X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2FApp.vue;h=f337394ef791785eca539c7ee680550a0f820178;hb=4f8871051c030acd51172b73cd20aedce687c2a8;hp=dd45b3439d138088771900c21d5ce765d0e2c168;hpb=85e5b5c1e6192a134fa69182e8c077605fdb969f;p=vchess.git

diff --git a/client/src/App.vue b/client/src/App.vue
index dd45b343..f337394e 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,57 +1,44 @@
 <template lang="pug">
 #app
-  // modal "welcome" will be filled in the selected language
-  #modalWelcome
   Language
   Settings
   ContactForm
   UpsertUser
   .container
-    .row(v-show="$route.path == '/'")
-      .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-        // Header (on index only)
-        header
-          img(src="./assets/images/index/unicorn.svg")
-          .info-container
-            p vchess.club
-          img(src="./assets/images/index/wildebeest.svg")
     .row
       .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
         // Menu (top of page):
-        // Left: home, variants, mygames, problems
+        // Left: hall, variants, mygames, forum (ext. link)
         // Right: usermenu, settings, flag
         nav
           label.drawer-toggle(for="drawerControl")
           input#drawerControl.drawer(type="checkbox")
-          #menuBar
+          #menuBar(@click="hideDrawer")
             label.drawer-close(for="drawerControl")
             #leftMenu
               router-link(to="/")
-                | {{ st.tr["Home"] }}
+                | {{ st.tr["Hall"] }}
               router-link(to="/variants")
                 | {{ st.tr["Variants"] }}
               router-link(to="/mygames")
                 | {{ st.tr["My games"] }}
-              router-link(to="/problems")
-                | {{ st.tr["Problems"] }}
+              a(href="https://forum.vchess.club")
+                | {{ st.tr["Forum"] }}
             #rightMenu
               .clickable(onClick="doClick('modalUser')")
-                | {{ !st.user.id ? "Login" : "Update" }}
+                | {{ st.user.id > 0 ? "Update" : "Login" }}
               .clickable(onClick="doClick('modalSettings')")
                 | {{ st.tr["Settings"] }}
-              .clickable(onClick="doClick('modalLang')")
-                img(v-if="!!st.lang"
-                  :src="require(`@/assets/images/flags/${st.lang}.svg`)")
-    .row
-      router-view
+              .clickable#flagContainer(onClick="doClick('modalLang')")
+                img(v-if="!!st.lang" :src="flagImage")
+    router-view
     .row
       .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
         footer
-          a(href="https://github.com/yagu0/vchess") {{ st.tr["Source code"] }}
+          router-link.menuitem(to="/about") {{ st.tr["About"] }}
           p.clickable(onClick="doClick('modalContact')")
-            | {{ st.tr["Contact form"] }}
-  //my-game(:game-ref="gameRef" :mode="mode" :settings="settings" @game-over="archiveGame")
-  //// TODO: add only the necessary icons to mini-css custom build
+            | {{ st.tr["Contact"] }}
+  // TODO: add only the necessary icons to mini-css custom build
   //script(src="//unpkg.com/feather-icons")
 </template>
 
@@ -74,6 +61,19 @@ export default {
       st: store.state,
     };
   },
+  computed: {
+    flagImage: function() {
+      return `/images/flags/${this.st.lang}.svg`;
+    },
+  },
+  methods: {
+    hideDrawer: function(e) {
+      if (e.target.innerText == "Forum")
+        return; //external link
+      e.preventDefault(); //TODO: why is this needed?
+      document.getElementsByClassName("drawer")[0].checked = false;
+    },
+  },
 };
 </script>
 
@@ -87,6 +87,12 @@ export default {
   @media screen and (max-width: 767px)
     padding: 0
 
+.row > div
+  padding: 0
+
+.nopadding
+  padding: 0
+
 header
   width: 100%
   display: flex
@@ -102,6 +108,7 @@ header
 
 nav
   width: 100%
+  margin: 0
   padding: 0
   & > #menuBar
     width: 100%
@@ -125,25 +132,30 @@ nav
       justify-content: flex-end
       & > div
         display: inline-block
+        &#flagContainer
+          display: inline-flex
         & > img
           padding: 0
-          width: 30px
-          height: 30px
+          width: 36px
+          height: 27px
 
-// TODO: drawer, until 600px wide OK (seemingly)
-// After, zone where left and right just go on top of another
-// Then, on narrow screen put everything on one line
 [type="checkbox"].drawer+*
   right: -767px
 
+#menuBar
+  label.drawer-close
+    top: 50px
+
 footer
   //background-color: #000033
   font-size: 1rem
   width: 100%
+  padding-left: 0
+  padding-right: 0
   display: inline-flex
   align-items: center
   justify-content: center
-  & > a
+  & > .menuitem
     display: inline-block
     margin: 0 10px 0 0
     &:link