From 1c50437a1672a663a65a1120db0c6d1f88a018d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 28 Jun 2022 10:36:26 +0300 Subject: [PATCH] app show page button typo --- app/View/Components/Link.php | 2 +- public/akaunting-js/generalAction.js | 1 + public/css/app.css | 2 +- .../layouts/modules/show/buttons.blade.php | 82 ++++++++++++------- .../{link.blade.php => link/index.blade.php} | 1 - .../views/components/link/loading.blade.php | 2 +- 6 files changed, 57 insertions(+), 33 deletions(-) rename resources/views/components/{link.blade.php => link/index.blade.php} (98%) diff --git a/app/View/Components/Link.php b/app/View/Components/Link.php index 58ef80de2..d89551adf 100644 --- a/app/View/Components/Link.php +++ b/app/View/Components/Link.php @@ -34,7 +34,7 @@ class Link extends Component */ public function render() { - return view('components.link'); + return view('components.link.index'); } protected function getOverride($override) diff --git a/public/akaunting-js/generalAction.js b/public/akaunting-js/generalAction.js index 3b5dc3b2c..3d206eadd 100644 --- a/public/akaunting-js/generalAction.js +++ b/public/akaunting-js/generalAction.js @@ -298,6 +298,7 @@ document.querySelectorAll('[data-link-loading]').forEach((href) => { target_link_html.addEventListener('click', function () { this.classList.add('disabled-link'); + this.querySelector('[data-link-spin]').classList.remove('hidden'); this.querySelector('[data-link-text]').classList.add('opacity-0'); this.querySelector('[data-link-text]').classList.remove('opacity-1'); diff --git a/public/css/app.css b/public/css/app.css index 5fa6b504e..38f359f57 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -35773,7 +35773,7 @@ html[dir='rtl'] .el-input__suffix { text-overflow: unset; } -.disabled-link{ +.disabled-link { pointer-events: none; cursor: default; opacity: 0.5; diff --git a/resources/views/components/layouts/modules/show/buttons.blade.php b/resources/views/components/layouts/modules/show/buttons.blade.php index c8c5ac5a5..4093c0286 100644 --- a/resources/views/components/layouts/modules/show/buttons.blade.php +++ b/resources/views/components/layouts/modules/show/buttons.blade.php @@ -1,34 +1,49 @@ @props(['module', 'installed', 'enable']) @if (! empty($module->plan)) - - - {{ trans('modules.get_premium_cloud') }} - - + + {{ trans('modules.get_premium_cloud') }} + @elseif (in_array('onprime', $module->where_to_use)) @if ($installed) @can('delete-modules-item') - - + + {{ trans('modules.button.uninstall') }} - + @endcan @can('update-modules-item') @if ($enable) - - + + {{ trans('modules.button.disable') }} - + @else - - + + {{ trans('modules.button.enable') }} - + @endif @endcan @else @@ -53,26 +68,35 @@ @endif @else - - - {{ trans('modules.use_app') }} - - + + {{ trans('modules.use_app') }} + @endif @endcan @endif @else @if ($module->install) - - - {{ trans('modules.install_cloud') }} - - + + {{ trans('modules.install_cloud') }} + @else - - - {{ trans('modules.get_cloud') }} - - + + {{ trans('modules.get_cloud') }} + @endif @endif diff --git a/resources/views/components/link.blade.php b/resources/views/components/link/index.blade.php similarity index 98% rename from resources/views/components/link.blade.php rename to resources/views/components/link/index.blade.php index e1d319005..ea05a9a5e 100644 --- a/resources/views/components/link.blade.php +++ b/resources/views/components/link/index.blade.php @@ -1,4 +1,3 @@ - {{ $slot }} diff --git a/resources/views/components/link/loading.blade.php b/resources/views/components/link/loading.blade.php index 06b698485..96e28a845 100644 --- a/resources/views/components/link/loading.blade.php +++ b/resources/views/components/link/loading.blade.php @@ -8,4 +8,4 @@ {!! $slot !!} - \ No newline at end of file +