resolve merge conflicts

silvankammermann · Oct 28, 2023 · 675e62b · 675e62b
1 parent a51e9a4
commit 675e62b
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/frontend/src/app/components/TinderSwiper/TinderSwiper.js b/frontend/src/app/components/TinderSwiper/TinderSwiper.js
@@ -7,11 +7,18 @@ import TinderCard from "react-tinder-card";
 const TinderSwiper = ({ taksId, taskName }) => {
   return (
     <>
-      <TinderCard>
-        <div className={styles.container}>
-          <span className="h1">{taskName}</span>
-        </div>
-      </TinderCard>
+      <div className={styles.cardStack}>
+        <TinderCard key="1" className={styles.card}>
+          <div className={styles.container}>
+            <span className="h1">{taskName}</span>
+          </div>
+        </TinderCard>
+        <TinderCard key="2" className={styles.card}>
+          <div className={styles.container}>
+            <span className="h1">{taskName}</span>
+          </div>
+        </TinderCard>
+      </div>
       <div className={styles.decissionTriggers}>
         <button className="h2 circle bgRed colorWhite">Later</button>
         <button className="h2 circle bgGreen colorWhite">Yes!</button>