Merge branch 'Weaverse:main' into main

Weaverse · Oct 16, 2024 · 100e200 · 100e200
2 parents 17b8af8 + 7acaccc
commit 100e200
Show file tree

Hide file tree

Showing 9 changed files with 251 additions and 210 deletions.
diff --git a/app/lib/judgeme.ts b/app/lib/judgeme.ts
@@ -11,6 +11,7 @@ type JudgemeProductData = {
 type JudgemeReviewType = {
   id: string;
   title: string;
+  created_at: string;
   body: string;
   rating: number;
   reviewer: {

diff --git a/app/modules/product-card/index.tsx b/app/modules/product-card/index.tsx
@@ -1,11 +1,10 @@
 import { Image, flattenConnection } from "@shopify/hydrogen";
-import type { MoneyV2, Product } from "@shopify/hydrogen/storefront-api-types";
+import type { MoneyV2 } from "@shopify/hydrogen/storefront-api-types";
 import clsx from "clsx";
 import type { ProductCardFragment } from "storefrontapi.generated";
 import { Link } from "~/components/link";
 import { ProductTag } from "~/components/product-tag";
 import { VariantPrices } from "~/components/variant-prices";
-import { getProductPlaceholder } from "~/lib/placeholders";
 import { isDiscounted, isNewArrival } from "~/lib/utils";
 import { QuickViewTrigger } from "./quick-view";
 
@@ -18,18 +17,15 @@ export function ProductCard({
   className?: string;
   loading?: HTMLImageElement["loading"];
 }) {
-  let cardLabel = "";
-  let cardProduct: Product = product?.variants
-    ? (product as Product)
-    : getProductPlaceholder();
-  if (!cardProduct?.variants?.nodes?.length) return null;
+  if (!product?.variants?.nodes?.length) return null;
 
-  let variants = flattenConnection(cardProduct.variants);
+  let variants = flattenConnection(product.variants);
   let firstVariant = variants[0];
 
   if (!firstVariant) return null;
-  let { image, price, compareAtPrice } = firstVariant;
 
+  let { image, price, compareAtPrice } = firstVariant;
+  let cardLabel = "";
   if (isDiscounted(price as MoneyV2, compareAtPrice as MoneyV2)) {
     cardLabel = "Sale";
   } else if (isNewArrival(product.publishedAt)) {

diff --git a/app/sections/judgeme-reviews/index.tsx b/app/sections/judgeme-reviews/index.tsx
@@ -2,16 +2,13 @@ import type {
   HydrogenComponentSchema
 } from "@weaverse/hydrogen";
 import { forwardRef } from "react";
-import { backgroundInputs } from "~/components/background-image";
 import { Section, layoutInputs } from "~/components/section";
 
 let JudgemeReviewSection = forwardRef<HTMLElement, any>((props, ref) => {
   let { children, loaderData, ...rest } = props;
   return (
     <Section ref={ref} {...rest} overflow="unset">
-      <div className="max-w-4xl mx-auto py-6 px-8 bg-white rounded shadow">
         {children}
-      </div>
     </Section>
   );
 });
@@ -22,21 +19,24 @@ export let schema: HydrogenComponentSchema = {
   type: "judgeme-reviews",
   title: "Judgeme Reviews",
   inspector: [
-    // {
-    //   group: "Layout",
-    //   inputs: layoutInputs.filter((inp) => inp.name !== "borderRadius"),
-    // },
-    // {
-    //   group: "Background",
-    //   inputs: backgroundInputs.filter((inp) => inp.name === "backgroundColor"),
-    // },
+    {
+      group: "Layout",
+      inputs: layoutInputs.filter((inp) => inp.name !== "borderRadius"),
+    },
   ],
   childTypes: [
     "heading",
-    "subheading",
-    "paragraph",
-    "button",
-    "judgeme-review--form",
-    "judgeme-review--list",
+    "judgeme-review--index",
   ],
+  presets: {
+    children: [
+      {
+        type: "heading",
+        Content: "Reviews",
+      },
+      {
+        type: "judgeme-review--index",
+      },
+    ],
+  },
 };