X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2FApp.vue;h=02693a62639f89fe61bcb0fa772363380836a487;hb=5fbc0680d484bf6b8f4ea183f26bbe22797f92a3;hp=745dd79934e7809a6b8d91f442c67f708f4be975;hpb=8d61fc4ab7373b4a576f3f9108cdf7768ae27096;p=vchess.git

diff --git a/client/src/App.vue b/client/src/App.vue
index 745dd799..02693a62 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,98 +1,305 @@
 <template lang="pug">
 #app
-  // modal "welcome" will be filled in the selected language
-  #modalWelcome
-  Language
-  Settings(:settings="settings")
+  Settings
   ContactForm
+  UpsertUser
   .container
-    .row(v-show="$route.path == '/'")
-      // Header (on index only)
-      header
-        .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
-					img(src="./assets/images/index/unicorn.svg")
-					.info-container
-						p vchess.club
-					img(src="./assets/images/index/wildebeest.svg")
     .row
-      // Menu (top of page):
-      // shared: Home + flags, userMenu
-			// variant: hall, problems, rules, my games + settings
-			nav
-				label.drawer-toggle(for="drawerControl")
-				input#drawerControl.drawer(type="checkbox")
-				#menuBar
-					label.drawer-close(for="drawerControl")
-					router-link(v-if="$route.path != '/'" to="/")
-						| Home
-					router-link(:href="getLink('/hall')")
-						| getLink function : suffix ==> /variant + suffix
-						=translations["Hall"]
-					router-link(href="#tabGames")
-						=translations["My games"]
-					router-link(href="#rules")
-						=translations["Rules"]
-					router-link(href="#problems")
-						=translations["Problems"]
-					#userMenu.clickable.right-menu(onClick="doClick('modalUser')")
-						.info-container
-							if !user.email
-								p
-									span Login
-									span.icon-user
-							else
-								p
-									span Update
-									span.icon-user
-					#flagMenu.clickable.right-menu(onClick="doClick('modalLang')")
-					img(src="/images/flags/" + lang + ".svg")
-				#settings.clickable(v-show="display!='index'" onClick="doClick('modalSettings')")
-					i(data-feather="settings")
-    .row
-			router-view
-		.row
-			footer
-				.col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2.text-center
-					a(href="https://github.com/yagu0/vchess") Source code
-					p.clickable(onClick="doClick('modalContact')")
-						= translations["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")
+      .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
+        nav
+          label.drawer-toggle(for="drawerControl")
+          input#drawerControl.drawer(type="checkbox")
+          #menuBar(@click="hideDrawer($event)")
+            label.drawer-close(for="drawerControl")
+            #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"] }}
+            #rightMenu
+              .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#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 { ajax } from "@/utils/ajax.js";
 export default {
-  data: function() {
-    return {
-      settings: {}, //TODO
-    };
-  },
   components: {
     ContactForm,
-    Language,
     Settings,
+    UpsertUser
+  },
+  data: function() {
+    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
+  --card-back-color: #f4f6f6
+  --button-back-color: #d1d5d5
+  --table-body-back-color: #f8f8f8
+
+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
+  // 45px is footer height
+  min-height: calc(100vh - 45px)
+  overflow: hidden
+  padding: 0
+  margin: 0
+
+.row > div
+  padding: 0
+
+a
+  text-decoration: underline
+
+header
+  width: 100%
+  display: flex
+  align-items: center
+  justify-content: center
+  margin: 0 auto
+
+.clickable
+  cursor: pointer
+
+.text-center
   text-align: center
-  color: #2c3e50
-
-#nav
-  padding: 30px
-  a
-    font-weight: bold
-    color: #2c3e50
-    &.router-link-exact-active
-      color: #42b983
+
+.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
+  padding: 0
+  & > #menuBar
+    width: 100%
+    padding: 0
+    @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
+          text-decoration: none
+          color: #2c3e50
+          &.router-link-exact-active
+            color: #388e3c
+      & > #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
+          text-decoration: none
+          color: #2c3e50
+          &.router-link-exact-active
+            color: #388e3c
+      & > #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
+    & > 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
+  & > .router-link-exact-active
+    color: #388e3c !important
+    text-decoration: none
+  & > .menuitem
+    margin: 0 12px
+    display: inline-flex;
+    align-self: center;
+    &:link
+      color: #2c3e50
+      text-decoration: none
+    &:visited, &:hover
+      color: #2c3e50
+      text-decoration: none
+    & > img
+      height: 1.2em
+      display: inline-block
+      margin-left: 5px
+  & > p
+    display: inline-block
+    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
 </style>