From ecc643435bc67212333eadec7c495d6a4c1b3a14 Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Mon, 28 Nov 2022 17:55:21 +0300
Subject: [PATCH] refactoring

---
 .../layouts/modules/show/toggle.blade.php          | 14 +++++++-------
 .../views/components/loading/module.blade.php      |  9 ---------
 resources/views/modules/item/show.blade.php        |  4 ++--
 3 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 resources/views/components/loading/module.blade.php

diff --git a/resources/views/components/layouts/modules/show/toggle.blade.php b/resources/views/components/layouts/modules/show/toggle.blade.php
index 9ce529edc..bb2e06b1d 100644
--- a/resources/views/components/layouts/modules/show/toggle.blade.php
+++ b/resources/views/components/layouts/modules/show/toggle.blade.php
@@ -1,27 +1,27 @@
 <x-form>
     <div>
         <div class="relative" x-model="price_type">
-            <div class="w-58 flex items-center bg-gray-200 p-1 rounded-lg">
+            <div class="w-58 flex items-center">
                 <button type="button"
                     x-on:click="price_type = 'monthly'"
-                    class="w-18 flex justify-center px-2"
-                    x-bind:class="price_type == 'monthly' ? 'bg-white rounded-lg' : 'btn-outline-primary'"
+                    class="w-18 flex justify-center text-base px-2 py-1 rounded-tl-lg rounded-bl-lg"
+                    x-bind:class="price_type == 'monthly' ? 'bg-black-700 text-white' : 'bg-gray-200 btn-outline-primary'"
                 >
                     {{ trans('general.monthly') }}
                 </button>
 
                 <button type="button"
                     x-on:click="price_type = 'yearly'"
-                    class="w-18 flex justify-center px-2"
-                    x-bind:class="price_type == 'yearly' ? 'bg-white rounded-lg' : 'btn-outline-primary'"
+                    class="w-18 flex justify-center text-base px-2 py-1 border-r border-l border-gray-300"
+                    x-bind:class="price_type == 'yearly' ? 'bg-black-700 text-white' : 'bg-gray-200 btn-outline-primary'"
                 >
                     {{ trans('general.yearly') }}
                 </button>
 
                 <button type="button"
                     x-on:click="price_type = 'lifetime'"
-                    class="w-18 flex justify-center px-2"
-                    x-bind:class="price_type == 'lifetime' ? 'bg-white rounded-lg' : 'btn-outline-primary'"
+                    class="w-18 flex justify-center text-base px-2 py-1 rounded-tr-lg rounded-br-lg "
+                    x-bind:class="price_type == 'lifetime' ? 'bg-black-700 text-white' : 'bg-gray-200 btn-outline-primary'"
                 >
                     {{ trans('general.lifetime') }}
                 </button>
diff --git a/resources/views/components/loading/module.blade.php b/resources/views/components/loading/module.blade.php
deleted file mode 100644
index f1b3d0adc..000000000
--- a/resources/views/components/loading/module.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div
-  x-data="{ }"
-  x-init="document.querySelector('[data-modal-handle]') ? document.querySelectorAll('[data-modal-handle]').forEach((item) => { item.classList.add('invisible') }) : null, setTimeout(() => $refs.loadingModuleContent.remove(), 1000), setTimeout(() => document.querySelector('[data-modal-handle]') ? document.querySelectorAll('[data-modal-handle]').forEach((item) => { item.classList.remove('invisible') }) : null , 1010)"
-  x-ref="loadingModuleContent"
-  class="absolute lg:flex items-center justify-center bg-body top-0 bottom-0 left-0 right-0"
-  style="width: 120%; z-index: 60;"
->
-  <img src="{{ asset('public/img/akaunting-loading.gif') }}" class="w-28 h-28" alt="Akaunting" />
-</div>
\ No newline at end of file
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index e5b9f2844..6a4dac4ab 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -14,6 +14,8 @@
     </x-slot>
 
     <x-slot name="content">
+        <x-loading.content />
+        
         <div class="flex flex-col space-y-16 py-4 cursor-default">
             <div class="flex flex-col lg:flex-row w-full lg:space-x-16 rtl:space-x-reverse space-y-0">
                 <div class="w-full lg:w-7/12 flex flex-col space-x-2 banner">
@@ -102,8 +104,6 @@
                         </div>
 
                         <div class="flex items-center space-x-4 justify-between">
-                            <x-loading.module />
-
                             <x-layouts.modules.show.price :module="$module" />
 
                             <div class="flex lg:justify-center">