From b0eb841047017180210a1bbe280b489978a33dce Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 2 Nov 2022 11:28:25 +0300 Subject: [PATCH 1/5] portal swiper slider control --- public/css/app.css | 8 ++-- resources/assets/js/views/portal/apps.js | 29 ++++++++++++- .../views/portal/invoices/preview.blade.php | 26 ++++-------- .../views/portal/invoices/show.blade.php | 42 +++++++------------ .../views/portal/invoices/signed.blade.php | 16 ++----- 5 files changed, 59 insertions(+), 62 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 1424ee98b..40f642430 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -50876,6 +50876,10 @@ body{ width: 8.333333%; } + .lg\:w-auto{ + width: auto; + } + .lg\:w-3\/12{ width: 25%; } @@ -50940,10 +50944,6 @@ body{ width: 1rem; } - .lg\:w-auto{ - width: auto; - } - .lg\:w-2\/4{ width: 50%; } diff --git a/resources/assets/js/views/portal/apps.js b/resources/assets/js/views/portal/apps.js index 547c56aa4..f079b0929 100644 --- a/resources/assets/js/views/portal/apps.js +++ b/resources/assets/js/views/portal/apps.js @@ -66,10 +66,37 @@ const app = new Vue({ if (typeof this.form.password !== 'undefined') { this.form.password = ''; } + + + if (document.querySelector('[data-tabs-swiper]').childElementCount) { + + document.querySelectorAll('[data-tabs-slide]').forEach((item) => { + item.classList.add('swiper-slide'); + }); + + document.querySelector('[data-tabs-swiper]').classList.add('swiper', 'swiper-links'); + + let html = ` +
+ ${document.querySelector('[data-tabs-swiper]').innerHTML} +
+ +
+ chevron_right +
+ +
+ chevron_left +
+ `; + + document.querySelector('[data-tabs-swiper]').innerHTML = html; + } + new Swiper(".swiper-links", { loop: false, - slidesPerView: 3, + slidesPerView: 1, pagination: { el: ".swiper-pagination", clickable: true diff --git a/resources/views/portal/invoices/preview.blade.php b/resources/views/portal/invoices/preview.blade.php index adab432eb..86c14a20b 100644 --- a/resources/views/portal/invoices/preview.blade.php +++ b/resources/views/portal/invoices/preview.blade.php @@ -28,33 +28,23 @@ @php $is_active = true; @endphp -
-
- @foreach ($payment_methods as $key => $name) - @stack('invoice_{{ $key }}_tab_start') -
+
+ @foreach ($payment_methods as $key => $name) + @stack('invoice_{{ $key }}_tab_start') +
-
+
{{ $name }}
- @stack('invoice_{{ $key }}_tab_end') + @stack('invoice_{{ $key }}_tab_end') - @php $is_active = false; @endphp - @endforeach -
- -
- chevron_right -
- -
- chevron_left -
+ @php $is_active = false; @endphp + @endforeach
diff --git a/resources/views/portal/invoices/show.blade.php b/resources/views/portal/invoices/show.blade.php index 67844fe81..33736c241 100644 --- a/resources/views/portal/invoices/show.blade.php +++ b/resources/views/portal/invoices/show.blade.php @@ -26,33 +26,23 @@ @php $is_active = true; @endphp -
-
- @foreach ($payment_methods as $key => $name) - @stack('invoice_{{ $key }}_tab_start') -
- -
- {{ $name }} -
- -
- @stack('invoice_{{ $key }}_tab_end') +
+ @foreach ($payment_methods as $key => $name) + @stack('invoice_{{ $key }}_tab_start') +
+ +
+ {{ $name }} +
+ +
+ @stack('invoice_{{ $key }}_tab_end') - @php $is_active = false; @endphp - @endforeach -
- -
- chevron_right -
- -
- chevron_left -
+ @php $is_active = false; @endphp + @endforeach
diff --git a/resources/views/portal/invoices/signed.blade.php b/resources/views/portal/invoices/signed.blade.php index a7af3a0f1..403d1d89d 100644 --- a/resources/views/portal/invoices/signed.blade.php +++ b/resources/views/portal/invoices/signed.blade.php @@ -35,16 +35,15 @@ @php $is_active = true; @endphp -
-
+
@foreach ($payment_methods as $key => $name) @stack('invoice_{{ $key }}_tab_start') -
+
-
+
{{ $name }}
@@ -53,15 +52,6 @@ @php $is_active = false; @endphp @endforeach -
- -
- chevron_right -
- -
- chevron_left -
From 246151781216a20f2989169f6dfdb3bbff298612 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 2 Nov 2022 11:29:15 +0300 Subject: [PATCH 2/5] count refactoring --- resources/assets/js/views/portal/apps.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/views/portal/apps.js b/resources/assets/js/views/portal/apps.js index f079b0929..308420c25 100644 --- a/resources/assets/js/views/portal/apps.js +++ b/resources/assets/js/views/portal/apps.js @@ -68,7 +68,7 @@ const app = new Vue({ } - if (document.querySelector('[data-tabs-swiper]').childElementCount) { + if (document.querySelector('[data-tabs-swiper]').childElementCount > 2) { document.querySelectorAll('[data-tabs-slide]').forEach((item) => { item.classList.add('swiper-slide'); @@ -96,7 +96,7 @@ const app = new Vue({ new Swiper(".swiper-links", { loop: false, - slidesPerView: 1, + slidesPerView: 3, pagination: { el: ".swiper-pagination", clickable: true From 2c74fd62122abad703217211de8712b91e69d0e3 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 2 Nov 2022 12:24:54 +0300 Subject: [PATCH 3/5] report table responsive control --- resources/views/components/reports/detail/table.blade.php | 4 ++-- resources/views/reports/profit_loss/content/footer.blade.php | 4 ++-- resources/views/reports/profit_loss/content/header.blade.php | 4 ++-- resources/views/reports/tax_summary/content/header.blade.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/components/reports/detail/table.blade.php b/resources/views/components/reports/detail/table.blade.php index 474f5834d..1f3667d07 100644 --- a/resources/views/components/reports/detail/table.blade.php +++ b/resources/views/components/reports/detail/table.blade.php @@ -1,5 +1,5 @@ -
- +
+
@include($class->views['detail.table.header']) @include($class->views['detail.table.body']) @include($class->views['detail.table.footer']) diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index f58f632fa..35d411525 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index 284cd78ae..f436f2224 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -1,5 +1,5 @@ -
- +
+
diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index 34be3ec76..c52f75fad 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -1,5 +1,5 @@ -
-
 
+
+
From bac040d4ea48c10156eeb6264bda6a73087f6c7a Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 2 Nov 2022 14:24:59 +0300 Subject: [PATCH 4/5] unused development ejected --- resources/views/components/reports/detail/table.blade.php | 4 ++-- resources/views/reports/profit_loss/content/footer.blade.php | 4 ++-- resources/views/reports/profit_loss/content/header.blade.php | 4 ++-- resources/views/reports/tax_summary/content/header.blade.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/components/reports/detail/table.blade.php b/resources/views/components/reports/detail/table.blade.php index 1f3667d07..474f5834d 100644 --- a/resources/views/components/reports/detail/table.blade.php +++ b/resources/views/components/reports/detail/table.blade.php @@ -1,5 +1,5 @@ -
-
 
+
+
@include($class->views['detail.table.header']) @include($class->views['detail.table.body']) @include($class->views['detail.table.footer']) diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 35d411525..f58f632fa 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index f436f2224..f3a2827a0 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -1,5 +1,5 @@ -
- +
+
diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index c52f75fad..34be3ec76 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -1,5 +1,5 @@ -
-
 
+
+
From 176e5207e398d5033c740982b46d3ef41f98b75f Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Wed, 2 Nov 2022 14:40:30 +0300 Subject: [PATCH 5/5] update center feedbacks --- public/css/app.css | 29 ++++++++++++++----- resources/assets/sass/app.css | 14 +++++---- .../views/install/updates/index.blade.php | 2 +- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index e61a1a105..04e610218 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -1533,26 +1533,41 @@ button, input, optgroup, select, textarea{ /* changelog modal styling for update center */ +.change-log-modal .badge{ + border-radius: 1.5rem; + --tw-bg-opacity: 1; + background-color: rgb(110 161 82 / var(--tw-bg-opacity)); + padding-left: 0.75rem; + padding-right: 0.75rem; + padding-top: 0.5rem; + padding-bottom: 0.5rem; + font-size: 0.75rem; + line-height: 1rem; + font-weight: 500; + --tw-text-opacity: 1; + color: rgb(255 255 255 / var(--tw-text-opacity)); +} + .change-log-modal h2{ - margin-bottom: 0.75rem; + margin-bottom: 0.5rem; font-size: 1.375rem; line-height: 1.5rem; font-weight: 700; --tw-text-opacity: 1; - color: rgb(66 66 66 / var(--tw-text-opacity)); + color: rgb(85 88 139 / var(--tw-text-opacity)); } .change-log-modal h3{ - margin-bottom: 0.75rem; + margin-bottom: 0.5rem; font-size: 1.125rem; line-height: 1.75rem; font-weight: 700; --tw-text-opacity: 1; - color: rgb(66 66 66 / var(--tw-text-opacity)); + color: rgb(85 88 139 / var(--tw-text-opacity)); } .change-log-modal ul{ - margin-bottom: 0.75rem; + margin-bottom: 0.5rem; list-style-position: inside; list-style-type: disc; } @@ -1561,12 +1576,12 @@ button, input, optgroup, select, textarea{ font-size: 1rem; line-height: 1.5rem; --tw-text-opacity: 1; - color: rgb(66 66 66 / var(--tw-text-opacity)); + color: rgb(85 88 139 / var(--tw-text-opacity)); } .change-log-modal a{ --tw-text-opacity: 1; - color: rgb(85 88 139 / var(--tw-text-opacity)); + color: rgb(110 161 82 / var(--tw-text-opacity)); -webkit-text-decoration-line: underline; text-decoration-line: underline; } diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css index 0f6a93bcb..f43a0c352 100644 --- a/resources/assets/sass/app.css +++ b/resources/assets/sass/app.css @@ -193,24 +193,28 @@ /* after the upgrade tailwind 3.2.1, this tags font-weight changed. Added this block for now */ /* changelog modal styling for update center */ + .change-log-modal .badge { + @apply px-3 py-2 rounded-3xl text-xs font-medium bg-green text-white; + } + .change-log-modal h2 { - @apply text-2xl font-bold text-black mb-3; + @apply text-2xl font-bold text-purple mb-2; } .change-log-modal h3 { - @apply text-lg font-bold text-black mb-3; + @apply text-lg font-bold text-purple mb-2; } .change-log-modal ul { - @apply list-disc list-inside mb-3; + @apply list-disc list-inside mb-2; } .change-log-modal li { - @apply text-base text-black; + @apply text-base text-purple; } .change-log-modal a { - @apply text-purple underline; + @apply text-green underline; } /* changelog modal styling for update center */ } diff --git a/resources/views/install/updates/index.blade.php b/resources/views/install/updates/index.blade.php index 75787305b..b40023263 100644 --- a/resources/views/install/updates/index.blade.php +++ b/resources/views/install/updates/index.blade.php @@ -30,7 +30,7 @@ - + {{ trans('updates.update', ['version' => $core]) }}