diff --git a/components.d.ts b/components.d.ts index 213ab65a4e6fa8ad0a32994eb6e65050d68bc5d9..139e2cab76cf09152dddbc49590c12cde6022201 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 d1c0ae6b8441c103fb74237dd006bd11b827b6ad..7a0abe949abb1b37b2ceca8345a6551bd0c1e3db 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 7b5ac9c0ee54d338ac46782b2c5b271f091f3b90..675d2782caf4d15c6130ef5f8a6c7429071de55b 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 f9ae4f51e6c998f3e471349c2391c5ae12616dae..659cadb75267441aaa51101c92929da9c9a5ff10 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 4c9536e839800da8d9bac6d3c4bb6c9389b76ba4..699199eea315e475f9b6fd9a49e72fddc152578a 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 f0b3ed0813698a2cafdecb298086c520eae80241..b61cec809f84be9d41071d18c73f86a17541de5e 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 9652021332db5b88725cfc6d6bb32836163bf551..98dcd9051c6891900820960dfe184ced17a95d24 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 d1ba2d75f777c78ac055955bd34651ce897d23d0..846b16051ee3f788dc7872f7fd4a7ba508ec39a2 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 27b1f4004d2ed9d1a31568c8d6c042320f61d6a7..bbd53f45806d3744512dff576e4ce2ea209e3e5d 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 26d0dfca4898806218d3abfef710a3f9d480dbd9..3cff49c6e4eafe67164ca5a04ad0f434e84be6b6 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 a51145e952f004c36dc87ffff45382f8b88fbbc3..0000000000000000000000000000000000000000 --- a/src/assets/Motion.svg +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/CreateEntityMenu.vue b/src/components/CreateEntityMenu.vue index 8d679e0e63f356fb1d35b34bdff88c8722e1f133..eaf9bad5895bd5a18d354554d16e1a5067de4ed2 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 a02b908acfe378d15768f6da150a300df4acba27..0000000000000000000000000000000000000000 --- a/src/components/EditTextEntityMenu.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - diff --git a/src/components/LogoAndLabel.vue b/src/components/LogoAndLabel.vue index e6b58fa33c09a6d828a1223f34ab5a08dbdc3567..83c84e242b112883b0696dd2158b0670a7fb87a6 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 9afc9f54905891ea6528e5f2025705d3b087e1f3..0264faa62e6277032fc429315319a743bce181d5 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 0000000000000000000000000000000000000000..a39d07e3cddc6ac15a637dd03c185b7b538d3f44 --- /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 c77d79660eba1d306c7b2aea22188f5b1ee9828b..7abdbcee67f4d0ce5c7880a8f5ab9cfb6d3b229c 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 8c4d4dca7eb0bc0bde9a23c197d997de08f044c4..2e936bfcfcbe97ec2c1e1261ad19c8f0057ab68d 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 69321b5e6cc48db509a79be55f5df53e4fe9343e..d8cfa76b232136a5987ff4d8fdd930ff12243cd7 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