jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: admin CSS -> BootStrap, expiration, send_email page

Browse Source
This commit is contained in:
Jisang Park
2018-09-16 19:03:04 +09:00
parent 0d324bab69
commit 14a3665a95
7 changed files with 146 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/admin/admin_expiration_list.html
+47 -10
View File
@@ -5,15 +5,13 @@
<title>마우스 타자 관리자 페이지</title>
<link rel="icon" href="/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="./../css/module.css">
<link rel="stylesheet" type="text/css" href="./../css/color_button.css">
<link href="../../../resources/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<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">
$(document).ready(function() {
$("#header").load("admin_header.html");
$("#section").load("admin_section.html");
});
</script>
</head>
@@ -22,16 +20,55 @@
<body bgcolor="white">
<div id="wrapper">
<header id="header">
</header>
<section id="section">
</section>
<header id="header"></header>
<div class="container mt-3">
<div class="row mx-1">
<h3 class="my-3">계정 유효기간 만료 목록</h3>
</div>
<div id="message_box"></div>
<div class="row mx-1">
<div class="col-4">
<h5 class="my-3">마에스트로 검색</h5>
<form class="mx-2">
<div class="form-group row">
<label for="search_name" class="col-sm-5 col-form-label">마에스트로 아이디</label>
<div class="col-sm-7">
<input type="text" class="form-control" id="search_name" placeholder="이름 입력">
<!-- <small class="form-text text-muted">1~8 글자 / [ 한글,영문,숫자,-,_ ]</small> -->
</div>
</div>
<div class="form-group row">
<div class="offset-sm-3 col-sm-9 mt-3">
<button type="button" class="col-sm-7 btn btn-primary btn-lg" onClick="searchMaestroUpgrade()">검색</button>
</div>
</div>
</form>
</div>
<div class="col-8 border border-warning rounded" style="background-color: #ffeab6">
<h5 class="my-3">검색 결과</h5>
<form id="search_player_list">
<div class="form-group row mx-2 mb-0 font-weight-bold">
<label class="col-form-label d-none">Upgrade ID</label>
<label class="col-form-label col-sm text-center">아이디</label>
<label class="col-form-label col-sm text-center">현재 계정</label>
<label class="col-form-label col-sm text-center">업그레이드</label>
<label class="col-form-label col-sm text-center">추가 금액</label>
<label class="col-form-label col-sm text-center">요청 날짜</label>
<label class="col-form-label col-sm-1 text-center"></label>
</div>
<div id="maestro_list_result_contents"></div>
</form>
</div> <!-- 학생 목록 -->
</div>
</div> <!-- container -->
</body>
src/web/admin/admin_header.html
+1 -1
View File
@@ -32,7 +32,7 @@
<div class="eyebrow ml-auto mt-0 d-md-flex align-items-center">
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_register_list.html">등록 목록</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_upgrade_list.html">업그레이드 목록</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_expiration_list.html">만료 예정</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_expiration_list.html">계정 만료 목록</a>
<a class="btn btn-primary btn-lg" href="./../admin/admin_send_email.html">이메일 발송</a>
</div>
src/web/admin/admin_register_list.html
+3 -1
View File
@@ -9,6 +9,8 @@
<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/request_server.js"></script>
<script type="text/javascript" src="./../../game/lib/number_util.js"></script>
<script type="text/javascript" src="./../js/lib/account_info.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$("#header").load("admin_header.html");
@@ -64,7 +66,7 @@
"<div class='form-group player-list row mx-2 mb-1'>"
+ " <input type='text' class='maestro_id d-none' value='" + jsonList[i].maestroID + "'>"
+ " <input type='text' class='col-sm' value='" + jsonList[i].maestroName + "'>"
+ " <input type='text' class='col-sm' value='" + jsonList[i].accountType + "'>"
+ " <input type='text' class='col-sm' value='" + accoutType(jsonList[i].accountType) + "'>"
+ " <input type='button' class='col-sm-1' value='+' onClick='register(this)'>"
+ " <input type='button' class='col-sm-1' disabled value='-'>"
+ "</div>"
src/web/admin/admin_send_email.html
+11 -10
View File
@@ -5,15 +5,13 @@
<title>마우스 타자 관리자 페이지</title>
<link rel="icon" href="/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="./../css/module.css">
<link rel="stylesheet" type="text/css" href="./../css/color_button.css">
<link href="../../../resources/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<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">
$(document).ready(function() {
$("#header").load("admin_header.html");
$("#section").load("admin_section.html");
});
</script>
</head>
@@ -22,16 +20,19 @@
<body bgcolor="white">
<div id="wrapper">
<header id="header">
</header>
<section id="section">
</section>
<header id="header"></header>
<div class="container mt-3">
<div class="row mx-1">
<h3 class="my-3">이메일 발송</h3>
</div>
<div id="message_box"></div>
</div> <!-- container -->
</body>
src/web/admin/admin_upgrade_list.html
+2 -86
View File
@@ -10,7 +10,8 @@
<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/request_server.js"></script>
<script type="text/javascript" src="./../js/lib/number_util.js"></script>
<script type="text/javascript" src="./../../game/lib/number_util.js"></script>
<script type="text/javascript" src="./../js/lib/account_info.js"></script>
<script type="text/javascript">
$(document).ready(function() {
@@ -71,91 +72,6 @@
}
}
function accoutType(accountType) {
switch(accountType) {
case 1:
return "20명, 1만원";
case 2:
return "50명, 2만원";
case 3:
return "100명, 3만원";
case 4:
return "500명, 4만원";
case 5:
return "1,000명, 5만원";
}
return accountType + "? (N/A)";
}
function accountTypePrice(accountType) {
switch(accountType) {
case 1:
return 10000;
case 2:
return 20000;
case 3:
return 30000;
case 4:
return 40000;
case 5:
return 50000;
}
return 0;
}
function accoutTypeValue(accountType) {
switch(accountType) {
case "20명, 1만원":
return 1;
case "50명, 2만원":
return 2;
case "100명, 3만원":
return 3;
case "500명, 4만원":
return 4;
case "1,000명, 5만원":
return 5;
}
return accountType + "? (N/A)";
}
function price(requestedAccountType, registeredAccountType) {
var priceRequested = accountTypePrice(requestedAccountType);
var priceRegistered = accountTypePrice(registeredAccountType);
return priceRequested - priceRegistered;
}
function status(status) {
switch(status) {
case 1:
return "요청";
case 2:
return "취소";
case 3:
return "업그레이드 적용";
}
return status + "? (N/A)";
}
function searchMaestroUpgrade() {
var maestroName = $("#search_name").val();
src/web/js/lib/account_info.js
+84
View File
@@ -0,0 +1,84 @@
function accoutType(accountType) {
switch(accountType) {
case 1:
return "20명 (1만원)";
case 2:
return "50명 (2만원)";
case 3:
return "100명 (3만원)";
case 4:
return "500명 (4만원)";
case 5:
return "1,000명 (5만원)";
}
return accountType + "? (N/A)";
}
function accountTypePrice(accountType) {
switch(accountType) {
case 1:
return 10000;
case 2:
return 20000;
case 3:
return 30000;
case 4:
return 40000;
case 5:
return 50000;
}
return 0;
}
function accoutTypeValue(accountType) {
switch(accountType) {
case "20명 (1만원)":
return 1;
case "50명 (2만원)":
return 2;
case "100명 (3만원)":
return 3;
case "500명 (4만원)":
return 4;
case "1,000명 (5만원)":
return 5;
}
return accountType + "? (N/A)";
}
function price(requestedAccountType, registeredAccountType) {
var priceRequested = accountTypePrice(requestedAccountType);
var priceRegistered = accountTypePrice(registeredAccountType);
return priceRequested - priceRegistered;
}
function status(status) {
switch(status) {
case 1:
return "요청";
case 2:
return "취소";
case 3:
return "업그레이드 적용";
}
return status + "? (N/A)";
}
src/web/js/lib/number_util.js
-24
View File
@@ -1,24 +0,0 @@
function NumberUtil() {
}
NumberUtil.numberWithCommas = function(x) {
return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
}
NumberUtil.numberOfDigits = function(number) {
if(number === 1000)
return 4;
return Math.floor(Math.log(number) / Math.LN10 + 1); // bug : 1000 -> expected 4 but 3
}
NumberUtil.getRecordText = function(value) {
var number = Math.floor(value);
var numberWithCommas = NumberUtil.numberWithCommas(number);
if(isTypingGame())
return numberWithCommas + " 타";
else
return numberWithCommas + " 점";
}