From 11b62269c943148f7bb6c1564629d2f77be853d5 Mon Sep 17 00:00:00 2001 From: Kasper Seweryn Date: Mon, 11 Dec 2023 15:00:00 +0100 Subject: [PATCH] feat: add sidebar --- front/package.json | 13 +- front/src/App.vue | 99 +--- front/src/LegacyLayout.vue | 102 ++++ front/src/main.ts | 2 + front/src/ui/App.vue | 27 + front/src/ui/components/Sidebar.vue | 230 ++++++++ front/src/ui/pages/upload.vue | 23 +- front/src/ui/stores/upload.ts | 31 +- front/src/utils/color.ts | 2 +- front/vite.config.ts | 21 +- front/yarn.lock | 833 +++++++++++++++++++++++----- 11 files changed, 1112 insertions(+), 271 deletions(-) create mode 100644 front/src/LegacyLayout.vue create mode 100644 front/src/ui/App.vue create mode 100644 front/src/ui/components/Sidebar.vue diff --git a/front/package.json b/front/package.json index 99a08102d..b418b2bf7 100644 --- a/front/package.json +++ b/front/package.json @@ -22,10 +22,10 @@ "@types/jsmediatags": "3.9.6", "@vue/runtime-core": "3.3.11", "@vueuse/components": "10.6.1", - "@vueuse/core": "10.3.0", - "@vueuse/integrations": "10.3.0", - "@vueuse/math": "10.3.0", - "@vueuse/router": "10.3.0", + "@vueuse/core": "10.6.1", + "@vueuse/integrations": "10.6.1", + "@vueuse/math": "10.6.1", + "@vueuse/router": "10.6.1", "axios": "1.2.3", "axios-auth-refresh": "3.3.6", "butterchurn": "3.0.0-beta.4", @@ -100,13 +100,14 @@ "sinon": "15.0.2", "standardized-audio-context-mock": "9.6.32", "typescript": "4.9.5", + "unocss": "0.58.0", "unplugin-vue-macros": "2.4.6", "utility-types": "3.10.0", - "vite": "5.0.4", + "vite": "5.0.6", "vite-plugin-node-polyfills": "0.17.0", "vite-plugin-pwa": "0.14.4", "vitest": "0.25.8", - "vue-tsc": "1.6.5", + "vue-tsc": "1.8.25", "workbox-core": "6.5.4", "workbox-precaching": "6.5.4", "workbox-routing": "6.5.4", diff --git a/front/src/App.vue b/front/src/App.vue index 433d00ffe..1608b71d3 100644 --- a/front/src/App.vue +++ b/front/src/App.vue @@ -1,25 +1,19 @@ + diff --git a/front/src/ui/components/Sidebar.vue b/front/src/ui/components/Sidebar.vue new file mode 100644 index 000000000..7371700a5 --- /dev/null +++ b/front/src/ui/components/Sidebar.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/front/src/ui/pages/upload.vue b/front/src/ui/pages/upload.vue index 8d0dd632e..38cb90210 100644 --- a/front/src/ui/pages/upload.vue +++ b/front/src/ui/pages/upload.vue @@ -45,7 +45,6 @@ const currentTab = ref(tabs[0].label) // Modals const libraryOpen = ref(false) -const libraryModalAlertOpen = ref(true) // Server import const serverPath = ref('/srv/funkwhale/data/music') @@ -68,6 +67,20 @@ const cancel = () => { libraryOpen.value = false uploads.cancelAll() } + +// Sorting +const sortItems = reactive([ + { label: 'Upload time', value: 'upload-time' }, + { label: 'Upload time 2', value: 'upload-time-2' }, + { label: 'Upload time 3', value: 'upload-time-3' } +]) +const currentSort = ref(sortItems[0]) + +// Filtering +const filterItems = reactive([ + { label: 'All', value: 'all' } +]) +const currentFilter = ref(filterItems[0])