Merge branch 'Weaverse:main' into main

Weaverse · Jul 22, 2024 · c9b047f · c9b047f
2 parents b5feb08 + 885b4de
commit c9b047f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.env.example b/.env.example
@@ -1,15 +1,14 @@
 # Replace the values with your own
 SESSION_SECRET="foobar"
 
-PUBLIC_STOREFRONT_ID=1000010106
-PUBLIC_STOREFRONT_API_TOKEN=939ac830f7c7c6d229a24dd78f4258f0
 PUBLIC_STORE_DOMAIN=weaverse-hydrogen.myshopify.com
+PUBLIC_STOREFRONT_API_TOKEN=939ac830f7c7c6d229a24dd78f4258f0
 PUBLIC_CUSTOMER_ACCOUNT_API_CLIENT_ID=shp_182e9ed0-270f-473a-be74-e3073f852c39
 PUBLIC_CUSTOMER_ACCOUNT_API_URL=https://shopify.com/72804106547
 PUBLIC_CHECKOUT_DOMAIN=www.weaverse.dev
 
-
 ## optional
+PUBLIC_STOREFRONT_ID=1000010106
 #PRIVATE_STOREFRONT_API_TOKEN="your-private-storefront-api-token"
 
 # Weaverse setup

diff --git a/app/modules/product-form/product-media.tsx b/app/modules/product-form/product-media.tsx
@@ -69,7 +69,7 @@ export function ProductMedia(props: ProductMediaProps) {
         onSlideChange={(swiper) => {
           setActiveIndex(swiper.activeIndex);
         }}
-        className="max-w-full pb-14 md:pb-0 md:[&_.swiper-pagination-fraction]:hidden"
+        className="vt-product-image max-w-full pb-14 md:pb-0 md:[&_.swiper-pagination-fraction]:hidden"
         style={
           {
             "--swiper-pagination-bottom": "20px",

diff --git a/app/styles/app.css b/app/styles/app.css
@@ -1,4 +1,4 @@
-@import "swiper/css/bundle";
+@import "swiper/swiper-bundle.css";
 
 @tailwind base;
 @tailwind components;

diff --git a/env.d.ts b/env.d.ts
@@ -3,13 +3,9 @@
 /// <reference types="@shopify/oxygen-workers-types" />
 
 import type { HydrogenCart, HydrogenSessionData } from "@shopify/hydrogen";
-import type {
-  LanguageCode,
-  CountryCode,
-} from "@shopify/hydrogen/storefront-api-types";
-import type { AppSession } from "~/lib/session";
 import type { WeaverseClient } from "@weaverse/hydrogen";
-import type { Storefront, CustomerAccount } from "~/lib/type";
+import type { AppSession } from "~/lib/session";
+import type { CustomerAccount, Storefront } from "~/lib/type";
 
 declare global {
   /**
@@ -57,6 +53,3 @@ declare module "@shopify/remix-oxygen" {
    */
   interface SessionData extends HydrogenSessionData {}
 }
-
-// Needed to make this file a module.
-export {};