From 758b3708eff655830cfbb83e34db7bd0b79b4b36 Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Tue, 16 Jul 2024 12:41:31 +0800
Subject: [PATCH] resolve conflicts

---
 resources/views/layouts/sidebar.blade.php | 118 ----------------------
 1 file changed, 118 deletions(-)

diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 5928a10..f2f6abd 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -115,22 +115,10 @@
                     <div class="flex items-center">
                         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75" />
-<<<<<<< HEAD
-<<<<<<< HEAD
-                          </svg>
-                        <span class="ml-2 text-lg">Poskod</span>
-=======
                         </svg>
                         <span class="text-sm ml-2 text-lg">Poskod</span>
->>>>>>> cb7a1c06 (Update codebase :)
-=======
-                        </svg>
-                        <span class="text-sm ml-2 text-lg">Poskod</span>
-=======
                           </svg>
                         <span class="ml-2 text-lg">Poskod</span>
->>>>>>> 4a083e10 (added akrubulananpecahan dan imbangduga range untuk tallykan)
->>>>>>> f976f8ed (added akrubulananpecahan dan imbangduga range untuk tallykan)
                     </div>
                 </li>
             </a>
@@ -212,25 +200,6 @@
             </a>
 
             {{-- <a href="{{ route('tetapan') }}"
-<<<<<<< HEAD
-                class="rounded mb-2 mr-2
-            {{ Route::is('tetapan') || Route::is('tetapan.*')  ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
-                <li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
-                    <div class="flex items-center">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round"
-                                d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                        </svg>
-                        <span class="ml-2 text-lg">Tetapan</span>
-                    </div>
-                </li>
-            </a> --}}
-
-            <a href="{{ route('tetapan.home') }}"
-=======
->>>>>>> cb7a1c06 (Update codebase :)
             class="rounded mb-2 mr-2
             {{ Route::is('tetapan') || Route::is('tetapan.*')  ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
             <li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
@@ -356,75 +325,6 @@
             </a> --}}
 
             @elseif(Auth::user()->roles == 'kpo')
-<<<<<<< HEAD
-                <a href="{{ route('home') }}"
-                    class="rounded mr-2 mb-2 {{ Route::is('home') || Route::is('home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
-                    <li
-                        class="flex w-full justify-between text-gray-500 hover:text-gray-500 cursor-pointer items-center">
-                        <div class="flex items-center">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-grid"
-                                width="18" height="18" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                                <path stroke="none" d="M0 0h24v24H0z"></path>
-                                <rect x="4" y="4" width="6" height="6" rx="1">
-                                </rect>
-                                <rect x="14" y="4" width="6" height="6" rx="1">
-                                </rect>
-                                <rect x="4" y="14" width="6" height="6" rx="1">
-                                </rect>
-                                <rect x="14" y="14" width="6" height="6" rx="1">
-                                </rect>
-                            </svg>
-                            <span class="ml-2 text-lg">Dashboard</span>
-                        </div>
-                    </li>
-                </a>
-
-
-                <a href="{{ route('akaun.home') }}"
-                    class="rounded mb-2 mr-2 {{ Route::is('akaun.home') || Route::is('akaun.home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
-                    <li
-                        class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
-                        <div class="flex items-center">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none"
-                                viewBox="0 0 24 24" stroke="currentColor">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                    d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
-                            </svg>
-                            <span class="ml-2 text-lg">Laporan</span>
-                        </div>
-                    </li>
-                </a>
-
-
-                @elseif(Auth::user()->roles == 'callcenter')
-                <a href="{{ route('home') }}"
-                    class="rounded mr-2 mb-2 {{ Route::is('home') || Route::is('home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
-                    <li
-                        class="flex w-full justify-between text-gray-500 hover:text-gray-500 cursor-pointer items-center">
-                        <div class="flex items-center">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-grid"
-                                width="18" height="18" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                                <path stroke="none" d="M0 0h24v24H0z"></path>
-                                <rect x="4" y="4" width="6" height="6" rx="1">
-                                </rect>
-                                <rect x="14" y="4" width="6" height="6" rx="1">
-                                </rect>
-                                <rect x="4" y="14" width="6" height="6" rx="1">
-                                </rect>
-                                <rect x="14" y="14" width="6" height="6" rx="1">
-                                </rect>
-                            </svg>
-                            <span class="ml-2 text-lg">Dashboard</span>
-                        </div>
-                    </li>
-                </a>
-
-
-                <a href="{{ route('pelanggan') }}"
-                class="rounded mb-2 mr-2 {{ Route::is('pelanggan') || Route::is('pelanggan.*')  ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
-=======
             <a href="{{ route('home') }}" class="rounded mr-2 mb-2 {{ Route::is('home') || Route::is('home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
                 <li class="flex w-full justify-between text-gray-500 hover:text-gray-500 cursor-pointer items-center">
                     <div class="flex items-center">
@@ -446,7 +346,6 @@
 
 
             <a href="{{ route('akaun.home') }}" class="rounded mb-2 mr-2 {{ Route::is('akaun.home') || Route::is('akaun.home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
->>>>>>> cb7a1c06 (Update codebase :)
                 <li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
                     <div class="flex items-center">
                         <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
@@ -492,22 +391,6 @@
             </a>
 
 
-<<<<<<< HEAD
-                <a href="{{ route('akaun.home') }}"
-                    class="rounded mb-2 mr-2 {{ Route::is('akaun.home') || Route::is('akaun.home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
-                    <li
-                        class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
-                        <div class="flex items-center">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none"
-                                viewBox="0 0 24 24" stroke="currentColor">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                    d="M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10" />
-                            </svg>
-                            <span class="ml-2 text-lg">Laporan</span>
-                        </div>
-                    </li>
-                </a>
-=======
             <a href="{{ route('akaun.home') }}" class="rounded mb-2 mr-2 {{ Route::is('akaun.home') || Route::is('akaun.home.*') ? 'bg-gray-200 rounded text-white-500' : 'hover:bg-yellow-300 ' }}">
                 <li class="flex w-full justify-between text-gray-600 hover:text-gray-500 cursor-pointer items-center ">
                     <div class="flex items-center">
@@ -518,7 +401,6 @@
                     </div>
                 </li>
             </a>
->>>>>>> cb7a1c06 (Update codebase :)
 
             @endif