From 8d543ab94d3678728466d3627e0d419ec00f3010 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Wed, 29 Jan 2020 04:53:35 +0100 Subject: viewer: finalized the thumbnails view layouts. implemented thumbnails lazy-loading --- viewer/src/views/GalleryDirectory.vue | 15 ++++++++------- viewer/src/views/GallerySearch.vue | 5 ++++- viewer/src/views/GalleryThumbnail.vue | 34 ++++++++++++++++++++++++++++++++-- viewer/src/views/MainLayout.vue | 3 ++- 4 files changed, 46 insertions(+), 11 deletions(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue index eb98595..1df0c4d 100644 --- a/viewer/src/views/GalleryDirectory.vue +++ b/viewer/src/views/GalleryDirectory.vue @@ -18,13 +18,14 @@ --> diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue index 7e61f89..870d3e2 100644 --- a/viewer/src/views/GallerySearch.vue +++ b/viewer/src/views/GallerySearch.vue @@ -18,13 +18,16 @@ --> diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue index 4d8f604..7ceea4f 100644 --- a/viewer/src/views/GalleryThumbnail.vue +++ b/viewer/src/views/GalleryThumbnail.vue @@ -18,8 +18,15 @@ --> -- cgit v1.2.3 From 118666b4c3faeaeaf153a2ea7172764a3cbcffab Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Wed, 29 Jan 2020 23:04:30 +0100 Subject: viewer: the loader now correctly waits for the json to be loaded and indexes to be processed before displaying the UI. resolves #61 --- viewer/src/views/MainLayout.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue index 7a75eb1..f608b9d 100644 --- a/viewer/src/views/MainLayout.vue +++ b/viewer/src/views/MainLayout.vue @@ -19,9 +19,9 @@ @@ -35,7 +35,7 @@ import PanelTop from "./PanelTop.vue"; components: { PanelLeft, PanelTop }, }) export default class MainLayout extends Vue { - isLoading: boolean = false; + isLoading: boolean = true; mounted() { this.fetchGalleryItems(); -- cgit v1.2.3 From 8670fb146e90f98653c776b01f29d905e5a6fe9f Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Wed, 29 Jan 2020 23:11:55 +0100 Subject: viewer: fixed subdirectory deploiement; all paths are now relative to index.html. resolves #17 --- viewer/src/views/MainLayout.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue index f608b9d..cedef58 100644 --- a/viewer/src/views/MainLayout.vue +++ b/viewer/src/views/MainLayout.vue @@ -44,7 +44,7 @@ export default class MainLayout extends Vue { fetchGalleryItems() { this.isLoading = true; this.$galleryStore - .fetchGalleryItems(`${process.env.VUE_APP_DATA_URL}/index.json`) + .fetchGalleryItems(`${process.env.VUE_APP_DATA_URL}index.json`) .finally(() => (this.isLoading = false)) .catch(this.displayError); } -- cgit v1.2.3 From 234d0d13c767786393494810526a77d3d89b0e83 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Thu, 30 Jan 2020 17:01:56 +0100 Subject: viewer: global keypress componant. ESC gets out of fullscreen. --- viewer/src/views/MainLayout.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'viewer/src/views') diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue index cedef58..f0809b6 100644 --- a/viewer/src/views/MainLayout.vue +++ b/viewer/src/views/MainLayout.vue @@ -23,6 +23,7 @@ + -- cgit v1.2.3 From 76af6cffce939ef3c9a0952e6f7adc234e92f782 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Thu, 30 Jan 2020 17:04:09 +0100 Subject: viewer: directories first and sorted by title in the navigation mode --- viewer/src/views/Gallery.vue | 104 -------------------------------- viewer/src/views/GalleryDirectory.vue | 8 ++- viewer/src/views/MainGallery.vue | 108 ++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 105 deletions(-) delete mode 100644 viewer/src/views/Gallery.vue create mode 100644 viewer/src/views/MainGallery.vue (limited to 'viewer/src/views') diff --git a/viewer/src/views/Gallery.vue b/viewer/src/views/Gallery.vue deleted file mode 100644 index fad7cc3..0000000 --- a/viewer/src/views/Gallery.vue +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue index 1df0c4d..d01032d 100644 --- a/viewer/src/views/GalleryDirectory.vue +++ b/viewer/src/views/GalleryDirectory.vue @@ -19,7 +19,7 @@ @@ -56,6 +56,7 @@ export default class GalleryPicture extends Vue { height: 100%; & > img { object-fit: contain; + cursor: zoom-in; } } .originalSize { @@ -67,6 +68,7 @@ export default class GalleryPicture extends Vue { max-width: unset; max-height: unset; object-fit: none; + cursor: zoom-out; } } -- cgit v1.2.3 From 16d319ac092aea56ac9f872129d23fface4b379d Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Thu, 30 Jan 2020 18:34:34 +0100 Subject: viewer: thumbnail loader styling --- viewer/src/views/GalleryThumbnail.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/GalleryThumbnail.vue b/viewer/src/views/GalleryThumbnail.vue index 7ceea4f..433a673 100644 --- a/viewer/src/views/GalleryThumbnail.vue +++ b/viewer/src/views/GalleryThumbnail.vue @@ -57,16 +57,14 @@ export default class GalleryThumbnail extends Vue { max-height: 250px; } .preload { - background: linear-gradient(to right, rgba(0, 0, 0, 0) 8%, $loader-color 18%, rgba(0, 0, 0, 0) 33%); - background-size: 200% 50px; - animation: preloadAnimation 2s infinite linear; + animation: preloadAnimation 1s infinite ease-in-out alternate; } @keyframes preloadAnimation { from { - background-position: -200px 0; + background-color: $content-bgcolor; } to { - background-position: 200px 0; + background-color: $loader-color; } } // Temporary size until we get the true thumbnail size -- cgit v1.2.3 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/views/GalleryThumbnail.vue | 2 +- viewer/src/views/PanelLeft.vue | 5 +-- viewer/src/views/PanelTop.vue | 78 +++++++++++++++++------------------ 3 files changed, 39 insertions(+), 46 deletions(-) (limited to 'viewer/src/views') 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" />
- + {{item.path}}
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 @@

{{$t('panelLeft.filters')}}

{{$t('panelLeft.propositions')}}

- + @@ -36,7 +36,4 @@ export default class PanelLeft extends Vue {} 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 @@ --> @@ -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); - } } -- cgit v1.2.3 From 17b1598c5a5a375e6eaa0763767368c05ba0f56e Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Thu, 30 Jan 2020 22:58:27 +0100 Subject: viewer: Improved the proposition layout --- viewer/src/views/PanelLeft.vue | 2 +- viewer/src/views/PanelTop.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue index 35c092a..ea35664 100644 --- a/viewer/src/views/PanelLeft.vue +++ b/viewer/src/views/PanelLeft.vue @@ -24,7 +24,7 @@

{{$t('panelLeft.filters')}}

{{$t('panelLeft.propositions')}}

- + diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue index 7e24699..e7421f0 100644 --- a/viewer/src/views/PanelTop.vue +++ b/viewer/src/views/PanelTop.vue @@ -20,7 +20,7 @@ -- cgit v1.2.3 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/views/MainLayout.vue | 7 ++-- viewer/src/views/PanelTop.vue | 64 +++++++---------------------------- viewer/src/views/TopBreadcrumb.vue | 63 +++++++++++++++++++++++++++++++++++ viewer/src/views/TopCommand.vue | 68 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 54 deletions(-) create mode 100644 viewer/src/views/TopBreadcrumb.vue create mode 100644 viewer/src/views/TopCommand.vue (limited to 'viewer/src/views') 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 @@ --> diff --git a/viewer/src/views/TopBreadcrumb.vue b/viewer/src/views/TopBreadcrumb.vue deleted file mode 100644 index 9104b80..0000000 --- a/viewer/src/views/TopBreadcrumb.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - diff --git a/viewer/src/views/TopCommand.vue b/viewer/src/views/TopCommand.vue deleted file mode 100644 index dc79fa7..0000000 --- a/viewer/src/views/TopCommand.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - -- cgit v1.2.3 From 675f007d85a69d89a9252d980562509f224d4b29 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Mon, 10 Feb 2020 15:20:13 +0100 Subject: viewer: re-applied changes which were eaten by the big Eldrich monster --- viewer/src/views/PanelLeft.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue index ea35664..2c00bbf 100644 --- a/viewer/src/views/PanelLeft.vue +++ b/viewer/src/views/PanelLeft.vue @@ -19,11 +19,11 @@ -- cgit v1.2.3 From 95f75d95c12e95fd5c54c2203e031b0a593c7550 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 10 Feb 2020 20:13:50 +0100 Subject: viewer: move temporary mode selector Out of the sidebar so we can continue polishing the interface without interference. --- viewer/src/views/MainLayout.vue | 17 ++++++++++++++++- viewer/src/views/PanelLeft.vue | 3 --- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue index 78d8a8a..31b0440 100644 --- a/viewer/src/views/MainLayout.vue +++ b/viewer/src/views/MainLayout.vue @@ -24,6 +24,10 @@ + + + + @@ -123,4 +127,15 @@ html { background-color: $content-bgcolor; } } - \ No newline at end of file + +// TODO: Remove when #21 (remove explicit navigation/search modes) is resolved +// Forced at the bottom right corner so we can continue working on the sidebar without interference +.tmp-mode-selector { + position: absolute; + bottom: 0; + right: 0; + z-index: 100; + opacity: 0.75; +} +// ===== + diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue index 2c00bbf..91d193c 100644 --- a/viewer/src/views/PanelLeft.vue +++ b/viewer/src/views/PanelLeft.vue @@ -20,9 +20,6 @@ diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue index 4e843b9..278bbe3 100644 --- a/viewer/src/views/GallerySearch.vue +++ b/viewer/src/views/GallerySearch.vue @@ -25,9 +25,6 @@
{{$t('search.no-results')}}
-
- -
-- cgit v1.2.3 From 85950b42384d315f74a4e6b1077618cd557bb15a Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 10 Feb 2020 20:20:25 +0100 Subject: viewer: sidebar: self-contain style We'll polish that later when groups are done. For now let's have this styling self-contained. --- viewer/src/views/PanelLeft.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'viewer/src/views') diff --git a/viewer/src/views/PanelLeft.vue b/viewer/src/views/PanelLeft.vue index 91d193c..a61fe4a 100644 --- a/viewer/src/views/PanelLeft.vue +++ b/viewer/src/views/PanelLeft.vue @@ -18,7 +18,7 @@ -->