diff --git a/i18n-2.xlsm b/i18n-2.xlsm index 15a029e..df6c2b6 100644 Binary files a/i18n-2.xlsm and b/i18n-2.xlsm differ diff --git a/package.json b/package.json index 405bf33..a846346 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "projectsnode", - "version": "0.0.1", - "description": "telegram miniapp", - "productName": "projectsNode", + "name": "tgcrew", + "version": "0.1.01", + "description": "telegram admin miniapp", + "productName": "tgCrew (admin)", "author": "Alex Mart", "type": "module", "private": true, @@ -49,4 +49,4 @@ "npm": ">= 6.13.4", "yarn": ">= 1.21.1" } -} +} \ No newline at end of file diff --git a/public/resources b/public/resources new file mode 120000 index 0000000..59e4850 --- /dev/null +++ b/public/resources @@ -0,0 +1 @@ +F:/project/tgCrew/backend/public/resources \ No newline at end of file diff --git a/quasar.config.ts b/quasar.config.ts index 2930ff1..a568aa7 100644 --- a/quasar.config.ts +++ b/quasar.config.ts @@ -117,6 +117,16 @@ export default defineConfig((ctx) => { changeOrigin: true, ws: true }, + // необходимо создать simlink + // mklink /D "F:\project\tgCrew\admin\public\resources" "F:\project\tgCrew\backend\public\resources" + '/resources': { + target: 'http://localhost:3000', + changeOrigin: true, + secure: false, + pathRewrite: { + '^/resources': '/resources' + } + } /* '/ws': { target: 'ws://localhost:3000', // или wss:// для HTTPS changeOrigin: true, @@ -126,7 +136,7 @@ export default defineConfig((ctx) => { }, // https: true, - // open: true // opens browser window automatically + open: false // opens browser window automatically }, // https://v2.quasar.dev/quasar-cli-vite/quasar-config-file#framework @@ -244,7 +254,7 @@ export default defineConfig((ctx) => { builder: { // https://www.electron.build/configuration/configuration - appId: 'projectsnode' + appId: 'tgcrew' } }, diff --git a/src/components/companyBlock.vue b/src/components/companyBlock.vue index 6450f4d..c8e2af8 100644 --- a/src/components/companyBlock.vue +++ b/src/components/companyBlock.vue @@ -4,21 +4,23 @@ {{ $t(title) }}
@@ -57,24 +59,35 @@ diff --git a/src/components/pnImageSelector.vue b/src/components/pnImageSelector.vue index 71dba70..4615312 100644 --- a/src/components/pnImageSelector.vue +++ b/src/components/pnImageSelector.vue @@ -30,7 +30,7 @@ :style="{ height: sizePx, maxWidth: sizePx, - borderRadius: avatar ? String(size/2) + 'px' : 'var(--top-raduis)', + borderRadius: avatar ? String(size/2) + 'px' : 'var(--top-radius)', }" @click="showDialog = true" /> diff --git a/src/components/pnItemBtmDialog.vue b/src/components/pnItemBtmDialog.vue index c50c224..bb7c38d 100644 --- a/src/components/pnItemBtmDialog.vue +++ b/src/components/pnItemBtmDialog.vue @@ -36,8 +36,8 @@
- {{ $t(title) }} + + {{ $t(title) }} + {{ $t(caption) }}
diff --git a/src/components/pnOnboardBtn.vue b/src/components/pnOnboardBtn.vue index 5203c59..d75b5a9 100644 --- a/src/components/pnOnboardBtn.vue +++ b/src/components/pnOnboardBtn.vue @@ -18,20 +18,20 @@
- {{message1}} + {{ message1 }}
-
- {{message2}} +
+ {{ message2 }}
diff --git a/src/pages/ProjectAddPage.vue b/src/pages/ProjectAddPage.vue index 971ab04..30b84d5 100644 --- a/src/pages/ProjectAddPage.vue +++ b/src/pages/ProjectAddPage.vue @@ -1,6 +1,5 @@