Merge pull request #228 from TokenScript/feat/wip-multi-auth

Feat/wip multi auth
SmartTokenLabs · Jul 18, 2023 · 6a4ba87 · 6a4ba87
2 parents ae4344b + 78617e4
commit 6a4ba87
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/hotel-bogota-passive-negotiation-website/src/App.js b/hotel-bogota-passive-negotiation-website/src/App.js
@@ -101,6 +101,7 @@ function App() {
         // legacy version output.
         setTokenProofData({proof: result.data});
       }
+      alert("Your discount has been applied");
     });
   }, [selectedPendingTokenInstances]);
 
@@ -120,13 +121,8 @@ function App() {
     return mockRoomData;
   };
 
-  // example to return a discount
-  const getApplicableDiscount = (ticketNum) => {
-    return mockRoomDiscountData * ticketNum;
-  };
-
   // When a ticket is present and user applies it, the discount will be shown
-  const applyDiscount = async (ticket, roomType) => {
+  const applyDiscountTicket = async (ticket, roomType) => {
     // tickets selected, but owner is not yet authenticated.
     let updatedTicketSelection = [];
     if (selectedPendingTokenInstances?.length) {
@@ -148,12 +144,8 @@ function App() {
     localStorage.setItem("booking-room-type", roomType);
   };
 
-  useEffect(() => {
-    localStorage.setItem(
-      "token-instances",
-      JSON.stringify(selectedPendingTokenInstances)
-    );
-    if (selectedPendingTokenInstances && selectedPendingTokenInstances.length) {
+  const applyDiscount = async () => {
+    if (selectedPendingTokenInstances?.length) {
       if (selectedPendingTokenInstances.length === 1) {
         window.negotiator.authenticate({
           issuer: config.collectionID,
@@ -176,7 +168,7 @@ function App() {
         tokenInstance: []
       });
     }
-  }, [selectedPendingTokenInstances]);
+  };
 
   // This is the example at which the hotel would begin a hotel room booking transaction.
   const book = async (formData) => {
@@ -228,6 +220,7 @@ function App() {
               key={index}
               room={room}
               applyDiscount={applyDiscount}
+              applyDiscountTicket={applyDiscountTicket}
               discount={discount}
               tokens={tokens}
               book={book}

diff --git a/hotel-bogota-passive-negotiation-website/src/BookingModal/index.js b/hotel-bogota-passive-negotiation-website/src/BookingModal/index.js
@@ -13,6 +13,7 @@ import "./BookingModal.css";
 
 export default function BookingModal({
   roomType,
+  applyDiscountTicket,
   applyDiscount,
   discount,
   price,
@@ -123,17 +124,18 @@ export default function BookingModal({
               <div>
                 {tokens.length > 0 && (
                   <p className="smallCopy">
-                    Select ticket(s) to apply discount:
+                    Select ticket(s) and apply discount:
                   </p>
                 )}
               </div>
               <div className="ticketWrapper">
                 {tokens?.map((token, index) => (
                   <div key={index}>
                     <TokenCard
-                      applyDiscount={(token) => {
-                        applyDiscount(token, roomType);
+                      applyDiscountTicket={(token) => {
+                        applyDiscountTicket(token, roomType);
                       }}
+                      applyDiscount={applyDiscount}
                       tokenInstance={token}
                       discount={discount}
                       selectedPendingTokenInstances={
@@ -143,6 +145,11 @@ export default function BookingModal({
                   </div>
                 ))}
               </div>
+              <div style={{display: "flex", justifyContent: "center"}}>
+                <Button onClick={applyDiscount} color="primary">
+                  Apply Discount
+                </Button>
+              </div>
               <TextField
                 id="booking-name"
                 label="Reference name"

diff --git a/hotel-bogota-passive-negotiation-website/src/RoomCard/index.js b/hotel-bogota-passive-negotiation-website/src/RoomCard/index.js
@@ -23,6 +23,7 @@ const useStyles = makeStyles({
 
 export default function RoomCard({
   room,
+  applyDiscountTicket,
   applyDiscount,
   discount,
   tokens,
@@ -47,6 +48,7 @@ export default function RoomCard({
       <CardActions>
         <BookingModal
           book={book}
+          applyDiscountTicket={applyDiscountTicket}
           applyDiscount={applyDiscount}
           tokens={tokens}
           roomType={type}

diff --git a/hotel-bogota-passive-negotiation-website/src/TokenCard/index.js b/hotel-bogota-passive-negotiation-website/src/TokenCard/index.js
@@ -7,7 +7,7 @@ import "./Card.css";
 
 function TokenCard({
   tokenInstance,
-  applyDiscount,
+  applyDiscountTicket,
   selectedPendingTokenInstances
 }) {
   let tokenSelected = false;
@@ -20,7 +20,9 @@ function TokenCard({
 
   return (
     <div
-      onClick={(e) => applyDiscount(tokenInstance)}
+      onClick={(e) => {
+        applyDiscountTicket(tokenInstance);
+      }}
       className={"tokenCard" + (tokenSelected ? " selected" : "")}
     >
       <div