-
-
+
+
+import { users } from '@Plugins/AuthUsers'
+import { hasPermission } from '@Plugins/RolePermission'
import { logout } from '@Services/Page';
import useDarkMode from '@Stores/DarkMode'
import useLeftSidebar from '@Stores/LeftSidebar'
import useNotificationSidebar from '@Stores/NotificationSidebar'
-import useNotifier from '@Stores/Notifier'
+import useNotifier from '@Stores/Notifier'
+import useLoader from '@Stores/Loader';
+import Loader from '@Shared/Loader.vue';
import GoogleIcon from '@Shared/GoogleIcon.vue';
import Dropdown from '../Dropdown.vue';
import DropdownLink from '../DropdownLink.vue';
@@ -19,6 +23,8 @@ const darkMode = useDarkMode()
const leftSidebar = useLeftSidebar()
const notificationSidebar = useNotificationSidebar()
const notifier = useNotifier()
+const loader = useLoader()
+
@@ -36,6 +42,19 @@ const notifier = useNotifier()
/>
\ No newline at end of file
diff --git a/src/components/Holos/Skeleton/Sidebar/Notification/Item.vue b/src/components/Holos/Skeleton/Sidebar/Notification/Item.vue
index 583a00d..c6388e7 100644
--- a/src/components/Holos/Skeleton/Sidebar/Notification/Item.vue
+++ b/src/components/Holos/Skeleton/Sidebar/Notification/Item.vue
@@ -6,6 +6,11 @@ import GoogleIcon from '@Shared/GoogleIcon.vue';
/** Definidores */
const notifier = useNotifier();
+/** Eventos */
+const emit = defineEmits([
+ 'openModal'
+]);
+
/** Propiedades */
defineProps({
notification: Object,
@@ -22,12 +27,12 @@ defineProps({
- -
+
-
+
+
+ -
+
+ ++ {{ users.length - 1 }} + -
-import { onMounted } from 'vue'; +import { ref } from 'vue'; +import { RouterLink } from 'vue-router'; import useNotificationSidebar from '@Stores/NotificationSidebar' import useNotifier from '@Stores/Notifier' -import GoogleIcon from '@Shared/GoogleIcon.vue'; -import Item from './Notification/Item.vue'; +import ModalController from '@Controllers/ModalController.js'; + +import GoogleIcon from '@Shared/GoogleIcon.vue'; +import Item from './Notification/Item.vue'; +import PrimaryButton from '@Holos/Button/Primary.vue'; +import ShowView from '@Holos/Skeleton/Sidebar/Notification/Show.vue'; /** Definidores */ const notifier = useNotifier(); const notificationSidebar = useNotificationSidebar() +/** Controladores */ +const Modal = new ModalController(); + /** Eventos */ const emit = defineEmits(['open']); @@ -18,10 +26,9 @@ const props = defineProps({ sidebar: Boolean }); -/** Ciclos */ -onMounted(() => { - notifier.boot(); -}); +const showModal = ref(Modal.showModal); +const modelModal = ref(Modal.modelModal); + @@ -37,9 +44,14 @@ onMounted(() => { + +-- {{ $t('notifications.title') }} ({{ notifier.counter }}) -
+++ {{ $t('notifications.title') }} ({{ notifier.counter }}) +
++ {{ $t('notifications.unreadClosed') }} ({{ notifier.unreadClosedCounter }}) +
+{ /> -+-
+
++ ++ {{ $t('notifications.seeAll') }} + +
-
+
+
![]()
+
+import { computed, nextTick, onUpdated } from 'vue';
+import { getDateTime } from '@Controllers/DateController';
+import useNotifier from '@Stores/Notifier';
+
+import Header from '@Holos/Modal/Elements/Header.vue';
+import ShowModal from '@Holos/Modal/Show.vue';
+import GoogleIcon from '@Shared/GoogleIcon.vue';
+
+/** Definidores */
+const notifier = useNotifier();
+
+/** Eventos */
+const emit = defineEmits([
+ 'close',
+ 'reload'
+]);
+
+/** Propiedades */
+const props = defineProps({
+ show: Boolean,
+ model: Object
+});
+
+onUpdated(() => {
+ if(!props.model.read_at && props.show) {
+ notifier.readNotification(props.model.id);
+ }
+
+ if(!props.model.read_at && !props.show) {
+ emit('reload');
+ }
+});
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Holos/Table.vue b/src/components/Holos/Table.vue
index 5e61c6d..577849a 100644
--- a/src/components/Holos/Table.vue
+++ b/src/components/Holos/Table.vue
@@ -1,5 +1,6 @@
@@ -16,13 +18,13 @@ const props = defineProps({
+
import { onMounted, ref } from 'vue';
import { can, apiTo, viewTo } from './Module'
-import { api } from '@Services/Api';
+import { useSearcher } from '@Services/Api';
+import { users } from '@Plugins/AuthUsers'
import ModalController from '@Controllers/ModalController.js';
-import SearcherController from '@Controllers/SearcherController.js';
import IconButton from '@Holos/Button/Icon.vue'
import DestroyView from '@Holos/Modal/Template/Destroy.vue';
@@ -23,27 +23,23 @@ const modelModal = ref(Modal.modelModal);
const models = ref([]);
-const Searcher = new SearcherController({
- route: 'users.index',
- model: models
+const searcher = useSearcher({
+ url: route('users.index'),
+ onSuccess: (r) => models.value = r.models,
+ onError: () => models.value = []
});
-/** Métodos */
-function load() {
- api.get(apiTo('index'), {
- onSuccess: (r) => models.value = r.users
- });
-}
-
/** Ciclos */
-onMounted(() => load());
+onMounted(() => {
+ searcher.search();
+});
load());
+
+
+
+
+
+ + {{ $t('details') }} +
+
+ {{ $t('description') }}:
+ {{ model.data.description }}
+
+
+ {{ $t('message') }}:
+ {{ model.data.message }}
+
+ + {{ $t('created_at') }}: + {{ getDateTime(model.created_at) }} +
++ {{ $t('read_at') }}: + {{ getDateTime(model.read_at) }} +
+
-
+
+
+
+
diff --git a/src/components/Holos/TableSimple.vue b/src/components/Holos/TableSimple.vue
index c657cd6..476cf87 100644
--- a/src/components/Holos/TableSimple.vue
+++ b/src/components/Holos/TableSimple.vue
@@ -25,9 +25,6 @@ const props = defineProps({
name="body"
:items="items"
/>
-
-
diff --git a/src/components/Shared/Loader.vue b/src/components/Shared/Loader.vue
new file mode 100644
index 0000000..1ab8724
--- /dev/null
+++ b/src/components/Shared/Loader.vue
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/src/controllers/SearcherController.js b/src/controllers/SearcherController.js
deleted file mode 100644
index 89512cb..0000000
--- a/src/controllers/SearcherController.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { ref } from 'vue';
-import { api } from '@Services/Api.js';
-
-/**
- * Controlador simple de las bandejas
- */
-class SearcherController
-{
- route = '';
- params = {};
- query = ref('');
-
- constructor({ route, model, params = {} }) {
- this.route = route;
- this.model = ref(model);
- this.params = params;
- }
-
- /**
- * Búsqueda simple
- */
- search = (q = '', params) => {
- this.query.value = q;
- api.get(this._getRoute(), {
- params: {
- q: this.query.value,
- ...params
- },
- onSuccess: (r) => {
- this.model.value = r.users;
- }
- });
- };
-
- /**
- * Paginación simple
- */
- withPagination = (page, params) => {
- api.get(this._getRoute(), {
- params: {
- page,
- ...params
- },
- onSuccess: (r) => {
- this.model.value = r.users;
- }
- });
- }
-
- /**
- * Búsqueda con Paginación en tablas
- */
- searchWithPagination = (page, params) => {
- api.get(page, {
- params: {
- q: this.query.value,
- ...params
- },
- onSuccess: (r) => {
- this.model.value = r.users;
- }
- });
- }
-
- /**
- * Búsqueda con Paginación en bandejas
- */
- searchWithInboxPagination = (page, params) => {
- api.get(page, {
- params: {
- q: this.query.value,
- ...params
- },
- onSuccess: (r) => {
- this.model.value = r.users;
- }
- });
- }
-
- /**
- * Obtiene la ruta según los parámetros
- */
- _getRoute = () => {
- return (this.params)
- ? route(this.route, this.params)
- : route(this.route);
- }
-}
-
-export default SearcherController;
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 64e78fc..2e835ec 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,50 +4,63 @@ import axios from 'axios';
import { createPinia } from 'pinia'
import { createApp } from 'vue'
import { useRoute, ZiggyVue } from 'ziggy-js';
-import { i18n, lang } from '@/lang/i18n.js';
+import { i18n, lang } from '@Lang/i18n.js';
import router from '@Router/Index'
import Notify from '@Plugins/Notify'
+import { bootPermissions } from '@Plugins/RolePermission';
import TailwindScreen from '@Plugins/TailwindScreen'
import { pagePlugin } from '@Services/Page';
-import { reloadApp,view } from '@Services/Page';
+import { reloadApp, view } from '@Services/Page';
-import App from '@Layouts/AppLayout.vue'
+import App from '@Layouts/AppLayout.vue'
+import Error503 from '@Pages/Errors/503.vue'
// Configurar axios
axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
-// Crear instancias globales
+// Elementos globales
window.axios = axios;
window.Lang = lang;
window.Notify = new Notify();
window.TwScreen = new TailwindScreen();
async function boot() {
+ let initRoutes = false;
+
+ // Iniciar rutas
try {
const routes = await axios.get(import.meta.env.VITE_API_URL + '/api/resources/routes');
- // Iniciar rutas
window.Ziggy = routes.data;
window.route = useRoute();
- window.view = view;
+ window.view = view;
+ initRoutes = true;
} catch (error) {
- console.error(error);
- alert('Failed to load routes');
+ window.Notify.error(window.Lang('server.api.noAvailable'));
}
- if(import.meta.env.VITE_REVERB_ACTIVE === 'true') {
- await import('@Services/Broadcast')
+ if(initRoutes) {
+ // Iniciar permisos
+ await bootPermissions();
+
+ // Iniciar broadcast
+ if(import.meta.env.VITE_REVERB_ACTIVE === 'true') {
+ await import('@Services/Broadcast')
+ }
+
+ reloadApp();
+
+ createApp(App)
+ .use(createPinia())
+ .use(i18n)
+ .use(pagePlugin)
+ .use(router)
+ .use(ZiggyVue)
+ .mount('#app');
+ } else {
+ createApp(Error503)
+ .mount('#app');
}
-
- reloadApp();
-
- createApp(App)
- .use(createPinia())
- .use(i18n)
- .use(pagePlugin)
- .use(router)
- .use(ZiggyVue)
- .mount('#app');
}
// Iniciar aplicación
diff --git a/src/lang/es.js b/src/lang/es.js
index 0afe94c..763d145 100644
--- a/src/lang/es.js
+++ b/src/lang/es.js
@@ -202,17 +202,21 @@ export default {
import: 'Importar',
items: 'Elementos',
maternal:'Apellido materno',
+ message:'Mensaje',
menu:'Menú',
name:'Nombre',
noRecords:'Sin registros',
notification:'Notificación',
notifications: {
+ unreadClosed:'Ocultas',
readed:'Marcar como leído',
deleted:'Notificación eliminada',
description:'Notificaciones del usuario',
notFound:'Notificación no encontrada',
title:'Notificaciones',
+ seeAll:'Ver todas',
},
+ omitted:'Omitida',
password:'Contraseña',
passwordConfirmation:'Confirmar contraseña',
passwordCurrent:'Contraseña actual',
@@ -246,6 +250,7 @@ export default {
},
profile:'Perfil',
readed:'Leído',
+ read_at:'Fecha leído',
register: {
create: {
onError: 'Error al crear el registro',
@@ -300,6 +305,11 @@ export default {
search:'Buscar',
selected: 'Seleccionado',
select: 'Seleccionar',
+ server: {
+ api: {
+ noAvailable: 'No se encontró el servidor API.'
+ }
+ },
session: {
closed: 'Sesión cerrada',
},
@@ -354,6 +364,7 @@ export default {
start: 'Hora inicial',
end: 'Hora final',
},
+ title: 'Título',
total: 'Total',
unknown:'Desconocido',
update:'Actualizar',
@@ -390,6 +401,11 @@ export default {
},
title:'Roles de usuario',
},
+ online: {
+ description: 'Lista de usuarios conectados al sistema.',
+ title: 'Usuarios conectados',
+ count: 'Usuarios conectados.',
+ },
menu:'Menú de usuario',
select:'Seleccionar un usuario',
settings:'Ajustes del usuario',
diff --git a/src/layouts/AppLayout.vue b/src/layouts/AppLayout.vue
index 61bd149..8c46289 100644
--- a/src/layouts/AppLayout.vue
+++ b/src/layouts/AppLayout.vue
@@ -1,13 +1,25 @@
@@ -28,8 +40,12 @@ defineProps({
to="profile.show"
/>
- |
+
+
+ |
+
|---|
| + + | +
| @@ -166,7 +163,7 @@ onMounted(() => load()); :show="destroyModal" :to="(user) => apiTo('destroy', { user })" @close="Modal.switchDestroyModal" - @update="load" + @update="searcher.search()" /> diff --git a/src/pages/Admin/Users/Online.vue b/src/pages/Admin/Users/Online.vue new file mode 100644 index 0000000..34719c8 --- /dev/null +++ b/src/pages/Admin/Users/Online.vue @@ -0,0 +1,150 @@ + + + + |
|---|
| + | + | + | + + + + |
|---|---|---|---|
|
+ |
+ + {{ `${model.full_name}` }} + | +
+
+ + Teléfono: + + {{ model.phone }} + + + |
+
+
+
+ |
+
+
+
\ No newline at end of file
diff --git a/src/pages/Errors/502.vue b/src/pages/Errors/502.vue
new file mode 100644
index 0000000..f1b8dc8
--- /dev/null
+++ b/src/pages/Errors/502.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+ 404
+
+
+ Not Found
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/Errors/503.vue b/src/pages/Errors/503.vue
new file mode 100644
index 0000000..b582b0b
--- /dev/null
+++ b/src/pages/Errors/503.vue
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+ 502
+
+
+ Bad Gateway
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/Profile/Notifications/Index.vue b/src/pages/Profile/Notifications/Index.vue
new file mode 100644
index 0000000..3a51cae
--- /dev/null
+++ b/src/pages/Profile/Notifications/Index.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+ 503
+
+
+ Service Unavailable
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/Profile/Notifications/Module.js b/src/pages/Profile/Notifications/Module.js
new file mode 100644
index 0000000..86268a9
--- /dev/null
+++ b/src/pages/Profile/Notifications/Module.js
@@ -0,0 +1,21 @@
+import { lang } from '@Lang/i18n';
+import { hasPermission } from '@Plugins/RolePermission.js';
+
+// Ruta API
+const apiTo = (name, params = {}) => route(`users.${name}`, params)
+
+// Ruta visual
+const viewTo = ({ name = '', params = {}, query = {} }) => view({ name: `admin.users.${name}`, params, query })
+
+// Obtener traducción del componente
+const transl = (str) => lang(`users.${str}`)
+
+// Determina si un usuario puede hacer algo no en base a los permisos
+const can = (permission) => hasPermission(`users.${permission}`)
+
+export {
+ can,
+ viewTo,
+ apiTo,
+ transl
+}
\ No newline at end of file
diff --git a/src/plugins/AuthUsers.js b/src/plugins/AuthUsers.js
new file mode 100644
index 0000000..6aee26e
--- /dev/null
+++ b/src/plugins/AuthUsers.js
@@ -0,0 +1,26 @@
+/**
+ * Usuarios autenticados
+ */
+
+import { ref } from 'vue';
+
+const users = ref([]);
+
+function boot(x) {
+ users.value = x;
+}
+
+function addUser(user) {
+ users.value.push(user);
+}
+
+function removeUser(user) {
+ users.value = users.value.filter(u => u.id !== user.id);
+}
+
+export {
+ users,
+ boot,
+ addUser,
+ removeUser
+};
\ No newline at end of file
diff --git a/src/plugins/Notify.js b/src/plugins/Notify.js
index 72d2a3a..7e27263 100644
--- a/src/plugins/Notify.js
+++ b/src/plugins/Notify.js
@@ -1,4 +1,3 @@
-import { lang } from '@Lang/i18n';
import toastr from 'toastr';
class Notify {
diff --git a/src/plugins/RolePermission.js b/src/plugins/RolePermission.js
index 323fc0e..52e0061 100644
--- a/src/plugins/RolePermission.js
+++ b/src/plugins/RolePermission.js
@@ -22,16 +22,23 @@ const hasPermission = (can) => {
}
const bootPermissions = () => {
- if (!permissionsInit.value) {
- api.get(route('user.permissions'), {
- onSuccess: (res) => {
- loadPermissions(res.permissions)
- },
- onFinish: () => {
- permissionsInit.value = true;
- }
- })
- }
+ return new Promise((resolve, reject) => {
+ if (!permissionsInit.value) {
+ api.get(route('user.permissions'), {
+ onSuccess: (res) => {
+ loadPermissions(res.permissions)
+
+ resolve(true)
+ },
+ onFinish: () => {
+ permissionsInit.value = true;
+ },
+ onError: () => {
+ reject(false)
+ }
+ })
+ }
+ })
}
const resetPermissions = () => {
@@ -47,8 +54,13 @@ const loadPermissions = (permissionList = []) => {
}
}
+const getAllPermissions = () => {
+ return allPermissions.value;
+}
+
export {
bootPermissions,
hasPermission,
- resetPermissions
+ resetPermissions,
+ getAllPermissions
};
\ No newline at end of file
diff --git a/src/router/Index.js b/src/router/Index.js
index 328c9d6..bd0dbdb 100644
--- a/src/router/Index.js
+++ b/src/router/Index.js
@@ -1,4 +1,13 @@
import { createRouter, createWebHashHistory } from 'vue-router'
+import { hasPermission } from '@Plugins/RolePermission';
+
+function can(next, can) {
+ if (!hasPermission(can)) {
+ next({ name: '404' });
+ } else {
+ next();
+ }
+}
const router = createRouter({
history: createWebHashHistory(import.meta.env.BASE_URL),
@@ -9,8 +18,23 @@ const router = createRouter({
component: () => import('@Pages/Dashboard/Index.vue')
}, {
path: '/profile',
- name: 'profile.show',
- component: () => import('@Pages/Profile/Show.vue')
+ children: [
+ {
+ path: '',
+ name: 'profile.show',
+ component: () => import('@Pages/Profile/Show.vue')
+ },
+ {
+ path: 'notifications',
+ children: [
+ {
+ path: '',
+ name: 'profile.notifications.index',
+ component: () => import('@Pages/Profile/Notifications/Index.vue')
+ }
+ ]
+ },
+ ]
}, {
path: '/admin',
children: [
@@ -20,24 +44,39 @@ const router = createRouter({
{
path: '',
name: 'admin.users.index',
+ beforeEnter: (to, from, next) => can(next, 'users.index'),
component: () => import('@Pages/Admin/Users/Index.vue')
},
+ {
+ path: 'online',
+ name: 'admin.users.online',
+ beforeEnter: (to, from, next) => can(next, 'users.online'),
+ component: () => import('@Pages/Admin/Users/Online.vue')
+ },
{
path: 'create',
name: 'admin.users.create',
+ beforeEnter: (to, from, next) => can(next, 'users.create'),
component: () => import('@Pages/Admin/Users/Create.vue')
}, {
path: ':id/edit',
name: 'admin.users.edit',
+ beforeEnter: (to, from, next) => can(next, 'users.edit'),
component: () => import('@Pages/Admin/Users/Edit.vue')
}, {
path: ':id/settings',
name: 'admin.users.settings',
+ beforeEnter: (to, from, next) => can(next, 'users.settings'),
component: () => import('@Pages/Admin/Users/Settings.vue')
}
]
},
]
+ },
+ {
+ path: '/:pathMatch(.*)*',
+ name: '404',
+ component: () => import('@Pages/Errors/404.vue')
}
]
})
diff --git a/src/services/Api.js b/src/services/Api.js
index e1e0702..5dc04fc 100644
--- a/src/services/Api.js
+++ b/src/services/Api.js
@@ -244,6 +244,11 @@ const api = {
},
}
+/**
+ * Instancia de la API
+ */
+const useApi = () => reactive(api);
+
/**
* Instancia de la API para formularios
*/
@@ -462,7 +467,7 @@ const useSearcher = (options = {
async load({
url,
apiToken = token.value,
- filters = {}
+ filters,
}) {
this.errors = {};
this.processing = true;
@@ -478,7 +483,7 @@ const useSearcher = (options = {
method: 'get',
url,
params: {
- query: this.query,
+ q: this.query,
...filters
},
headers: {
@@ -531,35 +536,46 @@ const useSearcher = (options = {
this.processing = false;
},
- pagination(url, filters = {}) {
+ pagination(url, filter = {}) {
+ console.log(url, filter)
this.load({
url,
- filters
+ filters : {
+ ...options.filters,
+ ...filter,
+ }
})
},
- search(q, filters = {}) {
+ search(q = '', filter = {}) {
this.query = q
this.load({
- url,
- filters
+ url: options.url,
+ filters : {
+ ...options.filters,
+ ...filter,
+ }
})
},
- refresh(filters = {}) {
+ refresh(filter = {}) {
this.load({
- url,
- filters
+ url: options.url,
+ filters : {
+ ...options.filters,
+ ...filter,
+ }
})
- },
+ }
})
export {
api,
token,
closeSession,
- hasToken,
- useForm,
- useSearcher,
- defineApiToken,
defineCsrfToken,
- resetApiToken
+ defineApiToken,
+ hasToken,
+ resetApiToken,
+ useApi,
+ useForm,
+ useSearcher
}
\ No newline at end of file
diff --git a/src/stores/Loader.js b/src/stores/Loader.js
new file mode 100644
index 0000000..dd0c23b
--- /dev/null
+++ b/src/stores/Loader.js
@@ -0,0 +1,35 @@
+import axios from 'axios';
+import { defineStore } from 'pinia'
+
+// Almacén del modo oscuro
+const useLoader = defineStore('loader', {
+ state: () => ({
+ processing: false
+ }),
+ getters: {
+ isProcessing(state) {
+ return state.processing
+ }
+ },
+ actions: {
+ boot() {
+ axios.interceptors.request.use((config) => {
+ this.processing = true
+ return config;
+ }, (error) => {
+ this.processing = false
+ return Promise.reject(error);
+ });
+
+ axios.interceptors.response.use((response) => {
+ this.processing = false
+ return response;
+ }, (error) => {
+ this.processing = false
+ return Promise.reject(error);
+ });
+ }
+ },
+})
+
+export default useLoader
\ No newline at end of file
diff --git a/src/stores/Notifier.js b/src/stores/Notifier.js
index c4998a4..24628c0 100644
--- a/src/stores/Notifier.js
+++ b/src/stores/Notifier.js
@@ -1,6 +1,8 @@
import { defineStore } from 'pinia'
import { api } from '@Services/Api'
import { page } from '@Services/Page'
+import { hasPermission } from '@Plugins/RolePermission'
+import { boot as bootAuthUsers, addUser, removeUser } from '@Plugins/AuthUsers'
/** Propiedades */
const hasNotifications = import.meta.env.VITE_REVERB_ACTIVE === 'true';
@@ -9,6 +11,7 @@ const hasNotifications = import.meta.env.VITE_REVERB_ACTIVE === 'true';
const useNotifier = defineStore('notifier', {
state: () => ({
counter: 0,
+ unreadClosedCounter: 0,
notifications: [],
isStarted: false,
user_id: 0,
@@ -21,7 +24,7 @@ const useNotifier = defineStore('notifier', {
this.subscribeGLobalNotifications();
this.subscribeUserNotifications();
-
+ this.suscribeAuthUsers();
this.isStarted = true;
this.getUpdates();
@@ -48,6 +51,23 @@ const useNotifier = defineStore('notifier', {
unsubscribeGlobalNotifications() {
Echo.leave('Global');
},
+ // Usuarios logueados
+ suscribeAuthUsers() {
+ if(hasPermission('users.index')) {
+ Echo.join('online')
+ .here((users) => {
+ bootAuthUsers(users);
+ })
+ .joining((user) => {
+ addUser(user);
+ })
+ .leaving((user) => {
+ removeUser(user);
+ });
+ } else {
+ Echo.join('online');
+ }
+ },
// Notificaciones del usuario
subscribeUserNotifications() {
Echo.private(`App.Models.User.${this.user_id}`)
@@ -61,13 +81,26 @@ const useNotifier = defineStore('notifier', {
},
readNotification(id) {
api.post(route('system.notifications.read'), {
- id,
+ data: {
+ id
+ },
+ onSuccess: res => {
+ this.getUpdates();
+ },
+ onFailed: res => {
+ this.getUpdates();
+ }
+ })
+ },
+ closeNotification(id) {
+ api.post(route('system.notifications.close'), {
+ data: {
+ id
+ },
onSuccess: res => {
- Notify.success(Lang('notifications.readed'))
this.getUpdates();
},
onFailed: res => {
- Notify.error(Lang('error'))
this.getUpdates();
}
})
@@ -75,8 +108,9 @@ const useNotifier = defineStore('notifier', {
getUpdates() {
api.get(route('system.notifications.all-unread'), {
onSuccess: res => {
- this.counter = res.data.total;
- this.notifications = res.data.notifications;
+ this.counter = res.total;
+ this.unreadClosedCounter = res.unread_closed;
+ this.notifications = res.notifications;
},
onFailed: res => {
console.log('error', res)
+
+
+
+
+
+ | + | + | + | + | + + + |
|---|---|---|---|---|
| + {{ model.data.title }} + | ++ {{ model.data.description }} + | ++ {{ getDateTime(model.created_at) }} + | +
+
+
+ {{ model.read_at ? $t('readed') : (model.is_closed ? $t('omitted') : $t('unreaded')) }}
+
+ |
+
+
+
+ |
+
+
+
+ + {{ $t('registers.empty') }} + + |
+ - | +- | +- | +- | + +