Merge branch 'main' into claude/shopify-csv-sync-TuV8j

Author: asperpharma

data/shopify-import-3.csv

@@ -68,7 +68,7 @@ const csvArg = args.find(
   (a) => !a.startsWith("--") && (limitIdx === -1 || a !== args[limitIdx + 1])
 );
 const CSV_PATH =
-  csvArg || process.env.CSV_PATH || path.resolve("data/shopify-import-2.csv");
+  csvArg || process.env.CSV_PATH || path.resolve("data/shopify-import-3.csv");
 
 // Throttle between products (ms)
 const THROTTLE_MS = 500;
@@ -259,7 +259,7 @@ function groupProducts(rows: Record<string, string>[]): ProductGroup[] {
         title: row["Title"] || "",
         bodyHtml: row["Body (HTML)"] || "",
         vendor: row["Vendor"] || "Asper Beauty",
-        productType: type,
+        productType: normalizeProductType(type),
         tags,
         status: (row["Status"] || "active").toLowerCase(),
         seoTitle: row["SEO Title"] || "",
@@ -348,7 +348,7 @@ const PRODUCT_CREATE = `
 `;
 
 const PRODUCT_UPDATE = `
-  mutation ProductUpdate($input: ProductInput!) {
+  mutation ProductUpdate($input: ProductInput!, $media: [CreateMediaInput!]) {
     productUpdate(input: $input) {
       product {
         id
@@ -398,6 +398,103 @@ const GET_PUBLICATIONS = `
   }
 `;
 
+// ---------------------------------------------------------------------------
+// Inventory queries & mutations
+// ---------------------------------------------------------------------------
+
+const LOCATIONS_QUERY = `
+  query GetLocations {
+    locations(first: 1) {
+      edges { node { id name } }
+    }
+  }
+`;
+
+const VARIANT_INVENTORY_ITEMS = `
+  query VariantInventoryItems($productId: ID!) {
+    product(id: $productId) {
+      variants(first: 100) {
+        edges {
+          node {
+            id
+            sku
+            inventoryItem { id }
+          }
+        }
+      }
+    }
+  }
+`;
+
+const INVENTORY_SET_QUANTITIES = `
+  mutation InventorySetQuantities($input: InventorySetQuantitiesInput!) {
+    inventorySetQuantities(input: $input) {
+      inventoryAdjustmentGroup { reason }
+      userErrors { field message }
+    }
+  }
+`;
+
+let cachedLocationId: string | null = null;
+
+async function getPrimaryLocationId(): Promise<string> {
+  if (cachedLocationId) return cachedLocationId;
+  const data = await adminGraphQL(LOCATIONS_QUERY);
+  const loc = data?.locations?.edges?.[0]?.node;
+  if (!loc) throw new Error("No Shopify locations found. Create a location first.");
+  cachedLocationId = loc.id;
+  console.log(`  📍 Primary location: ${loc.name} (${loc.id})`);
+  return loc.id;
+}
+
+async function setInventoryQuantities(
+  productId: string,
+  variants: { sku: string; inventoryQty: number }[],
+  tag: string
+) {
+  const locationId = await getPrimaryLocationId();
+
+  // Fetch inventoryItemIds for the product's variants
+  const data = await adminGraphQL(VARIANT_INVENTORY_ITEMS, { productId });
+  const variantEdges = data?.product?.variants?.edges || [];
+
+  const quantities: { inventoryItemId: string; locationId: string; quantity: number }[] = [];
+
+  for (const edge of variantEdges) {
+    const node = edge.node;
+    const inventoryItemId = node.inventoryItem?.id;
+    if (!inventoryItemId) continue;
+
+    // Match by SKU or by position
+    const csvMatch = variants.find((v) => v.sku && v.sku === node.sku);
+    const qty = csvMatch?.inventoryQty ?? variants[variantEdges.indexOf(edge)]?.inventoryQty;
+
+    if (qty !== undefined && qty >= 0) {
+      quantities.push({ inventoryItemId, locationId, quantity: qty });
+    }
+  }
+
+  if (quantities.length === 0) return;
+
+  try {
+    const result = await adminGraphQL(INVENTORY_SET_QUANTITIES, {
+      input: {
+        name: "available",
+        reason: "correction",
+        quantities,
+      },
+    });
+    const errors = result?.inventorySetQuantities?.userErrors;
+    if (errors?.length) {
+      console.warn(`  ⚠️ ${tag} inventory warnings:`, errors);
+    } else {
+      console.log(`  📦 ${tag}: set inventory for ${quantities.length} variant(s)`);
+    }
+  } catch (invErr: any) {
+    console.warn(`  ⚠️ ${tag} inventory update failed: ${invErr.message}`);
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Sync logic
 // ---------------------------------------------------------------------------
@@ -591,6 +688,14 @@ async function syncProduct(product: ProductGroup, index: number, total: number)
       }
     }
   }
+  // 3. Set inventory quantities at the primary location
+  if (variantEdges?.length > 0 && product.variants.some((v) => v.inventoryQty > 0)) {
+    await setInventoryQuantities(
+      productId,
+      product.variants.map((v) => ({ sku: v.sku, inventoryQty: v.inventoryQty })),
+      tag
+    );
+  }
 
   // 3. Publish to storefront (auto-publish new active products, or if --publish flag)
   if (PUBLISH || (!existing && product.status === "active")) {

scripts/sync-shopify-catalog.ts

@@ -102,7 +102,7 @@ const XIcon = () => (
 export const socialLinks = [
   { key: "whatsapp", href: "https://wa.me/962790656666", label: "WhatsApp", Icon: WhatsAppIcon },
   { key: "instagram", href: "https://www.instagram.com/asper.beauty.shop/", label: "Instagram", Icon: InstagramIcon },
-  { key: "facebook", href: "https://www.facebook.com/AsperBeautyShop", label: "Facebook", Icon: FacebookIcon },
+  { key: "facebook", href: "https://www.facebook.com/robu.sweileh", label: "Facebook", Icon: FacebookIcon },
   { key: "tiktok", href: "https://tiktok.com/@asper.beauty.shop", label: "TikTok", Icon: TikTokIcon },
   { key: "youtube", href: "https://youtube.com/@asperbeautyshop", label: "YouTube", Icon: YouTubeIcon },
   { key: "snapchat", href: "https://snapchat.com/add/asperbeautyshop", label: "Snapchat", Icon: SnapchatIcon },

src/components/brand/SocialLinks.tsx

@@ -18,7 +18,7 @@ const socialPosts = [
     platform: "facebook" as const,
     caption: "Pharmacist-approved sunscreen picks for summer ☀️",
     hashtag: "#SanctuaryOfScience",
-    link: "https://www.facebook.com/AsperBeautyShop",
+    link: "https://www.facebook.com/robu.sweileh",
   },
   {
     id: 3,
@@ -32,7 +32,7 @@ const socialPosts = [
     platform: "facebook" as const,
     caption: "Pregnancy-safe skincare essentials 🤰",
     hashtag: "#SafeBeauty",
-    link: "https://www.facebook.com/AsperBeautyShop",
+    link: "https://www.facebook.com/robu.sweileh",
   },
   {
     id: 5,
@@ -46,7 +46,7 @@ const socialPosts = [
     platform: "facebook" as const,
     caption: "Customer spotlight: Sara's acne journey ✨",
     hashtag: "#AsperStories",
-    link: "https://www.facebook.com/AsperBeautyShop",
+    link: "https://www.facebook.com/robu.sweileh",
   },
 ];
 
@@ -152,7 +152,7 @@ export default function SocialGallery() {
           </a>
           <span className="text-border">|</span>
           <a
-            href="https://www.facebook.com/AsperBeautyShop"
+            href="https://www.facebook.com/robu.sweileh"
             target="_blank"
             rel="noopener noreferrer"
             className="group inline-flex items-center gap-2 text-sm font-body text-muted-foreground hover:text-accent transition-colors"

src/components/home/SocialGallery.tsx

@@ -66,13 +66,13 @@ export const CATEGORY_GROUPS: CategoryGroup[] = [
     icon: "🧴",
     subcategories: [
       { label: "Cleanser", types: ["Cleanser", "Face Wash", "Micellar Water", "Micellar"] },
-      { label: "Serum", types: ["Serum", "Face Serum"] },
+      { label: "Serum & Essence", types: ["Serum", "Face Serum", "Essence"] },
       { label: "Sunscreen", types: ["Sunscreen", "Sun Screen", "SPF", "Sun Care"] },
-      { label: "Moisturizer", types: ["Moisturizer", "Moisturiser", "Face Cream", "Day Cream", "Night Cream"] },
-      { label: "Toner", types: ["Toner", "Face Tonic"] },
+      { label: "Moisturizer", types: ["Moisturizer", "Moisturiser", "Face Cream", "Day Cream", "Night Cream", "Skin Care"] },
+      { label: "Toner & Mist", types: ["Toner", "Face Tonic", "Face Mist"] },
       { label: "Mask", types: ["Face Mask", "Sheet Mask", "Clay Mask", "Peel-Off Mask"] },
       { label: "Eye Care", types: ["Eye Cream", "Eye Serum", "Under Eye"] },
-      { label: "Exfoliator", types: ["Exfoliator", "Scrub", "Face Scrub", "Peeling"] },
+      { label: "Exfoliator & Peeling", types: ["Exfoliator", "Scrub", "Face Scrub", "Peeling"] },
     ],
   },
   {
@@ -84,6 +84,7 @@ export const CATEGORY_GROUPS: CategoryGroup[] = [
       { label: "Hair Treatment", types: ["Hair Treatment", "Hair Mask", "Hair Oil", "Hair Serum"] },
       { label: "Styling", types: ["Hair Styling", "Hair Spray", "Hair Gel", "Hair Wax"] },
       { label: "Hair Color", types: ["Hair Color", "Hair Dye"] },
+      { label: "Hair Care", types: ["Hair Care"] },
     ],
   },
   {
@@ -93,14 +94,15 @@ export const CATEGORY_GROUPS: CategoryGroup[] = [
       { label: "Body Lotion", types: ["Body Lotion", "Body Cream", "Body Butter"] },
       { label: "Body Wash", types: ["Body Wash", "Shower Gel", "Bath & Body"] },
       { label: "Hand & Foot", types: ["Hand Cream", "Foot Cream", "Hand & Nail"] },
-      { label: "Deodorant", types: ["Deodorant", "Antiperspirant"] },
+      { label: "Deodorant", types: ["Deodorant", "Antiperspirant", "Deodorant Spray", "Deodorant & Antiperspirant Roll"] },
+      { label: "Intimate Care", types: ["Intimate Wash", "Intimate Care"] },
     ],
   },
   {
     label: "Fragrance",
     icon: "🌹",
     subcategories: [
-      { label: "Perfume", types: ["Perfume", "Eau de Parfum", "EDP"] },
+      { label: "Perfume", types: ["Perfume", "Eau de Parfum", "EDP", "Fragrance"] },
       { label: "Eau de Toilette", types: ["Eau de Toilette", "EDT"] },
       { label: "Body Mist", types: ["Body Mist", "Body Spray"] },
       { label: "Gift Sets", types: ["Gift Set", "Fragrance Set"] },
@@ -113,6 +115,12 @@ export const CATEGORY_GROUPS: CategoryGroup[] = [
       { label: "Baby Skin", types: ["Baby Lotion", "Baby Cream", "Baby Oil", "Baby Wash"] },
       { label: "Maternity", types: ["Maternity", "Stretch Mark", "Nursing"] },
       { label: "Baby Hair", types: ["Baby Shampoo"] },
+      { label: "Feeding", types: ["Nipple", "Bottle", "Cutlery", "Baby Set"] },
+      { label: "Soothers & Teething", types: ["Soothers", "Teether"] },
+      { label: "Baby Toys", types: ["Toys", "Playmat", "Projecter"] },
+      { label: "Baby Essentials", types: ["Thermometer", "Sterilizer", "Swaddles", "Baby Towel", "Accessories"] },
+      { label: "Baby Oral Care", types: ["Toothpaste", "Toothbrush"] },
+      { label: "Baby Clothing", types: ["Body Care"] },
     ],
   },
 ];

src/lib/categoryMapping.ts

@@ -382,7 +382,7 @@ const Index = () => {
                 <a href="https://wa.me/962790656666" target="_blank" rel="noopener noreferrer" className="text-sm text-primary-foreground/60 hover:text-accent transition-colors font-body">
                   WhatsApp: +962 79 065 6666
                 </a>
-                <a href="https://instagram.com/asper.beauty.shop" target="_blank" rel="noopener noreferrer" className="text-sm text-primary-foreground/60 hover:text-accent transition-colors font-body">
+                <a href="https://www.instagram.com/asper.beauty.shop/" target="_blank" rel="noopener noreferrer" className="text-sm text-primary-foreground/60 hover:text-accent transition-colors font-body">
                   @asper.beauty.shop
                 </a>
                 <IncognitoToggle className="mt-1 border-primary-foreground/20 text-primary-foreground/60 hover:text-primary-foreground hover:border-primary-foreground/40" />

src/pages/Index.tsx

@@ -104,7 +104,7 @@ const Products = () => {
             Product Catalog
           </h1>
           <p className="mt-2 text-muted-foreground font-body">
-            Browse our curated collection of 3,000+ beauty & wellness products
+            Browse our curated collection of 4,000+ beauty & wellness products
           </p>
 
           <form onSubmit={handleSearch} className="mt-6 flex gap-2 max-w-lg">