From d91d98cef56df52afbf4d9f2ac71c477feb0fd03 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Wed, 16 Mar 2022 20:13:09 +0100
Subject: [PATCH] factor out top bar to __layout.svelte

---
 web/pw-server/src/routes/__layout.svelte |  26 +++++
 web/pw-server/src/routes/index.svelte    | 116 +++++++++--------------
 2 files changed, 73 insertions(+), 69 deletions(-)
 create mode 100644 web/pw-server/src/routes/__layout.svelte

diff --git a/web/pw-server/src/routes/__layout.svelte b/web/pw-server/src/routes/__layout.svelte
new file mode 100644
index 0000000..53b6269
--- /dev/null
+++ b/web/pw-server/src/routes/__layout.svelte
@@ -0,0 +1,26 @@
+<script lang="ts">
+  import "./style.css";
+</script>
+
+<div class="outer-container">
+  <div class="top-bar" />
+  <slot />
+</div>
+
+<style lang="scss">
+  @import "../lib/variables.scss";
+
+  .outer-container {
+    width: 100vw;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .top-bar {
+    height: 40px;
+    background-color: $bg-color;
+    border-bottom: 1px solid;
+    flex-shrink: 0;
+  }
+</style>
diff --git a/web/pw-server/src/routes/index.svelte b/web/pw-server/src/routes/index.svelte
index 8680588..dcc40ca 100644
--- a/web/pw-server/src/routes/index.svelte
+++ b/web/pw-server/src/routes/index.svelte
@@ -2,7 +2,6 @@
   import Visualizer from "$lib/components/Visualizer.svelte";
   import EditorView from "$lib/components/EditorView.svelte";
   import { onMount } from "svelte";
-  import "./style.css";
 
   import { DateTime } from "luxon";
 
@@ -131,76 +130,59 @@
   }
 </script>
 
-<div class="outer-container">
-  <div class="top-bar" />
-  <div class="container">
-    <div class="sidebar-left">
-      <div
-        class="editor-button sidebar-item"
-        class:selected={viewMode === ViewMode.Editor}
-        on:click={selectEditor}
-      >
-        Editor
-      </div>
-      <div
-        class="rules-button sidebar-item"
-        class:selected={viewMode === ViewMode.Rules}
-        on:click={selectRules}
-      >
-        Rules
-      </div>
-      <div class="sidebar-header">match history</div>
-      <ul class="match-list">
-        {#each matches as match}
-          <li
-            class="match-card sidebar-item"
-            on:click={() => selectMatch(match.id)}
-            class:selected={match.id === selectedMatchId}
-          >
-            <span class="match-timestamp">{formatMatchTimestamp(match.timestamp)}</span>
-            <!-- hex is hardcoded for now, don't show map name -->
-            <!-- <span class="match-mapname">hex</span> -->
-            <!-- ugly temporary hardcode -->
-            <span class="match-opponent">{match["players"][1]["bot_name"]}</span>
-          </li>
-        {/each}
-      </ul>
+<div class="container">
+  <div class="sidebar-left">
+    <div
+      class="editor-button sidebar-item"
+      class:selected={viewMode === ViewMode.Editor}
+      on:click={selectEditor}
+    >
+      Editor
     </div>
-    <div class="editor-container">
-      {#if viewMode === ViewMode.MatchVisualizer}
-        <Visualizer matchLog={selectedMatchLog} />
-      {:else if viewMode === ViewMode.Editor}
-        <EditorView {editSession} />
-      {:else if viewMode === ViewMode.Rules}
-        <RulesView />
-      {/if}
-    </div>
-    <div class="sidebar-right">
-      {#if viewMode === ViewMode.MatchVisualizer}
-        <OutputPane matchLog={selectedMatchLog} />
-      {:else if viewMode === ViewMode.Editor}
-        <SubmitPane {editSession} on:matchCreated={onMatchCreated} />
-      {/if}
+    <div
+      class="rules-button sidebar-item"
+      class:selected={viewMode === ViewMode.Rules}
+      on:click={selectRules}
+    >
+      Rules
     </div>
+    <div class="sidebar-header">match history</div>
+    <ul class="match-list">
+      {#each matches as match}
+        <li
+          class="match-card sidebar-item"
+          on:click={() => selectMatch(match.id)}
+          class:selected={match.id === selectedMatchId}
+        >
+          <span class="match-timestamp">{formatMatchTimestamp(match.timestamp)}</span>
+          <!-- hex is hardcoded for now, don't show map name -->
+          <!-- <span class="match-mapname">hex</span> -->
+          <!-- ugly temporary hardcode -->
+          <span class="match-opponent">{match["players"][1]["bot_name"]}</span>
+        </li>
+      {/each}
+    </ul>
+  </div>
+  <div class="editor-container">
+    {#if viewMode === ViewMode.MatchVisualizer}
+      <Visualizer matchLog={selectedMatchLog} />
+    {:else if viewMode === ViewMode.Editor}
+      <EditorView {editSession} />
+    {:else if viewMode === ViewMode.Rules}
+      <RulesView />
+    {/if}
+  </div>
+  <div class="sidebar-right">
+    {#if viewMode === ViewMode.MatchVisualizer}
+      <OutputPane matchLog={selectedMatchLog} />
+    {:else if viewMode === ViewMode.Editor}
+      <SubmitPane {editSession} on:matchCreated={onMatchCreated} />
+    {/if}
   </div>
 </div>
 
 <style lang="scss">
-  $bg-color: rgb(41, 41, 41);
-
-  .outer-container {
-    width: 100vw;
-    height: 100vh;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .top-bar {
-    height: 40px;
-    background-color: $bg-color;
-    border-bottom: 1px solid;
-    flex-shrink: 0;
-  }
+  @import "../lib/variables.scss";
 
   .container {
     display: flex;
@@ -266,10 +248,6 @@
     color: #ccc;
   }
 
-  .match-mapname {
-    padding: 0 0.5em;
-  }
-
   .match-opponent {
     padding: 0 0.5em;
   }