diff --git a/package.json b/package.json index 27746cb..934cb11 100755 --- a/package.json +++ b/package.json @@ -31,6 +31,8 @@ "apexcharts-clevision": "^3.28.5", "chart.js": "^4.4.0", "cookie-es": "^1.0.0", + "date-fns": "^3.0.6", + "export-from-json": "^1.7.3", "jwt-decode": "^3.1.2", "mapbox-gl": "2.15.0", "ofetch": "^1.3.3", @@ -50,8 +52,7 @@ "vue3-apexcharts": "^1.4.4", "vue3-perfect-scrollbar": "^1.6.1", "vuetify": "3.3.22", - "webfontloader": "^1.6.28", - "export-from-json": "^1.7.3" + "webfontloader": "^1.6.28" }, "devDependencies": { "@antfu/eslint-config-vue": "^0.43.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf2fb2c..992cb2a 100755 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -67,6 +67,9 @@ dependencies: cookie-es: specifier: ^1.0.0 version: 1.0.0 + date-fns: + specifier: ^3.0.6 + version: 3.0.6 export-from-json: specifier: ^1.7.3 version: 1.7.3 @@ -3201,6 +3204,10 @@ packages: /dash-get@1.0.2: resolution: {integrity: sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ==} + /date-fns@3.0.6: + resolution: {integrity: sha512-W+G99rycpKMMF2/YD064b2lE7jJGUe+EjOES7Q8BIGY8sbNdbgcs9XFTZwvzc9Jx1f3k7LB7gZaZa7f8Agzljg==} + dev: false + /de-indent@1.0.2: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} dev: true diff --git a/src/navigation/horizontal/index.ts b/src/navigation/horizontal/index.ts index f8b5cee..14f896c 100755 --- a/src/navigation/horizontal/index.ts +++ b/src/navigation/horizontal/index.ts @@ -28,4 +28,15 @@ export default [ title: 'Dotsoft', icon: { icon: 'tabler-database-star' }, }, + { + title: 'XADMIN', + icon: { icon: 'tabler-database-star' }, + children: [ + { + title: 'Application Log', + to: { name: 'xadmin-application-log' }, + icon: { icon: 'tabler-bug' }, + }, + ], + }, ] diff --git a/src/navigation/vertical/index.ts b/src/navigation/vertical/index.ts index f8b5cee..14f896c 100755 --- a/src/navigation/vertical/index.ts +++ b/src/navigation/vertical/index.ts @@ -28,4 +28,15 @@ export default [ title: 'Dotsoft', icon: { icon: 'tabler-database-star' }, }, + { + title: 'XADMIN', + icon: { icon: 'tabler-database-star' }, + children: [ + { + title: 'Application Log', + to: { name: 'xadmin-application-log' }, + icon: { icon: 'tabler-bug' }, + }, + ], + }, ] diff --git a/src/pages/flux/bl/not_sent/index.vue b/src/pages/flux/bl/not_sent/index.vue index 44f3955..1c8111a 100644 --- a/src/pages/flux/bl/not_sent/index.vue +++ b/src/pages/flux/bl/not_sent/index.vue @@ -148,7 +148,7 @@ const exportEXCEL = () => { - + diff --git a/src/pages/store/details/index.vue b/src/pages/store/details/index.vue index d2efcd4..47f7bfe 100644 --- a/src/pages/store/details/index.vue +++ b/src/pages/store/details/index.vue @@ -3,6 +3,7 @@ import StoreHeader from '@/views/pages/store/view/StoreHeader.vue' import StoreTabAdmin from '@/views/pages/store/view/StoreTabAdmin.vue' import StoreTabGeneral from '@/views/pages/store/view/StoreTabGeneral.vue' import StoreTabItem from '@/views/pages/store/view/StoreTabItem.vue' +import StoreTabLog from '@/views/pages/store/view/StoreTabLog.vue' import StoreTabRemote from '@/views/pages/store/view/StoreTabRemote.vue' const { t } = useI18n() @@ -11,14 +12,13 @@ const route = useRoute('store-details') const storeTab = ref(route.query.tab || 'general') -console.log(route.query.dbHost) - // tabs const tabs = [ { title: 'General', icon: 'tabler-settings', tab: 'general' }, { title: t('Item'), icon: 'tabler-shirt-sport', tab: 'item' }, { title: t('Remote'), icon: 'tabler-brand-openvpn', tab: 'remote' }, { title: 'Admin', icon: 'tabler-lock', tab: 'admin' }, + { title: 'Log', icon: 'tabler-bug', tab: 'log' }, ] const { data: storeData } = await useApi(`/stores/${route.query.storeId}/details?dbHost=${route.query.dbHost}`) @@ -72,6 +72,11 @@ const { data: storeData } = await useApi(`/stores/${route.query.storeId}/de + + + + + diff --git a/src/pages/xadmin/application/log/index.vue b/src/pages/xadmin/application/log/index.vue new file mode 100644 index 0000000..039379b --- /dev/null +++ b/src/pages/xadmin/application/log/index.vue @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ t("Reload") }} + + + + + + + + + + + + + + + + + + City: {{ slotProps.item.logMessage }} + + + + + + + + {{ formatDate(item.businessDate) }} + + + + + + diff --git a/src/plugins/i18n/locales/ar.json b/src/plugins/i18n/locales/ar.json index 64284d7..8c8dd7c 100755 --- a/src/plugins/i18n/locales/ar.json +++ b/src/plugins/i18n/locales/ar.json @@ -55,6 +55,16 @@ "You can search for a reference, reference-color or reference-color-size.": "You can search for a reference, reference-color or reference-color-size.", "Minimum 5 characters long": "Minimum 5 characters long", "Filters": "Filters", + "XADMIN": "XADMIN", + "Application Log": "Application Log", + "Level": "level", + "loggerCategory": "loggerCategory", + "Thread": "Thread", + "Date": "Date", + "WSK": "WSK", + "Select date": "Select date", + "ExcelData is empty, cannot export": "ExcelData is empty, cannot export", + "Logs list": "Logs list", "---------------------------": "---------------------------", "UI Elements": "ุนูุงุตุฑ ูุงุฌูุฉ ุงูู ุณุชุฎุฏู ", "Forms & Tables": "ุงููู ุงุฐุฌ ูุงูุฌุฏุงูู", diff --git a/src/plugins/i18n/locales/en.json b/src/plugins/i18n/locales/en.json index f4549b7..826e964 100755 --- a/src/plugins/i18n/locales/en.json +++ b/src/plugins/i18n/locales/en.json @@ -55,6 +55,16 @@ "You can search for a reference, reference-color or reference-color-size.": "You can search for a reference, reference-color or reference-color-size.", "Minimum 5 characters long": "Minimum 5 characters long", "Filters": "Filters", + "XADMIN": "XADMIN", + "Application Log": "Application Log", + "Level": "level", + "loggerCategory": "loggerCategory", + "Thread": "Thread", + "Date": "Date", + "WSK": "WSK", + "Select date": "Select date", + "ExcelData is empty, cannot export": "No data, cannot export", + "Logs list": "Logs list", "---------------------------": "---------------------------", "UI Elements": "UI Elements", "Forms & Tables": "Forms & Tables", diff --git a/src/plugins/i18n/locales/fr.json b/src/plugins/i18n/locales/fr.json index 0cb2d31..0be7fde 100755 --- a/src/plugins/i18n/locales/fr.json +++ b/src/plugins/i18n/locales/fr.json @@ -55,6 +55,16 @@ "You can search for a reference, reference-color or reference-color-size.": "Vous pouvez chercher une reference, reference-couleur ou reference-couleur-taille.", "Minimum 5 characters long": "Minimum 5 caractรจres", "Filters": "Filtres", + "XADMIN": "XADMIN", + "Application Log": "Application Log", + "Level": "Niveau", + "loggerCategory": "Categorie log", + "Thread": "Thread", + "Date": "Date", + "WSK": "Caisse", + "Select date": "Selectionner une date", + "ExcelData is empty, cannot export": "Aucune donnรฉe, impossible d'exporter", + "Logs list": "Liste des logs", "---------------------------": "---------------------------", "UI Elements": "รLรMENTS DE L'UI", "Forms & Tables": "Formulaires et tableaux", diff --git a/src/views/pages/store/view/StoreTabLog.vue b/src/views/pages/store/view/StoreTabLog.vue new file mode 100644 index 0000000..6ba6fff --- /dev/null +++ b/src/views/pages/store/view/StoreTabLog.vue @@ -0,0 +1,326 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Export + + + + + + {{ $t('Reload') }} + + + + + + + + + + + + + + + {{ format(new Date(item.createDate), 'dd/MM/yyyy HH:mm:ss') }} + + + + + + + + {{ slotProps.item.logMessage }} + + + + + + + + + + + {{ $t('ExcelData is empty, cannot export') }} + + + + Close + + + + diff --git a/typed-router.d.ts b/typed-router.d.ts index 9b543d3..7e78d51 100755 --- a/typed-router.d.ts +++ b/typed-router.d.ts @@ -45,6 +45,7 @@ declare module 'vue-router/auto/routes' { 'login': RouteRecordInfo<'login', '/login', Record, Record>, 'store-details': RouteRecordInfo<'store-details', '/store/details', Record, Record>, 'store-list': RouteRecordInfo<'store-list', '/store/list', Record, Record>, + 'xadmin-application-log': RouteRecordInfo<'xadmin-application-log', '/xadmin/application/log', Record, Record>, } }
+ City: {{ slotProps.item.logMessage }} +
+ {{ slotProps.item.logMessage }} +