clearing up contributor page

aws-amplify · Jul 24, 2024 · bf32b7e · bf32b7e
1 parent 8bacf0a
commit bf32b7e
Show file tree

Hide file tree

Showing 151 changed files with 69 additions and 23 deletions.
diff --git a/src/assets/apple-touch-icon.png b/src/assets/apple-touch-icon.png
diff --git a/src/assets/favicon.ico b/src/assets/favicon.ico
diff --git a/src/assets/fonts/AmazonEmberDisplay_W_Bd.woff2 b/src/assets/fonts/AmazonEmberDisplay_W_Bd.woff2
diff --git a/src/assets/fonts/AmazonEmberDisplay_W_He.woff2 b/src/assets/fonts/AmazonEmberDisplay_W_He.woff2
diff --git a/src/assets/fonts/AmazonEmberDisplay_W_Lt.woff2 b/src/assets/fonts/AmazonEmberDisplay_W_Lt.woff2
diff --git a/src/assets/fonts/AmazonEmberDisplay_W_Md.woff2 b/src/assets/fonts/AmazonEmberDisplay_W_Md.woff2
diff --git a/src/assets/fonts/AmazonEmberDisplay_W_Rg.woff2 b/src/assets/fonts/AmazonEmberDisplay_W_Rg.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_Bd.woff2 b/src/assets/fonts/AmazonEmber_W_Bd.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_BdIt.woff2 b/src/assets/fonts/AmazonEmber_W_BdIt.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_He.woff2 b/src/assets/fonts/AmazonEmber_W_He.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_HeIt.woff2 b/src/assets/fonts/AmazonEmber_W_HeIt.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_Lt.woff2 b/src/assets/fonts/AmazonEmber_W_Lt.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_LtIt.woff2 b/src/assets/fonts/AmazonEmber_W_LtIt.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_Rg.woff2 b/src/assets/fonts/AmazonEmber_W_Rg.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_RgIt.woff2 b/src/assets/fonts/AmazonEmber_W_RgIt.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_SBd.woff2 b/src/assets/fonts/AmazonEmber_W_SBd.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_SBdIt.woff2 b/src/assets/fonts/AmazonEmber_W_SBdIt.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_Th.woff2 b/src/assets/fonts/AmazonEmber_W_Th.woff2
diff --git a/src/assets/fonts/AmazonEmber_W_ThIt.woff2 b/src/assets/fonts/AmazonEmber_W_ThIt.woff2
diff --git a/src/assets/images/cover_images/fullstack-for-frontend.png b/src/assets/images/cover_images/fullstack-for-frontend.png
diff --git a/src/assets/images/cover_images/membership-site.png b/src/assets/images/cover_images/membership-site.png
diff --git a/src/assets/images/cover_images/swift-course.png b/src/assets/images/cover_images/swift-course.png
diff --git a/src/assets/images/fullstack_for_frontend/actions.png b/src/assets/images/fullstack_for_frontend/actions.png
diff --git a/src/assets/images/fullstack_for_frontend/amplify-pull.png b/src/assets/images/fullstack_for_frontend/amplify-pull.png
diff --git a/src/assets/images/fullstack_for_frontend/authentication.png b/src/assets/images/fullstack_for_frontend/authentication.png
diff --git a/src/assets/images/fullstack_for_frontend/authenticator.png b/src/assets/images/fullstack_for_frontend/authenticator.png
diff --git a/src/assets/images/fullstack_for_frontend/authorization-rules.png b/src/assets/images/fullstack_for_frontend/authorization-rules.png
diff --git a/src/assets/images/fullstack_for_frontend/content.png b/src/assets/images/fullstack_for_frontend/content.png
diff --git a/src/assets/images/fullstack_for_frontend/delete.png b/src/assets/images/fullstack_for_frontend/delete.png
diff --git a/src/assets/images/fullstack_for_frontend/deployed.png b/src/assets/images/fullstack_for_frontend/deployed.png
diff --git a/src/assets/images/fullstack_for_frontend/final-app.png b/src/assets/images/fullstack_for_frontend/final-app.png
diff --git a/src/assets/images/fullstack_for_frontend/generate-data.png b/src/assets/images/fullstack_for_frontend/generate-data.png
diff --git a/src/assets/images/fullstack_for_frontend/get-started.png b/src/assets/images/fullstack_for_frontend/get-started.png
diff --git a/src/assets/images/fullstack_for_frontend/host-a-web-app.png b/src/assets/images/fullstack_for_frontend/host-a-web-app.png
diff --git a/src/assets/images/fullstack_for_frontend/note-collection.png b/src/assets/images/fullstack_for_frontend/note-collection.png
diff --git a/src/assets/images/fullstack_for_frontend/note-data-model.png b/src/assets/images/fullstack_for_frontend/note-data-model.png
diff --git a/src/assets/images/fullstack_for_frontend/note-title.png b/src/assets/images/fullstack_for_frontend/note-title.png
diff --git a/src/assets/images/fullstack_for_frontend/run-plugin.png b/src/assets/images/fullstack_for_frontend/run-plugin.png
diff --git a/src/assets/images/fullstack_for_frontend/setup-data.png b/src/assets/images/fullstack_for_frontend/setup-data.png
diff --git a/src/assets/images/fullstack_for_frontend/studio-input.png b/src/assets/images/fullstack_for_frontend/studio-input.png
diff --git a/src/assets/images/fullstack_for_frontend/text-fields.png b/src/assets/images/fullstack_for_frontend/text-fields.png
diff --git a/src/assets/images/fullstack_for_frontend/theme.png b/src/assets/images/fullstack_for_frontend/theme.png
diff --git a/src/assets/images/fullstack_for_frontend/ui-library copy.png b/src/assets/images/fullstack_for_frontend/ui-library copy.png
diff --git a/src/assets/images/fullstack_for_frontend/ui-library.png b/src/assets/images/fullstack_for_frontend/ui-library.png
diff --git a/src/assets/images/membership_website/1-dup-ui-kit.png b/src/assets/images/membership_website/1-dup-ui-kit.png
diff --git a/src/assets/images/membership_website/1-theme-plugin.png b/src/assets/images/membership_website/1-theme-plugin.png
diff --git a/src/assets/images/membership_website/1-ui-kit.png b/src/assets/images/membership_website/1-ui-kit.png
diff --git a/src/assets/images/membership_website/1-use-theme-plugin.png b/src/assets/images/membership_website/1-use-theme-plugin.png
diff --git a/src/assets/images/membership_website/2-accept-theme.png b/src/assets/images/membership_website/2-accept-theme.png
diff --git a/src/assets/images/membership_website/2-add-auth.png b/src/assets/images/membership_website/2-add-auth.png
diff --git a/src/assets/images/membership_website/2-content.png b/src/assets/images/membership_website/2-content.png
diff --git a/src/assets/images/membership_website/2-deploy-app.png b/src/assets/images/membership_website/2-deploy-app.png
diff --git a/src/assets/images/membership_website/2-generate-content-2.png b/src/assets/images/membership_website/2-generate-content-2.png
diff --git a/src/assets/images/membership_website/2-generate-content.png b/src/assets/images/membership_website/2-generate-content.png
diff --git a/src/assets/images/membership_website/2-import-figma.png b/src/assets/images/membership_website/2-import-figma.png
diff --git a/src/assets/images/membership_website/2-model-data-2.png b/src/assets/images/membership_website/2-model-data-2.png
diff --git a/src/assets/images/membership_website/2-model-data.png b/src/assets/images/membership_website/2-model-data.png
diff --git a/src/assets/images/membership_website/2-new-app-2.png b/src/assets/images/membership_website/2-new-app-2.png
diff --git a/src/assets/images/membership_website/2-new-app.png b/src/assets/images/membership_website/2-new-app.png
diff --git a/src/assets/images/membership_website/2-save-components.png b/src/assets/images/membership_website/2-save-components.png
diff --git a/src/assets/images/membership_website/2-search-amplify.png b/src/assets/images/membership_website/2-search-amplify.png
diff --git a/src/assets/images/membership_website/2-sync-figma.png b/src/assets/images/membership_website/2-sync-figma.png
diff --git a/src/assets/images/membership_website/4-pull-comp.png b/src/assets/images/membership_website/4-pull-comp.png
diff --git a/src/assets/images/membership_website/4-run-app.png b/src/assets/images/membership_website/4-run-app.png
diff --git a/src/assets/images/membership_website/5-bind-card.png b/src/assets/images/membership_website/5-bind-card.png
diff --git a/src/assets/images/membership_website/5-bind-hero.png b/src/assets/images/membership_website/5-bind-hero.png
diff --git a/src/assets/images/membership_website/5-bind-nav-2.png b/src/assets/images/membership_website/5-bind-nav-2.png
diff --git a/src/assets/images/membership_website/5-bind-nav-3.png b/src/assets/images/membership_website/5-bind-nav-3.png
diff --git a/src/assets/images/membership_website/5-bind-nav-4.png b/src/assets/images/membership_website/5-bind-nav-4.png
diff --git a/src/assets/images/membership_website/5-bind-nav.png b/src/assets/images/membership_website/5-bind-nav.png
diff --git a/src/assets/images/membership_website/5-bind-persuade.png b/src/assets/images/membership_website/5-bind-persuade.png
diff --git a/src/assets/images/membership_website/5-bind-story.png b/src/assets/images/membership_website/5-bind-story.png
diff --git a/src/assets/images/membership_website/5-create-collection-2.png b/src/assets/images/membership_website/5-create-collection-2.png
diff --git a/src/assets/images/membership_website/5-create-collection-3.png b/src/assets/images/membership_website/5-create-collection-3.png
diff --git a/src/assets/images/membership_website/5-create-collection.png b/src/assets/images/membership_website/5-create-collection.png
diff --git a/src/assets/images/membership_website/7-client-integration.png b/src/assets/images/membership_website/7-client-integration.png
diff --git a/src/assets/images/membership_website/7-create-product.png b/src/assets/images/membership_website/7-create-product.png
diff --git a/src/assets/images/membership_website/7-key.png b/src/assets/images/membership_website/7-key.png
diff --git a/src/assets/images/membership_website/7-product-id.png b/src/assets/images/membership_website/7-product-id.png
diff --git a/src/assets/images/membership_website/7-setup-stripe.png b/src/assets/images/membership_website/7-setup-stripe.png
diff --git a/src/assets/images/membership_website/8-add-api.png b/src/assets/images/membership_website/8-add-api.png
diff --git a/src/assets/images/membership_website/8-test-hook.png b/src/assets/images/membership_website/8-test-hook.png
diff --git a/src/assets/images/mock_course_images/amplify-pull.png b/src/assets/images/mock_course_images/amplify-pull.png
diff --git a/src/assets/images/mock_course_images/content.png b/src/assets/images/mock_course_images/content.png
diff --git a/src/assets/images/mock_course_images/delete.png b/src/assets/images/mock_course_images/delete.png
diff --git a/src/assets/images/mock_course_images/final-app.png b/src/assets/images/mock_course_images/final-app.png
diff --git a/src/assets/images/mock_course_images/generate-data.png b/src/assets/images/mock_course_images/generate-data.png
diff --git a/src/assets/images/mock_course_images/get-started.png b/src/assets/images/mock_course_images/get-started.png
diff --git a/src/assets/images/mock_course_images/note-collection.png b/src/assets/images/mock_course_images/note-collection.png
diff --git a/src/assets/images/mock_course_images/note-data-model.png b/src/assets/images/mock_course_images/note-data-model.png
diff --git a/src/assets/images/mock_course_images/note-title.png b/src/assets/images/mock_course_images/note-title.png
diff --git a/src/assets/images/mock_course_images/setup-data.png b/src/assets/images/mock_course_images/setup-data.png
diff --git a/src/assets/images/mock_course_images/studio-input.png b/src/assets/images/mock_course_images/studio-input.png
diff --git a/src/assets/images/mock_course_images/text-fields.png b/src/assets/images/mock_course_images/text-fields.png
diff --git a/src/assets/images/mock_course_images/ui-library.png b/src/assets/images/mock_course_images/ui-library.png
diff --git a/src/assets/images/profile_images/aspittel.jpeg b/src/assets/images/profile_images/aspittel.jpeg
diff --git a/src/assets/images/profile_images/chnwamba.jpeg b/src/assets/images/profile_images/chnwamba.jpeg
diff --git a/src/assets/images/profile_images/kyle.jpg b/src/assets/images/profile_images/kyle.jpg
diff --git a/src/assets/images/swift_course/amplify-studio-auth-configure-login.png b/src/assets/images/swift_course/amplify-studio-auth-configure-login.png
diff --git a/src/assets/images/swift_course/amplify-studio-auth-configure-sign-up.png b/src/assets/images/swift_course/amplify-studio-auth-configure-sign-up.png
diff --git a/src/assets/images/swift_course/amplify-studio-auth-multi-factor-off.png b/src/assets/images/swift_course/amplify-studio-auth-multi-factor-off.png
diff --git a/src/assets/images/swift_course/amplify-studio-auth-start-from-scratch.png b/src/assets/images/swift_course/amplify-studio-auth-start-from-scratch.png
diff --git a/src/assets/images/swift_course/amplify-studio-auth-successfully-deployed.png b/src/assets/images/swift_course/amplify-studio-auth-successfully-deployed.png
diff --git a/src/assets/images/swift_course/amplify-studio-authentication-tab.png b/src/assets/images/swift_course/amplify-studio-authentication-tab.png
diff --git a/src/assets/images/swift_course/amplify-studio-chatroom-lastmessage-models.png b/src/assets/images/swift_course/amplify-studio-chatroom-lastmessage-models.png
diff --git a/src/assets/images/swift_course/amplify-studio-data-deployed.png b/src/assets/images/swift_course/amplify-studio-data-deployed.png
diff --git a/src/assets/images/swift_course/amplify-studio-data-tab-2.png b/src/assets/images/swift_course/amplify-studio-data-tab-2.png
diff --git a/src/assets/images/swift_course/amplify-studio-data-tab.png b/src/assets/images/swift_course/amplify-studio-data-tab.png
diff --git a/src/assets/images/swift_course/amplify-studio-message-model.png b/src/assets/images/swift_course/amplify-studio-message-model.png
diff --git a/src/assets/images/swift_course/amplify-studio-product-model.png b/src/assets/images/swift_course/amplify-studio-product-model.png
diff --git a/src/assets/images/swift_course/amplify-studio-project-name.png b/src/assets/images/swift_course/amplify-studio-project-name.png
diff --git a/src/assets/images/swift_course/amplify-studio-storage-configuration.png b/src/assets/images/swift_course/amplify-studio-storage-configuration.png
diff --git a/src/assets/images/swift_course/amplify-studio-user-model.png b/src/assets/images/swift_course/amplify-studio-user-model.png
diff --git a/src/assets/images/swift_course/course-thumbnail.png b/src/assets/images/swift_course/course-thumbnail.png
diff --git a/src/assets/images/swift_course/iam-add-user-add-tags.png b/src/assets/images/swift_course/iam-add-user-add-tags.png
diff --git a/src/assets/images/swift_course/iam-add-user-credentials.png b/src/assets/images/swift_course/iam-add-user-credentials.png
diff --git a/src/assets/images/swift_course/iam-add-user-name.png b/src/assets/images/swift_course/iam-add-user-name.png
diff --git a/src/assets/images/swift_course/iam-add-user-set-permissions.png b/src/assets/images/swift_course/iam-add-user-set-permissions.png
diff --git a/src/assets/images/swift_course/launch-studio.png b/src/assets/images/swift_course/launch-studio.png
diff --git a/src/assets/images/swift_course/local-setup-instructions.png b/src/assets/images/swift_course/local-setup-instructions.png
diff --git a/src/assets/images/swift_course/my-account-tab.png b/src/assets/images/swift_course/my-account-tab.png
diff --git a/src/assets/images/swift_course/navigate-to-amplify-from-console.png b/src/assets/images/swift_course/navigate-to-amplify-from-console.png
diff --git a/src/assets/images/swift_course/new-amplify-app.png b/src/assets/images/swift_course/new-amplify-app.png
diff --git a/src/assets/images/swift_course/project_setup_xcode_ios_new_app.png b/src/assets/images/swift_course/project_setup_xcode_ios_new_app.png
diff --git a/src/assets/images/swift_course/project_setup_xcode_project_configuration.png b/src/assets/images/swift_course/project_setup_xcode_project_configuration.png
diff --git a/src/assets/images/swift_course/xcode-add-chat-files.png b/src/assets/images/swift_course/xcode-add-chat-files.png
diff --git a/src/assets/images/swift_course/xcode-add-configuration-files.png b/src/assets/images/swift_course/xcode-add-configuration-files.png
diff --git a/src/assets/images/swift_course/xcode-add-packages.png b/src/assets/images/swift_course/xcode-add-packages.png
diff --git a/src/assets/images/swift_course/xcode-add-product-files.png b/src/assets/images/swift_course/xcode-add-product-files.png
diff --git a/src/assets/images/swift_course/xcode-amplify-image-product-selected.png b/src/assets/images/swift_course/xcode-amplify-image-product-selected.png
diff --git a/src/assets/images/swift_course/xcode-amplify-image-repo.png b/src/assets/images/swift_course/xcode-amplify-image-repo.png
diff --git a/src/assets/images/swift_course/xcode-datastore-plugin-selected.png b/src/assets/images/swift_course/xcode-datastore-plugin-selected.png
diff --git a/src/assets/images/swift_course/xcode-models-folder.png b/src/assets/images/swift_course/xcode-models-folder.png
diff --git a/src/assets/images/swift_course/xcode-package-api-plugin-selected.png b/src/assets/images/swift_course/xcode-package-api-plugin-selected.png
diff --git a/src/assets/images/swift_course/xcode-package-auth-plugin-selected.png b/src/assets/images/swift_course/xcode-package-auth-plugin-selected.png
diff --git a/src/assets/images/swift_course/xcode-package-product-select-amplify.png b/src/assets/images/swift_course/xcode-package-product-select-amplify.png
diff --git a/src/assets/images/swift_course/xcode-photo-library-privacy-policy.png b/src/assets/images/swift_course/xcode-photo-library-privacy-policy.png
diff --git a/src/assets/images/swift_course/xcode-storage-plugin-selected.png b/src/assets/images/swift_course/xcode-storage-plugin-selected.png
diff --git a/src/assets/learn-preview.jpg b/src/assets/learn-preview.jpg
diff --git a/src/assets/robots.txt b/src/assets/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/src/assets/scripts/aws-ux-shortbread-v1-0-14.js b/src/assets/scripts/aws-ux-shortbread-v1-0-14.js
diff --git a/src/assets/vercel.svg b/src/assets/vercel.svg
diff --git a/src/components/CardLayout/CardLayout.tsx b/src/components/CardLayout/CardLayout.tsx
@@ -79,7 +79,7 @@ export function CardLayout({
               borderRadius="8px"
               padding="0px 0px 0px 0px"
               overflow="hidden"
-              src={course?.image}
+              src={course?.image.substring(6)}
               alt={course?.imageAltText || ""}
             ></Image>
           </View>

diff --git a/src/components/ContributorCollection/ContributorComponents/ContributorLargeCustom.jsx b/src/components/ContributorCollection/ContributorComponents/ContributorLargeCustom.jsx
@@ -103,7 +103,7 @@ export default function ContributorLargeCustom(props) {
           style={{
             borderRadius: "50%",
           }}
-          src={contributor?.profilePic}
+          src={contributor?.profilePic.substring(6)}
           alt={`Profile picture`}
           {...getOverrideProps(overrides, "Ellipse 15")}
         />

diff --git a/src/components/ContributorCollection/ContributorComponents/ContributorVerticalCustom.jsx b/src/components/ContributorCollection/ContributorComponents/ContributorVerticalCustom.jsx
@@ -103,7 +103,7 @@ export default function ContributorVerticalCustom(props) {
           style={{
             borderRadius: "50%",
           }}
-          src={contributor?.profilePic}
+          src={contributor?.profilePic.substring(6)}
           alt={`Profile picture`}
           {...getOverrideProps(overrides, "Ellipse 15")}
         />

diff --git a/src/components/CourseContributors/ContributorHorizontalCustom.jsx b/src/components/CourseContributors/ContributorHorizontalCustom.jsx
@@ -103,7 +103,7 @@ export default function ContributorHorizontal(props) {
           style={{
             borderRadius: "50%",
           }}
-          src={contributor?.profilePic}
+          src={contributor?.profilePic.substring(6)}
           alt={`Profile picture`}
           {...getOverrideProps(overrides, "Ellipse 15")}
         />

diff --git a/src/components/HeroCourse/HeroCourse.tsx b/src/components/HeroCourse/HeroCourse.tsx
@@ -89,7 +89,7 @@ export function HeroCourse({ course, tags }: HeroCourseProps) {
             width={{ base: "100%", large: "", xl: "100%" }}
             height={{ base: "100%", large: "", xl: "100%" }}
             objectFit={{ base: "cover", large: "contain", xl: "cover" }}
-            src={course.image}
+            src={course?.image.substring(6)}
             alt={course.imageAltText || ""}
             borderRadius="8px"
             overflow="hidden"

diff --git a/src/lib/getData.ts b/src/lib/getData.ts
@@ -43,16 +43,32 @@ export async function getFeaturedCourseData(
 
 export async function getCourseTags(
   context: GetStaticPropsContext & Context,
-  courseId: string
+  courseId: string, 
 ): Promise<Tag[]> {
   const { DataStore } = withSSRContext(context);
 
   const courseTags: CourseTag[] = await DataStore.query(CourseTag);
-  const filteredCourseTags = courseTags.filter(
-   async (e) => (await (e.course)).published && (await (e.course)).id === courseId
-  );
+  const filteredCourseTags = [];
+
+  for (const courseTag of courseTags) {
+    const course = await courseTag.course;
+
+    if (course.published && course.id === courseId) {
+      filteredCourseTags.push(courseTag)
+    }
+  }
+
+  const tagsList = [];
+
+  for (const filteredCourseTag of filteredCourseTags) {
+    const tag = await filteredCourseTag.tag;
+    const course = await filteredCourseTag.course;
+    const id = await filteredCourseTag.id;
+
+    tagsList.push({id, tag, course});
+  }
 
-  return filteredCourseTags.map((e) => e.tag);
+  return tagsList.map((e) => e.tag);
 }
 
 export async function getCardLayoutData(
@@ -62,7 +78,6 @@ export async function getCardLayoutData(
 
   let courseTags: CourseTag[] = await DataStore.query(CourseTag);
 
-
   // Go through and group up the tags to their respective courses
     const groupedCourseTags: Record<string, CardLayoutData> = {};
     for (const courseTag of courseTags) {
@@ -130,7 +145,6 @@ export async function getCourseAndLessonData(
 
     return { course: courseResult, lessons: lessonsSorted };
   }
-
   return null;
 }
 
@@ -141,8 +155,17 @@ export async function getCourseContributors(
   const { DataStore } = withSSRContext(context);
 
   const contributorCourses = await DataStore.query(ContributorCourse);
+  const resolvedCourses = [];
+
+  for (const contributorCourse of contributorCourses) {
+    const id = await contributorCourse.id;
+    const contributor = await contributorCourse.contributor;
+
+    const course = await contributorCourse.course;
+    resolvedCourses.push({id, contributor:contributor, course: course}); 
+  }
 
-  return contributorCourses
+  return resolvedCourses
     .filter(filterFn)
     .map((e: ContributorCourse) => e.contributor);
 }

diff --git a/src/pages/about/[contributor].tsx b/src/pages/about/[contributor].tsx
@@ -12,7 +12,7 @@ import { withSSRContext } from "aws-amplify";
 import { serializeModel, deserializeModel } from "@aws-amplify/datastore/ssr";
 import { useRouter } from "next/router";
 import { useCallback } from "react";
-import { Contributor, ContributorCourse } from "../../models";
+import { Contributor, ContributorCourse, LazyCourse } from "../../models";
 import { CardLayoutCollection } from "../../components/CardLayoutCollection";
 import { SocialMediaButton } from "../../components/SocialMediaButton";
 import { capitalizeEnum } from "../../utils/capitalizeEnum";
@@ -216,7 +216,7 @@ export default function ContributorPage(data: {
                 style={{
                   borderRadius: "50%",
                 }}
-                src={contributor?.profilePic || ""}
+                src={contributor?.profilePic.substring(6) || ""}
                 alt={`Profile pic of ${contributor.firstName}`}
               />
             </Flex>
@@ -385,15 +385,29 @@ export async function getStaticProps(
     const contributorCoursesRelationships: ContributorCourse[] =
       await DataStore.query(ContributorCourse);
 
-    const filteredCourses = contributorCoursesRelationships
-      .filter((e) => e.contributor.username === username)
-      .map((e) => e.course);
+      const resolvedContributorCourseRelationships = [];
+
+      for (const contributorCoursesRelationship of contributorCoursesRelationships) {
+        const contributor = await contributorCoursesRelationship.contributor;
+        const id = contributorCoursesRelationship.id;
+        const course = await contributorCoursesRelationship.course;
+
+        resolvedContributorCourseRelationships.push({id, course, contributor}); 
+      }
+
+    const filteredCourses = resolvedContributorCourseRelationships
+      .filter((e) => {
+        return e.contributor.username === username
+      })
 
     const cardLayoutData = await getCardLayoutData(context);
 
-    const filteredCardLayoutData = cardLayoutData.filter((cardLayout) =>
-      filteredCourses.find((e) => e.id === cardLayout.course.id)
-    );
+    const filteredCardLayoutData = cardLayoutData.filter((cardLayout) => {
+      const filter = filteredCourses.find((e) => {
+        return e.course.id === cardLayout.course.id;
+      })
+      return filter;
+    });
 
     const otherContributors = await DataStore.query(Contributor, (c: any) =>
       c.username.ne(username)

diff --git a/src/pages/courses/[courseurltitle]/index.tsx b/src/pages/courses/[courseurltitle]/index.tsx
@@ -183,7 +183,7 @@ export default function CoursePage(data: {
                   overflow="hidden"
                   width="100%"
                   maxHeight="350px"
-                  src={course.image || ""}
+                  src={course?.image.substring(6) || ""}
                   alt={course.imageAltText || ""}
                   borderRadius="8px"
                 />

diff --git a/src/ui-components/CardLayout.jsx b/src/ui-components/CardLayout.jsx
@@ -126,7 +126,7 @@ export default function CardLayout(props) {
           transform="rotate(0deg)"
           borderRadius="8px"
           padding="0px 0px 0px 0px"
-          src={course?.image}
+          src={course?.image.substring(6)}
           alt={course?.imageAltText}
           {...getOverrideProps(
             overrides,