Skip to content

Commit 8eafa76

Browse files
HelloWorld017HelloWorld017
committed
Merge branch 'front-end' of https://github.com/if-Team/Strategy-Yut 
2 parents 3dc62b6 + a33d4e7 commit 8eafa76

File tree

3 files changed

+156
-2
lines changed

3 files changed

+156
-2
lines changed

‎bower.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
"description": "이벤트성 전략 윷놀이 서버",
44
"main": "src/start.js",
55
"authors": [
6-
"HelloWorld017 <[email protected]>"
6+
"HelloWorld017 <[email protected]>",
7+
"MuhunKim <[email protected]>"
78
],
89
"license": "GPL-3.0",
910
"keywords": [
1011
"Yutnori",
1112
"Strategy"
1213
],
14+
"dependencies": {
15+
"semantic": "semantic-ui#^2.1.8",
16+
"mdi": "^1.6.50"
17+
},
1318
"homepage": "https://github.com/if-Team/Strategy-Yut",
1419
"private": true,
1520
"ignore": [

‎views/css/login.css

Whitespace-only changes.

‎views/login.ejs

Lines changed: 150 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,150 @@
1-
Please wait...
1+
<!DOCTYPE html>
2+
<html lang="ko">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="x-ua-compatible" content="ie=edge">
6+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
7+
<title>Yutnori - 로그인</title>
8+
<!-- jQuery -->
9+
<script src="bower_components/jquery/dist/jquery.min.js"></script>
10+
11+
<!-- semantic-ui -->
12+
<link href="bower_components/semantic/dist/semantic.min.css" rel="stylesheet">
13+
<script src="bower_components/semantic/dist/semantic.min.js"></script>
14+
15+
<!-- mdi -->
16+
<link href="bower_components/mdi/css/materialdesignicons.min.css" media="all" rel="stylesheet">
17+
18+
<!--etc.. -->
19+
<link href="css/login.css" rel="stylesheet">
20+
<link href="css/common.css" rel="stylesheet">
21+
<link href="css/table.css" rel="stylesheet">
22+
<script src="js/ui.js"></script>
23+
<script>
24+
$(document)
25+
.ready(function() {
26+
$('.ui.form')
27+
.form({
28+
fields: {
29+
email: {
30+
identifier: 'email',
31+
rules: [{
32+
type: 'empty',
33+
prompt: '이메일을 입력해주세요'
34+
}, {
35+
type: 'email',
36+
prompt: '유효한 이메일을 입력해주세요'
37+
}]
38+
},
39+
password: {
40+
identifier: 'password',
41+
rules: [{
42+
type: 'empty',
43+
prompt: '비밀번호를 입력해주세요'
44+
}, {
45+
type: 'length[6]',
46+
prompt: '비밀번호는 6자를 넘어야 합니다.'
47+
}]
48+
}
49+
}
50+
});
51+
});
52+
</script>
53+
</head>
54+
55+
<body>
56+
<div class="ui center middle aligned grid account-layout">
57+
<div class="segment account-segment" style="width: 100%">
58+
<div class="ui two column very relaxed stackable grid centered container account-container">
59+
<div class="column">
60+
<form class="ui large form">
61+
<div class="ui stacked segment account middle aligned">
62+
<div class="account-contents">
63+
<h1 class="ui teal image header" style="float:left; font-size:4em;">
64+
<div class="content">
65+
LOG<span class="unbold">IN</span>
66+
</div>
67+
</h1>
68+
<div class="field">
69+
<div class="ui left icon input">
70+
<i class="mdi mdi-account icon" style="font-size:1em;"></i>
71+
<input type="text" name="email" placeholder="이메일 주소">
72+
</div>
73+
</div>
74+
<div class="field">
75+
<div class="ui left icon input">
76+
<i class="mdi mdi-key icon" style="font-size:1em"></i>
77+
<input type="password" name="password" placeholder="비밀번호">
78+
</div>
79+
</div>
80+
<div class="ui fluid large teal submit button">로그인</div>
81+
</div>
82+
</div>
83+
</form>
84+
</div>
85+
86+
<div class="ui vertical divider">
87+
or
88+
</div>
89+
90+
<div class="column">
91+
<form class="ui large form">
92+
<div class="ui stacked segment account">
93+
<div class="account-contents">
94+
<h1 class="ui teal image header" style="float:left; font-size:4em;">
95+
<div class="content">
96+
SIGN<span class="unbold">IN</span>
97+
</div>
98+
</h1>
99+
100+
<div class="field">
101+
<div class="ui left icon input">
102+
<i class="mdi mdi-account icon" style="font-size:1em"></i>
103+
<input type="text" name="name" placeholder="이름">
104+
</div>
105+
</div>
106+
107+
<div class="field">
108+
<div class="ui left icon input">
109+
<i class="mdi mdi-account icon" style="font-size:1em"></i>
110+
<input type="text" name="email" placeholder="이메일 주소">
111+
</div>
112+
</div>
113+
114+
<div class="field">
115+
<div class="ui left icon input">
116+
<i class="mdi mdi-key icon" style="font-size:1em"></i>
117+
<input type="password" name="password" placeholder="비밀번호">
118+
</div>
119+
</div>
120+
121+
<div class="field">
122+
<div class="ui left icon input">
123+
<i class="mdi mdi-key icon" style="font-size:1em"></i>
124+
<input type="password" name="password-confirm" placeholder="비밀번호 확인">
125+
</div>
126+
</div>
127+
<div class="ui fluid large teal submit button">회원가입</div>
128+
</div>
129+
</div>
130+
</form>
131+
</div>
132+
</div>
133+
</div>
134+
</div>
135+
</div>
136+
<div class="ui inverted vertical footer segment" style="top:3em">
137+
<div class="ui container">
138+
<div class="row-container warp">
139+
<div class="credit">
140+
<h5 class="ui inverted header">
141+
<img src="../public/resources/img/logo.svg" style="width:50px; hight:auto;">
142+
<span>Strategy-Yut</span>
143+
</h5>
144+
<p>copyright(C) if-Team</p>
145+
</div>
146+
</div>
147+
</div>
148+
</div>
149+
</body>
150+
</html>

0 commit comments

Comments
 (0)