aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZero~Informatique2020-01-07 19:46:41 +0100
committerZero~Informatique2020-01-07 19:46:41 +0100
commitc7153c8d6d3879566b49af0f7b23593d46477eb9 (patch)
tree3e6d0c639b1fefd115322edac7638a5093ee8c15
parente3a5a52114880bdabf62cb205ec01374a93a28bd (diff)
downloadldgallery-c7153c8d6d3879566b49af0f7b23593d46477eb9.tar.gz
viewer: relative gallery path (NOT STABLE with current compiler)
compiler: commands for compilation on Windows
-rw-r--r--compiler/win_build.cmd4
-rw-r--r--compiler/win_compile_example.cmd10
-rw-r--r--viewer/.env4
-rw-r--r--viewer/src/views/Gallery.vue1
-rw-r--r--viewer/vue.config.js4
5 files changed, 19 insertions, 4 deletions
diff --git a/compiler/win_build.cmd b/compiler/win_build.cmd
new file mode 100644
index 0000000..33559fa
--- /dev/null
+++ b/compiler/win_build.cmd
@@ -0,0 +1,4 @@
1@echo off
2stack setup
3stack build
4pause \ No newline at end of file
diff --git a/compiler/win_compile_example.cmd b/compiler/win_compile_example.cmd
new file mode 100644
index 0000000..f5ef2e2
--- /dev/null
+++ b/compiler/win_compile_example.cmd
@@ -0,0 +1,10 @@
1@echo off
2SET rebuild=--rebuild
3CHOICE /M "Rebuild all?"
4IF ERRORLEVEL 2 SET rebuild=
5echo.
6echo stack exec ldgallery-compiler-exe -- %rebuild% -i=../example/ -o=../example/out/
7echo.
8stack exec ldgallery-compiler-exe -- %rebuild% -i=../example/ -o=../example/out/
9echo.
10pause
diff --git a/viewer/.env b/viewer/.env
index d06d633..59b220a 100644
--- a/viewer/.env
+++ b/viewer/.env
@@ -1,4 +1,4 @@
1VUE_APP_I18N_LOCALE=en 1VUE_APP_I18N_LOCALE=en
2VUE_APP_I18N_FALLBACK_LOCALE=en 2VUE_APP_I18N_FALLBACK_LOCALE=en
3VUE_APP_DATA_URL=/gallery 3VUE_APP_DATA_URL=/gallery/
4VUE_APP_EXAMPLE_PROJECT=example 4VUE_APP_EXAMPLE_PROJECT=../example/out/
diff --git a/viewer/src/views/Gallery.vue b/viewer/src/views/Gallery.vue
index f04b276..4deb937 100644
--- a/viewer/src/views/Gallery.vue
+++ b/viewer/src/views/Gallery.vue
@@ -3,6 +3,7 @@
3 <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" /> 3 <gallery-search v-if="$uiStore.isModeSearch" :items="currentSearch" />
4 <gallery-directory v-else-if="isDirectory" :directory="currentItem" /> 4 <gallery-directory v-else-if="isDirectory" :directory="currentItem" />
5 <gallery-image v-else-if="isImage" :image="currentItem" /> 5 <gallery-image v-else-if="isImage" :image="currentItem" />
6 <div v-else>Unknown type</div>
6 </div> 7 </div>
7</template> 8</template>
8 9
diff --git a/viewer/vue.config.js b/viewer/vue.config.js
index dbf1551..0f84d44 100644
--- a/viewer/vue.config.js
+++ b/viewer/vue.config.js
@@ -12,9 +12,9 @@ module.exports = {
12 port: 8085, 12 port: 8085,
13 serveIndex: true, 13 serveIndex: true,
14 before: (app, server, compiler) => { 14 before: (app, server, compiler) => {
15 app.get(`${process.env.VUE_APP_DATA_URL}/*`, (req, res) => { 15 app.get(`${process.env.VUE_APP_DATA_URL}*`, (req, res) => {
16 const fs = require("fs"); 16 const fs = require("fs");
17 const fileName = `../${process.env.VUE_APP_EXAMPLE_PROJECT}${req.url.slice(process.env.VUE_APP_DATA_URL.length)}`; 17 const fileName = `${process.env.VUE_APP_EXAMPLE_PROJECT}${req.url.slice(process.env.VUE_APP_DATA_URL.length)}`;
18 const file = fs.readFileSync(decodeURIComponent(fileName)); 18 const file = fs.readFileSync(decodeURIComponent(fileName));
19 res.end(file); 19 res.end(file);
20 }); 20 });