XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet

SpaceNinjaServer

A simple server for a small space ninja game

公开
关注 0 Fork 1 Star 0
返回提交历史

XFEstudio/SpaceNinjaServer

chore(webui): rename "admin" to "users" & update paths (#4048)

Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/4048 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

0d9beb5f
Sainan <63328889+Sainan@users.noreply.github.com>
提交于

代码差异

10 个文件 +22 -25
Modified src/routes/webui.ts +4 -0
@@ -37,11 +37,15 @@ const virtualRouteController: RequestHandler = async (_req, res) => {
37 37 };
38 38 webuiRouter.get("/webui/", virtualRouteController); // can be handled by express.static, but would not check webui.enabled config.
39 39 webuiRouter.get("/webui/inventory", virtualRouteController);
40 webuiRouter.get("/webui/details", virtualRouteController);
40 41 webuiRouter.get("/webui/detailedView", virtualRouteController);
41 42 webuiRouter.get("/webui/mods", virtualRouteController);
42 43 webuiRouter.get("/webui/cheats", virtualRouteController);
44 webuiRouter.get("/webui/settings", virtualRouteController);
43 45 webuiRouter.get("/webui/import", virtualRouteController);
46 webuiRouter.get("/webui/clan", virtualRouteController);
44 47 webuiRouter.get("/webui/guildView", virtualRouteController);
48 webuiRouter.get("/webui/users", virtualRouteController);
45 49 webuiRouter.get("/webui/admin", virtualRouteController);
46 50
47 51 // Serve static files
Modified static/webui/index.html +6 -6
@@ -71,10 +71,10 @@
71 71 <a class="nav-link" href="/webui/import" data-bs-dismiss="offcanvas" data-bs-target="#sidebar" data-loc="navbar_import"></a>
72 72 </li>
73 73 <li class="nav-item">
74 <a class="nav-link" href="/webui/guildView" data-bs-dismiss="offcanvas" data-bs-target="#sidebar" data-loc="navbar_guildView"></a>
74 <a class="nav-link" href="/webui/clan" data-bs-dismiss="offcanvas" data-bs-target="#sidebar" data-loc="navbar_guildView"></a>
75 75 </li>
76 76 <li class="nav-item">
77 <a class="nav-link" href="/webui/admin" data-bs-dismiss="offcanvas" data-bs-target="#sidebar" data-loc="navbar_admin"></a>
77 <a class="nav-link" href="/webui/users" data-bs-dismiss="offcanvas" data-bs-target="#sidebar" data-loc="admin_users"></a>
78 78 </li>
79 79 </ul>
80 80 </div>
@@ -572,7 +572,7 @@
572 572 </div>
573 573 </div>
574 574 </div>
575 <div id="guild-route" data-route="/webui/guildView" data-title-tag="navbar_guildView">
575 <div id="guild-route" data-route="/webui/clan, /webui/guildView" data-title-tag="navbar_guildView">
576 576 <h3 id="guildView-loading" data-loc="general_loading"></h3>
577 577 <h3 id="guildView-na" class="d-none" data-loc="guildView_na"></h3>
578 578 <h5 id="guildView-naDescription" class="d-none" data-loc="guildView_naDescription"></h5>
@@ -732,7 +732,7 @@
732 732 </div>
733 733 </div>
734 734 </div>
735 <div id="detailedView-route" data-route="/webui/detailedView" data-title-tag="navbar_inventory">
735 <div id="detailedView-route" data-route="/webui/details, /webui/detailedView" data-title-tag="navbar_inventory">
736 736 <h3 id="detailedView-loading" class="mb-0" data-loc="general_loading"></h3>
737 737 <h3 id="detailedView-title" class="mb-0"></h3>
738 738 <p class="text-body-secondary"></p>
@@ -923,7 +923,7 @@
923 923 </div>
924 924 </div>
925 925 </div>
926 <div data-route="/webui/cheats" data-title-tag="navbar_cheats">
926 <div data-route="/webui/cheats, /webui/settings" data-title-tag="navbar_cheats">
927 927 <div class="row g-3">
928 928 <div class="col-md-6">
929 929 <div class="card">
@@ -1718,7 +1718,7 @@
1718 1718 <li><a href="#" onclick="event.preventDefault();setImportSample('eidolonLocPins');" data-loc="import_samples_eidolonLocPins"></a></li>
1719 1719 </ul>
1720 1720 </div>
1721 <div data-route="/webui/admin" data-title-tag="navbar_admin">
1721 <div data-route="/webui/users, /webui/admin" data-title-tag="admin_users">
1722 1722 <div class="d-none admin-hide">
1723 1723 <p class="card-text" data-loc="cheats_administratorRequirement"></p>
1724 1724 </div>
Modified static/webui/script.js +12 -12
@@ -111,7 +111,7 @@ function openWebSocket() {
111 111 auth_pending = false;
112 112 if (localStorage.getItem("possessing")) {
113 113 localStorage.removeItem("possessing");
114 doAccountSwitch("/webui/admin");
114 doAccountSwitch("/webui/users");
115 115 } else {
116 116 logout();
117 117 if (single.getCurrentPath() == "/webui/") {
@@ -145,7 +145,7 @@ function openWebSocket() {
145 145 if ("logged_out" in msg) {
146 146 if (localStorage.getItem("possessing")) {
147 147 localStorage.removeItem("possessing");
148 doAccountSwitch("/webui/admin");
148 doAccountSwitch("/webui/users");
149 149 } else {
150 150 logout();
151 151 single.loadRoute("/webui/"); // Show login screen
@@ -173,7 +173,7 @@ openWebSocket();
173 173 function refreshServerConfig() {
174 174 window.is_admin = undefined;
175 175 config_data = undefined;
176 if (single.getCurrentPath() == "/webui/cheats" || single.getCurrentPath() == "/webui/admin") {
176 if (single.getCurrentPath() == "/webui/cheats" || single.getCurrentPath() == "/webui/users") {
177 177 single.loadRoute(single.getCurrentPath());
178 178 }
179 179 }
@@ -250,7 +250,7 @@ function logout() {
250 250 function doLogout() {
251 251 if (localStorage.getItem("possessing")) {
252 252 localStorage.removeItem("possessing");
253 doAccountSwitch("/webui/admin");
253 doAccountSwitch("/webui/users");
254 254 } else {
255 255 logout();
256 256 if (ws_is_open) {
@@ -412,7 +412,7 @@ single.on("route_load", function (event) {
412 412 $("body").addClass("logged-in");
413 413
414 414 let navPath = event.route.paths[0];
415 if (navPath == "/webui/detailedView") {
415 if (navPath == "/webui/details") {
416 416 const params = new URLSearchParams(window.location.search);
417 417 const category = params.get("productCategory");
418 418
@@ -1244,7 +1244,7 @@ function updateInventory() {
1244 1244 inventory_data = undefined;
1245 1245 if (
1246 1246 single.getCurrentPath() == "/webui/inventory" ||
1247 single.getCurrentPath().startsWith("/webui/detailedView") ||
1247 single.getCurrentPath().startsWith("/webui/details") ||
1248 1248 single.getCurrentPath() == "/webui/mods" ||
1249 1249 single.getCurrentPath() == "/webui/cheats"
1250 1250 ) {
@@ -1430,7 +1430,7 @@ async function populateInventoryRoute() {
1430 1430
1431 1431 {
1432 1432 const a = document.createElement("a");
1433 a.href = "/webui/detailedView?productCategory=" + category + "&itemId=" + item.ItemId.$oid;
1433 a.href = "/webui/details?productCategory=" + category + "&itemId=" + item.ItemId.$oid;
1434 1434 a.innerHTML = icons.feather;
1435 1435 td.appendChild(a);
1436 1436 }
@@ -1967,7 +1967,7 @@ single.getRoute("/webui/mods").on("beforeload", async function () {
1967 1967 }
1968 1968 if (U5Mods.includes(item.ItemType)) {
1969 1969 const a = document.createElement("a");
1970 a.href = "/webui/detailedView?productCategory=Upgrades&itemId=" + item.ItemId.$oid;
1970 a.href = "/webui/details?productCategory=Upgrades&itemId=" + item.ItemId.$oid;
1971 1971 a.innerHTML = icons.feather;
1972 1972 td.appendChild(a);
1973 1973 }
@@ -2220,7 +2220,7 @@ dictPromise.then(() => {
2220 2220 });
2221 2221
2222 2222 function updateGuild() {
2223 if (single.getCurrentPath() == "/webui/guildView") {
2223 if (single.getCurrentPath() == "/webui/clan") {
2224 2224 single.loadRoute(single.getCurrentPath());
2225 2225 }
2226 2226 }
@@ -5667,7 +5667,7 @@ function removeItems(category) {
5667 5667 });
5668 5668 }
5669 5669
5670 single.getRoute("/webui/admin").on("beforeload", function () {
5670 single.getRoute("/webui/users").on("beforeload", function () {
5671 5671 awaitAuthz().then(() => {
5672 5672 if (window.is_admin === false) {
5673 5673 $(".admin-hide").removeClass("d-none");
@@ -5722,8 +5722,8 @@ single.getRoute("/webui/admin").on("beforeload", function () {
5722 5722 sendAuth();
5723 5723 }
5724 5724 revalidateAuthz().then(() => {
5725 if (single.getCurrentPath() == "/webui/admin") {
5726 single.loadRoute("/webui/admin");
5725 if (single.getCurrentPath() == "/webui/users") {
5726 single.loadRoute("/webui/users");
5727 5727 }
5728 5728 });
5729 5729 } else {
Modified static/webui/translations/de.js +0 -1
@@ -542,7 +542,6 @@ dict = {
542 542 guildView_promote: `Befördern`,
543 543 guildView_demote: `Degradieren`,
544 544
545 navbar_admin: `Admin`,
546 545 admin_users: `Benutzer`,
547 546 admin_possess: `Als Benutzer anmelden`,
548 547 admin_broadcastInbox: `[UNTRANSLATED] Broadcast Inbox Message`,
Modified static/webui/translations/en.js +0 -1
@@ -541,7 +541,6 @@ dict = {
541 541 guildView_promote: `Promote`,
542 542 guildView_demote: `Demote`,
543 543
544 navbar_admin: `Admin`,
545 544 admin_users: `Users`,
546 545 admin_possess: `Impersonate`,
547 546 admin_broadcastInbox: `Broadcast Inbox Message`,
Modified static/webui/translations/es.js +0 -1
@@ -542,7 +542,6 @@ dict = {
542 542 guildView_promote: `Promover`,
543 543 guildView_demote: `Degradar`,
544 544
545 navbar_admin: `[UNTRANSLATED] Admin`,
546 545 admin_users: `[UNTRANSLATED] Users`,
547 546 admin_possess: `[UNTRANSLATED] Impersonate`,
548 547 admin_broadcastInbox: `[UNTRANSLATED] Broadcast Inbox Message`,
Modified static/webui/translations/fr.js +0 -1
@@ -542,7 +542,6 @@ dict = {
542 542 guildView_promote: `Promouvoir`,
543 543 guildView_demote: `Rétrograder`,
544 544
545 navbar_admin: `Administrateur`,
546 545 admin_users: `Utilisateurs`,
547 546 admin_possess: `[UNTRANSLATED] Impersonate`,
548 547 admin_broadcastInbox: `[UNTRANSLATED] Broadcast Inbox Message`,
Modified static/webui/translations/ru.js +0 -1
@@ -542,7 +542,6 @@ dict = {
542 542 guildView_promote: `Повысить`,
543 543 guildView_demote: `Понизить`,
544 544
545 navbar_admin: `Админ`,
546 545 admin_users: `Пользователи`,
547 546 admin_possess: `Дейстовать от имени`,
548 547 admin_broadcastInbox: `[UNTRANSLATED] Broadcast Inbox Message`,
Modified static/webui/translations/uk.js +0 -1
@@ -542,7 +542,6 @@ dict = {
542 542 guildView_promote: `Підвищити звання`,
543 543 guildView_demote: `Понизити звання`,
544 544
545 navbar_admin: `[UNTRANSLATED] Admin`,
546 545 admin_users: `[UNTRANSLATED] Users`,
547 546 admin_possess: `[UNTRANSLATED] Impersonate`,
548 547 admin_broadcastInbox: `[UNTRANSLATED] Broadcast Inbox Message`,
Modified static/webui/translations/zh.js +0 -1
@@ -542,7 +542,6 @@ dict = {
542 542 guildView_promote: `升级`,
543 543 guildView_demote: `降级`,
544 544
545 navbar_admin: `管理员`,
546 545 admin_users: `用户`,
547 546 admin_possess: `管理此账户`,
548 547 admin_broadcastInbox: `广播收件箱消息`,