From 53517e5170204c62390be66d2cc081a98ada531e Mon Sep 17 00:00:00 2001 From: jedi Date: Sat, 28 Oct 2023 20:24:25 +0200 Subject: [PATCH] stash --- frontend/src/assets/css/toolshed.css | 3 +- frontend/src/components/PropertyBadge.vue | 2 +- frontend/src/components/PropertyField.vue | 5 -- frontend/src/components/Sidebar.vue | 6 ++ frontend/src/router.js | 2 + frontend/src/store.js | 1 + frontend/src/views/Admin.vue | 102 ++++++++++++++++++++++ frontend/vite.config.js | 13 ++- 8 files changed, 119 insertions(+), 15 deletions(-) create mode 100644 frontend/src/views/Admin.vue diff --git a/frontend/src/assets/css/toolshed.css b/frontend/src/assets/css/toolshed.css index b4bcaa2..daced67 100644 --- a/frontend/src/assets/css/toolshed.css +++ b/frontend/src/assets/css/toolshed.css @@ -13394,7 +13394,8 @@ a.list-group-item { min-width: 0; min-height: 100vh; transition: margin-left .35s ease-in-out, left .35s ease-in-out, margin-right .35s ease-in-out, right .35s ease-in-out; - background: #f7f7fc; + /*background: #f7f7fc;*/ + background-color: #ddd; flex-direction: column; overflow: hidden; border-top-left-radius: 0; diff --git a/frontend/src/components/PropertyBadge.vue b/frontend/src/components/PropertyBadge.vue index baca598..7b06ef0 100644 --- a/frontend/src/components/PropertyBadge.vue +++ b/frontend/src/components/PropertyBadge.vue @@ -90,7 +90,7 @@ export default { return this.property.value }, set(value) { - this.$emit("input", value) + this.$emit("input", {...this.property,value}) } }, prettyDescription() { diff --git a/frontend/src/components/PropertyField.vue b/frontend/src/components/PropertyField.vue index 81771a5..343ad41 100644 --- a/frontend/src/components/PropertyField.vue +++ b/frontend/src/components/PropertyField.vue @@ -29,11 +29,6 @@ import BadgeSelectField from "@/components/BadgeSelectField.vue"; export default { name: "PropertyField", - data() { - return { - property: "" - } - }, components: { BadgeSelectField, PropertyBadge, diff --git a/frontend/src/components/Sidebar.vue b/frontend/src/components/Sidebar.vue index 38c4b13..3182694 100644 --- a/frontend/src/components/Sidebar.vue +++ b/frontend/src/components/Sidebar.vue @@ -21,6 +21,12 @@ Friends + diff --git a/frontend/src/router.js b/frontend/src/router.js index e064919..f27119c 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -11,6 +11,7 @@ import Search from '@/views/Search.vue'; import InventoryDetail from '@/views/InventoryDetail.vue'; import InventoryNew from '@/views/InventoryNew.vue'; import InventoryEdit from '@/views/InventoryEdit.vue'; +import Admin from '@/views/Admin.vue'; const routes = [ @@ -20,6 +21,7 @@ const routes = [ {path: '/inventory/:id/edit', component: InventoryEdit, meta: {requiresAuth: true}, props: true}, {path: '/inventory/new', component: InventoryNew, meta: {requiresAuth: true}}, {path: '/friends', component: Friends, meta: {requiresAuth: true}}, + {path: '/admin', component: Admin, meta: {requiresAuth: true}}, {path: '/search/:query', component: Search, meta: {requiresAuth: true}, props: true}, {path: '/login', component: Login, meta: {requiresAuth: false}}, {path: '/register', component: Register, meta: {requiresAuth: false}}, diff --git a/frontend/src/store.js b/frontend/src/store.js index 6eb2a0a..584f6e6 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -25,6 +25,7 @@ export default createStore({ files: [], categories: [], availability_policies: [], + domains: [], }, mutations: { setUser(state, user) { diff --git a/frontend/src/views/Admin.vue b/frontend/src/views/Admin.vue new file mode 100644 index 0000000..1c73781 --- /dev/null +++ b/frontend/src/views/Admin.vue @@ -0,0 +1,102 @@ + + + + + \ No newline at end of file diff --git a/frontend/vite.config.js b/frontend/vite.config.js index e16c385..ce6d940 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -31,22 +31,19 @@ export default defineConfig({ },*/ proxy: { '^/api/': { - target: "http://127.0.0.1:8000/", + target: "https://toolshed.j3d1.de:8000/", }, '^/auth/': { - target: "http://127.0.0.1:8000/", - }, - '^/admin/': { - target: "http://127.0.0.1:8000/", + target: "https://toolshed.j3d1.de:8000/", }, '^/docs/': { - target: "http://127.0.0.1:8000/", + target: "https://toolshed.j3d1.de:8000/", }, '^/static/': { - target: "http://127.0.0.1:8000/", + target: "https://toolshed.j3d1.de:8000/", }, '^/media/': { - target: "http://127.0.0.1:8000/", + target: "https://toolshed.j3d1.de:8000/", }, '^/wiki/': { target: "http://127.0.0.1:8080/",