From 2012bbdbc1a11c2746b5471d71d5f595c39fd9c5 Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 10 Sep 2021 18:43:29 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20browser=20support=20=EB=B2=94?= =?UTF-8?q?=EC=9C=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ed0069d1..f5626f79 100644 --- a/package.json +++ b/package.json @@ -84,8 +84,10 @@ "lint" ], "browserslist": [ + "last 3 versions", "> 0.4%", - "not ie <= 11", - "not op_mini all" + "not dead", + "not op_mini all", + "not ie <= 11" ] -} +} \ No newline at end of file From 4e642fe3d31a8544d214693f277f098cd6fd92bd Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 10 Sep 2021 21:05:26 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=EB=82=B4=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80=20=EB=B6=88=EB=9F=AC?= =?UTF-8?q?=EC=98=A4=EA=B8=B0=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/myPage.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hwe/ts/myPage.ts b/hwe/ts/myPage.ts index bc0dc914..055af084 100644 --- a/hwe/ts/myPage.ts +++ b/hwe/ts/myPage.ts @@ -9,7 +9,7 @@ import { unwrap_any } from './util/unwrap_any'; type LogResponse = { result: true; - log: Record; + log: Record; }; $(function ($) { @@ -92,10 +92,11 @@ $(function ($) { } const html: string[] = []; - for (const [key, item] of Object.entries(result.log)) { + for (const key of Object.values(keys)) { if ($(`#log_${logType}_${key}`).length) { return true; } + const item = result.log[key]; html.push(`
${item}
`); } $(`#${logType}Plate`).append(html.join('')); From 826d9fcf6a871c25ff6b5b67542d5d991bfde51b Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 10 Sep 2021 21:38:32 +0900 Subject: [PATCH 3/5] fix: gateway tooltip --- hwe/ts/gateway/entrance.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hwe/ts/gateway/entrance.ts b/hwe/ts/gateway/entrance.ts index 6aa9f7da..d52a5671 100644 --- a/hwe/ts/gateway/entrance.ts +++ b/hwe/ts/gateway/entrance.ts @@ -1,11 +1,15 @@ import axios from 'axios'; import $ from 'jquery'; +import Popper from 'popper.js'; +exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? +import 'bootstrap'; import { initTooltip } from '../common_legacy'; import { TemplateEngine } from "../util/TemplateEngine"; import { InvalidResponse } from '../defs'; import { getDateTimeNow } from '../util/getDateTimeNow'; import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest'; import { loadPlugin as loadAdminPlugin } from './admin_server'; +import { exportWindow } from '../util/exportWindow'; declare const isAdmin: boolean; From 6315dff17b92e67b8d27a2f74c00c4edefaedec2 Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 10 Sep 2021 22:26:14 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20bootstrap4=20package=20order=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20-=20vue3=20+=20bootstrap5=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=EC=A0=84=EA=B9=8C=EC=A7=84=20=EA=B3=A0=ED=86=B5=20?= =?UTF-8?q?=EB=B0=9B=EC=95=84=EC=95=BC...=20-=20=EB=8B=B9=EB=B6=84?= =?UTF-8?q?=EA=B0=84=20Popper,=20jQuery=EA=B0=80=20=EC=A0=9C=EB=8C=80?= =?UTF-8?q?=EB=A1=9C=20export=20=EB=90=98=EC=97=88=EB=8A=94=EC=A7=80=20?= =?UTF-8?q?=ED=99=95=EC=9D=B8=20=ED=95=84=EC=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/battle_simulator.ts | 2 +- hwe/ts/bossInfo.ts | 2 +- hwe/ts/build_exports.json | 4 ++-- hwe/ts/common_deprecated.ts | 2 +- hwe/ts/gateway/admin_member.ts | 2 ++ hwe/ts/gateway/admin_server.ts | 17 ++++++----------- hwe/ts/gateway/common_deprecated.ts | 1 - hwe/ts/gateway/entrance.ts | 6 ++++-- i_entrance/entrance.php | 6 +++--- webpack.config.cjs | 1 - 10 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 hwe/ts/gateway/common_deprecated.ts diff --git a/hwe/ts/battle_simulator.ts b/hwe/ts/battle_simulator.ts index f9958772..29c06159 100644 --- a/hwe/ts/battle_simulator.ts +++ b/hwe/ts/battle_simulator.ts @@ -1,3 +1,4 @@ +import { exportWindow } from './util/exportWindow'; import $ from 'jquery'; import Popper from 'popper.js'; exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? @@ -10,7 +11,6 @@ import { numberWithCommas } from "./util/numberWithCommas"; import { unwrap_any } from './util/unwrap_any'; import { BasicGeneralListResponse, InvalidResponse } from './defs'; import { formatTime } from './util/formatTime'; -import { exportWindow } from './util/exportWindow'; type CityAttackerInfo = { level: number, diff --git a/hwe/ts/bossInfo.ts b/hwe/ts/bossInfo.ts index 034b25f2..58c5d8aa 100644 --- a/hwe/ts/bossInfo.ts +++ b/hwe/ts/bossInfo.ts @@ -1,10 +1,10 @@ +import { exportWindow } from './util/exportWindow'; import $ from 'jquery'; import axios from 'axios'; import { convertFormData } from './util/convertFormData'; import { InvalidResponse } from './defs'; import { unwrap_any } from './util/unwrap_any'; import { setAxiosXMLHttpRequest } from './util/setAxiosXMLHttpRequest'; -import { exportWindow } from './util/exportWindow'; import Popper from 'popper.js'; exportWindow(Popper, 'Popper'); import 'bootstrap'; diff --git a/hwe/ts/build_exports.json b/hwe/ts/build_exports.json index cb6e28be..bab37e61 100644 --- a/hwe/ts/build_exports.json +++ b/hwe/ts/build_exports.json @@ -1,7 +1,6 @@ { "ingame": { "chiefCenter": "chiefCenter.ts", - "common": "common_deprecated.ts", "troop": "troop.ts", "map": "map.ts", "install_db": "install_db.ts", @@ -22,7 +21,8 @@ "history": "history.ts", "join": "join.ts", "select_general_from_pool": "select_general_from_pool.ts", - "extKingdoms": "extKingdoms.ts" + "extKingdoms": "extKingdoms.ts", + "common": "common_deprecated.ts" }, "ingame_vue": { "v_inheritPoint": "v_inheritPoint.ts", diff --git a/hwe/ts/common_deprecated.ts b/hwe/ts/common_deprecated.ts index bf98d673..a9d5a502 100644 --- a/hwe/ts/common_deprecated.ts +++ b/hwe/ts/common_deprecated.ts @@ -1,10 +1,10 @@ +import { exportWindow } from "./util/exportWindow"; import { activateFlip, isBrightColor, getIconPath, errUnknown, errUnknownToast, quickReject, initTooltip } from "./common_legacy"; import { mb_strwidth } from "./util/mb_strwidth"; import { TemplateEngine } from "./util/TemplateEngine"; import { escapeHtml } from "./legacy/escapeHtml"; import { nl2br } from "./util/nl2br"; import jQuery from "jquery"; -import { exportWindow } from "./util/exportWindow"; import Popper from 'popper.js'; exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? import 'bootstrap'; diff --git a/hwe/ts/gateway/admin_member.ts b/hwe/ts/gateway/admin_member.ts index ba74ecf4..bb5847ce 100644 --- a/hwe/ts/gateway/admin_member.ts +++ b/hwe/ts/gateway/admin_member.ts @@ -1,5 +1,7 @@ import axios from 'axios'; import $ from 'jquery'; +import Popper from 'popper.js'; +exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? import { isNumber } from 'lodash'; import { TemplateEngine } from '../util/TemplateEngine'; import { InvalidResponse } from '../defs'; diff --git a/hwe/ts/gateway/admin_server.ts b/hwe/ts/gateway/admin_server.ts index ff9a2514..2494ad0f 100644 --- a/hwe/ts/gateway/admin_server.ts +++ b/hwe/ts/gateway/admin_server.ts @@ -1,5 +1,4 @@ - -import $ from 'jquery'; +import { exportWindow } from '../util/exportWindow'; import axios from 'axios'; import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest'; import { InvalidResponse } from '../defs'; @@ -65,10 +64,6 @@ const serverAdminTemplate = '\ declare global { interface Window { - modifyServerStatus: (caller: HTMLElement, action: string) => void; - Entrance_AdminClosedLogin: (caller: HTMLElement) => void; - Entrance_AdminOpen119: (caller: HTMLElement) => void; - serverUpdate: (caller: HTMLElement) => void; adminGrade: number; aclList: Record; } @@ -218,11 +213,6 @@ export async function loadPlugin(): Promise { Entrance_AdminInit(); - window.modifyServerStatus = modifyServerStatus; - window.Entrance_AdminClosedLogin = Entrance_AdminClosedLogin; - window.Entrance_AdminOpen119 = Entrance_AdminOpen119; - window.serverUpdate = serverUpdate; - const response = await axios({ url: 'j_server_get_admin_status.php', method: 'post', @@ -330,3 +320,8 @@ function Entrance_AdminOpen119(caller: HTMLElement) { const serverDir = $caller.parents('tr').data('server_name'); location.href = `../${serverDir}/_119.php`; } + +exportWindow(modifyServerStatus, 'modifyServerStatus'); +exportWindow(Entrance_AdminClosedLogin, 'Entrance_AdminClosedLogin'); +exportWindow(Entrance_AdminOpen119, 'Entrance_AdminOpen119'); +exportWindow(serverUpdate, 'serverUpdate'); \ No newline at end of file diff --git a/hwe/ts/gateway/common_deprecated.ts b/hwe/ts/gateway/common_deprecated.ts deleted file mode 100644 index 91cef818..00000000 --- a/hwe/ts/gateway/common_deprecated.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '../common_deprecated'; \ No newline at end of file diff --git a/hwe/ts/gateway/entrance.ts b/hwe/ts/gateway/entrance.ts index d52a5671..ebec76cd 100644 --- a/hwe/ts/gateway/entrance.ts +++ b/hwe/ts/gateway/entrance.ts @@ -1,7 +1,9 @@ -import axios from 'axios'; +import { exportWindow } from '../util/exportWindow'; import $ from 'jquery'; +exportWindow($, '$'); import Popper from 'popper.js'; exportWindow(Popper, 'Popper');//XXX: 왜 popper를 이렇게 불러야 하는가? +import axios from 'axios'; import 'bootstrap'; import { initTooltip } from '../common_legacy'; import { TemplateEngine } from "../util/TemplateEngine"; @@ -9,7 +11,7 @@ import { InvalidResponse } from '../defs'; import { getDateTimeNow } from '../util/getDateTimeNow'; import { setAxiosXMLHttpRequest } from '../util/setAxiosXMLHttpRequest'; import { loadPlugin as loadAdminPlugin } from './admin_server'; -import { exportWindow } from '../util/exportWindow'; + declare const isAdmin: boolean; diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php index ce27db18..8744aca5 100644 --- a/i_entrance/entrance.php +++ b/i_entrance/entrance.php @@ -34,9 +34,9 @@ $acl = $session->acl; - - - + + + diff --git a/webpack.config.cjs b/webpack.config.cjs index 22c1eeab..48a6b356 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -247,7 +247,6 @@ module.exports = (env, argv) => { }, mode, entry: { - common: `${tsDir}/gateway/common_deprecated.ts`, entrance: `${tsDir}/gateway/entrance.ts`, user_info: `${tsDir}/gateway/user_info.ts`, admin_member: `${tsDir}/gateway/admin_member.ts`, From e816f7126d7157a66bf2c05268d42c6175fb4b8e Mon Sep 17 00:00:00 2001 From: hide_d Date: Fri, 10 Sep 2021 22:49:30 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EA=B0=80=EC=98=A4=ED=94=88=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=95=88=EB=82=98=EC=98=A4=EB=8A=94=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/ts/gateway/entrance.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hwe/ts/gateway/entrance.ts b/hwe/ts/gateway/entrance.ts index ebec76cd..c8e6c32b 100644 --- a/hwe/ts/gateway/entrance.ts +++ b/hwe/ts/gateway/entrance.ts @@ -242,6 +242,14 @@ async function Entrance_drawServerList(serverInfos: ServerResponseItem[]) { continue; } + if(response.reserved){ + $serverHtml.find('.server_down').detach(); + $serverHtml.append( + TemplateEngine(serverReservedTemplate, response.reserved) + ); + initTooltip($serverHtml); + } + if(!response.game){ continue; }