Merge branch 'oz-config-json' into develop

# Conflicts:
#	scripts/win_compile_example.cmd

22 files changed, 51 insertions, 28 deletions

diff --git a/example/config.json b/example/config.json
new file mode 100644
index 0000000..6483257
--- /dev/null
+++ b/example/config.json
@@ -0,0 +1,3 @@
+{
+    "galleryRoot": "out/"
+}
diff --git a/example/readme.md b/example/readme.md
index d5a7563..e455f03 100644
--- a/example/readme.md
+++ b/example/readme.md
@@ -8,7 +8,8 @@ Content
 -------
 
 ```
-./example
+./example/out                -- the output directory for the compiled version of the gallery
+./example/src                -- source directory with pictures, configuration, tags and metadata
 ├── _DSC8808-1.jpg           -- a picture
 ├── _DSC8808-1.jpg.yaml      -- its associated sidecar metadata file
 ├── Glacier 3000             -- a directory grouping gallery items
@@ -17,6 +18,5 @@ Content
 │   ├── _DSC5475.jpg.yaml
 │   ├── _DSC5542.jpg
 │   └── _DSC5542.jpg.yaml
-├── gallery.yaml             -- gallery settings file
-└── readme.md                -- this README
+└── gallery.yaml             -- gallery settings file
 ```
diff --git a/example/Glacier 3000/_DSC5475.jpg b/example/src/Glacier 3000/_DSC5475.jpg
index 9835447..9835447 100644
--- a/example/Glacier 3000/_DSC5475.jpg
+++ b/example/src/Glacier 3000/_DSC5475.jpg
diff --git a/example/Glacier 3000/_DSC5475.jpg.yaml b/example/src/Glacier 3000/_DSC5475.jpg.yaml
index 3454a68..3454a68 100644
--- a/example/Glacier 3000/_DSC5475.jpg.yaml
+++ b/example/src/Glacier 3000/_DSC5475.jpg.yaml
diff --git a/example/Glacier 3000/_DSC5542.jpg b/example/src/Glacier 3000/_DSC5542.jpg
index 19a716e..19a716e 100644
--- a/example/Glacier 3000/_DSC5542.jpg
+++ b/example/src/Glacier 3000/_DSC5542.jpg
diff --git a/example/Glacier 3000/_DSC5542.jpg.yaml b/example/src/Glacier 3000/_DSC5542.jpg.yaml
index d174911..d174911 100644
--- a/example/Glacier 3000/_DSC5542.jpg.yaml
+++ b/example/src/Glacier 3000/_DSC5542.jpg.yaml
diff --git a/example/Glacier 3000/thumbnail.jpg b/example/src/Glacier 3000/thumbnail.jpg
index 19a716e..19a716e 100644
--- a/example/Glacier 3000/thumbnail.jpg
+++ b/example/src/Glacier 3000/thumbnail.jpg
diff --git a/example/_DSC8808-1.jpg b/example/src/_DSC8808-1.jpg
index 51b43b0..51b43b0 100644
--- a/example/_DSC8808-1.jpg
+++ b/example/src/_DSC8808-1.jpg
diff --git a/example/_DSC8808-1.jpg.yaml b/example/src/_DSC8808-1.jpg.yaml
index b946ff7..b946ff7 100644
--- a/example/_DSC8808-1.jpg.yaml
+++ b/example/src/_DSC8808-1.jpg.yaml
diff --git a/example/gallery.yaml b/example/src/gallery.yaml
index ea23d8a..ea23d8a 100644
--- a/example/gallery.yaml
+++ b/example/src/gallery.yaml
diff --git a/ldgallery.1.md b/ldgallery.1.md
index 8928693..f071344 100644
--- a/ldgallery.1.md
+++ b/ldgallery.1.md
@@ -126,9 +126,6 @@ compiler.pictureMaxResolution.width
 compiler.pictureMaxResolution.height
 : Maximum height in pixels of the picture items, unlimited by default.
 
-viewer.defaultSearchMode [TODO]
-: Default search view mode ("highlight" or "filter").  Defaults to "filter".
-
 viewer.defaultSearchQuery [TODO]
 : Default search query string.
 
@@ -138,9 +135,6 @@ viewer.defaultSortOrder [TODO]
 viewer.tagGroups[].tag [TODO]
 : Tag prefix defining the tag group.
 
-viewer.tagGroups[].order [TODO]
-: Order in which to display tag groups.
-
 viewer.tagGroups[].colour [TODO]
 : Colour associated to the tag group.
 
diff --git a/scripts/win_compile_example.cmd b/scripts/win_compile_example.cmd
index e89b302..1226269 100644
--- a/scripts/win_compile_example.cmd
+++ b/scripts/win_compile_example.cmd
@@ -3,8 +3,8 @@ SET rebuild=--rebuild
 CHOICE /M "Rebuild all ('--rebuild' argument)?"
 IF ERRORLEVEL 2 SET rebuild=
 echo.
+cd ..\compiler\
 
 @echo on
-cd ..\compiler\
-stack exec ldgallery-compiler-exe -- %rebuild% --clean-output -i=../example/ -o=../example/out/
+stack exec ldgallery-compiler-exe -- %rebuild% --clean-output -i=../example/src/ -o=../example/out/
 @pause
diff --git a/viewer/.env b/viewer/.env
index 959477b..0914292 100644
--- a/viewer/.env
+++ b/viewer/.env
@@ -1,5 +1,5 @@
+# Override with .env.development.local and .env.production.local
+
 VUE_APP_I18N_LOCALE=en
 VUE_APP_I18N_FALLBACK_LOCALE=en
-VUE_APP_EXAMPLE_PROJECT=../example/out/
-VUE_APP_DATA_URL=gallery/
-VUE_APP_DEVSERVER_PORT=8085
+VUE_APP_DATA_URL=./
diff --git a/viewer/.env.development b/viewer/.env.development
new file mode 100644
index 0000000..0d87cf4
--- /dev/null
+++ b/viewer/.env.development
@@ -0,0 +1,3 @@
+VUE_APP_DEVSERVER_PORT=8085
+VUE_APP_DEVSERVER_CONFIG_PATH=../example/
+VUE_APP_DATA_URL=~/
diff --git a/viewer/public/config.json b/viewer/public/config.json.example
index 7023edb..90c5f74 100644
--- a/viewer/public/config.json
+++ b/viewer/public/config.json.example
@@ -1,4 +1,3 @@
 {
-    "generationTimestamp": 0,
     "galleryRoot": "gallery/"
 }
\ No newline at end of file
diff --git a/viewer/readme.md b/viewer/readme.md
index 864dcc6..3757f3e 100644
--- a/viewer/readme.md
+++ b/viewer/readme.md
@@ -8,6 +8,10 @@ npm install
 ```
 
 ### Compiles and hot-reloads for development
+
+The viewer DevServer will serve the compiled version of the example gallery by default.
+To override, create a file .env.development.local
+
 ```
 npm run serve
 ```
diff --git a/viewer/src/@types/gallery.d.ts b/viewer/src/@types/gallery.d.ts
index 14a7ed9..03d21fc 100644
--- a/viewer/src/@types/gallery.d.ts
+++ b/viewer/src/@types/gallery.d.ts
@@ -18,6 +18,10 @@
 */
 
 declare namespace Gallery {
+    interface Config {
+        galleryRoot: string,
+    }
+
     interface Other extends Item {
         properties: OtherProperties,
     }
diff --git a/viewer/src/components/LdPicture.vue b/viewer/src/components/LdPicture.vue
index 8a9a08e..a5faeb3 100644
--- a/viewer/src/components/LdPicture.vue
+++ b/viewer/src/components/LdPicture.vue
@@ -28,7 +28,7 @@
     @dragscrollend="dragScrollClickFix.onDragScrollEnd()"
   >
     <v-lazy-image
-      :src="pictureSrc()"
+      :src="pictureSrc(picture.properties.resource)"
       :class="{'slow-loading': Boolean(slowLoadingStyle)}"
       :style="slowLoadingStyle"
       @load="clearSlowLoading"
@@ -67,15 +67,17 @@ export default class LdPicture extends Vue {
     this.loader = false;
   }
 
-  pictureSrc() {
-    return `${process.env.VUE_APP_DATA_URL}${this.picture.properties.resource}`;
+  pictureSrc(resource: string) {
+    return `${process.env.VUE_APP_DATA_URL}${this.$galleryStore.config!.galleryRoot}${resource}`;
   }
 
   generateSlowLoadingStyle() {
     this.clearSlowLoading();
     this.loader = true;
-    if (this.picture.thumbnail)
-      this.slowLoadingStyle = `background-image: url('${process.env.VUE_APP_DATA_URL}${this.picture.thumbnail.resource}');`;
+    if (this.picture.thumbnail) {
+      const url = this.pictureSrc(this.picture.thumbnail.resource);
+      this.slowLoadingStyle = `background-image: url('${url}');`;
+    }
   }
 }
 </script>
diff --git a/viewer/src/components/LdThumbnail.vue b/viewer/src/components/LdThumbnail.vue
index 17c7659..13468e1 100644
--- a/viewer/src/components/LdThumbnail.vue
+++ b/viewer/src/components/LdThumbnail.vue
@@ -21,7 +21,7 @@
   <div :class="{'preload': loading}">
     <v-lazy-image
       v-if="item.thumbnail"
-      :src="pictureSrc()"
+      :src="pictureSrc(item.thumbnail.resource)"
       :style="pictureStyle()"
       :title="item.title"
       @intersect="loading=true"
@@ -44,9 +44,8 @@ export default class LdThumbnail extends Vue {
 
   loading: boolean = false;
 
-  pictureSrc() {
-    const resource = this.item.thumbnail!.resource;
-    return `${process.env.VUE_APP_DATA_URL}${resource}`;
+  pictureSrc(resource: string) {
+    return `${process.env.VUE_APP_DATA_URL}${this.$galleryStore.config!.galleryRoot}${resource}`;
   }