Add back a loading page for server builds

superpowers · Jul 7, 2016 · f8c6268 · f8c6268
1 parent e69662b
commit f8c6268
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/client/src/project/sidebar/header.ts b/client/src/project/sidebar/header.ts
@@ -58,7 +58,7 @@ if (runButton.hidden || runButton.disabled) return;
 
   if (SupApp != null) {
     if (runWindow == null) {
-      runWindow = SupApp.openWindow(`${window.location.origin}/build.html`);
+      runWindow = SupApp.openWindow(`${window.location.origin}/serverBuild`);
       runWindow.setMenuBarVisibility(false);
       runWindow.on("closed", onCloseRunWindow);
 
@@ -68,7 +68,7 @@ if (runButton.hidden || runButton.disabled) return;
     runWindow.focus();
 
     stopButton.disabled = false;
-  } else window.open("/build.html", `player_${SupClient.query.project}`);
+  } else window.open("/serverBuild", `player_${SupClient.query.project}`);
 
   socket.emit("build:project", (err: string, buildId: string) => {
     if (err != null) { new SupClient.Dialogs.InfoDialog(err); return; }

diff --git a/client/src/serverBuild/index.jade b/client/src/serverBuild/index.jade
@@ -0,0 +1,10 @@
+doctype html
+html
+  head
+    title Superpowers
+    meta(charset="utf-8")
+    link(rel="stylesheet",href="/styles/reset.css")
+    link(rel="stylesheet",href="/serverBuild/index.css")
+
+  body
+    header= t("common:states.loading")
diff --git a/client/src/serverBuild/index.styl b/client/src/serverBuild/index.styl
@@ -0,0 +1,14 @@
+body {
+  display: flex;
+  flex-flow: column;
+  align-items: center;
+  justify-content: center;
+  padding: 2em;
+  background: #eee;
+}
+
+header {
+  text-transform: uppercase;
+  font-size: 1.5em;
+  color: #888;
+}
diff --git a/server/commands/start.ts b/server/commands/start.ts
@@ -93,6 +93,7 @@ export default function start(serverDataPath: string) {
   mainApp.get("/project", enforceAuth, serveProjectIndex);
 
   mainApp.get("/build", enforceAuth, serveBuildIndex);
+  mainApp.get("/serverBuild", enforceAuth, serveServerBuildIndex);
 
   mainApp.use("/projects/:projectId/*", serveProjectWildcard);
   mainApp.use("/", express.static(`${__dirname}/../../public`));
@@ -227,6 +228,11 @@ function serveBuildIndex(req: express.Request, res: express.Response) {
   res.sendFile(path.resolve(`${__dirname}/../../public/build/${localizedIndex}`));
 }
 
+function serveServerBuildIndex(req: express.Request, res: express.Response) {
+  const localizedIndex = getLocalizedFilename("index.html", req.cookies["supLanguage"]);
+  res.sendFile(path.resolve(`${__dirname}/../../public/serverBuild/${localizedIndex}`));
+}
+
 function serveProjectWildcard(req: express.Request, res: express.Response) {
   const projectPath = hub.serversById[req.params.projectId].projectPath;