From 96b287e54049fca3be6a8db5270f8fe177164969 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 27 Oct 2023 10:23:47 +0700 Subject: [PATCH 01/12] update action dialog success --- src/components/Dialogs/ActionDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Dialogs/ActionDialog.vue b/src/components/Dialogs/ActionDialog.vue index 542dd17..b35f733 100644 --- a/src/components/Dialogs/ActionDialog.vue +++ b/src/components/Dialogs/ActionDialog.vue @@ -145,7 +145,7 @@ const handleOnClose = () => { class="flex items-center justify-center w-12 h-12 mx-auto rounded-full bg-secondary-100"> + class="w-6 h-6 text-green-600 fill-green-600"> From 298e6b7c0107545c60bc1aa70d60c448c39ba1d6 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 27 Oct 2023 10:44:35 +0700 Subject: [PATCH 02/12] update style --- src/assets/css/style.css | 122 +++++++-------------------------------- 1 file changed, 21 insertions(+), 101 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index d2c872c..911c2f3 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1252,10 +1252,6 @@ select { max-height: 15rem; } -.max-h-80 { - max-height: 20rem; -} - .max-h-\[1000px\] { max-height: 1000px; } @@ -1611,10 +1607,6 @@ select { --tw-divide-opacity: 0.1; } -.divide-opacity-100 > :not([hidden]) ~ :not([hidden]) { - --tw-divide-opacity: 1; -} - .overflow-auto { overflow: auto; } @@ -1675,16 +1667,6 @@ select { border-bottom-right-radius: 9999px; } -.rounded-t-3xl { - border-top-left-radius: 1.5rem; - border-top-right-radius: 1.5rem; -} - -.rounded-t-xl { - border-top-left-radius: 0.75rem; - border-top-right-radius: 0.75rem; -} - .rounded-t-2xl { border-top-left-radius: 1rem; border-top-right-radius: 1rem; @@ -1883,6 +1865,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; } @@ -1907,14 +1893,6 @@ select { background-image: none; } -.fill-gray-400 { - fill: #9ca3af; -} - -.bg-opacity-100 { - --tw-bg-opacity: 1; -} - .fill-gray-500 { fill: #6b7280; } @@ -1923,6 +1901,10 @@ select { fill: #4b5563; } +.fill-green-600 { + fill: #16a34a; +} + .fill-primary-500 { fill: #035b71; } @@ -1931,10 +1913,6 @@ select { fill: #cc0000; } -.fill-secondary-600 { - fill: #007b8d; -} - .fill-white { fill: #fff; } @@ -2138,14 +2116,6 @@ select { padding-top: 1.25rem; } -.pt-6 { - padding-top: 1.5rem; -} - -.pt-4 { - padding-top: 1rem; -} - .text-left { text-align: left; } @@ -2191,16 +2161,16 @@ select { line-height: 1.25rem; } -.text-xs { - font-size: 0.75rem; - line-height: 1rem; -} - .text-xl { font-size: 1.25rem; line-height: 1.75rem; } +.text-xs { + font-size: 0.75rem; + line-height: 1rem; +} + .font-bold { font-weight: 700; } @@ -2292,6 +2262,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)); @@ -2382,11 +2357,6 @@ select { color: rgb(204 0 0 / var(--tw-text-opacity)); } -.text-secondary-600 { - --tw-text-opacity: 1; - color: rgb(0 123 141 / var(--tw-text-opacity)); -} - .text-slate-600 { --tw-text-opacity: 1; color: rgb(71 85 105 / var(--tw-text-opacity)); @@ -2422,11 +2392,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; } @@ -2915,8 +2880,6 @@ select { color: rgb(53 124 141 / var(--tw-text-opacity)); } -.group:hover .group-hover\:fill-gray-500 { - fill: #6b7280; .group:hover .group-hover\:block { display: block; } @@ -3268,10 +3231,6 @@ select { padding-right: 1.5rem; } - .sm\:pt-4 { - padding-top: 1rem; - } - .sm\:text-left { text-align: left; } @@ -3393,29 +3352,14 @@ select { padding: 5rem; } - .md\:px-0 { - padding-left: 0px; - padding-right: 0px; - } - - .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 { @@ -3426,15 +3370,6 @@ select { padding-left: 20rem; } - .md\:pt-6 { - padding-top: 1.5rem; - } - - .md\:text-2xl { - font-size: 1.5rem; - line-height: 2rem; - } - .md\:text-3xl { font-size: 1.875rem; line-height: 2.25rem; @@ -3522,21 +3457,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; From c479b35cf8f1a05ea2f97fdb3d8516bc4a54cd03 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 27 Oct 2023 11:10:33 +0700 Subject: [PATCH 03/12] update recent page list title --- src/components/Pages/Welcome.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pages/Welcome.vue b/src/components/Pages/Welcome.vue index a4e95e1..0c22663 100644 --- a/src/components/Pages/Welcome.vue +++ b/src/components/Pages/Welcome.vue @@ -12,7 +12,7 @@

- Terakhir Dikunjungi + Terakhir Diakses

From 62696fa8f579080ee4d5326282326e7bf14d2a1d Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 27 Oct 2023 11:28:58 +0700 Subject: [PATCH 04/12] update style --- src/assets/css/style.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index d68ff60..911c2f3 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1917,10 +1917,6 @@ select { fill: #fff; } -.fill-secondary-600 { - fill: #007b8d; -} - .stroke-white { stroke: #fff; } @@ -2396,11 +2392,6 @@ select { color: rgb(153 153 0 / var(--tw-text-opacity)); } -.text-secondary-600 { - --tw-text-opacity: 1; - color: rgb(0 123 141 / var(--tw-text-opacity)); -} - .text-opacity-40 { --tw-text-opacity: 0.4; } From 356102c20f092af388aee18cf05b8bc90f8a0e80 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 27 Oct 2023 13:30:28 +0700 Subject: [PATCH 05/12] update style --- src/assets/css/style.css | 103 +++++++-------------------------------- 1 file changed, 17 insertions(+), 86 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 6ddbd1a..0082b19 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -1210,10 +1210,6 @@ select { max-height: 15rem; } -.max-h-80 { - max-height: 20rem; -} - .max-h-\[1000px\] { max-height: 1000px; } @@ -1547,10 +1543,6 @@ select { --tw-divide-opacity: 0.1; } -.divide-opacity-100 > :not([hidden]) ~ :not([hidden]) { - --tw-divide-opacity: 1; -} - .overflow-auto { overflow: auto; } @@ -1607,16 +1599,6 @@ select { border-bottom-right-radius: 9999px; } -.rounded-t-3xl { - border-top-left-radius: 1.5rem; - border-top-right-radius: 1.5rem; -} - -.rounded-t-xl { - border-top-left-radius: 0.75rem; - border-top-right-radius: 0.75rem; -} - .rounded-t-2xl { border-top-left-radius: 1rem; border-top-right-radius: 1rem; @@ -1805,6 +1787,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; } @@ -1825,10 +1811,6 @@ select { --tw-bg-opacity: 0.8; } -.bg-opacity-100 { - --tw-bg-opacity: 1; -} - .fill-gray-500 { fill: #6b7280; } @@ -2048,14 +2030,6 @@ select { padding-top: 1.25rem; } -.pt-6 { - padding-top: 1.5rem; -} - -.pt-4 { - padding-top: 1rem; -} - .text-left { text-align: left; } @@ -2101,16 +2075,16 @@ select { line-height: 1.25rem; } -.text-xs { - font-size: 0.75rem; - line-height: 1rem; -} - .text-xl { font-size: 1.25rem; line-height: 1.75rem; } +.text-xs { + font-size: 0.75rem; + line-height: 1rem; +} + .font-bold { font-weight: 700; } @@ -2202,6 +2176,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)); @@ -2332,11 +2311,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; } @@ -3124,10 +3098,6 @@ select { padding-right: 1.5rem; } - .sm\:pt-4 { - padding-top: 1rem; - } - .sm\:text-left { text-align: left; } @@ -3249,29 +3219,14 @@ select { padding: 5rem; } - .md\:px-0 { - padding-left: 0px; - padding-right: 0px; - } - - .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 { @@ -3282,15 +3237,6 @@ select { padding-left: 20rem; } - .md\:pt-6 { - padding-top: 1.5rem; - } - - .md\:text-2xl { - font-size: 1.5rem; - line-height: 2rem; - } - .md\:text-3xl { font-size: 1.875rem; line-height: 2.25rem; @@ -3374,21 +3320,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; From 7c6212c37b3e59c69a614e7095409d139200439b Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 27 Oct 2023 13:51:43 +0700 Subject: [PATCH 06/12] update --- src/stores/menu.ts | 17 ++++++----------- vite.config.ts | 3 ++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/stores/menu.ts b/src/stores/menu.ts index 02c0210..9711dcd 100644 --- a/src/stores/menu.ts +++ b/src/stores/menu.ts @@ -40,18 +40,8 @@ export const useMenuStore = defineStore('menu', () => { } const toggleSidebarDesktop = () => (sidebarShowed.value = !sidebarShowed.value) - watch(router, (value) => { - if (value.currentRoute.value.fullPath === '/' || value.currentRoute.value.fullPath === '/home') { - for (const item of navigation.value) { - item.expanded = false - } - } - }) - watch(menuSelected, (value) => { if (value !== '/login' && value !== '/404' && value !== '/home' && value !== '/') { - console.log('current route', value); - const result = command.searchRoutesPath(routes, value) if (result.length > 0) { const route = result.find((item) => item.path === value) @@ -59,7 +49,12 @@ export const useMenuStore = defineStore('menu', () => { command.addRecent(route) } } - + } else { + if (value === '/' || value === '/home') { + for (const item of navigation.value) { + item.expanded = false + } + } } }) diff --git a/vite.config.ts b/vite.config.ts index 6c8dc64..e90681d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -18,7 +18,8 @@ export default defineConfig({ ], resolve: { alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) + '@': fileURLToPath(new URL('./src', import.meta.url)), + 'inferno': 'inferno/dist/index.dev.esm.js', } }, }) From 06749de494adf8639957a2d6f0bfbc52ddf0fb79 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 27 Oct 2023 15:36:47 +0700 Subject: [PATCH 07/12] fix dialog command palettes error --- package-lock.json | 79 ++++++++++--------- package.json | 2 +- src/App.vue | 5 -- src/components/CommandPalettes.vue | 7 +- .../Navigation/Aside/AsideMenuMultiple.vue | 3 +- src/stores/command.ts | 7 +- src/stores/menu.ts | 12 +-- 7 files changed, 54 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33c2a51..2a53c13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "eis", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "eis", - "version": "0.0.1", + "version": "0.0.2", "dependencies": { "@headlessui/tailwindcss": "^0.2.0", "@headlessui/vue": "^1.7.16", @@ -500,9 +500,9 @@ } }, "node_modules/@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.22.13", @@ -2678,19 +2678,22 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 4" } }, "node_modules/browserify-sign/node_modules/readable-stream": { @@ -3259,9 +3262,9 @@ } }, "node_modules/crypto-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz", - "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "node_modules/css-line-break": { "version": "2.1.0", @@ -8511,9 +8514,9 @@ } }, "node_modules/vite": { - "version": "4.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz", - "integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", + "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -9492,9 +9495,9 @@ } }, "@babel/traverse": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz", - "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "requires": { "@babel/code-frame": "^7.22.13", @@ -11033,19 +11036,19 @@ } }, "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" }, "dependencies": { "readable-stream": { @@ -11455,9 +11458,9 @@ } }, "crypto-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz", - "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "css-line-break": { "version": "2.1.0", @@ -15354,9 +15357,9 @@ } }, "vite": { - "version": "4.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz", - "integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", + "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", "requires": { "esbuild": "^0.18.10", "fsevents": "~2.3.2", diff --git a/package.json b/package.json index 6076041..6051259 100644 --- a/package.json +++ b/package.json @@ -63,4 +63,4 @@ "vitest": "^0.34.6", "vue-tsc": "^1.6.5" } -} +} \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index c146d58..e7bf172 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,12 +4,7 @@ import { NotificationProvider } from '@/components/Notification' import { useDialogStore } from '@/stores/dialog' import ActionDialog from '@/components/Dialogs/ActionDialog.vue' import CommandPalettes from '@/components/CommandPalettes.vue' -import { onMounted } from 'vue' const dialog = useDialogStore() - -onMounted(() => { - // remove all local storage -})