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

Fix: html bugs

Browse Source
This commit is contained in:
Jisang Park
2018-12-16 00:23:26 +09:00
parent 9125e035b6
commit 75e73c82c1
9 changed files with 95 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/license_timer/loading.js
+1 -1
View File
@@ -8,7 +8,7 @@ var Loading = {
// var userID = sessionStorage.getItem("UserID"); // var userID = sessionStorage.getItem("UserID");
// console.log("userID : " + userID); // console.log("userID : " + userID);
// game.stage.backgroundColor = '#4d4d4d'; game.stage.backgroundColor = '#4d4d4d';
// // Progress report // // Progress report
// this.textProgress = game.add.text(game.world.centerX, 100, '로딩중 . . .', textStyleBasic); // this.textProgress = game.add.text(game.world.centerX, 100, '로딩중 . . .', textStyleBasic);
src/game/menu/main_menu_app.js
+1 -1
View File
@@ -1,7 +1,7 @@
///////////////////////////// /////////////////////////////
// Main game // Main game
var CONTENT_ID = "Menu"; var CONTENT_ID = "MenuApp";
var game = new Phaser.Game( var game = new Phaser.Game(
GAME_SCREEN_SIZE.x, GAME_SCREEN_SIZE.y, GAME_SCREEN_SIZE.x, GAME_SCREEN_SIZE.y,
src/game/menu/main_menu_typing_practice.js
+1 -1
View File
@@ -1,7 +1,7 @@
///////////////////////////// /////////////////////////////
// Main game // Main game
var CONTENT_ID = "Menu"; var CONTENT_ID = "MenuApp";
var game = new Phaser.Game( var game = new Phaser.Game(
GAME_SCREEN_SIZE.x, GAME_SCREEN_SIZE.y, GAME_SCREEN_SIZE.x, GAME_SCREEN_SIZE.y,
src/game/menu/main_menu_typing_test.js
+1 -1
View File
@@ -1,7 +1,7 @@
///////////////////////////// /////////////////////////////
// Main game // Main game
var CONTENT_ID = "Menu"; var CONTENT_ID = "MenuApp";
var game = new Phaser.Game( var game = new Phaser.Game(
GAME_SCREEN_SIZE.x, GAME_SCREEN_SIZE.y, GAME_SCREEN_SIZE.x, GAME_SCREEN_SIZE.y,
src/web/client/result.html
+1 -1
View File
@@ -59,7 +59,7 @@
</head> </head>
<body> <body>
<div id="Start" style="text-align:center;"></div> <div id="Result" style="text-align:center;"></div>
<div style="margin-top: 20px; text-align:center;"> <div style="margin-top: 20px; text-align:center;">
앱이 실행되지 않으면, 브라우저의 새로 고침 버튼( <span class="oi oi-reload" title="icon reload" aria-hidden="true"></span> , 단축키 : Ctrl + R)을 눌러주세요. 앱이 실행되지 않으면, 브라우저의 새로 고침 버튼( <span class="oi oi-reload" title="icon reload" aria-hidden="true"></span> , 단축키 : Ctrl + R)을 눌러주세요.
</div> </div>
src/web/client/typing_practice.html
+1 -1
View File
@@ -112,7 +112,7 @@
</head> </head>
<body> <body>
<div id="Typing Test" style="text-align:center;"></div> <div id="Typing Practice" style="text-align:center;"></div>
<div style="margin-top: 20px; text-align:center;"> <div style="margin-top: 20px; text-align:center;">
앱이 실행되지 않으면, 브라우저의 새로 고침 버튼( <span class="oi oi-reload" title="icon reload" aria-hidden="true"></span> , 단축키 : Ctrl + R)을 눌러주세요. 앱이 실행되지 않으면, 브라우저의 새로 고침 버튼( <span class="oi oi-reload" title="icon reload" aria-hidden="true"></span> , 단축키 : Ctrl + R)을 눌러주세요.
</div> </div>
src/web/js/lib/account_validator.js
+30 -2
View File
@@ -4,9 +4,12 @@ function AccountValidator() {
this.patternPlayerID = /^[A-Za-z0-9가-힣-_]{1,8}$/; this.patternPlayerID = /^[A-Za-z0-9가-힣-_]{1,8}$/;
this.patternPlayerPW = /^[0-9]{2,8}$/; this.patternPlayerPW = /^[0-9]{2,8}$/;
this.patternLicenseTimerPW = /^[0-9]{2,8}$/;
} }
// maestro
// maestro ID
AccountValidator.prototype.isValidMaestroID = function(textID) { AccountValidator.prototype.isValidMaestroID = function(textID) {
if(!this.patternMaestroID.test(textID)) if(!this.patternMaestroID.test(textID))
return false; return false;
@@ -26,6 +29,7 @@ AccountValidator.prototype.messageForInvalidMaestroID = function(textID) {
} }
// maestro password
AccountValidator.prototype.isValidMaestroPW = function(textPW) { AccountValidator.prototype.isValidMaestroPW = function(textPW) {
if(!this.patternMaestroPW.test(textPW)) if(!this.patternMaestroPW.test(textPW))
return false; return false;
@@ -46,7 +50,7 @@ AccountValidator.prototype.messageForInvalidMaestroPW = function(textPW) {
} }
// player // player ID
AccountValidator.prototype.isValidPlayerID = function(textID) { AccountValidator.prototype.isValidPlayerID = function(textID) {
if(!this.patternPlayerID.test(textID)) if(!this.patternPlayerID.test(textID))
return false; return false;
@@ -64,6 +68,7 @@ AccountValidator.prototype.messageForInvalidPlayerID = function(textID) {
} }
// player password
AccountValidator.prototype.isValidPlayerPW = function(textPW) { AccountValidator.prototype.isValidPlayerPW = function(textPW) {
if(!this.patternPlayerPW.test(textPW)) if(!this.patternPlayerPW.test(textPW))
return false; return false;
@@ -81,6 +86,26 @@ AccountValidator.prototype.messageForInvalidPlayerPW = function(textPW) {
} }
// license timer maestro password
AccountValidator.prototype.isValidLicenseTimerPassword = function(textID) {
if(!this.patternLicenseTimerPW.test(textID))
return false;
return true;
}
AccountValidator.prototype.messageForInvalidLicenseTimerPassword = function(textID) {
if(textID.length < AccountValidator.LICENSE_TIMER_PW_LENGTH_MINIMUM)
return "자격증 타이머의 비밀번호는 " + AccountValidator.LICENSE_TIMER_PW_LENGTH_MINIMUM + "글자 이상이어야 합니다.";
else if(textID.length > AccountValidator.LICENSE_TIMER_PW_LENGTH_MAXIMUM)
return "자격증 타이머의 비밀번호는 " + AccountValidator.LICENSE_TIMER_PW_LENGTH_MAXIMUM + "글자 이하이어야 합니다.";
else
return "자격증 타이머의 비밀번호는 2~8자리 숫자로 입력해 주세요.";
}
AccountValidator.MAESTRO_ID_LENGTH_MINIMUM = 4; AccountValidator.MAESTRO_ID_LENGTH_MINIMUM = 4;
AccountValidator.MAESTRO_ID_LENGTH_MAXIMUM = 20; AccountValidator.MAESTRO_ID_LENGTH_MAXIMUM = 20;
@@ -93,3 +118,6 @@ AccountValidator.PLAYER_ID_LENGTH_MAXIMUM = 8;
AccountValidator.PLAYER_PW_LENGTH_MINIMUM = 2; AccountValidator.PLAYER_PW_LENGTH_MINIMUM = 2;
AccountValidator.PLAYER_PW_LENGTH_MAXIMUM = 8; AccountValidator.PLAYER_PW_LENGTH_MAXIMUM = 8;
AccountValidator.LICENSE_TIMER_PW_LENGTH_MINIMUM = 2;
AccountValidator.LICENSE_TIMER_PW_LENGTH_MAXIMUM = 8;
src/web/module/maestro_section_timer.html
+57 -11
View File
@@ -2,28 +2,74 @@
$(document).ready(function() { $(document).ready(function() {
// load maestro timer password and show it
$("#timer_short_url").html( $("#timer_short_url").html(
"<span class='text-secondary'>자격증 타이머 앱 <span class='font-weight-bold'>바로 실행 URL</span> :</span><br/>" "<span class='text-secondary'>자격증 타이머 앱 <span class='font-weight-bold'>바로 실행 URL</span> :</span><br/>"
+ "http://www.chocomae.com/timer/" + maestroInfo.maestroName + "http://www.chocomae.com/timer/" + maestroInfo.maestroName
); );
$("#entercode").keydown(function(key) {
if(key.keyCode == 13) {
editPassword();
}
});
// load maestro timer password and show it
sendRequestServer( //url, sendParams, onSuccess, onFail, isDebugMode);
"./../server/license_timer/get_license_maestro_password.php",
"MaestroID=" + maestroID,
(function(jsonData) {
// showErrorMessage(playerName + " : 학생 데이터가 추가되었습니다", "success");
$("#password").val(jsonData.maestroPassword);
}),
(function(errorMessage, errorCode) {
showErrorMessage(errorMessage, "error");
})
);
}); });
function editPassword() {
var password = $("#password").val();
function onErrorPlayerName(message) { if(password.length === 0) {
showErrorMessage(message, "error"); onErrorPassword("자격증 타이머의 비밀번호를 입력하세요.");
return;
}
$("#player_name").select(); if(!accountValidator.isValidLicenseTimerPassword(password)) {
$("#player_name").focus(); // console.log("Error - playerName : " + playerName);
onErrorPassword(accountValidator.messageForInvalidLicenseTimerPassword(password));
return;
}
sendRequestServer( //url, sendParams, onSuccess, onFail, isDebugMode);
"./../server/license_timer/update_license_maestro_password.php",
"MaestroID=" + maestroID + "&Password=" + password,
(function(jsonData) {
console.log(jsonData);
showErrorMessage("자격증 타이머 비밀번호가 " + jsonData.maestroPassword + "로 변경되었습니다", "success");
addPlayerListManager.updateAddPlayerListPage(1);
onChangePlayerCount();
}),
(function(errorMessage, errorCode) {
showErrorMessage(errorMessage, "error");
})
);
} }
function onErrorPlayerPW(message) { function onErrorPassword(message) {
showErrorMessage(message, "error"); showErrorMessage(message, "error");
$("#entercode").select(); $("#password").select();
$("#entercode").focus(); $("#password").focus();
} }
@@ -55,9 +101,9 @@ function onErrorPlayerPW(message) {
<form class="mx-2"> <form class="mx-2">
<div class="form-group row"> <div class="form-group row">
<label for="player_name" class="col-sm-3 col-form-label">비밀번호</label> <label for="password" class="col-sm-3 col-form-label">비밀번호</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" class="form-control col-sm-9" id="player_name" placeholder="새로운 비밀번호 입력"> <input type="text" class="form-control col-sm-9" id="password" placeholder="새로운 비밀번호 입력">
<small class="form-text text-muted">2~8자리의 숫자</small> <small class="form-text text-muted">2~8자리의 숫자</small>
<button type="button" class="col-sm-7 btn btn-primary btn-lg mt-3" onClick="editPassword()">수정</button> <button type="button" class="col-sm-7 btn btn-primary btn-lg mt-3" onClick="editPassword()">수정</button>
</div> </div>
src/web/server/license_timer/update_license_maestro_password.php
+1
View File
@@ -12,6 +12,7 @@ include "./../setup/connect_db.php";
update_maestro_password($maestro_id, $password); update_maestro_password($maestro_id, $password);
set_data("maestroPassword", $password);
send_result_success(); send_result_success();
exit; exit;