diff --git a/.vscode/settings.json b/.vscode/settings.json index cc6e5bbd..ed4a6019 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,11 @@ { "cmake.configureOnOpen": false, "git.followTagsWhenSync": false, - "git.pullTags": false + "git.pullTags": false, + "liveServer.settings.root": "/CelesteNet.Server.FrontendModule/Content/frontend/", + "liveServer.settings.proxy": { + "enable": true, + "baseUri": "/api", + "proxyUri": "http://127.0.0.1:3821/api" + } } \ No newline at end of file diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/assets/avatar_fallback.png b/CelesteNet.Server.FrontendModule/Content/frontend/assets/avatar_fallback.png new file mode 100755 index 00000000..c8512f0b Binary files /dev/null and b/CelesteNet.Server.FrontendModule/Content/frontend/assets/avatar_fallback.png differ diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/auth.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/auth.js index c5f5496c..c3c309bb 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/auth.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/auth.js @@ -27,7 +27,7 @@ export class FrontendAuth { let data; try { - data = await fetch("/auth", { + data = await fetch("/api/auth", { method: "post", body: JSON.stringify(pass) }).then(r => r.json()); diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/sync.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/sync.js index 60baca0e..6029bbab 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/sync.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/components/sync.js @@ -107,7 +107,7 @@ export class FrontendSync { if (!this.ws || this.ws.readyState === WebSocket.CLOSED) { this.frontend.snackbar({ text: "Connecting..." }); this.status = "connecting"; - let ws = this.ws = new WebSocket(`${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/ws`); + let ws = this.ws = new WebSocket(localStorage["frontend-ws"] || `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/api/ws`); if (!this.resyncPromiseResolve) this.resyncPromise = new Promise(resolve => this.resyncPromiseResolve = resolve); ws.onopen = this.onopen; diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/accounts.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/accounts.js index 1efc21aa..6beb2ee4 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/accounts.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/accounts.js @@ -36,7 +36,7 @@ export class FrontendPlayersPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Accounts"; - this.ep = "/userinfos?from=0&count=100000"; + this.ep = "/api/userinfos?from=0&count=100000"; /** @type {UserInfo[]} */ this.data = []; diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/assemblies.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/assemblies.js index 56389e8e..a682110f 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/assemblies.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/assemblies.js @@ -24,7 +24,7 @@ export class FrontendAssembliesPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Assemblies"; - this.ep = "/asms"; + this.ep = "/api/asms"; /** @type {AssemblyInfo[]} */ this.data = []; } diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/channels.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/channels.js index 94c8c527..c2a3e8b4 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/channels.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/channels.js @@ -26,7 +26,7 @@ export class FrontendChannelsPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Channels"; - this.ep = "/channels"; + this.ep = "/api/channels"; /** @type {ChannelData[]} */ this.data = []; } diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/chat.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/chat.js index 28d78a4e..c8b2ffd1 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/chat.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/chat.js @@ -27,7 +27,7 @@ export class FrontendChatPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Chat"; - this.ep = "/chatlog"; + this.ep = "/api/chatlog"; /** @type {[string, string, () => void][]} */ this.actions = [ diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/endpoints.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/endpoints.js index 3b81881c..87578e08 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/endpoints.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/endpoints.js @@ -16,7 +16,7 @@ export class FrontendEndpointsPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Endpoints"; - this.ep = "/eps"; + this.ep = "/api/eps"; } async update() { diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/exec.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/exec.js index 8f5c3d24..850838d7 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/exec.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/exec.js @@ -17,7 +17,7 @@ export class FrontendExecPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Run C#"; - this.ep = "/exec"; + this.ep = "/api/exec"; this.data = ""; diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/notes.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/notes.js index 1f327072..146dc5a6 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/notes.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/notes.js @@ -16,7 +16,7 @@ export class FrontendNotesPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Notes"; - this.ep = "/notes"; + this.ep = "/api/notes"; this.data = ""; diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/players.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/players.js index 8a840fac..5e76cab0 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/players.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/players.js @@ -32,7 +32,7 @@ export class FrontendPlayersPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Players"; - this.ep = "/players"; + this.ep = "/api/players"; /** @type {PlayerData[]} */ this.data = []; } diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/status.js b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/status.js index d7171d6d..b5a8eda5 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/status.js +++ b/CelesteNet.Server.FrontendModule/Content/frontend/cp/js/panels/status.js @@ -16,8 +16,8 @@ export class FrontendStatusPanel extends FrontendBasicPanel { constructor(frontend) { super(frontend); this.header = "Status"; - this.ep = "/status"; - this.netPlusEp = "/netplus"; + this.ep = "/api/status"; + this.netPlusEp = "/api/netplus"; this.data = { Alive: false, diff --git a/CelesteNet.Server.FrontendModule/Content/frontend/index.html b/CelesteNet.Server.FrontendModule/Content/frontend/index.html index 50946dc7..140effa8 100644 --- a/CelesteNet.Server.FrontendModule/Content/frontend/index.html +++ b/CelesteNet.Server.FrontendModule/Content/frontend/index.html @@ -4,6 +4,7 @@ THIS IS THE DEFAULT WEBSITE. If you're hosting your own CelesteNet server, replace it! Or host it separately, as the built-in HTTP server isn't the best. + Most importantly though, CTRL+F 0x0a.de and replace it all, and maybe adjust / remove the netdata graphs. --> @@ -22,9 +23,9 @@ - - - + + + @@ -32,20 +33,18 @@ -
+
+
+
-
+
- -
- -
- - -
-
+
+
- +
+ +
An online multiplayer mod for Celeste.