From 774ccf75fbad15eb1c6e5c41a84cd2e923b66a66 Mon Sep 17 00:00:00 2001
From: Arthur DANJOU <arthurdanjou@outlook.fr>
Date: Mon, 4 Sep 2023 00:03:30 +0200
Subject: [PATCH] Improve talents and lint code

---
 src/composables/useTalents.ts      |  2 +
 src/pages/talents.vue              | 66 +++++++++++++++++-------------
 src/pages/writing/[slug].vue       |  9 ++--
 src/server/trpc/routers/talents.ts |  8 ++--
 src/store/talents.ts               |  4 +-
 5 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/composables/useTalents.ts b/src/composables/useTalents.ts
index ad5406f..28ebb78 100644
--- a/src/composables/useTalents.ts
+++ b/src/composables/useTalents.ts
@@ -7,6 +7,7 @@ export async function useTalents() {
   const {
     data: talents,
     refresh: refreshTalents,
+    pending,
   } = await useAsyncData('talents:talents', async () => await $trpc.talents.getTalents.query({ favorite: isFavorite.value, category: getCategory.value }))
 
   async function switchCategory(category: string) {
@@ -29,5 +30,6 @@ export async function useTalents() {
     isFavorite,
     switchCategory,
     toggleFavorite,
+    pending,
   }
 }
diff --git a/src/pages/talents.vue b/src/pages/talents.vue
index dca3725..2c0116a 100644
--- a/src/pages/talents.vue
+++ b/src/pages/talents.vue
@@ -3,8 +3,8 @@ useHead({
   title: 'Discover new talents • Arthur Danjou',
 })
 
-const categories = ref<Array<{ label: string, slug: string }>>([{ label: 'All', slug: 'all' }])
-const { getCategories, talents, isFavorite, toggleFavorite, switchCategory } = await useTalents()
+const categories = ref<Array<{ label: string; slug: string }>>([{ label: 'All', slug: 'all' }])
+const { getCategories, talents, isFavorite, toggleFavorite, switchCategory, pending } = await useTalents()
 
 getCategories.value?.forEach(category => categories.value.push({ label: category.name, slug: category.slug }))
 
@@ -45,7 +45,9 @@ function getColor() {
         <UTabs :items="categories">
           <template #default="{ item }">
             <div class="flex items-center gap-2 relative w-full" @click="switchCategory(item.slug)">
-              <div class="w-full">{{ item.label }}</div >
+              <div class="w-full">
+                {{ item.label }}
+              </div>
             </div>
           </template>
         </UTabs>
@@ -69,8 +71,8 @@ function getColor() {
         </template>
       </UPopover>
     </div>
-    <div v-if="talents && getCategories" class="mt-16 md:mt-20">
-      <div v-if="talents.length > 0" class="grid grid-cols-1 gap-x-12 gap-y-16 sm:grid-cols-2 lg:grid-cols-3">
+    <div v-if="talents && getCategories" class="mt-8 md:mt-16">
+      <div v-if="talents.length > 0 && !pending" class="grid grid-cols-1 gap-x-12 gap-y-16 sm:grid-cols-2 lg:grid-cols-3">
         <div
           v-for="talent in talents"
           :key="talent.name.toLowerCase().trim()"
@@ -79,24 +81,24 @@ function getColor() {
           <div class="flex ">
             <div class="flex gap-6 items-center">
               <img :src="talent.logo" class="z-20 h-12 w-12 rounded-md">
-            <div>
-              <h2 class="text-base font-semibold text-zinc-800 dark:text-zinc-100">
-                <div class="absolute -inset-y-6 -inset-x-4 z-0 scale-95 bg-zinc-50 opacity-0 transition group-hover:scale-100 group-hover:opacity-100 dark:bg-zinc-800/50 sm:-inset-x-6 sm:rounded-2xl" />
-                <NuxtLink :to="talent.website" target="_blank">
-                  <span class="absolute -inset-y-6 -inset-x-4 z-20 sm:-inset-x-6 sm:rounded-2xl" />
-                  <div class="flex gap-2 items-center">
-                    <h1 class="relative z-10">
-                      {{ talent.name }}
-                    </h1>
-                    <UTooltip v-if="talent.favorite" text="You can set the filter to only show favorites.">
-                      <UIcon name="i-ic-round-star" class="z-20 text-amber-500 text-xl font-bold" />
-                    </UTooltip>
-                  </div>
-                </NuxtLink>
-              </h2>
-              <p class="relative z-10 my-2 text-sm text-zinc-600 dark:text-zinc-400">
-                {{ talent.work }}
-              </p>
+              <div>
+                <h2 class="text-base font-semibold text-zinc-800 dark:text-zinc-100">
+                  <div class="absolute -inset-y-6 -inset-x-4 z-0 scale-95 bg-zinc-50 opacity-0 transition group-hover:scale-100 group-hover:opacity-100 dark:bg-zinc-800/50 sm:-inset-x-6 sm:rounded-2xl" />
+                  <NuxtLink :to="talent.website" target="_blank">
+                    <span class="absolute -inset-y-6 -inset-x-4 z-20 sm:-inset-x-6 sm:rounded-2xl" />
+                    <div class="flex gap-2 items-center">
+                      <h1 class="relative z-10">
+                        {{ talent.name }}
+                      </h1>
+                      <UTooltip v-if="talent.favorite" text="You can set the filter to only show favorites.">
+                        <UIcon name="i-ic-round-star" class="z-20 text-amber-500 text-xl font-bold" />
+                      </UTooltip>
+                    </div>
+                  </NuxtLink>
+                </h2>
+                <p class="relative z-10 my-2 text-sm text-zinc-600 dark:text-zinc-400">
+                  {{ talent.work }}
+                </p>
               </div>
             </div>
           </div>
@@ -113,12 +115,18 @@ function getColor() {
           </p>
         </div>
       </div>
-      <p v-else-if="talents?.length === 0" class="my-8 text-subtitle">
-        There are no talents for this category. Maybe soon...
-      </p>
-      <p v-else class="my-8 text-subtitle">
-        The talents are loading...
-      </p>
+      <div v-else-if="talents?.length === 0 && !pending" class="my-4 text-subtitle">
+        <div class="flex gap-2 items-center">
+          <UIcon name="i-akar-icons-cross" />
+          <p>There are no talents for this category. Maybe soon...</p>
+        </div>
+      </div>
+      <div v-else class="my-4 text-subtitle">
+        <div class="flex gap-2 items-center">
+          <UIcon name="i-eos-icons-loading" />
+          <p>The talents are loading...</p>
+        </div>
+      </div>
     </div>
   </section>
 </template>
diff --git a/src/pages/writing/[slug].vue b/src/pages/writing/[slug].vue
index 3f459d8..7a21de2 100644
--- a/src/pages/writing/[slug].vue
+++ b/src/pages/writing/[slug].vue
@@ -89,9 +89,12 @@ async function handleLike() {
                 :value="postContent"
               />
               <template #fallback>
-                <p class="my-16 text-subtitle">
-                  The content of the page is loading...
-                </p>
+                <div class="my-16 text-subtitle">
+                  <div class="flex gap-2 items-center">
+                    <UIcon name="i-eos-icons-loading" />
+                    <p>The talents are loading...</p>
+                  </div>
+                </div>
               </template>
             </ClientOnly>
             <footer class="my-8 space-y-8">
diff --git a/src/server/trpc/routers/talents.ts b/src/server/trpc/routers/talents.ts
index ea4664c..577f508 100644
--- a/src/server/trpc/routers/talents.ts
+++ b/src/server/trpc/routers/talents.ts
@@ -19,7 +19,7 @@ export default router({
                 include: {
                   talent: true,
                   category: true,
-                }
+                },
               },
             },
             where: {
@@ -36,7 +36,7 @@ export default router({
                 include: {
                   talent: true,
                   category: true,
-                }
+                },
               },
             },
             where: {
@@ -56,7 +56,7 @@ export default router({
                 include: {
                   talent: true,
                   category: true,
-                }
+                },
               },
             },
             where: {
@@ -72,7 +72,7 @@ export default router({
                 include: {
                   talent: true,
                   category: true,
-                }
+                },
               },
             },
             where: {
diff --git a/src/store/talents.ts b/src/store/talents.ts
index 924f923..2b6f392 100644
--- a/src/store/talents.ts
+++ b/src/store/talents.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 
 export const useTalentsStore = defineStore(
-  'talents', 
+  'talents',
   () => {
     const currentCategory = ref<string>('all')
     const currentFavorite = ref<boolean>(false)
@@ -26,5 +26,5 @@ export const useTalentsStore = defineStore(
   },
   {
     persist: true,
-  }
+  },
 )