fix css order conflict during build
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
const config = require('./server/config.js')
|
const config = require('./server/config.js')
|
||||||
const locales = require('./locales/index')
|
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')
|
const isDev = (process.env.NODE_ENV !== 'production')
|
||||||
module.exports = {
|
module.exports = {
|
||||||
@@ -140,7 +140,11 @@ module.exports = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
buildModules: ['@nuxtjs/vuetify'],
|
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: {
|
build: {
|
||||||
extend(config, { isDev, isClient }) {
|
extend(config, { isDev, isClient }) {
|
||||||
// ..
|
// ..
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
"doc:dev": "cd docs && bundle exec jekyll s --drafts",
|
"doc:dev": "cd docs && bundle exec jekyll s --drafts",
|
||||||
"migrate": "NODE_ENV=production sequelize db:migrate",
|
"migrate": "NODE_ENV=production sequelize db:migrate",
|
||||||
"migrate:dev": "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;"
|
"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": [
|
"files": [
|
||||||
|
|||||||
@@ -73,12 +73,11 @@ v-container.container.pa-0.pa-md-3
|
|||||||
<script>
|
<script>
|
||||||
import { mapState } from 'vuex'
|
import { mapState } from 'vuex'
|
||||||
import { mdiAlert, mdiChevronRight, mdiChevronLeft } from '@mdi/js'
|
import { mdiAlert, mdiChevronRight, mdiChevronLeft } from '@mdi/js'
|
||||||
import Settings from '@/components/admin/Settings'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Admin',
|
name: 'Admin',
|
||||||
components: {
|
components: {
|
||||||
Settings,
|
Settings: () => import(/* webpackChunkName: "admin" */'../components/admin/Settings.vue'),
|
||||||
Users: () => import(/* webpackChunkName: "admin" */'../components/admin/Users'),
|
Users: () => import(/* webpackChunkName: "admin" */'../components/admin/Users'),
|
||||||
Events: () => import(/* webpackChunkName: "admin" */'../components/admin/Events'),
|
Events: () => import(/* webpackChunkName: "admin" */'../components/admin/Events'),
|
||||||
Places: () => import(/* webpackChunkName: "admin" */'../components/admin/Places'),
|
Places: () => import(/* webpackChunkName: "admin" */'../components/admin/Places'),
|
||||||
|
|||||||
@@ -20,17 +20,19 @@ v-container.pa-6
|
|||||||
Completed(ref='completed' :isHttp='isHttp')
|
Completed(ref='completed' :isHttp='isHttp')
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import DbStep from '@/components/DbStep'
|
|
||||||
import Settings from '@/components/admin/Settings'
|
|
||||||
import Completed from '@/components/Completed'
|
|
||||||
|
|
||||||
export default {
|
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',
|
middleware: 'setup',
|
||||||
layout: 'clean',
|
layout: 'clean',
|
||||||
head: {
|
head: {
|
||||||
title: 'Setup',
|
title: 'Setup',
|
||||||
},
|
},
|
||||||
|
name: 'Setup',
|
||||||
auth: false,
|
auth: false,
|
||||||
asyncData ({ params, req }) {
|
asyncData ({ params, req }) {
|
||||||
const protocol = process.client ? window.location.protocol : req.protocol + ':'
|
const protocol = process.client ? window.location.protocol : req.protocol + ':'
|
||||||
|
|||||||
Reference in New Issue
Block a user