diff --git a/.env.testing b/.env.testing new file mode 100644 index 0000000..efe4bb3 --- /dev/null +++ b/.env.testing @@ -0,0 +1,2 @@ +VITE_PUBLICPATH=/testing/food/ +VITE_DEBUG=true \ No newline at end of file diff --git a/index.html b/index.html index 9a935ba..0797196 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,42 @@ + + + + + + Food and meal finder + + +
+ + + + + + + diff --git a/package-lock.json b/package-lock.json index f2a806e..e87c677 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@fortawesome/free-solid-svg-icons": "^6.7.1", "@fortawesome/pro-regular-svg-icons": "^6.6.0", "@phila/phila-ui-core": "^1.0.18", - "@phila/pinboard": "^2.0.69", + "@phila/pinboard": "^2.0.77", "date-fns": "^4.1.0", "unplugin-auto-import": "^0.18.3", "unplugin-vue-router": "^0.10.8" @@ -1836,9 +1836,9 @@ } }, "node_modules/@phila/pinboard": { - "version": "2.0.69", - "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.0.69.tgz", - "integrity": "sha512-umvoz/k3q5snVZce9Fa1TArj30DYQpXNw+mAjwIFeBI/TiNS3soKHnWO+6BFkuC1LRdm8fB4FXKpiY2DID/jRw==", + "version": "2.0.77", + "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.0.77.tgz", + "integrity": "sha512-KhkVdKUKYWwtclP6SR0WsdifPWGABXzJFjoh3Dqhytodr086JZZ7dHXyIWeG1r3Y6vOEoG5L+TfIlwurEZKQWA==", "dependencies": { "@creativebulma/bulma-tooltip": "^1.2.0", "@fortawesome/fontawesome-pro": "^6.6.0", @@ -1872,6 +1872,7 @@ "@turf/points-within-polygon": "^7.1.0", "axios": "^1.6.8", "bulma": "^0.9.4", + "bulma-toast": "^2.4.4", "date-fns": "^3.6.0", "date-fns-tz": "^3.2.0", "fuse.js": "^6.6.2", @@ -2957,6 +2958,11 @@ "bulma": "^0.9.3" } }, + "node_modules/bulma-toast": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/bulma-toast/-/bulma-toast-2.4.4.tgz", + "integrity": "sha512-frK7CiTE7sW6bgJFnWE4aL3Fga9O2U6O536gj6xox+52kqb5S5WaDUq37cArzjuvnSXY5mPIvzt5xNdBeOnShA==" + }, "node_modules/bundle-name": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz", diff --git a/package.json b/package.json index 8113373..a069d71 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,9 @@ "type": "module", "scripts": { "dev": "vite", + "test": "vite --mode=testing", "build": "vite build", + "build:testing": "vite build --mode=testing", "preview": "vite preview", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore" }, @@ -14,7 +16,7 @@ "@fortawesome/free-solid-svg-icons": "^6.7.1", "@fortawesome/pro-regular-svg-icons": "^6.6.0", "@phila/phila-ui-core": "^1.0.18", - "@phila/pinboard": "^2.0.69", + "@phila/pinboard": "^2.0.77", "date-fns": "^4.1.0", "unplugin-auto-import": "^0.18.3", "unplugin-vue-router": "^0.10.8" diff --git a/src/main.js b/src/main.js index 86ef10e..67f1624 100644 --- a/src/main.js +++ b/src/main.js @@ -22,13 +22,10 @@ import { faMinus as farMinus } from '@fortawesome/pro-regular-svg-icons'; import { markRaw } from 'vue'; library.add(faExclamationTriangle, faHandHoldingHeart, farAngleDown, farAngleUp, farTimes, farPlus, farMinus); -// import pinboard from '@phila/pinboard'; -import pinboard from '../node_modules/@phila/pinboard/src/main.js'; -if (import.meta.env.VITE_DEBUG) console.log('test pinboard:', pinboard); - +import pinboard from '@phila/pinboard'; +// import pinboard from '../node_modules/@phila/pinboard/src/main.js'; import '../node_modules/@phila/pinboard/dist/style.css'; -// import greeting from './general/greeting'; import legendControl from './general/legendControl'; // data-sources diff --git a/vite.config.js b/vite.config.js index 1b28d78..cd48802 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,43 +1,58 @@ import { fileURLToPath, URL } from 'node:url' -import { defineConfig, searchForWorkspaceRoot } from 'vite' +import { defineConfig, searchForWorkspaceRoot, loadEnv } from 'vite' import vue from '@vitejs/plugin-vue' import vueDevTools from 'vite-plugin-vue-devtools' import AutoImport from 'unplugin-auto-import/vite' // https://vite.dev/config/ -export default defineConfig({ - server: { - fs: { - allow: [ - searchForWorkspaceRoot(process.cwd()), - 'C:/Users/andy.rothwell/Projects/vue3-pinboard/node_modules/@fortawesome/fontawesome-pro/webfonts', - ] - } - }, - plugins: [ - vue(), - vueDevTools(), - AutoImport({ - imports: [ - 'vue', - // 'vue-router', - // { - // 'pinia': [ 'defineStore', 'storeToRefs', 'acceptHMRUpdate' ], - // } - ], - // dirs: [ - // './node_modules/@phila/pinboard/src/stores', - // ], - }), - ], - resolve: { - alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) +export default defineConfig(({ mode }) => { + const env = loadEnv(mode, process.cwd()); + + return { + css: { + preprocessorOptions: { + scss: { + // api: 'modern-compiler', + includePaths: ['node_modules'], + }, + }, + }, + server: { + fs: { + allow: [ + searchForWorkspaceRoot(process.cwd()), + 'C:/Users/andy.rothwell/Projects/vue3-pinboard/node_modules/@fortawesome/fontawesome-pro/webfonts', + ] + } + }, + plugins: [ + vue(), + vueDevTools(), + AutoImport({ + imports: [ + 'vue', + // 'vue-router', + // { + // 'pinia': [ 'defineStore', 'storeToRefs', 'acceptHMRUpdate' ], + // } + ], + // dirs: [ + // './node_modules/@phila/pinboard/src/stores', + // ], + }), + ], + // base: 'testing/primary-care/', + base: env.VITE_PUBLICPATH, + resolve: { + alias: { + '@': fileURLToPath(new URL('./src', import.meta.url)) + } + }, + optimizeDeps: { + include: [ '@turf/jsts', 'maplibre-gl', 'concaveman' ], + // exclude: [ '@phila/pinboard' ] + // extensions: [".scss", ".sass"], } - }, - optimizeDeps: { - include: [ '@turf/jsts', 'maplibre-gl', 'concaveman' ], - // exclude: [ '@phila/pinboard' ] } -}) +}) \ No newline at end of file