From 415b22303c82413847dfba3083855551c34543b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9C=D0=B0?= =?UTF-8?q?=D0=BB=D1=8E=D0=B3=D0=B8=D0=BD?= Date: Wed, 14 Aug 2024 10:30:14 +0500 Subject: [PATCH] refactor project --- components.d.ts | 9 +- index.html | 2 +- src/{ => app}/App.vue | 0 src/{ => app}/assets/ShelfNote.svg | 0 src/{ => app}/assets/main.css | 0 src/{ => app}/auto-imports.d.ts | 0 src/{ => app}/helpers/index.ts | 8 +- src/{ => app}/interfaces/authorization.ts | 4 +- src/{ => app}/interfaces/entities.ts | 0 src/{ => app}/interfaces/environment.ts | 2 +- src/{ => app}/main.ts | 2 +- src/{ => app}/router/index.ts | 2 +- src/{ => app}/stores/authorization.ts | 2 +- src/{ => app}/stores/data.ts | 2 +- src/{ => app}/stores/interface.ts | 0 src/{ => app}/stores/websocket.ts | 4 +- src/assets/Motion.svg | 203 ------------------ src/components/CreateEntityMenu.vue | 4 +- src/components/EditImageEntityMenu.vue | 189 ---------------- src/components/EditTextEntityMenu.vue | 182 ---------------- src/components/LogoAndLabel.vue | 2 +- src/components/UserInfoHeaderWithSettings.vue | 2 +- .../editEntityMenu/image/MoveMenu.vue | 121 +++++++++++ .../editEntityMenu/image/StateMenu.vue | 91 ++++++++ .../text/MoveMenu.vue | 10 +- .../text/StateMenu.vue | 6 +- src/helpers/autoResize.ts | 0 src/helpers/constants.ts | 0 src/modules/BaseMenu.vue | 2 +- src/modules/EntityItem.vue | 8 +- .../entities/ImageItem.vue | 29 ++- .../entities/TextItem.vue | 14 +- src/output.css | 55 +---- src/pages/HomePage.vue | 12 +- src/shared/Divider.vue | 7 + vite.config.ts | 2 +- 36 files changed, 300 insertions(+), 676 deletions(-) rename src/{ => app}/App.vue (100%) rename src/{ => app}/assets/ShelfNote.svg (100%) rename src/{ => app}/assets/main.css (100%) rename src/{ => app}/auto-imports.d.ts (100%) rename src/{ => app}/helpers/index.ts (87%) rename src/{ => app}/interfaces/authorization.ts (70%) rename src/{ => app}/interfaces/entities.ts (100%) rename src/{ => app}/interfaces/environment.ts (82%) rename src/{ => app}/main.ts (92%) rename src/{ => app}/router/index.ts (84%) rename src/{ => app}/stores/authorization.ts (83%) rename src/{ => app}/stores/data.ts (96%) rename src/{ => app}/stores/interface.ts (100%) rename src/{ => app}/stores/websocket.ts (95%) delete mode 100644 src/assets/Motion.svg delete mode 100644 src/components/EditImageEntityMenu.vue delete mode 100644 src/components/EditTextEntityMenu.vue create mode 100644 src/components/editEntityMenu/image/MoveMenu.vue create mode 100644 src/components/editEntityMenu/image/StateMenu.vue rename src/components/{editEntityMenus => editEntityMenu}/text/MoveMenu.vue (87%) rename src/components/{editEntityMenus => editEntityMenu}/text/StateMenu.vue (95%) delete mode 100644 src/helpers/autoResize.ts delete mode 100644 src/helpers/constants.ts rename src/{components => modules}/entities/ImageItem.vue (83%) rename src/{components => modules}/entities/TextItem.vue (83%) create mode 100644 src/shared/Divider.vue diff --git a/components.d.ts b/components.d.ts index 213ab65..139e2ca 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,17 +12,16 @@ declare module 'vue' { CreateEntityMenu: typeof import('./src/components/CreateEntityMenu.vue')['default'] Divider: typeof import('primevue/divider')['default'] Drawer: typeof import('primevue/drawer')['default'] - EditImageEntityMenu: typeof import('./src/components/EditImageEntityMenu.vue')['default'] - ImageItem: typeof import('./src/components/entities/ImageItem.vue')['default'] + ImageItem: typeof import('@/modules/entities/ImageItem.vue')['default'] LogoAndLabel: typeof import('./src/components/LogoAndLabel.vue')['default'] - MoveMenu: typeof import('./src/components/editEntityMenus/text/MoveMenu.vue')['default'] + MoveMenu: typeof import('./src/components/editEntityMenu/image/MoveMenu.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] SpeedDial: typeof import('primevue/speeddial')['default'] Splitter: typeof import('primevue/splitter')['default'] SplitterPanel: typeof import('primevue/splitterpanel')['default'] - StateMenu: typeof import('./src/components/editEntityMenus/text/StateMenu.vue')['default'] - TextItem: typeof import('./src/components/entities/TextItem.vue')['default'] + StateMenu: typeof import('./src/components/editEntityMenu/image/StateMenu.vue')['default'] + TextItem: typeof import('@/modules/entities/TextItem.vue')['default'] Tree: typeof import('primevue/tree')['default'] UserInfoHeaderWithSettings: typeof import('./src/components/UserInfoHeaderWithSettings.vue')['default'] } diff --git a/index.html b/index.html index d1c0ae6..7a0abe9 100644 --- a/index.html +++ b/index.html @@ -9,6 +9,6 @@
- + \ No newline at end of file diff --git a/src/App.vue b/src/app/App.vue similarity index 100% rename from src/App.vue rename to src/app/App.vue diff --git a/src/assets/ShelfNote.svg b/src/app/assets/ShelfNote.svg similarity index 100% rename from src/assets/ShelfNote.svg rename to src/app/assets/ShelfNote.svg diff --git a/src/assets/main.css b/src/app/assets/main.css similarity index 100% rename from src/assets/main.css rename to src/app/assets/main.css diff --git a/src/auto-imports.d.ts b/src/app/auto-imports.d.ts similarity index 100% rename from src/auto-imports.d.ts rename to src/app/auto-imports.d.ts diff --git a/src/helpers/index.ts b/src/app/helpers/index.ts similarity index 87% rename from src/helpers/index.ts rename to src/app/helpers/index.ts index 7b5ac9c..675d278 100644 --- a/src/helpers/index.ts +++ b/src/app/helpers/index.ts @@ -1,7 +1,7 @@ -import { useInterfaceStore } from '@/stores/interface'; -import type { IEntity } from '@/interfaces/environment'; -import { useDataStore } from '@/stores/data'; -import { useWebsocketStore } from '@/stores/websocket'; +import { useInterfaceStore } from '@/app/stores/interface'; +import type { IEntity } from '@/app/interfaces/environment'; +import { useDataStore } from '@/app/stores/data'; +import { useWebsocketStore } from '@/app/stores/websocket'; export async function uploadFile($event: Event) { const target = $event.target as HTMLInputElement; diff --git a/src/interfaces/authorization.ts b/src/app/interfaces/authorization.ts similarity index 70% rename from src/interfaces/authorization.ts rename to src/app/interfaces/authorization.ts index f9ae4f5..659cadb 100644 --- a/src/interfaces/authorization.ts +++ b/src/app/interfaces/authorization.ts @@ -1,5 +1,5 @@ -import type { TThemes } from '@/interfaces/environment'; -import type {IImage } from "@/interfaces/entities"; +import type { TThemes } from '@/app/interfaces/environment'; +import type { IImage } from '@/app/interfaces/entities'; export interface IUserData { user_uuid: string; diff --git a/src/interfaces/entities.ts b/src/app/interfaces/entities.ts similarity index 100% rename from src/interfaces/entities.ts rename to src/app/interfaces/entities.ts diff --git a/src/interfaces/environment.ts b/src/app/interfaces/environment.ts similarity index 82% rename from src/interfaces/environment.ts rename to src/app/interfaces/environment.ts index 4c9536e..699199e 100644 --- a/src/interfaces/environment.ts +++ b/src/app/interfaces/environment.ts @@ -1,4 +1,4 @@ -import type { IImage, ITable, IText } from '@/interfaces/entities'; +import type { IImage, ITable, IText } from '@/app/interfaces/entities'; export interface ISheet { sheet_uuid: string; diff --git a/src/main.ts b/src/app/main.ts similarity index 92% rename from src/main.ts rename to src/app/main.ts index f0b3ed0..b61cec8 100644 --- a/src/main.ts +++ b/src/app/main.ts @@ -1,4 +1,4 @@ -import './assets/main.css'; +import '@/app/assets/main.css'; import { createApp } from 'vue'; import { createPinia } from 'pinia'; diff --git a/src/router/index.ts b/src/app/router/index.ts similarity index 84% rename from src/router/index.ts rename to src/app/router/index.ts index 9652021..98dcd90 100644 --- a/src/router/index.ts +++ b/src/app/router/index.ts @@ -12,7 +12,7 @@ const router = createRouter({ { path: '/:sheetUuid', name: 'sheet', - component: () => import('../pages/[uuid]/SheetPage.vue') + component: () => import('../../pages/[uuid]/SheetPage.vue') } ] }); diff --git a/src/stores/authorization.ts b/src/app/stores/authorization.ts similarity index 83% rename from src/stores/authorization.ts rename to src/app/stores/authorization.ts index d1ba2d7..846b160 100644 --- a/src/stores/authorization.ts +++ b/src/app/stores/authorization.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import type { IUserData } from '@/interfaces/authorization'; +import type { IUserData } from '@/app/interfaces/authorization'; export const useAuthorizationStore = defineStore('authorizationStore', () => { const userUuid = ref('e786de50-f33c-4ef9-9dfe-329eed32b023'); diff --git a/src/stores/data.ts b/src/app/stores/data.ts similarity index 96% rename from src/stores/data.ts rename to src/app/stores/data.ts index 27b1f40..bbd53f4 100644 --- a/src/stores/data.ts +++ b/src/app/stores/data.ts @@ -1,5 +1,5 @@ import { defineStore } from 'pinia'; -import type {IEntity, ISheet} from '@/interfaces/environment'; +import type { IEntity } from '@/app/interfaces/environment'; export const useDataStore = defineStore('dataStore', () => { const sheets = ref([ diff --git a/src/stores/interface.ts b/src/app/stores/interface.ts similarity index 100% rename from src/stores/interface.ts rename to src/app/stores/interface.ts diff --git a/src/stores/websocket.ts b/src/app/stores/websocket.ts similarity index 95% rename from src/stores/websocket.ts rename to src/app/stores/websocket.ts index 26d0dfc..3cff49c 100644 --- a/src/stores/websocket.ts +++ b/src/app/stores/websocket.ts @@ -1,6 +1,6 @@ import { defineStore } from 'pinia'; -import { useDataStore } from '@/stores/data'; -import type { IEntity } from '@/interfaces/environment'; +import { useDataStore } from '@/app/stores/data'; +import type { IEntity } from '@/app/interfaces/environment'; export const useWebsocketStore = defineStore('websocketStore', () => { const socket = ref(); diff --git a/src/assets/Motion.svg b/src/assets/Motion.svg deleted file mode 100644 index a51145e..0000000 --- a/src/assets/Motion.svg +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/CreateEntityMenu.vue b/src/components/CreateEntityMenu.vue index 8d679e0..eaf9bad 100644 --- a/src/components/CreateEntityMenu.vue +++ b/src/components/CreateEntityMenu.vue @@ -1,7 +1,6 @@ - - - - diff --git a/src/components/EditTextEntityMenu.vue b/src/components/EditTextEntityMenu.vue deleted file mode 100644 index a02b908..0000000 --- a/src/components/EditTextEntityMenu.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - diff --git a/src/components/LogoAndLabel.vue b/src/components/LogoAndLabel.vue index e6b58fa..83c84e2 100644 --- a/src/components/LogoAndLabel.vue +++ b/src/components/LogoAndLabel.vue @@ -2,7 +2,7 @@ diff --git a/src/components/UserInfoHeaderWithSettings.vue b/src/components/UserInfoHeaderWithSettings.vue index 9afc9f5..0264faa 100644 --- a/src/components/UserInfoHeaderWithSettings.vue +++ b/src/components/UserInfoHeaderWithSettings.vue @@ -1,5 +1,5 @@ + + + + diff --git a/src/components/editEntityMenu/image/StateMenu.vue b/src/components/editEntityMenu/image/StateMenu.vue new file mode 100644 index 0000000..a39d07e --- /dev/null +++ b/src/components/editEntityMenu/image/StateMenu.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/components/editEntityMenus/text/MoveMenu.vue b/src/components/editEntityMenu/text/MoveMenu.vue similarity index 87% rename from src/components/editEntityMenus/text/MoveMenu.vue rename to src/components/editEntityMenu/text/MoveMenu.vue index c77d796..7abdbce 100644 --- a/src/components/editEntityMenus/text/MoveMenu.vue +++ b/src/components/editEntityMenu/text/MoveMenu.vue @@ -1,8 +1,8 @@ diff --git a/src/components/entities/TextItem.vue b/src/modules/entities/TextItem.vue similarity index 83% rename from src/components/entities/TextItem.vue rename to src/modules/entities/TextItem.vue index 8c4d4dc..2e936bf 100644 --- a/src/components/entities/TextItem.vue +++ b/src/modules/entities/TextItem.vue @@ -1,10 +1,10 @@ + + + + diff --git a/vite.config.ts b/vite.config.ts index 69321b5..d8cfa76 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -72,7 +72,7 @@ export default defineConfig({ // Filepath to generate corresponding .d.ts file. // Defaults to './auto-imports.d.ts' when `typescript` is installed locally. // Set `false` to disable. - dts: 'src/auto-imports.d.ts', + dts: 'src/app/auto-imports.d.ts', // Array of strings of regexes that contains imports meant to be ignored during // the declaration file generation. You may find this useful when you need to provide -- GitLab