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

diff --git a/client/src/App.vue b/client/src/App.vue
index 745dd799..c5008f2e 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,61 +1,43 @@
 <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")
+      .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
+        nav
+          label.drawer-toggle(for="drawerControl")
+          input#drawerControl.drawer(type="checkbox")
+          #menuBar
+            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="/problems")
+                | {{ st.tr["Problems"] }}
+            #rightMenu
+              .clickable(onClick="doClick('modalUser')")
+                | {{ st.user.id > 0 ? "Update" : "Login" }}
+              .clickable(onClick="doClick('modalSettings')")
+                | {{ st.tr["Settings"] }}
+              .clickable#flagContainer(onClick="doClick('modalLang')")
+                img(v-if="!!st.lang" :src="flagImage")
+    router-view
     .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"]
+      .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")
@@ -66,16 +48,28 @@
 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";
 export default {
-  data: function() {
-    return {
-      settings: {}, //TODO
-    };
-  },
   components: {
     ContactForm,
     Language,
     Settings,
+    UpsertUser,
+  },
+  data: function() {
+    return {
+      st: store.state,
+    };
+  },
+//    // TODO: $route: ...
+//    gameRef: function() {
+//      this.loadGame();
+//    },
+  computed: {
+    flagImage: function() {
+      return `/images/flags/${this.st.lang}.svg`;
+    },
   },
 };
 </script>
@@ -85,14 +79,86 @@ export default {
   font-family: "Avenir", Helvetica, Arial, sans-serif
   -webkit-font-smoothing: antialiased
   -moz-osx-font-smoothing: grayscale
-  text-align: center
-  color: #2c3e50
 
-#nav
-  padding: 30px
-  a
-    font-weight: bold
-    color: #2c3e50
-    &.router-link-exact-active
-      color: #42b983
+.container
+  @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
+
+nav
+  width: 100%
+  margin: 0
+  padding: 0
+  & > #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
+[type="checkbox"].drawer+*
+  right: -767px
+
+footer
+  //background-color: #000033
+  font-size: 1rem
+  width: 100%
+  padding-left: 0
+  padding-right: 0
+  display: inline-flex
+  align-items: center
+  justify-content: center
+  & > a
+    display: inline-block
+    margin: 0 10px 0 0
+    &:link
+      color: #2c3e50
+    &:hover
+      text-decoration: none
+  & > p
+    display: inline-block
+    margin: 0 0 0 10px
 </style>