Merge branch 'main' of https://github.com/defuj/eis into development
This commit is contained in:
commit
dd2f6de9d3
16
package-lock.json
generated
16
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "eis",
|
"name": "eis",
|
||||||
"version": "0.0.1",
|
"version": "0.0.2",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "eis",
|
"name": "eis",
|
||||||
"version": "0.0.1",
|
"version": "0.0.2",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@headlessui/tailwindcss": "^0.2.0",
|
"@headlessui/tailwindcss": "^0.2.0",
|
||||||
"@headlessui/vue": "^1.7.16",
|
"@headlessui/vue": "^1.7.16",
|
||||||
@ -8526,9 +8526,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vite": {
|
"node_modules/vite": {
|
||||||
"version": "4.4.11",
|
"version": "4.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
|
||||||
"integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==",
|
"integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"esbuild": "^0.18.10",
|
"esbuild": "^0.18.10",
|
||||||
"postcss": "^8.4.27",
|
"postcss": "^8.4.27",
|
||||||
@ -15375,9 +15375,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vite": {
|
"vite": {
|
||||||
"version": "4.4.11",
|
"version": "4.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
|
||||||
"integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==",
|
"integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"esbuild": "^0.18.10",
|
"esbuild": "^0.18.10",
|
||||||
"fsevents": "~2.3.2",
|
"fsevents": "~2.3.2",
|
||||||
|
@ -4,12 +4,7 @@ import { NotificationProvider } from '@/components/Notification'
|
|||||||
import { useDialogStore } from '@/stores/dialog'
|
import { useDialogStore } from '@/stores/dialog'
|
||||||
import ActionDialog from '@/components/Dialogs/ActionDialog.vue'
|
import ActionDialog from '@/components/Dialogs/ActionDialog.vue'
|
||||||
import CommandPalettes from '@/components/CommandPalettes.vue'
|
import CommandPalettes from '@/components/CommandPalettes.vue'
|
||||||
import { onMounted } from 'vue'
|
|
||||||
const dialog = useDialogStore()
|
const dialog = useDialogStore()
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
// remove all local storage
|
|
||||||
})
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
@ -1860,15 +1860,6 @@ select {
|
|||||||
background-color: rgb(204 204 0 / var(--tw-bg-opacity));
|
background-color: rgb(204 204 0 / var(--tw-bg-opacity));
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-gray-200 {
|
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
background-color: rgb(229 231 235 / var(--tw-bg-opacity));
|
|
||||||
}
|
|
||||||
|
|
||||||
.bg-opacity-100 {
|
|
||||||
--tw-bg-opacity: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bg-opacity-25 {
|
.bg-opacity-25 {
|
||||||
--tw-bg-opacity: 0.25;
|
--tw-bg-opacity: 0.25;
|
||||||
}
|
}
|
||||||
@ -1889,8 +1880,8 @@ select {
|
|||||||
--tw-bg-opacity: 0.8;
|
--tw-bg-opacity: 0.8;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-none {
|
.bg-opacity-100 {
|
||||||
background-image: none;
|
--tw-bg-opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fill-gray-500 {
|
.fill-gray-500 {
|
||||||
|
@ -130,7 +130,6 @@
|
|||||||
</ComboboxOptions>
|
</ComboboxOptions>
|
||||||
|
|
||||||
<div v-if="query !== '' && filteredMenus.length === 0" class="px-6 text-center py-14 sm:px-14">
|
<div v-if="query !== '' && filteredMenus.length === 0" class="px-6 text-center py-14 sm:px-14">
|
||||||
<!-- <FolderIcon class="w-6 h-6 mx-auto text-gray-900 text-opacity-40" aria-hidden="true" /> -->
|
|
||||||
<h2 class="font-semibold text-slate-900">Tidak ada hasil</h2>
|
<h2 class="font-semibold text-slate-900">Tidak ada hasil</h2>
|
||||||
|
|
||||||
<p class="mt-2 text-sm leading-6 text-slate-600">
|
<p class="mt-2 text-sm leading-6 text-slate-600">
|
||||||
|
@ -33,8 +33,7 @@ const isMenuSelected = computed(() => {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div :class="[isChildren ? 'ml-2 mt-1 bg-primary-100 rounded-xl' : '']">
|
<div :class="[isChildren ? 'ml-2 mt-1 bg-primary-100 rounded-xl' : '']">
|
||||||
<Disclosure :defaultOpen="item.expanded" as="dev">
|
<Disclosure :defaultOpen="item.expanded">
|
||||||
<!-- Nested item with children -->
|
|
||||||
<DisclosureButton @click="menu.toggleSidebarMenu(item.path, !item.expanded)"
|
<DisclosureButton @click="menu.toggleSidebarMenu(item.path, !item.expanded)"
|
||||||
: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']">
|
: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']">
|
||||||
<component v-if="isChildren" :is="IconDotOutline"
|
<component v-if="isChildren" :is="IconDotOutline"
|
||||||
|
@ -13,11 +13,7 @@ export const useCommandPalattesStore = defineStore('command_palettes', () => {
|
|||||||
const keyFStatus = ref(false)
|
const keyFStatus = ref(false)
|
||||||
|
|
||||||
const showCommandPalettes = () => {
|
const showCommandPalettes = () => {
|
||||||
open.value = true;
|
open.value = true
|
||||||
}
|
|
||||||
|
|
||||||
const handleOnDismissCommandPalettes = () => {
|
|
||||||
open.value = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const onKeyPressed = (event: KeyboardEvent) => {
|
const onKeyPressed = (event: KeyboardEvent) => {
|
||||||
@ -100,7 +96,6 @@ export const useCommandPalattesStore = defineStore('command_palettes', () => {
|
|||||||
return {
|
return {
|
||||||
open,
|
open,
|
||||||
showCommandPalettes,
|
showCommandPalettes,
|
||||||
handleOnDismissCommandPalettes,
|
|
||||||
onKeyPressed,
|
onKeyPressed,
|
||||||
onKeyUp,
|
onKeyUp,
|
||||||
addRecent,
|
addRecent,
|
||||||
|
@ -39,19 +39,14 @@ export const useMenuStore = defineStore('menu', () => {
|
|||||||
toggleItemExpanded(navigation.value)
|
toggleItemExpanded(navigation.value)
|
||||||
}
|
}
|
||||||
const toggleSidebarDesktop = () => (sidebarShowed.value = !sidebarShowed.value)
|
const toggleSidebarDesktop = () => (sidebarShowed.value = !sidebarShowed.value)
|
||||||
|
const collapseAllMenu = (): void => {
|
||||||
watch(router, (value) => {
|
for (const item of navigation.value) {
|
||||||
if (value.currentRoute.value.fullPath === '/' || value.currentRoute.value.fullPath === '/home') {
|
item.expanded = false
|
||||||
for (const item of navigation.value) {
|
|
||||||
item.expanded = false
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
|
||||||
watch(menuSelected, (value) => {
|
watch(menuSelected, (value) => {
|
||||||
if (value !== '/login' && value !== '/404' && value !== '/home' && value !== '/') {
|
if (value !== '/login' && value !== '/404' && value !== '/home' && value !== '/') {
|
||||||
console.log('current route', value);
|
|
||||||
|
|
||||||
const result = command.searchRoutesPath(routes, value)
|
const result = command.searchRoutesPath(routes, value)
|
||||||
if (result.length > 0) {
|
if (result.length > 0) {
|
||||||
const route = result.find((item) => item.path === value)
|
const route = result.find((item) => item.path === value)
|
||||||
@ -59,7 +54,8 @@ export const useMenuStore = defineStore('menu', () => {
|
|||||||
command.addRecent(route)
|
command.addRecent(route)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
collapseAllMenu()
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -80,6 +76,7 @@ export const useMenuStore = defineStore('menu', () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
collapseAllMenu,
|
||||||
expandCurrentActiveMenu,
|
expandCurrentActiveMenu,
|
||||||
navigation,
|
navigation,
|
||||||
toggleSidebar,
|
toggleSidebar,
|
||||||
|
@ -18,7 +18,8 @@ export default defineConfig({
|
|||||||
],
|
],
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
'@': fileURLToPath(new URL('./src', import.meta.url))
|
'@': fileURLToPath(new URL('./src', import.meta.url)),
|
||||||
|
'inferno': 'inferno/dist/index.dev.esm.js',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user