From dbf0e6dae96001f58591ac1353b74fa288124c6e 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: Sun, 15 Sep 2024 18:56:06 +0500 Subject: [PATCH] add MenuDial and refactor --- src/app/assets/icons/close-circle.svg | 4 - src/app/assets/main.css | 4 + src/app/components.d.ts | 5 +- src/components/PageMenuButton.vue | 17 +++ src/pages/[uuid]/SheetPage.vue | 24 +--- src/shared/MenuDial.vue | 106 ++++++++++++++++++ .../{HamgurgerMenu.vue => HamburgerMenu.vue} | 0 7 files changed, 134 insertions(+), 26 deletions(-) delete mode 100644 src/app/assets/icons/close-circle.svg create mode 100644 src/components/PageMenuButton.vue create mode 100644 src/shared/MenuDial.vue rename src/shared/icons/{HamgurgerMenu.vue => HamburgerMenu.vue} (100%) diff --git a/src/app/assets/icons/close-circle.svg b/src/app/assets/icons/close-circle.svg deleted file mode 100644 index 22022e7..0000000 --- a/src/app/assets/icons/close-circle.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/app/assets/main.css b/src/app/assets/main.css index 0c447b6..e1a9b3e 100644 --- a/src/app/assets/main.css +++ b/src/app/assets/main.css @@ -242,6 +242,10 @@ label { legend { display: block; } +input[type=file], /* FF, IE7+, chrome (except button) */ +input[type=file]::-webkit-file-upload-button { + cursor: pointer; +} ::-webkit-scrollbar { width: 10px; } diff --git a/src/app/components.d.ts b/src/app/components.d.ts index 9d8258e..827970b 100644 --- a/src/app/components.d.ts +++ b/src/app/components.d.ts @@ -27,7 +27,7 @@ declare module 'vue' { EntityPositionSettings: typeof import('./../components/entities/settings/EntityPositionSettings.vue')['default'] EntityTitle: typeof import('./../components/entities/share/EntityTitle.vue')['default'] ExitIcon: typeof import('./../shared/icons/ExitIcon.vue')['default'] - HamgurgerMenu: typeof import('./../shared/icons/HamgurgerMenu.vue')['default'] + HamburgerMenu: typeof import('./../shared/icons/HamburgerMenu.vue')['default'] HomeIcon: typeof import('./../shared/icons/HomeIcon.vue')['default'] ImageItem: typeof import('./../modules/entities/ImageItem.vue')['default'] ImageMenu: typeof import('./../components/entities/settings/ImageMenu.vue')['default'] @@ -35,11 +35,13 @@ declare module 'vue' { ImageSizeMenu: typeof import('./../components/entities/image/ImageSizeMenu.vue')['default'] ImageStateMenu: typeof import('./../components/entities/image/ImageStateMenu.vue')['default'] LogoAndLabel: typeof import('./../components/LogoAndLabel.vue')['default'] + MenuDial: typeof import('./../shared/MenuDial.vue')['default'] MenuHeader: typeof import('./../modules/MenuHeader.vue')['default'] Modal: typeof import('./../shared/Modal.vue')['default'] NavigationIcon: typeof import('./../shared/icons/NavigationIcon.vue')['default'] PageBackgroundMenu: typeof import('./../modules/PageBackgroundMenu.vue')['default'] PageHeader: typeof import('./../modules/PageHeader.vue')['default'] + PageMenuButton: typeof import('./../components/PageMenuButton.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] SettingsIcon: typeof import('./../shared/icons/SettingsIcon.vue')['default'] @@ -47,7 +49,6 @@ declare module 'vue' { SignIn: typeof import('./../pages/authorization/signIn.vue')['default'] SignUp: typeof import('./../pages/authorization/signUp.vue')['default'] SolidIcon: typeof import('./../shared/icons/SolidIcon.vue')['default'] - SpeedDial: typeof import('primevue/speeddial')['default'] TelegramSection: typeof import('./../modules/TelegramSection.vue')['default'] TextFontMenu: typeof import('./../components/entities/share/TextFontMenu.vue')['default'] TextItem: typeof import('./../modules/entities/TextItem.vue')['default'] diff --git a/src/components/PageMenuButton.vue b/src/components/PageMenuButton.vue new file mode 100644 index 0000000..8cbf136 --- /dev/null +++ b/src/components/PageMenuButton.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/pages/[uuid]/SheetPage.vue b/src/pages/[uuid]/SheetPage.vue index 8f15594..83a2354 100644 --- a/src/pages/[uuid]/SheetPage.vue +++ b/src/pages/[uuid]/SheetPage.vue @@ -7,6 +7,7 @@ import type { IEntity } from '@/app/interfaces/environment'; import type { IImageMainInfo } from '@/app/interfaces'; import { createEntity, fetchForEntities, setDefaultPageBackground } from '@/app/helpers'; import cookies from '@/app/plugins/Cookie'; +import PageMenuButton from '@/components/PageMenuButton.vue'; const dataStore = useDataStore(); const interfaceStore = useInterfaceStore(); @@ -74,29 +75,16 @@ const saveImage = (finalImageUrl: string) => { interfaceStore.editPageBackground(finalImageUrl); isModalUploadFile.value = false; }; -const closeMenu = () => (isMenuVisible.value = false); +const openMenu = () => (isMenuVisible.value = true);