Skip to content

Commit

Permalink
stop using vite because blitzar has error
Browse files Browse the repository at this point in the history
  • Loading branch information
mgineer85 committed Nov 18, 2023
1 parent 0432339 commit 3dbc990
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 22 deletions.
26 changes: 17 additions & 9 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,25 @@
<head>
<title><%= productName %></title>

<meta charset="utf-8">
<meta name="description" content="<%= productDescription %>">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
<meta charset="utf-8" />
<meta name="description" content="<%= productDescription %>" />
<meta name="format-detection" content="telephone=no" />
<meta name="msapplication-tap-highlight" content="no" />
<meta
name="viewport"
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
/>

<link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png">
<link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">
<link
rel="icon"
type="image/png"
sizes="128x128"
href="icons/favicon-128x128.png"
/>
<!-- <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
<link rel="icon" type="image/ico" href="favicon.ico">
<link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png"> -->
<!-- <link rel="icon" type="image/ico" href="favicon.ico" /> -->
</head>
<body>
<!-- quasar:entry-point -->
Expand Down
19 changes: 17 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"qrcode": "^1.5.3",
"quasar": "^2.6.0",
"vue": "^3.0.0",
"vue-qrcode": "^2.2.0",
"vue-router": "^4.0.0"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions quasar.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = configure(function (/* ctx */) {
// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://v2.quasar.dev/quasar-cli-vite/boot-files
boot: ["axios", "blitzar", "see"],
boot: ["axios", "blitzar"],

// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
css: ["app.scss"],
Expand Down Expand Up @@ -68,7 +68,7 @@ module.exports = configure(function (/* ctx */) {
// minify: false,
// polyfillModulePreload: true,
// distDir
distDir: "../photobooth-app/photobooth/web_spa/",
//distDir: "../photobooth-app/photobooth/web_spa/",

// extendViteConf (viteConf) {},
// viteVuePluginOptions: {},
Expand Down Expand Up @@ -108,9 +108,9 @@ module.exports = configure(function (/* ctx */) {
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
framework: {
config: {
notify: {
/* look at QuasarConfOptions from the API card */
},
// notify: {
// /* look at QuasarConfOptions from the API card */
// },
},

// iconSet: 'material-icons', // Quasar icon set
Expand All @@ -125,7 +125,7 @@ module.exports = configure(function (/* ctx */) {
// directives: [],

// Quasar plugins
plugins: ["Notify"],
// plugins: ["Notify"],
},

// animations: 'all', // --- includes all animations
Expand Down
10 changes: 5 additions & 5 deletions src/stores/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { store } from 'quasar/wrappers'
import { createPinia } from 'pinia'
import { store } from "quasar/wrappers";
import { createPinia } from "pinia";

/*
* If not building with SSR mode, you can
Expand All @@ -11,10 +11,10 @@ import { createPinia } from 'pinia'
*/

export default store((/* { ssrContext } */) => {
const pinia = createPinia()
const pinia = createPinia();

// You can add Pinia plugins here
// pinia.use(SomePiniaPlugin)

return pinia
})
return pinia;
});

0 comments on commit 3dbc990

Please sign in to comment.