From c7153c8d6d3879566b49af0f7b23593d46477eb9 Mon Sep 17 00:00:00 2001 From: Zero~Informatique Date: Tue, 7 Jan 2020 19:46:41 +0100 Subject: viewer: relative gallery path (NOT STABLE with current compiler) compiler: commands for compilation on Windows --- compiler/win_build.cmd | 4 ++++ compiler/win_compile_example.cmd | 10 ++++++++++ viewer/.env | 4 ++-- viewer/src/views/Gallery.vue | 1 + viewer/vue.config.js | 4 ++-- 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 compiler/win_build.cmd create mode 100644 compiler/win_compile_example.cmd 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 @@ +@echo off +stack setup +stack build +pause \ 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 @@ +@echo off +SET rebuild=--rebuild +CHOICE /M "Rebuild all?" +IF ERRORLEVEL 2 SET rebuild= +echo. +echo stack exec ldgallery-compiler-exe -- %rebuild% -i=../example/ -o=../example/out/ +echo. +stack exec ldgallery-compiler-exe -- %rebuild% -i=../example/ -o=../example/out/ +echo. +pause diff --git a/viewer/.env b/viewer/.env index d06d633..59b220a 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 +VUE_APP_DATA_URL=/gallery/ +VUE_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 @@ +
Unknown type
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 = { port: 8085, serveIndex: true, before: (app, server, compiler) => { - app.get(`${process.env.VUE_APP_DATA_URL}/*`, (req, res) => { + app.get(`${process.env.VUE_APP_DATA_URL}*`, (req, res) => { const fs = require("fs"); - const fileName = `../${process.env.VUE_APP_EXAMPLE_PROJECT}${req.url.slice(process.env.VUE_APP_DATA_URL.length)}`; + const fileName = `${process.env.VUE_APP_EXAMPLE_PROJECT}${req.url.slice(process.env.VUE_APP_DATA_URL.length)}`; const file = fs.readFileSync(decodeURIComponent(fileName)); res.end(file); }); -- cgit v1.2.3