avancement profile/parametre

master
Darius BERTRAND 2 years ago
parent 42c530032c
commit 7a8e4f0edf

@ -23,7 +23,7 @@ export const uploadPicture = (data, id) => {
return axios return axios
.get(`${process.env.REACT_APP_API_URL}api/user/${id}`) .get(`${process.env.REACT_APP_API_URL}api/user/${id}`)
.then((res) => { .then((res) => {
dispatch(setUserDataImg(res.data.picture)); /*dispatch(setUserDataImg(res.data.picture));*/
}) })
}) })
.catch((err) => console.log(err)); .catch((err) => console.log(err));

@ -1,5 +1,5 @@
import React, { useState } from 'react'; import React, { useState } from 'react';
import { useSelector } from 'react-redux'; import { useSelector, useDispatch } from 'react-redux';
import PP from "../../assets/img/unknown.png"; import PP from "../../assets/img/unknown.png";
import PLUS from "../../assets/img/plus.png"; import PLUS from "../../assets/img/plus.png";
import { NavLink } from "react-router-dom"; import { NavLink } from "react-router-dom";
@ -10,32 +10,28 @@ const ConfigurationDuProfil = ()=>{
const userData = useSelector((state) => state.user.user); const userData = useSelector((state) => state.user.user);
const [pseudo, setPseudo] = useState(''); const [pseudo, setPseudo] = useState(userData.pseudo);
const [nomUtilisateur, setNomUtilisateur] = useState(''); const [nomUtilisateur, setNomUtilisateur] = useState(userData.pseudo);
const[userPicture, setUserPicture] = useState(userData.picture)
const [tmpImage, setTmpImage] =useState('')
const [displayAdd, setDisplayAdd] = useState(false); const [displayAdd, setDisplayAdd] = useState(false);
/*const [updateImage, setUpdateImage]= useState(false); const handlevalidationPopup =(e)=>{
const setimageDeProfile=()=>{ setUserPicture(tmpImage);
if(updateImage=true){
useState("");
setDisplayAdd(false); setDisplayAdd(false);
} }
else{ const handleLoadFile=(e)=>{
setDisplayAdd(false);
}
}*/
var handleLoadFile=(e)=>{
var image = document.getElementById("output"); var image = document.getElementById("output");
image.src = URL.createObjectURL(e.target.files[0]); image.src = URL.createObjectURL(e.target.files[0]);
setTmpImage(image.src);
}; };
var a=PP;
return( return(
<div className='modificationDuProfilBackgroud'> <div className='modificationDuProfilBackgroud'>
<h2 className='ligneHorizontal' >Modifucation du Profil</h2> <h2 className='ligneHorizontal' >Modifucation du Profil</h2>
<div className='modificationDuProfil' > <div className='modificationDuProfil' >
<button className='imageDeProfilConfigurationPlus imageDeProfil' > <button className='imageDeProfilConfigurationPlus imageDeProfil' >
<img src={PLUS} className="plusButton "/> <img src={PLUS} className="plusButton "/>
<img src={a} className="imageDeProfilConfiguration imageDeProfil" onClick={() => setDisplayAdd(true)}/> <img src={userPicture} className="imageDeProfilConfiguration imageDeProfil" onClick={() => setDisplayAdd(true)}/>
</button> </button>
<div className='modificationDuProfilText alignementText'> <div className='modificationDuProfilText alignementText'>
<span>Pseudo: </span> <span>Pseudo: </span>
@ -78,7 +74,7 @@ const ConfigurationDuProfil = ()=>{
<div className='popup-modificationProfil'> <div className='popup-modificationProfil'>
<div className="modal"> <div className="modal">
<div className='imagesPopup'> <div className='imagesPopup'>
<img src={PP} className="imageDeProfilConfigurationPlus imageDeProfil"/> <img src={userPicture} className="imageDeProfilConfigurationPlus imageDeProfil"/>
<div className="imageDeProfilConfigurationPlus imageDeProfil profile-pic" > <div className="imageDeProfilConfigurationPlus imageDeProfil profile-pic" >
<label className="-label" for="file"> <label className="-label" for="file">
<span class="camera"></span> <span class="camera"></span>
@ -89,16 +85,30 @@ const ConfigurationDuProfil = ()=>{
</div> </div>
</div > </div >
<div className='buttonPopup'> <div className='buttonPopup'>
<button onClick={() => setDisplayAdd(false)/*&&setUpdateImage(true)*/}>Retour</button> <button onClick={()=>setDisplayAdd(false)}>Retour</button>
<button /*onClick={} */>Valider</button> <button onClick={handlevalidationPopup} >Valider</button>
</div> </div>
</div> </div>
</div> </div>
)} )}
</div> </div>
) )
} }
export default ConfigurationDuProfil; export default ConfigurationDuProfil;

@ -6,17 +6,22 @@ const PolitiqueDeConfidentialite =()=>{
return( return(
<div className='PolitiqueDeConfidentialiteText'> <div className='PolitiqueDeConfidentialiteText'>
<p> Cette politique de confidentialité sapplique au site : Designed By GG. <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales ligula in libero. Sed dignissim lacinia nunc. </p>
La présente politique de confidentialité a pour but dexposer aux utilisateurs du site :
<p>Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. </p>
La manière dont sont collectées et traitées leurs données à caractère
personnel. Doivent être considérées comme données personnelles toutes les données étant susceptibles didentifier un utilisateur. Il sagit notamment du prénom et du nom, de lâge, de ladresse postale, ladresse mail, la localisation de lutilisateur ou encore son adresse IP ; <p>Nam nec ante. Sed lacinia, urna non tincidunt mattis, tortor neque adipiscing diam, a cursus ipsum ante quis turpis. Nulla facilisi. Ut fringilla. Suspendisse potenti. Nunc feugiat mi a tellus consequat imperdiet. Vestibulum sapien. Proin quam. Etiam ultrices. Suspendisse in justo eu magna luctus suscipit. Sed lectus. Integer euismod lacus luctus magna. Quisque cursus, metus vitae pharetra auctor, sem massa mattis sem, at interdum magna augue eget diam. </p>
Quels sont les droits des utilisateurs concernant ces données ;
Qui est responsable du traitement des données à caractère personnes <p>Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Morbi lacinia molestie dui. Praesent blandit dolor. Sed non quam. In vel mi sit amet augue congue elementum. Morbi in ipsum sit amet pede facilisis laoreet. Donec lacus nunc, viverra nec, blandit vel, egestas et, augue. Vestibulum tincidunt malesuada tellus. Ut ultrices ultrices enim. Curabitur sit amet mauris. Morbi in dui quis est pulvinar ullamcorper. Nulla facilisi. Integer lacinia sollicitudin massa. Cras metus. </p>
collectées et traitées ;
A qui ces données sont transmises ; <p>Sed aliquet risus a tortor. Integer id quam. Morbi mi. Quisque nisl felis, venenatis tristique, dignissim in, ultrices sit amet, augue. Proin sodales libero eget ante. Nulla quam. Aenean laoreet. Vestibulum nisi lectus, commodo ac, facilisis ac, ultricies eu, pede. Ut orci risus, accumsan porttitor, cursus quis, aliquet eget, justo. Sed pretium blandit orci. Ut eu diam at pede suscipit sodales. Aenean lectus elit, fermentum non, convallis id, sagittis at, neque. </p>
Eventuellement, la politique du site en matière de fichiers cookies
</p> <p>Nullam mauris orci, aliquet et, iaculis et, viverra vitae, ligula. Nulla ut felis in purus aliquam imperdiet. Maecenas aliquet mollis lectus. Vivamus consectetuer risus et tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. </p>
<p>Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur sodales ligula in libero. Sed dignissim lacinia nunc. Curabitur tortor. Pellentesque nibh. Aenean quam. In scelerisque sem at dolor. Maecenas mattis. Sed convallis tristique sem. Proin ut ligula vel nunc egestas porttitor. </p>
<p>Morbi lectus risus, iaculis vel, suscipit quis, luctus non, massa. Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam nec ante. Sed lacinia, urna non tincidunt mattis, tortor neque adipiscing diam, a cursus ipsum ante quis turpis. Nulla facilisi. Ut fringilla. Suspendisse potenti. </p>
</div> </div>
) )
} }

@ -1,15 +1,17 @@
import React, { useEffect, useState } from 'react'; import { current } from '@reduxjs/toolkit';
import React, { useEffect, useState, useContext } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { getPosts } from '../../actions/post.actions'; import { getPosts } from '../../actions/post.actions';
import { isEmpty } from "../Utils"; import { isEmpty } from "../Utils";
import Post from './PostNouvelleAffichage'; import Post from './PostNouvelleAffichage';
import { UidContext } from './../AppContext';
const NouveauDisplayPosts = () => { const NouveauDisplayPosts = () => {
const [loadPost, setLoadPost] = useState(true); const [loadPost, setLoadPost] = useState(true);
const [count , setCount] = useState(5); const [count , setCount] = useState(5);
const dispatch = useDispatch(); const dispatch = useDispatch();
const postsData = useSelector((state) => state.post.post); const postsData = useSelector((state) => state.post.post);
const uid = useContext(UidContext);
const loadMore = () => { const loadMore = () => {
if (window.innerHeight + document.documentElement.scrollTop + 1 > document.scrollingElement.scrollHeight){ if (window.innerHeight + document.documentElement.scrollTop + 1 > document.scrollingElement.scrollHeight){
setLoadPost(true); setLoadPost(true);
@ -31,7 +33,11 @@ const NouveauDisplayPosts = () => {
<ul> <ul>
{!isEmpty(postsData[0]) && {!isEmpty(postsData[0]) &&
postsData.map((post) => { postsData.map((post) => {
if(post.postedId === uid){
return <Post post={post} key={post._id}/> return <Post post={post} key={post._id}/>
}
else return null;
})} })}
</ul> </ul>
</div> </div>

@ -23,16 +23,19 @@ const LinkPreview = ({ link }) => {
}, [link]); }, [link]);
if(preview.image === "") { if(preview.image === "") {
return (<div><a href={link}>{link}</a></div>); return (<div className='alignementLien'><a className="LienPostHome" href={link}>{link}</a></div>);
} }
else { else {
return ( return (
<div> <>
<div className='alignementLien'>
<a href={link}> <a href={link}>
<img id="imageLien" src={preview.image} alt={preview.title}/> <img id="imageLien" className="LienPostHome" src={preview.image} alt={preview.title}/>
</a> </a>
<p>{preview.description}</p>
</div> </div>
<p>{preview.description}</p>
</>
); );
} }
}; };

@ -51,10 +51,11 @@ const PostNouvelleAffichage = ( { post } ) => {
}) })
return ( return (
<li className='conteneur_postes' key={post._id}> <li className='PostesProfilConteneur' key={post._id}>
{isLoading ? ( {isLoading ? (
<i className='fas fa-spinner fa-spin'></i> <i className='fas fa-spinner fa-spin'></i>
):( ):(
<>
<div className="unPosteNouvelleAffichage"> <div className="unPosteNouvelleAffichage">
<div className="dateDePublicationDuPost"> <div className="dateDePublicationDuPost">
<div>{dateParser(post.createdAt)}</div> <div>{dateParser(post.createdAt)}</div>
@ -74,8 +75,9 @@ const PostNouvelleAffichage = ( { post } ) => {
<div >{post.comments.length}</div> <div >{post.comments.length}</div>
</div> </div>
</div> </div>
{comments && <Comment post={post} />}
</div> </div>
{comments && <Comment className="CommentaireProfil" post={post} />}
</>
) } ) }
</li> </li>
); );

@ -8,7 +8,7 @@ const DossiersPersonnels=()=>{
return( return(
<div className='dossierPersonnel'> <div className='dossierPersonnel'>
pppp <NouveauDisplayPosts/>
</div> </div>
) )

@ -8,7 +8,7 @@ const PostPersonnels=()=>{
return( return(
<div className='postPersonnel'> <div className='postPersonnel'>
<NouveauDisplayPosts/>
</div> </div>
) )
} }

@ -9,7 +9,7 @@ const Configuration = () => {
const [ConfigurationCompte, setConfigurationDuCompte] = useState(false); const [ConfigurationCompte, setConfigurationDuCompte] = useState(false);
const [ConfigurationProfil, setConfigurationDuProfil] = useState(true); const [ConfigurationProfil, setConfigurationDuProfil] = useState(true);
const [PolitiqueConfidentialite, setPolitiqueDeConfidentialite] =useState(false) const [PolitiqueConfidentialite, setPolitiqueDeConfidentialite] =useState(false);
const handleModals = (e) => { const handleModals = (e) => {
if (e.target.id === "ConfigurationDuProfil") { if (e.target.id === "ConfigurationDuProfil") {

@ -3,9 +3,9 @@ import { useDispatch, useSelector } from 'react-redux';
import Navbar from '../components/Navbar'; import Navbar from '../components/Navbar';
import { dateParser } from '../components/Utils'; import { dateParser } from '../components/Utils';
import FollowHandler from '../components/UserProfil/FollowHandler'; import FollowHandler from '../components/UserProfil/FollowHandler';
import PostPersonnels from '../components/UserProfil/NavigationProfil/PostsPersonnels'; import LesPostPersonnels from '../components/UserProfil/NavigationProfil/PostsPersonnels';
import DossierPersonnels from '../components/UserProfil/NavigationProfil/DossiersPersonnels'; import LesDossierPersonnels from '../components/UserProfil/NavigationProfil/DossiersPersonnels';
import PostsLikes from '../components/UserProfil/NavigationProfil/PostsLikes'; import LesPostsLikes from '../components/UserProfil/NavigationProfil/PostsLikes';
const Profil = () => { const Profil = () => {
const userData = useSelector((state) => state.user.user); const userData = useSelector((state) => state.user.user);
@ -13,11 +13,13 @@ const Profil = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const [followingPopup, setFollowingPopup] = useState(false); const [followingPopup, setFollowingPopup] = useState(false);
const [followerPopup, setFollowerPopup] = useState(false); const [followerPopup, setFollowerPopup] = useState(false);
const [dossierPersonnels,setdossierPersonnels ] = useState(true);
const [postPersonnels,setpostPersonnels ] = useState(false);
const [postLikes,setpostLikes ] =useState(false)
const handleModals = (e) => {
const [dossierPersonnel,setdossierPersonnels ] = useState(true);
const [postPersonnel,setpostPersonnels ] = useState(false);
const [postLike,setpostLikes ] =useState(false);
const handleModalsProfil = (e) => {
if (e.target.id === "DossierPersonnels") { if (e.target.id === "DossierPersonnels") {
setdossierPersonnels(true); setdossierPersonnels(true);
setpostPersonnels(false); setpostPersonnels(false);
@ -210,25 +212,24 @@ const Profil = () => {
<nav role="navigation" class="navProfil"> <nav role="navigation" class="navProfil">
<ul class="navItemsProfil"> <ul class="navItemsProfil">
<li class="navItemProfil"> <li class="navItemProfil">
<a class="navLinkProfil" id='DossierPersonnels' onClick={handleModals}><span>Dossier Personnel</span></a> <a class="navLinkProfil" onClick={handleModalsProfil} id="DossierPersonnels" >Dossier Personnel</a>
</li> </li>
<li class="navItemProfil"> <li class="navItemProfil">
<a class="navLinkProfil" id='PostsPersonnels' onClick={handleModals}><span>Posts</span></a> <a class="navLinkProfil" onClick={handleModalsProfil} id="PostsPersonnels">Posts</a>
</li> </li>
<li class="navItemProfil"> <li class="navItemProfil">
<a class="navLinkProfil" id='PostLikes' onClick={handleModals}><span>Posts likés</span></a> <a class="navLinkProfil" onClick={handleModalsProfil} id="PostsLikes" >Posts likés</a>
</li> </li>
</ul> </ul>
</nav> </nav>
</div> </div>
<div class="menuContent"> <div class="menuContent listContent">
{dossierPersonnel &&<LesDossierPersonnels/>}
{postPersonnel &&<LesPostPersonnels/>}
{postLike &&<LesPostsLikes/>}
<div class="listContent">
{dossierPersonnels &&<DossierPersonnels/>}
{postPersonnels &&<PostPersonnels/>}
{postLikes &&<PostsLikes/>}
</div>
</div> </div>
</div> </div>

@ -8,6 +8,8 @@ $color-5: #AABBCC;
$color-6: #5499c7 ; $color-6: #5499c7 ;
$color-7: #19104f ; $color-7: #19104f ;
$color-8: #FAFAFA; $color-8: #FAFAFA;
$color-9: #645b5b;
$color-10:#dddddd;
// $color-1: #4cbfa6; // $color-1: #4cbfa6;

@ -1,16 +1,22 @@
.PolitiqueDeConfidentialiteText{ .PolitiqueDeConfidentialiteText{
display: flex;
justify-content: center;
flex-direction: column;
margin-top: 2%; margin-top: 2%;
margin-left: 5%; margin-left: 5%;
text-indent: 1%; text-indent: 1%;
text-align: justify; text-align: justify;
display: flex;
justify-content: center;
background-color: $color-8; background-color: $color-8;
border: 0.2px solid $color-5; border: 0.2px solid $color-5;
max-width:85% ; max-width:85% ;
min-width: 380px; min-width: 380px;
height: 550px; height: 550px;
overflow-y: scroll;
scrollbar-width: thin;
scrollbar-gutter: stable both-edges;
p{ p{
animation-duration: 2s; animation-duration: 2s;

@ -1,4 +1,4 @@
.conteneur_postes{ .PostesProfilConteneur{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.unPosteNouvelleAffichage{ .unPosteNouvelleAffichage{
@ -9,15 +9,20 @@
background: $color-8; background: $color-8;
border: 0.3px solid $color-5; border: 0.3px solid $color-5;
margin: 0.2% 1%; margin: 0.2% 1%;
padding: 1%; padding: 1% 3%;
border-radius: 10px;
.dateDePublicationDuPost{ .dateDePublicationDuPost{
flex: 0.5 0.8 20%; flex: 0 0 22%;
} }
.LienDunPosteNouvelleAffichage{ .LienDunPosteNouvelleAffichage{
display: flex; display: flex;
justify-content: space-around; justify-content: space-between;
flex-flow: row wrap; flex-flow: row wrap;
flex: 0.9 0 60%; flex: 0.9 0 60%;
margin-left: 3%;
p{
margin-left: 5%;
}
} }
.informationDunPosteNouvelleAffichage{ .informationDunPosteNouvelleAffichage{
@ -27,10 +32,18 @@
padding-left: 10%; padding-left: 10%;
flex: 0.5 0.8 auto; flex: 0.5 0.8 auto;
} }
}
.CommentaireProfil{
background: $color-8;
border: 0.3px solid $color-5;
}
} }
.PreviewPostNouvelleAffichage{ .PreviewPostNouvelleAffichage{
min-width: 100px;
width: 80%; width: 80%;
max-height: 48px; max-height: 48px;
} }
@ -39,7 +52,6 @@
.postPersonnel .dossierPersonnel{ .postPersonnel .dossierPersonnel{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 100; width: 100%;
}
} }

@ -77,5 +77,14 @@
align-items:center; align-items:center;
} }
.alignementLien{
display: flex;
flex-direction: row;
justify-content: center;
background-color: $color-10;
.LienPostHome{
min-height:100px ;
height: 100%;
max-height: 300px;
}
}

@ -162,6 +162,7 @@
padding-top: 2%; padding-top: 2%;
padding-bottom: 2%; padding-bottom: 2%;
list-style: none; list-style: none;
} }
.navItemProfil { .navItemProfil {
@ -317,9 +318,10 @@ margin-top: 1%;
} }
.menuContent{ .menuContent{
background-color: #8c8c8e; border: 0.3px solid $color-5;
background-color: $color-9;
border-radius: 10px;
margin: 0% 0% 0% 2.5%; margin: 0% 0% 0% 2.5%;
border-radius: 25px;
width: 95%; width: 95%;
height: 85%; height: 85%;
} }
@ -339,10 +341,12 @@ padding-top: 3%;
} }
.listContent { .listContent {
/* display: flex; padding-left: 1%;
justify-content: center; */ padding-top: 1%;
padding-left: 2.5%; overflow-y: scroll;
padding-top: 2.5%; scrollbar-width: thin;
scrollbar-gutter: stable both-edges;
} }
.basDePage { .basDePage {

@ -1,11 +1,11 @@
#listeNotif{ #listeNotif{
margin: 2%; margin: 2%;
margin-left: 8%; margin-left: 20%;
padding:1%; padding:1%;
border-color: $color-5; border-color: $color-5;
border-style:solid; border-style:solid;
border-width: 0.3px; border-width: 0.3px;
min-width: 410px; min-width: 410px;
width: 84%; width: 60%;
background: $color-8; background: $color-8;
} }

@ -15,7 +15,7 @@ router.get('/logout', authController.logout);
// user // user
router.get('/', userController.getAllUsers); router.get('/', userController.getAllUsers);
router.get('/:id', userController.userInfo); router.get('/:id', userController.userInfo);
//put pour faire des updates router.put("/:id", userController.updateUser);
router.put('/:id', userController.updateUser); router.put('/:id', userController.updateUser);
router.delete('/:id', userController.deleteUser); router.delete('/:id', userController.deleteUser);
router.patch('/follow/:id', userController.follow); router.patch('/follow/:id', userController.follow);

Loading…
Cancel
Save