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

Merge branch 'refactor/removePrimevue' into 'main' 

Избавление от PrimeVue и добавление собственной UI-библиотеки (не закончена)

See merge request !13
parents 2c81472a c049cc44

package-lock.json

+0 −109
Original line number Diff line number Diff line
@@ -8,18 +8,14 @@ 
      "name": "ShelfNote",

      "version": "0.0.0",

      "dependencies": {

        "@primevue/themes": "^4.0.4",

        "@vueuse/core": "^10.11.0",

        "pinia": "^2.1.7",

        "primeicons": "^7.0.0",

        "primevue": "^4.0.4",

        "tailwindcss": "^3.4.7",

        "vue": "^3.4.29",

        "vue-cookies": "^1.8.4",

        "vue-router": "^4.3.3"

      },

      "devDependencies": {

        "@primevue/auto-import-resolver": "^4.0.4",

        "@rushstack/eslint-patch": "^1.8.0",

        "@tsconfig/node20": "^20.1.4",

        "@types/node": "^20.14.5",
@@ -418,91 +414,6 @@ 
        "url": "https://opencollective.com/unts"

      }

    },

    "node_modules/@primeuix/styled": {

      "version": "0.0.5",

      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.0.5.tgz",

      "integrity": "sha512-pVoGn/uPkVm/DyF3TR3EmH/pL/dP4nR42FcYbVduFq9VfO3KVeOEqvcCULHXos66RZO9MCbCFUoLy6ctf9GUGQ==",

      "license": "MIT",

      "dependencies": {

        "@primeuix/utils": "^0.0.5"

      },

      "engines": {

        "node": ">=12.11.0"

      }

    },

    "node_modules/@primeuix/utils": {

      "version": "0.0.5",

      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.0.5.tgz",

      "integrity": "sha512-ntUiUgtRtkF8KuaxHffzhYxQxoXk6LAPHm7CVlFjdqS8Rx8xRkLkZVyo84E+pO2hcNFkOGVP/GxHhQ2s94O8zA==",

      "license": "MIT",

      "engines": {

        "node": ">=12.11.0"

      }

    },

    "node_modules/@primevue/auto-import-resolver": {

      "version": "4.0.4",

      "resolved": "https://registry.npmjs.org/@primevue/auto-import-resolver/-/auto-import-resolver-4.0.4.tgz",

      "integrity": "sha512-rI91rugr0/A58lmDcC4m3nxKdMh2K2O6ntQd+6UT8oFYiptJVNXQLY+U4zweAoG1toMnIoqGR20FXOTA7lS7ww==",

      "dev": true,

      "license": "MIT",

      "dependencies": {

        "@primevue/metadata": "4.0.4"

      },

      "engines": {

        "node": ">=12.11.0"

      }

    },

    "node_modules/@primevue/core": {

      "version": "4.0.4",

      "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.0.4.tgz",

      "integrity": "sha512-xGD2hNYL4WLnkWuoxIjMIqEXiydYpFovDuCMHMWRl3yb/AFJcHpyZpUlgZ2HnJydA5ZsLS00sGsPHEoV5u2M8A==",

      "license": "MIT",

      "dependencies": {

        "@primeuix/styled": "^0.0.5",

        "@primeuix/utils": "^0.0.5"

      },

      "engines": {

        "node": ">=12.11.0"

      },

      "peerDependencies": {

        "vue": "^3.0.0"

      }

    },

    "node_modules/@primevue/icons": {

      "version": "4.0.4",

      "resolved": "https://registry.npmjs.org/@primevue/icons/-/icons-4.0.4.tgz",

      "integrity": "sha512-eHOuO5jIv/qb3mpo3m1qpDKJxw/B8ZFpAcsKxV4uWhAXkxWo/afmykGO38PVabKc3SSai8bq1zFVXPA1w0cg9g==",

      "license": "MIT",

      "dependencies": {

        "@primeuix/utils": "^0.0.5",

        "@primevue/core": "4.0.4"

      },

      "engines": {

        "node": ">=12.11.0"

      }

    },

    "node_modules/@primevue/metadata": {

      "version": "4.0.4",

      "resolved": "https://registry.npmjs.org/@primevue/metadata/-/metadata-4.0.4.tgz",

      "integrity": "sha512-j1Cb6qxuKDHyT0vjlFiLjiHILN7D6xC2zIaHRcYn0XcQS27r5ianzGFIiW98OVRFTUqWAf4k0TSCrgZPawPjRA==",

      "dev": true,

      "license": "MIT",

      "engines": {

        "node": ">=12.11.0"

      }

    },

    "node_modules/@primevue/themes": {

      "version": "4.0.4",

      "resolved": "https://registry.npmjs.org/@primevue/themes/-/themes-4.0.4.tgz",

      "integrity": "sha512-eknRgSo1KQY+r7LEtb/jERhVHq4/Vlu5BKBQ8/Sc/G3DBDHaeJTDqYHWWoTxdaTJkXbC2pJMKFaJ/Vs7LuoIOw==",

      "license": "MIT",

      "dependencies": {

        "@primeuix/styled": "^0.0.5"

      },

      "engines": {

        "node": ">=12.11.0"

      }

    },

    "node_modules/@rollup/pluginutils": {

      "version": "5.1.0",

      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
@@ -2965,26 +2876,6 @@ 
        "node": ">=6.0.0"

      }

    },

    "node_modules/primeicons": {

      "version": "7.0.0",

      "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-7.0.0.tgz",

      "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw=="

    },

    "node_modules/primevue": {

      "version": "4.0.4",

      "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.0.4.tgz",

      "integrity": "sha512-1moEddbczJ1+yEyfeYQk3xOQB64iCjjM//f+HSXs6YrKVVC0QjPFx9XPNXrr2JjHlp+6D7EpPZtsmcrfA9jWkA==",

      "license": "MIT",

      "dependencies": {

        "@primeuix/styled": "^0.0.5",

        "@primeuix/utils": "^0.0.5",

        "@primevue/core": "4.0.4",

        "@primevue/icons": "4.0.4"

      },

      "engines": {

        "node": ">=12.11.0"

      }

    },

    "node_modules/punycode": {

      "version": "2.3.1",

      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",

package.json

+0 −4
Original line number Diff line number Diff line
@@ -13,12 +13,9 @@ 
    "format": "prettier --write src/"

  },

  "dependencies": {

    "@primevue/themes": "^4.0.4",

    "@vueuse/core": "^10.11.0",

    "@vueuse/integrations": "^10.11.0",

    "pinia": "^2.1.7",

    "primeicons": "^7.0.0",

    "primevue": "^4.0.4",

    "universal-cookie": "^7",

    "uuid": "^10.0.0",

    "vue": "^3.4.29",
@@ -26,7 +23,6 @@ 
    "vue-router": "^4.3.3"

  },

  "devDependencies": {

    "@primevue/auto-import-resolver": "^4.0.4",

    "@rushstack/eslint-patch": "^1.8.0",

    "@tsconfig/node20": "^20.1.4",

    "@types/node": "^20.14.5",

src/app/App.vue

+0 −1
Original line number Diff line number Diff line 
<script setup lang="ts">

import 'primeicons/primeicons.css';

import cookies from '@/app/plugins/Cookie';

onMounted(() => {

  const home_uuidFromLS = cookies.get('home_uuid');

src/app/assets/main.css

+25 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 
}

body {

  min-height: 100vh;

  overflow-x: hidden;

}

#app {

  min-height: 100vh;
@@ -154,12 +155,15 @@ body { 
  padding: 0;

  margin: 0;

  border: none;

  box-sizing: border-box;

}



*,

*::before,

*::after {

  box-sizing: border-box;

  user-select: none;

  color: white;

}



/* Links */
@@ -238,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;

}
@@ -258,3 +266,20 @@ legend { 
::-webkit-scrollbar-thumb:hover {

  background: #0033ff;

}

.bounce-enter-active {

  animation: bounce-in 0.5s;

}

.bounce-leave-active {

  animation: bounce-in 0.5s reverse;

}

@keyframes bounce-in {

  0% {

    transform: scale(0);

  }

  50% {

    transform: scale(1.25);

  }

  100% {

    transform: scale(1);

  }

}

src/app/components.d.ts

+30 −15
Original line number Diff line number Diff line
@@ -9,48 +9,63 @@ declare module 'vue' { 
  export interface GlobalComponents {

    App: typeof import('./App.vue')['default']

    AuthorizationForm: typeof import('./../modules/authorization/AuthorizationForm.vue')['default']

    Avatar: typeof import('primevue/avatar')['default']

    BaseDivider: typeof import('./../shared/BaseDivider.vue')['default']

    BaseLoader: typeof import('./../shared/BaseLoader.vue')['default']

    BaseSidebarMenu: typeof import('./../modules/BaseSidebarMenu.vue')['default']

    Button: typeof import('primevue/button')['default']

    Button: typeof import('./../shared/ui/Button.vue')['default']

    CloseCircle: typeof import('./../shared/icons/CloseCircle.vue')['default']

    CreateEntityMenu: typeof import('./../components/CreateEntityMenu.vue')['default']

    CropImageModal: typeof import('./../modules/CropImageModal.vue')['default']

    DashedIcon: typeof import('./../shared/icons/DashedIcon.vue')['default']

    Dialog: typeof import('primevue/dialog')['default']

    Divider: typeof import('primevue/divider')['default']

    Divider: typeof import('./../shared/ui/Divider.vue')['default']

    DividerItem: typeof import('./../modules/entities/DividerItem.vue')['default']

    DividerMenu: typeof import('./../modules/entities/menu/DividerMenu.vue')['default']

    DividerMenu: typeof import('./../modules/entities/settings/DividerMenu.vue')['default']

    DividerSettings: typeof import('./../components/entities/settings/DividerSettings.vue')['default']

    DottedIcon: typeof import('./../shared/icons/DottedIcon.vue')['default']

    Drawer: typeof import('primevue/drawer')['default']

    Drawer: typeof import('./../shared/ui/Drawer.vue')['default']

    EntitiesList: typeof import('./../modules/entities/EntitiesList.vue')['default']

    EntityItem: typeof import('./../modules/entities/EntityItem.vue')['default']

    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']

    HamburgerIcon: typeof import('./../shared/icons/HamburgerIcon.vue')['default']

    HomeIcon: typeof import('./../shared/icons/HomeIcon.vue')['default']

    HorizontalLineIcon: typeof import('./../shared/icons/HorizontalLineIcon.vue')['default']

    ImageIcon: typeof import('./../shared/icons/ImageIcon.vue')['default']

    ImageItem: typeof import('./../modules/entities/ImageItem.vue')['default']

    ImageMenu: typeof import('./../modules/entities/menu/ImageMenu.vue')['default']

    ImageMenu: typeof import('./../components/entities/settings/ImageMenu.vue')['default']

    ImagePositionMenu: typeof import('./../components/entities/image/ImagePositionMenu.vue')['default']

    ImageSettings: typeof import('./../components/entities/settings/ImageSettings.vue')['default']

    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']

    MenuHeader: typeof import('./../modules/MenuHeader.vue')['default']

    page: typeof import('./../modules/Home page.vue')['default']

    MenuDial: typeof import('./../shared/ui/MenuDial.vue')['default']

    MenuHeader: typeof import('./../components/MenuHeader.vue')['default']

    Modal: typeof import('./../shared/ui/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']

    ParagraphIcon: typeof import('./../shared/icons/ParagraphIcon.vue')['default']

    PlusIcon: typeof import('./../shared/icons/PlusIcon.vue')['default']

    RouterLink: typeof import('vue-router')['RouterLink']

    RouterView: typeof import('vue-router')['RouterView']

    SettingsIcon: typeof import('./../shared/icons/SettingsIcon.vue')['default']

    SheetPage: typeof import('./../pages/[uuid]/SheetPage.vue')['default']

    SidebarMenuContent: typeof import('./../modules/SidebarMenuContent.vue')['default']

    SidebarMenuHeader: typeof import('./../modules/SidebarMenuHeader.vue')['default']

    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']

    TableIcon: typeof import('./../shared/icons/TableIcon.vue')['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']

    TextMenu: typeof import('./../modules/entities/menu/TextMenu.vue')['default']

    TextPositionMenu: typeof import('./../components/entities/text/TextPositionMenu.vue')['default']

    TextSettings: typeof import('./../components/entities/settings/TextSettings.vue')['default']

    TextStateMenu: typeof import('./../components/entities/text/TextStateMenu.vue')['default']

    ToggleSwitch: typeof import('primevue/toggleswitch')['default']

    Tree: typeof import('primevue/tree')['default']

    UserInfoHeaderWithSettings: typeof import('./../components/UserInfoHeaderWithSettings.vue')['default']

    ToggleSwitch: typeof import('./../shared/ui/ToggleSwitch.vue')['default']

    TrashIcon: typeof import('./../shared/icons/TrashIcon.vue')['default']

    Tree: typeof import('./../shared/ui/Tree.vue')['default']

    VerticalArrowsIcon: typeof import('./../shared/icons/VerticalArrowsIcon.vue')['default']

  }

}