From d7f8fe5782c810c486d07bbdc304cd28e87a7b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Thu, 15 Nov 2018 13:04:21 +0900
Subject: [PATCH] Fix: html header, footer and maestro home button

---
 src/web/maestro/setup.html               |  1 +
 src/web/maestro/upgrade.html             |  1 +
 src/web/module/footer.html               |  2 +-
 src/web/module/header.html               | 10 ++++-
 src/web/module/maestro_header.html       | 18 +++++++--
 src/web/module/maestro_section_main.html | 12 +++---
 src/web/module/maestro_setup.html        | 50 ++++++++++++++++++++++--
 src/web/module/maestro_upgrade.html      | 47 ++++++++++++++++++++--
 8 files changed, 123 insertions(+), 18 deletions(-)

diff --git a/src/web/maestro/setup.html b/src/web/maestro/setup.html
index f830311..1023546 100644
--- a/src/web/maestro/setup.html
+++ b/src/web/maestro/setup.html
@@ -20,6 +20,7 @@
 
 	<script type="text/javascript" src="./../../../resources/jquery/jquery-3.3.1.min.js"></script>
 	<script type="text/javascript" src="./../js/main.js"></script>
+	<script type="text/javascript" src="./../js/lib/account_info.js"></script>
 	<script type="text/javascript" src="./../js/lib/account_validator.js"></script>
 	<script type="text/javascript" src="./../js/lib/maestro_info.js"></script>
 	<script type="text/javascript" src="./../js/request_server.js"></script>
diff --git a/src/web/maestro/upgrade.html b/src/web/maestro/upgrade.html
index 6a65889..f4c2646 100644
--- a/src/web/maestro/upgrade.html
+++ b/src/web/maestro/upgrade.html
@@ -20,6 +20,7 @@
 
 	<script type="text/javascript" src="./../../../resources/jquery/jquery-3.3.1.min.js"></script>
 	<script type="text/javascript" src="./../js/main.js"></script>
+	<script type="text/javascript" src="./../js/lib/account_info.js"></script>
 	<script type="text/javascript" src="./../js/lib/account_validator.js"></script>
 	<script type="text/javascript" src="./../js/lib/maestro_info.js"></script>
 	<script type="text/javascript" src="./../js/request_server.js"></script>
diff --git a/src/web/module/footer.html b/src/web/module/footer.html
index e319ac4..d80dae3 100644
--- a/src/web/module/footer.html
+++ b/src/web/module/footer.html
@@ -11,7 +11,7 @@
         </div>
 
         <div class="col-md-4 text-right my-auto">
-          <a class="btn btn-sm btn-primary px-4" href="./../main/faq.html">FAQ</a>
+          <a class="btn btn-lg btn-warning px-4" href="./../main/faq.html">FAQ</a>
         </div>
 
       </div>
diff --git a/src/web/module/header.html b/src/web/module/header.html
index 8cc605c..b6e62fc 100644
--- a/src/web/module/header.html
+++ b/src/web/module/header.html
@@ -2,11 +2,17 @@
 	<div class="container">
 
 		<div class="navbar-header">
-			<a class="navbar-brand" href="javascript:void(0);" onClick="goHome()" href="">[ chocomae.com ]</a>
+			<a class="btn btn-warning btn-lg" href="./../main/index.html">
+				초코마에 [홈]
+				<!-- <button type="button" class="btn btn-warning">chocomae.com</button> -->
+				<!-- <span class="h1 text-warning font-weight-bold">chocomae.com</span> -->
+			</a>
+
+			<!-- <a class="navbar-brand" href="javascript:void(0);" onClick="goHome()" href="">[ chocomae.com ]</a> -->
 		</div>
 
 		<div class="eyebrow ml-auto mt-0 d-md-flex align-items-center">
-			<a class="btn btn-outline-warning btn-lg mr-2" href="./../client/login.html" target="_blank">등록 학생 앱 실행</a>
+			<a class="btn btn-outline-warning btn-lg mr-2" href="./../client/login.html" target="_blank">등록 학생 로그인</a>
 			<a class="btn btn-primary btn-lg" href="./../main/login.html">마에스트로 로그인</a>
 		</div>
 
diff --git a/src/web/module/maestro_header.html b/src/web/module/maestro_header.html
index d82302d..4533834 100644
--- a/src/web/module/maestro_header.html
+++ b/src/web/module/maestro_header.html
@@ -57,17 +57,29 @@ function deleteMaestroAllRecords() {
 	<div class="container">
 
 		<div class="navbar-header text-white">
+			<a class="btn btn-warning btn-lg" href="javascript:void(0);" onClick="logout()">
+				초코마에 [홈]
+				<!-- <button type="button" class="btn btn-warning">chocomae.com</button> -->
+				<!-- <span class="h1 text-warning font-weight-bold">chocomae.com</span> -->
+			</a>
+<!--
+			<a class="btn btn-info btn-lg" href="javascript:void(0);" onClick="goHome()">
+				마에스트로 [홈]
+			</a>
+ -->
+<!--
 			<a class="navbar-brand" href="javascript:void(0);" onClick="logout()" href="">[ chocomae.com ]</a>
 			|&nbsp;&nbsp;
 			<a class="navbar-brand" href="javascript:void(0);" onClick="goHome()" href="">[ 마에스트로 ]</a>
+ -->
 		</div>
 
 		<div class="eyebrow ml-auto mt-0 d-md-flex align-items-center">
-			<a class="btn btn-outline-warning btn-lg mr-2" href="javascript:void(0);" onClick="runMaestroAccountApp()">마에스트로 앱 실행</a>
-			<a class="btn btn-danger btn-lg mr-2" href="javascript:void(0);" onClick="deleteMaestroAllRecords()">마에스트로 앱 초기화</a>
+			<a class="btn btn-danger btn-lg mr-2" href="javascript:void(0);" onClick="deleteMaestroAllRecords()">마에스트로 기록 초기화</a>
+			<a class="btn btn-outline-warning btn-lg mr-2" href="javascript:void(0);" onClick="runMaestroAccountApp()">앱 실행</a>
 			<a class="btn btn-primary btn-lg" href="javascript:void(0);" onClick="logout()">마에스트로 로그아웃</a>
 		</div>
-<!-- 
+<!--
 		<div class="collapse navbar-collapse" id="navbarsExampleDefault">
 			<ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
 
diff --git a/src/web/module/maestro_section_main.html b/src/web/module/maestro_section_main.html
index 595f327..3b06d07 100644
--- a/src/web/module/maestro_section_main.html
+++ b/src/web/module/maestro_section_main.html
@@ -149,8 +149,8 @@ function deactivateApp(appID) {
 </div>
 
 
-<div class="container">
-	<div class="row border border-primary rounded py-2 mx-1 my-2">
+<div class="container py-3">
+	<div class="row border border-primary rounded py-2 mx-0 mb-2">
 		<div id="maestro_info_id" class="col-sm pr-0 my-auto"></div>
 		<!-- <div id="maestro_url" class="col my-auto"></div> -->
 		<div id="maestro_count_down_date" class="col-sm-2 px-0 my-auto mx-1 text-center"></div>
@@ -194,19 +194,19 @@ function deactivateApp(appID) {
 
 	<div class="tab-content" id="myTabContent">
 
-		<div class="tab-pane fade show active my-3" id="add" role="tabpanel" aria-labelledby="add-tab">
+		<div class="tab-pane fade show active mt-3" id="add" role="tabpanel" aria-labelledby="add-tab">
 			<div id="section_add_player"></div>
 		</div>
 
-		<div class="tab-pane fade my-3" id="search" role="tabpanel" aria-labelledby="search-tab">
+		<div class="tab-pane fade mt-3" id="search" role="tabpanel" aria-labelledby="search-tab">
 			<div id="section_search_player"></div>
 		</div>
 
-		<div class="tab-pane fade my-3" id="mouse" role="tabpanel" aria-labelledby="mouse-tab">
+		<div class="tab-pane fade mt-3" id="mouse" role="tabpanel" aria-labelledby="mouse-tab">
 			<div id="mouse_app_list"></div>
 		</div>
 
-		<div class="tab-pane fade my-3" id="typing" role="tabpanel" aria-labelledby="typing-tab">
+		<div class="tab-pane fade mt-3" id="typing" role="tabpanel" aria-labelledby="typing-tab">
 			<div id="typing_app_list"></div>
 		</div>
 
diff --git a/src/web/module/maestro_setup.html b/src/web/module/maestro_setup.html
index 9aeb88d..c557f9a 100644
--- a/src/web/module/maestro_setup.html
+++ b/src/web/module/maestro_setup.html
@@ -28,7 +28,11 @@ function loadMaestroInfo(maestroID) {
 		"maestro_id=" + maestroID,
 
 		(function(jsonData) {
-			console.log(jsonData);
+			// console.log(jsonData);
+
+			showEndDate(jsonData.availableActivateDateTime);
+			showPlayerCount(jsonData.accountType, jsonData.playerCount);
+
 			registeredMaestroIDName = jsonData.name;
 			$("#maestro_id").val(registeredMaestroIDName);
 
@@ -45,6 +49,27 @@ function loadMaestroInfo(maestroID) {
 	);
 }
 
+function showEndDate(date) {
+	var endDateArray = date.split(" ");
+	var endDate = endDateArray[0];	// "YY-MM_DD"
+
+	var today = new Date();
+	var endDay = new Date(endDate);
+	var diffDay = (endDay.getTime() - today.getTime()) / (1000 * 60 * 60 * 24);
+
+	$("#maestro_count_down_date").html("~ " + endDate + "<br/>유효 기간 : " + Math.ceil(diffDay) + "일");
+	if(diffDay < 30)
+		$("#maestro_count_down_date").addClass("text-danger");
+	else if(diffDay < 10)
+		$("#maestro_count_down_date").addClass("bg-danger text-light");
+	else if(diffDay < 0)
+		$("#maestro_count_down_date").addClass("bg-secondary text-light");
+}
+
+function showPlayerCount(accountType, playerCount) {
+	$("#maestro_info_player_count").val("학생수 : " + playerCount + " / " + accountTypePlayerCount(accountType));
+}
+
 function onChangeMaestroIDName() {
 	isChangedIDName = true;
 	isAvailableIDName = false;
@@ -209,7 +234,26 @@ function changeMaestroPassword() {
 
 
 
-<div class="container my-3">
+<div class="container py-3">
+	<div class="row border border-primary rounded py-2 mx-0 mb-2">
+		<div id="maestro_info_id" class="col-sm pl-2 my-auto">
+			<a class="btn btn-primary" href="javascript:void(0);" onClick="goHome()">< 마에스트로 [홈]</a>
+		</div>
+		<div id="maestro_count_down_date" class="col-sm-2 px-0 my-auto mx-1 text-center"></div>
+
+		<div class="col-sm-5 px-0 d-md-flex align-items-center">
+			<div class="input-group my-auto">
+				<input type="text" id="maestro_info_player_count" class="form-control px-2 mx-0" value="학생수 :">
+				<div class="input-group-append">
+					<button class="btn btn-primary px-2 mr-2" type="button" onClick="location.href='./../maestro/upgrade.html';">업그레이드</a>
+				</div>
+			</div>
+
+			<a class="btn btn-primary px-2 mr-2 disabled" href="./../maestro/setup.html">계정 정보 수정</a>
+		</div>
+
+	</div>	<!-- row border -->
+
 
 	<div id="message_box">
 	</div>
@@ -248,7 +292,7 @@ function changeMaestroPassword() {
 
 
 
-	<div class="card border-primary my-3">
+	<div class="card border-primary mt-3">
 		<div class="card-header bg-light"><span class="h4">마에스트로 암호 변경</span></div>
 		<div class="card-body">
 
diff --git a/src/web/module/maestro_upgrade.html b/src/web/module/maestro_upgrade.html
index a0465b2..8d71026 100644
--- a/src/web/module/maestro_upgrade.html
+++ b/src/web/module/maestro_upgrade.html
@@ -15,6 +15,8 @@ function loadMaestroInfo(maestroID) {
 		(function(jsonData) {
 			// console.log(jsonData);
 			registeredAccountType = jsonData.accountType;
+			showEndDate(jsonData.availableActivateDateTime);
+			showPlayerCount(jsonData.accountType, jsonData.playerCount);
 			updateCards(registeredAccountType);
 		}),
 
@@ -25,6 +27,26 @@ function loadMaestroInfo(maestroID) {
 	);
 }
 
+function showEndDate(date) {
+	var endDateArray = date.split(" ");
+	var endDate = endDateArray[0];	// "YY-MM_DD"
+
+	var today = new Date();
+	var endDay = new Date(endDate);
+	var diffDay = (endDay.getTime() - today.getTime()) / (1000 * 60 * 60 * 24);
+
+	$("#maestro_count_down_date").html("~ " + endDate + "<br/>유효 기간 : " + Math.ceil(diffDay) + "일");
+	if(diffDay < 30)
+		$("#maestro_count_down_date").addClass("text-danger");
+	else if(diffDay < 10)
+		$("#maestro_count_down_date").addClass("bg-danger text-light");
+	else if(diffDay < 0)
+		$("#maestro_count_down_date").addClass("bg-secondary text-light");
+}
+
+function showPlayerCount(accountType, playerCount) {
+	$("#maestro_info_player_count").val("학생수 : " + playerCount + " / " + accountTypePlayerCount(accountType));
+}
 
 var CARD_TYPE_EXPERIENCE	= "experience";
 var CARD_TYPE_LOWER_PRICE	= "lower_price";
@@ -32,7 +54,7 @@ var CARD_TYPE_PRESENT_PRICE	= "present_price";
 var CARD_TYPE_UPPER_PRICE	= "upper_price";
 
 function updateCards(accountType) {
-	console.log(accountType);
+	// console.log(accountType);
 	switch(accountType) {
 		case 100:
 		case 101:
@@ -149,7 +171,26 @@ function upgradeMaestroInfo(accountType) {
 
 
 
-<div class="container my-3">
+<div class="container py-3">
+	<div class="row border border-primary rounded py-2 mx-0 mb-2">
+		<div id="maestro_info_id" class="col-sm pl-2 my-auto">
+			<a class="btn btn-primary" href="javascript:void(0);" onClick="goHome()">< 마에스트로 [홈]</a>
+		</div>
+		<div id="maestro_count_down_date" class="col-sm-2 px-0 my-auto mx-1 text-center"></div>
+
+		<div class="col-sm-5 px-0 d-md-flex align-items-center">
+			<div class="input-group my-auto">
+				<input type="text" id="maestro_info_player_count" class="form-control px-2 mx-0" value="학생수 :">
+				<div class="input-group-append">
+					<button class="btn btn-primary px-2 mr-2 disabled" type="button" onClick="location.href='./../maestro/upgrade.html';">업그레이드</a>
+				</div>
+			</div>
+
+			<a class="btn btn-primary px-2 mr-2" href="./../maestro/setup.html">계정 정보 수정</a>
+		</div>
+
+	</div>	<!-- row border -->
+
 
 	<div id="message_box">
 	</div>
@@ -227,7 +268,7 @@ function upgradeMaestroInfo(accountType) {
 	</div>
 
 
-	<div class="rounded px-5 py-4 my-3" style="background-color: #66ccff">
+	<div class="rounded px-5 py-4 mt-3" style="background-color: #66ccff">
 
 		<h4 class="mb-4">마에스트로 업그레이드 안내</h4>