Updated featured widget; Marked tags page not used; Migration exception added

rajat1saxena · rajat1saxena · commit e3c20916229a · 2025-03-27T11:12:43.000+05:30
diff --git a/.yarn/cache/@next-swc-linux-x64-gnu-npm-14.2.25-2313f16aac-8.zip b/.yarn/cache/@next-swc-linux-x64-gnu-npm-14.2.25-2313f16aac-8.zip
diff --git a/apps/web/.migrations/23-03-25_12-48-migrate-customers-to-memberships.js b/apps/web/.migrations/23-03-25_12-48-migrate-customers-to-memberships.js
@@ -178,7 +178,11 @@ const createMembership = async (domain, userId, courseId, paymentPlan) => {
 
     const existingMembership = await Membership.findOne(payload);
     if (!existingMembership) {
-        await Membership.create(payload);
+        try {
+            await Membership.create(payload);
+        } catch (error) {
+            console.log("Error creating membership for ", domain, error);
+        }
     }
 };
 
diff --git a/apps/web/graphql/courses/query.ts b/apps/web/graphql/courses/query.ts
@@ -207,49 +207,4 @@ export default {
                 status,
             }),
     },
-    getCourses: {
-        type: new GraphQLList(types.publicCoursesType),
-        args: {
-            offset: {
-                type: GraphQLInt,
-            },
-            ids: {
-                type: new GraphQLList(GraphQLString),
-            },
-            tag: {
-                type: GraphQLString,
-            },
-            filterBy: {
-                type: new GraphQLList(courseFilters),
-            },
-        },
-        resolve: (
-            _: any,
-            {
-                offset,
-                ids,
-                tag,
-                filterBy,
-            }: {
-                offset?: number;
-                ids?: string[];
-                tag?: string;
-                filterBy?: Filter[];
-            },
-            ctx: GQLContext,
-        ) => getCourses({ offset, ids, tag, filterBy, ctx }),
-    },
-    // getEnrolledCourses: {
-    //     type: new GraphQLList(types.enrolledCourses),
-    //     args: {
-    //         userId: {
-    //             type: new GraphQLNonNull(GraphQLString),
-    //         },
-    //     },
-    //     resolve: (
-    //         _: any,
-    //         { userId }: { userId: string },
-    //         context: GQLContext,
-    //     ) => getEnrolledCourses(userId, context),
-    // },
 };
diff --git a/apps/web/pages/blog/index.tsx.notused b/apps/web/pages/blog/index.tsx.notused
diff --git a/apps/web/pages/courses.tsx.notused b/apps/web/pages/courses.tsx.notused
diff --git a/apps/web/pages/tag/[tag].tsx.notused b/apps/web/pages/tag/[tag].tsx.notused
@@ -1,22 +1,22 @@
 import {
     HEADER_BLOG_POSTS_SECTION,
     HEADER_TAG_SECTION,
-} from "../../ui-config/strings";
+} from "@/ui-config/strings";
 import { FetchBuilder } from "@courselit/utils";
 import { getBackendAddress, getPage } from "../../ui-lib/utils";
 import dynamic from "next/dynamic";
 import { Course, Page } from "@courselit/common-models";
 import { useRouter } from "next/router";
-import BaseLayout from "../../components/public/base-layout";
+import BaseLayout from "@/components/public/base-layout";
 
-const Items = dynamic(() => import("../../components/public/items"));
+const Items = dynamic(() => import("@/components/public/items"));
 
 const generateQuery =
     (tag: string) =>
     (pageOffset = 1) =>
         `
   query {
-    courses: getCourses(offset: ${pageOffset}, tag: "${tag}") {
+    courses: getProducts(offset: ${pageOffset}, tag: "${tag}") {
       id,
       title,
       description,
@@ -62,7 +62,7 @@ function Posts(props: PostsProps) {
     );
 }
 
-const getCourses = async (backend: string, tag: string) => {
+const getProducts= async (backend: string, tag: string) => {
     let courses = [];
     try {
         const fetch = new FetchBuilder()
@@ -79,7 +79,7 @@ const getCourses = async (backend: string, tag: string) => {
 export async function getServerSideProps({ query, req }: any) {
     const address = getBackendAddress(req.headers);
     const page = await getPage(address);
-    const courses = await getCourses(getBackendAddress(req.headers), query.tag);
+    const courses = await getProducts(getBackendAddress(req.headers), query.tag);
     return { props: { courses, page } };
 }
 
diff --git a/docs/widgets.md b/docs/widgets.md
@@ -116,7 +116,7 @@ You will get a unique `widgetId` from the framework. You have to use this as a k
 ```js
 // Fetches courses with a certain tag
 Widget.getData = (id: string, settings: Record<string, unknown>) => `
-    ${id}: getCourses(offset: 1, tag: "${settings && settings.tag}") {
+    ${id}: getProducts(offset: 1, tag: "${settings && settings.tag}") {
         id,
         title,
         cost,
diff --git a/packages/common-widgets/src/featured/admin-widget.tsx b/packages/common-widgets/src/featured/admin-widget.tsx
@@ -104,8 +104,8 @@ export default function AdminWidget({
 
     const loadPublishedProducts = async () => {
         const query = `
-            query {
-                products: getCourses(offset: 1, filterBy: [COURSE, DOWNLOAD]) {
+            query($limit: Int, $publicView: Boolean, $filter: [CourseFilters]) {
+                products: getProducts(limit: $limit, filterBy: $filter, publicView: $publicView) {
                     title,
                     courseId,
                     type
@@ -114,7 +114,7 @@ export default function AdminWidget({
         `;
         const fetch = new FetchBuilder()
             .setUrl(`${address.backend}/api/graph`)
-            .setPayload(query)
+            .setPayload({ query, variables: { limit: 1000, publicView: true, filter: ["COURSE", "DOWNLOAD"] } })
             .setIsGraphQLEndpoint(true)
             .build();
         try {
diff --git a/packages/common-widgets/src/featured/widget.tsx b/packages/common-widgets/src/featured/widget.tsx
@@ -44,10 +44,10 @@ export default function Widget({
     }, [products]);
 
     const loadCourses = async () => {
-        const productsArgs = getGraphQLQueryStringFromObject(products);
+        // const productsArgs = getGraphQLQueryStringFromObject(products);
         const query = `
-            query {
-                product: getProducts(ids: ${productsArgs}, limit: 1000, publicView: true) {
+            query ($ids: [String]) {
+                products: getProducts(ids: $ids, limit: 1000, publicView: true) {
                     title
                     courseId
                     featuredImage {
@@ -78,15 +78,20 @@ export default function Widget({
         `;
         const fetch = new FetchBuilder()
             .setUrl(`${state.address.backend}/api/graph`)
-            .setPayload(query)
+            .setPayload({
+                query,
+                variables: {
+                    ids: products,
+                },
+            })
             .setIsGraphQLEndpoint(true)
             .build();
 
         try {
             dispatch(actionCreators.networkAction(true));
             const response = await fetch.exec();
-            if (response.product) {
-                setProductItems(response.product);
+            if (response.products) {
+                setProductItems(response.products);
             }
         } catch (err) {
             console.log("Error", err.message); // eslint-disable-line no-console
diff --git a/packages/components-library/additional.d.ts b/packages/components-library/additional.d.ts
@@ -1,4 +1,3 @@
 declare module "next/link";
 declare module "next/legacy/image";
-declare module "next/image";
 declare module "next/navigation";
diff --git a/packages/components-library/src/content-card.tsx b/packages/components-library/src/content-card.tsx
@@ -1,8 +1,7 @@
 import { Card, CardContent } from "@/components/ui/card";
 import Link from "./link";
-import Image from "next/image";
-
 import { cn } from "@/lib/utils";
+import Image from "./image";
 
 interface ContentCardImageProps extends React.HTMLAttributes<HTMLDivElement> {
     src: string;
@@ -16,13 +15,11 @@ export function ContentCardImage({
     ...props
 }: ContentCardImageProps) {
     return (
-        <div className={cn("relative aspect-video", className)} {...props}>
+        <div className={cn("", className)} {...props}>
             <Image
-                src={src || "/courselit_backdrop_square.webp"}
-                alt={alt || ""}
-                fill
-                className="object-cover"
-                priority
+                src={src}
+                alt={alt}
+                loading="lazy"
             />
         </div>
     );
diff --git a/packages/components-library/src/image.tsx b/packages/components-library/src/image.tsx
@@ -1,4 +1,3 @@
-import React from "react";
 import NextImage from "next/legacy/image";
 
 interface ImgProps {
diff --git a/packages/components-library/src/product-card.tsx b/packages/components-library/src/product-card.tsx
@@ -36,7 +36,7 @@ export function ProductCard({
                             src={product.user?.avatar?.thumbnail}
                             alt={product.user?.name || "User Avatar"}
                             loading="lazy"
-                            className="!aspect-square !object-cover"
+                            className="!aspect-square"
                             width="w-6"
                             height="h-6"
                         />
diff --git a/packages/components-library/tsup.config.ts b/packages/components-library/tsup.config.ts
@@ -13,7 +13,6 @@ export default defineConfig((options: Options) => ({
         "next/link",
         "next/legacy/image",
         "next/navigation",
-        "next/image",
     ],
     ...options,
 }));
