-

-
+
+

+
+
diff --git a/Site Web/client/src/pages/Trends.js b/Site Web/client/src/pages/Trends.js
index 9a53390e..1d3ca6c4 100644
--- a/Site Web/client/src/pages/Trends.js
+++ b/Site Web/client/src/pages/Trends.js
@@ -64,17 +64,17 @@ const Trends = () => {
);*/
- return (
-
-
-
Notification
-
-
-
-
-
-
- );
+ // return (
+ //
+ //
+ //
Notification
+ //
+ //
+ //
+ //
+ //
+ //
+ // );
};
export default Trends;
\ No newline at end of file
diff --git a/Site Web/client/src/styles/_settings.scss b/Site Web/client/src/styles/_settings.scss
index 2ff77c6a..ca99a006 100644
--- a/Site Web/client/src/styles/_settings.scss
+++ b/Site Web/client/src/styles/_settings.scss
@@ -34,6 +34,9 @@ body{
.imageDeProfil{
object-fit: cover;
+ background-size: cover;
+ width: 180px;
+ height: 180px;
clip-path:circle(50%);
}
diff --git a/Site Web/client/src/styles/component/_configurationDuProfil.scss b/Site Web/client/src/styles/component/_configurationDuProfil.scss
index 8118274c..63fec04e 100644
--- a/Site Web/client/src/styles/component/_configurationDuProfil.scss
+++ b/Site Web/client/src/styles/component/_configurationDuProfil.scss
@@ -38,9 +38,10 @@ span{
.imageDeProfilConfigurationPlus {
position: relative;
+
width: 15%;
- max-width: 180px;
- min-width: 130px;
+ max-width: 200px;
+ min-width: 150px;
border: none;
}
@@ -119,8 +120,8 @@ input{
transform: scaleY(0);
transform-origin: center;
animation: modal .5s forwards;
- max-width: 360px;
- min-width: 320px;
+ max-width: 650px;
+ min-width: 500px;
border: 2px solid $color-4;
border-bottom-right-radius: 50px;
@@ -130,42 +131,33 @@ input{
}
}
- &:hover {
- transform: scale(1.07);
- }
+
}
- &::-webkit-scrollbar {
- width: 2px;
- }
- &::-webkit-scrollbar-track {
- background: $color-4;
- }
- &::-webkit-scrollbar-thumb {
- background: $color-1;
- }
- &::-webkit-scrollbar-thumb:hover {
- background: #555;
- }
+
.imagesPopup{
display: flex;
justify-content: space-between;
flex-direction: row;
+ .imageModifSpace{
+ margin-right: 18%;
+ img{
+ max-width: initial;
+ }
+ }
.profile-pic {
+ position: relative;
+ width: 100%;
color: transparent;
transition: all .3s ease;
@include object-center;
- position: relative;
- transition: all .3s ease;
-
input{
display:none;
}
img{
position: absolute;
- object-fit: cover;
z-index: 0;
}
.-label {
diff --git a/Site Web/client/src/styles/component/_politiqueDeConfidentialite.scss b/Site Web/client/src/styles/component/_politiqueDeConfidentialite.scss
index 18495a69..5de9df34 100644
--- a/Site Web/client/src/styles/component/_politiqueDeConfidentialite.scss
+++ b/Site Web/client/src/styles/component/_politiqueDeConfidentialite.scss
@@ -26,12 +26,10 @@
@keyframes slide {
from {
- margin-top: 80%;
width: 80%;
}
to {
- margin-top: 0%;
width: 100%;
}
}
diff --git a/Site Web/client/src/styles/component/_postNouvelleAffichage.scss b/Site Web/client/src/styles/component/_postNouvelleAffichage.scss
index a0be6e1b..55e07e64 100644
--- a/Site Web/client/src/styles/component/_postNouvelleAffichage.scss
+++ b/Site Web/client/src/styles/component/_postNouvelleAffichage.scss
@@ -30,7 +30,7 @@
flex-direction: row;
justify-content: space-between;
padding-left: 10%;
- flex: 0.5 0.8 auto;
+ flex: 0.5 0.4 auto;
}
}
diff --git a/Site Web/client/src/styles/pages/_configuration.scss b/Site Web/client/src/styles/pages/_configuration.scss
index b34538ea..ac299bc8 100644
--- a/Site Web/client/src/styles/pages/_configuration.scss
+++ b/Site Web/client/src/styles/pages/_configuration.scss
@@ -39,7 +39,7 @@
input:focus{
background-color:$color-3;
}
- margin-left: 1%;
+ margin-left: 6%;
}
.ligneHorizontal{
diff --git a/Site Web/routes/user.routes.js b/Site Web/routes/user.routes.js
index b9b93be3..f528ad2e 100644
--- a/Site Web/routes/user.routes.js
+++ b/Site Web/routes/user.routes.js
@@ -12,6 +12,7 @@ router.post('/login', authController.signIn);
//retirer le token (cookie)
router.get('/logout', authController.logout);
+
// user
router.get('/', userController.getAllUsers);
router.get('/:id', userController.userInfo);
diff --git a/Site Web/utils/errors.utils.js b/Site Web/utils/errors.utils.js
index b6928bd7..27264635 100644
--- a/Site Web/utils/errors.utils.js
+++ b/Site Web/utils/errors.utils.js
@@ -43,13 +43,3 @@ module.exports.uploadErrors = (err) => {
return errors
}
-module.exports.uploadErrors = (err) => {
- let errors = { format: '', maxSize: ""};
-
- if (err.message.includes('invalid file'))
- errors.format = "Format incompatible";
-
- if (err.message.includes('max size'))
- errors.maxSize = "Le fichier dépasse 500ko";
- return errors;
-}
\ No newline at end of file