Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions web-app/.browserslistrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
> 1%
last 2 versions
not ie <= 10
> 0.5%,
last 2 major versions,
Firefox ESR,
not dead,
not op_mini all
1 change: 1 addition & 0 deletions web-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"npm-run-all": "^4.1.5",
"postcss": "^8.4.21",
"prettier": "2.6.0",
"purgecss": "^5.0.0",
"rimraf": "^3.0.2",
"rollup-plugin-copy": "^3.4.0",
"tsc-alias": "^1.8.6",
Expand Down
9 changes: 2 additions & 7 deletions web-app/packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"scripts": {
"dev": "vue-demi-switch 3 && vite --port 8080",
"preview": "vue-demi-switch 3 && vite preview --port 8080",
"build": "vue-demi-switch 3 && vite build",
"build": "vue-demi-switch 3 && vite build && purgecss -c ./purgecss.config.ts",
"build:dev": "vue-demi-switch 3 && vite build --mode development",
"build:lib": "echo 'Not defined script'",
"build:lib:prod": "echo 'Not defined script'",
Expand All @@ -19,16 +19,13 @@
"i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^6.4.2",
"@mdi/font": "^6.6.96",
"@tabler/icons-webfont": "^2.42.0",
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
"axios": "^0.26.1",
"crypto-js": "^3.1.9-1",
"date-fns": "^2.28.0",
"file-saver": "^2.0.5",
"lodash": "^4.17.21",
"material-icons": "^0.2.3",
"pdfjs-dist": "2.5.207",
"pinia": "^2.1.7",
"portal-vue": "^3.0.0",
Expand All @@ -37,8 +34,6 @@
"vue": "^3.3.8",
"vue-i18n": "^9.7.1",
"vue-meta": "^3.0.0-alpha.10",
"vue-router": "4.2.5",
"vue-tabler-icons": "~2.20.0",
"vuetify": "3.4.3"
"vue-router": "4.2.5"
}
}
Binary file modified web-app/packages/app/public/favicon.ico
Binary file not shown.
11 changes: 11 additions & 0 deletions web-app/packages/app/purgecss.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = {
content: ['./dist/**/*.{html,js}'],
css: ['./dist/**/index-*.css'],
output: './dist/assets/',
extractors: [
{
extractor: (content) => content.match(/[A-z0-9-:/]+/g) || [],
extensions: ['js']
}
]
}
4 changes: 2 additions & 2 deletions web-app/packages/app/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
-->

<template>
<div class="grid min-h-screen">
<div class="grid grid-nogutter min-h-screen">
<dialog-windows />
<router-view name="sidebar" v-slot="{ Component }" :key="$route.fullPath">
<component :is="Component" />
Expand All @@ -18,6 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
'transition-duration-500',
'min-h-full',
'overflow-auto',
'pb-4',
isSideBar && drawer && !isUnderOverlayBreakpoint
? 'col-offset-2 col-10'
: 'col-12'
Expand All @@ -39,7 +40,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
</transition>
</router-view>
</main>
<upload-progress />
<notifications />
</div>
</template>
Expand Down
6 changes: 0 additions & 6 deletions web-app/packages/app/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
//
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial

// styles must be imported first (at least before imports of our libs)
import 'material-icons/iconfont/material-icons.scss'
import '@fortawesome/fontawesome-free/css/all.css'
import '@mdi/font/css/materialdesignicons.css'
import {
dateUtils,
textUtils,
Expand All @@ -32,7 +28,6 @@ import { createRouter } from './router'
import { addRouterToPinia, getPiniaInstance } from './store'

import i18n from '@/plugins/i18n/i18n'
import vuetify from '@/plugins/vuetify/vuetify'

const createMerginApp = () => {
const pinia = getPiniaInstance()
Expand All @@ -43,7 +38,6 @@ const createMerginApp = () => {
.mixin(MerginComponentUuidMixin)
.use(pinia)
.use(router)
.use(vuetify)
.use(i18n)
.use(PortalVue)
.use(createMetaManager())
Expand Down
13 changes: 1 addition & 12 deletions web-app/packages/app/src/plugins/i18n/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,10 @@
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial

import { createI18n } from 'vue-i18n'
import { en } from 'vuetify/locale'

import enMessages from './locale/en.json'

const messages = {
en: {
...enMessages,
$vuetify: en
}
}

export default createI18n({
legacy: false, // Vuetify does not support the legacy mode of vue-i18n
locale: import.meta.env.VITE_VUE_APP_I18N_LOCALE || 'en',
allowComposition: true,
fallbackLocale: import.meta.env.VITE_VUE_APP_I18N_FALLBACK_LOCALE || 'en',
messages
fallbackLocale: import.meta.env.VITE_VUE_APP_I18N_FALLBACK_LOCALE || 'en'
})
54 changes: 0 additions & 54 deletions web-app/packages/app/src/plugins/vuetify/vuetify.ts

This file was deleted.

2 changes: 1 addition & 1 deletion web-app/packages/app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "ES5",
"target": "ES6",
"module": "ESNext",
// setting strict to false
"strict": true,
Expand Down
16 changes: 8 additions & 8 deletions web-app/packages/app/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ import { NodeGlobalsPolyfillPlugin } from '@esbuild-plugins/node-globals-polyfil
import vue from '@vitejs/plugin-vue'
import { resolve } from 'path'
import rollupNodePolyFill from 'rollup-plugin-node-polyfills'
import {
Vuetify3Resolver,
PrimeVueResolver
} from 'unplugin-vue-components/resolvers'
import { PrimeVueResolver } from 'unplugin-vue-components/resolvers'
import Components from 'unplugin-vue-components/vite'
import { defineConfig } from 'vite'
import { defineConfig, splitVendorChunkPlugin } from 'vite'

const serverPort = process.env.FLASK_RUN_PORT ?? 5000

Expand All @@ -27,16 +24,18 @@ export default defineConfig(({ mode }) => ({
// styles: { configFile: './src/sass/settings.scss' }
// }),
Components({
resolvers: [Vuetify3Resolver(), PrimeVueResolver({ prefix: 'P' })]
})
resolvers: [PrimeVueResolver({ prefix: 'P' })]
}),
/** Creating index , vendor .js/.css for smaller bundle loaded async in browser */
splitVendorChunkPlugin()
],

resolve: {
alias: {
'@': resolve(__dirname, './src'),
url: 'rollup-plugin-node-polyfills/polyfills/url'
},
dedupe: ['vue', 'pinia', 'vue-router', 'vuetify', '@mergin/lib', 'primevue']
dedupe: ['vue', 'pinia', 'vue-router', '@mergin/lib', 'primevue']
},
// define: {
// 'process.env': process.env
Expand All @@ -46,6 +45,7 @@ export default defineConfig(({ mode }) => ({
// include: [/node_modules/],
// transformMixedEsModules: true
// },

sourcemap: mode !== 'production',
rollupOptions: {
plugins: [
Expand Down
15 changes: 1 addition & 14 deletions web-app/packages/lib/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,12 @@ declare module 'vue' {
POverlayPanel: typeof import('primevue/overlaypanel')['default']
PPanel: typeof import('primevue/panel')['default']
PPassword: typeof import('primevue/password')['default']
PProgressBar: typeof import('primevue/progressbar')['default']
PSidebar: typeof import('primevue/sidebar')['default']
PTabPanel: typeof import('primevue/tabpanel')['default']
PTabView: typeof import('primevue/tabview')['default']
PTag: typeof import('primevue/tag')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
VBtn: typeof import('vuetify/components')['VBtn']
VCard: typeof import('vuetify/components')['VCard']
VCardActions: typeof import('vuetify/components')['VCardActions']
VCardText: typeof import('vuetify/components')['VCardText']
VCardTitle: typeof import('vuetify/components')['VCardTitle']
VContainer: typeof import('vuetify/components')['VContainer']
VForm: typeof import('vuetify/components')['VForm']
VIcon: typeof import('vuetify/components')['VIcon']
VImg: typeof import('vuetify/components')['VImg']
VLayout: typeof import('vuetify/components')['VLayout']
VProgressCircular: typeof import('vuetify/components')['VProgressCircular']
VSnackbar: typeof import('vuetify/components')['VSnackbar']
VTextField: typeof import('vuetify/components')['VTextField']
VTooltip: typeof import('vuetify/components')['VTooltip']
}
}
13 changes: 4 additions & 9 deletions web-app/packages/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
"types": "types/main.d.ts",
"exports": {
".": {
"import": "./dist/lib.js",
"require": "./dist/lib.umd.cjs"
"import": "./dist/lib.js"
},
"./dist/": {
"import": "./dist/",
"require": "./dist/"
"import": "./dist/"
}
},
"scripts": {
Expand Down Expand Up @@ -48,15 +46,12 @@
"primevue": "^3.43.0",
"universal-cookie": "^4.0.4",
"vue": "^3.3.8",
"vue-router": "4.2.5",
"vue-tabler-icons": "~2.20.0",
"vuetify": "^3.4.3"
"vue-router": "4.2.5"
},
"peerDependencies": {
"pinia": ">=2.x",
"portal-vue": "3.x",
"vue": "3.x",
"vuetify": "3.x"
"vue": "3.x"
},
"devDependencies": {}
}
Binary file not shown.
Binary file not shown.
29 changes: 1 addition & 28 deletions web-app/packages/lib/src/assets/bulb.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading