From 170da2d55fec0359cbac780786383710b734eda7 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Fri, 31 Jan 2020 09:17:57 +0100 Subject: viewer: code cleaning, moved some views to components --- viewer/src/@types/Operation.ts | 24 ++++++++++ viewer/src/@types/gallery.d.ts | 52 +++++++++++++++++++++ viewer/src/@types/gallery/index.d.ts | 52 --------------------- viewer/src/@types/tag.d.ts | 34 ++++++++++++++ viewer/src/@types/tag/Operation.ts | 24 ---------- viewer/src/@types/tag/index.d.ts | 34 -------------- viewer/src/components/LdBreadcrumb.vue | 58 +++++++++++++++++++++++ viewer/src/components/LdCommand.vue | 68 +++++++++++++++++++++++++++ viewer/src/components/LdPicture.vue | 74 ++++++++++++++++++++++++++++++ viewer/src/components/LdProposition.vue | 4 +- viewer/src/components/LdTagInput.vue | 2 +- viewer/src/components/LdThumbnail.vue | 81 +++++++++++++++++++++++++++++++++ viewer/src/views/GalleryDirectory.vue | 8 +--- viewer/src/views/GalleryPicture.vue | 74 ------------------------------ viewer/src/views/GallerySearch.vue | 7 +-- viewer/src/views/GalleryThumbnail.vue | 81 --------------------------------- viewer/src/views/MainGallery.vue | 10 ++-- viewer/src/views/PanelTop.vue | 13 ++---- viewer/src/views/TopBreadcrumb.vue | 58 ----------------------- viewer/src/views/TopCommand.vue | 68 --------------------------- 20 files changed, 407 insertions(+), 419 deletions(-) create mode 100644 viewer/src/@types/Operation.ts create mode 100644 viewer/src/@types/gallery.d.ts delete mode 100644 viewer/src/@types/gallery/index.d.ts create mode 100644 viewer/src/@types/tag.d.ts delete mode 100644 viewer/src/@types/tag/Operation.ts delete mode 100644 viewer/src/@types/tag/index.d.ts create mode 100644 viewer/src/components/LdBreadcrumb.vue create mode 100644 viewer/src/components/LdCommand.vue create mode 100644 viewer/src/components/LdPicture.vue create mode 100644 viewer/src/components/LdThumbnail.vue delete mode 100644 viewer/src/views/GalleryPicture.vue delete mode 100644 viewer/src/views/GalleryThumbnail.vue delete mode 100644 viewer/src/views/TopBreadcrumb.vue delete mode 100644 viewer/src/views/TopCommand.vue (limited to 'viewer/src') diff --git a/viewer/src/@types/Operation.ts b/viewer/src/@types/Operation.ts new file mode 100644 index 0000000..f1e7a41 --- /dev/null +++ b/viewer/src/@types/Operation.ts @@ -0,0 +1,24 @@ +/* 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 . +*/ + +export enum Operation { + INTERSECTION = '', + ADDITION = '+', + SUBSTRACTION = '-', +}; \ No newline at end of file diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts new file mode 100644 index 0000000..b112b6d --- /dev/null +++ b/viewer/src/@types/gallery.d.ts @@ -0,0 +1,52 @@ +/* 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 . +*/ + +declare namespace Gallery { + interface Other extends Item { + properties: OtherProperties, + } + interface Picture extends Item { + properties: PictureProperties, + } + interface Directory extends Item { + properties: DirectoryProperties, + } + interface Item { + title: string, + datetime: string, + description: string, + tags: RawTag[], + path: string, + thumbnail?: string, + properties: OtherProperties | PictureProperties | DirectoryProperties, + } + interface OtherProperties { + type: "other", + } + interface PictureProperties { + type: "picture", + resource: string, + } + interface DirectoryProperties { + type: "directory", + items: Item[] + } + type RawTag = string; + type ItemType = "other" | "picture" | "directory"; +} \ No newline at end of file diff --git a/viewer/src/@types/gallery/index.d.ts b/viewer/src/@types/gallery/index.d.ts deleted file mode 100644 index b112b6d..0000000 --- a/viewer/src/@types/gallery/index.d.ts +++ /dev/null @@ -1,52 +0,0 @@ -/* 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 . -*/ - -declare namespace Gallery { - interface Other extends Item { - properties: OtherProperties, - } - interface Picture extends Item { - properties: PictureProperties, - } - interface Directory extends Item { - properties: DirectoryProperties, - } - interface Item { - title: string, - datetime: string, - description: string, - tags: RawTag[], - path: string, - thumbnail?: string, - properties: OtherProperties | PictureProperties | DirectoryProperties, - } - interface OtherProperties { - type: "other", - } - interface PictureProperties { - type: "picture", - resource: string, - } - interface DirectoryProperties { - type: "directory", - items: Item[] - } - type RawTag = string; - type ItemType = "other" | "picture" | "directory"; -} \ No newline at end of file diff --git a/viewer/src/@types/tag.d.ts b/viewer/src/@types/tag.d.ts new file mode 100644 index 0000000..1d5df88 --- /dev/null +++ b/viewer/src/@types/tag.d.ts @@ -0,0 +1,34 @@ +/* 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 . +*/ + +declare namespace Tag { + interface Node { + tag: Gallery.RawTag; + tagfiltered: Gallery.RawTag; + items: Gallery.Item[]; + children: Index; + } + interface Search extends Node { + parent?: Node; + operation: string; // Enum Operation + display: string; + } + type SearchByOperation = { [index: string]: Tag.Search[] }; + type Index = { [index: string]: Node }; +} \ No newline at end of file diff --git a/viewer/src/@types/tag/Operation.ts b/viewer/src/@types/tag/Operation.ts deleted file mode 100644 index f1e7a41..0000000 --- a/viewer/src/@types/tag/Operation.ts +++ /dev/null @@ -1,24 +0,0 @@ -/* 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 . -*/ - -export enum Operation { - INTERSECTION = '', - ADDITION = '+', - SUBSTRACTION = '-', -}; \ No newline at end of file diff --git a/viewer/src/@types/tag/index.d.ts b/viewer/src/@types/tag/index.d.ts deleted file mode 100644 index 1d5df88..0000000 --- a/viewer/src/@types/tag/index.d.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* 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 . -*/ - -declare namespace Tag { - interface Node { - tag: Gallery.RawTag; - tagfiltered: Gallery.RawTag; - items: Gallery.Item[]; - children: Index; - } - interface Search extends Node { - parent?: Node; - operation: string; // Enum Operation - display: string; - } - type SearchByOperation = { [index: string]: Tag.Search[] }; - type Index = { [index: string]: Node }; -} \ No newline at end of file diff --git a/viewer/src/components/LdBreadcrumb.vue b/viewer/src/components/LdBreadcrumb.vue new file mode 100644 index 0000000..8c5b7eb --- /dev/null +++ b/viewer/src/components/LdBreadcrumb.vue @@ -0,0 +1,58 @@ + + + + + + + diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue new file mode 100644 index 0000000..484e56a --- /dev/null +++ b/viewer/src/components/LdCommand.vue @@ -0,0 +1,68 @@ + + + + + + + diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue new file mode 100644 index 0000000..b6a719f --- /dev/null +++ b/viewer/src/components/LdPicture.vue @@ -0,0 +1,74 @@ + + + + + + + diff --git a/viewer/src/components/LdProposition.vue b/viewer/src/components/LdProposition.vue index a380021..6be0aee 100644 --- a/viewer/src/components/LdProposition.vue +++ b/viewer/src/components/LdProposition.vue @@ -37,10 +37,10 @@ + + diff --git a/viewer/src/views/GalleryDirectory.vue b/viewer/src/views/GalleryDirectory.vue index d01032d..baf627e 100644 --- a/viewer/src/views/GalleryDirectory.vue +++ b/viewer/src/views/GalleryDirectory.vue @@ -21,7 +21,7 @@
- +
@@ -33,12 +33,8 @@ - - diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue index 870d3e2..4e843b9 100644 --- a/viewer/src/views/GallerySearch.vue +++ b/viewer/src/views/GallerySearch.vue @@ -21,7 +21,7 @@
- +
{{$t('search.no-results')}}
@@ -33,11 +33,8 @@ - - diff --git a/viewer/src/views/MainGallery.vue b/viewer/src/views/MainGallery.vue index 06cf512..5767cce 100644 --- a/viewer/src/views/MainGallery.vue +++ b/viewer/src/views/MainGallery.vue @@ -21,21 +21,23 @@
- +
{{$t("gallery.unknowntype")}}
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