update default images

wri · Nov 14, 2023 · 6ceb143 · 6ceb143
1 parent 4f9f1ec
commit 6ceb143
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/deployment/frontend/public/images/placeholders/teams/teamdefault.png b/deployment/frontend/public/images/placeholders/teams/teamdefault.png
diff --git a/deployment/frontend/public/images/placeholders/topics/topicsdefault.png b/deployment/frontend/public/images/placeholders/topics/topicsdefault.png
diff --git a/deployment/frontend/public/images/placeholders/user/userdefault.png b/deployment/frontend/public/images/placeholders/user/userdefault.png
diff --git a/deployment/frontend/src/components/dashboard/UserProfile.tsx b/deployment/frontend/src/components/dashboard/UserProfile.tsx
@@ -14,7 +14,7 @@ export default function UserProfile() {
   return (
     <div className='w-full flex flex-col justify-center items-center font-acumin gap-y-2 text-white pb-6 pt-10'>
       <div className='relative w-24 h-24 rounded-full overflow-hidden'>
-        <Image src={`${data?.userdetails?.imageUrl ? data?.userdetails?.imageUrl : '/images/placeholders/user/defaultprofile.png'}`} fill alt='' />
+        <Image src={`${data?.userdetails?.imageUrl ? data?.userdetails?.imageUrl : '/images/placeholders/user/userdefault.png'}`} fill alt='' />
       </div>
       <div className='text-[1.438rem] leading-[1.725rem] font-semibold '>{data?.userdetails?.name}</div>
       <div className='font-normal text-base '>{data?.userdetails?.isSysAdmin ? "System Admin" : "Member"}</div>

diff --git a/deployment/frontend/src/schema/ckan.schema.ts b/deployment/frontend/src/schema/ckan.schema.ts
@@ -87,5 +87,5 @@ export interface GroupTree {
   name: string;
   highlighted: boolean;
   children: GroupTree[];
-  image_display_url?: string;
+  image_display_url: string;
 }
diff --git a/deployment/frontend/src/server/api/routers/User.ts b/deployment/frontend/src/server/api/routers/User.ts
@@ -87,7 +87,7 @@ export const UserRouter = createTRPCRouter({
               id: user.id!,
               description: user?.email,
               orgnumber: userTemp?.length,
-              image_display_url: user?.image_url,
+              image_display_url: user?.image_url ? user?.image_url : '/images/placeholders/user/userdefault.png',
               orgs: userOrgDetails
             })
           }
@@ -97,7 +97,7 @@ export const UserRouter = createTRPCRouter({
               id: user.id!,
               description: user?.email,
               orgnumber: 0,
-              image_display_url: user?.image_url,
+              image_display_url: user?.image_url ? user?.image_url : '/images/placeholders/user/userdefault.png',
               orgs: []
             })
           }

diff --git a/deployment/frontend/src/server/api/routers/organization.ts b/deployment/frontend/src/server/api/routers/organization.ts
@@ -23,15 +23,15 @@ export const OrganizationRouter = createTRPCRouter({
         return {
           title: orgTitle,
           name: orgName,
-          image_display_url: orgImage,
+          image_display_url: orgImage ? orgImage : '/images/placeholders/teams/teamdefault.png',
           description: `${userCount} Member(s) | ${packageCount} Datasets`
         }
       }));
 
       type IOrg = {
         title: string | undefined;
         name: string | undefined;
-        image_display_url: string | undefined;
+        image_display_url: string;
         description: string;
       }
       let result = org;

diff --git a/deployment/frontend/src/server/api/routers/topics.ts b/deployment/frontend/src/server/api/routers/topics.ts
@@ -26,18 +26,18 @@ export const TopicRouter = createTRPCRouter({
                     })
                     const rgroup = {
                         ...group,
-                        image_display_url: groupDetails?.image_display_url,
+                        image_display_url: groupDetails?.image_display_url ? groupDetails?.image_display_url : '/images/placeholders/topics/topicsdefault.png',
                     }
                     rgroup.children.map(async (child) => {
                         const childDetails = await getGroup({
                             apiKey: ctx.session.user.apikey,
                             id: child.id,
                         })
                         child.image_display_url =
-                            childDetails?.image_display_url
+                            childDetails?.image_display_url ? childDetails?.image_display_url : '/images/placeholders/topics/topicsdefault.png'
                         return child
                     })
-                    return group
+                    return rgroup
                 })
             )
             let result = groupDetails