Skip to content

Commit 11c0bc0

Browse files
JueonAnJueonAn
committed
total
2 parents c25d121 + 4609fc2 commit 11c0bc0

File tree

8 files changed

+115
-65
lines changed

8 files changed

+115
-65
lines changed

‎MinsaPayDesignSystem.css

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ body {
1414
margin: 0;
1515
left: 50%;
1616
position: absolute;
17-
-ms-transform: translate(-50%, 0%);
1817
transform: translate(-50%, 0%);
1918
}
2019

@@ -31,13 +30,16 @@ h2 {
3130
}
3231

3332
h3 {
34-
font-size: 20px; }
33+
font-size: 20px;
34+
}
3535

3636
h4 {
37-
font-size: 16px; }
37+
font-size: 16px;
38+
}
3839

3940
h5 {
40-
font-size: 15px; }
41+
font-size: 15px;
42+
}
4143

4244
h6 {
4345
color: #777777;
@@ -104,42 +106,77 @@ table {
104106
}
105107

106108
th {
107-
text-align: left;
109+
text-align: left;
110+
margin: 0px;
108111
}
109112

110113
td {
111114
text-align: left;
112-
}
113-
114-
tr:first-child th:first-child {
115-
border-radius: 10px 10px 0 0;
116-
}
117-
tr:last-child th:first-child {
118-
border-radius: 0 0 10px 10px;
115+
margin: 0px;
119116
}
120117

121118
input[type=radio] {
122119
width: 5%
123120
}
124121

125122
.smallp {
123+
margin: 0px;
126124
text-align: left;
127125
font-size: 12px;
128126
color: gray;
129127
margin-left: 10px;
130128
display: inline-block;
131129
}
132130

133-
.left {
131+
li {
134132
text-align: left;
133+
margin: 0px;
135134
}
136135

137-
li {
136+
form {
137+
padding: 0px;
138+
margin: 0px;
139+
}
140+
141+
.BalanceRecordTable {
142+
text-align: center;
143+
font-size: 10px;
144+
}
145+
146+
.BalanceRecordTable tr:nth-child(even) {background: #eeeeee}
147+
.BalanceRecordTable tr:nth-child(odd) {background: #ffffff}
148+
149+
.BalanceRecordTable th{
150+
text-align: center;
151+
background-color: #FBBC56;
152+
border: 0.5px solid black;
153+
}
154+
.BalanceRecordTable td{
155+
text-align: center;
156+
border: .5px solid black;
157+
}
158+
159+
.dataShowerH2 {
138160
text-align: left;
161+
padding: 0px;
139162
margin: 0px;
163+
margin-bottom: 10px;
140164
}
141165

142-
form {
166+
.dataShower {
167+
font-weight: normal;
168+
text-align: left;
143169
padding: 0px;
144170
margin: 0px;
171+
margin-top: 10px;
145172
}
173+
174+
summary {
175+
font-size: 20px;
176+
font-weight: bold;
177+
text-align: left;
178+
}
179+
180+
label {
181+
margin: 0px;
182+
}

‎add_account.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
<form action = "add_account_check.php" method="POST">
4444
<table>
4545
<tr>
46-
<th><h3>아이디</h3></th>
46+
<th><h3 class = 'dataShower'>아이디</h3></th>
4747
</tr>
4848
<tr>
4949
<th><input type="number" placeholder="학생은 학번, 선생님은 생년월일 입력" name="id" min="160000" max="999999" required></th>
5050
</tr>
5151
<tr>
52-
<th><h3>문화기획부 프리패스</h3></th>
52+
<th><h3 class = 'dataShower'>문화기획부 프리패스</h3></th>
5353
</tr>
5454
<tr>
5555
<th>
@@ -68,7 +68,7 @@
6868
</th>
6969
</tr>
7070
<tr>
71-
<th><h3>가입 유형</h3></th>
71+
<th><h3 class = 'dataShower'>가입 유형</h3></th>
7272
</tr>
7373
<tr>
7474
<th>
@@ -92,13 +92,13 @@
9292
</th>
9393
</tr>
9494
<tr>
95-
<th><h3>RFID 태그</h3></th>
95+
<th><h3 class = 'dataShower'>RFID 태그</h3></th>
9696
</tr>
9797
<tr>
9898
<th><input type="number" placeholder="RFID를 태그해주세요." name="rfid", required/></th>
9999
</tr>
100100
</table>
101-
<button type="submit" class="button1">계좌 개설하기</button>
101+
<button type="submit" class="button1">계좌 개설</button>
102102
</form>
103103
<script language="javascript" type="text/javascript" src="include/footer.js"></script>
104104
</body>

‎balance_check.php

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,23 @@
2121
}
2222
$balance = $row['balance'];
2323
$id = $row['idnumber'];
24-
echo $id," 의 잔액은 ";
25-
echo "<h4>", $balance, "원</h4>";
26-
echo"입니다.";
27-
if($row[freepass])
28-
echo "<br><br>당신은 문기부 FREEPASS 대상자 입니다.";
29-
?>
30-
<br>
31-
<details>
32-
<summary>결제 내역 보기</summary>
33-
<table>
24+
echo "<table><tr><th><h3 class = 'dataShower'>계좌 번호</h3></th></tr>";
25+
echo "<tr><th><h2 class = 'dataShowerH2'>", $id, "</h2></th></tr>";
26+
echo "<tr><th><h3 class = 'dataShower'>잔액</h3></th></tr>";
27+
echo "<tr><th><h2 class = 'dataShowerH2'>", number_format($balance), "원</h2></th></tr>";
28+
if($row['freepass']) {
29+
echo "<tr><th><h3 class = 'dataShower'>문화기획부 Freepass</h3></th></tr>";
30+
echo "<tr><th><h2 class = 'dataShowerH2' style = 'color: green'>Active</h2></th></tr>";
31+
}
32+
echo "</table>";
33+
?>
34+
<h3 class = 'dataShower'>계좌 기록</h3>
35+
<table class = "BalanceRecordTable">
3436
<thead>
3537
<tr>
3638
<th>번호</th>
3739
<th>시간</th>
38-
<th>부스명</th>
40+
<th>부스 이름</th>
3941
<th>분류</th>
4042
<th>잔액</th>
4143
</tr>
@@ -72,13 +74,12 @@
7274
echo "<td>".$time."</td>";
7375
echo "<td>".$booth."</td>";
7476
echo "<td>".$what."</td>";
75-
echo "<td>".$balance."</td>";
77+
echo "<td>".number_format($balance)."원</td>";
7678
echo "</tr>";
7779
}
7880
echo("</tbody>");
7981
?>
8082
</table>
81-
</details>
8283
<script language="javascript" type="text/javascript" src="include/footer.js"></script>
8384
</body>
8485
</html>

‎charge.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
<h3>계좌 충전 · 행정위원회</h3>
4040
<form action = "charge_check.php" method="POST">
4141
<div>
42-
<label for="amount"><h3 class="left">충전할 금액</h3></label>
42+
<label for="amount"><h3 class="dataShower">충전할 금액</h3></label>
4343
<input type="number" placeholder = "충전할 금액을 입력해주세요. (₩)" name="amount" min="0" required>
4444
</div>
4545
<div>
46-
<label for="rfid"><h3 class="left">RFID 태그</h3></label>
46+
<label for="rfid"><h3 class="dataShower">RFID 태그</h3></label>
4747
<input type="number" placeholder = "RFID를 태그해주세요." name="rfid" required>
4848
</div>
4949
<div class="button">
50-
<button type="submit" value="충전하기" class = "button1">계좌 충전하기</button>
50+
<button type="submit" value="충전하기" class = "button1">계좌 충전</button>
5151
</div>
5252
</form>
5353
<script language="javascript" type="text/javascript" src="include/footer.js"></script>

‎index.php

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,17 @@
77
</head>
88
<body>
99
<script language="javascript" type="text/javascript" src="include/header.js"></script>
10-
<form method="POST" id="Balance Check Form" action="balance_check.php"autocomplete="off" >
11-
<input type="number" name="studentid" placeholder = "아이디 입력 · RFID 태그" value="Student ID number"> <br>
12-
</form>
13-
<button type="submit" class = "button1" form="Balance Check Form" value="잔액 확인">계좌 조회</button>
14-
<button type="button" class = "button2" onclick="location.href='main.php' ">운영진 로그인</button>
15-
<script language="javascript" type="text/javascript" src="include/footer.js"></script>
10+
<table>
11+
<tr><th>
12+
<h3 class = 'dataShower'>계좌 조회</h3>
13+
</th></tr>
14+
<tr><th>
15+
<form method="POST" id="Balance Check Form" action="balance_check.php"autocomplete="off" >
16+
<input type="number" name="studentid" placeholder = "아이디 입력 · RFID 태그" value="Student ID number"> <br>
17+
</form>
18+
</th></tr></table>
19+
<button type="submit" class = "button1" form="Balance Check Form" value="잔액 확인">계좌 조회</button>
20+
<button type="button" class = "button2" onclick="location.href='main.php' ">운영진 로그인</button>
21+
<script language="javascript" type="text/javascript" src="include/footer.js"></script>
1622
</body>
17-
</html>
23+
</html>

‎login.html

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,23 @@
77
</head>
88
<body>
99
<script language="javascript" type="text/javascript" src="include/header.js"></script>
10-
<h3>운영진 로그인</h3>
1110
<form method="POST" action="/login_check.php">
12-
<input type="text" placeholder="아이디 입력하기" name="id"/>
13-
<input type="password" placeholder="비밀번호 입력하기" name="pw"/>
14-
<button type="submit" class="button1">로그인</button>
11+
<table>
12+
<tr><th>
13+
<h3 class = 'dataShower'>운영진 로그인</h3>
14+
</th></tr>
15+
16+
<tr><th>
17+
<input type="text" placeholder="아이디 입력하기" name="id"/>
18+
</th></tr>
19+
20+
<tr><th>
21+
<input type="password" placeholder="비밀번호 입력하기" name="pw"/>
22+
</th></tr>
23+
</table>
24+
<button type="submit" class="button1">로그인</button>
1525
</form>
16-
<button onclick="location.href='signUp.html'" class="button2"> 운영진 가입하기 </button>
26+
<button onclick="location.href='signUp.html'" class="button2">운영진 회원가입</button>
1727
<script language="javascript" type="text/javascript" src="include/footer.js"></script>
1828
</body>
1929
</html>

‎main.php

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
</head>
2020
<body>
2121
<script language="javascript" type="text/javascript" src="include/header.js"></script>
22-
<h4>부스 운영진 · 민족제 운영진만 접속할 수 있습니다.</h4>
2322
<?php
2423
$id = $_SESSION['userid'];
2524

@@ -29,10 +28,8 @@
2928
$result=$mysqli->query($check);
3029
$row=$result->fetch_array(MYSQLI_ASSOC);
3130
$boothname = $row['boothname'];
32-
33-
echo "<h4> 현재 로그인 된 부스</h4>";
34-
echo "<h3>",$boothname, "</h3>";
35-
echo "<br>";
31+
echo "<table><tr><th><h3 class = 'dataShower'>현재 부스</h3></th></tr>";
32+
echo "<tr><th><h2 class = 'dataShowerH2'>",$boothname,"</h2></th></tr></table>";
3633
$isAdmin = $row['admin'];
3734
if($isAdmin==1)
3835
{
@@ -53,15 +50,15 @@
5350
<button type="submit" class="button1" >결제하기</button>
5451
</div>
5552
</form>
56-
<details>
57-
<summary>결제 내역 보기</summary>
58-
<table>
53+
54+
<h3 class = 'dataShower'>결제 기록</h3>
55+
<table class = "BalanceRecordTable">
5956
<thead>
6057
<tr>
6158
<th>번호</th>
6259
<th>시간</th>
63-
<th>결제자</th>
64-
<th>판매액</th>
60+
<th>구매</th>
61+
<th>금액</th>
6562
</tr>
6663
</thead>
6764
<?php
@@ -80,7 +77,7 @@
8077
echo "<td>".$number."</td>";
8178
echo "<td>".$time."</td>";
8279
echo "<td>".$who."</td>";
83-
echo "<td>".$price."</td>";
80+
echo "<td>".number_format($price)."원</td>";
8481
echo "</tr>";
8582
}
8683
echo("</tbody>");

‎signUp.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,21 @@
77
</head>
88
<body>
99
<script language="javascript" type="text/javascript" src="include/header.js"></script>
10-
<h3>부스 가입하기</h3>
11-
12-
<h3 class = "left">약관</h3>
10+
<h2>운영진 회원가입</h2>
11+
<h3 class = "dataShower">약관</h3>
1312

1413
<script language="javascript" type="text/javascript" src="include/boothSignupAgreement.js"></script>
1514

1615
<form action = "signUp_check.php" method="POST">
1716
<table>
1817
<tr>
19-
<th><h3>아이디</h3></th>
18+
<th><h3 class = "dataShower">아이디</h3></th>
2019
</tr>
2120
<tr>
2221
<th><input type="text" placeholder = "아이디를 입력해주세요." name="id", required/></th>
2322
</tr>
2423
<tr>
25-
<th><h3>비밀번호</h3></th>
24+
<th><h3 class = "dataShower">비밀번호</h3></th>
2625
</tr>
2726
<tr>
2827
<th><input type="password" placeholder = "비밀번호를 입력해주세요." name="pw", required/></th>
@@ -32,7 +31,7 @@ <h3 class = "left">약관</h3>
3231
</tr>
3332
<tr>
3433
<th>
35-
<h3>부스 이름</h3>
34+
<h3 class = "dataShower">부스 이름</h3>
3635
</th>
3736
</tr>
3837
<tr>

0 commit comments

Comments
 (0)