viewer: item display order

github: resolves #28

13 files changed, 127 insertions, 6 deletions

diff --git a/viewer/package-lock.json b/viewer/package-lock.json
index 5898393..6b57e8e 100644
--- a/viewer/package-lock.json
+++ b/viewer/package-lock.json
@@ -1191,6 +1191,14 @@
         "@fortawesome/fontawesome-common-types": "^0.2.30"
       }
     },
+    "@fortawesome/free-regular-svg-icons": {
+      "version": "5.14.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.14.0.tgz",
+      "integrity": "sha512-6LCFvjGSMPoUQbn3NVlgiG4CY5iIY8fOm+to/D6QS/GvdqhDt+xZklQeERdCvVRbnFa1ITc1rJHPRXqkX5wztQ==",
+      "requires": {
+        "@fortawesome/fontawesome-common-types": "^0.2.30"
+      }
+    },
     "@fortawesome/free-solid-svg-icons": {
       "version": "5.14.0",
       "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.14.0.tgz",
diff --git a/viewer/package.json b/viewer/package.json
index 74e0636..892125a 100644
--- a/viewer/package.json
+++ b/viewer/package.json
@@ -15,6 +15,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "1.2.30",
     "@fortawesome/free-solid-svg-icons": "5.14.0",
+    "@fortawesome/free-regular-svg-icons": "5.14.0",
     "@fortawesome/vue-fontawesome": "2.0.0",
     "@types/hammerjs": "2.0.36",
     "@types/marked": "1.1.0",
diff --git a/viewer/src/assets/scss/theme.scss b/viewer/src/assets/scss/theme.scss
index c59eba9..19fe673 100644
--- a/viewer/src/assets/scss/theme.scss
+++ b/viewer/src/assets/scss/theme.scss
@@ -54,6 +54,8 @@ $button-focus-color: $button-color;
 $button-focus-border-color: $link;
 $button-focus-box-shadow-size: 0;
 $body-line-height: 1.5;
+$dropdown-item-color: $palette-900;
+$dropdown-item-active-color: $palette-900;
 
 // Custom components
 
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index d3705de..6059162 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -23,6 +23,7 @@
     <a class="link" :title="$t('command.search')" @click="$uiStore.toggleFullWidth()">
       <fa-icon :icon="commandToggleSearchPanelIcon" size="lg" />
     </a>
+    <ld-command-sort />
     <a
       :class="{ disabled: isEntryPoint }"
       class="link command-secondary"
diff --git a/viewer/src/components/LdCommandSort.vue b/viewer/src/components/LdCommandSort.vue
new file mode 100644
index 0000000..1d2eac3
--- /dev/null
+++ b/viewer/src/components/LdCommandSort.vue
@@ -0,0 +1,57 @@
+<!-- ldgallery - A static generator which turns a collection of tagged
+--             pictures into a searchable web gallery.
+--
+-- Copyright (C) 2019-2020  Guillaume FOUET
+--               2020       Pacien TRAN-GIRARD
+--
+-- 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>
+  <b-dropdown v-model="selectedSort" :mobile-modal="false" append-to-body @change="onChangeSort">
+    <a slot="trigger" class="link">
+      <fa-icon icon="sort-amount-down" size="lg" />
+    </a>
+    <b-dropdown-item v-for="(sort, idx) in SORTS" :key="idx" :value="idx">
+      <fa-icon :icon="['far', idx === selectedSort ? 'dot-circle' : 'circle']" />
+      <span :class="$style.ml1">{{ sort.name }}</span>
+    </b-dropdown-item>
+  </b-dropdown>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop } from "vue-property-decorator";
+import { RawLocation } from "vue-router";
+import ItemSortFn from "@/services/itemSortFn";
+
+@Component
+export default class LdCommandSort extends Vue {
+  readonly SORTS = [
+    { name: this.$t("command.sort.byName"), fn: ItemSortFn.sortByName },
+    { name: this.$t("command.sort.byDateDesc"), fn: ItemSortFn.sortByDateDesc },
+  ];
+
+  selectedSort = 0;
+
+  onChangeSort(newValue: number) {
+    this.$uiStore.setSortFn(this.SORTS[newValue].fn);
+  }
+}
+</script>
+
+<style lang="scss" module>
+.ml1 {
+  margin-left: 0.5em;
+}
+</style>
diff --git a/viewer/src/components/LdGallery.vue b/viewer/src/components/LdGallery.vue
index 5a72d99..0c0a43c 100644
--- a/viewer/src/components/LdGallery.vue
+++ b/viewer/src/components/LdGallery.vue
@@ -20,7 +20,7 @@
 <template>
   <ld-error v-if="hasNoResults" icon="search" :message="noresult" />
   <div v-else class="thumbnail-tiles">
-    <router-link v-for="item in items" :key="item.path" :to="item.path">
+    <router-link v-for="item in sortedItems" :key="item.path" :to="item.path">
       <ld-thumbnail :item="item" />
     </router-link>
   </div>
@@ -35,6 +35,10 @@ export default class LdPicture extends Vue {
   @Prop({ type: Array, required: true }) readonly items!: Gallery.Item[];
   @Prop(String) readonly noresult?: string;
 
+  get sortedItems() {
+    return this.items.sort(this.$uiStore.sortFn);
+  }
+
   get hasNoResults(): boolean {
     return Boolean(this.noresult) && this.items.length === 0;
   }
diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index b36ac57..915f600 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -17,5 +17,7 @@
   "directory.no-results": "Empty directory",
   "panelLeft.propositions.other": "other filters",
   "panelLeft.information.title": "Information",
-  "tag-propositions.showmore": "show more ({0})"
+  "tag-propositions.showmore": "show more ({0})",
+  "command.sort.byName": "By name",
+  "command.sort.byDateDesc": "By most recent"
 }
diff --git a/viewer/src/plugins/buefy.ts b/viewer/src/plugins/buefy.ts
index 7a71019..4794ad9 100644
--- a/viewer/src/plugins/buefy.ts
+++ b/viewer/src/plugins/buefy.ts
@@ -29,6 +29,8 @@ import Button from "buefy/src/components/button";
 import SnackBar from "buefy/src/components/snackbar";
 // @ts-ignore
 import Tag from "buefy/src/components/tag";
+// @ts-ignore
+import DropDown from "buefy/src/components/dropdown";
 
 import "@/assets/scss/buefy.scss";
 
@@ -37,6 +39,7 @@ Vue.use(Loading);
 Vue.use(Button);
 Vue.use(SnackBar);
 Vue.use(Tag);
+Vue.use(DropDown);
 
 declare module "vue/types/vue" {
   interface Vue {
diff --git a/viewer/src/plugins/fontawesome-icons.ts b/viewer/src/plugins/fontawesome-icons.ts
index 8d136a6..4b50641 100644
--- a/viewer/src/plugins/fontawesome-icons.ts
+++ b/viewer/src/plugins/fontawesome-icons.ts
@@ -39,4 +39,7 @@ export {
   faCaretUp,
   faCaretDown,
   faAngleDoubleDown,
+  faSortAmountDown,
 } from "@fortawesome/free-solid-svg-icons";
+
+export { faCircle, faDotCircle } from "@fortawesome/free-regular-svg-icons";
diff --git a/viewer/src/services/itemSortFn.ts b/viewer/src/services/itemSortFn.ts
new file mode 100644
index 0000000..ec9942c
--- /dev/null
+++ b/viewer/src/services/itemSortFn.ts
@@ -0,0 +1,28 @@
+/* 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/>.