aboutsummaryrefslogtreecommitdiff
path: root/viewer/src/plugins
diff options
context:
space:
mode:
authorOzoneGrif2020-02-24 01:15:14 +0100
committerGitHub2020-02-24 01:15:14 +0100
commit2a458e25c0510798120dddbd85cef5ee440c2a2a (patch)
tree77d6958950e1c6a2ad425da1c095fefce58b05e4 /viewer/src/plugins
parente42f4e864bac21ed3b19d1869df2cdd4f8c3433c (diff)
parenteb00c2a7874608f70ec7768eae8d006a22bc0a54 (diff)
downloadldgallery-2a458e25c0510798120dddbd85cef5ee440c2a2a.tar.gz
Merge pull request #144 from pacien/oz-search-overhaul
viewer: major code and search mode overhaul > Search indicator in the breadcrumbs: should be shown as clickable instead of being .disabled Not agreeing with this one.
Diffstat (limited to 'viewer/src/plugins')
-rw-r--r--viewer/src/plugins/buefy.ts4
-rw-r--r--viewer/src/plugins/fontawesome.ts2
-rw-r--r--viewer/src/plugins/router.ts17
3 files changed, 13 insertions, 10 deletions
diff --git a/viewer/src/plugins/buefy.ts b/viewer/src/plugins/buefy.ts
index 74b6176..ebdf64e 100644
--- a/viewer/src/plugins/buefy.ts
+++ b/viewer/src/plugins/buefy.ts
@@ -24,7 +24,7 @@ import Taginput from 'buefy/src/components/taginput';
24// @ts-ignore 24// @ts-ignore
25import Loading from 'buefy/src/components/loading'; 25import Loading from 'buefy/src/components/loading';
26// @ts-ignore 26// @ts-ignore
27import Radio from 'buefy/src/components/radio'; 27import Button from 'buefy/src/components/button';
28// @ts-ignore 28// @ts-ignore
29import SnackBar from 'buefy/src/components/snackbar'; 29import SnackBar from 'buefy/src/components/snackbar';
30 30
@@ -32,7 +32,7 @@ import "@/assets/scss/buefy.scss";
32 32
33Vue.use(Taginput); 33Vue.use(Taginput);
34Vue.use(Loading); 34Vue.use(Loading);
35Vue.use(Radio); 35Vue.use(Button);
36Vue.use(SnackBar); 36Vue.use(SnackBar);
37 37
38declare module 'vue/types/vue' { 38declare module 'vue/types/vue' {
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index e8848f9..cc8b7ab 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -23,6 +23,7 @@ import { library, config } from "@fortawesome/fontawesome-svg-core";
23import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; 23import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
24import { 24import {
25 faFolder, 25 faFolder,
26 faEraser,
26 faSearch, 27 faSearch,
27 faPlus, 28 faPlus,
28 faMinus, 29 faMinus,
@@ -37,6 +38,7 @@ import {
37 38
38library.add( 39library.add(
39 faFolder, 40 faFolder,
41 faEraser,
40 faSearch, 42 faSearch,
41 faPlus, 43 faPlus,
42 faMinus, 44 faMinus,
diff --git a/viewer/src/plugins/router.ts b/viewer/src/plugins/router.ts
index 8b4a8dc..00979c9 100644
--- a/viewer/src/plugins/router.ts
+++ b/viewer/src/plugins/router.ts
@@ -18,19 +18,20 @@
18*/ 18*/
19 19
20import Vue from "vue"; 20import Vue from "vue";
21import VueRouter from "vue-router"; 21import VueRouter, { RouteConfig } from "vue-router";
22import MainGallery from "@/views/MainGallery.vue"; 22import GalleryNavigation from "@/views/GalleryNavigation.vue";
23 23
24Vue.use(VueRouter); 24Vue.use(VueRouter);
25 25
26// async way : component: () => import(/* webpackChunkName: "MainGallery" */ "@/views/MainGallery.vue"), 26const routes: RouteConfig[] = [
27
28const routes = [
29 { 27 {
30 path: "*", 28 path: "*",
31 name: "MainGallery", 29 name: "GalleryNavigation",
32 component: MainGallery, 30 component: GalleryNavigation,
33 props: true 31 props: (route) => ({
32 path: route.params.pathMatch,
33 query: Object.keys(route.query),
34 }),
34 }, 35 },
35]; 36];
36 37