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

5 files changed, 81 insertions, 30 deletions

diff --git a/viewer/src/@types/ItemType.ts b/viewer/src/@types/ItemType.ts
new file mode 100644
index 0000000..31a395b
--- /dev/null
+++ b/viewer/src/@types/ItemType.ts
@@ -0,0 +1,11 @@
+// TODO: Convert all ambiant types related to LdGallery to modules
+
+export enum ItemType {
+  OTHER = "other",
+  PICTURE = "picture",
+  PLAINTEXT = "plaintext",
+  PDF = "pdf",
+  VIDEO = "video",
+  AUDIO = "audio",
+  DIRECTORY = "directory",
+}
diff --git a/viewer/src/@types/Operation.ts b/viewer/src/@types/Operation.ts
index e7aad27..e566f4b 100644
--- a/viewer/src/@types/Operation.ts
+++ b/viewer/src/@types/Operation.ts
@@ -21,4 +21,4 @@ export enum Operation {
   INTERSECTION = "",
   ADDITION = "+",
   SUBSTRACTION = "-",
-};
+}
diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 066aedf..e9b80e6 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -18,57 +18,97 @@
 */
 
 declare namespace Gallery {
+  type ItemSortStr = "title_asc" | "date_asc" | "date_desc";
+
   interface Config {
-    galleryRoot: string,
+    galleryRoot: string;
+    galleryIndex?: string;
+    initialItemSort?: ItemSortStr;
+    initialTagDisplayLimit?: number;
   }
 
   interface GalleryProperties {
-    galleryTitle: string,
-    tagCategories: RawTag[]
+    galleryTitle: string;
+    tagCategories: RawTag[];
   }
   interface Index {
-    properties: GalleryProperties,
-    tree: Directory
+    properties: GalleryProperties;
+    tree: Directory;
   }
 
   interface Other extends Item {
-    properties: OtherProperties,
+    properties: OtherProperties;
   }
   interface Picture extends Item {
-    properties: PictureProperties,
+    properties: PictureProperties;
+  }
+  interface PlainText extends Item {
+    properties: PlainTextProperties;
+  }
+  interface PDF extends Item {
+    properties: PDFProperties;
+  }
+  interface Video extends Item {
+    properties: VideoProperties;
+  }
+  interface Audio extends Item {
+    properties: AudioProperties;
   }
   interface Directory extends Item {
-    properties: DirectoryProperties,
+    properties: DirectoryProperties;
   }
   interface Item {
-    title: string,
-    datetime: string,
-    description: string,
-    tags: RawTag[],
-    path: string,
-    thumbnail?: Thumbnail
-    properties: OtherProperties | PictureProperties | DirectoryProperties,
+    title: string;
+    datetime: string;
+    description: string;
+    tags: RawTag[];
+    path: string;
+    thumbnail?: Thumbnail;
+    properties:
+      | OtherProperties
+      | PictureProperties
+      | PlainTextProperties
+      | PDFProperties
+      | VideoProperties
+      | AudioProperties
+      | DirectoryProperties;
   }
   interface Resolution {
-    width: number,
-    height: number,
+    width: number;
+    height: number;
   }
   interface OtherProperties {
-    type: "other",
+    type: import("./ItemType").ItemType.OTHER;
+    resource: string;
   }
   interface PictureProperties {
-    type: "picture",
-    resource: string,
-    resolution: Resolution
+    type: import("./ItemType").ItemType.PICTURE;
+    resource: string;
+    resolution: Resolution;
+  }
+  interface PlainTextProperties {
+    type: import("./ItemType").ItemType.PLAINTEXT;
+    resource: string;
+  }
+  interface PDFProperties {
+    type: import("./ItemType").ItemType.PDF;
+    resource: string;
+  }
+  interface VideoProperties {
+    type: import("./ItemType").ItemType.VIDEO;
+    resource: string;
+  }
+  interface AudioProperties {
+    type: import("./ItemType").ItemType.AUDIO;
+    resource: string;
   }
   interface DirectoryProperties {
-    type: "directory",
-    items: Item[]
+    type: import("./ItemType").ItemType.DIRECTORY;
+    items: Item[];
   }
   interface Thumbnail {
-    resource: string,
-    resolution: Resolution
+    resource: string;
+    resolution: Resolution;
   }
   type RawTag = string;
-  type ItemType = "other" | "picture" | "directory";
 }
diff --git a/viewer/src/@types/scrollposition.d.ts b/viewer/src/@types/scrollposition.d.ts
index b2147fa..2f17515 100644
--- a/viewer/src/@types/scrollposition.d.ts
+++ b/viewer/src/@types/scrollposition.d.ts
@@ -17,4 +17,4 @@
 -- along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-type ScrollPosition = { [index: string]: number }
+type ScrollPosition = Record<string, number>;
diff --git a/viewer/src/@types/tag.d.ts b/viewer/src/@types/tag.d.ts
index 76f1207..59ae779 100644
--- a/viewer/src/@types/tag.d.ts
+++ b/viewer/src/@types/tag.d.ts
@@ -31,8 +31,8 @@ declare namespace Tag {
     operation: string; // Enum Operation
     display: string;
   }
-  type SearchByOperation = { [index: string]: Tag.Search[] };
-  type Index = { [index: string]: Node };
+  type SearchByOperation = Record<string, Tag.Search[]>;
+  type Index = Record<string, Node>;
 
   interface Category {
     tag: string;