From 06fa539293aae326e0cf934afbdee395aa005d3a Mon Sep 17 00:00:00 2001 From: hide_d Date: Mon, 29 Nov 2021 01:00:52 +0900 Subject: [PATCH] =?UTF-8?q?feat(in-progress):=20=EC=BB=A4=EB=A7=A8?= =?UTF-8?q?=EB=93=9C=20=EB=AA=A9=EB=A1=9D=20UI/UX=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/func_template.php | 26 +-- hwe/scss/main.scss | 25 +-- hwe/scss/variables.scss | 4 + hwe/ts/ReservedCommand.vue | 314 ++++++++++++++++++++----------------- 4 files changed, 181 insertions(+), 188 deletions(-) create mode 100644 hwe/scss/variables.scss diff --git a/hwe/func_template.php b/hwe/func_template.php index 61fe96d2..53c92195 100644 --- a/hwe/func_template.php +++ b/hwe/func_template.php @@ -5,7 +5,7 @@ namespace sammo; /** * 템플릿 생성과 관련된 함수들을 모아두는 파일 - * + * * NOTE: 아직 converter와 명확한 구분이 되어있지 않음. * TODO: legacy template들을 전부 template 폴더로 모아둘 필요 있음 * TODO: side effect를 제거 @@ -13,7 +13,7 @@ namespace sammo; /** * 관리자 권한이 필요함을 출력. - * @return void + * @return void */ function requireAdminPermissionHTML() { @@ -41,28 +41,6 @@ function requireAdminPermissionHTML() return ob_get_clean(); } -function turnTable() -{ - - $turnList = []; - $turnList[] = ""; - foreach (Util::range(1, GameConst::$maxTurn) as $turnIdx) { - $turnText = $turnIdx + 1; - $turnList[] = ""; - } - - $turnText = join("\n", $turnList); - - return " - -"; -} - function chiefTurnTable() { $turnList = []; diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss index 420b599e..1f363801 100644 --- a/hwe/scss/main.scss +++ b/hwe/scss/main.scss @@ -101,6 +101,12 @@ body { grid-column-end: 3; grid-row-start: 1; grid-row-end: 4; + position:relative; + } + + .commandPad{ + position:absolute; + z-index: 99; } @@ -282,13 +288,6 @@ body { height: 18px; } -#generalTurnSelector { - width: 50px; - color: white; - background-color: black; - font-size: 13px; -} - #sidebar { position: fixed; right: 0; @@ -296,18 +295,6 @@ body { transform: translateY(-50%); } -.turn_pad { - white-space: nowrap; - font-weight: lighter; - max-width: 162px; - width: 162px; - -} - -.turn_pad .turn_text { - display: inline-block; -} - /*임시용 */ #container { diff --git a/hwe/scss/variables.scss b/hwe/scss/variables.scss new file mode 100644 index 00000000..e1aa56e0 --- /dev/null +++ b/hwe/scss/variables.scss @@ -0,0 +1,4 @@ + +//TODO:혹시나 몰라서, 나중에 실제로 수정 +$bg1color: #141c65aa; +$bg2color: #225500aa; diff --git a/hwe/ts/ReservedCommand.vue b/hwe/ts/ReservedCommand.vue index 9b65415b..0fd3ef0b 100644 --- a/hwe/ts/ReservedCommand.vue +++ b/hwe/ts/ReservedCommand.vue @@ -1,82 +1,45 @@ @@ -274,8 +241,8 @@ export default defineComponent({ methods: { updateNow() { - const clientNow = addMilliseconds(new Date(), this.timeDiff); - this.serverNow = formatTime(clientNow, false); + const serverNow = addMilliseconds(new Date(), this.timeDiff); + this.serverNow = formatTime(serverNow, "HH:mm:ss"); setTimeout(() => { this.updateNow(); }, 250); @@ -468,7 +435,7 @@ export default defineComponent({ viewMaxTurn: 18, maxPushTurn, commandList, - serverNow, + serverNow: formatTime(serverNowObj, "HH:mm:ss"), timeDiff, pressed, selectedCommand, @@ -480,4 +447,61 @@ export default defineComponent({ void this.reloadCommandList(); }, }); - \ No newline at end of file + + \ No newline at end of file