aboutsummaryrefslogtreecommitdiff
path: root/viewer/src/plugins
diff options
context:
space:
mode:
authorpacien2020-09-25 16:01:49 +0200
committerpacien2020-09-25 16:01:49 +0200
commite93f7b1eb84c083d67567115284c0002a3a7d5fc (patch)
tree8d373e8f7f571485e1330928f43b090ed004c525 /viewer/src/plugins
parent8e3ac8fe44bebb38e1882ca7f06b8100078ad88d (diff)
parentfd542f75a1d94ee5f804d0925823276b97f38581 (diff)
downloadldgallery-e93f7b1eb84c083d67567115284c0002a3a7d5fc.tar.gz
Merge branch 'develop' for release v2.0v2.0
Diffstat (limited to 'viewer/src/plugins')
-rw-r--r--viewer/src/plugins/buefy.ts6
-rw-r--r--viewer/src/plugins/fontawesome-icons.ts45
-rw-r--r--viewer/src/plugins/fontawesome.ts30
-rw-r--r--viewer/src/plugins/router.ts2
4 files changed, 54 insertions, 29 deletions
diff --git a/viewer/src/plugins/buefy.ts b/viewer/src/plugins/buefy.ts
index 0f8e16b..4794ad9 100644
--- a/viewer/src/plugins/buefy.ts
+++ b/viewer/src/plugins/buefy.ts
@@ -27,6 +27,10 @@ import Loading from "buefy/src/components/loading";
27import Button from "buefy/src/components/button"; 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// @ts-ignore
31import Tag from "buefy/src/components/tag";
32// @ts-ignore
33import DropDown from "buefy/src/components/dropdown";
30 34
31import "@/assets/scss/buefy.scss"; 35import "@/assets/scss/buefy.scss";
32 36
@@ -34,6 +38,8 @@ Vue.use(Taginput);
34Vue.use(Loading); 38Vue.use(Loading);
35Vue.use(Button); 39Vue.use(Button);
36Vue.use(SnackBar); 40Vue.use(SnackBar);
41Vue.use(Tag);
42Vue.use(DropDown);
37 43
38declare module "vue/types/vue" { 44declare module "vue/types/vue" {
39 interface Vue { 45 interface Vue {
diff --git a/viewer/src/plugins/fontawesome-icons.ts b/viewer/src/plugins/fontawesome-icons.ts
new file mode 100644
index 0000000..4b50641
--- /dev/null
+++ b/viewer/src/plugins/fontawesome-icons.ts
@@ -0,0 +1,45 @@
1/* ldgallery - A static generator which turns a collection of tagged
2-- pictures into a searchable web gallery.
3--
4-- Copyright (C) 2019-2020 Guillaume FOUET
5--
6-- This program is free software: you can redistribute it and/or modify
7-- it under the terms of the GNU Affero General Public License as
8-- published by the Free Software Foundation, either version 3 of the
9-- License, or (at your option) any later version.
10--
11-- This program is distributed in the hope that it will be useful,
12-- but WITHOUT ANY WARRANTY; without even the implied warranty of
13-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-- GNU Affero General Public License for more details.
15--
16-- You should have received a copy of the GNU Affero General Public License
17-- along with this program. If not, see <https://www.gnu.org/licenses/>.
18*/
19
20export {
21 faFolder,
22 faFolderOpen,
23 faEraser,
24 faSearch,
25 faPlus,
26 faMinus,
27 faImage,
28 faHome,
29 faArrowLeft,
30 faLevelUpAlt,
31 faAngleRight,
32 faAngleDoubleLeft,
33 faFile,
34 faFileAlt,
35 faFilePdf,
36 faFileVideo,
37 faFileAudio,
38 faFileDownload,
39 faCaretUp,
40 faCaretDown,
41 faAngleDoubleDown,
42 faSortAmountDown,
43} from "@fortawesome/free-solid-svg-icons";
44
45export { faCircle, faDotCircle } from "@fortawesome/free-regular-svg-icons";
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index 480e8e0..25ddd99 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -21,35 +21,9 @@ import Vue from "vue";
21 21
22import { library, config } from "@fortawesome/fontawesome-svg-core"; 22import { library, config } from "@fortawesome/fontawesome-svg-core";
23import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; 23import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
24import { 24import * as faIcons from "./fontawesome-icons";
25 faFolder,
26 faEraser,
27 faSearch,
28 faPlus,
29 faMinus,
30 faImage,
31 faHome,
32 faArrowLeft,
33 faLevelUpAlt,
34 faAngleRight,
35 faAngleDoubleLeft,
36 faFile,
37} from "@fortawesome/free-solid-svg-icons";
38 25
39library.add( 26library.add(faIcons);
40 faFolder,
41 faEraser,
42 faSearch,
43 faPlus,
44 faMinus,
45 faImage,
46 faHome,
47 faArrowLeft,
48 faLevelUpAlt,
49 faAngleRight,
50 faAngleDoubleLeft,
51 faFile,
52);
53 27
54config.autoAddCss = false; 28config.autoAddCss = false;
55import "@fortawesome/fontawesome-svg-core/styles.css"; 29import "@fortawesome/fontawesome-svg-core/styles.css";
diff --git a/viewer/src/plugins/router.ts b/viewer/src/plugins/router.ts
index 00979c9..03ca021 100644
--- a/viewer/src/plugins/router.ts
+++ b/viewer/src/plugins/router.ts
@@ -28,7 +28,7 @@ const routes: RouteConfig[] = [
28 path: "*", 28 path: "*",
29 name: "GalleryNavigation", 29 name: "GalleryNavigation",
30 component: GalleryNavigation, 30 component: GalleryNavigation,
31 props: (route) => ({ 31 props: route => ({
32 path: route.params.pathMatch, 32 path: route.params.pathMatch,
33 query: Object.keys(route.query), 33 query: Object.keys(route.query),
34 }), 34 }),