X-Git-Url: https://git.auder.net/images/pieces/Cwda/bt.svg?a=blobdiff_plain;f=client%2Fsrc%2FApp.vue;h=2771e282c1cfa86f14f6293d61068f6eab8ac03c;hb=67cb2575962f6ce9af954cdabefb7e45ce6baaa5;hp=89b645b37aae50dd490cd014dedcacd9c8197408;hpb=ee37e2af8fc3ce2273eddfbe66822ce8b6b011d6;p=vchess.git

diff --git a/client/src/App.vue b/client/src/App.vue
index 89b645b3..2771e282 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,94 +1,249 @@
 <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 {{ $lang }}
-					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")
-      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"]
+      .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
+        // Right: usermenu, settings, flag
+        nav
+          label.drawer-toggle(for="drawerControl")
+          input#drawerControl.drawer(type="checkbox")
+          #menuBar(@click="hideDrawer")
+            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"] }}
+            #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")
+    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"] }}
+          p.clickable(onClick="doClick('modalContact')")
+            | {{ 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 {
-  data: function() {
-    return {
-      settings: {}, //TODO
-    };
-  },
   components: {
     ContactForm,
     Language,
     Settings,
+    UpsertUser,
+  },
+  data: function() {
+    return {
+      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
+
+.row > div
+  padding: 0
+
+.nopadding
+  padding: 0
+
+header
+  width: 100%
+  display: flex
+  align-items: center
+  justify-content: center
+  margin: 0 auto
+  & > img
+    width: 30px
+    height: 30px
+
+.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
+
+.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
+  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
+          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
+  & > .router-link-exact-active
+    color: #42b983 !important
+    text-decoration: none
+  & > .menuitem
+    display: inline-block
+    margin: 0 10px
+    &:link
+      color: #2c3e50
+    &:visited, &:hover
+      color: #2c3e50
+      text-decoration: none
+  & > p
+    display: inline-block
+    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>