From 819f6587bdafa6c9f6850b7ca2a991fb1842cc92 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 9 Nov 2022 17:52:22 +0300 Subject: [PATCH 1/6] mobile index actions --- public/akaunting-js/generalAction.js | 17 ++- .../views/components/table/actions.blade.php | 133 ++++++++++++++++++ 2 files changed, 149 insertions(+), 1 deletion(-) diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js index cbf0431bc..7a7e06de8 100644 --- a/public/akaunting-js/generalAction.js +++ b/public/akaunting-js/generalAction.js @@ -11,7 +11,7 @@ document.querySelectorAll("[data-table-list]").forEach((row) => { //redirect edit or show page for table row click document.querySelectorAll("[data-table-body]").forEach((table) => { - if (document.body.clientWidth >= 991) { + if (document.body.clientWidth < 768 || document.body.clientWidth > 1200) { let rows = table.querySelectorAll("tr"); rows.forEach((row) => { @@ -27,6 +27,7 @@ document.querySelectorAll("[data-table-body]").forEach((table) => { if (row_href) { for (let i = first_selector; i < td.length - 1; i++) { let td_item = td[i]; + td_item.addEventListener("click", () => { window.location.href = row_href; }); @@ -42,6 +43,20 @@ document.querySelectorAll("[data-table-body]").forEach((table) => { } }); } + + if (document.body.clientWidth <= 768) { + table.querySelectorAll('[data-table-list]').forEach((actions) => { + actions.querySelector('[data-mobile-actions]').addEventListener('click', function() { + this.closest('td').querySelector('[data-mobile-actions-modal]').classList.add('show', 'flex'); + this.closest('td').querySelector('[data-mobile-actions-modal]').classList.remove('hidden'); + + this.closest('td').querySelector('[data-mobile-actions-modal]').addEventListener('click', function() { + this.classList.add('hidden'); + this.classList.remove('show', 'flex'); + }); + }); + }); + } }); //redirect edit or show page for table row click diff --git a/resources/views/components/table/actions.blade.php b/resources/views/components/table/actions.blade.php index 8ce6cd0cf..d2e273600 100644 --- a/resources/views/components/table/actions.blade.php +++ b/resources/views/components/table/actions.blade.php @@ -3,6 +3,138 @@ $more_actions = []; @endphp +@mobile +
+ + arrow_drop_up + +
+ + + +@else @endif +@endmobile From 4a5858f724c0e172385d5853811c4654002478db Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Thu, 10 Nov 2022 11:14:30 +0300 Subject: [PATCH 2/6] other scenario fixed --- app/View/Components/DeleteLink.php | 2 +- public/akaunting-js/generalAction.js | 7 +- public/css/app.css | 5 + .../views/components/delete-button.blade.php | 81 ++-- .../components/table/actions-mobile.blade.php | 134 +++++++ .../views/components/table/actions.blade.php | 355 ++++++------------ safelist.txt | 1 + 7 files changed, 314 insertions(+), 271 deletions(-) create mode 100644 resources/views/components/table/actions-mobile.blade.php diff --git a/app/View/Components/DeleteLink.php b/app/View/Components/DeleteLink.php index 52c9cdee7..f098768eb 100644 --- a/app/View/Components/DeleteLink.php +++ b/app/View/Components/DeleteLink.php @@ -282,7 +282,7 @@ class DeleteLink extends Component protected function getClass($class) { - $default_class = 'w-full flex items-center text-purple px-2 h-9 leading-9 whitespace-nowrap'; + $default_class = 'w-full flex items-center text-red sm:text-purple px-2 h-9 leading-9 whitespace-nowrap'; $explode = explode(',', $this->override); diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js index 7a7e06de8..f608d6058 100644 --- a/public/akaunting-js/generalAction.js +++ b/public/akaunting-js/generalAction.js @@ -28,7 +28,12 @@ document.querySelectorAll("[data-table-body]").forEach((table) => { for (let i = first_selector; i < td.length - 1; i++) { let td_item = td[i]; - td_item.addEventListener("click", () => { + td_item.addEventListener("click", (event) => { + // click disabled when preview dialog is open + if (event.target.closest('[data-tooltip-target]')) { + return; + } + // click disabled when preview dialog is open window.location.href = row_href; }); diff --git a/public/css/app.css b/public/css/app.css index a2837b0a6..63164f7b4 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -57052,6 +57052,11 @@ body{ line-height: 2.75rem; } + .sm\:text-purple{ + --tw-text-opacity: 1; + color: rgb(85 88 139 / var(--tw-text-opacity)); + } + [dir="ltr"] .sm\:ltr\:right-4{ right: 1rem; } diff --git a/resources/views/components/delete-button.blade.php b/resources/views/components/delete-button.blade.php index e7e3333b7..6197ddb5e 100644 --- a/resources/views/components/delete-button.blade.php +++ b/resources/views/components/delete-button.blade.php @@ -1,28 +1,55 @@ - - @if ($slot->isNotEmpty()) - {!! $slot !!} - @else - delete - - @endif +@mobile + + @if ($slot->isNotEmpty()) + {!! $slot !!} + @else + {!! $label !!} + @endif - - + + +@else + + @if ($slot->isNotEmpty()) + {!! $slot !!} + @else + delete + + @endif + + + +@endmobile diff --git a/resources/views/components/table/actions-mobile.blade.php b/resources/views/components/table/actions-mobile.blade.php new file mode 100644 index 000000000..e0a311ddc --- /dev/null +++ b/resources/views/components/table/actions-mobile.blade.php @@ -0,0 +1,134 @@ +@php + $count_buttons = 1; + $more_actions = []; +@endphp + +
+ + more_horiz + +
+ + \ No newline at end of file diff --git a/resources/views/components/table/actions.blade.php b/resources/views/components/table/actions.blade.php index d2e273600..639303fc4 100644 --- a/resources/views/components/table/actions.blade.php +++ b/resources/views/components/table/actions.blade.php @@ -4,264 +4,135 @@ @endphp @mobile -
- - arrow_drop_up - -
+ +@else +