From a4f084e590f40698a3f24cc3993010523ca17ed5 Mon Sep 17 00:00:00 2001 From: philipp lang Date: Thu, 12 Sep 2024 11:14:59 +0200 Subject: [PATCH] --wip-- [skip ci] --- docker-compose.yml | 4 + resources/js/views/member/VForm.vue | 323 +++++++++++--------- resources/js/views/member/VIndex.vue | 28 +- resources/js/views/member/index/Actions.vue | 2 +- 4 files changed, 192 insertions(+), 165 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index aa27c717..50c63b6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -92,6 +92,8 @@ services: socketi: image: quay.io/soketi/soketi:89604f268623cf799573178a7ba56b7491416bde-16-debian + ports: + - '6001:6001' environment: SOKETI_DEFAULT_APP_ID: adremaid SOKETI_DEFAULT_APP_KEY: adremakey @@ -104,6 +106,8 @@ services: meilisearch: image: getmeili/meilisearch:v1.6 + ports: + - '7700:7700' volumes: - ./data/meilisearch:/meili_data env_file: diff --git a/resources/js/views/member/VForm.vue b/resources/js/views/member/VForm.vue index b202a9e6..105c6201 100644 --- a/resources/js/views/member/VForm.vue +++ b/resources/js/views/member/VForm.vue @@ -1,5 +1,5 @@ - diff --git a/resources/js/views/member/VIndex.vue b/resources/js/views/member/VIndex.vue index 5901e236..dde14699 100644 --- a/resources/js/views/member/VIndex.vue +++ b/resources/js/views/member/VIndex.vue @@ -1,8 +1,11 @@ @@ -149,15 +152,16 @@ import MemberMemberships from './MemberMemberships.vue'; import MemberCourses from './MemberCourses.vue'; import Tags from './Tags.vue'; import Actions from './index/Actions.vue'; -import { indexProps, useIndex } from '../../composables/useIndex.js'; +import VForm from './VForm.vue'; +import { indexProps, useIndex } from '../../composables/useInertiaApiIndex.js'; import { ref, defineProps } from 'vue'; -const single = ref(null); +const sidebar = ref(null); const deleting = ref(null); const membershipFilters = ref(null); const props = defineProps(indexProps); -var { router, data, meta, getFilter, setFilter, filterString, reloadPage } = useIndex(props.data, 'member'); +var { router, data, meta, getFilter, setFilter, filterString, reloadPage, edit, create, single, cancel } = useIndex(props.data, 'member'); function exportMembers() { window.open(`/member-export?filter=${filterString.value}`); @@ -175,12 +179,12 @@ async function remove(member) { } function openSidebar(type, model) { - single.value = { + sidebar.value = { type: type, model: model, }; } function closeSidebar() { - single.value = null; + sidebar.value = null; } diff --git a/resources/js/views/member/index/Actions.vue b/resources/js/views/member/index/Actions.vue index 0f45815f..26cab595 100644 --- a/resources/js/views/member/index/Actions.vue +++ b/resources/js/views/member/index/Actions.vue @@ -1,7 +1,7 @@