Merge branch 'v3' into dk/rating-boolean-conditions-fixes

web3privacy · Sep 20, 2024 · 588ed8a · 588ed8a
2 parents 23a2126 + 370adcb
commit 588ed8a
Show file tree

Hide file tree

Showing 5 changed files with 254 additions and 1,078 deletions.
diff --git a/components/Project/Create/Categories/Privacy.vue b/components/Project/Create/Categories/Privacy.vue
@@ -81,7 +81,7 @@ defineExpose({
       <ProjectCreateComponentsSelectChips
         v-model="signRequirements"
         label="Sign-in requirements"
-        :options="signInRequirmentsData.map(s => ({ label: s.name, value: s.id }))"
+        :options="signInRequirmentsData?.map(s => ({ label: s.name, value: s.id }))"
         placeholder="Add requirement"
         hint="What do you need to provide to use your project?"
       />

diff --git a/components/Project/Create/Categories/Technology.vue b/components/Project/Create/Categories/Technology.vue
@@ -47,7 +47,7 @@ defineExpose({
     />
     <ProjectCreateComponentsRadio
       v-model="version"
-      :options="projectPhaseData.map(p => ({ label: p.name, value: p.id }))"
+      :options="projectPhaseData?.map(p => ({ label: p.name, value: p.id }))"
     />
     <ProjectCreateComponentsCategoryDivider
       w-full
@@ -71,7 +71,7 @@ defineExpose({
     </div>
     <ProjectCreateComponentsSelect
       v-model="assetType"
-      :options="assetCustodyData.map(c => ({ label: c.name, value: c.id }))"
+      :options="assetCustodyData?.map(c => ({ label: c.name, value: c.id }))"
       label="Asset custody type"
       placeholder="Select custody type"
       hint="How are user’s fund handled? (non-custody, multisig, pool,...)"

diff --git a/components/Project/ProjectRating.vue b/components/Project/ProjectRating.vue
@@ -31,24 +31,11 @@ const backgroundColorByScore = computed(() => {
   const colorIndex = Math.floor(normalizedPercentage / 10)
   return colors[colorIndex]
 })
-const isLargeScreen = useMediaQuery('(min-width: 1024px)')
-
-function onClick() {
-  if (isLargeScreen.value)
-    return
-  if (props.disablePopover)
-    emits('selected')
-  else
-    isPopoverVisible.value = !isPopoverVisible.value
-}
 
 const isPopoverVisible = ref(false)
 
 let hideTimeout: ReturnType<typeof setTimeout> | null = null
 const showPopover = () => {
-  if (!isLargeScreen.value)
-    return
-  console.log('show')
   if (hideTimeout) {
     clearTimeout(hideTimeout)
     hideTimeout = null
@@ -57,8 +44,6 @@ const showPopover = () => {
 }
 
 const hidePopover = () => {
-  if (!isLargeScreen.value)
-    return
   hideTimeout = setTimeout(() => {
     isPopoverVisible.value = false
   }, 100) // Delay of 200ms before hiding
@@ -83,7 +68,7 @@ const hidePopover = () => {
       cursor-pointer
       @mouseenter="showPopover"
       @mouseleave="hidePopover"
-      @click.prevent="onClick()"
+      @click.prevent=" emits('selected')"
     >
       <div
         v-for="point of [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"

diff --git a/composables/useData.ts b/composables/useData.ts
@@ -73,7 +73,7 @@ export const useData = defineStore('data', () => {
       features.value = data.features
       ranks.value = data.ranks
 
-      projectPhase.value = data.project_phase.map(p => ({ id: p.id.toLowerCase(), name: p.name }))
+      projectPhase.value = data.project_phase?.map(p => ({ id: p.id.toLowerCase(), name: p.name }))
       assetCustody.value = data.asset_custody_type.map(a => ({ id: a.id.toLowerCase(), name: a.name }))
       signInRequirments.value = data.sign_in_type_requirments.map(s => ({ id: s.id.toLowerCase(), name: s.name }))
     }