correction graphique

This commit is contained in:
ORDONNEAU Antoine
2026-03-12 09:03:31 +01:00
parent 75e93abce6
commit fb7152bf21
7 changed files with 162 additions and 160 deletions
-1
View File
@@ -2,7 +2,6 @@
width: 100%;
padding: 12px;
margin-bottom: 10px;
border-radius: 8px;
}
.content {
+1 -1
View File
@@ -52,7 +52,7 @@ const Task: React.FC<TaskProps> = ({ task }) => {
}, [task.events_id]);
return (
<div className={`${styles.task} glassCard`}>
<div className={`${styles.task} glassBorder`}>
<div className={styles.content}>
<div>
<h2>
@@ -11,7 +11,7 @@ function IncompleteEvent() {
<h2>Derniers événements</h2>
<div className={styles.eventsContainer}>
{events.map((event) => (
<div key={event.id} className={`glassCard ${styles.eventCard}`}>
<div key={event.id} className={`glassBorder ${styles.eventCard}`}>
<h3>{event.name}</h3>
<p className={styles.eventDate}>
{new Date(event.start).toLocaleDateString("fr-FR")} - {new Date(event.end).toLocaleDateString("fr-FR")}
@@ -29,17 +29,18 @@
transform: translateX(20px);
animation: slideInEvent 1s ease forwards;
flex-shrink: 0;
padding: 10px;
}
.eventCard ul {
align-items: center;
margin-left: 8%;
padding-left: 15px;
margin-left: 5%;
}
.eventCard ul li {
text-align: left;
list-style-type: circle;
list-style: none;
}
.eventCard > h3 {
@@ -58,7 +58,7 @@ function PendingMembers() {
{pendingMembers.map((member, index) => (
<div key={index} className={`glassCard ${styles.memberCard}`}>
<div key={index} className={`glassBorder ${styles.memberCard}`}>
<p>{member.name} {member.lastname}</p>
@@ -5,7 +5,8 @@ import {EventContext} from "../../../../contexts/events/EventContext.js";
import Button from "../../../../components/ui/button/button.jsx";
import {AuthContext} from "../../../../contexts/auth/AuthContext.ts";
function Calendar() {
function
Calendar() {
const { user } = useContext(AuthContext);
+154 -153
View File
@@ -17,20 +17,20 @@ import deleteProfilePhoto from "../../utils/users/deleteProfilePhoto.js";
interface TaskType {
id: number;
name: string;
description: string;
location: string;
start: string;
end: string;
max_participants: number;
events_id: number;
created_at: string;
updated_at: string;
pivot: {
user_id: number;
task_id: number;
};
id: number;
name: string;
description: string;
location: string;
start: string;
end: string;
max_participants: number;
events_id: number;
created_at: string;
updated_at: string;
pivot: {
user_id: number;
task_id: number;
};
}
@@ -53,161 +53,162 @@ interface AuthContextType {
}
function ProfilePage() {
const navigate = useNavigate();
const { id } = useParams();
const { user, update } = useContext(AuthContext) as AuthContextType;
const [profileUser, setProfileUser] = useState<User | null>(null);
const [profilePicture, setProfilePicture] = useState<string | null>(null);
const [error, setError] = useState<string | null>(null);
const [success, setSuccess] = useState<string | null>(null);
const fileInputRef = useRef<HTMLInputElement>(null);
const navigate = useNavigate();
const {id} = useParams();
const {user, update} = useContext(AuthContext) as AuthContextType;
const [profileUser, setProfileUser] = useState<User | null>(null);
const [profilePicture, setProfilePicture] = useState<string | null>(null);
const [error, setError] = useState<string | null>(null);
const [success, setSuccess] = useState<string | null>(null);
const fileInputRef = useRef<HTMLInputElement>(null);
const isOwnProfile = !id || user?.id.toString() === id;
const isOwnProfile = !id || user?.id.toString() === id;
useEffect(() => {
(async () => {
if (!isOwnProfile && id) {
const res = await getUserById(id);
if (res.status === 404) {
navigate("/404");
return;
useEffect(() => {
(async () => {
if (!isOwnProfile && id) {
const res = await getUserById(id);
if (res.status === 404) {
navigate("/404");
return;
}
if (res.status !== 200) {
console.error("Erreur lors du chargement du profil", res);
return;
}
setProfileUser(res.data);
} else {
update();
setProfileUser(user);
if (user?.profile_photo_path) {
setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${user.profile_photo_path}`);
}
}
})();
}, [user, id]);
const handleEditPictureClick = () => {
if (fileInputRef.current) {
fileInputRef.current.click();
}
if (res.status !== 200) {
console.error("Erreur lors du chargement du profil", res);
return;
};
// Remplacé : handleFileChange extrait vers utils/users/uploadProfilePhoto
const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
const file = e.target.files?.[0];
if (!file) return;
try {
const res = await uploadProfilePhoto(file);
if (res.ok) {
setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${res.data.profile_photo_path}`);
setSuccess("Photo mise à jour !");
setError(null);
await update();
} else {
setError(res.data?.message || res.error || "Erreur lors de l'upload.");
setSuccess(null);
}
} catch (err) {
setError("Erreur réseau.");
setSuccess(null);
}
setProfileUser(res.data);
} else {
update();
setProfileUser(user);
if (user?.profile_photo_path) {
setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${user.profile_photo_path}`);
};
// Remplacé : handleDeletePicture extrait vers utils/users/deleteProfilePhoto
const handleDeletePicture = async () => {
try {
const res = await deleteProfilePhoto();
if (res.status >= 200 && res.status < 300) {
setProfilePicture(null);
setSuccess("Photo supprimée !");
setError(null);
await update();
} else {
setError(res.data?.message || "Erreur lors de la suppression.");
setSuccess(null);
}
} catch (err) {
setError("Erreur réseau.");
setSuccess(null);
}
}
})();
}, [user, id]);
};
const handleEditPictureClick = () => {
if (fileInputRef.current) {
fileInputRef.current.click();
}
};
return (
<div className={styles.container}>
<div className={`${styles.profileboard} glassCard`}>
<div className={styles.contentWrapper}>
<div className={styles.profilePictureContainer}>
<img
src={isOwnProfile ? (profilePicture || "/react.svg") : "/react.svg"}
alt="Photo de profil"
className={styles.profilePicture}
/>
</div>
// Remplacé : handleFileChange extrait vers utils/users/uploadProfilePhoto
const handleFileChange = async (e: React.ChangeEvent<HTMLInputElement>) => {
const file = e.target.files?.[0];
if (!file) return;
{isOwnProfile && (
<div className={styles.pictureButtons}>
<button onClick={handleEditPictureClick} className={styles.editPictureButton}>
Modifier la photo
</button>
{user?.profile_photo_path && (
<button onClick={handleDeletePicture} className={styles.deletePictureButton}>
Supprimer
</button>
)}
</div>
)}
try {
const res = await uploadProfilePhoto(file);
if (res.ok) {
setProfilePicture(`${import.meta.env.VITE_API_URL}/storage/${res.data.profile_photo_path}`);
setSuccess("Photo mise à jour !");
setError(null);
await update();
} else {
setError(res.data?.message || res.error || "Erreur lors de l'upload.");
setSuccess(null);
}
} catch (err) {
setError("Erreur réseau.");
setSuccess(null);
}
};
<input
type="file"
ref={fileInputRef}
onChange={handleFileChange}
accept="image/*"
style={{display: "none"}}
/>
{error && <p className={styles.errorMessage}>{error}</p>}
{success && <p className={styles.successMessage}>{success}</p>}
// Remplacé : handleDeletePicture extrait vers utils/users/deleteProfilePhoto
const handleDeletePicture = async () => {
try {
const res = await deleteProfilePhoto();
if (res.status >= 200 && res.status < 300) {
setProfilePicture(null);
setSuccess("Photo supprimée !");
setError(null);
await update();
} else {
setError(res.data?.message || "Erreur lors de la suppression.");
setSuccess(null);
}
} catch (err) {
setError("Erreur réseau.");
setSuccess(null);
}
};
<div className={styles.description}>
<div className={styles.headerProfile}>
<h2>
{profileUser?.name} {profileUser?.lastname}
</h2>
{user?.isAdmin && profileUser && !isOwnProfile && (
<ManageMember userToManage={profileUser}/>
)}
</div>
return (
<div className={styles.container}>
<div className={`${styles.profileboard} glassCard`}>
<div className={styles.contentWrapper}>
<div className={styles.profilePictureContainer}>
<img
src={isOwnProfile ? (profilePicture || "/react.svg") : "/react.svg"}
alt="Photo de profil"
className={styles.profilePicture}
/>
</div>
<div className={styles.topDescription}>
<div className={`${styles.infoBlock} glassBorder`}>
<p><strong>Role :</strong> {profileUser?.role}</p>
<p><strong>Membre depuis :</strong> {profileUser && formatDate(profileUser.created_at)}
</p>
</div>
{isOwnProfile && (
<div className={styles.pictureButtons}>
<button onClick={handleEditPictureClick} className={styles.editPictureButton}>
Modifier la photo
</button>
{user?.profile_photo_path && (
<button onClick={handleDeletePicture} className={styles.deletePictureButton}>
Supprimer
</button>
)}
</div>
)}
<div className={`${styles.infoBlock} glassBorder`}>
<p><strong>Mail :</strong> {profileUser?.email}</p>
<p><strong>Téléphone :</strong> {profileUser?.phone ?? "Non renseigné"}</p>
</div>
<input
type="file"
ref={fileInputRef}
onChange={handleFileChange}
accept="image/*"
style={{ display: "none" }}
/>
{error && <p className={styles.errorMessage}>{error}</p>}
{success && <p className={styles.successMessage}>{success}</p>}
{isOwnProfile && (
<div className={styles.settingImage}>
<SettingsModal/>
</div>
)}
</div>
<div className={styles.description}>
<div className={styles.headerProfile}>
<h2>
{profileUser?.name} {profileUser?.lastname}
</h2>
{user?.isAdmin && profileUser && !isOwnProfile && (
<ManageMember userToManage={profileUser} />
)}
</div>
<div className={styles.topDescription}>
<div className={`${styles.infoBlock} glassBorder`}>
<p><strong>Role :</strong> {profileUser?.role}</p>
<p><strong>Membre depuis :</strong> {profileUser && formatDate(profileUser.created_at)}</p>
</div>
<div className={`${styles.infoBlock} glassBorder`}>
<p><strong>Mail :</strong> {profileUser?.email}</p>
<p><strong>Téléphone :</strong> {profileUser?.phone ?? "Non renseigné"}</p>
</div>
{isOwnProfile && (
<div className={styles.settingImage}>
<SettingsModal />
<h2>Tâches :</h2>
{profileUser?.tasks.length ? (
profileUser.tasks.map((task) =><Task key={task.id} task={task}/>)
) : (
<p>Aucune tâche.</p>
)}
</div>
</div>
)}
</div>
<h2>Tâches :</h2>
{profileUser?.tasks.length ? (
profileUser.tasks.map((task) => <Task key={task.id} task={task} />)
) : (
<p>Aucune tâche.</p>
)}
</div>
</div>
</div>
</div>
);
);
}
export default ProfilePage;