NoLog.cz/gancio-upstream
6
0
Fork 0
mirror of https://framagit.org/les/gancio.git synced 2025-01-31 16:42:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix css order conflict during build

Browse source
This commit is contained in:
lesion 2023-04-14 10:47:54 +02:00
parent c573660589
commit 4e3a36ec0d
No known key found for this signature in database
GPG key ID: 352918250B012177
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nuxt.config.js
View file

@ -1,6 +1,6 @@
const config = require('./server/config.js')
const locales = require('./locales/index')
import { ca, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, sk, ru, zhHans } from 'vuetify/es5/locale'
const isDev = (process.env.NODE_ENV !== 'production')
module.exports = {
@ -140,7 +140,11 @@ module.exports = {
}
},
buildModules: ['@nuxtjs/vuetify'],
vuetify: { defaultAssets: false, optionsPath: './vuetify.options.js' },
vuetify: {
lang: { locales: { ca, de, en, es, eu, fr, gl, it, nb, nl, pl, pt, sk, ru, zhHans } },
treeShake: true,
defaultAssets: false,
optionsPath: './vuetify.options.js' },
build: {
extend(config, { isDev, isClient }) {
// ..

1
package.json
View file

@ -15,6 +15,7 @@
"doc:dev": "cd docs && bundle exec jekyll s --drafts",
"migrate": "NODE_ENV=production sequelize db:migrate",
"migrate:dev": "sequelize db:migrate",
"analyze": "nuxt build --analyze",
"build:wc": "cd webcomponents; yarn build:lib; cp dist/gancio-events.js ../wp-plugin/js/gancio-events.es.js; cp dist/gancio-events.js ../assets/gancio-events.es.js; cp dist/gancio-events.js ../docs/assets/js/gancio-events.es.js; cp dist/gancio-events.js ../static/gancio-events.es.js;"
},
"files": [

3
pages/Admin.vue
View file

@ -73,12 +73,11 @@ v-container.container.pa-0.pa-md-3
<script>
import { mapState } from 'vuex'
import { mdiAlert, mdiChevronRight, mdiChevronLeft } from '@mdi/js'
import Settings from '@/components/admin/Settings'
export default {
name: 'Admin',
components: {
Settings,
Settings: () => import(/* webpackChunkName: "admin" */'../components/admin/Settings.vue'),
Users: () => import(/* webpackChunkName: "admin" */'../components/admin/Users'),
Events: () => import(/* webpackChunkName: "admin" */'../components/admin/Events'),
Places: () => import(/* webpackChunkName: "admin" */'../components/admin/Places'),

10
pages/setup/_db.vue
View file

@ -20,17 +20,19 @@ v-container.pa-6
Completed(ref='completed' :isHttp='isHttp')
</template>
<script>
import DbStep from '@/components/DbStep'
import Settings from '@/components/admin/Settings'
import Completed from '@/components/Completed'
export default {
components: { DbStep, Settings, Completed },
components: {
Settings: () => import(/* webpackChunkName: "setup" */'@/components/admin/Settings.vue'),
DbStep: () => import(/* webpackChunkName: "setup" */'@/components/DbStep.vue'),
Completed: () => import(/* webpackChunkName: "setup" */'@/components/Completed.vue'),
},
middleware: 'setup',
layout: 'clean',
head: {
title: 'Setup',
},
name: 'Setup',
auth: false,
asyncData ({ params, req }) {
const protocol = process.client ? window.location.protocol : req.protocol + ':'