From e424df11397e28910bd92a3ffd754b086e4e1a67 Mon Sep 17 00:00:00 2001
From: 0xdevant <0xdevant@gmail.com>
Date: Mon, 22 Jul 2024 14:37:20 +0800
Subject: [PATCH 1/3] feat: enable scoring model on Project by certain data
 points

---
 components/Project/ProjectHeading.vue | 79 +++++++++++++++++++++++----
 1 file changed, 69 insertions(+), 10 deletions(-)

diff --git a/components/Project/ProjectHeading.vue b/components/Project/ProjectHeading.vue
index 1098ea8..1e438d0 100644
--- a/components/Project/ProjectHeading.vue
+++ b/components/Project/ProjectHeading.vue
@@ -13,16 +13,76 @@ const availableSupport = computed(() => {
   return 0
 })
 
+
+/**
+ * From data points
+  - product readiness
+  - docs (yes/no)
+  - github (yes/no)
+  - team: anon / public
+  - audit: yes / no
+ */
+const calculateScore = computed(() => {
+  const criterias: { value: string, key?: string }[] = [
+    { value: 'product_readiness' },
+    { value: "github", key: 'links' },
+    { value: "docs", key: 'links' },
+    { value: 'team' },
+    { value: 'audits' }
+  ];
+
+  let matched = 0;
+  for (let i = 0; i < criterias.length; i++) {
+    let value;
+    if (criterias[i].key) {
+      if(props.project[criterias[i].key] === null || props.project[criterias[i].key] === undefined) continue;
+      value = props.project[criterias[i].key][criterias[i].value];
+      // console.log(props.project[criterias[i].key] == null);
+    } else {
+      value = props.project[criterias[i].value];
+    }
+    // console.log(value);
+
+    if (fulfilled(value)) {
+      matched++;
+      // console.log('matched', matched);
+    }
+  }
+
+  return 100 / criterias.length * matched;
+})
+
+function fulfilled(value: any): boolean {
+  const type = typeof value;
+  switch (type) {
+    case 'string':
+      if (value !== '') return true;
+      break;
+    case 'array':
+      if (value.length > 0) return true;
+      break;
+    case 'object':
+      if (Object.keys(value).length > 0) return true;
+      break;
+
+    default:
+      return false;
+      break;
+  }
+}
+
 const logo = props.project?.logos?.at(0)?.url
 </script>
 
 <template>
   <div lg:flex lg:gap-32px>
-    <NuxtImg lg:max-w-320px lg:max-h-320px shrink :src="logo ?? '/no-image-1-1.svg'" class="bg-app-bg-grey object-cover max-w-full h-full vertical-align[middle] block border-0 w-full h-[300px]" />
+    <NuxtImg lg:max-w-320px lg:max-h-320px shrink :src="logo ?? '/no-image-1-1.svg'"
+      class="bg-app-bg-grey object-cover max-w-full h-full vertical-align[middle] block border-0 w-full h-[300px]" />
     <div grow>
       <div flex flex-col justify-between gap-32px lg:flex-row lg:items-center>
         <div mt-24px>
-          <NuxtLink :to="project.links?.web" target="_blank" flex items-center gap-12px hover:underline underline-offset-3>
+          <NuxtLink :to="project.links?.web" target="_blank" flex items-center gap-12px hover:underline
+            underline-offset-3>
             <h1 text="24px sm:32px app-white" leading-32px font-700>
               {{ project.name }}
             </h1>
@@ -32,12 +92,9 @@ const logo = props.project?.logos?.at(0)?.url
             {{ project.project_type ?? '---' }}
           </h2>
         </div>
-        <div
-          border-2px
-          class="border-app-black bg-app-white text-app-black"
-          flex items-center justify-center px-32px py-16px text-32px font-700 leading-40px cursor-pointer
-        >
-          {{ '63%' }}
+        <div border-2px class="border-app-black bg-app-white text-app-black" flex items-center justify-center px-32px
+          py-16px text-32px font-700 leading-40px cursor-pointer>
+          {{ calculateScore }}
         </div>
       </div>
       <div grid grid-cols-2 gap-16px my-32px lg:grid-cols-4>
@@ -47,7 +104,8 @@ const logo = props.project?.logos?.at(0)?.url
           </template>
           {{ project.links?.github ? 'YES' : 'NO' }}
         </ProjectInfoItem>
-        <ProjectInfoItem :check-undefined="project.project_status?.version" title="Product readyness" bold text-size="18px">
+        <ProjectInfoItem :check-undefined="project.project_status?.version" title="Product readyness" bold
+          text-size="18px">
           <template #prefix>
             <UnoIcon i-web-cube />
           </template>
@@ -79,7 +137,8 @@ const logo = props.project?.logos?.at(0)?.url
         </ProjectInfoItem>
       </div>
       <div grid grid-cols-2 gap-16px my-32px lg:grid-cols-4>
-        <ProjectInfoItem :check-undefined="project.blockchain_features?.network" tooltip-link="/" title="Ecosystem" bold>
+        <ProjectInfoItem :check-undefined="project.blockchain_features?.network" tooltip-link="/" title="Ecosystem"
+          bold>
           {{ project.blockchain_features?.network }}
         </ProjectInfoItem>
         <ProjectInfoItem invisible title="Last update" bold>

From 950b4164a06599d47f12df92299cfb3bed87fb5a Mon Sep 17 00:00:00 2001
From: 0xdevant <0xdevant@gmail.com>
Date: Mon, 22 Jul 2024 15:36:53 +0800
Subject: [PATCH 2/3] fix: account for null values

---
 components/Project/ProjectHeading.vue | 86 +++++++++++++++------------
 1 file changed, 48 insertions(+), 38 deletions(-)

diff --git a/components/Project/ProjectHeading.vue b/components/Project/ProjectHeading.vue
index 1e438d0..537fd74 100644
--- a/components/Project/ProjectHeading.vue
+++ b/components/Project/ProjectHeading.vue
@@ -13,7 +13,6 @@ const availableSupport = computed(() => {
   return 0
 })
 
-
 /**
  * From data points
   - product readiness
@@ -22,52 +21,53 @@ const availableSupport = computed(() => {
   - team: anon / public
   - audit: yes / no
  */
-const calculateScore = computed(() => {
-  const criterias: { value: string, key?: string }[] = [
+const calculateScore: number = computed(() => {
+  const criterias: { value: string; key?: string }[] = [
     { value: 'product_readiness' },
-    { value: "github", key: 'links' },
-    { value: "docs", key: 'links' },
+    { value: 'github', key: 'links' },
+    { value: 'docs', key: 'links' },
     { value: 'team' },
-    { value: 'audits' }
-  ];
+    { value: 'audits' },
+  ]
 
-  let matched = 0;
+  let matched = 0
   for (let i = 0; i < criterias.length; i++) {
-    let value;
+    let value
     if (criterias[i].key) {
-      if(props.project[criterias[i].key] === null || props.project[criterias[i].key] === undefined) continue;
-      value = props.project[criterias[i].key][criterias[i].value];
-      // console.log(props.project[criterias[i].key] == null);
-    } else {
-      value = props.project[criterias[i].value];
+      if (props.project[criterias[i].key] === null || props.project[criterias[i].key] === undefined)
+        continue
+      value = props.project[criterias[i].key][criterias[i].value]
+    }
+    else {
+      if (props.project[criterias[i].value] === null || props.project[criterias[i].value] === undefined)
+        continue
+      value = props.project[criterias[i].value]
     }
     // console.log(value);
+    // console.log(Object.keys(props.project["team"]).length);
 
-    if (fulfilled(value)) {
-      matched++;
+    if (fulfilled(value))
+      matched++
       // console.log('matched', matched);
-    }
   }
 
-  return 100 / criterias.length * matched;
+  return 100 / criterias.length * matched
 })
 
 function fulfilled(value: any): boolean {
-  const type = typeof value;
+  const type = typeof value
   switch (type) {
     case 'string':
-      if (value !== '') return true;
-      break;
-    case 'array':
-      if (value.length > 0) return true;
-      break;
+      if (value !== '')
+        return true
+      break
     case 'object':
-      if (Object.keys(value).length > 0) return true;
-      break;
+      if (Object.keys(value).length > 0)
+        return true
+      break
 
     default:
-      return false;
-      break;
+      return false
   }
 }
 
@@ -76,13 +76,17 @@ const logo = props.project?.logos?.at(0)?.url
 
 <template>
   <div lg:flex lg:gap-32px>
-    <NuxtImg lg:max-w-320px lg:max-h-320px shrink :src="logo ?? '/no-image-1-1.svg'"
-      class="bg-app-bg-grey object-cover max-w-full h-full vertical-align[middle] block border-0 w-full h-[300px]" />
+    <NuxtImg
+      lg:max-w-320px lg:max-h-320px shrink :src="logo ?? '/no-image-1-1.svg'"
+      class="bg-app-bg-grey object-cover max-w-full h-full vertical-align[middle] block border-0 w-full h-[300px]"
+    />
     <div grow>
       <div flex flex-col justify-between gap-32px lg:flex-row lg:items-center>
         <div mt-24px>
-          <NuxtLink :to="project.links?.web" target="_blank" flex items-center gap-12px hover:underline
-            underline-offset-3>
+          <NuxtLink
+            :to="project.links?.web" target="_blank" flex items-center gap-12px hover:underline
+            underline-offset-3
+          >
             <h1 text="24px sm:32px app-white" leading-32px font-700>
               {{ project.name }}
             </h1>
@@ -92,8 +96,10 @@ const logo = props.project?.logos?.at(0)?.url
             {{ project.project_type ?? '---' }}
           </h2>
         </div>
-        <div border-2px class="border-app-black bg-app-white text-app-black" flex items-center justify-center px-32px
-          py-16px text-32px font-700 leading-40px cursor-pointer>
+        <div
+          border-2px class="border-app-black bg-app-white text-app-black" flex items-center justify-center px-32px
+          py-16px text-32px font-700 leading-40px cursor-pointer
+        >
           {{ calculateScore }}
         </div>
       </div>
@@ -104,8 +110,10 @@ const logo = props.project?.logos?.at(0)?.url
           </template>
           {{ project.links?.github ? 'YES' : 'NO' }}
         </ProjectInfoItem>
-        <ProjectInfoItem :check-undefined="project.project_status?.version" title="Product readyness" bold
-          text-size="18px">
+        <ProjectInfoItem
+          :check-undefined="project.project_status?.version" title="Product readyness" bold
+          text-size="18px"
+        >
           <template #prefix>
             <UnoIcon i-web-cube />
           </template>
@@ -137,8 +145,10 @@ const logo = props.project?.logos?.at(0)?.url
         </ProjectInfoItem>
       </div>
       <div grid grid-cols-2 gap-16px my-32px lg:grid-cols-4>
-        <ProjectInfoItem :check-undefined="project.blockchain_features?.network" tooltip-link="/" title="Ecosystem"
-          bold>
+        <ProjectInfoItem
+          :check-undefined="project.blockchain_features?.network" tooltip-link="/" title="Ecosystem"
+          bold
+        >
           {{ project.blockchain_features?.network }}
         </ProjectInfoItem>
         <ProjectInfoItem invisible title="Last update" bold>

From abc5e3cd4d85b8054f283dae3f0391b655c43aaa Mon Sep 17 00:00:00 2001
From: 0xdevant <0xdevant@gmail.com>
Date: Mon, 22 Jul 2024 18:17:18 +0800
Subject: [PATCH 3/3] fix: optional return for null cases

---
 components/Project/ProjectHeading.vue | 39 +++++++++++++--------------
 types/project.ts                      |  4 +++
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/components/Project/ProjectHeading.vue b/components/Project/ProjectHeading.vue
index 537fd74..fd8cd3b 100644
--- a/components/Project/ProjectHeading.vue
+++ b/components/Project/ProjectHeading.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { Project } from '~/types'
+import type { Project, ProjectIndexable } from '~/types'
 
 const props = defineProps<{
   project: Project
@@ -21,34 +21,33 @@ const availableSupport = computed(() => {
   - team: anon / public
   - audit: yes / no
  */
-const calculateScore: number = computed(() => {
-  const criterias: { value: string; key?: string }[] = [
-    { value: 'product_readiness' },
+const calculateScore = computed(() => {
+  const criterias: { value: string; key: string }[] = [
+    { value: 'product_readiness', key: '' },
     { value: 'github', key: 'links' },
     { value: 'docs', key: 'links' },
-    { value: 'team' },
-    { value: 'audits' },
+    { value: 'team', key: '' },
+    { value: 'audits', key: '' },
   ]
 
   let matched = 0
   for (let i = 0; i < criterias.length; i++) {
     let value
-    if (criterias[i].key) {
-      if (props.project[criterias[i].key] === null || props.project[criterias[i].key] === undefined)
-        continue
-      value = props.project[criterias[i].key][criterias[i].value]
-    }
-    else {
-      if (props.project[criterias[i].value] === null || props.project[criterias[i].value] === undefined)
-        continue
-      value = props.project[criterias[i].value]
-    }
-    // console.log(value);
-    // console.log(Object.keys(props.project["team"]).length);
+    // value = ((criterias[i].key ?? props.project[criterias[i].value as keyof typeof props.project]) ?? null === null) ? null : (props.project as ProjectIndexable)[criterias[i].key][criterias[i].value]
+
+    const indexableProject = (props.project as ProjectIndexable)
+    if (criterias[i].key !== '')
+      value = indexableProject?.[criterias[i].key]?.[criterias[i].value]
+    else
+      value = indexableProject?.[criterias[i].value]
+
+    // console.log(props.project?.links?.github);
+    // console.log(Object.keys(props.indexableProject["team"]).length);
+    if (value === null || value === undefined)
+      continue
 
     if (fulfilled(value))
       matched++
-      // console.log('matched', matched);
   }
 
   return 100 / criterias.length * matched
@@ -65,10 +64,10 @@ function fulfilled(value: any): boolean {
       if (Object.keys(value).length > 0)
         return true
       break
-
     default:
       return false
   }
+  return false
 }
 
 const logo = props.project?.logos?.at(0)?.url
diff --git a/types/project.ts b/types/project.ts
index 78b059e..d5915e4 100644
--- a/types/project.ts
+++ b/types/project.ts
@@ -143,3 +143,7 @@ export interface ProjectShallow {
   support?: number | undefined
   anonymity?: boolean | undefined
 }
+
+export interface ProjectIndexable extends Project {
+  [key: string]: any
+}