Commit e2497930 authored by Дмитрий Малюгин's avatar Дмитрий Малюгин 🕓
Browse files

Merge remote-tracking branch 'origin/refactor/removePrimevue' into refactor/removePrimevue 

# Conflicts:
#	src/app/components.d.ts
#	src/pages/[uuid]/SheetPage.vue
parents ab450632 dbf0e6da

src/app/assets/icons/close-circle.svg

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->

<svg width="40px" height="40px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">

<path fill-rule="evenodd" clip-rule="evenodd" d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM8.96963 8.96965C9.26252 8.67676 9.73739 8.67676 10.0303 8.96965L12 10.9393L13.9696 8.96967C14.2625 8.67678 14.7374 8.67678 15.0303 8.96967C15.3232 9.26256 15.3232 9.73744 15.0303 10.0303L13.0606 12L15.0303 13.9696C15.3232 14.2625 15.3232 14.7374 15.0303 15.0303C14.7374 15.3232 14.2625 15.3232 13.9696 15.0303L12 13.0607L10.0303 15.0303C9.73742 15.3232 9.26254 15.3232 8.96965 15.0303C8.67676 14.7374 8.67676 14.2625 8.96965 13.9697L10.9393 12L8.96963 10.0303C8.67673 9.73742 8.67673 9.26254 8.96963 8.96965Z" fill="#1C274C"/>

</svg>
 
 No newline at end of file

src/app/assets/main.css

+4 −0
Original line number Diff line number Diff line
@@ -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;

}

src/app/components.d.ts

+2 −2
Original line number Diff line number Diff line
@@ -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']
@@ -40,6 +40,7 @@ declare module 'vue' { 
    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 +48,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']

src/components/PageMenuButton.vue

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<script setup lang="ts">

const emit = defineEmits(['openMenu']);

</script>



<template>

  <div class="fixed top-0 left-0 z-50">

    <button

      class="px-4 py-2 text-white font-bold hover:bg-slate-800 transition-all rounded-md"

      @click.prevent="emit('openMenu')"

    >

      Menu

      <HamburgerMenu color="white" size="40" />

    </button>

  </div>

</template>



<style scoped></style>

src/pages/[uuid]/SheetPage.vue

+3 −20
Original line number Diff line number Diff line
@@ -75,29 +75,16 @@ const saveImage = (finalImageUrl: string) => { 
  interfaceStore.editPageBackground(finalImageUrl);

  isModalUploadFile.value = false;

};

const closeMenu = () => (isMenuVisible.value = false);

const openMenu = () => (isMenuVisible.value = true);

</script>



<template>

  <PageHeader v-model:isEditMode="isEditMode" :title="'Home page'" />

  <div class="fixed top-0 left-0 z-50">

    <button

      class="px-4 py-2 text-white font-bold hover:bg-slate-800 transition-all rounded-md"

      @click.prevent="isMenuVisible = !isMenuVisible"

    >

      Menu

      <HamgurgerMenu color="white" size="40" />

    </button>

  </div>

  <PageMenuButton @openMenu="openMenu" />

  <Drawer v-model:isVisible="isMenuVisible" theme="black">

    <template #header><MenuHeader /></template>

    <BaseSidebarMenu class="relative z-50" @closeMenu="closeMenu" />

    <BaseSidebarMenu class="relative z-50" />

  </Drawer>

  <!--  <Drawer v-model:visible="isMenuVisible">-->

  <!--    <template #container="{ closeCallback }">-->

  <!--      <BaseSidebarMenu class="relative z-50" @closeMenu="closeCallback" />-->

  <!--    </template>-->

  <!--  </Drawer>-->

  <TelegramSection />

  <CropImageModal

    v-model:isVisible="isModalUploadFile"
@@ -158,8 +145,4 @@ const closeMenu = () => (isMenuVisible.value = false); 
.telegramContainer:hover > a {

  filter: brightness(0.75);

}

input[type=file], /* FF, IE7+, chrome (except button) */

input[type=file]::-webkit-file-upload-button {

  cursor: pointer;

}

</style>