diff --git a/.gitignore b/.gitignore index 2a5c510..54e30ae 100644 --- a/.gitignore +++ b/.gitignore @@ -27,11 +27,10 @@ logs .env.* !.env.example -# zip files +# Zip files static/data/*.zip - # Zip Extracted files # data json src/assets/data.json # assets pictures -assets/pictures +public/data/pictures diff --git a/assets/Logo-LDC.jpg b/assets/pictures/Logo-LDC.jpg similarity index 100% rename from assets/Logo-LDC.jpg rename to assets/pictures/Logo-LDC.jpg diff --git a/assets/layout/ldc-intl.png b/assets/pictures/layout/ldc-intl.png similarity index 100% rename from assets/layout/ldc-intl.png rename to assets/pictures/layout/ldc-intl.png diff --git a/static/scss/_bootstrap-variables.scss b/assets/scss/_bootstrap-variables.scss similarity index 100% rename from static/scss/_bootstrap-variables.scss rename to assets/scss/_bootstrap-variables.scss diff --git a/static/scss/_sweetalert-custom.scss b/assets/scss/_sweetalert-custom.scss similarity index 100% rename from static/scss/_sweetalert-custom.scss rename to assets/scss/_sweetalert-custom.scss diff --git a/static/scss/_variables.scss b/assets/scss/_variables.scss similarity index 100% rename from static/scss/_variables.scss rename to assets/scss/_variables.scss diff --git a/static/scss/bootstrap.scss b/assets/scss/bootstrap.scss similarity index 100% rename from static/scss/bootstrap.scss rename to assets/scss/bootstrap.scss diff --git a/static/scss/layout.scss b/assets/scss/layout.scss similarity index 75% rename from static/scss/layout.scss rename to assets/scss/layout.scss index 454141f..d1083f3 100644 --- a/static/scss/layout.scss +++ b/assets/scss/layout.scss @@ -1,8 +1,3 @@ -html { - background: url('~/static/assets/images/background.png') no-repeat 0 0 scroll; - background-size: 100% 100%; -} - body { min-height: 100vh; background-color: unset; diff --git a/static/scss/style.scss b/assets/scss/style.scss similarity index 100% rename from static/scss/style.scss rename to assets/scss/style.scss diff --git a/components/layout/AppHeader.vue b/components/layout/AppHeader.vue index f48580d..d3be501 100644 --- a/components/layout/AppHeader.vue +++ b/components/layout/AppHeader.vue @@ -10,7 +10,7 @@ data-bs-placement="bottom" :title="settings.title" > - + diff --git a/electron/UnzipData.ts b/electron/UnzipData.ts index 28dec99..e36cb87 100644 --- a/electron/UnzipData.ts +++ b/electron/UnzipData.ts @@ -43,12 +43,12 @@ export default abstract class UnzipData { const zip = new AdmZip(fs.readFileSync(UnzipData.zipFileToUse)); // * Clear export dir - fs.rmSync(path.resolve(__dirname, "../assets/pictures"), { recursive: true, force: true }); - fs.rmSync(path.resolve(__dirname, "../assets/data.json"), { recursive: true, force: true }); - zip.extractAllTo("assets"); + fs.rmSync(path.resolve(__dirname, "../public/data/pictures"), { recursive: true, force: true }); + fs.rmSync(path.resolve(__dirname, "../src/assets/data.json"), { recursive: true, force: true }); + zip.extractAllTo("public/data"); // * Move data to src assets fs.renameSync( - path.resolve(__dirname, "../assets/data.json"), + path.resolve(__dirname, "../public/data/data.json"), path.resolve(__dirname, "../src/assets/data.json") ); const jsonData = fs.readFileSync( diff --git a/nuxt.config.ts b/nuxt.config.ts index b4ad78b..bd25dae 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -49,7 +49,7 @@ export default defineNuxtConfig({ }, // Global CSS: https://go.nuxtjs.dev/config-css - css: ["~/static/scss/style.scss"], + css: ["~/assets/scss/style.scss"], plugins: [ { src: "~/plugins/boostrap.ts", mode: "client" }, { src: "~/plugins/fontawesome.ts", mode: "client" }, @@ -57,7 +57,7 @@ export default defineNuxtConfig({ ], alias: { - images: resolve(__dirname, "./static/assets/images"), + // images: resolve(__dirname, "./static/assets/images"), data: resolve(__dirname, "./static/data"), } }); diff --git a/package.json b/package.json index 6555752..905cdf4 100755 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "postinstall": "nuxt prepare", "lint:ts": "npm run typecheck", "lint:js": "eslint --ext \".js,.ts,.vue\" --ignore-path .gitignore .", - "lint:style": "node ./node_modules/.bin/stylelint --config './.stylelintrc.json' --max-warnings 0 \"static/**/*.{css,scss,sass,html,vue}\" --ignore-path .gitignore", + "lint:style": "node ./node_modules/.bin/stylelint --config './.stylelintrc.json' --max-warnings 0 \"assets/**/*.{css,scss,sass,html,vue}\" --ignore-path .gitignore", "lint": "npm run lint:js && npm run lint:style && lint:ts", "lint:fix": "npm run lint:js --fix && npm run lint:style --fix", "validate": "npm-run-all --parallel lint:js lint:style lint:ts", diff --git a/pages/brands/[slug].vue b/pages/brands/[slug].vue index 16f7219..3ff67cf 100644 --- a/pages/brands/[slug].vue +++ b/pages/brands/[slug].vue @@ -6,7 +6,7 @@
- +
{{ range.name }}
diff --git a/pages/index.vue b/pages/index.vue index 00e655c..8025b78 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -20,7 +20,7 @@
- +
diff --git a/public/data/.gitkeep b/public/data/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/static/assets/images/background.png b/static/assets/images/background.png deleted file mode 100644 index 197f546..0000000 Binary files a/static/assets/images/background.png and /dev/null differ