Merge pull request #65 from pacien/oz-viewer

viewer improvements

25 files changed, 255 insertions, 109 deletions

diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index 4dd6660..e26055f 100644
--- a/compiler/app/Main.hs
+++ b/compiler/app/Main.hs
@@ -18,8 +18,12 @@
 
 module Main where
 
+import GHC.Generics (Generic)
 import Paths_ldgallery_compiler (version, getDataFileName)
 import Data.Version (showVersion)
+import Data.Int (Int64)
+import Data.Aeson (ToJSON)
+import Data.Time.Clock.System (getSystemTime, systemSeconds)
 import System.FilePath ((</>))
 import System.Console.CmdArgs
 
@@ -27,6 +31,12 @@ import Compiler
 import Files (readDirectory, copyTo)
 
 
+data ViewerConfig = ViewerConfig
+  { galleryRoot :: String
+  , generationTimestamp :: Int64
+  } deriving (Generic, Show, ToJSON)
+
+
 data Options = Options
   { inputDir :: String
   , outputDir :: String
@@ -77,25 +87,27 @@ main :: IO ()
 main =
   do
     opts <- cmdArgs options
-
     buildGallery opts
-
-    if (withViewer opts) then
+    if (withViewer opts) then do
       copyViewer (outputDir opts)
+      writeViewerConfig (outputDir opts </> "config.json")
     else
       return ()
 
   where
+    gallerySubdir :: String
+    gallerySubdir = "gallery/"
+
     buildGallery :: Options -> IO ()
     buildGallery opts =
       compileGallery
         (inputDir opts)
-        (galleryOutputDir "gallery" opts)
+        (galleryOutputDir opts)
         (rebuilAll opts)
         (cleanOutput opts)
 
-    galleryOutputDir :: FilePath -> Options -> FilePath
-    galleryOutputDir gallerySubdir opts =
+    galleryOutputDir :: Options -> FilePath
+    galleryOutputDir opts =
       if withViewer opts then outputBase </> gallerySubdir else outputBase
       where outputBase = outputDir opts
 
@@ -105,3 +117,9 @@ main =
       >>  getDataFileName "viewer"
       >>= readDirectory
       >>= copyTo target
+
+    writeViewerConfig :: FilePath -> IO ()
+    writeViewerConfig fileName =
+      getSystemTime
+      >>= return . ViewerConfig gallerySubdir . systemSeconds
+      >>= writeJSON fileName
diff --git a/compiler/data/viewer/readme.md b/compiler/data/viewer/readme.md
new file mode 100644
index 0000000..5786878
--- /dev/null
+++ b/compiler/data/viewer/readme.md
@@ -0,0 +1,2 @@
+Missing viewer distribution.
+Copy the files in "/viewer/dist/*" here, then rebuild the compiler.
diff --git a/compiler/src/Compiler.hs b/compiler/src/Compiler.hs
index fc40a76..8819ffc 100644
--- a/compiler/src/Compiler.hs
+++ b/compiler/src/Compiler.hs
@@ -18,6 +18,7 @@
 
 module Compiler
   ( compileGallery
+  , writeJSON
   ) where
 
 
diff --git a/viewer/.env b/viewer/.env
index 59b220a..9092dea 100644
--- a/viewer/.env
+++ b/viewer/.env
@@ -1,4 +1,4 @@
 VUE_APP_I18N_LOCALE=en
 VUE_APP_I18N_FALLBACK_LOCALE=en
-VUE_APP_DATA_URL=/gallery/
 VUE_APP_EXAMPLE_PROJECT=../example/out/
+VUE_APP_DATA_URL=gallery/
diff --git a/viewer/public/config.json b/viewer/public/config.json
new file mode 100644
index 0000000..7023edb
--- /dev/null
+++ b/viewer/public/config.json
@@ -0,0 +1,4 @@
+{
+    "generationTimestamp": 0,
+    "galleryRoot": "gallery/"
+}
\ No newline at end of file
diff --git a/viewer/src/@types/gallery/index.d.ts b/viewer/src/@types/gallery/index.d.ts
index 25407e8..b112b6d 100644
--- a/viewer/src/@types/gallery/index.d.ts
+++ b/viewer/src/@types/gallery/index.d.ts
@@ -18,6 +18,9 @@
 */
 
 declare namespace Gallery {
+    interface Other extends Item {
+        properties: OtherProperties,
+    }
     interface Picture extends Item {
         properties: PictureProperties,
     }
@@ -31,7 +34,10 @@ declare namespace Gallery {
         tags: RawTag[],
         path: string,
         thumbnail?: string,
-        properties: PictureProperties | DirectoryProperties,
+        properties: OtherProperties | PictureProperties | DirectoryProperties,
+    }
+    interface OtherProperties {
+        type: "other",
     }
     interface PictureProperties {
         type: "picture",
@@ -42,4 +48,5 @@ declare namespace Gallery {
         items: Item[]
     }
     type RawTag = string;
+    type ItemType = "other" | "picture" | "directory";
 }
\ No newline at end of file
diff --git a/viewer/src/assets/scss/buefy.scss b/viewer/src/assets/scss/buefy.scss
index 7fdb883..735ce6a 100644
--- a/viewer/src/assets/scss/buefy.scss
+++ b/viewer/src/assets/scss/buefy.scss
@@ -24,8 +24,7 @@
 @import "buefy_variables";
 
 // 2. Setup your Custom Colors
-// $linkedin: #0077b5;
-// $linkedin-invert: findColorInvert($linkedin);
+@import "@/assets/scss/theme.scss";
 
 @import "~bulma/sass/utilities/derived-variables";
 
diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 1903c9e..b418911 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -32,6 +32,9 @@
 .nowrap {
   white-space: nowrap;
 }
+.no-scroll-x {
+  overflow-x: hidden;
+}
 
 .flex {
   display: flex;
@@ -44,19 +47,35 @@
   align-items: center;
 }
 
+// === Links
+
+.link {
+  color: $link;
+  cursor: pointer;
+  text-decoration: none;
+  &:hover {
+    color: $link-hover;
+  }
+}
+
+.disabled {
+  color: $disabled-color !important;
+}
+
 // === Scrollbar styling
 
 .scrollbar {
   overflow: auto;