From cb0bfd5bc5e42c1f0ef9085d5b342a3937994874 Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Wed, 14 Aug 2024 08:10:13 +0200 Subject: [PATCH] Split into icons fix avatar move class to view not icon itself fix icon format --- src/components/Client/Address.vue | 15 +---- src/components/Client/Avatar.vue | 13 +---- src/components/Client/Config.vue | 15 +---- src/components/Client/Delete.vue | 13 +---- src/components/Client/InlineTransfer.vue | 26 +-------- src/components/Client/Name.vue | 15 +---- src/components/Client/QRCode.vue | 15 +---- src/components/Client/Transfer.vue | 26 +-------- src/components/Clients/BackupConfig.vue | 2 +- src/components/Clients/Empty.vue | 16 +----- src/components/Clients/New.vue | 2 +- src/components/Clients/RestoreConfig.vue | 2 +- src/components/icons/ArrowDown.vue | 13 +++++ src/components/icons/ArrowInf.vue | 1 - src/components/icons/ArrowUp.vue | 13 +++++ src/components/icons/Avatar.vue | 13 +++++ src/components/icons/Chart.vue | 12 ++++ src/components/icons/Close.vue | 15 +++++ src/components/icons/Delete.vue | 13 +++++ src/components/icons/Download.vue | 15 +++++ src/components/icons/Edit.vue | 15 +++++ src/components/icons/HalfMoon.vue | 11 ++++ src/components/icons/Loading.vue | 21 +++++++ src/components/icons/Logout.vue | 15 +++++ src/components/icons/Moon.vue | 15 +++++ src/components/icons/Plus.vue | 1 - src/components/icons/QRCode.vue | 15 +++++ src/components/icons/Stack.vue | 1 - src/components/icons/Sun.vue | 15 +++++ src/components/icons/Warning.vue | 17 ++++++ src/components/ui/Icon.vue | 0 src/layouts/Header.vue | 72 +++--------------------- src/pages/index.vue | 69 ++--------------------- src/pages/login.vue | 34 +---------- src/server/middleware/auth.ts | 6 +- 35 files changed, 250 insertions(+), 312 deletions(-) create mode 100644 src/components/icons/ArrowDown.vue create mode 100644 src/components/icons/ArrowUp.vue create mode 100644 src/components/icons/Avatar.vue create mode 100644 src/components/icons/Chart.vue create mode 100644 src/components/icons/Close.vue create mode 100644 src/components/icons/Delete.vue create mode 100644 src/components/icons/Download.vue create mode 100644 src/components/icons/Edit.vue create mode 100644 src/components/icons/HalfMoon.vue create mode 100644 src/components/icons/Loading.vue create mode 100644 src/components/icons/Logout.vue create mode 100644 src/components/icons/Moon.vue create mode 100644 src/components/icons/QRCode.vue create mode 100644 src/components/icons/Sun.vue create mode 100644 src/components/icons/Warning.vue delete mode 100644 src/components/ui/Icon.vue diff --git a/src/components/Client/Address.vue b/src/components/Client/Address.vue index 2a9719a8..ca3e8dc4 100644 --- a/src/components/Client/Address.vue +++ b/src/components/Client/Address.vue @@ -30,20 +30,9 @@ nextTick(() => clientAddressInput?.select()); " > - - - + /> diff --git a/src/components/Client/Avatar.vue b/src/components/Client/Avatar.vue index 25f64669..3afb0fb1 100644 --- a/src/components/Client/Avatar.vue +++ b/src/components/Client/Avatar.vue @@ -1,17 +1,6 @@ diff --git a/src/components/Client/Delete.vue b/src/components/Client/Delete.vue index 91a8cce0..d0e962e0 100644 --- a/src/components/Client/Delete.vue +++ b/src/components/Client/Delete.vue @@ -4,18 +4,7 @@ :title="$t('deleteClient')" @click="modalStore.clientDelete = client" > - - - + diff --git a/src/components/Client/InlineTransfer.vue b/src/components/Client/InlineTransfer.vue index a0e1539b..7d62348f 100644 --- a/src/components/Client/InlineTransfer.vue +++ b/src/components/Client/InlineTransfer.vue @@ -6,18 +6,7 @@ :title="$t('totalDownload') + bytes(client.transferTx)" > · - - - + {{ bytes(client.transferTxCurrent) }}/s @@ -28,18 +17,7 @@ :title="$t('totalUpload') + bytes(client.transferRx)" > · - - - + {{ bytes(client.transferRxCurrent) }}/s diff --git a/src/components/Client/Name.vue b/src/components/Client/Name.vue index f274fa56..038274ea 100644 --- a/src/components/Client/Name.vue +++ b/src/components/Client/Name.vue @@ -35,20 +35,9 @@ nextTick(() => clientNameInput?.select()); " > - - - + /> diff --git a/src/components/Client/QRCode.vue b/src/components/Client/QRCode.vue index 7a600123..728fa7fe 100644 --- a/src/components/Client/QRCode.vue +++ b/src/components/Client/QRCode.vue @@ -12,20 +12,7 @@ modalStore.qrcode = `./api/wireguard/client/${client.id}/qrcode.svg` " > - - - + diff --git a/src/components/Client/Transfer.vue b/src/components/Client/Transfer.vue index 59583f98..30ed2a31 100644 --- a/src/components/Client/Transfer.vue +++ b/src/components/Client/Transfer.vue @@ -5,18 +5,7 @@ class="flex gap-1" :title="$t('totalDownload') + bytes(client.transferTx)" > - - - +
{{ bytes(client.transferTxCurrent) }}/s - - - +
{{ bytes(client.transferRxCurrent) }}/s - + {{ $t('backup') }} diff --git a/src/components/Clients/Empty.vue b/src/components/Clients/Empty.vue index e2016b28..73d1f555 100644 --- a/src/components/Clients/Empty.vue +++ b/src/components/Clients/Empty.vue @@ -8,21 +8,7 @@ modalStore.clientCreateName = ''; " > - - - + {{ $t('newClient') }}

diff --git a/src/components/Clients/New.vue b/src/components/Clients/New.vue index 2fedf635..3c737c1c 100644 --- a/src/components/Clients/New.vue +++ b/src/components/Clients/New.vue @@ -5,7 +5,7 @@ modalStore.clientCreateName = ''; " > - + {{ $t('new') }} diff --git a/src/components/Clients/RestoreConfig.vue b/src/components/Clients/RestoreConfig.vue index 009af79d..96d782b4 100644 --- a/src/components/Clients/RestoreConfig.vue +++ b/src/components/Clients/RestoreConfig.vue @@ -1,6 +1,6 @@ diff --git a/src/components/icons/ArrowInf.vue b/src/components/icons/ArrowInf.vue index 4ffd745a..0a204f4a 100644 --- a/src/components/icons/ArrowInf.vue +++ b/src/components/icons/ArrowInf.vue @@ -1,7 +1,6 @@ diff --git a/src/components/icons/Avatar.vue b/src/components/icons/Avatar.vue new file mode 100644 index 00000000..cec5b567 --- /dev/null +++ b/src/components/icons/Avatar.vue @@ -0,0 +1,13 @@ + diff --git a/src/components/icons/Chart.vue b/src/components/icons/Chart.vue new file mode 100644 index 00000000..2c9d74e8 --- /dev/null +++ b/src/components/icons/Chart.vue @@ -0,0 +1,12 @@ + diff --git a/src/components/icons/Close.vue b/src/components/icons/Close.vue new file mode 100644 index 00000000..654ca4d4 --- /dev/null +++ b/src/components/icons/Close.vue @@ -0,0 +1,15 @@ + diff --git a/src/components/icons/Delete.vue b/src/components/icons/Delete.vue new file mode 100644 index 00000000..43ad5ff2 --- /dev/null +++ b/src/components/icons/Delete.vue @@ -0,0 +1,13 @@ + diff --git a/src/components/icons/Download.vue b/src/components/icons/Download.vue new file mode 100644 index 00000000..8fdb7643 --- /dev/null +++ b/src/components/icons/Download.vue @@ -0,0 +1,15 @@ + diff --git a/src/components/icons/Edit.vue b/src/components/icons/Edit.vue new file mode 100644 index 00000000..e13e8453 --- /dev/null +++ b/src/components/icons/Edit.vue @@ -0,0 +1,15 @@ + diff --git a/src/components/icons/HalfMoon.vue b/src/components/icons/HalfMoon.vue new file mode 100644 index 00000000..47d87a01 --- /dev/null +++ b/src/components/icons/HalfMoon.vue @@ -0,0 +1,11 @@ + diff --git a/src/components/icons/Loading.vue b/src/components/icons/Loading.vue new file mode 100644 index 00000000..cd55253d --- /dev/null +++ b/src/components/icons/Loading.vue @@ -0,0 +1,21 @@ + diff --git a/src/components/icons/Logout.vue b/src/components/icons/Logout.vue new file mode 100644 index 00000000..21656ea4 --- /dev/null +++ b/src/components/icons/Logout.vue @@ -0,0 +1,15 @@ + diff --git a/src/components/icons/Moon.vue b/src/components/icons/Moon.vue new file mode 100644 index 00000000..4b271121 --- /dev/null +++ b/src/components/icons/Moon.vue @@ -0,0 +1,15 @@ + diff --git a/src/components/icons/Plus.vue b/src/components/icons/Plus.vue index 047e1082..e3e95b7a 100644 --- a/src/components/icons/Plus.vue +++ b/src/components/icons/Plus.vue @@ -1,6 +1,5 @@ diff --git a/src/components/icons/Stack.vue b/src/components/icons/Stack.vue index 74cc0f3b..d26b002b 100644 --- a/src/components/icons/Stack.vue +++ b/src/components/icons/Stack.vue @@ -1,7 +1,6 @@ diff --git a/src/components/icons/Warning.vue b/src/components/icons/Warning.vue new file mode 100644 index 00000000..07a27999 --- /dev/null +++ b/src/components/icons/Warning.vue @@ -0,0 +1,17 @@ + diff --git a/src/components/ui/Icon.vue b/src/components/ui/Icon.vue deleted file mode 100644 index e69de29b..00000000 diff --git a/src/layouts/Header.vue b/src/layouts/Header.vue index a34d310a..04ec9f6e 100644 --- a/src/layouts/Header.vue +++ b/src/layouts/Header.vue @@ -24,51 +24,14 @@ :title="$t(`theme.${theme.preference}`)" @click="toggleTheme" > - - - - + - - - + - - - @@ -84,17 +47,9 @@ class="sr-only peer" @change="toggleCharts" /> - - - + /> {{ $t('logout') }} - - - +
diff --git a/src/pages/index.vue b/src/pages/index.vue index 02561f4f..90fa97c8 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -30,26 +30,7 @@ v-if="clientsStore.clients === null" class="text-gray-200 dark:text-red-300 p-5" > - - - - + @@ -64,20 +45,7 @@ class="absolute right-4 top-4 text-gray-600 dark:text-neutral-500 hover:text-gray-800 dark:hover:text-neutral-700" @click="modalStore.qrcode = null" > - - - + @@ -136,21 +104,7 @@
- - - +
- - +

- - - +

- - - - + { const session = await useWGSession(event); if (url.pathname === '/login') { if (!REQUIRES_PASSWORD || session.data.authenticated) { - return sendRedirect(event, '/', 302) + return sendRedirect(event, '/', 302); } } if (url.pathname === '/') { if (!session.data.authenticated) { - return sendRedirect(event, '/login', 302) + return sendRedirect(event, '/login', 302); } } -}); \ No newline at end of file +});