diff --git a/ui/src/App.vue b/ui/src/App.vue index dd214d8..082ffc5 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -3,6 +3,8 @@ import { watchEffect, computed } from 'vue' // Added computed import TopBar from '@/components/ui/TopBar.vue' import NavBar from '@/components/ui/NavBar.vue' import FloatingChat from '@/components/chat/FloatingChat.vue' +import SnackbarContainer from '@/components/ui/SnackbarContainer.vue' + import { useUi } from '@/stores/useUi' const ui = useUi() @@ -82,6 +84,7 @@ const transitionDurationStyle = computed(() => { + diff --git a/ui/src/components/ui/NavBar.vue b/ui/src/components/ui/NavBar.vue index 22e34b8..c247e90 100644 --- a/ui/src/components/ui/NavBar.vue +++ b/ui/src/components/ui/NavBar.vue @@ -3,16 +3,18 @@ import { ref, watch, computed, onMounted } from 'vue' import { useRoute } from 'vue-router' import { useUi } from '@/stores/useUi' import { useRealtimeStore } from '@/stores/useRealtime' +import { moduleInfo } from '@/constants/moduleInfo' const ui = useUi() const realtime = useRealtimeStore() // enlaces de la app const links = [ - { to: '/empleados', label: 'Empleados', icon: 'π₯' }, - { to: '/tareas', label: 'Tareas', icon: 'π' }, - { to: '/planillas', label: 'Planillas', icon: 'π' }, - { to: '/asistencias', label: 'Asistencias', icon: 'β°' }, + + { to: '/empleados', label: 'Empleados', icon: moduleInfo.Cliente.icon }, + { to: '/tareas', label: 'Tareas', icon: moduleInfo.TareaRealizada.icon }, + { to: '/planillas', label: 'Planillas', icon: moduleInfo.Planilla.icon }, + { to: '/asistencias', label: 'Asistencias', icon: moduleInfo.Asistencia.icon }, { to: '/feed', label: 'Feed', icon: 'π°' }, { to: '/config', label: 'Config', icon: 'βοΈ' }, ] @@ -53,15 +55,26 @@ const hasBadge = (path, op) => { return table && realtime.badges[table]?.[op] } +const hasAnyBadge = (path) => { + const table = tableForPath(path) + if (!table) return false + const b = realtime.badges[table] + return b.INSERT || b.UPDATE || b.DELETE +} + // clases dinΓ‘micas p/ mostrar / ocultar barra const sidebarClasses = computed(() => ui.sidebarOpen ? 'translate-x-0' : '-translate-x-full') -const handleLinkClick = () => { +const handleLinkClick = (path) => { // Close sidebar if desktopNavbarPersistent is false or if it's mobile view (width < 768px) // Assuming 768px is the 'md' breakpoint. if (!ui.desktopNavbarPersistent || window.innerWidth < 768) { ui.closeSidebar() } + // Clear badges for this module when the link is clicked + const table = tableForPath(path) + if (table) realtime.clearBadgesForTable(table) + // Otherwise, (desktopNavbarPersistent is true AND width >= 768px), do nothing to keep sidebar open. } @@ -88,9 +101,9 @@ const handleLinkClick = () => { {{ l.icon }} {{ l.label }} @@ -116,7 +129,7 @@ ul { list-style: none; padding-left: 0; } border: 1px solid var(--accent-color); overflow: hidden; border-radius: 0.375rem; - transition: background-color 0.3s ease, color 0.3s ease; + transition: background-color 0.3s ease, color 0.3s ease, transform 0.3s ease; z-index: 0; } @@ -158,6 +171,10 @@ ul { list-style: none; padding-left: 0; } box-shadow: 0 1px 3px 0 rgba(0,0,0,0.1), 0 1px 2px 0 rgba(0,0,0,0.06); } +.nav-link.notified { + transform: translateX(10px); +} + /* Scrollbar styling using primary color */ .custom-scroll::-webkit-scrollbar { width: 8px; } .custom-scroll::-webkit-scrollbar-track { background: transparent; } diff --git a/ui/src/components/ui/SnackbarContainer.vue b/ui/src/components/ui/SnackbarContainer.vue new file mode 100644 index 0000000..be3b66c --- /dev/null +++ b/ui/src/components/ui/SnackbarContainer.vue @@ -0,0 +1,80 @@ + + + + + + + {{ snack.icon }} + {{ snack.header }} + + {{ snack.text }} + + × + + + + + + + + diff --git a/ui/src/constants/moduleInfo.js b/ui/src/constants/moduleInfo.js new file mode 100644 index 0000000..5d8aa30 --- /dev/null +++ b/ui/src/constants/moduleInfo.js @@ -0,0 +1,6 @@ +export const moduleInfo = { + Cliente: { label: 'Empleados', icon: 'π₯' }, + TareaRealizada: { label: 'Tareas', icon: 'π' }, + Planilla: { label: 'Planillas', icon: 'π' }, + Asistencia: { label: 'Asistencias', icon: 'β°' } +} diff --git a/ui/src/stores/useRealtime.js b/ui/src/stores/useRealtime.js index cf34662..9992412 100644 --- a/ui/src/stores/useRealtime.js +++ b/ui/src/stores/useRealtime.js @@ -3,6 +3,8 @@ import { usePlanillasStore } from './usePlanillas' import { useEmpleadosStore } from './useEmpleados' import { useTareasStore } from './useTareas' import { useAsistenciasStore } from './useAsistencias' +import { useSnackbarStore } from './useSnackbar' +import { moduleInfo } from '@/constants/moduleInfo' export const useRealtimeStore = defineStore('realtime', { state: () => ({ @@ -55,6 +57,19 @@ export const useRealtimeStore = defineStore('realtime', { addEvent(); } + const snackbar = useSnackbarStore(); + const idPart = payload.new?.id || payload.old?.id; + const message = `${payload.operation} ${payload.table}${idPart ? ' #' + idPart : ''}`; + const type = payload.operation === 'DELETE' ? 'error' : + payload.operation === 'INSERT' ? 'success' : 'info'; + const info = moduleInfo[payload.table] || {}; + snackbar.push({ + text: message, + type, + icon: info.icon, + header: info.label + }); + // mark badge for module and operation if (this.badges[payload.table]) { this.badges[payload.table][payload.operation] = true; diff --git a/ui/src/stores/useSnackbar.js b/ui/src/stores/useSnackbar.js new file mode 100644 index 0000000..1689eb6 --- /dev/null +++ b/ui/src/stores/useSnackbar.js @@ -0,0 +1,26 @@ +import { defineStore } from 'pinia' + +export const useSnackbarStore = defineStore('snackbar', { + state: () => ({ + snacks: [], + maxSnacks: 5 + }), + actions: { + push({ text, type = 'info', icon = '', header = '', duration = 6000 }) { + const id = crypto.randomUUID ? crypto.randomUUID() : Date.now().toString(36) + Math.random().toString(36).slice(2) + const snack = { id, text, type, icon, header } + if (this.snacks.length >= this.maxSnacks) { + this.snacks.shift() + } + this.snacks.push(snack) + if (duration > 0) { + setTimeout(() => this.remove(id), duration) + } + return id + }, + remove(id) { + const index = this.snacks.findIndex(s => s.id === id) + if (index !== -1) this.snacks.splice(index, 1) + } + } +})