X-Git-Url: https://git.auder.net/doc/screen_ranking.png?a=blobdiff_plain;f=client%2Fsrc%2FApp.vue;h=2771e282c1cfa86f14f6293d61068f6eab8ac03c;hb=b121b2c842c663ca10687145dcdc44ef21ed5a12;hp=2699453b2e47ee630ec3220f74db43218b6fa0f7;hpb=fb54f098a565034c09c111f1141d2c60073b4a61;p=vchess.git

diff --git a/client/src/App.vue b/client/src/App.vue
index 2699453b..2771e282 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,66 +1,52 @@
 <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
         // 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"] }}
             #rightMenu
               .clickable(onClick="doClick('modalUser')")
-                | {{ !st.user.id ? "Login" : "Update" }}
+                | {{ st.user.id > 0 ? (st.user.name || "@nonymous") : "Login" }}
               .clickable(onClick="doClick('modalSettings')")
                 | {{ st.tr["Settings"] }}
               .clickable#flagContainer(onClick="doClick('modalLang')")
-                img(v-if="!!st.lang"
-                  :src="require(`@/assets/images/flags/${st.lang}.svg`)")
+                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
-  //script(src="//unpkg.com/feather-icons")
+            | {{ st.tr["Contact"] }}
+          a.menuitem(href="https://forum.vchess.club")
+            | {{ st.tr["Forum"] }}
 </template>
 
 <script>
-// See https://stackoverflow.com/a/35417159
 import ContactForm from "@/components/ContactForm.vue";
 import Language from "@/components/Language.vue";
 import Settings from "@/components/Settings.vue";
 import UpsertUser from "@/components/UpsertUser.vue";
 import { store } from "./store.js";
+import { processModalClick } from "./utils/modalClick.js";
 export default {
   components: {
     ContactForm,
@@ -73,16 +59,45 @@ export default {
       st: store.state,
     };
   },
+  computed: {
+    flagImage: function() {
+      return `/images/flags/${this.st.lang}.svg`;
+    },
+  },
+  mounted: function() {
+    let dialogs = document.querySelectorAll("div[role='dialog']");
+    dialogs.forEach(d => {
+      d.addEventListener("click", processModalClick);
+    });
+  },
+  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>
 
 <style lang="sass">
+html, *
+  font-family: "Open Sans", Arial, sans-serif
+  --back-color: #f2f2f2
+  --a-link-color: black
+  --a-visited-color: black
+
+body
+  padding: 0
+  min-width: 320px
+
 #app
-  font-family: "Avenir", Helvetica, Arial, sans-serif
   -webkit-font-smoothing: antialiased
   -moz-osx-font-smoothing: grayscale
 
 .container
+  overflow: hidden
   @media screen and (max-width: 767px)
     padding: 0
 
@@ -92,33 +107,6 @@ export default {
 .nopadding
   padding: 0
 
-#modalWelcome
-  max-width: 767px
-  @media screen and (max-width: 767px)
-    max-width: 100vw
-  img
-    width: 75%
-    @media screen and (max-width: 767px)
-      width: 100%
-      max-width: 552px
-  ul
-    list-style-type: none
-  // TODO: bad practice, shouldn't use table to align things...
-  table.list-table
-    width: 300px
-    margin: 0 auto
-    border: 0
-    tbody
-      border: 0
-      tr
-        border: 0
-        margin: 0
-        padding: 0
-        td
-          padding: 0
-          text-align: left
-          border: 0
-
 header
   width: 100%
   display: flex
@@ -132,6 +120,27 @@ header
 .clickable
   cursor: pointer
 
+.text-center
+  text-align: center
+
+.smallpad
+  padding: 5px
+
+.emphasis
+  font-style: italic
+
+.clearer
+  clear: both
+
+.smallfont
+  font-size: 0.8em
+
+.bigfont
+  font-size: 1.2em
+
+.bold
+  font-weight: bold
+
 nav
   width: 100%
   margin: 0
@@ -139,53 +148,102 @@ nav
   & > #menuBar
     width: 100%
     padding: 0
-    & > #leftMenu
-      padding: 0
-      width: 50%
-      display: inline-flex
-      align-items: center
-      justify-content: flex-start
-      & > a
-        display: inline-block
-        color: #2c3e50
-        &.router-link-exact-active
-          color: #42b983
-    & > #rightMenu
-      padding: 0
-      width: 50%
-      display: inline-flex
-      align-items: center
-      justify-content: flex-end
-      & > div
-        display: inline-block
-        &#flagContainer
-          display: inline-flex
-        & > img
-          padding: 0
-          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
+    @media screen and (min-width: 768px)
+      & > #leftMenu
+        padding: 0
+        width: 50%
+        display: inline-flex
+        align-items: center
+        justify-content: flex-start
+        & > a
+          display: inline-block
+          color: #2c3e50
+          &.router-link-exact-active
+            color: #42b983
+      & > #rightMenu
+        padding: 0
+        width: 50%
+        display: inline-flex
+        align-items: center
+        justify-content: flex-end
+        & > div
+          display: inline-block
+          &#flagContainer
+            display: inline-flex
+          & > img
+            padding: 0
+            width: 36px
+            height: 27px
+    @media screen and (max-width: 767px)
+      & > #leftMenu
+        padding-bottom: 5px
+        & > a
+          color: #2c3e50
+          &.router-link-exact-active
+            color: #42b983
+      & > #rightMenu
+        padding-top: 5px
+        border-top: 1px solid darkgrey
+        & > div
+          &#flagContainer
+            display: inline-flex
+          & > img
+            padding: 0
+            width: 36px
+            height: 27px
+
+@media screen and (max-width: 767px)
+  nav
+    border: none
+
 [type="checkbox"].drawer+*
   right: -767px
 
+@media screen and (max-width: 767px)
+  .button-group
+    flex-direction: row
+    button:not(:first-child)
+      border-left: 1px solid var(--button-group-border-color)
+      border-top: 0
+
 footer
+  border: 1px solid #ddd
   //background-color: #000033
   font-size: 1rem
   width: 100%
+  padding-left: 0
+  padding-right: 0
   display: inline-flex
   align-items: center
   justify-content: center
-  & > a
+  & > .router-link-exact-active
+    color: #42b983 !important
+    text-decoration: none
+  & > .menuitem
     display: inline-block
-    margin: 0 10px 0 0
+    margin: 0 10px
     &:link
       color: #2c3e50
-    &:hover
+    &:visited, &:hover
+      color: #2c3e50
       text-decoration: none
   & > p
     display: inline-block
-    margin: 0 0 0 10px
+    margin: 0 10px
+
+@media screen and (max-width: 767px)
+  footer
+    border: none
+
+//#settings, #contactForm
+//  max-width: 767px
+//  @media screen and (max-width: 767px)
+//    max-width: 100vw
+//[type="checkbox"].modal+div .card
+//  max-width: 767px
+//  max-height: 100vh
+//[type="checkbox"].modal+div .card.small-modal
+//  max-width: 320px
+//[type="checkbox"].modal+div .card.big-modal
+//  max-width: 90vw
 </style>