Merge pull request #22 from valihna/theoSarhane

Theo sarhane
valihna · Nov 24, 2023 · 242b6fd · 242b6fd
2 parents 4dd0f2c + 9359031
commit 242b6fd
Show file tree

Hide file tree

Showing 27 changed files with 346 additions and 109 deletions.
diff --git a/backend/db.json b/backend/db.json
@@ -0,0 +1,104 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+{
+  "users": [
+    {
+      "id": "641782ba-ce3d-48f7-8da0-6681384c49a2",
+      "username": "Viola69",
+      "email": "[email protected]",
+      "avatar": "https://avatars.githubusercontent.com/u/82421949",
+      "password": "EX9J3hAVPeRxa3H",
+      "birthdate": "1973-07-25T14:56:10.020Z",
+      "registeredAt": "2023-02-16T07:31:26.096Z"
+    },
+    {
+      "id": "8efcc26b-f5ef-4fda-bb42-b17b591f65a7",
+      "username": "Darlene.Waters",
+      "email": "[email protected]",
+      "avatar": "https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/232.jpg",
+      "password": "UI8q1J5pBgiLwxp",
+      "birthdate": "1980-10-22T09:17:04.040Z",
+      "registeredAt": "2023-09-13T11:26:37.997Z"
+    },
+    {
+      "id": "83466ee5-2447-465e-8365-25d4609fa796",
+      "username": "Imelda_Reynolds",
+      "email": "[email protected]",
+      "avatar": "https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/815.jpg",
+      "password": "sB671sreWWKUBUn",
+      "birthdate": "1995-09-04T06:27:10.316Z",
+      "registeredAt": "2023-10-14T12:25:05.129Z"
+    },
+    {
+      "id": "8d412668-21ea-4679-9fc7-ee5f776ed8fd",
+      "username": "Zane76",
+      "email": "[email protected]",
+      "avatar": "https://avatars.githubusercontent.com/u/6424642",
+      "password": "HS7glT_8BoDUVOp",
+      "birthdate": "1943-04-26T23:48:51.930Z",
+      "registeredAt": "2023-01-13T03:43:03.224Z"
+    },
+    {
+      "id": "c492f630-a845-4a6a-9b9f-40c92a7aa565",
+      "username": "Anastacio_Schneider4",
+      "email": "[email protected]",
+      "avatar": "https://avatars.githubusercontent.com/u/49594731",
+      "password": "mO_ezS83LA3Canm",
+      "birthdate": "1961-09-27T18:40:10.734Z",
+      "registeredAt": "2023-09-12T18:05:15.149Z"
+    }
+  ]
+}
+=======
+{
+  "users": [
+    {
+      "id": "1c93bbc3-eeec-4a6d-87ff-058c7b16e1fb",
+      "username": "Dorris_Lakin",
+      "email": "[email protected]",
+      "avatar": "https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/461.jpg",
+      "password": "AMbib_ucSYVjfxK",
+      "birthdate": "1978-12-16T14:07:17.522Z",
+      "registeredAt": "2023-08-15T07:25:17.059Z"
+    },
+    {
+      "id": "72905bd9-f8c2-4e6a-8c1d-40f7ba158f12",
+      "username": "Louisa_Powlowski",
+      "email": "[email protected]",
+      "avatar": "https://avatars.githubusercontent.com/u/53140870",
+      "password": "draDRm_0cpLPkUO",
+      "birthdate": "2004-04-23T11:23:56.984Z",
+      "registeredAt": "2023-09-26T02:37:58.576Z"
+    },
+    {
+      "id": "c997cb74-99e6-44e2-854b-e6f90744ff46",
+      "username": "Stanford70",
+      "email": "[email protected]",
+      "avatar": "https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/923.jpg",
+      "password": "QTZtGetu8Y47QZQ",
+      "birthdate": "1951-01-05T01:57:09.298Z",
+      "registeredAt": "2023-03-19T15:59:57.110Z"
+    },
+    {
+      "id": "428115ad-4a1e-4276-8fe3-822da4dca183",
+      "username": "Dixie60",
+      "email": "[email protected]",
+      "avatar": "https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/3.jpg",
+      "password": "oODXTstUS9cGeqo",
+      "birthdate": "1969-09-01T22:22:29.222Z",
+      "registeredAt": "2023-03-02T13:39:53.506Z"
+    },
+    {
+      "id": "714d7657-470c-4dca-8c95-90fa89b6ee4f",
+      "username": "Art_Keeling52",
+      "email": "[email protected]",
+      "avatar": "https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/341.jpg",
+      "password": "O729_XG9omHf2X8",
+      "birthdate": "1945-06-22T01:31:47.823Z",
+      "registeredAt": "2023-08-26T15:24:12.178Z"
+    }
+  ]
+}
+>>>>>>> 0a49db158776eed933f794ce28ea1261fe57c4bb
+=======
+>>>>>>> 69afff10c1d1a2bd57ec5e3cf2c5446acacca39c
diff --git a/frontend/assets/360_F_175994457_9HLmhvBVEEbmGZAYomaIHCUeQ2909Yv9.jpg b/frontend/assets/360_F_175994457_9HLmhvBVEEbmGZAYomaIHCUeQ2909Yv9.jpg
diff --git a/frontend/assets/COUV-ARTICLES-1920x1080-64-1024x576.jpg b/frontend/assets/COUV-ARTICLES-1920x1080-64-1024x576.jpg
diff --git a/frontend/assets/Capture d’écran 2023-11-23 à 11.30.41.png b/frontend/assets/Capture d’écran 2023-11-23 à 11.30.41.png
diff --git a/frontend/assets/Capture d’écran 2023-11-23 à 11.33.43.png b/frontend/assets/Capture d’écran 2023-11-23 à 11.33.43.png
diff --git a/frontend/assets/Capture d’écran 2023-11-23 à 11.36.22.png b/frontend/assets/Capture d’écran 2023-11-23 à 11.36.22.png
diff --git a/frontend/assets/Capture d’écran 2023-11-23 à 11.36.35.png b/frontend/assets/Capture d’écran 2023-11-23 à 11.36.35.png
diff --git a/frontend/assets/Capture d’écran 2023-11-23 à 11.37.32.png b/frontend/assets/Capture d’écran 2023-11-23 à 11.37.32.png
diff --git a/frontend/assets/giphy-1.gif b/frontend/assets/giphy-1.gif
diff --git a/frontend/assets/giphy-2.gif b/frontend/assets/giphy-2.gif
diff --git a/frontend/assets/giphy.gif b/frontend/assets/giphy.gif
diff --git a/frontend/assets/images-1.jpg b/frontend/assets/images-1.jpg
diff --git a/frontend/assets/images-2.jpg b/frontend/assets/images-2.jpg
diff --git a/frontend/components/Calendrier/Calendrier.jsx b/frontend/components/Calendrier/Calendrier.jsx
@@ -6,114 +6,121 @@ import "./calendrier.css";
 function Calendrier() {
   const [dataCadeau, setDataCadeau] = useState(0);
 
-  function cadeau(event){
+  function cadeau(event) {
     setDataCadeau(event.target.value);
   }
 
-  function fermer(){
+  function fermer() {
     setDataCadeau(0);
   }
 
   return (
     <div className="calender-all-container">
       <div className="calender-container">
         <div className="first-row">
-          <button type="button" className="case" value="1" onClick={cadeau} >
+          <button type="button" className="case" value="1" onClick={cadeau}>
             1
           </button>
           <button type="button" className="case" value="2" onClick={cadeau}>
             2
           </button>
-          <div className="case">
-            <p className="numbers-calendrier">3</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">4</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">5</p>
-          </div>
+          <button type="button" className="case" value="3" onClick={cadeau}>
+            3
+          </button>
+          <button type="button" className="case" value="4" onClick={cadeau}>
+            4
+          </button>
+          <button type="button" className="case" value="5" onClick={cadeau}>
+            5
+          </button>
         </div>
+
         <div className="second-row">
-          <div className="case">
-            <p className="numbers-calendrier">6</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">7</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">8</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">9</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">10</p>
-          </div>
+          <button type="button" className="case" value="6" onClick={cadeau}>
+            6
+          </button>
+          <button type="button" className="case" value="7" onClick={cadeau}>
+            7
+          </button>
+          <button type="button" className="case" value="8" onClick={cadeau}>
+            8
+          </button>
+          <button type="button" className="case" value="9" onClick={cadeau}>
+            9
+          </button>
+          <button type="button" className="case" value="10" onClick={cadeau}>
+            10
+          </button>
         </div>
+
         <div className="third-row">
-          <div className="case">
-            <p className="numbers-calendrier">11</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">12</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">13</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">14</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">15</p>
-          </div>
+          <button type="button" className="case" value="11" onClick={cadeau}>
+            11
+          </button>
+          <button type="button" className="case" value="12" onClick={cadeau}>
+            12
+          </button>
+          <button type="button" className="case" value="13" onClick={cadeau}>
+            13
+          </button>
+          <button type="button" className="case" value="14" onClick={cadeau}>
+            14
+          </button>
+          <button type="button" className="case" value="15" onClick={cadeau}>
+            15
+          </button>
         </div>
+
         <div className="fourth-row">
-          <div className="case">
-            <p className="numbers-calendrier">16</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">17</p>
-          </div> 
-          <div className="case">
-            <p className="numbers-calendrier">18</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">19</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">20</p>
-          </div>
+          <button type="button" className="case" value="16" onClick={cadeau}>
+            16
+          </button>
+          <button type="button" className="case" value="17" onClick={cadeau}>
+            17
+          </button>
+          <button type="button" className="case" value="18" onClick={cadeau}>
+            18
+          </button>
+          <button type="button" className="case" value="19" onClick={cadeau}>
+            19
+          </button>
+          <button type="button" className="case" value="20" onClick={cadeau}>
+            20
+          </button>
         </div>
+
         <div className="fivth-row">
-          <div className="case">
-            <p className="numbers-calendrier">21</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">22</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">23</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">24</p>
-          </div>
-          <div className="case">
-            <p className="numbers-calendrier">25</p>
-          </div>
+          <button type="button" className="case" value="21" onClick={cadeau}>
+            21
+          </button>
+          <button type="button" className="case" value="22" onClick={cadeau}>
+            22
+          </button>
+          <button type="button" className="case" value="23" onClick={cadeau}>
+            23
+          </button>
+          <button type="button" className="case" value="24" onClick={cadeau}>
+            24
+          </button>
+          <button type="button" className="case" value="25" onClick={cadeau}>
+            25
+          </button>
         </div>
       </div>
 
-        <div>
-          {data.filter((cadeau) => cadeau.id === +dataCadeau)
-          .map((cadeau) => ( 
-            <CardCalendrier key={cadeau.id} title={cadeau.title} urlImg={cadeau.urlImg} fermer={fermer}/>
-            )
-            )
-          }
-        </div>
+      <div>
+        {data
+          .filter((cadeau) => cadeau.id === +dataCadeau)
+          .map((cadeau) => (
+            <CardCalendrier
+              key={cadeau.id}
+              title={cadeau.title}
+              urlImg={cadeau.urlImg}
+              fermer={fermer}
+            />
+          ))}
       </div>
-
+    </div>
   );
 }
 

diff --git a/frontend/components/Calendrier/calendrier.css b/frontend/components/Calendrier/calendrier.css
@@ -5,7 +5,8 @@
 
 /* Keyframes */
 @keyframes wiggle {
-  0%, 7% {
+  0%,
+  7% {
     transform: rotateZ(0);
   }
   15% {
@@ -23,7 +24,8 @@
   35% {
     transform: rotateZ(-4deg);
   }
-  40%, 100% {
+  40%,
+  100% {
     transform: rotateZ(0);
   }
 }
@@ -33,14 +35,16 @@
 }
 
 .case {
-  width: 125px;
-  height: 120px;
+  width: 145px;
+  height: 140px;
   border: 5px solid #ead10f;
   background: none;
   margin: 5px;
   color: white;
   border-radius: 10px;
   box-shadow: -5px 5px 5px black;
+  font-size: 3rem;
+  color: rgb(255, 235, 85);
 }
 
 .numbers-calendrier {
@@ -69,4 +73,3 @@
   display: flex;
   justify-content: center;
 }
-
diff --git a/frontend/components/CardCalendrier/CardCalendrier.jsx b/frontend/components/CardCalendrier/CardCalendrier.jsx
@@ -1,13 +1,16 @@
+/* eslint-disable react/prop-types */
 import "./CardCalendrier.css";
 
-function CardCalendrier({urlImg, title, fermer}){
-    return <div className="cadeau">
-        <span onClick={fermer}>X</span>
-        <div>
-            <h1>{title}</h1>
-        </div>
-        <img src={urlImg} alt={title}/>
+function CardCalendrier({ urlImg, title, fermer }) {
+  return (
+    <div className="cadeau">
+      <span onClick={fermer}>X</span>
+      <div>
+        <h1>{title}</h1>
+      </div>
+      <img src={urlImg} alt={title} />
     </div>
+  );
 }
 
-export default CardCalendrier;
+export default CardCalendrier;
diff --git a/frontend/components/Surprise/Surprise.css b/frontend/components/Surprise/Surprise.css
@@ -1,9 +1,15 @@
+<<<<<<< HEAD
+/* * {
+  background-image: url(frontend/src/assets/imageSurprise.jpg);
+=======
 .surprise {
   background-image: url(public/imageSurprise.jpg);
+>>>>>>> 8485bddcb17696aa999f14b25f7e9b36c36e6940
   background-size: 100%;
   background-attachment: fixed;
   margin: 0;
-}
+  padding: O;
+} */
 
 .containerSurprise {
   display: flex;

diff --git a/frontend/components/Surprise/SurpriseCom.jsx b/frontend/components/Surprise/SurpriseCom.jsx
@@ -1,4 +1,3 @@
-import React from "react";
 import "../../components/Surprise/Surprise.css";
 
 function SurpriseCom() {