Merge branch 'master' of https://codefirst.iut.uca.fr/git/noan.randon/Favor

Site Web/client/src/components/AjoutLien.js

@@ -29,6 +29,7 @@ const AjoutLien = () => {
                 dispatch(getPosts());
                 cancelPost();
                 setDisplayAdd(false);
+                await new Promise(r => setTimeout(r, 500));
                 window.location.reload();
             }else {
                 alert("Veuillez compléter tous les champs et ajouter au moins un tag.")

Site Web/client/src/pages/Profil.js

@@ -165,55 +165,53 @@ const Profil = () => {
                   </div> 
                 </div>
                   {followingPopup && (
-                                <div className="popup-profil-container">
-                                <div className="modal">
-                                    <h3>Abonnements</h3>
-                                    <span className="cross" onClick={() => setFollowingPopup(false)}>
-                                    &#10005;
-                                    </span>
-                                    <ul>
-                                        {
-                                            userData.following.map((follower, i) => {
-                                                return (
-                                                    <li key={i}>
-                                                        <MiniProfil uid={follower}/>
-                                                        <div classNameName="follow-handler">
-                                                            <FollowHandler idToFollow={uid} type={'card'}/>
-                                                        </div>
-                                                    </li>
-                                                )
-                                            })
-                                        }
-                                    </ul>
-                                </div>
-                                </div>
-                            )}
-                            {followerPopup && (
-                                <div classNameName="popup-profil-container">
-                                <div classNameName="modal">
-                                    <h3>Abonnés</h3>
-                                    <span classNameName="cross" onClick={() => setFollowerPopup(false)}>
-                                    &#10005;
-                                    </span>
-                                    <ul>
-                                        {
-                                            userData.followers.map((follower, i) => {
-                                                return (
-                                                    <li key={i}>
-                                                        <MiniProfil uid={follower}/>
-                                                        <div classNameName="follow-handler">
-                                                            <FollowHandler idToFollow={uid} type={'card'}/>
-                                                        </div>
-                                                    </li>
-                                                )
-                                            })
-                                        }
-                                    </ul>
-                                </div>
-                                </div>
-                            )}
-
-                
+                      <div className="popup-profil-container">
+                          <div className="modal">
+                              <h3>Abonnements</h3>
+                              <span className="cross" onClick={() => setFollowingPopup(false)}>
+                                  &#10005;
+                              </span>
+                              <ul>
+                                  {
+                                      userData.following.map((follower, i) => {
+                                          return (
+                                              <li key={i}>
+                                                  <MiniProfil uid={follower}/>
+                                                  <div classNameName="follow-handler">
+                                                      <FollowHandler idToFollow={uid} type={'card'}/>
+                                                  </div>
+                                              </li>
+                                          )
+                                      })
+                                  }
+                              </ul>
+                          </div>
+                      </div>
+                  )}
+                {followerPopup && (
+                    <div className="popup-profil-container">
+                        <div className="modal">
+                            <h3>Abonnements</h3>
+                            <span className="cross" onClick={() => setFollowerPopup(false)}>
+                                  &#10005;
+                              </span>
+                            <ul>
+                                {
+                                    userData.followers.map((follower, i) => {
+                                        return (
+                                            <li key={i}>
+                                                <MiniProfil uid={follower}/>
+                                                <div classNameName="follow-handler">
+                                                    <FollowHandler idToFollow={uid} type={'card'}/>
+                                                </div>
+                                            </li>
+                                        )
+                                    })
+                                }
+                            </ul>
+                        </div>
+                    </div>
+                )}
             </div>
 
 

Site Web/client/src/pages/Trends.js

@@ -15,9 +15,7 @@ const Trends = () => {
             {
                 userData.notif != null && userData.notif.map((notif) => {
                     return (
-                        <li>
                             <Notif key={notif._id} notification={notif}/>
-                        </li>
                     );
                 })
 

Site Web/client/src/styles/component/_ajoutLien.scss

@@ -8,8 +8,6 @@
     cursor: pointer;
 }
 
-
-
 .popup-ajout-container {
   position: fixed;
   animation: popup 1s forwards;

Site Web/client/src/styles/component/_miniProfil.scss

@@ -1,6 +1,7 @@
 .miniProfil{
   display: flex;
   justify-content: start;
+  margin-right: 5px;
 }
 
 .infoMiniProfil{

Site Web/client/src/styles/pages/_profil.scss

@@ -59,6 +59,7 @@
       position: absolute;
       top: 10%;
       left: 50%;
+      width: 500px;
       transform: translate(-100%);
       background: $color-2;
       padding: 25px;
@@ -223,7 +224,7 @@ width: 10%;
 
 .imageProfil{
   display: flex;
-justify-content: center;
+  justify-content: center;
 }
 
 .flex-menu {

Site Web/client/src/styles/pages/_searchBar.scss

@@ -15,7 +15,7 @@
 
 .listUsers{
     padding-top: 20px;
-    li {
+    ul {
         list-style: none;
         padding-left: 10%;
         padding-bottom: 15px;