From e4631b3b6f1aecc56ff2c4462c48c0e15e6523c7 Mon Sep 17 00:00:00 2001
From: Noan07 <84435602+Noan07@users.noreply.github.com>
Date: Tue, 3 Jan 2023 16:01:13 +0100
Subject: [PATCH] Visuel post

---
 .../components/Configurations/ConfigurationDuProfil.js    | 7 +++++--
 Site Web/client/src/components/Navbar.js                  | 4 ++--
 Site Web/client/src/components/Post/Post.js               | 6 +++---
 Site Web/client/src/components/Routes/index.js            | 6 +++---
 Site Web/client/src/pages/Configuration.js                | 7 ++++---
 Site Web/client/src/styles/component/_navbar.scss         | 8 +++++++-
 Site Web/client/src/styles/component/_newPoste.scss       | 4 ++++
 Site Web/client/src/styles/pages/_configuration.scss      | 4 ++++
 8 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js
index e95586f0..b6b71f4e 100644
--- a/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js	
+++ b/Site Web/client/src/components/Configurations/ConfigurationDuProfil.js	
@@ -5,7 +5,10 @@ import { NavLink } from "react-router-dom";
 
 
 const ConfigurationDuProfil = ()=>{
-    const userData = useSelector((state) => state.userReducer)
+    const userData = useSelector((state) => state.user.user);
+    const [pseudo, setPseudo] = useState('');
+    const [nomUtilisateur, setNomUtilisateur] = useState('');
+
     return(
 
     <div className='modificationDuProfilBackgroud'>
@@ -40,7 +43,7 @@ const ConfigurationDuProfil = ()=>{
         <h2 className='ligneHorizontal' >Acces au dossiers personnel</h2>
         <div className='accesDossiersPerso'>
             <input type="checkbox" id="accesDossiersPerso" name='cocher' />
-            <label for="cocher">Cocher si oui</label>
+            <label >Cocher si oui</label>
         </div> 
     </div>
 
diff --git a/Site Web/client/src/components/Navbar.js b/Site Web/client/src/components/Navbar.js
index 1df25f03..9e461a92 100644
--- a/Site Web/client/src/components/Navbar.js	
+++ b/Site Web/client/src/components/Navbar.js	
@@ -116,10 +116,10 @@ const Navbar = () => {
                     </NavLink>
                   </li>
                   <li className="navbar-item">
-                    <a onClick={() => setDisplayAdd(true)} className="navbar-link">
+                    <NavLink to="/Configuration" className="navbar-link">
                       <i className="fas fa-cog navbar-icon"></i>
                       <span className="navbar-title">Paramètre</span>
-                    </a>
+                    </NavLink>
                   </li>
                   <li className="navbar-item">
                     <a onClick={logout} className="navbar-link">
diff --git a/Site Web/client/src/components/Post/Post.js b/Site Web/client/src/components/Post/Post.js
index 296a3002..29b8632a 100644
--- a/Site Web/client/src/components/Post/Post.js	
+++ b/Site Web/client/src/components/Post/Post.js	
@@ -24,10 +24,10 @@ const LinkPreview = ({ link }) => {
             <a href={link}>
                 <img id="imageLien" src={preview.image} alt={preview.title} />
             </a>
-            <a id="url" href={link}>
+            {/* <a id="url" href={link}>
                 {link}
             </a>
-            <p>{preview.description}</p>
+            <p>{preview.description}</p> */}
         </div>
     );
 };
@@ -75,7 +75,7 @@ const Post = ( { post } ) => {
 
 
                     <div id="contenuePoste">
-                        <LinkPreview link="https://www.bbc.com/news/uk-politics-63335671" />
+                        {/* <LinkPreview link="https://www.bbc.com/news/uk-politics-63335671" /> */}
                         <p>{post.message}</p>
                     </div>
 
diff --git a/Site Web/client/src/components/Routes/index.js b/Site Web/client/src/components/Routes/index.js
index f6a89ccb..c4210b41 100644
--- a/Site Web/client/src/components/Routes/index.js	
+++ b/Site Web/client/src/components/Routes/index.js	
@@ -5,17 +5,17 @@ import Home from '../../pages/Home.js';
 import Trends from '../../pages/Trends.js';
 import Discover from '../../pages/Discover.js';
 import Profil from '../../pages/Profil.js';
-import Configuration from '../../pages/Configuration';
+import Configuration from '../../pages/Configuration.js';
 
 const index = () => {
     return (
             <BrowserRouter>
                 <Routes>
                     <Route path="/" element={<HomeNavigation/>} />
-                    <Route path="/h" element={<Home/>} />
+                    <Route path="/home" element={<Home/>} />
                     <Route path="/trends" element={<Trends/>} />
                     <Route path="/discover" element={<Discover/>} />
-                    <Route path="*" element={<HomeNavigation/>} />
+                    {/* <Route path="*" element={<HomeNavigation/>} /> */}
                     <Route path="/profil" element={<Profil />} />
                     <Route path="/configuration" element={<Configuration/>}/>
                 </Routes>
diff --git a/Site Web/client/src/pages/Configuration.js b/Site Web/client/src/pages/Configuration.js
index fcc66d6b..620be1d6 100644
--- a/Site Web/client/src/pages/Configuration.js	
+++ b/Site Web/client/src/pages/Configuration.js	
@@ -4,7 +4,8 @@ import ConfigurationDuProfil from '../components/Configurations/ConfigurationDuP
 import ConfigurationDuCompte from '../components/Configurations/ConfigurationDuCompte.js';
 import PolitiqueDeConfidentialite from '../components/Configurations/PolitiqueDeConfidentialite';
 import Navbar from '../components/Navbar';
-function Configuration(){
+
+const Configuration = () => {
 
         const [ConfigurationCompte, setConfigurationDuCompte] = useState(false);
         const [ConfigurationProfil, setConfigurationDuProfil] = useState(true);
@@ -27,7 +28,7 @@ function Configuration(){
 
         };        
     return(
-        <>
+        <main className='mainConfig'>
         <Navbar />
             <div className='boutonDeConfigurations'>
             <button onClick={handleModals} id="ConfigurationDuProfil" className={ConfigurationProfil} >
@@ -45,7 +46,7 @@ function Configuration(){
             {ConfigurationProfil &&<ConfigurationDuProfil/>}
             {ConfigurationCompte &&<ConfigurationDuCompte/>}
             {PolitiqueConfidentialite &&<PolitiqueDeConfidentialite/>}
-        </>
+        </main>
     );
 }
 
diff --git a/Site Web/client/src/styles/component/_navbar.scss b/Site Web/client/src/styles/component/_navbar.scss
index e11aaada..f5198d0f 100644
--- a/Site Web/client/src/styles/component/_navbar.scss	
+++ b/Site Web/client/src/styles/component/_navbar.scss	
@@ -18,7 +18,13 @@
   main {
     padding: 1rem 4rem;
     margin-left: 5rem;
-    text-align: justify;
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+  }
+
+  .RightBar{
+    width: 20%;
   }
   
   .navbar {
diff --git a/Site Web/client/src/styles/component/_newPoste.scss b/Site Web/client/src/styles/component/_newPoste.scss
index 1a47057e..d013d184 100644
--- a/Site Web/client/src/styles/component/_newPoste.scss	
+++ b/Site Web/client/src/styles/component/_newPoste.scss	
@@ -40,4 +40,8 @@ textarea[name="description"]{
   margin-bottom:10px;
   display:flex;
   justify-content: space-between;
+}
+
+.postInMain{
+  width: 80%;
 }
\ No newline at end of file
diff --git a/Site Web/client/src/styles/pages/_configuration.scss b/Site Web/client/src/styles/pages/_configuration.scss
index a5d0a699..a985975f 100644
--- a/Site Web/client/src/styles/pages/_configuration.scss	
+++ b/Site Web/client/src/styles/pages/_configuration.scss	
@@ -32,3 +32,7 @@
     margin-top: 2%;
 }
 
+.mainConfig{
+    display: flex;
+    flex-direction: column;
+}
\ No newline at end of file