From e6c2a8d9653ffde924632ca2f260c3a8cddc14ed Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Fri, 11 Sep 2020 00:15:04 +0200 Subject: viewer: item display order github: resolves #28 --- viewer/package-lock.json | 8 +++++ viewer/package.json | 1 + viewer/src/assets/scss/theme.scss | 2 ++ viewer/src/components/LdCommand.vue | 1 + viewer/src/components/LdCommandSort.vue | 57 +++++++++++++++++++++++++++++++++ viewer/src/components/LdGallery.vue | 6 +++- viewer/src/locales/en.json | 4 ++- viewer/src/plugins/buefy.ts | 3 ++ viewer/src/plugins/fontawesome-icons.ts | 3 ++ viewer/src/services/itemSortFn.ts | 28 ++++++++++++++++ viewer/src/store/galleryStore.ts | 4 +-- viewer/src/store/uiStore.ts | 8 +++++ viewer/src/views/MainLayout.vue | 8 +++-- 13 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 viewer/src/components/LdCommandSort.vue create mode 100644 viewer/src/services/itemSortFn.ts 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 @@ + . +--> + + + + + + 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 @@