Merge branch 'develop' for release v2.0v2.0

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";
 import Button from "buefy/src/components/button";
 // @ts-ignore
 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";
 
@@ -34,6 +38,8 @@ Vue.use(Taginput);
 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
new file mode 100644
index 0000000..4b50641
--- /dev/null
+++ b/viewer/src/plugins/fontawesome-icons.ts
@@ -0,0 +1,45 @@
+/* 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/>.
+*/
+
+export {
+  faFolder,
+  faFolderOpen,
+  faEraser,
+  faSearch,
+  faPlus,
+  faMinus,
+  faImage,
+  faHome,
+  faArrowLeft,
+  faLevelUpAlt,
+  faAngleRight,
+  faAngleDoubleLeft,
+  faFile,
+  faFileAlt,
+  faFilePdf,
+  faFileVideo,
+  faFileAudio,
+  faFileDownload,
+  faCaretUp,
+  faCaretDown,
+  faAngleDoubleDown,
+  faSortAmountDown,
+} from "@fortawesome/free-solid-svg-icons";
+
+export { 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";
 
 import { library, config } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import {
-  faFolder,
-  faEraser,
-  faSearch,
-  faPlus,
-  faMinus,
-  faImage,
-  faHome,
-  faArrowLeft,
-  faLevelUpAlt,
-  faAngleRight,
-  faAngleDoubleLeft,
-  faFile,
-} from "@fortawesome/free-solid-svg-icons";
+import * as faIcons from "./fontawesome-icons";
 
-library.add(
-  faFolder,
-  faEraser,
-  faSearch,
-  faPlus,
-  faMinus,
-  faImage,
-  faHome,
-  faArrowLeft,
-  faLevelUpAlt,
-  faAngleRight,
-  faAngleDoubleLeft,
-  faFile,
-);
+library.add(faIcons);
 
 config.autoAddCss = false;
 import "@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[] = [
     path: "*",
     name: "GalleryNavigation",
     component: GalleryNavigation,
-    props: (route) => ({
+    props: route => ({
       path: route.params.pathMatch,
       query: Object.keys(route.query),
     }),