From c6f0e0e57e82b7b46e7d780052337fb28eaacb69 Mon Sep 17 00:00:00 2001 From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> Date: Tue, 4 Jun 2024 21:36:00 +0530 Subject: [PATCH 1/2] Fix projects visibility --- apps/new/widget/components/project/Card.jsx | 17 +++++++++-------- apps/new/widget/components/project/ListCard.jsx | 12 ++++++------ apps/new/widget/lib/projects.jsx | 2 +- apps/new/widget/page/projects/Editor.jsx | 11 +++++++---- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/apps/new/widget/components/project/Card.jsx b/apps/new/widget/components/project/Card.jsx index b3fbc5eb..990d91a4 100644 --- a/apps/new/widget/components/project/Card.jsx +++ b/apps/new/widget/components/project/Card.jsx @@ -103,10 +103,11 @@ const ProjectCard = ({ data, showEditProjectAction }) => { collaborators, metadata, projectID, + profileImage, + backgroundImage, + location } = data; - const profile = Social.getr(`${projectAccountId}/profile`); - return ( { src="${alias_mob}/widget/Image" loading="" props={{ - image: profile.backgroundImage, - alt: profile?.name, + image: backgroundImage.image ?? backgroundImage, + alt: title, className: "w-100", style: { objectFit: "cover", @@ -149,8 +150,8 @@ const ProjectCard = ({ data, showEditProjectAction }) => { src="${alias_mob}/widget/Image" loading="" props={{ - image: metadata.profileImage?.image ?? metadata.profileImage, - alt: metadata.title, + image: profileImage?.image ?? profileImage, + alt: title, className: "rounded-circle w-100 h-100", style: { objectFit: "cover" }, thumbnail: "thumbnail", @@ -205,10 +206,10 @@ const ProjectCard = ({ data, showEditProjectAction }) => {
- {profile.location && ( + {location && ( - {profile.location} + {location} )} {tags.map((tag) => ( diff --git a/apps/new/widget/components/project/ListCard.jsx b/apps/new/widget/components/project/ListCard.jsx index 55c59f2e..c1704ebc 100644 --- a/apps/new/widget/components/project/ListCard.jsx +++ b/apps/new/widget/components/project/ListCard.jsx @@ -103,10 +103,10 @@ const ListCard = ({ data, showEditProjectAction }) => { collaborators, metadata, projectID, + profileImage, + location } = data; - const profile = Social.getr(`${projectAccountId}/profile`); - return ( { src="${alias_mob}/widget/Image" loading="" props={{ - image: metadata.profileImage?.image ?? metadata.profileImage, - alt: metadata.title, + image: profileImage?.image ?? profileImage, + alt: title, className: "rounded-circle w-100 h-100", style: { objectFit: "cover" }, thumbnail: "thumbnail", @@ -156,9 +156,9 @@ const ListCard = ({ data, showEditProjectAction }) => {
- {profile.location && ( + {location && ( - {profile.location} + {location} )} {tags.map((tag) => ( diff --git a/apps/new/widget/lib/projects.jsx b/apps/new/widget/lib/projects.jsx index 8db161cf..8afa97a0 100644 --- a/apps/new/widget/lib/projects.jsx +++ b/apps/new/widget/lib/projects.jsx @@ -63,7 +63,7 @@ const processData = (data, type) => { }; const fetchProjects = (props) => { - const app = props.app || "${alias_old}"; + const app = props.app || "${alias_new}"; const type = props.type || "project"; const data = fetchThings(props, app, type); diff --git a/apps/new/widget/page/projects/Editor.jsx b/apps/new/widget/page/projects/Editor.jsx index 1b6f36da..42267fb1 100644 --- a/apps/new/widget/page/projects/Editor.jsx +++ b/apps/new/widget/page/projects/Editor.jsx @@ -151,7 +151,7 @@ useEffect(() => { const { title, description, - image, + profileImage, backgroundImage, linktree, contributorsWithRoles, @@ -159,10 +159,13 @@ useEffect(() => { projectAccountId, tags, tabs, + location, + teamSize } = editProjectData; - const { twitter, github, telegram, website } = linktree; setTitle(title); + setLocation(location); + setTeamSize(teamSize) setProjectId(editProjectId.split("project/")[1]); setDescription(description); setContributorsWithRoles(contributorsWithRoles ?? []); @@ -171,8 +174,8 @@ useEffect(() => { setGitHub(github); setTelegram(telegram); setWebsite(website); - setAvatar(image); - setCoverImage(backgroundImage); + setAvatar(profileImage?.image ?? profileImage); + setCoverImage(backgroundImage?.image ?? backgroundImage); setProjectAccount(projectAccountId); setTags(tags); setSelectedTabs(new Set(tabs)); From 007a7f7a3ea50f32487f048392d92b4c7ea5aed9 Mon Sep 17 00:00:00 2001 From: Megha-Dev-19 <100185149+Megha-Dev-19@users.noreply.github.com> Date: Tue, 4 Jun 2024 21:40:10 +0530 Subject: [PATCH 2/2] fmt --- apps/new/widget/components/project/Card.jsx | 2 +- apps/new/widget/components/project/ListCard.jsx | 2 +- apps/new/widget/page/projects/Editor.jsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/new/widget/components/project/Card.jsx b/apps/new/widget/components/project/Card.jsx index 990d91a4..f7580895 100644 --- a/apps/new/widget/components/project/Card.jsx +++ b/apps/new/widget/components/project/Card.jsx @@ -105,7 +105,7 @@ const ProjectCard = ({ data, showEditProjectAction }) => { projectID, profileImage, backgroundImage, - location + location, } = data; return ( diff --git a/apps/new/widget/components/project/ListCard.jsx b/apps/new/widget/components/project/ListCard.jsx index c1704ebc..a2226394 100644 --- a/apps/new/widget/components/project/ListCard.jsx +++ b/apps/new/widget/components/project/ListCard.jsx @@ -104,7 +104,7 @@ const ListCard = ({ data, showEditProjectAction }) => { metadata, projectID, profileImage, - location + location, } = data; return ( diff --git a/apps/new/widget/page/projects/Editor.jsx b/apps/new/widget/page/projects/Editor.jsx index 42267fb1..f2b16cc0 100644 --- a/apps/new/widget/page/projects/Editor.jsx +++ b/apps/new/widget/page/projects/Editor.jsx @@ -160,12 +160,12 @@ useEffect(() => { tags, tabs, location, - teamSize + teamSize, } = editProjectData; const { twitter, github, telegram, website } = linktree; setTitle(title); setLocation(location); - setTeamSize(teamSize) + setTeamSize(teamSize); setProjectId(editProjectId.split("project/")[1]); setDescription(description); setContributorsWithRoles(contributorsWithRoles ?? []);