From 252dd6fc6f53ecd8b28e05a0514429472d53d08e Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Fri, 31 Jan 2020 06:46:31 +0100
Subject: viewer: finalized the command buttons. added the 'up to parent'
 command

---
 viewer/src/locales/en.json         |  6 +++-
 viewer/src/plugins/fontawesome.ts  |  6 ++--
 viewer/src/store/uiStore.ts        |  5 +++
 viewer/src/views/MainLayout.vue    |  7 ++--
 viewer/src/views/PanelTop.vue      | 64 +++++++----------------------------
 viewer/src/views/TopBreadcrumb.vue | 63 +++++++++++++++++++++++++++++++++++
 viewer/src/views/TopCommand.vue    | 68 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 162 insertions(+), 57 deletions(-)
 create mode 100644 viewer/src/views/TopBreadcrumb.vue
 create mode 100644 viewer/src/views/TopCommand.vue

(limited to 'viewer')

diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index d44a116..987d4d1 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -7,5 +7,9 @@
   "mode.search": "Search",
   "search.no-results": "No results",
   "panelLeft.propositions": "Proposed tags",
-  "gallery.unknowntype": "Unknown item type"
+  "gallery.unknowntype": "Unknown item type",
+  "title.tags": "Tags",
+  "title.home": "Home",
+  "title.back": "Back",
+  "title.parent": "Parent"
 }
\ No newline at end of file
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index bf2ff5f..fdbfcdb 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -24,27 +24,29 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import {
     faFolder,
     faSearch,
-    faTag,
     faPlus,
     faMinus,
     faImage,
     faHome,
     faArrowLeft,
+    faLevelUpAlt,
     faTags,
     faAngleRight,
+    faWindowClose,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
     faFolder,
     faSearch,
-    faTag,
     faPlus,
     faMinus,
     faImage,
     faHome,
     faArrowLeft,
+    faLevelUpAlt,
     faTags,
     faAngleRight,
+    faWindowClose,
 );
 
 Vue.component("fa-icon", FontAwesomeIcon);
diff --git a/viewer/src/store/uiStore.ts b/viewer/src/store/uiStore.ts
index 6bcc538..f7484de 100644
--- a/viewer/src/store/uiStore.ts
+++ b/viewer/src/store/uiStore.ts
@@ -27,6 +27,7 @@ const VuexModule = createModule({
 export default class UIStore extends VuexModule {
 
     fullscreen: boolean = false;
+    fullWidth: boolean = true;
     mode: "navigation" | "search" = "navigation";
     currentTags: Tag.Search[] = [];
 
@@ -46,6 +47,10 @@ export default class UIStore extends VuexModule {
         this.fullscreen = !this.fullscreen;
     }
 
+    @mutation toggleFullWidth() {
+        this.fullWidth = !this.fullWidth;
+    }
+
     @mutation setModeNavigation() {
         this.mode = "navigation";
     }
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index f0809b6..c202def 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -18,7 +18,7 @@
 -->
 
 <template>
-  <div :class="{fullscreen: $uiStore.fullscreen}">
+  <div :class="{fullscreen: $uiStore.fullscreen, fullWidth: $uiStore.fullWidth}">
     <panel-top v-if="!isLoading" class="layout layout-top" />
     <panel-left v-if="!isLoading" class="layout layout-left" />
     <router-view v-if="!isLoading" class="layout layout-content scrollbar" />
@@ -98,8 +98,11 @@ html {
   }
 }
 .fullscreen {
-  --layout-left: 0px;
   --layout-top: 0px;
+  @extend .fullWidth;
+}
+.fullWidth {
+  --layout-left: 0px;
   .layout {
     &.layout-left {
       transform: translate(-$layout-left, 0);
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index e7421f0..3553789 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -19,64 +19,24 @@
 
 <template>
   <div class="flex">
-    <div class="command-btns">
-      <fa-icon icon="tags" size="lg" class="disabled" />
-      <router-link to="/" :class="{disabled: $galleryStore.currentItemPath.length <= 1}">
-        <fa-icon icon="home" size="lg" />
-      </router-link>
-      <div class="link" @click="$router.go(-1)">
-        <fa-icon icon="arrow-left" size="lg" />
-      </div>
-    </div>
-    <ul class="pathBreadcrumb">
-      <li v-for="(item,idx) in $galleryStore.currentItemPath" :key="item.path">
-        <router-link :to="item.path">
-          <fa-icon :icon="getIcon(item)" size="lg" />
-          {{item.title}}
-        </router-link>
-        <fa-icon v-if="(idx+1) < $galleryStore.currentItemPath.length" icon="angle-right" />
-      </li>
-    </ul>
+    <top-command />
+    <top-breadcrumb />
   </div>
 </template>
 
 <script lang="ts">
-import { Component, Vue, Prop, Watch } from "vue-property-decorator";
-import Gallery from "./Gallery.vue";
+import { Component, Vue } from "vue-property-decorator";
+import TopBreadcrumb from "./TopBreadcrumb.vue";
+import TopCommand from "./TopCommand.vue";
 
-@Component
-export default class PanelTop extends Vue {
-  getIcon(item: Gallery.Item) {
-    if (item.path.length <= 1) return "home";
-    switch (item.properties.type) {
-      case "picture":
-        return "image";
-      case "directory":
-        return "folder";
-    }
-  }
-}
+@Component({
+  components: {
+    TopCommand,
+    TopBreadcrumb,
+  },
+})
+export default class PanelTop extends Vue {}
 </script>
 
 <style lang="scss">
-@import "@/assets/scss/theme.scss";
-
-.pathBreadcrumb {
-  display: flex;
-  list-style: none;
-  margin: 5px;
-  a {
-    margin-right: 5px;
-  }
-  li:not(:first-child) {
-    margin-left: 10px;
-  }
-}
-.command-btns {
-  display: flex;
-  justify-content: space-around;
-  vertical-align: middle;
-  align-items: center;
-  width: $layout-left;
-}
 </style>
diff --git a/viewer/src/views/TopBreadcrumb.vue b/viewer/src/views/TopBreadcrumb.vue
new file mode 100644
index 0000000..1a14123
--- /dev/null
+++ b/viewer/src/views/TopBreadcrumb.vue
@@ -0,0 +1,63 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <ul class="pathBreadcrumb">
+    <li v-for="(item,idx) in $galleryStore.currentItemPath" :key="item.path">
+      <router-link :to="item.path">
+        <fa-icon :icon="getIcon(item)" size="lg" />
+        {{item.title}}
+      </router-link>
+      <fa-icon v-if="(idx+1) < $galleryStore.currentItemPath.length" icon="angle-right" />
+    </li>
+  </ul>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+
+@Component
+export default class TopBreadcrumb extends Vue {
+  getIcon(item: Gallery.Item) {
+    if (item.path.length <= 1) return "home";
+    switch (item.properties.type) {
+      case "picture":
+        return "image";
+      case "directory":
+        return "folder";
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.pathBreadcrumb {
+  border-left: 2px solid rgba(white, 0.1);
+  padding-left: 15px;
+  display: flex;
+  list-style: none;
+  margin: 5px;
+  a {
+    margin-right: 5px;
+  }
+  li:not(:first-child) {
+    margin-left: 10px;
+  }
+}
+</style>
diff --git a/viewer/src/views/TopCommand.vue b/viewer/src/views/TopCommand.vue
new file mode 100644
index 0000000..b5d16e8
--- /dev/null
+++ b/viewer/src/views/TopCommand.vue
@@ -0,0 +1,68 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU Affero General Public License as
+-- published by the Free Software Foundation, either version 3 of the
+-- License, or (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU Affero General Public License for more details.
+--
+-- You should have received a copy of the GNU Affero General Public License
+-- along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<template>
+  <div class="flex command-btns">
+    <div class="link" title="$t('title.tags')" @click="$uiStore.toggleFullWidth()">
+      <fa-icon :icon="commandTagsIcon()" size="lg" />
+    </div>
+    <router-link to="/" :class="{disabled: isRoot()}" title="$t('title.home')">
+      <fa-icon icon="home" size="lg" />
+    </router-link>
+    <div class="link" title="$t('title.back')" @click="$router.go(-1)">
+      <fa-icon icon="arrow-left" size="lg" />
+    </div>
+    <router-link :class="{disabled: isRoot()}" title="$t('title.parent')" :to="parent()">
+      <fa-icon icon="folder" size="xs" />
+      <fa-icon icon="level-up-alt" size="lg" />
+    </router-link>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import { RawLocation } from "vue-router";
+
+@Component
+export default class TopCommand extends Vue {
+  commandTagsIcon(): string {
+    return this.$uiStore.fullWidth ? "tags" : "window-close";
+  }
+
+  isRoot(): boolean {
+    return this.$galleryStore.currentItemPath.length <= 1;
+  }
+
+  parent(): RawLocation {
+    if (!this.isRoot()) return this.$galleryStore.currentItemPath[this.$galleryStore.currentItemPath.length - 2];
+    return "";
+  }
+}
+</script>
+
+<style lang="scss">
+@import "@/assets/scss/theme.scss";
+
+.command-btns {
+  justify-content: space-around;
+  vertical-align: middle;
+  align-items: center;
+  width: $layout-left;
+}
+</style>
-- 
cgit v1.2.3