Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change display #228

Merged
merged 1 commit into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 100 additions & 0 deletions client/src/Components/Button/Button.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,106 @@
.button-active-props:active{
transform: scale(0.8);
}
@keyframes lds-ripple {
0% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 0;
}
4.9% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 0;
}
5% {
top: 36px;
left: 36px;
width: 0;
height: 0;
opacity: 1;
}
100% {
top: 0px;
left: 0px;
width: 72px;
height: 72px;
opacity: 0;
}
}
.lds-ellipsis {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-ellipsis div {
position: absolute;
top: 33px;
width: 13px;
height: 13px;
border-radius: 50%;
background: white;
animation-timing-function: cubic-bezier(0, 1, 1, 0);
}
.lds-ellipsis-settings-page {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
z-index: 231;
}
.lds-ellipsis-settings-page div {
position: absolute;
top: 33px;
width: 10px;
height: 10px;
border-radius: 50%;
animation-timing-function: cubic-bezier(0, 1, 1, 0);
}
.lds-ellipsis div:nth-child(1) {
left: 8px;
animation: lds-ellipsis1 0.6s infinite;
}
.lds-ellipsis div:nth-child(2) {
left: 8px;
animation: lds-ellipsis2 0.6s infinite;
}
.lds-ellipsis div:nth-child(3) {
left: 32px;
animation: lds-ellipsis2 0.6s infinite;
}
.lds-ellipsis div:nth-child(4) {
left: 56px;
animation: lds-ellipsis3 0.6s infinite;
}
@keyframes lds-ellipsis1 {
0% {
transform: scale(0);
}
100% {
transform: scale(1);
}
}
@keyframes lds-ellipsis3 {
0% {
transform: scale(1);
}
100% {
transform: scale(0);
}
}
@keyframes lds-ellipsis2 {
0% {
transform: translate(0, 0);
}
100% {
transform: translate(24px, 0);
}
}
/* .button-component:hover{
background-color: #f7c520 !important;
transition-duration: 300ms !important;
Expand Down
33 changes: 26 additions & 7 deletions client/src/Components/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,25 @@ import "./Button.css";
const Button = ({
isLink,
to,
style,
customMediaQueries,
style,
customMediaQueries,
text,
onClick,
id,
createPostButtonClass,
hover,
active
active,
disabled,
loading,
settingsPage,
}) => {
return (
<>
<style>
{`
<style>
{`
${customMediaQueries}
`}
</style>
</style>
{isLink ? (
<Link
className={`button-component ${createPostButtonClass} ${hover} ${active}`}
Expand All @@ -38,8 +41,24 @@ const Button = ({
style={style}
onClick={onClick}
id={id}
disabled={disabled}
>
{text}
{loading ? (
<div
className={
settingsPage
? "lds-ellipsis lds-ellipsis-settings-page"
: "lds-ellipsis"
}
>
<div></div>
<div></div>
<div></div>
<div></div>
</div>
) : (
text
)}
</button>
)}
</>
Expand Down
1 change: 1 addition & 0 deletions client/src/Components/NftCard/NftCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ const NftCard = ({
</>
) : (
<>

<div
key={uuidv4()}
ref={nftCardRef}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function DropDownMenu({

// Mettre à jour le champ 'status' en le mettant à false
await updateDoc(commentRef, {
status: false,
stdiatus: false,
});

console.log("Le status a bien été passé à false");
Expand Down
10 changes: 8 additions & 2 deletions client/src/Pages/SettingsPage/SettingsPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
font-weight: 900;
margin-top: 5px;
}
.settings-page-error-display-name {
color: #85d87e;
font-size: 12px;
font-weight: 900;
margin-top: 5px;
}
.settings-page-display-name-input img {
/* background-color: red; */
margin-left: 15px;
Expand Down Expand Up @@ -207,7 +213,7 @@
border: none;
opacity: 0.5;
}
.PhoneInputCountryIcon{
.PhoneInputCountryIcon {
/* width: 25px ; */
border: none;
/* height: 25px ; */
Expand All @@ -228,4 +234,4 @@
height: 35px;
/* background-color: red; */
border-left: none !important;
}
}
132 changes: 122 additions & 10 deletions client/src/Pages/SettingsPage/SettingsPage.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import "./SettingsPage.css";
import validationLogo from "../../Assets/Image/cross-validation-black.svg";
import Button from "../../Components/Button/Button";
import PhoneInput from "react-phone-number-input";
import { isValidPhoneNumber } from "libphonenumber-js";
import useUserCollection from "../../contexts/UserContext/useUserCollection";
import { db } from "../../Configs/firebase";
import {
collection,
query,
orderBy,
onSnapshot,
where,
limit,
getDocs,
getDoc,
doc,
updateDoc,
} from "firebase/firestore";

function SettingsPage() {
const [isFocusDisplayName, setIsFocusDisplayName] = useState(false);
Expand Down Expand Up @@ -33,13 +47,65 @@ function SettingsPage() {
const [showError, setShowError] = useState(false);
const [phone, setPhone] = useState("");
const [phoneRegexError, setPhoneRegexError] = useState(false);
const [displayName, setDisplayname] = useState();
const [isDisplayNameChangeLoading, setIsDisplayNameChangeLoading] =
useState();
const [isDisplayNameChangeError, setIsDisplayNameChangeError] = useState();
const [isDisplayNameChanged, setIsDisplayNameChanged] = useState();
const { loggedInUser } = useUserCollection();
const usersCollection = collection(db, "users");
console.log(loggedInUser?.id);
async function getDisplayName() {
try {
const q = query(
usersCollection,
where("id", "==", `${loggedInUser?.id}`)
);
const data = await getDocs(q);
// setDisplayname(
const displayNameObject = data.docs.map((doc) => {
const docData = doc.data();
return {
display_name: docData.display_name,
};
});
// )
setDisplayname(displayNameObject[0]?.display_name);
} catch (error) {
console.error(error);
}
}
async function handleChangeDisplayName() {
if (usernameRegexError === false && valueInputDisplayName !== displayName) {
setIsDisplayNameChangeLoading(true);
try {
const usersCollectionRef = doc(db, `users/${loggedInUser?.id}`);
await updateDoc(usersCollectionRef, {
display_name: valueInputDisplayName,
});
setIsDisplayNameChangeError(false);
setIsDisplayNameChangeLoading(false);
setIsDisplayNameChanged(true);
getDisplayName();
console.log("pseudo changé");
} catch (error) {
console.error(error);
setIsDisplayNameChangeLoading(false);
setIsDisplayNameChangeError(true);
setIsDisplayNameChanged(false);
}
}
}
useEffect(() => {
getDisplayName();
setValueInputDisplayName(displayName)

let displayName = "ramiabdou";

}, [loggedInUser, displayName]);
// let displayName = "ramiabdou";
function handleFocusDisplayName() {
setIsFocusDisplayName(true);
}
function handleBlurDisplayName(e) {
function handleBlurDisplayName() {
if (valueInputDisplayName === displayName) {
setIsFocusDisplayName(false);
}
Expand Down Expand Up @@ -129,6 +195,7 @@ function SettingsPage() {
setPhone(value);
setPhoneRegexError(value && !isValidPhoneNumber(value));
}
console.log("valueInputDisplayName -> ",valueInputDisplayName,"displayName -> ",displayName)
return (
<div className="settings-page-container">
<div className="setting-page-wrap">
Expand All @@ -147,7 +214,7 @@ function SettingsPage() {
onBlur={handleBlurDisplayName}
type="text"
// value={username}
defaultValue="ramiabdou"
defaultValue={displayName}
// onChange={handleUsernameChange}
/>
{usernameRegexError && (
Expand All @@ -156,15 +223,60 @@ function SettingsPage() {
à 29 caractères alphanumérique.
</p>
)}
{isDisplayNameChangeError && (
<p className="settings-page-error-display-name">
Oops quelque chose s'est mal passé. Veuillez réessayer ou
raffraîchir la page.
</p>
)}
{isDisplayNameChanged && (
<p className="settings-page-error-display-name">
Votre pseudo a bien été changé !
</p>
)}
{/* <img src={validationLogo} alt="" /> */}
</div>
{/* <button className="settings-page-validation-button">Changer pseudo</button> */}
<div className="settings-page-validation-button-container">
<Button
text={"Changer nom d'affichage"}
hover="button-hover-props"
active="button-active-props"
/>
{isDisplayNameChangeLoading ? (
<Button
text={
isDisplayNameChangeLoading
? "Chargement"
: "Changer nom d'affichage"
}
style={
valueInputDisplayName === displayName
? { opacity: "0.5" }
: isDisplayNameChangeLoading
? {
backgroundColor: "#f6d46349",
border: "#f6d463 1px solid",
pointerEvents: "none",
}
: { opacity: 1 }
}
hover="button-hover-props"
active="button-active-props"
onClick={handleChangeDisplayName}
disabled={valueInputDisplayName === displayName}
loading={true}
settingsPage={true}
/>
) : (
<Button
text={"Changer nom d'affichage"}
style={
valueInputDisplayName === displayName
? { opacity: 0.5 }
: { opacity: 1 }
}
hover="button-hover-props"
active="button-active-props"
onClick={handleChangeDisplayName}
disabled={ valueInputDisplayName === displayName}
/>
)}
</div>
</div>
</div>
Expand Down
Loading