From 3478c60c8093f985ac7ba2bf333a44b15f28b9a0 Mon Sep 17 00:00:00 2001 From: "bastien.ollier@etu.uca.fr" Date: Thu, 19 Jan 2023 18:41:28 +0100 Subject: [PATCH 1/2] on peut de nouveau poster --- Site Web/client/src/components/AjoutLien.js | 1 + Site Web/client/src/pages/Trends.js | 2 -- Site Web/client/src/styles/component/_ajoutLien.scss | 2 -- Site Web/client/src/styles/component/_miniProfil.scss | 1 + Site Web/client/src/styles/pages/_searchBar.scss | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Site Web/client/src/components/AjoutLien.js b/Site Web/client/src/components/AjoutLien.js index 630d2924..882532b1 100644 --- a/Site Web/client/src/components/AjoutLien.js +++ b/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.") diff --git a/Site Web/client/src/pages/Trends.js b/Site Web/client/src/pages/Trends.js index 0ae4975a..cdee3aa8 100644 --- a/Site Web/client/src/pages/Trends.js +++ b/Site Web/client/src/pages/Trends.js @@ -15,9 +15,7 @@ const Trends = () => { { userData.notif != null && userData.notif.map((notif) => { return ( -
  • -
  • ); }) diff --git a/Site Web/client/src/styles/component/_ajoutLien.scss b/Site Web/client/src/styles/component/_ajoutLien.scss index dcdd2b26..ae702e1a 100644 --- a/Site Web/client/src/styles/component/_ajoutLien.scss +++ b/Site Web/client/src/styles/component/_ajoutLien.scss @@ -8,8 +8,6 @@ cursor: pointer; } - - .popup-ajout-container { position: fixed; animation: popup 1s forwards; diff --git a/Site Web/client/src/styles/component/_miniProfil.scss b/Site Web/client/src/styles/component/_miniProfil.scss index 069ef048..cd50fa3f 100644 --- a/Site Web/client/src/styles/component/_miniProfil.scss +++ b/Site Web/client/src/styles/component/_miniProfil.scss @@ -1,6 +1,7 @@ .miniProfil{ display: flex; justify-content: start; + margin-right: 5px; } .infoMiniProfil{ diff --git a/Site Web/client/src/styles/pages/_searchBar.scss b/Site Web/client/src/styles/pages/_searchBar.scss index b43a7f25..304edcf8 100644 --- a/Site Web/client/src/styles/pages/_searchBar.scss +++ b/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; From 4350406120606dc7ffcf5bbe44433c6f9e58014d Mon Sep 17 00:00:00 2001 From: "bastien.ollier@etu.uca.fr" Date: Thu, 19 Jan 2023 18:57:04 +0100 Subject: [PATCH 2/2] popup follower du profil corriger --- Site Web/client/src/pages/Profil.js | 96 +++++++++---------- Site Web/client/src/styles/pages/_profil.scss | 3 +- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/Site Web/client/src/pages/Profil.js b/Site Web/client/src/pages/Profil.js index dba5422f..db213473 100644 --- a/Site Web/client/src/pages/Profil.js +++ b/Site Web/client/src/pages/Profil.js @@ -165,55 +165,53 @@ const Profil = () => { {followingPopup && ( -
    -
    -

    Abonnements

    - setFollowingPopup(false)}> - ✕ - -
      - { - userData.following.map((follower, i) => { - return ( -
    • - -
      - -
      -
    • - ) - }) - } -
    -
    -
    - )} - {followerPopup && ( -
    -
    -

    Abonnés

    - setFollowerPopup(false)}> - ✕ - -
      - { - userData.followers.map((follower, i) => { - return ( -
    • - -
      - -
      -
    • - ) - }) - } -
    -
    -
    - )} - - +
    +
    +

    Abonnements

    + setFollowingPopup(false)}> + ✕ + +
      + { + userData.following.map((follower, i) => { + return ( +
    • + +
      + +
      +
    • + ) + }) + } +
    +
    +
    + )} + {followerPopup && ( +
    +
    +

    Abonnements

    + setFollowerPopup(false)}> + ✕ + +
      + { + userData.followers.map((follower, i) => { + return ( +
    • + +
      + +
      +
    • + ) + }) + } +
    +
    +
    + )} diff --git a/Site Web/client/src/styles/pages/_profil.scss b/Site Web/client/src/styles/pages/_profil.scss index 69fb79b4..c60df4a6 100644 --- a/Site Web/client/src/styles/pages/_profil.scss +++ b/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 {