From 1123a786c976b00f2b485130dccf786b6c39d3f9 Mon Sep 17 00:00:00 2001 From: philipp lang Date: Fri, 29 Apr 2022 00:23:28 +0200 Subject: [PATCH] Add popup for conflict --- app/Member/MemberController.php | 1 + resources/css/buttons.css | 5 +---- resources/js/components/Popup.vue | 20 ++++++++++++++++++++ resources/js/views/member/VForm.vue | 23 +++++++++++++++++++++++ 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 resources/js/components/Popup.vue diff --git a/app/Member/MemberController.php b/app/Member/MemberController.php index 4326daa8..78c37355 100644 --- a/app/Member/MemberController.php +++ b/app/Member/MemberController.php @@ -105,6 +105,7 @@ class MemberController extends Controller 'subscriptions' => Subscription::pluck('name', 'id'), 'data' => new MemberResource($member), 'mode' => 'edit', + 'conflict' => '1' === $request->query('conflict', '0'), ]); } diff --git a/resources/css/buttons.css b/resources/css/buttons.css index 7f467429..25720459 100644 --- a/resources/css/buttons.css +++ b/resources/css/buttons.css @@ -32,10 +32,7 @@ } } &.btn-danger { - @apply bg-red-700; - &:not(.disabled):hover { - @apply bg-red-500; - } + @apply bg-red-400 text-red-100 hover:bg-red-300; } &.label { diff --git a/resources/js/components/Popup.vue b/resources/js/components/Popup.vue new file mode 100644 index 00000000..1b9aa935 --- /dev/null +++ b/resources/js/components/Popup.vue @@ -0,0 +1,20 @@ + + + diff --git a/resources/js/views/member/VForm.vue b/resources/js/views/member/VForm.vue index fb0b3a6a..9069eb43 100644 --- a/resources/js/views/member/VForm.vue +++ b/resources/js/views/member/VForm.vue @@ -1,5 +1,21 @@