김동근 / WhoAreYou

Go to a project
Toggle navigation Toggle navigation pinning
김동근
7f8e6a06 2 parents 8d7a7559 6f5023c4

Merge branch 'Lee' into 'master' 

Lee



See merge request !1
Inline Side-by-side
Showing 14 changed files with 558 additions and 68 deletions
1 +{
2 + "CurrentProjectSetting": null
3 +}
...\ No newline at end of file ...\ No newline at end of file
1 +{
2 + "ExpandedNodes": [
3 + ""
4 + ],
5 + "SelectedNode": "\\select_opponent.html",
6 + "PreviewInSolutionExplorer": false
7 +}
...\ No newline at end of file ...\ No newline at end of file
No preview for this file type
No preview for this file type
1 -<!DOCTYPE html> 1 +<!DOCTYPE html>
2 <html lang="ko"> 2 <html lang="ko">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 - <title>Who Are You? - 하스스톤 멀리건 도우미</title> 7 + <title>HearthCompare - 하스스톤 도우미</title>
8 8
9 <!-- 부트스트랩 --> 9 <!-- 부트스트랩 -->
10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet"> 10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
...@@ -23,16 +23,16 @@ ...@@ -23,16 +23,16 @@
23 type:'POST', 23 type:'POST',
24 url:'/logout', 24 url:'/logout',
25 success:function(result){ 25 success:function(result){
26 - alert('로그아웃 성공!') 26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 window.location.href='/' 27 window.location.href='/'
28 }, 28 },
29 error:function(result){ 29 error:function(result){
30 - alert('로그아웃 실패!') 30 + alert('로그아웃에 실패하였습니다.')
31 return false 31 return false
32 } 32 }
33 }) 33 })
34 }) 34 })
35 - $('#backToSelectOpponent').click(function(){ 35 + $('#backToSelectMine').click(function(){
36 window.history.back() 36 window.history.back()
37 }) 37 })
38 }) 38 })
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
48 <span class="icon-bar"></span> 48 <span class="icon-bar"></span>
49 <span class="icon-bar"></span> 49 <span class="icon-bar"></span>
50 </button> 50 </button>
51 - <a class="navbar-brand" href="/">Who Are You?</a> 51 + <a class="navbar-brand" href="/">HearthCompare</a>
52 </div> 52 </div>
53 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;"> 53 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
54 <ul class="nav navbar-nav"> 54 <ul class="nav navbar-nav">
...@@ -64,46 +64,28 @@ ...@@ -64,46 +64,28 @@
64 <div class="padding" style="width:100px"></div> 64 <div class="padding" style="width:100px"></div>
65 <br> 65 <br>
66 <br> 66 <br>
67 - <h3 class="form-signin-heading">상대편의 주요 덱</h3> 67 + <h3 class="form-signin-heading">상대편 직업의 주요 덱</h3>
68 <div id="opponentDecks"> 68 <div id="opponentDecks">
69 <table class="table" style="text-align: center;"> 69 <table class="table" style="text-align: center;">
70 <thead> 70 <thead>
71 <td>덱 이름</td> 71 <td>덱 이름</td>
72 - <td>플레이 수</td> 72 + <td>승률</td>
73 </thead> 73 </thead>
74 <tbody> 74 <tbody>
75 <tr> 75 <tr>
76 <td><a class="list-group-item">덱이름1</a></td> 76 <td><a class="list-group-item">덱이름1</a></td>
77 - <td><a class="list-group-item">10000</a></td> 77 + <td><a class="list-group-item">56</a></td>
78 </tr> 78 </tr>
79 </tbody> 79 </tbody>
80 </table> 80 </table>
81 </div> 81 </div>
82 - <br> 82 + <br><br><br><br><br>
83 - <br>
84 - <h3 class="form-signin-heading">내 덱의 추천 멀리건</h3>
85 - <div id="yourMulligan">
86 - <table class="table" style="text-align: center;">
87 - <thead>
88 - <td>카드 이름</td>
89 - <td>멀리건 승률</td>
90 - </thead>
91 - <tbody>
92 - <tr>
93 - <td><a class="list-group-item">카드이름1</a></td>
94 - <td><a class="list-group-item">59.8</a></td>
95 - </tr>
96 - </tbody>
97 - </table>
98 - </div>
99 - <br>
100 - <br>
101 <div class="row"> 83 <div class="row">
102 <div class="col-md-6"> 84 <div class="col-md-6">
103 - <a href="/decklist"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToDeckList" value="덱 선택으로 돌아가기" /></a> 85 + <a href="/menulist"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToMenuList" value="메뉴 선택으로 돌아가기" /></a>
104 </div> 86 </div>
105 <div class="col-md-6"> 87 <div class="col-md-6">
106 - <input class="btn btn-lg btn-primary btn-block" type="button" id="backToSelectOpponent" value="상대편 직업 선택으로 돌아가기"/> 88 + <a href="/select_opponent"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToSelectOpponent" value="상대 직업 선택으로 돌아가기" /></a>
107 </div> 89 </div>
108 </div> 90 </div>
109 </div> 91 </div>
......
1 -<!DOCTYPE html> 1 +<!DOCTYPE html>
2 <html lang="ko"> 2 <html lang="ko">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 - <title>Who Are You? - 하스스톤 멀리건 도우미</title> 7 + <title>HearthCompare - 하스스톤 도우미</title>
8 8
9 <!-- 부트스트랩 --> 9 <!-- 부트스트랩 -->
10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet"> 10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
23 type:'POST', 23 type:'POST',
24 url:'/logout', 24 url:'/logout',
25 success:function(result){ 25 success:function(result){
26 - alert('로그아웃 성공!') 26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 window.location.href='/' 27 window.location.href='/'
28 }, 28 },
29 error:function(result){ 29 error:function(result){
30 - alert('로그아웃 실패!') 30 + alert('로그아웃에 실패하였습니다.')
31 return false 31 return false
32 } 32 }
33 }) 33 })
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <span class="icon-bar"></span> 45 <span class="icon-bar"></span>
46 <span class="icon-bar"></span> 46 <span class="icon-bar"></span>
47 </button> 47 </button>
48 - <a class="navbar-brand" href="/main">Who Are You?</a> 48 + <a class="navbar-brand" href="/main">HearthCompare</a>
49 </div> 49 </div>
50 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;"> 50 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
51 <ul class="nav navbar-nav"> 51 <ul class="nav navbar-nav">
...@@ -57,12 +57,13 @@ ...@@ -57,12 +57,13 @@
57 </div> 57 </div>
58 </nav> 58 </nav>
59 59
60 - <div class="container show-grid" > 60 + <div class="container show-grid">
61 <div class="padding" style="width:100px"></div> 61 <div class="padding" style="width:100px"></div>
62 <div class="container" style="width:50%;"> 62 <div class="container" style="width:50%;">
63 <div class="row"> 63 <div class="row">
64 <h3 class="form-signin-heading col-md-10" style="text-align: left;">내 덱 리스트</h3> 64 <h3 class="form-signin-heading col-md-10" style="text-align: left;">내 덱 리스트</h3>
65 - <a href="/newdeck"><input type="button" class="btn col-md-2" value="+" style="margin-top: 18px;" /></a> 65 + <a href="/newdeck"><input type="button" class="btn col-md-2" value="+" style="margin-left: 345px;" /></a>
66 + <a><input type="button" class="btn col-md-2" value="-" style="margin-left: 20px;" /></a>
66 </div> 67 </div>
67 <br> 68 <br>
68 <table class="table"> 69 <table class="table">
...@@ -70,6 +71,13 @@ ...@@ -70,6 +71,13 @@
70 <tr><td style="text-align: center;"><a class="list-group-item" href="#">덱 이름</a></td></tr> 71 <tr><td style="text-align: center;"><a class="list-group-item" href="#">덱 이름</a></td></tr>
71 </table> 72 </table>
72 </div> 73 </div>
74 + <br><br><br><br><br><br><br><br><br><br>
75 + <div class="row">
76 + <div class="col-md-4"></div>
77 + <div class="col-md-4">
78 + <a href="/menulist"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToMenuList" value="메뉴 선택으로 돌아가기" /></a>
79 + </div>
80 + </div>
73 </div> 81 </div>
74 82
75 <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) --> 83 <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) -->
......
1 -<!DOCTYPE html> 1 +<!DOCTYPE html>
2 <html lang="ko"> 2 <html lang="ko">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 - <title>Who Are You? - 하스스톤 멀리건 도우미</title> 7 + <title>HearthCompare - 하스스톤 도우미</title>
8 <!-- 부트스트랩 --> 8 <!-- 부트스트랩 -->
9 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css" rel="stylesheet"> 9 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css" rel="stylesheet">
10 <link href="../../static/main.css" rel="stylesheet"> 10 <link href="../../static/main.css" rel="stylesheet">
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
38 traditional:true, 38 traditional:true,
39 processdata:false, 39 processdata:false,
40 success:function(result){ 40 success:function(result){
41 - alert('로그인 성공!') 41 + alert('로그인에 성공하였습니다.\nHearthCompare에 오신 것을 환영합니다.')
42 - window.location.href='/decklist' 42 + window.location.href='/menulist'
43 }, 43 },
44 error:function(result){ 44 error:function(result){
45 - alert(`로그인 실패!\nmessage:${result['message']}`) 45 + alert(`로그인에 실패하였습니다.\n아이디와 비밀번호를 다시 확인해주세요.\nmessage:${result['message']}`)
46 return false 46 return false
47 } 47 }
48 }) 48 })
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 <span class="icon-bar"></span> 64 <span class="icon-bar"></span>
65 <span class="icon-bar"></span> 65 <span class="icon-bar"></span>
66 </button> 66 </button>
67 - <a class="navbar-brand" href="/">Who Are You?</a> 67 + <a class="navbar-brand" href="/">HearthCompare</a>
68 </div> 68 </div>
69 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;"> 69 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
70 <ul class="nav navbar-nav"> 70 <ul class="nav navbar-nav">
......
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">
7 + <title>HearthCompare - 하스스톤 도우미</title>
8 +
9 + <!-- 부트스트랩 -->
10 + <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
11 + <link href="../../static/main.css" rel="stylesheet">
12 + <!-- IE8 에서 HTML5 요소와 미디어 쿼리를 위한 HTML5 shim 와 Respond.js -->
13 + <!-- WARNING: Respond.js 는 당신이 file:// 을 통해 페이지를 볼 때는 동작하지 않습니다. -->
14 + <!--[if lt IE 9]>
15 + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
16 + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
17 + <![endif]-->
18 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
19 + <script>
20 + $(document).ready(function(){
21 + $('#logoutButton').click(function(){
22 + $.ajax({
23 + type:'POST',
24 + url:'/logout',
25 + success:function(result){
26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 + window.location.href='/'
28 + },
29 + error:function(result){
30 + alert('로그아웃에 실패하였습니다.')
31 + return false
32 + }
33 + })
34 + })
35 + })
36 + </script>
37 +</head>
38 +<body>
39 + <nav class="navbar-default navbar-fixed-top">
40 + <div class="container">
41 + <div class="navbar-header">
42 + <button class="navbar-toggle collapsed" aria-expanded="false" aria-controls="navbar" type="button" data-toggle="collapse" data-target="#navbar">
43 + <span class="sr-only">Toggle navigation</span>
44 + <span class="icon-bar"></span>
45 + <span class="icon-bar"></span>
46 + <span class="icon-bar"></span>
47 + </button>
48 + <a class="navbar-brand" href="/main">HearthCompare</a>
49 + </div>
50 + <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
51 + <ul class="nav navbar-nav"></ul>
52 + <div class="navbar-right">
53 + <input type="button" class="btn navbar-btn" id="logoutButton" style="color:#000;" value="로그아웃" />
54 + </div>
55 + </div>
56 + </div>
57 + </nav>
58 +
59 +
60 + <div class="container show-grid">
61 + <div class="padding" style="width:100px"></div>
62 + <div class="container" style="width:50%;">
63 + <h3 class="form-signin-heading">메뉴</h3>
64 + <br>
65 + <div class="col">
66 + <div class="row-md-5">
67 + <a href="/decklist"><input class="btn btn-lg btn-info btn-block" type="button" id="handprob_check" value="1. 멀리건 승률 확인하기" /></a>
68 + </div>
69 + <br>
70 + <div class="row-md-5">
71 + <a href="/select_opponent"><input class="btn btn-lg btn-info btn-block" type="button" id="oppenentdeck_check" value="2. 상대편 직업의 주요 덱 보기" /></a>
72 + </div>
73 + <br>
74 + <div class="row-md-5">
75 + <a href="/select_mine"><input class="btn btn-lg btn-info btn-block" type="button" id="cardscore_check" value="3. 투기장 카드 점수 확인하기" /></a>
76 + </div>
77 + </div>
78 + </div>
79 + </div>
80 +
81 + <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) -->
82 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
83 + <!-- 모든 컴파일된 플러그인을 포함합니다 (아래), 원하지 않는다면 필요한 각각의 파일을 포함하세요 -->
84 + <script src="../../static/bootstrap-3.3.2-dist/js/bootstrap.min.js"></script>
85 +</body>
86 +</html>
...\ No newline at end of file ...\ No newline at end of file
1 -<!DOCTYPE html> 1 +<!DOCTYPE html>
2 <html lang="ko"> 2 <html lang="ko">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 - <title>Who Are You? - 하스스톤 멀리건 도우미</title> 7 + <title>HearthCompare - 하스스톤 도우미</title>
8 8
9 <!-- 부트스트랩 --> 9 <!-- 부트스트랩 -->
10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet"> 10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
23 type:'POST', 23 type:'POST',
24 url:'/logout', 24 url:'/logout',
25 success:function(result){ 25 success:function(result){
26 - alert('로그아웃 성공!') 26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 window.location.href='/' 27 window.location.href='/'
28 }, 28 },
29 error:function(result){ 29 error:function(result){
30 - alert('로그아웃 실패!') 30 + alert('로그아웃에 실패하였습니다.')
31 return false 31 return false
32 } 32 }
33 }) 33 })
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 data.deckTitle=$('#deckTitle').val() 37 data.deckTitle=$('#deckTitle').val()
38 data.deckCode=$('#deckCode').val() 38 data.deckCode=$('#deckCode').val()
39 const stringData=JSON.stringify(data) 39 const stringData=JSON.stringify(data)
40 - alert('잠시 기다리시겠습니까?') 40 + alert('덱이 추가되는 동안 잠시만 기다려주십시오.')
41 $.ajax({ 41 $.ajax({
42 type:'POST', 42 type:'POST',
43 url:'/api/deck/newdeck', 43 url:'/api/deck/newdeck',
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
47 traditional:true, 47 traditional:true,
48 processdata:false, 48 processdata:false,
49 success:function(result){ 49 success:function(result){
50 - alert('덱 생성 성공!') 50 + alert('덱 추가를 성공하였습니다.\n내 덱 리스트 화면으로 이동합니다.')
51 window.location.href='/decklist' 51 window.location.href='/decklist'
52 }, 52 },
53 error:function(result){ 53 error:function(result){
54 - alert(`덱 생성 실패!\nmessage:${result['message']}`) 54 + alert(`덱 추가를 실패하였습니다.\nmessage:${result['message']}`)
55 return false 55 return false
56 } 56 }
57 }) 57 })
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 <span class="icon-bar"></span> 69 <span class="icon-bar"></span>
70 <span class="icon-bar"></span> 70 <span class="icon-bar"></span>
71 </button> 71 </button>
72 - <a class="navbar-brand" href="/">Who Are You?</a> 72 + <a class="navbar-brand" href="/">HearthCompare</a>
73 </div> 73 </div>
74 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;"> 74 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
75 <ul class="nav navbar-nav"> 75 <ul class="nav navbar-nav">
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
89 <label class="sr-only" for="deckTitle">덱 이름</label> 89 <label class="sr-only" for="deckTitle">덱 이름</label>
90 <input class="form-control" id="deckTitle" autofocus="" required="" type="text" placeholder="덱 이름" name="deckTitle"> 90 <input class="form-control" id="deckTitle" autofocus="" required="" type="text" placeholder="덱 이름" name="deckTitle">
91 <label class="sr-only" for="deckCode">덱 코드</label> 91 <label class="sr-only" for="deckCode">덱 코드</label>
92 - <textarea class="form-control" id="deckCode" required="" placeholder="#으로 시작하는 문장은 제외한 덱 코드만 입력해 주세요." style="resize:none;height:150px;" name="deckCode"></textarea> 92 + <textarea class="form-control" id="deckCode" required="" placeholder="카드 정보를 제외한 덱 코드만 입력해주세요." style="resize:none;height:150px;" name="deckCode"></textarea>
93 </form> 93 </form>
94 <input type="button" class="btn btn-primary btn-block" id="newDeckButton" value="확인" /> 94 <input type="button" class="btn btn-primary btn-block" id="newDeckButton" value="확인" />
95 </div> 95 </div>
......
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">
7 + <title>HearthCompare - 하스스톤 도우미</title>
8 +
9 + <!-- 부트스트랩 -->
10 + <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
11 + <link href="../../static/main.css" rel="stylesheet">
12 + <!-- IE8 에서 HTML5 요소와 미디어 쿼리를 위한 HTML5 shim 와 Respond.js -->
13 + <!-- WARNING: Respond.js 는 당신이 file:// 을 통해 페이지를 볼 때는 동작하지 않습니다. -->
14 + <!--[if lt IE 9]>
15 + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
16 + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
17 + <![endif]-->
18 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
19 + <script>
20 + $(document).ready(function(){
21 + $('#logoutButton').click(function(){
22 + $.ajax({
23 + type:'POST',
24 + url:'/logout',
25 + success:function(result){
26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 + window.location.href='/'
28 + },
29 + error:function(result){
30 + alert('로그아웃에 실패하였습니다.')
31 + return false
32 + }
33 + })
34 + })
35 + })
36 + </script>
37 +</head>
38 +<body>
39 + <nav class="navbar-default navbar-fixed-top">
40 + <div class="container">
41 + <div class="navbar-header">
42 + <button class="navbar-toggle collapsed" aria-expanded="false" aria-controls="navbar" type="button" data-toggle="collapse" data-target="#navbar">
43 + <span class="sr-only">Toggle navigation</span>
44 + <span class="icon-bar"></span>
45 + <span class="icon-bar"></span>
46 + <span class="icon-bar"></span>
47 + </button>
48 + <a class="navbar-brand" href="/">HearthCompare</a>
49 + </div>
50 + <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
51 + <ul class="nav navbar-nav"></ul>
52 + <div class="navbar-right">
53 + <input type="button" class="btn navbar-btn" id="logoutButton" style="color:#000;" value="로그아웃" />
54 + </div>
55 + </div>
56 + </div>
57 + </nav>
58 +
59 + <div class="container show-grid">
60 + <div class="padding-top" style="width:100px"></div>
61 + <br><br><br><br><br>
62 + <h3 class="form-signin-heading">내 덱</h3>
63 + <div id="opponentDecks">
64 + <table class="table" style="text-align: center;">
65 + <thead>
66 + <td>덱 이름</td>
67 + <td>승률</td>
68 + </thead>
69 + <tbody>
70 + <tr>
71 + <td><a class="list-group-item">덱 이름</a></td>
72 + <td><a class="list-group-item">56</a></td>
73 + </tr>
74 + </tbody>
75 + </table>
76 + </div>
77 + <br>
78 + <br>
79 + <h3 class="form-signin-heading">멀리건 승률</h3>
80 + <div id="yourMulligan">
81 + <table class="table" style="text-align: center;">
82 + <thead>
83 + <td>카드 이름</td>
84 + <td>멀리건 승률</td>
85 + </thead>
86 + <tbody>
87 + <tr>
88 + <td><a class="list-group-item">카드 이름</a></td>
89 + <td><a class="list-group-item">60</a></td>
90 + </tr>
91 + <tr>
92 + <td><a class="list-group-item">카드 이름</a></td>
93 + <td><a class="list-group-item">59</a></td>
94 + </tr>
95 + <tr>
96 + <td><a class="list-group-item">카드 이름</a></td>
97 + <td><a class="list-group-item">58</a></td>
98 + </tr>
99 + <tr>
100 + <td><a class="list-group-item">카드 이름</a></td>
101 + <td><a class="list-group-item">57</a></td>
102 + </tr>
103 + </tbody>
104 + </table>
105 + <input type="button" class="btn btn-primary btn-block" id="newDeckButton" value="멀리건 승률 표출하기" />
106 + </div>
107 + <br>
108 + <br>
109 + <div class="row">
110 + <div class="col-md-6">
111 + <a href="/menulist"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToMenuList" value="메뉴 선택으로 돌아가기" /></a>
112 + </div>
113 + <div class="col-md-6">
114 + <a href="/decklist"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToDeckList" value="내 덱 리스트로 돌아가기" /></a>
115 + </div>
116 + </div>
117 + </div>
118 +
119 + <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) -->
120 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
121 + <!-- 모든 컴파일된 플러그인을 포함합니다 (아래), 원하지 않는다면 필요한 각각의 파일을 포함하세요 -->
122 + <script src="../../static/bootstrap-3.3.2-dist/js/bootstrap.min.js"></script>
123 +</body>
124 +</html>
...\ No newline at end of file ...\ No newline at end of file
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">
7 + <title>HearthCompare - 하스스톤 도우미</title>
8 +
9 + <!-- 부트스트랩 -->
10 + <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
11 + <link href="../../static/main.css" rel="stylesheet">
12 + <!-- IE8 에서 HTML5 요소와 미디어 쿼리를 위한 HTML5 shim 와 Respond.js -->
13 + <!-- WARNING: Respond.js 는 당신이 file:// 을 통해 페이지를 볼 때는 동작하지 않습니다. -->
14 + <!--[if lt IE 9]>
15 + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
16 + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
17 + <![endif]-->
18 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
19 + <script>
20 + $(document).ready(function(){
21 + $('#logoutButton').click(function(){
22 + $.ajax({
23 + type:'POST',
24 + url:'/logout',
25 + success:function(result){
26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 + window.location.href='/'
28 + },
29 + error:function(result){
30 + alert('로그아웃에 실패하였습니다.')
31 + return false
32 + }
33 + })
34 + })
35 + })
36 + </script>
37 +</head>
38 +<body>
39 + <nav class="navbar-default navbar-fixed-top">
40 + <div class="container">
41 + <div class="navbar-header">
42 + <button class="navbar-toggle collapsed" aria-expanded="false" aria-controls="navbar" type="button" data-toggle="collapse" data-target="#navbar">
43 + <span class="sr-only">Toggle navigation</span>
44 + <span class="icon-bar"></span>
45 + <span class="icon-bar"></span>
46 + <span class="icon-bar"></span>
47 + </button>
48 + <a class="navbar-brand" href="/">HearthCompare</a>
49 + </div>
50 + <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
51 + <ul class="nav navbar-nav"></ul>
52 + <div class="navbar-right">
53 + <input type="button" class="btn navbar-btn" id="logoutButton" style="color:#000;" value="로그아웃" />
54 + </div>
55 + </div>
56 + </div>
57 + </nav>
58 +
59 + <div class="container show-grid">
60 + <div class="padding-top" style="width:100px"></div>
61 + <br><br><br><br><br>
62 + <h3 class="form-signin-heading">내 직업</h3>
63 + <div id="opponentDecks">
64 + <table class="table" style="text-align: center;">
65 + <thead>
66 + <td>직업</td>
67 + </thead>
68 + <tbody>
69 + <tr>
70 + <td><a class="list-group-item">드루이드</a></td>
71 + </tr>
72 + </tbody>
73 + </table>
74 + </div>
75 + <br>
76 + <br>
77 + <h3 class="form-signin-heading">투기장 카드 점수</h3>
78 + <div id="yourMulligan">
79 + <table class="table" style="text-align: center;">
80 + <thead>
81 + <td>카드 이름</td>
82 + <td>카드 점수</td>
83 + </thead>
84 + <tbody>
85 + <tr>
86 + <td><a class="list-group-item">카드 이름</a></td>
87 + <td><a class="list-group-item">60</a></td>
88 + </tr>
89 + <tr>
90 + <td><a class="list-group-item">카드 이름</a></td>
91 + <td><a class="list-group-item">59</a></td>
92 + </tr>
93 + <tr>
94 + <td><a class="list-group-item">카드 이름</a></td>
95 + <td><a class="list-group-item">58</a></td>
96 + </tr>
97 +
98 + </tbody>
99 + </table>
100 + <input type="button" class="btn btn-primary btn-block" id="newDeckButton" value="카드 점수 표출하기" />
101 + </div>
102 + <br>
103 + <br>
104 + <div class="row">
105 + <div class="col-md-6">
106 + <a href="/menulist"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToMenuList" value="메뉴 선택으로 돌아가기" /></a>
107 + </div>
108 + <div class="col-md-6">
109 + <a href="/select_mine"><input class="btn btn-lg btn-primary btn-block" type="button" id="backToMine" value="내 직업 선택으로 돌아가기" /></a>
110 + </div>
111 + </div>
112 + </div>
113 +
114 + <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) -->
115 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
116 + <!-- 모든 컴파일된 플러그인을 포함합니다 (아래), 원하지 않는다면 필요한 각각의 파일을 포함하세요 -->
117 + <script src="../../static/bootstrap-3.3.2-dist/js/bootstrap.min.js"></script>
118 +</body>
119 +</html>
...\ No newline at end of file ...\ No newline at end of file
1 -<!DOCTYPE html> 1 +<!DOCTYPE html>
2 <html lang="ko"> 2 <html lang="ko">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 - <title>Who Are You? - 하스스톤 멀리건 도우미</title> 7 + <title>HearthCompare - 하스스톤 도우미</title>
8 8
9 <!-- 부트스트랩 --> 9 <!-- 부트스트랩 -->
10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet"> 10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
23 type:'POST', 23 type:'POST',
24 url:'/logout', 24 url:'/logout',
25 success:function(result){ 25 success:function(result){
26 - alert('로그아웃 성공!') 26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 window.location.href='/' 27 window.location.href='/'
28 }, 28 },
29 error:function(result){ 29 error:function(result){
30 - alert('로그아웃 실패!') 30 + alert('로그아웃에 실패하였습니다.')
31 return false 31 return false
32 } 32 }
33 }) 33 })
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
36 let data=new Object() 36 let data=new Object()
37 let opponentClass=$('input[name="checkOpponent"]:checked').val() 37 let opponentClass=$('input[name="checkOpponent"]:checked').val()
38 data.opponentClass=opponentClass 38 data.opponentClass=opponentClass
39 - const stringData=JSON.stringify(data) 39 + const stringData = JSON.stringify(data)
40 - alert('잠시 기다리시겠습니까?') 40 + alert('')
41 $.ajax({ 41 $.ajax({
42 type:'POST', 42 type:'POST',
43 url:'/api/card/setopponentclass', 43 url:'/api/card/setopponentclass',
...@@ -47,10 +47,10 @@ ...@@ -47,10 +47,10 @@
47 traditional:true, 47 traditional:true,
48 processdata:false, 48 processdata:false,
49 success:function(){ 49 success:function(){
50 - window.location.href='/result' 50 + window.location.href='/deck_result'
51 }, 51 },
52 error:function(){ 52 error:function(){
53 - alert('상대 직업 선택 실패!') 53 + alert('내 직업 선택에 실패했습니다.')
54 return false 54 return false
55 } 55 }
56 }) 56 })
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 <span class="icon-bar"></span> 68 <span class="icon-bar"></span>
69 <span class="icon-bar"></span> 69 <span class="icon-bar"></span>
70 </button> 70 </button>
71 - <a class="navbar-brand" href="/">Who Are You?</a> 71 + <a class="navbar-brand" href="/">HearthCompare</a>
72 </div> 72 </div>
73 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;"> 73 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
74 <ul class="nav navbar-nav"> 74 <ul class="nav navbar-nav">
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 82
83 <div class="container show-grid" > 83 <div class="container show-grid" >
84 <div class="padding" style="width:100px"></div> 84 <div class="padding" style="width:100px"></div>
85 - <h3 class="form-signin-heading">상대편의 직업을 선택해 주세요</h3> 85 + <h3 class="form-signin-heading">내가 고른 투기장 직업을 선택해 주세요</h3>
86 <br> 86 <br>
87 <br> 87 <br>
88 <div class="row" style="text-align: center;"> 88 <div class="row" style="text-align: center;">
......
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">
7 + <title>HearthCompare - 하스스톤 도우미</title>
8 +
9 + <!-- 부트스트랩 -->
10 + <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css?ver=1" rel="stylesheet">
11 + <link href="../../static/main.css" rel="stylesheet">
12 + <!-- IE8 에서 HTML5 요소와 미디어 쿼리를 위한 HTML5 shim 와 Respond.js -->
13 + <!-- WARNING: Respond.js 는 당신이 file:// 을 통해 페이지를 볼 때는 동작하지 않습니다. -->
14 + <!--[if lt IE 9]>
15 + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
16 + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
17 + <![endif]-->
18 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
19 + <script>
20 + $(document).ready(function(){
21 + $('#logoutButton').click(function(){
22 + $.ajax({
23 + type:'POST',
24 + url:'/logout',
25 + success:function(result){
26 + alert('로그아웃에 성공하였습니다.\n로그인 화면으로 이동합니다.')
27 + window.location.href='/'
28 + },
29 + error:function(result){
30 + alert('로그아웃에 실패하였습니다.')
31 + return false
32 + }
33 + })
34 + })
35 + $('#submitButton').click(function(){
36 + let data=new Object()
37 + let opponentClass=$('input[name="checkOpponent"]:checked').val()
38 + data.opponentClass=opponentClass
39 + const stringData=JSON.stringify(data)
40 + alert('상대편 직업의 주요 덱을 가져오는 동안 잠시만 기다려주십시오.')
41 + $.ajax({
42 + type:'POST',
43 + url:'/api/card/setopponentclass',
44 + data:stringData,
45 + dataType:'JSON',
46 + contentType:'application/json; charset=utf-8',
47 + traditional:true,
48 + processdata:false,
49 + success:function(){
50 + window.location.href='/deck_result'
51 + },
52 + error:function(){
53 + alert('상대편 덱을 불러오는데 실패했습니다.')
54 + return false
55 + }
56 + })
57 + })
58 + })
59 + </script>
60 +</head>
61 +<body>
62 + <nav class="navbar-default navbar-fixed-top">
63 + <div class="container">
64 + <div class="navbar-header">
65 + <button class="navbar-toggle collapsed" aria-expanded="false" aria-controls="navbar" type="button" data-toggle="collapse" data-target="#navbar">
66 + <span class="sr-only">Toggle navigation</span>
67 + <span class="icon-bar"></span>
68 + <span class="icon-bar"></span>
69 + <span class="icon-bar"></span>
70 + </button>
71 + <a class="navbar-brand" href="/">HearthCompare</a>
72 + </div>
73 + <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
74 + <ul class="nav navbar-nav"></ul>
75 + <div class="navbar-right">
76 + <input type="button" class="btn navbar-btn" id="logoutButton" style="color:#000;" value="로그아웃" />
77 + </div>
78 + </div>
79 + </div>
80 + </nav>
81 +
82 + <div class="container show-grid">
83 + <div class="padding" style="width:100px"></div>
84 + <h3 class="form-signin-heading">상대편의 직업을 선택해주세요.</h3>
85 + <br>
86 + <br>
87 + <div class="row" style="text-align: center;">
88 + <div class="col-md-4">
89 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/c/c5/Garrosh_Hellscream%28635%29.png?version=1b614ad5340f67612d99542b05168969" style="width:200px;height:250px;" />
90 + <br>
91 + <input type="radio" name="checkOpponent" value="WARRIOR" />전사
92 + </div>
93 + <div class="col-md-4">
94 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/4/4b/Thrall%28319%29.png?version=d0a09d4b1a9973cf5d3853798915d1ac" style="width:200px;height:250px;" />
95 + <br>
96 + <input type="radio" name="checkOpponent" value="SHAMAN" />주술사
97 + </div>
98 + <div class="col-md-4">
99 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/a/a4/Valeera_Sanguinar%282%29.png?version=8e1f8248cfd10cd0780944f5adae3c88" style="width:200px;height:250px;" />
100 + <br>
101 + <input type="radio" name="checkOpponent" value="ROGUE" />도적
102 + </div>
103 + </div>
104 + <br>
105 + <br>
106 + <br>
107 + <div class="row" style="text-align: center;">
108 + <div class="col-md-4">
109 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/4/4d/Uther_Lightbringer%28257%29.png?version=6dfe616bf25bb33225417253ae47a6d8" style="width:200px;height:250px;" />
110 + <br>
111 + <input type="radio" name="checkOpponent" value="PALADIN" />성기사
112 + </div>
113 + <div class="col-md-4">
114 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/a/a0/Rexxar%28484%29.png?version=f018fc6e46b383cc12aefb4b51a66206" style="width:200px;height:250px;" />
115 + <br>
116 + <input type="radio" name="checkOpponent" value="HUNTER" />사냥꾼
117 + </div>
118 + <div class="col-md-4">
119 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/f/fa/Malfurion_Stormrage%28621%29.png?version=77c0505d00ce8f853911fe2926f85271" style="width:200px;height:250px;" />
120 + <br>
121 + <input type="radio" name="checkOpponent" value="DRUID" />드루이드
122 + </div>
123 + </div>
124 + <br>
125 + <br>
126 + <br>
127 + <div class="row" style="text-align: center;">
128 + <div class="col-md-4">
129 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/0/0a/Gul%27dan%28618%29.png?version=cdc516499d50f4887dc32d5a57674c2d" style="width:200px;height:250px;" />
130 + <br>
131 + <input type="radio" name="checkOpponent" value="WARLOCK" />흑마법사
132 + </div>
133 + <div class="col-md-4">
134 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/3/3c/Jaina_Proudmoore%28320%29.png?version=3b2fe59be9088a51fc77e579e4faa8ce" style="width:200px;height:250px;" />
135 + <br>
136 + <input type="radio" name="checkOpponent" value="MAGE" />마법사
137 + </div>
138 + <div class="col-md-4">
139 + <img src="https://gamepedia.cursecdn.com/hearthstone_gamepedia/8/80/Anduin_Wrynn%28110%29.png?version=0bac7e0db29ce55f333afe972a0afdb0" style="width:200px;height:250px;" />
140 + <br>
141 + <input type="radio" name="checkOpponent" value="PRIEST" />사제
142 + </div>
143 + </div>
144 + <br>
145 + <br>
146 + <div class="row">
147 + <div class="col-md-5"></div>
148 + <div class="col-md-2">
149 + <input class="btn btn-lg btn-primary btn-block" type="button" id="submitButton" value="확인" />
150 + </div>
151 + <div class="col-md-5"></div>
152 + </div>
153 + <div class="padding" style="width:100px"></div>
154 + </div>
155 +
156 + <!-- jQuery (부트스트랩의 자바스크립트 플러그인을 위해 필요합니다) -->
157 + <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
158 + <!-- 모든 컴파일된 플러그인을 포함합니다 (아래), 원하지 않는다면 필요한 각각의 파일을 포함하세요 -->
159 + <script src="../../static/bootstrap-3.3.2-dist/js/bootstrap.min.js"></script>
160 +</body>
161 +</html>
...\ No newline at end of file ...\ No newline at end of file
1 -<!DOCTYPE html> 1 +<!DOCTYPE html>
2 <html lang="ko"> 2 <html lang="ko">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 6 <meta name="viewport" content="width=device-width, initial-scale=1">
7 - <title>Who Are You? - 하스스톤 멀리건 도우미</title> 7 + <title>HearthCompare - 하스스톤 도우미</title>
8 8
9 <!-- 부트스트랩 --> 9 <!-- 부트스트랩 -->
10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css" rel="stylesheet"> 10 <link href="../../static/bootstrap-3.3.2-dist/css/bootstrap.min.css" rel="stylesheet">
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 $(document).ready(function(){ 20 $(document).ready(function(){
21 $('#signupButton').click(function(){ 21 $('#signupButton').click(function(){
22 if($('#password').val()!==$('#repeatPassword').val()) { 22 if($('#password').val()!==$('#repeatPassword').val()) {
23 - alert('두 비밀번호가 일치하지 않습니다!') 23 + alert('비밀번호와 확인란이 일치하지 않습니다.')
24 return false 24 return false
25 } 25 }
26 else{ 26 else{
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
37 traditional:true, 37 traditional:true,
38 processdata:false, 38 processdata:false,
39 success:function(result){ 39 success:function(result){
40 - alert('회원가입 성공!') 40 + alert('회원가입에 성공하였습니다.\n로그인 화면으로 이동합니다.')
41 window.location.href='/login' 41 window.location.href='/login'
42 }, 42 },
43 error:function(result){ 43 error:function(result){
44 - alert(`회원가입 실패!\nmessage:${result['message']}`) 44 + alert(`회원가입에 실패하였습니다.\nmessage:${result['message']}`)
45 return false 45 return false
46 } 46 }
47 }) 47 })
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 <span class="icon-bar"></span> 61 <span class="icon-bar"></span>
62 <span class="icon-bar"></span> 62 <span class="icon-bar"></span>
63 </button> 63 </button>
64 - <a class="navbar-brand" href="/">Who Are You?</a> 64 + <a class="navbar-brand" href="/">HearthCompare</a>
65 </div> 65 </div>
66 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;"> 66 <div class="navbar-collapse collapse" id="navbar" aria-expanded="false" style="height: 1px;">
67 <ul class="nav navbar-nav"> 67 <ul class="nav navbar-nav">
......