X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2FApp.vue;h=a961d7fcf3401918f72e66cbb891854772fa7f5a;hb=49dad26138d3dee0cacbb94ad8d3d3eff12c477a;hp=0aad59be9f8ba9695da57fd3ab6ad9a157174f01;hpb=cf2343cee5729c011770ace6d5b4f79d1ac3a2b6;p=vchess.git

diff --git a/client/src/App.vue b/client/src/App.vue
index 0aad59be..a961d7fc 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,6 +1,5 @@
 <template lang="pug">
 #app
-  Language
   Settings
   ContactForm
   UpsertUser
@@ -8,78 +7,113 @@
     .row
       .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
         // Menu (top of page):
-        // Left: hall, variants, mygames, problems
-        // Right: usermenu, settings, flag
+        // Left: hall, variants, problems, mygames
+        // Right: usermenu, settings
         nav
           label.drawer-toggle(for="drawerControl")
           input#drawerControl.drawer(type="checkbox")
-          #menuBar
+          #menuBar(@click="hideDrawer($event)")
             label.drawer-close(for="drawerControl")
             #leftMenu
               router-link(to="/")
                 | {{ st.tr["Hall"] }}
-              router-link(to="/variants")
-                | {{ st.tr["Variants"] }}
               router-link(to="/mygames")
                 | {{ st.tr["My games"] }}
+              router-link(to="/variants")
+                | {{ st.tr["Variants"] }}
               router-link(to="/problems")
                 | {{ st.tr["Problems"] }}
             #rightMenu
-              .clickable(onClick="doClick('modalUser')")
-                | {{ !st.user.id ? "Login" : "Update" }}
-              .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`)")
+              .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
-          a(href="https://github.com/yagu0/vchess") {{ st.tr["Source code"] }}
-          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")
+  .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#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>
-// 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 { store } from "@/store.js";
+import { ajax } from "@/utils/ajax.js";
 export default {
   components: {
     ContactForm,
-    Language,
     Settings,
-    UpsertUser,
+    UpsertUser
   },
   data: function() {
-    return {
-      st: store.state,
-    };
+    return { st: store.state };
+  },
+  mounted: function() {
+    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) {
+      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: darkred
+  --a-visited-color: darkred
+
+body
+  padding: 0
+  min-width: 320px
+  --fore-color: #1c1e10 //#2c3e50
+  //--back-color: #f2f2f2
+  background-image: radial-gradient(white, #e6e6ff) //lavender)
+
 #app
-  font-family: "Avenir", Helvetica, Arial, sans-serif
   -webkit-font-smoothing: antialiased
   -moz-osx-font-smoothing: grayscale
 
 .container
-  @media screen and (max-width: 767px)
-    padding: 0
-
-.row > div
+  // 45px is footer height
+  min-height: calc(100vh - 45px)
+  overflow: hidden
   padding: 0
+  margin: 0
 
-.nopadding
+.row > div
   padding: 0
 
 header
@@ -88,13 +122,53 @@ header
   align-items: center
   justify-content: center
   margin: 0 auto
-  & > img
-    width: 30px
-    height: 30px
 
 .clickable
   cursor: pointer
 
+.text-center
+  text-align: center
+
+.bold
+  font-weight: bold
+
+.clearer
+  clear: both
+
+.button-group
+  margin: 0
+
+input[type="checkbox"]:focus
+  outline: 0
+
+input[type=checkbox]:checked:before
+  top: -5px;
+  height: 18px
+
+table
+  display: block
+  padding: 0
+  tr > td
+    cursor: pointer
+  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
+      font-size: 14px
+
 nav
   width: 100%
   margin: 0
@@ -102,53 +176,185 @@ 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
+    @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
+    @media screen and (max-width: 767px)
+      & > #leftMenu
+        margin-top: 42px
+        padding-bottom: 5px
+        & > a
+          color: #2c3e50
+          &.router-link-exact-active
+            color: #42b983
+      & > #rightMenu
+        padding-top: 5px
+        border-top: 1px solid darkgrey
+
+@media screen and (max-width: 767px)
+  nav
+    height: 42px
+    border: none
+    & > label.drawer-toggle
+      cursor: pointer
+      position: absolute
+      top: 0
+      left: 5px
+      line-height: 42px
+      height: 42px
       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
+    & > 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: 0
+  left: 5px
+  padding: 0
+  height: 50px
+  width: 50px
+  line-height: 50px
+
+[type=checkbox].drawer+* .drawer-close:before
+  font-size: 50px
+
+@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
+  height: 45px
+  border: 1px solid #ddd
+  box-sizing: border-box
   //background-color: #000033
   font-size: 1rem
   width: 100%
+  padding: 0
   display: inline-flex
   align-items: center
   justify-content: center
-  & > a
-    display: inline-block
-    margin: 0 10px 0 0
+  & > .router-link-exact-active
+    color: #42b983 !important
+    text-decoration: none
+  & > .menuitem
+    margin: 0 12px
+    display: inline-flex;
+    align-self: center;
     &:link
       color: #2c3e50
-    &:hover
+    &:visited, &:hover
+      color: #2c3e50
       text-decoration: none
+    & > img
+      height: 1.2em
+      display: inline-block
+      margin-left: 5px
   & > p
     display: inline-block
-    margin: 0 0 0 10px
+    margin: 0 12px
+
+@media screen and (max-width: 767px)
+  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 ?
+
+.light-square-diag
+  background-color: #e5e5ca
+
+.dark-square-diag
+  background-color: #6f8f57
+
+div.board
+  float: left
+  height: 0
+  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.09%
+
+div.board12
+  width: 8.33%
+  padding-bottom: 8.33%
+
+img.piece
+  width: 100%
+
+img.piece, img.mark-square, img.circle-square
+  max-width: 100%
+  height: auto
+  display: block
+
+img.mark-square
+  opacity: .7
+  width: 76%
+  position: absolute
+  top: 12%
+  left: 12%
+
+img.circle-square
+  opacity: 0.7
+  width: 100%
+  position: absolute
+  top: 0
+  left: 0
+
+.in-shadow
+  filter: brightness(50%)
 </style>