From 414cdbe168d3e9be80fb8a1fa2543a606d64e3b4 Mon Sep 17 00:00:00 2001 From: Jonathan Baecker Date: Wed, 2 Oct 2024 10:26:50 +0200 Subject: [PATCH] select correct channel on user page, show only filename, fix naming --- frontend/components/ConfigChannel.vue | 2 ++ frontend/components/ConfigUser.vue | 2 +- frontend/composables/helper.ts | 21 +++++++++++++++------ frontend/i18n/locales/de-DE.js | 4 +++- frontend/i18n/locales/en-US.js | 4 +++- frontend/i18n/locales/pt-BR.js | 4 +++- frontend/i18n/locales/ru-RU.js | 4 +++- frontend/pages/media.vue | 16 +++++++--------- 8 files changed, 37 insertions(+), 20 deletions(-) diff --git a/frontend/components/ConfigChannel.vue b/frontend/components/ConfigChannel.vue index 47b2b186..37d462ec 100644 --- a/frontend/components/ConfigChannel.vue +++ b/frontend/components/ConfigChannel.vue @@ -127,6 +127,7 @@ async function addUpdateChannel() { indexStore.msgAlert('success', t('config.updateChannelSuccess'), 2) await configStore.getPlayoutConfig() + await configStore.getUserConfig() } else { indexStore.msgAlert('error', t('config.updateChannelFailed'), 2) @@ -152,6 +153,7 @@ async function deleteChannel() { i.value = configStore.i - 1 await configStore.getChannelConfig() await configStore.getPlayoutConfig() + await configStore.getUserConfig() if (response.status === 200) { indexStore.msgAlert('success', t('config.errorChannelDelete'), 2) diff --git a/frontend/components/ConfigUser.vue b/frontend/components/ConfigUser.vue index a9fa5dde..57c72284 100644 --- a/frontend/components/ConfigUser.vue +++ b/frontend/components/ConfigUser.vue @@ -144,7 +144,7 @@ const user = ref({ password: '', confirm: '', admin: false, - channel_ids: [1], + channel_ids: [configStore.channels[configStore.i]?.id ?? 1], role_id: 3, } as User) diff --git a/frontend/composables/helper.ts b/frontend/composables/helper.ts index 86eb9ee5..8bf70e7d 100644 --- a/frontend/composables/helper.ts +++ b/frontend/composables/helper.ts @@ -39,12 +39,12 @@ export const stringFormatter = () => { .replace(/\[Validator\]/g, '[Validator]') } - function timeToSeconds(time: string) { + function timeToSeconds(time: string): number { const t = time.split(':') return parseInt(t[0]) * 3600 + parseInt(t[1]) * 60 + parseInt(t[2]) } - function secToHMS(sec: number) { + function secToHMS(sec: number): string { const sign = Math.sign(sec) sec = Math.abs(sec) @@ -62,7 +62,7 @@ export const stringFormatter = () => { return `${hString}:${m}:${s}` } - function numberToHex(num: number) { + function numberToHex(num: number): string { return '0x' + Math.round(num * 255).toString(16) } @@ -70,7 +70,7 @@ export const stringFormatter = () => { return parseFloat((parseFloat(parseInt(num, 16).toString()) / 255).toFixed(2)) } - function filename(path: string) { + function filename(path: string): string { if (path) { const pathArr = path.split('/') const name = pathArr[pathArr.length - 1] @@ -85,7 +85,7 @@ export const stringFormatter = () => { } } - function parent(path: string) { + function parent(path: string): string { if (path) { const pathArr = path.split('/') pathArr.pop() @@ -100,7 +100,7 @@ export const stringFormatter = () => { } } - function toMin(sec: number) { + function toMin(sec: number): string { if (sec) { const minutes = Math.floor(sec / 60) const seconds = Math.round(sec - minutes * 60) @@ -167,6 +167,14 @@ export const stringFormatter = () => { return null } + function dir_file(path: string): {dir: string, file: string} { + const index = path.lastIndexOf('/') + const dir = path.substring(0, index + 1) || '/' + const file = path.substring(index + 1) + + return {dir, file} + } + return { fileSize, formatLog, @@ -179,6 +187,7 @@ export const stringFormatter = () => { toMin, secondsToTime, mediaType, + dir_file, } } diff --git a/frontend/i18n/locales/de-DE.js b/frontend/i18n/locales/de-DE.js index dd7abd9d..1568c1f8 100644 --- a/frontend/i18n/locales/de-DE.js +++ b/frontend/i18n/locales/de-DE.js @@ -93,7 +93,9 @@ export default { notExists: 'Speicher existiert nicht!', create: 'Ordner erstellen', upload: 'Dateien hochladen', - deleteTitle: 'Datei/Ordner löschen', + delete: 'Lösche', + file: 'Datei', + folder: 'Ordner', deleteQuestion: 'Sind Sie sicher, dass Sie löschen möchten', preview: 'Vorschau', rename: 'Datei umbenennen', diff --git a/frontend/i18n/locales/en-US.js b/frontend/i18n/locales/en-US.js index e8cf85e7..feb68c0c 100644 --- a/frontend/i18n/locales/en-US.js +++ b/frontend/i18n/locales/en-US.js @@ -93,7 +93,9 @@ export default { notExists: 'Storage not exist!', create: 'Create Folder', upload: 'Upload Files', - deleteTitle: 'Delete File/Folder', + delete: 'Delete', + file: 'File', + folder: 'Folder', deleteQuestion: 'Are you sure that you want to delete', preview: 'Preview', rename: 'Rename File', diff --git a/frontend/i18n/locales/pt-BR.js b/frontend/i18n/locales/pt-BR.js index 0a9d2d13..cd163d5c 100644 --- a/frontend/i18n/locales/pt-BR.js +++ b/frontend/i18n/locales/pt-BR.js @@ -93,7 +93,9 @@ export default { notExists: 'O armazenamento não existe!', create: 'Criar Pasta', upload: 'Enviar Arquivos', - deleteTitle: 'Deletar Arquivo/Pasta', + delete: 'Deletar', + file: 'Arquivo', + folder: 'Pasta', deleteQuestion: 'Tem certeza que deseja deletar?', preview: 'Visualizar', rename: 'Renomear Arquivo', diff --git a/frontend/i18n/locales/ru-RU.js b/frontend/i18n/locales/ru-RU.js index 4dda70a6..7028928b 100644 --- a/frontend/i18n/locales/ru-RU.js +++ b/frontend/i18n/locales/ru-RU.js @@ -93,7 +93,9 @@ export default { notExists: 'Папки не существует!', create: 'Сделать папку', upload: 'Загрузить файлы', - deleteTitle: 'Удалить Файл/Папку', + delete: 'Удалить', + file: 'Файл', + folder: 'Папку', deleteQuestion: 'Вы уверены что хотите это удалить', preview: 'Просмотр', rename: 'Переименовать файл', diff --git a/frontend/pages/media.vue b/frontend/pages/media.vue index 9df1bc78..e0167c67 100644 --- a/frontend/pages/media.vue +++ b/frontend/pages/media.vue @@ -230,12 +230,12 @@
- +