From 0f6ed81e48c05edb7c19e1fec41d227a2d9ecfcf Mon Sep 17 00:00:00 2001 From: kur0nek-o Date: Fri, 27 Oct 2023 20:22:36 +0700 Subject: [PATCH] implement filters to the menu --- src/assets/css/style.css | 66 ++++------ src/components/DatePicker.vue | 21 +++ src/components/Form/Filters.vue | 6 +- src/components/Form/FiltersType/Type1.vue | 65 +++------- src/components/Form/FiltersType/Type2.vue | 23 ---- .../Navigation/Aside/AsideMenuSingle.vue | 6 +- src/components/Pages/MenuProvider.vue | 23 +++- src/components/Select.vue | 120 ++++++++++++++++++ src/router/index.ts | 5 +- src/views/TestView.vue | 88 +------------ 10 files changed, 211 insertions(+), 212 deletions(-) create mode 100644 src/components/DatePicker.vue create mode 100644 src/components/Select.vue diff --git a/src/assets/css/style.css b/src/assets/css/style.css index c62282c..5e002d6 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1607,10 +1607,6 @@ select { --tw-divide-opacity: 0.1; } -.divide-opacity-100 > :not([hidden]) ~ :not([hidden]) { - --tw-divide-opacity: 1; -} - .overflow-auto { overflow: auto; } @@ -1676,6 +1672,11 @@ select { border-top-right-radius: 1rem; } +.rounded-b-2xl { + border-bottom-right-radius: 1rem; + border-bottom-left-radius: 1rem; +} + .border { border-width: 1px; } @@ -1869,6 +1870,10 @@ select { background-color: rgb(204 204 0 / var(--tw-bg-opacity)); } +.bg-opacity-100 { + --tw-bg-opacity: 1; +} + .bg-opacity-25 { --tw-bg-opacity: 0.25; } @@ -1889,8 +1894,8 @@ select { --tw-bg-opacity: 0.8; } -.bg-opacity-100 { - --tw-bg-opacity: 1; +.bg-none { + background-image: none; } .fill-gray-500 { @@ -1946,6 +1951,10 @@ select { padding: 1.25rem; } +.p-0 { + padding: 0px; +} + .\!px-2 { padding-left: 0.5rem !important; padding-right: 0.5rem !important; @@ -2112,10 +2121,6 @@ select { padding-top: 0.5rem; } -.pt-4 { - padding-top: 1rem; -} - .pt-5 { padding-top: 1.25rem; } @@ -2266,6 +2271,11 @@ select { color: rgb(21 22 23 / var(--tw-text-opacity)); } +.text-gray-200 { + --tw-text-opacity: 1; + color: rgb(229 231 235 / var(--tw-text-opacity)); +} + .text-gray-300 { --tw-text-opacity: 1; color: rgb(209 213 219 / var(--tw-text-opacity)); @@ -2396,11 +2406,6 @@ select { color: rgb(153 153 0 / var(--tw-text-opacity)); } -.text-gray-200 { - --tw-text-opacity: 1; - color: rgb(229 231 235 / var(--tw-text-opacity)); -} - .text-opacity-40 { --tw-text-opacity: 0.4; } @@ -3361,24 +3366,14 @@ select { padding: 5rem; } - .md\:px-4 { - padding-left: 1rem; - padding-right: 1rem; - } - - .md\:py-0 { - padding-top: 0px; - padding-bottom: 0px; - } - .md\:px-6 { padding-left: 1.5rem; padding-right: 1.5rem; } - .md\:py-6 { - padding-top: 1.5rem; - padding-bottom: 1.5rem; + .md\:py-0 { + padding-top: 0px; + padding-bottom: 0px; } .md\:pl-4 { @@ -3476,21 +3471,6 @@ select { padding-right: 2rem; } - .lg\:px-6 { - padding-left: 1.5rem; - padding-right: 1.5rem; - } - - .lg\:py-6 { - padding-top: 1.5rem; - padding-bottom: 1.5rem; - } - - .lg\:text-3xl { - font-size: 1.875rem; - line-height: 2.25rem; - } - .lg\:text-xs { font-size: 0.75rem; line-height: 1rem; diff --git a/src/components/DatePicker.vue b/src/components/DatePicker.vue new file mode 100644 index 0000000..15dceac --- /dev/null +++ b/src/components/DatePicker.vue @@ -0,0 +1,21 @@ + + + \ No newline at end of file diff --git a/src/components/Form/Filters.vue b/src/components/Form/Filters.vue index c320c86..fe42dd7 100644 --- a/src/components/Form/Filters.vue +++ b/src/components/Form/Filters.vue @@ -18,13 +18,13 @@ diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue index ffa4e32..72d45e1 100644 --- a/src/components/Form/FiltersType/Type2.vue +++ b/src/components/Form/FiltersType/Type2.vue @@ -1,14 +1,3 @@ - - \ No newline at end of file diff --git a/src/components/Navigation/Aside/AsideMenuSingle.vue b/src/components/Navigation/Aside/AsideMenuSingle.vue index 9606dd1..23a9199 100644 --- a/src/components/Navigation/Aside/AsideMenuSingle.vue +++ b/src/components/Navigation/Aside/AsideMenuSingle.vue @@ -2,7 +2,7 @@ import type { MenuItemModel } from '@/types/menu' import { IconDotOutline } from '@/utils/icons'; -defineProps({ +const props = defineProps({ item: { type: Object as () => MenuItemModel, required: true @@ -29,7 +29,7 @@ defineProps({