X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2FApp.vue;h=369391e7b495beb85f2abb78b3f811c473691c60;hb=472c0c4f5aa29d96e080873ebfce2a04f664d852;hp=d65d3806f2427b1e45a54f37c7d48390f5286bea;hpb=aafe9f160744bf8f507d1cebd398cc11d798e090;p=vchess.git

diff --git a/client/src/App.vue b/client/src/App.vue
index d65d3806..369391e7 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,6 +1,5 @@
 <template lang="pug">
 #app
-  Language
   Settings
   ContactForm
   UpsertUser
@@ -9,7 +8,7 @@
       .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
         // Menu (top of page):
         // Left: hall, variants, problems, mygames
-        // Right: usermenu, settings, flag
+        // Right: usermenu, settings
         nav
           label.drawer-toggle(for="drawerControl")
           input#drawerControl.drawer(type="checkbox")
@@ -18,75 +17,83 @@
             #leftMenu
               router-link(to="/")
                 | {{ st.tr["Hall"] }}
+              router-link(to="/mygames")
+                | {{ st.tr["My games"] }}
               router-link(to="/variants")
                 | {{ st.tr["Variants"] }}
               router-link(to="/problems")
                 | {{ st.tr["Problems"] }}
-              router-link(to="/mygames")
-                | {{ st.tr["My games"] }}
             #rightMenu
-              .clickable(onClick="doClick('modalUser')")
-                | {{ 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="flagImage")
+              .clickable(onClick="window.doClick('modalUser')") {{ userName }}
+              #divSettings.clickable(onClick="window.doClick('modalSettings')")
+                span {{ st.tr["Settings"] }}
+                img(src="/images/icons/settings.svg")
     router-view
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       footer
         router-link.menuitem(to="/about") {{ st.tr["About"] }}
-        router-link.menuitem(to="/news") {{ st.tr["News"] }}
-        p.clickable(onClick="doClick('modalContact')")
+        router-link.menuitem#newsMenu(to="/news") {{ st.tr["News"] }}
+        a.menuitem(href="https://discord.gg/a9ZFKBe")
+          span Discord
+          img(src="/images/icons/discord.svg")
+        a.menuitem(href="https://github.com/yagu0/vchess")
+          span {{ st.tr["Code"] }}
+          img(src="/images/icons/github.svg")
+        p.clickable(onClick="window.doClick('modalContact')")
           | {{ st.tr["Contact"] }}
 </template>
 
 <script>
 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";
+import { store } from "@/store.js";
+import { ajax } from "@/utils/ajax.js";
 export default {
   components: {
     ContactForm,
-    Language,
     Settings,
-    UpsertUser,
+    UpsertUser
   },
   data: function() {
-    return {
-      st: store.state,
-    };
-  },
-  computed: {
-    flagImage: function() {
-      return `/images/flags/${this.st.lang}.svg`;
-    },
+    return { st: store.state };
   },
   mounted: function() {
-    let dialogs = document.querySelectorAll("div[role='dialog']");
-    dialogs.forEach(d => {
-      d.addEventListener("click", processModalClick);
-    });
+    ajax(
+      "/newsts",
+      "GET",
+      {
+        success: (res) => {
+          if (this.st.user.newsRead < res.timestamp)
+            document.getElementById("newsMenu").classList.add("somenews");
+        }
+      }
+    );
+  },
+  computed: {
+    userName: function() {
+      return (
+        this.st.user.id > 0
+          ? (this.st.user.name || "@nonymous")
+          : "Login"
+      );
+    }
   },
   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
-  --a-link-color: black
-  --a-visited-color: black
+  --a-link-color: darkred
+  --a-visited-color: darkred
 
 body
   padding: 0
@@ -122,6 +129,9 @@ header
 .text-center
   text-align: center
 
+.bold
+  font-weight: bold
+
 .clearer
   clear: both
 
@@ -143,6 +153,17 @@ table
   th, td
     padding: 5px
 
+#divSettings
+  padding: 0 10px 0 0
+  height: 100%
+  & > span
+    padding-right: 5px
+    vertical-align: middle
+  & > img
+    padding: 0
+    height: 1.2em
+    vertical-align: middle
+
 @media screen and (max-width: 767px)
   table
     tr > th, td
@@ -175,12 +196,6 @@ nav
         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
         margin-top: 42px
@@ -192,33 +207,34 @@ nav
       & > #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
-    z-index: 5000 //to hide currently selected piece if any
     height: 42px
     border: none
     & > label.drawer-toggle
       cursor: pointer
-      font-size: 32px
       position: absolute
-      top: -22px
-      //padding: -5px 0 0 10px
+      top: 0
+      left: 5px
+      line-height: 42px
+      height: 42px
+      padding: 0
+    & > label.drawer-toggle:before
+      font-size: 42px
+    & > #menuBar
+      z-index: 5000 //to hide currently selected piece if any
 
 [type="checkbox"].drawer+*
   right: -767px
 
 [type=checkbox].drawer+* .drawer-close
-  top: -10px
-  left: var(--universal-margin)
-  right: 0
+  top: 0
+  left: 5px
+  padding: 0
+  height: 50px
+  width: 50px
+  line-height: 50px
 
 [type=checkbox].drawer+* .drawer-close:before
   font-size: 50px
@@ -245,13 +261,18 @@ footer
     color: #42b983 !important
     text-decoration: none
   & > .menuitem
-    display: inline-block
     margin: 0 12px
+    display: inline-flex;
+    align-self: center;
     &:link
       color: #2c3e50
     &:visited, &:hover
       color: #2c3e50
       text-decoration: none
+    & > img
+      height: 1.2em
+      display: inline-block
+      margin-left: 5px
   & > p
     display: inline-block
     margin: 0 12px
@@ -260,6 +281,19 @@ footer
   footer
     border: none
 
+@media screen and (max-width: 420px)
+  .container
+    min-height: calc(100vh - 55px)
+  footer
+    height: 55px
+    display: block
+    padding: 5px 0
+
+.menuitem.somenews
+  color: red
+  &:link, &:visited, &:hover
+    color: red
+
 // Styles for diagrams and board (partial).
 // TODO: where to put that ?
 
@@ -275,17 +309,29 @@ div.board
   display: inline-block
   position: relative
 
+div.board5
+  width: 20%
+  padding-bottom: 20%
+
 div.board8
   width: 12.5%
   padding-bottom: 12.5%
 
+div.board9
+  width: 11.1%
+  padding-bottom: 11.1%
+
 div.board10
   width: 10%
   padding-bottom: 10%
 
 div.board11
   width: 9.09%
-  padding-bottom: 9.1%
+  padding-bottom: 9.09%
+
+div.board12
+  width: 8.33%
+  padding-bottom: 8.33%
 
 img.piece
   width: 100%