chore: fix conflicts and broken code

thisdot · Aug 2, 2023 · 16619db · 16619db
1 parent 8bfb6b5
commit 16619db
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/nuxt-pinia-tailwind/components/RepositoryCard/RepositoryCard.vue b/nuxt-pinia-tailwind/components/RepositoryCard/RepositoryCard.vue
@@ -25,6 +25,7 @@
       :updated-at="meta.updatedAt"
       :fork-count="meta.forkCount"
       :stargazer-count="meta.stargazerCount"
+      :language-color="meta.languageColor"
     />
   </article>
 </template>
@@ -50,12 +51,12 @@ export default {
     meta: {
       type: Object as PropType<{
         language: string;
-        updatedAt: Date;
+        languageColor?: string;
+        updatedAt: Date | string;
         forkCount: number;
         stargazerCount: number;
       }>,
       required: true,
-      default: () => {},
     },
   },
 };

diff --git a/nuxt-pinia-tailwind/components/UserRepos/UserRepos.vue b/nuxt-pinia-tailwind/components/UserRepos/UserRepos.vue
@@ -1,15 +1,16 @@
 <template>
   <div class="w-full border rounded-lg relative bg-white">
-    <div class="flex items-center justify-between px-4 py-3">
-      <h3 class="font-semibold">Repositories</h3>
-    </div>
-
     <RepositoryCard
       v-for="repo in repos"
       :key="repo.id"
       :name="repo.name"
       :is-private="repo.private"
-      :description="repo.description"
+      :meta="{
+        language: repo.language,
+        updatedAt: repo.updated_at,
+        forkCount: repo.forks_count,
+        stargazerCount: repo.stargazers_count,
+      }"
     />
 
     <div class="flex items-center justify-center py-4">
@@ -36,6 +37,7 @@ export default defineComponent({
 
       return userStore.repos;
     });
+
     return {
       repos,
       username: $auth.$state.user.login,