From 42105af46681d81959a5d5a9a16ec9e98463a92e Mon Sep 17 00:00:00 2001
From: Zero~Informatique
Date: Thu, 30 Jan 2020 21:24:15 +0100
Subject: viewer: new breadcrumb. navigation buttons. and styling improvements

---
 viewer/src/assets/scss/buefy.scss       |  3 +-
 viewer/src/assets/scss/global.scss      | 15 +++++++
 viewer/src/assets/scss/theme.scss       |  7 +--
 viewer/src/components/LdProposition.vue | 14 +++---
 viewer/src/plugins/fontawesome.ts       |  8 ++++
 viewer/src/views/GalleryThumbnail.vue   |  2 +-
 viewer/src/views/PanelLeft.vue          |  5 +--
 viewer/src/views/PanelTop.vue           | 78 ++++++++++++++++-----------------
 8 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/viewer/src/assets/scss/buefy.scss b/viewer/src/assets/scss/buefy.scss
index 7fdb883..735ce6a 100644
--- a/viewer/src/assets/scss/buefy.scss
+++ b/viewer/src/assets/scss/buefy.scss
@@ -24,8 +24,7 @@
 @import "buefy_variables";
 
 // 2. Setup your Custom Colors
-// $linkedin: #0077b5;
-// $linkedin-invert: findColorInvert($linkedin);
+@import "@/assets/scss/theme.scss";
 
 @import "~bulma/sass/utilities/derived-variables";
 
diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 645d4a0..3cfa1a5 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -44,6 +44,21 @@
   align-items: center;
 }
 
+// === Links
+
+.link {
+  color: $link;
+  cursor: pointer;
+  text-decoration: none;
+  & :hover {
+    color: $link-hover;
+  }
+}
+
+.disabled {
+  color: $disabled-color !important;
+}
+
 // === Scrollbar styling
 
 .scrollbar {
diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss
index 3f2b623..2314ee8 100644
--- a/viewer/src/assets/scss/theme.scss
+++ b/viewer/src/assets/scss/theme.scss
@@ -19,7 +19,7 @@
 
 // === Theme
 
-$layout-top: 70px;
+$layout-top: 35px;
 $layout-left: 250px;
 
 $panel-top-bgcolor: #225;
@@ -27,7 +27,8 @@ $panel-top-txtcolor: white;
 $panel-left-bgcolor: $panel-top-bgcolor;
 $panel-left-txtcolor: $panel-top-txtcolor;
 $content-bgcolor: #1e1e1e;
-
 $toolbar-color: #d62929;
-
 $loader-color: #272727;
+$link: $panel-top-txtcolor;
+$link-hover: lightblue;
+$disabled-color: rgba($link, 0.3);
diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue
index 9a32e0a..f653e4d 100644
--- a/viewer/src/components/LdProposition.vue
+++ b/viewer/src/components/LdProposition.vue
@@ -19,7 +19,7 @@
 
 <template>
   <div>
-    <div v-for="proposed in proposedTags" :key="proposed.rawTag" class="proposition">
+    <div v-for="proposed in proposedTags" :key="proposed.rawTag" class="proposition link">
       <fa-icon icon="minus" @click="add(Operation.SUBSTRACTION, proposed.rawTag)" />
       <span
         @click="add(Operation.INTERSECTION, proposed.rawTag)"
@@ -51,13 +51,12 @@ export default class LdTagInput extends Vue {
         .forEach(rawTag => (propositions[rawTag] = (propositions[rawTag] ?? 0) + 1));
     } else {
       // Tags count from the whole gallery
-      Object.entries(this.$galleryStore.tags)
-        .forEach(entry => (propositions[entry[0]] = entry[1].items.length));
+      Object.entries(this.$galleryStore.tags).forEach(entry => (propositions[entry[0]] = entry[1].items.length));
     }
-    
+
     return Object.entries(propositions)
-      .sort((a,b) => b[1] - a[1])
-      .map(entry => ({rawTag: entry[0], count: entry[1]}));
+      .sort((a, b) => b[1] - a[1])
+      .map(entry => ({ rawTag: entry[0], count: entry[1] }));
   }
 
   extractDistinctItems(currentTags: Tag.Search[]): Gallery.Item[] {
@@ -79,12 +78,13 @@ export default class LdTagInput extends Vue {
 </script>
 
 <style lang="scss">
+@import "@/assets/scss/theme.scss";
+
 .proposition {
   display: flex;
   justify-content: space-between;
   align-items: center;
   margin: 10px;
-  color: lightcyan;
   cursor: pointer;
 }
 .proposition span {
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index bb77c01..c17d4a1 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -28,6 +28,10 @@ import {
     faPlus,
     faMinus,
     faImage,
+    faHome,
+    faArrowLeft,
+    faFilter,
+    faAngleRight,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -37,6 +41,10 @@ library.add(
     faPlus,
     faMinus,
     faImage,
+    faHome,
+    faArrowLeft,
+    faFilter,
+    faAngleRight,
 );
 
 Vue.component("fa-icon", FontAwesomeIcon);
diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue
index 433a673..66e46d6 100644
--- a/viewer/src/views/GalleryThumbnail.vue
+++ b/viewer/src/views/GalleryThumbnail.vue
@@ -28,7 +28,7 @@
       @load="loading=false"
     />
     <div v-else class="flex-column flex-center">
-      <fa-icon icon="folder" class="fa-4x" />
+      <fa-icon icon="folder" size="4x" />
       {{item.path}}
     </div>
   </div>
diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue
index 16be249..35c092a 100644
--- a/viewer/src/views/PanelLeft.vue
+++ b/viewer/src/views/PanelLeft.vue
@@ -24,7 +24,7 @@
     <h1>{{$t('panelLeft.filters')}}</h1>
     <ld-tag-input />
     <h1>{{$t('panelLeft.propositions')}}</h1>
-    <ld-proposition />
+    <ld-proposition class="scrollbar" />
   </div>
 </template>
 
@@ -36,7 +36,4 @@ export default class PanelLeft extends Vue {}
 </script>
 
 <style lang="scss">
-.label {
-  color: white;
-}
 </style>
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index 0efc9b6..7e24699 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -18,23 +18,25 @@
 -->
 
 <template>
-  <div v-if="isReady">
-    <b-steps
-      v-model="activeStep"
-      class="pathBreadcrumb"
-      type="is-info"
-      :has-navigation="false"
-      :animated="false"
-      @input="onStepClick"
-    >
-      <b-step-item
-        v-for="item in $galleryStore.currentItemPath"
-        :key="item.path"
-        :label="item.title"
-        :icon="getIcon(item)"
-        :to="item.path"
-      />
-    </b-steps>
+  <div class="flex">
+    <div class="command-btns">
+      <fa-icon icon="filter" 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>
   </div>
 </template>
 
@@ -44,23 +46,8 @@ import Gallery from "./Gallery.vue";
 
 @Component
 export default class PanelTop extends Vue {
-  activeStep: number = -1;
-
-  mounted() {
-    this.currentItemPathChanged();
-  }
-
-  get isReady() {
-    return this.activeStep >= 0;
-  }
-
-  @Watch("$galleryStore.currentItemPath")
-  currentItemPathChanged() {
-    this.activeStep = -1;
-    this.$nextTick(() => (this.activeStep = this.$galleryStore.currentItemPath.length - 1));
-  }
-
   getIcon(item: Gallery.Item) {
+    if (item.path.length <= 1) return "home";
     switch (item.properties.type) {
       case "picture":
         return "image";
@@ -68,19 +55,28 @@ export default class PanelTop extends Vue {
         return "folder";
     }
   }
-
-  onStepClick(index: number) {
-    const item = this.$galleryStore.currentItemPath[index];
-    if (item) this.$router.push(item.path);
-  }
 }
 </script>
 
 <style lang="scss">
+@import "@/assets/scss/theme.scss";
+
 .pathBreadcrumb {
-  margin: 3px;
+  display: flex;
+  list-style: none;
+  margin: 5px;
+  a {
+    margin-right: 5px;
+  }
+  li:not(:first-child) {
+    margin-left: 10px;
+  }
 }
-.step-title {
-  color: white;
+.command-btns {
+  display: flex;
+  justify-content: space-around;
+  vertical-align: middle;
+  align-items: center;
+  width: $layout-left;
 }
 </style>
-- 
cgit v1.2.3