From caaaca7a2cebaf4ecc2544747c67aa280f2e25c7 Mon Sep 17 00:00:00 2001 From: Andrey Chernikov Date: Fri, 29 Dec 2023 20:39:35 +0300 Subject: [PATCH] Opt, GitLab mirror --- .github/workflows/dev.yaml | 1 - .github/workflows/sync.yaml | 20 ++++ .gitignore | 1 + frontend/package-lock.json | 184 ++++----------------------------- frontend/package.json | 7 +- frontend/src/App.vue | 4 +- frontend/src/helpers/parser.ts | 4 + frontend/tsconfig.json | 5 +- frontend/vite.config.ts | 5 +- frontend/vue.config.ts | 41 -------- 10 files changed, 52 insertions(+), 220 deletions(-) create mode 100644 .github/workflows/sync.yaml delete mode 100644 frontend/vue.config.ts diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 4070f9e..c73f455 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -3,7 +3,6 @@ name: Development version deploy on: workflow_dispatch: - env: DEPLOY_PATH: reader/ diff --git a/.github/workflows/sync.yaml b/.github/workflows/sync.yaml new file mode 100644 index 0000000..b6c84c8 --- /dev/null +++ b/.github/workflows/sync.yaml @@ -0,0 +1,20 @@ +name: Sync with Gitlab + +on: + - push + - delete + +jobs: + sync: + runs-on: ubuntu-latest + name: Sync repo with Gitlab + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: pixta-dev/repository-mirroring-action@v1 + with: + target_repo_url: + $${{ secrets.GITLAB_REPO }} + ssh_private_key: + ${{ secrets.GITLAB_KEY }} diff --git a/.gitignore b/.gitignore index 837d1d9..10fc197 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,4 @@ dmypy.json .pyre/ /config.cfg /frontend-v1/ +/frontend/node_modules/ diff --git a/frontend/package-lock.json b/frontend/package-lock.json index dbc4178..f46285d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -9,18 +9,15 @@ "version": "0.1.0", "dependencies": { "@achrinza/node-ipc": "^10.1.7", - "@types/node": "^20.10.4", + "@vicons/ionicons5": "^0.12.0", "arr-union": "^3.1.0", "axios": "^1.6.2", - "bootstrap": "^5.1.3", "core-js": "^3.22.2", "debounce": "^1.2.1", "debug": "^4.3.4", "dotenv": "^16.3.1", "jquery": "^3.6.0", - "mdb-vue-ui-kit": "^1.12.0", "popper.js": "^1.16.1", - "rxjs": "^7.5.5", "sass": "^1.50.1", "sass-loader": "^12.6.0", "ts-node": "^10.9.2", @@ -29,12 +26,12 @@ "vue-gtag": "^2.0.1", "vue-i18n": "^9.2.2", "vue-router": "^4.0.14", - "vue3-clipboard": "^1.0.0", "vuex": "^4.1.0", "vuex-persist": "^3.1.3" }, "devDependencies": { "@intlify/unplugin-vue-i18n": "^0.11.0", + "@types/node": "^20.10.5", "@vitejs/plugin-vue": "^4.5.2", "autoprefixer": "^10.4.16", "naive-ui": "^2.35.0", @@ -870,16 +867,6 @@ "node": ">= 8" } }, - "node_modules/@popperjs/core": { - "version": "2.11.7", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz", - "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==", - "peer": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/@rollup/pluginutils": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz", @@ -975,13 +962,18 @@ } }, "node_modules/@types/node": { - "version": "20.10.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz", - "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==", + "version": "20.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz", + "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==", "dependencies": { "undici-types": "~5.26.4" } }, + "node_modules/@vicons/ionicons5": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@vicons/ionicons5/-/ionicons5-0.12.0.tgz", + "integrity": "sha512-Iy1EUVRpX0WWxeu1VIReR1zsZLMc4fqpt223czR+Rpnrwu7pt46nbnC2ycO7ItI/uqDLJxnbcMC7FujKs9IfFA==" + }, "node_modules/@vitejs/plugin-vue": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.5.2.tgz", @@ -1432,18 +1424,6 @@ "node": ">=8" } }, - "node_modules/bootstrap": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", - "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/bootstrap" - }, - "peerDependencies": { - "@popperjs/core": "^2.10.2" - } - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1565,16 +1545,6 @@ "node": ">=6.0" } }, - "node_modules/clipboard": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", - "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", - "dependencies": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -1706,11 +1676,6 @@ "node": ">=0.4.0" } }, - "node_modules/delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" - }, "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -2154,14 +2119,6 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "peer": true }, - "node_modules/good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", - "dependencies": { - "delegate": "^3.1.2" - } - }, "node_modules/graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -2445,11 +2402,6 @@ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" }, - "node_modules/mdb-vue-ui-kit": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/mdb-vue-ui-kit/-/mdb-vue-ui-kit-1.12.0.tgz", - "integrity": "sha512-/6NcTyCmzuR5yGDgUURSgHjEG0JFYcU2feOBD8VrJpDFvUs3Q7N8HaB1MqAQ3IDQT67uE+unPXBw+OlpVlH73w==" - }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -3013,14 +2965,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/rxjs": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", - "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -3118,11 +3062,6 @@ "integrity": "sha512-lEV5VB8BUKTo/AfktXJcy+JeXns26ylbMkIUco8CYREsQijuz4mrXres2Q+vMLdwkuLxJdIPQ8IlCIxLYm71Yw==", "dev": true }, - "node_modules/select": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", - "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" - }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -3369,11 +3308,6 @@ "node": ">=0.8" } }, - "node_modules/tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -3444,11 +3378,6 @@ "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" }, - "node_modules/tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" - }, "node_modules/type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -3674,17 +3603,6 @@ "vue": "^3.2.0" } }, - "node_modules/vue3-clipboard": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/vue3-clipboard/-/vue3-clipboard-1.0.0.tgz", - "integrity": "sha512-GUqKh1oO79xDpq0z+cCv/NDVTpcJGNDzeNgT3PmTdTp/WJh3gcTrDqIYKycKhzMFOtIFJ7hO/+usgyWtT+fNhA==", - "dependencies": { - "clipboard": "^2.0.6" - }, - "peerDependencies": { - "vue": "^3.0.0" - } - }, "node_modules/vueuc": { "version": "0.4.51", "resolved": "https://registry.npmjs.org/vueuc/-/vueuc-0.4.51.tgz", @@ -4361,12 +4279,6 @@ "fastq": "^1.6.0" } }, - "@popperjs/core": { - "version": "2.11.7", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz", - "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==", - "peer": true - }, "@rollup/pluginutils": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz", @@ -4451,13 +4363,18 @@ } }, "@types/node": { - "version": "20.10.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz", - "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==", + "version": "20.10.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz", + "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==", "requires": { "undici-types": "~5.26.4" } }, + "@vicons/ionicons5": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@vicons/ionicons5/-/ionicons5-0.12.0.tgz", + "integrity": "sha512-Iy1EUVRpX0WWxeu1VIReR1zsZLMc4fqpt223czR+Rpnrwu7pt46nbnC2ycO7ItI/uqDLJxnbcMC7FujKs9IfFA==" + }, "@vitejs/plugin-vue": { "version": "4.5.2", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.5.2.tgz", @@ -4848,12 +4765,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, - "bootstrap": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz", - "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==", - "requires": {} - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -4921,16 +4832,6 @@ "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "peer": true }, - "clipboard": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", - "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", - "requires": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -5030,11 +4931,6 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" }, - "delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" - }, "didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", @@ -5355,14 +5251,6 @@ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "peer": true }, - "good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", - "requires": { - "delegate": "^3.1.2" - } - }, "graceful-fs": { "version": "4.2.10", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", @@ -5585,11 +5473,6 @@ "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" }, - "mdb-vue-ui-kit": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/mdb-vue-ui-kit/-/mdb-vue-ui-kit-1.12.0.tgz", - "integrity": "sha512-/6NcTyCmzuR5yGDgUURSgHjEG0JFYcU2feOBD8VrJpDFvUs3Q7N8HaB1MqAQ3IDQT67uE+unPXBw+OlpVlH73w==" - }, "merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -5968,14 +5851,6 @@ "queue-microtask": "^1.2.2" } }, - "rxjs": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", - "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", - "requires": { - "tslib": "^2.1.0" - } - }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -6018,11 +5893,6 @@ "integrity": "sha512-lEV5VB8BUKTo/AfktXJcy+JeXns26ylbMkIUco8CYREsQijuz4mrXres2Q+vMLdwkuLxJdIPQ8IlCIxLYm71Yw==", "dev": true }, - "select": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", - "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" - }, "semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -6196,11 +6066,6 @@ "thenify": ">= 3.1.0 < 4" } }, - "tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -6248,11 +6113,6 @@ } } }, - "tslib": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz", - "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==" - }, "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -6394,14 +6254,6 @@ "@vue/devtools-api": "^6.0.0" } }, - "vue3-clipboard": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/vue3-clipboard/-/vue3-clipboard-1.0.0.tgz", - "integrity": "sha512-GUqKh1oO79xDpq0z+cCv/NDVTpcJGNDzeNgT3PmTdTp/WJh3gcTrDqIYKycKhzMFOtIFJ7hO/+usgyWtT+fNhA==", - "requires": { - "clipboard": "^2.0.6" - } - }, "vueuc": { "version": "0.4.51", "resolved": "https://registry.npmjs.org/vueuc/-/vueuc-0.4.51.tgz", diff --git a/frontend/package.json b/frontend/package.json index 3176203..d67343e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,18 +12,16 @@ }, "dependencies": { "@achrinza/node-ipc": "^10.1.7", - "@types/node": "^20.10.4", + "@vicons/ionicons5": "^0.12.0", + "@types/node": "^20.10.5", "arr-union": "^3.1.0", "axios": "^1.6.2", - "bootstrap": "^5.1.3", "core-js": "^3.22.2", "debounce": "^1.2.1", "debug": "^4.3.4", "dotenv": "^16.3.1", "jquery": "^3.6.0", - "mdb-vue-ui-kit": "^1.12.0", "popper.js": "^1.16.1", - "rxjs": "^7.5.5", "sass": "^1.50.1", "sass-loader": "^12.6.0", "ts-node": "^10.9.2", @@ -32,7 +30,6 @@ "vue-gtag": "^2.0.1", "vue-i18n": "^9.2.2", "vue-router": "^4.0.14", - "vue3-clipboard": "^1.0.0", "vuex": "^4.1.0", "vuex-persist": "^3.1.3" }, diff --git a/frontend/src/App.vue b/frontend/src/App.vue index f5d5dd0..ad81e65 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -29,13 +29,11 @@ export default defineComponent({ components: {Navigation, NConfigProvider, NMessageProvider, darkTheme}, setup() { const store = useStore(); - const {t} = useI18n(); - const windowWidth = ref(window.innerWidth); + const { t } = useI18n(); return { darkTheme, t, - windowWidth, theme: computed(function (){ return store.state.theme === 'darkTheme' ? darkTheme : null }) diff --git a/frontend/src/helpers/parser.ts b/frontend/src/helpers/parser.ts index a86903a..0c3a435 100644 --- a/frontend/src/helpers/parser.ts +++ b/frontend/src/helpers/parser.ts @@ -26,6 +26,10 @@ export default class TextParser { this.replaceMap = { 'А': '@', 'В': '8', 'Е': '№', 'К': '<', 'М': 'M', 'Н': 'Н', 'О': '0', 'Р': '%', 'С': '$', 'Т': '7', 'У': 'Y', 'Х': 'X', 'Ь': 'b', 'Я': '9', + 'A': '4', 'B': '8', 'C': '<', 'E': '3', 'G': '6', 'H': '#', 'I': '!', + 'J': ']', 'K': 'X', 'L': '1', 'M': 'M', 'N': 'И', 'O': '0', 'P': '9', + 'Q': 'O', 'R': '2', 'S': '$', 'T': '7', 'U': 'Y', 'V': '√', 'W': 'W', + 'X': '%', 'Y': 'Y', 'Z': '2' }; } private removePuntuation(text: string): string { diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 8eeea28..0fd70e9 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -10,7 +10,10 @@ "allowJs": true, // Allows JavaScript files to be imported into TypeScript files "experimentalDecorators": true, "allowSyntheticDefaultImports": true, - "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"] + "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"], + "paths": { + "@/*": ["./src/*"] + } }, "include": [ "src/**/*.ts", diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 6b4e567..f283e21 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -1,5 +1,4 @@ -import { defineConfig } from "vite"; -import { fileURLToPath, URL } from "url"; +import { defineConfig, loadEnv } from "vite"; import vue from "@vitejs/plugin-vue"; import path from 'path'; import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'; @@ -15,7 +14,7 @@ export default defineConfig({ ], resolve: { alias: { - "@": fileURLToPath(new URL('./src', import.meta.url)), + '@': path.resolve(__dirname, './src'), "@components": path.resolve(__dirname, './components') }, extensions: ['.js', '.ts'] diff --git a/frontend/vue.config.ts b/frontend/vue.config.ts deleted file mode 100644 index 036b770..0000000 --- a/frontend/vue.config.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { Configuration } from 'webpack'; - -const config: Configuration = { - chainWebpack: (config) => { - config.module - .rule('vue') - .use('vue-loader') - .tap(options => { - options.complierOptions = {whitespace: 'preserve'}; - return options; - }); - }, - - devServer: { - host: 'localhost', - port: 4000, - open: false, - allowedHosts: [ - 'frontend', - 'localhost', - 'reader.dev.andyi95.com', - 'reader.stage.andyi95.com', - 'text-tools.ru' - ], - client: { - webSocketURL: 'auto://0.0.0.0:0/ws' - } - }, - pluginOptions: { - sitemap: { - urls: [ - 'https://text-tools.ru', - 'https://text-tools.ru/spreeder', - 'https://text-tools.ru/anticipation', - 'https://text-tools.ru/text' - ] - } - } -}; - -export default config; \ No newline at end of file