homingos · Yuvrajhere · Sep 13, 2022 · Sep 13, 2022 · Sep 13, 2022 · Sep 13, 2022
diff --git a/dist/FlamSaasSDK.js b/dist/FlamSaasSDK.js
diff --git a/examples/vanilla-js/index.js b/examples/vanilla-js/index.js
@@ -131,7 +131,12 @@ function buyCard(id) {
   let orderDetails = {
     productId: id,
     refId: random,
-    logo: "https://upload.wikimedia.org/wikipedia/commons/thumb/5/51/Facebook_f_logo_%282019%29.svg/2048px-Facebook_f_logo_%282019%29.svg.png"
+    prefill: {
+      name: 'Yuvraj Singh',
+      email: 'support@email.com',
+      phone: '+91 98765 43210'
+    }
+    // logo: 'https://upload.wikimedia.org/wikipedia/commons/thumb/5/51/Facebook_f_logo_%282019%29.svg/2048px-Facebook_f_logo_%282019%29.svg.png'
   };
 
   flam.placeOrder(orderDetails, (err, res) => {

diff --git a/src/constants.js b/src/constants.js
@@ -1,5 +1,5 @@
- const SDK_BASE_URL = 'https://saas-sdk-flam.vercel.app';
-//const SDK_BASE_URL = 'http://localhost:3000';
+const SDK_BASE_URL = 'https://saas-sdk-flam.vercel.app';
+// const SDK_BASE_URL = 'http://localhost:3000';
 
 export const PAGES = {
   main: SDK_BASE_URL,

diff --git a/src/placeOrder.js b/src/placeOrder.js
@@ -84,6 +84,7 @@ export default async function placeOrder(order_details, callback) {
 
     // render the success UI
     let url = `${PAGES.main}`;
+
     this.callback = callback;
 
     await this.renderWithRetry(url);

diff --git a/src/receiveMessage.js b/src/receiveMessage.js
@@ -19,6 +19,7 @@ export default function receiveMessage(event) {
         this.sendMessage({
           type: 'INITIAL_DATA_ERR',
           payload: {
+            ...this.clientData,
             email:
               this.order_details &&
               this.order_details.prefill &&

diff --git a/ui/.env.development b/ui/.env.development
@@ -1,2 +1,4 @@
 NEXT_PUBLIC_BACKEND_URL=https://api.flamapp.com/saas
-NEXT_PUBLIC_SANDBOX_BACKEND_URL=https://api.flamapp.com/saas
+NEXT_PUBLIC_SANDBOX_BACKEND_URL=https://api.flamapp.com/saas
+NEXT_PUBLIC_BACKEND_AUTH_KEY=7cc88f57ac9789058ea3e42e8329d0f52ef86acb
+NEXT_PUBLIC_SANDBOX_BACKEND_AUTH_KEY=7cc88f57ac9789058ea3e42e8329d0f52ef86acb
diff --git a/ui/.env.production b/ui/.env.production
@@ -1,2 +1,4 @@
 NEXT_PUBLIC_BACKEND_URL=https://api.flamapp.com/saas
-NEXT_PUBLIC_SANDBOX_BACKEND_URL=https://api.flamapp.com/saas
+NEXT_PUBLIC_SANDBOX_BACKEND_URL=https://api.flamapp.com/saas
+NEXT_PUBLIC_BACKEND_AUTH_KEY=7cc88f57ac9789058ea3e42e8329d0f52ef86acb
+NEXT_PUBLIC_SANDBOX_BACKEND_AUTH_KEY=7cc88f57ac9789058ea3e42e8329d0f52ef86acb
diff --git a/ui/api/index.ts b/ui/api/index.ts
@@ -1,10 +1,14 @@
 import axios from 'axios';
 
-const backend_base_URL = process.env.NEXT_PUBLIC_BACKEND_URL;
-const backend_sandbox_base_URL = process.env.NEXT_PUBLIC_SANDBOX_BACKEND_URL;
-
 const getUrl = (env: 'SANDBOX' | 'PRODUCTION') =>
-  env == 'PRODUCTION' ? backend_base_URL : backend_sandbox_base_URL;
+  env == 'PRODUCTION'
+    ? process.env.NEXT_PUBLIC_BACKEND_URL
+    : process.env.NEXT_PUBLIC_SANDBOX_BACKEND_URL;
+
+const getAuthKey = (env: 'SANDBOX' | 'PRODUCTION') =>
+  env == 'PRODUCTION'
+    ? process.env.NEXT_PUBLIC_BACKEND_AUTH_KEY
+    : process.env.NEXT_PUBLIC_SANDBOX_BACKEND_AUTH_KEY;
 
 export const getProductData = async ({
   env = 'SANDBOX',
@@ -33,7 +37,7 @@ export const getSignedURL = async (
 ) => {
   const res = await axios.post(`${getUrl(env)}/orders/v2/signed_url`, data, {
     headers: {
-      Authorization: 'Token 7cc88f57ac9789058ea3e42e8329d0f52ef86acb'
+      Authorization: `Token ${getAuthKey(env)}`
     }
   });
   return res.data;
@@ -90,3 +94,43 @@ export const getCLientData = async ({
 
   return res.data;
 };
+
+export const getCreatedProductData = async ({
+  env = 'SANDBOX',
+  flamCardId
+}: {
+  env: 'SANDBOX' | 'PRODUCTION';
+  flamCardId: string;
+}) => {
+  // /api/v1/orders/flamcard?flamcard_id=bee5c2d4-20fb-4b7f-8d91-0746a5117ca7
+  const res = await axios.get(`${getUrl(env)}/api/v1/orders/flamcard`, {
+    params: {
+      flamcard_id: flamCardId
+    },
+    headers: {
+      Authorization: `Token ${getAuthKey(env)}`
+    }
+  });
+
+  return res.data;
+};
+
+export const updateCard = async ({
+  env = 'SANDBOX',
+  data
+}: {
+  env: 'SANDBOX' | 'PRODUCTION';
+  data: {
+    flamcardId: string;
+    newVideoUrl: string;
+  };
+}) => {
+  const res = await axios.post(`${getUrl(env)}/api/v1/videochange`, data, {
+    // api/v1/videochange
+    headers: {
+      Authorization: `Token ${getAuthKey(env)}`
+    }
+  });
+
+  return res;
+};
diff --git a/ui/components/atoms/Text.tsx b/ui/components/atoms/Text.tsx
diff --git a/ui/components/molecules/ProductImage.tsx b/ui/components/molecules/ProductImage.tsx
@@ -10,8 +10,8 @@ function ProductImage({
   setData
 }: {
   existingPhoto: string;
-  photo: any;
-  setData: Dispatch<SetStateAction<any>>;
+  photo?: any;
+  setData?: Dispatch<SetStateAction<any>>;
 }) {
   const [files, setFiles] = useState<any[]>([]);
 
@@ -31,10 +31,12 @@ function ProductImage({
         )
       );
 
-      setData((prev: any) => ({
-        ...prev,
-        photo: acceptedFiles[0]
-      }));
+      if (setData) {
+        setData((prev: any) => ({
+          ...prev,
+          photo: acceptedFiles[0]
+        }));
+      }
     }
   });
 

diff --git a/ui/components/organisms/ModalFooter.tsx b/ui/components/organisms/ModalFooter.tsx
@@ -15,7 +15,7 @@ const ModalFooter = ({
   showLaterOption: boolean;
   handleSubmit: (data: any) => void;
   is_deferred: boolean;
-  setData: Dispatch<SetStateAction<any>>;
+  setData?: Dispatch<SetStateAction<any>>;
 }) => {
   return (
     <div
@@ -30,10 +30,12 @@ const ModalFooter = ({
               className="flex items-baseline gap-2 cursor-pointer"
               onClick={e => {
                 e.preventDefault();
-                setData((prev: any) => ({
-                  ...prev,
-                  is_deferred: !is_deferred
-                }));
+                if (setData) {
+                  setData((prev: any) => ({
+                    ...prev,
+                    is_deferred: !is_deferred
+                  }));
+                }
               }}
             >
               {is_deferred ? (

diff --git a/ui/components/organisms/ModalHeader.tsx b/ui/components/organisms/ModalHeader.tsx
@@ -12,8 +12,8 @@ function ModalHeader({
 }: {
   title: string;
   showPhoto: boolean;
-  photo: File;
-  setData: Dispatch<SetStateAction<any>>;
+  photo?: File;
+  setData?: Dispatch<SetStateAction<any>>;
   existingPhoto: string;
   clientData: {
     name: string;

diff --git a/ui/components/organisms/VideoUpload.tsx b/ui/components/organisms/VideoUpload.tsx
@@ -5,13 +5,13 @@ import { IoMdImage } from 'react-icons/io';
 import DropArea from '../atoms/DropArea';
 
 const VideoUpload = ({
-  is_defered,
-  existingVideo,
+  is_defered = false,
+  existingVideo = '',
   video,
   setData
 }: {
-  is_defered: boolean;
-  existingVideo: string;
+  is_defered?: boolean;
+  existingVideo?: string;
   video: any;
   setData: Dispatch<SetStateAction<any>>;
 }) => {

diff --git a/ui/hooks/useMessage.tsx b/ui/hooks/useMessage.tsx
@@ -15,11 +15,20 @@ function useMessage(environment: 'SANDBOX' | 'PRODUCTION') {
     }
   }, [environment]);
 
+  const receiveMessage = (
+    event: ReceivedEventType,
+    handleMessage: (event: ReceivedEventType) => void
+  ) => {
+    if (event.origin.concat('/') === parentUrl) {
+      handleMessage(event);
+    }
+  };
+
   function sendMessage(message: { type: string; payload?: any }) {
     parent.postMessage({ ...message, parentUrl }, parentUrl);
   }
 
-  return { sendMessage, ready: Boolean(parentUrl), parentUrl };
+  return { sendMessage, receiveMessage, parentUrl };
 }
 
 export default useMessage;
diff --git a/ui/pages/404.tsx b/ui/pages/404.tsx
@@ -0,0 +1,18 @@
+import FlexCenter from '../components/atoms/FlexCenter';
+
+const NotFound = () => {
+  return (
+    <div className="h-screen w-screen  bg-white">
+      <FlexCenter col className="gap-4">
+        <h1 className="text-3xl font-medium">404 | Page not found</h1>
+        <a href="https://saas-business.web.app/">
+          <button className="bg-brand_blue text-white text-sm font-bold py-2 px-16 h-min w-full rounded-lg">
+            Go back to main page
+          </button>
+        </a>
+      </FlexCenter>
+    </div>
+  );
+};
+
+export default NotFound;