noan.randon
/
Favor
3
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codefirst.iut.uca.fr/git/noan.randon/Favor
continuous-integration/drone/push Build encountered an error Details

Browse Source
master
Darius BERTRAND 2 years ago
parent c1930c43d0 4350406120
commit c1a1e9dacc
7 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File

1
Site Web/client/src/components/AjoutLien.js
Unescape View File

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

96
Site Web/client/src/pages/Profil.js
Unescape View File

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

2
Site Web/client/src/pages/Trends.js
Unescape View File

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

2
Site Web/client/src/styles/component/_ajoutLien.scss
Unescape View File

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

1
Site Web/client/src/styles/component/_miniProfil.scss
Unescape View File

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

3
Site Web/client/src/styles/pages/_profil.scss
Unescape View File

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

2
Site Web/client/src/styles/pages/_searchBar.scss
Unescape View File

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

Write Preview
Loading…
Cancel
Save