From 6931e06952e96f53af8bc1125ed09be0fd8b1fa3 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Tue, 24 Oct 2023 08:56:29 +0700 Subject: [PATCH 01/20] update condition sidebar menu active --- src/components/Navigation/Aside/AsideMenuMultiple.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Navigation/Aside/AsideMenuMultiple.vue b/src/components/Navigation/Aside/AsideMenuMultiple.vue index d8f0af4..b2ad9fa 100644 --- a/src/components/Navigation/Aside/AsideMenuMultiple.vue +++ b/src/components/Navigation/Aside/AsideMenuMultiple.vue @@ -36,7 +36,7 @@ const isMenuSelected = computed(() => { + :class="[(isMenuSelected || item.expanded || isChildren || item.expanded) ? 'bg-primary-100 font-bold' : 'font-semibold text-aside hover:bg-primary-100 hover:text-primary-500', isMenuSelected ? 'text-primary-500' : 'text-gray-600', isChildren ? 'pl-1 pr-2' : 'px-2', 'group w-full flex items-center py-2 text-left text-xs rounded-lg focus:outline-none focus:ring-0']"> From 96d8550cfeaae6f26ab50120059d30f399871fde Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Tue, 24 Oct 2023 15:24:21 +0700 Subject: [PATCH 02/20] update --- package-lock.json | 66 ++++++++----- package.json | 10 +- src/App.vue | 13 +-- src/components/CommandPalettes.vue | 103 ++++--------------- src/router/index.ts | 152 ++++++++++++++++------------- src/stores/auth.ts | 2 +- src/stores/command.ts | 48 +++++++-- src/utils/route.ts | 20 ---- src/{stores => utils}/storage.ts | 0 9 files changed, 199 insertions(+), 215 deletions(-) rename src/{stores => utils}/storage.ts (100%) diff --git a/package-lock.json b/package-lock.json index 474335c..44ba8b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,23 +1,25 @@ { - "name": "apkt", - "version": "0.0.0", + "name": "eis", + "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "apkt", - "version": "0.0.0", + "name": "eis", + "version": "0.0.1", "dependencies": { "@headlessui/tailwindcss": "^0.2.0", "@headlessui/vue": "^1.7.16", "@heroicons/vue": "^2.0.18", "@lottiefiles/lottie-player": "^2.0.2", + "@types/qs": "^6.9.9", "@types/uuid": "^9.0.2", "devextreme": "23.1.5", "devextreme-vue": "23.1.5", "dotenv": "^16.3.1", "encrypt-storage": "^2.12.16", "pinia": "^2.1.3", + "qs": "^6.11.2", "uuid": "^9.0.0", "vue": "^3.3.4", "vue-router": "^4.2.2", @@ -1308,6 +1310,11 @@ "resolved": "https://registry.npmjs.org/@types/pako/-/pako-1.0.5.tgz", "integrity": "sha512-cg6x1RjMyCYoAdhOyNC/144EqhdHJXXZiiTgN3o+ZtOu4+ZQVN5msZgNyxzDI1w+dMYDdRamDzto3+bkR3FFQQ==" }, + "node_modules/@types/qs": { + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", + "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==" + }, "node_modules/@types/semver": { "version": "7.5.3", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", @@ -2578,7 +2585,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -4114,8 +4120,7 @@ "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/function.prototype.name": { "version": "1.1.6", @@ -4174,7 +4179,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -4374,7 +4378,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -4386,7 +4389,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, "engines": { "node": ">= 0.4" }, @@ -5759,7 +5761,6 @@ "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -6365,6 +6366,20 @@ "node": ">=6" } }, + "node_modules/qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", @@ -6906,7 +6921,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -9141,6 +9155,11 @@ "resolved": "https://registry.npmjs.org/@types/pako/-/pako-1.0.5.tgz", "integrity": "sha512-cg6x1RjMyCYoAdhOyNC/144EqhdHJXXZiiTgN3o+ZtOu4+ZQVN5msZgNyxzDI1w+dMYDdRamDzto3+bkR3FFQQ==" }, + "@types/qs": { + "version": "6.9.9", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz", + "integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg==" + }, "@types/semver": { "version": "7.5.3", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz", @@ -10051,7 +10070,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -11226,8 +11244,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "function.prototype.name": { "version": "1.1.6", @@ -11268,7 +11285,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -11412,14 +11428,12 @@ "has-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==" }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, "has-tostringtag": { "version": "1.0.0", @@ -12445,8 +12459,7 @@ "object-inspect": { "version": "1.12.3", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" }, "object-keys": { "version": "1.1.1", @@ -12843,6 +12856,14 @@ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true }, + "qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "requires": { + "side-channel": "^1.0.4" + } + }, "querystringify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", @@ -13246,7 +13267,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, "requires": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", diff --git a/package.json b/package.json index 2a48ee9..0d11ff4 100644 --- a/package.json +++ b/package.json @@ -18,16 +18,18 @@ "@headlessui/vue": "^1.7.16", "@heroicons/vue": "^2.0.18", "@lottiefiles/lottie-player": "^2.0.2", + "@types/qs": "^6.9.9", "@types/uuid": "^9.0.2", "devextreme": "23.1.5", "devextreme-vue": "23.1.5", + "dotenv": "^16.3.1", + "encrypt-storage": "^2.12.16", "pinia": "^2.1.3", + "qs": "^6.11.2", "uuid": "^9.0.0", "vue": "^3.3.4", "vue-router": "^4.2.2", - "vue-tailwind-datepicker": "^1.4.5", - "encrypt-storage": "^2.12.16", - "dotenv": "^16.3.1" + "vue-tailwind-datepicker": "^1.4.5" }, "devDependencies": { "@rushstack/eslint-patch": "^1.5.1", @@ -57,4 +59,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 25b53f2..e7bf172 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,12 +2,9 @@ import { RouterView } from 'vue-router' import { NotificationProvider } from '@/components/Notification' import { useDialogStore } from '@/stores/dialog' -import ActionDialog from '@/components/Dialogs/ActionDialog.vue'; -import CommandPalettes from '@/components/CommandPalettes.vue'; -import { useCommandPalattesStore } from '@/stores/command'; - +import ActionDialog from '@/components/Dialogs/ActionDialog.vue' +import CommandPalettes from '@/components/CommandPalettes.vue' const dialog = useDialogStore() -const command = useCommandPalattesStore() - - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/CommandPalettes.vue b/src/components/CommandPalettes.vue index aed0065..de1335a 100644 --- a/src/components/CommandPalettes.vue +++ b/src/components/CommandPalettes.vue @@ -1,5 +1,5 @@ \ No newline at end of file +@/utils/menu \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Daftar/Daftar_1.vue b/src/components/Pages/Gangguan/Daftar/Daftar_1.vue new file mode 100644 index 0000000..9ac84cd --- /dev/null +++ b/src/components/Pages/Gangguan/Daftar/Daftar_1.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Daftar/Daftar_2.vue b/src/components/Pages/Gangguan/Daftar/Daftar_2.vue new file mode 100644 index 0000000..28321bf --- /dev/null +++ b/src/components/Pages/Gangguan/Daftar/Daftar_2.vue @@ -0,0 +1,108 @@ + + + \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Daftar/Daftar_3.vue b/src/components/Pages/Gangguan/Daftar/Daftar_3.vue new file mode 100644 index 0000000..d82e1d7 --- /dev/null +++ b/src/components/Pages/Gangguan/Daftar/Daftar_3.vue @@ -0,0 +1,106 @@ + + + \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Daftar/Data_1.vue b/src/components/Pages/Gangguan/Daftar/Data_1.vue deleted file mode 100644 index 234d1ad..0000000 --- a/src/components/Pages/Gangguan/Daftar/Data_1.vue +++ /dev/null @@ -1,204 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Daftar/index.ts b/src/components/Pages/Gangguan/Daftar/index.ts index c01eea3..c74a0e9 100644 --- a/src/components/Pages/Gangguan/Daftar/index.ts +++ b/src/components/Pages/Gangguan/Daftar/index.ts @@ -1 +1,3 @@ -export { default as Data1 } from './Data_1.vue' \ No newline at end of file +export { default as GangguanDaftar1 } from './Daftar_1.vue' +export { default as GangguanDaftar2 } from './Daftar_2.vue' +export { default as GangguanDaftar3 } from './Daftar_3.vue' \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Rekapitulasi/Rekap_1.vue b/src/components/Pages/Gangguan/Rekapitulasi/Rekap_1.vue new file mode 100644 index 0000000..d269dd2 --- /dev/null +++ b/src/components/Pages/Gangguan/Rekapitulasi/Rekap_1.vue @@ -0,0 +1,114 @@ + + + \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Rekapitulasi/index.ts b/src/components/Pages/Gangguan/Rekapitulasi/index.ts new file mode 100644 index 0000000..0f1e6c0 --- /dev/null +++ b/src/components/Pages/Gangguan/Rekapitulasi/index.ts @@ -0,0 +1 @@ +export { default as GangguanRekap1 } from './Rekap_1.vue' \ No newline at end of file diff --git a/src/components/Pages/HomeEmpty.vue b/src/components/Pages/HomeEmpty.vue index 7e1c5c2..1ee39cf 100644 --- a/src/components/Pages/HomeEmpty.vue +++ b/src/components/Pages/HomeEmpty.vue @@ -8,10 +8,103 @@

{{ appName }}

+ + +
+
+ + + +
+ + +
+ Nothing found. +
+ + +
  • + + {{ person.name }} + + + +
  • +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/components/Pages/MenuProvider.vue b/src/components/Pages/MenuProvider.vue index 6f314ac..b0cbf7b 100644 --- a/src/components/Pages/MenuProvider.vue +++ b/src/components/Pages/MenuProvider.vue @@ -1,10 +1,9 @@ \ No newline at end of file diff --git a/src/components/Navigation/Aside/AsideMenuMultiple.vue b/src/components/Navigation/Aside/AsideMenuMultiple.vue index 6d1ef10..45f5c60 100644 --- a/src/components/Navigation/Aside/AsideMenuMultiple.vue +++ b/src/components/Navigation/Aside/AsideMenuMultiple.vue @@ -3,7 +3,7 @@ import { computed } from 'vue' import type { MenuItemModel } from '@/types/menu' import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue' import { useMenuStore } from '@/stores/menu' -import { DotOutline } from '@/utils/icons' +import { IconDotOutline } from '@/utils/icons' import AsideMenuSingle from '@/components/Navigation/Aside/AsideMenuSingle.vue' const menu = useMenuStore() @@ -36,11 +36,17 @@ const isMenuSelected = computed(() => { - - {{ item.name }} + :class="[(isMenuSelected || item.expanded || isChildren) ? 'bg-primary-100 font-bold' : 'font-semibold text-aside hover:bg-primary-100 hover:text-primary-500', isMenuSelected ? 'text-primary-500' : 'text-gray-600', isChildren ? 'pl-1 pr-2' : 'px-2', 'group w-full flex items-center py-2 text-left text-xs rounded-lg focus:outline-none focus:ring-0']"> + -@/utils/menu \ No newline at end of file + \ No newline at end of file diff --git a/src/components/Navigation/Aside/AsideMenuSingle.vue b/src/components/Navigation/Aside/AsideMenuSingle.vue index 5cedd6c..9606dd1 100644 --- a/src/components/Navigation/Aside/AsideMenuSingle.vue +++ b/src/components/Navigation/Aside/AsideMenuSingle.vue @@ -1,5 +1,6 @@