From 0a0e8370a5bf48f61fcf75610466016e2f02316b Mon Sep 17 00:00:00 2001
From: jlpereira <pepelui@outlook.com>
Date: Thu, 15 Jun 2023 18:27:19 -0300
Subject: [PATCH] Add scroll css vars. Update sitemap

---
 src/assets/css/vars.css                       |  6 ++
 src/assets/css/webkit.css                     | 12 ++--
 src/components/VSpinner.global.vue            | 67 +++----------------
 .../components/Panel/PanelMap/CachedMap.vue   |  3 +-
 src/modules/otus/components/SiteMap.vue       | 38 ++++++++---
 5 files changed, 53 insertions(+), 73 deletions(-)

diff --git a/src/assets/css/vars.css b/src/assets/css/vars.css
index 387574a..37d06d0 100644
--- a/src/assets/css/vars.css
+++ b/src/assets/css/vars.css
@@ -22,6 +22,9 @@
   --color-map-asserted: 249, 115, 22;
   --color-map-type-material: 51, 136, 255;
   --color-map-collection-object: 239, 68, 68;
+
+  --color-scrollbar-thumb: 156, 163, 175;
+  --color-scrollbar-track: 229, 231, 235;
 }
 
 .dark {
@@ -42,4 +45,7 @@
   --color-base-lighter: 220, 220, 220;
   --color-base-border: 70, 70, 70;
   --color-base-content: 255, 255, 255;
+
+  --color-scrollbar-thumb: 156, 163, 175;
+  --color-scrollbar-track: 55, 65, 81;
 }
diff --git a/src/assets/css/webkit.css b/src/assets/css/webkit.css
index cd7c7a7..e68baa2 100644
--- a/src/assets/css/webkit.css
+++ b/src/assets/css/webkit.css
@@ -1,8 +1,8 @@
 ::-webkit-scrollbar {
   width: 6px;
   height: 6px;
-  -webkit-transition: background .3s;
-  transition: background .3s;
+  -webkit-transition: background 0.3s;
+  transition: background 0.3s;
 }
 
 ::-webkit-scrollbar-corner {
@@ -11,11 +11,9 @@
 
 ::-webkit-scrollbar-thumb {
   @apply rounded;
-  @apply bg-gray-300;
-  @apply dark:bg-slate-600;
+  background-color: rgb(var(--color-scrollbar-thumb));
 }
 
 ::-webkit-scrollbar-track {
-  @apply bg-gray-100;
-  @apply dark:bg-slate-700;
-}
\ No newline at end of file
+  background-color: rgb(var(--color-scrollbar-track));
+}
diff --git a/src/components/VSpinner.global.vue b/src/components/VSpinner.global.vue
index 97dff3f..43bc4f8 100644
--- a/src/components/VSpinner.global.vue
+++ b/src/components/VSpinner.global.vue
@@ -11,70 +11,25 @@
       <svg
         v-if="showSpinner"
         :style="logoSize"
-        version="1.1"
+        aria-hidden="true"
+        class="text-base-lighter animate-spin fill-primary-color"
+        viewBox="0 0 100 101"
+        fill="none"
         xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        x="0px"
-        y="0px"
-        viewBox="0 0 194.6 200"
-        style="enable-background: new 0 0 194.6 200"
-        xml:space="preserve"
       >
         <path
-          id="LeftTop"
-          d="M14.2,63.1C24.3,63.1,28,76.3,28,76.3s5,15.5,15.3,15.5c7.7,0,9.4-6.3,9.8-9.1c0-0.1,0-0.2,0-0.4s0-0.5,0.1-0.8
-            c0-0.1,0-0.1,0-0.2c0.3-2-0.8-4-2.7-4.8l0,0c-3.1-1.1-5.9-3-8-5.6c-6.4-7.4-3-17,4.5-23.6c-3.5-4-8-8.7-12-10.8
-            c-8.7-4.6-15.7,2.6-16.2,3.2L18.7,40c-0.6,0.8-1.2,1.6-1.8,2.5l-0.1,0.1c-0.6,0.9-1.2,1.8-1.8,2.7L15,45.4c-0.5,0.8-1,1.6-1.5,2.4
-            l-0.3,0.5c-1,1.8-2,3.6-3,5.5L10,54.3c-0.4,0.9-0.9,1.8-1.3,2.7l-0.1,0.1C8.2,58,7.8,59,7.4,59.9l-0.2,0.5c-0.3,0.8-0.6,1.5-0.9,2.3
-            l-0.2,0.6c-0.4,1-0.7,1.9-1,2.9L5,66.7c-0.1,0.3-0.2,0.5-0.2,0.8C7.1,64.7,10.5,63.1,14.2,63.1z"
+          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="currentColor"
         />
         <path
-          id="Head"
-          d="M36.2,33c5.3,1.8,11.4,6.8,15.7,11c0.5-0.3,1.1-0.6,1.6-0.9c2.3-1.2,4.7-2.1,7.2-2.7
-            c-2.4-4.9-5.6-12.8-4.9-18.3c1.4-11.2,13.6-12,13.6-12S58.3,12.5,59,22.9c0.3,5,4.7,12.5,7.5,16.8c7-0.1,13,2.7,15.8,8
-            c0.3,0.5,0.5,1.1,0.7,1.6l0,0c0.5,1,1.3,1.9,2.3,2.4c3.6,1.2,7.6,2.5,11.7,4.2c5.8,2.3,11.5,5,17,8.1c0.5,0.2,1,0,1.2-0.5
-            c0.1-0.3,0.1-0.7-0.2-0.9c-27.2-26.1-8-36.3-8-36.3c-9.8,14.2,6.6,24.5,25.5,35.1c16.6,9.3,28.4,19.5,41.3,12.7
-            c6.4-3.4,1.9-11-1-15.2c-2.2-2.9-4-6-5.6-9.2c-1-2.1-1.3-4.4-0.8-6.6c0.7-3.1-0.4-6.8-2.8-10.5c-1.8-2.8-5.1-5.7-7.6-7.6
-            c-1.6-1.3-3.1-2.7-4.3-4.4c-9-12.6-32.2-17.9-32.2-17.9l0,0C97.5-2.6,74.3,0.1,54,10.2l0,0c-6.9,3.5-13.5,7.7-19.4,12.7l-0.8,0.6
-            c-1.4,1.2-2.8,2.5-4.2,3.8l0,0c-0.8,0.8-1.6,1.5-2.3,2.3l0,0c-1.5,1.6-3,3.2-4.4,4.9l-0.2,0.2l-0.4,0.5C25.2,32.8,29.6,30.9,36.2,33
-            z M145.8,33.9c3.9-1.7,8.5,0.1,10.2,4c0.6,1.3,0.8,2.7,0.6,4c-2.5,1.2-5.5,0.9-7.7-0.9C146.5,39.5,145.3,36.7,145.8,33.9L145.8,33.9
-            z"
-        />
-        <path
-          id="LeftMid"
-          d="M53.2,106.9c-0.2-2-0.4-4-0.4-6.3c-2.3,1-4.7,1.5-7.2,1.5c-19,0-19.5-18.8-26.2-29.2
-            c-7-10.8-16.8,0.9-17.8,7.2c0,0.3-0.1,0.5-0.1,0.7c-0.1,0.6-0.2,1.3-0.3,1.9C1,83.1,1,83.4,1,83.6c-0.1,0.8-0.2,1.6-0.3,2.3
-            c0,0.3-0.1,0.5-0.1,0.8c-0.1,1-0.2,2.1-0.3,3.1c0,0.1,0,0.2,0,0.3c-0.1,0.9-0.2,1.9-0.2,2.8c0,0.3,0,0.6,0,0.9C0,94.9,0,95.8,0,96.7
-            c0,0.1,0,0.2,0,0.3s0,0.1,0,0.1s0,0.1,0,0.1c0,0.4,0,0.8,0,1.2s0,0.8,0,1.2c0,0.6,0,1.2,0.1,1.7c0,0.2,0,0.5,0,0.7
-            c1.5,30.7,17.5,58.9,43,76c-8-7.8-12.7-17.8-12.7-28.6c0-13.4,7.3-26,19.1-34.4C52,113.2,53.5,110.1,53.2,106.9z"
-        />
-        <path
-          id="LeftBottom"
-          d="M128.3,170c-5.8,2.4-12,3.9-18.3,4.4c-1.1,0.1-2.2,0.1-3.3,0.1c-12.3,0-28.4-4.8-40.7-25.3
-            l-1.6-2.7c-1.9,2.7-2.9,6-2.9,9.3c0,13.9,16.6,26.5,36.7,26.5c5.4,0.1,10.7-0.6,15.9-2c-4.6,2.9-13.8,5.6-21.9,5.6
-            C69.2,186,50,170.8,50,152.7c0.1-6.3,2.1-12.5,5.8-17.6c1.5-2.1,1.9-4.8,1.1-7.2l0,0c-10.5,6.1-17,15.4-17,26.6
-            c0,17.2,15.3,31.9,37,37.9c1.2,0.3,2.5,0.5,3.7,0.7c15.6,2.6,29.5-0.1,38.9-9.1C123.5,180.1,126.5,175.3,128.3,170z"
-        />
-        <path
-          id="Tail"
-          class="st0"
-          d="M171,33.8c28,39.3,18.8,93.8-20.5,121.8c-2.4,1.7-4.9,3.3-7.5,4.8l-0.2,0.2c0-0.4,0-0.9,0.1-1.3
-            c0.6-3.9,2.1-7.6,4.4-10.8c7.5-10.7,12.4-27-0.3-48.1c-7-11.6-21.7-28-51.7-40.1c-4.1-1.7-8.1-3.1-11.8-4.2L82,55.6l-0.2-0.1
-            c-1.1-0.3-2.1-0.6-3.1-0.9h-0.2l-2.9-0.8h-0.1l-1.3-0.3h-0.1l-2.6-0.6h-0.1l-2.3-0.5h-0.2l-1-0.2l0,0L67,51.7h-0.2l-0.7-0.2h-0.2
-            l-0.8-0.2H65l-0.6-0.1h-0.2L63.7,51l-0.1,0.4v0.1l-0.1,0.3l0,0.2l-0.1,0.3l-0.1,0.2l-0.1,0.3l-0.1,0.2L63,53.5L63,53.7l-0.1,0.4
-            l-0.1,0.2l-0.1,0.5l-0.1,0.3l-0.1,0.6L62.3,56l-0.1,0.5l-0.1,0.3L62,57.2l-0.1,0.4L61.8,58l-0.1,0.4l-0.1,0.5l-0.1,0.4l-0.1,0.5
-            l-0.1,0.4l-0.1,0.6l-0.1,0.5L61,61.9l-0.1,0.4l-0.1,0.5l-0.1,0.5l-0.1,0.5l-0.1,0.5l-0.1,0.5l-0.1,0.5l-0.1,0.5l-0.1,0.5L60,66.9
-            l-0.1,0.5l-0.1,0.7l-0.1,0.5l-0.2,1l-0.1,0.5l-0.1,0.6l-0.1,0.5l-0.1,0.6l-0.1,0.6L59,73.1l-0.1,0.6l-0.1,0.6l-0.1,0.6l-0.1,0.7
-            l-0.1,0.6l-0.1,0.8l-0.1,0.5c-0.2,1.8-0.4,3.6-0.6,5.5V83c0,0.6-0.1,1.1-0.1,1.7l0,0c0,0.6-0.1,1.1-0.1,1.7v0.1
-            c0,0.6-0.1,1.1-0.1,1.7l0,0c-0.2,3-0.2,6.2-0.2,9.5c0.1,4.3,0.4,8.5,0.8,12.7c0,0.3,0.1,0.7,0.1,1.1c0.7,5.8,1.9,11.4,3.6,17
-            c1.5,4.5,3.2,8.9,5.2,13.2c0.9,1.7,1.8,3.4,2.8,5.1c9.2,15.3,21.5,23,36.6,23c1,0,2.1,0,3.2-0.1c7-0.6,13.9-2.5,20.2-5.6
-            c4.9-24.5-8.4-59.3-36.1-88.3C90,71.8,86,68,81.7,64.4c9.2,6.9,13.9,10.7,19.2,16.3c37.8,39.6,49.7,89.7,26.5,111.9
-            c-3.4,3.3-7.5,5.8-11.9,7.5c5.8-1.6,11.1-4.5,15.4-8.6c1.4-1.3,2.6-2.7,3.8-4.2c49.6-20.7,73-77.7,52.4-127.3
-            C183.1,50.4,177.7,41.6,171,33.8z"
+          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentFill"
         />
       </svg>
+      <span class="sr-only">Loading...</span>
+
       <div
-        class="text-gray-900 dark:text-slate-400"
+        class="text-base-content"
         :style="legendStyle"
       >
         <span
diff --git a/src/modules/otus/components/Panel/PanelMap/CachedMap.vue b/src/modules/otus/components/Panel/PanelMap/CachedMap.vue
index 09fadbe..582fcf6 100644
--- a/src/modules/otus/components/Panel/PanelMap/CachedMap.vue
+++ b/src/modules/otus/components/Panel/PanelMap/CachedMap.vue
@@ -2,16 +2,15 @@
   <VButton
     class="left-2 bottom-2 !px-2 py-2 rounded-full absolute z-[1500]"
     primary
+    @click="isModalVisible = true"
   >
     <IconCheck
       v-if="cachedMap.synced"
       class="w-4 h-4"
-      @click="isModalVisible = true"
     />
     <IconWarning
       v-else
       class="w-4 h-4"
-      @click="isModalVisible = true"
     />
   </VButton>
   <VModal
diff --git a/src/modules/otus/components/SiteMap.vue b/src/modules/otus/components/SiteMap.vue
index ec57c16..94515b2 100644
--- a/src/modules/otus/components/SiteMap.vue
+++ b/src/modules/otus/components/SiteMap.vue
@@ -13,20 +13,42 @@
       @close="isModalVisible = false"
     >
       <template #header>
-        <h3>Sitemap requests</h3>
+        <h3 class="font-medium">Sitemap</h3>
       </template>
-      <ul class="p-4 text-sm whitespace-pre">
-        <li v-for="(item, key) in store.sitemap">
-          <span class="capitalize">{{ key }}</span
-          >: <a :href="item">{{ item }}</a>
-        </li>
-      </ul>
+      <div class="p-4 pt-0">
+        <p class="text-sm mb-2">
+          The following links provide the information present on this page in
+          JSON format.
+        </p>
+
+        <VTable>
+          <VTableHeader>
+            <VTableHeaderRow>
+              <VTableHeaderCell> Request Key </VTableHeaderCell>
+              <VTableHeaderCell> URL </VTableHeaderCell>
+            </VTableHeaderRow>
+          </VTableHeader>
+          <VTableBody>
+            <VTableBodyRow
+              v-for="(item, key) in store.sitemap"
+              :key="key"
+            >
+              <VTableBodyCell class="capitalize">{{
+                key.replaceAll(':', ' ')
+              }}</VTableBodyCell>
+              <VTableBodyCell
+                ><a :href="item">{{ item }}</a></VTableBodyCell
+              >
+            </VTableBodyRow>
+          </VTableBody>
+        </VTable>
+      </div>
     </VModal>
   </div>
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { useOtuPageRequestStore } from '../store/request'
 
 const isModalVisible = ref(false)