correction graphique
This commit is contained in:
1 parent
75e93abce6
commit
fb7152bf21
7 files changed
+16
-14
No files matched your search
@@ -2,7 +2,6 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
border-radius: 8px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.content {
|
.content {
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ const Task: React.FC<TaskProps> = ({ task }) => {
|
|||||||
}, [task.events_id]);
|
}, [task.events_id]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={`${styles.task} glassCard`}>
|
<div className={`${styles.task} glassBorder`}>
|
||||||
<div className={styles.content}>
|
<div className={styles.content}>
|
||||||
<div>
|
<div>
|
||||||
<h2>
|
<h2>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ function IncompleteEvent() {
|
|||||||
<h2>Derniers événements</h2>
|
<h2>Derniers événements</h2>
|
||||||
<div className={styles.eventsContainer}>
|
<div className={styles.eventsContainer}>
|
||||||
{events.map((event) => (
|
{events.map((event) => (
|
||||||
<div key={event.id} className={`glassCard ${styles.eventCard}`}>
|
<div key={event.id} className={`glassBorder ${styles.eventCard}`}>
|
||||||
<h3>{event.name}</h3>
|
<h3>{event.name}</h3>
|
||||||
<p className={styles.eventDate}>
|
<p className={styles.eventDate}>
|
||||||
{new Date(event.start).toLocaleDateString("fr-FR")} - {new Date(event.end).toLocaleDateString("fr-FR")}
|
{new Date(event.start).toLocaleDateString("fr-FR")} - {new Date(event.end).toLocaleDateString("fr-FR")}
|
||||||
|
|||||||
@@ -29,17 +29,18 @@
|
|||||||
transform: translateX(20px);
|
transform: translateX(20px);
|
||||||
animation: slideInEvent 1s ease forwards;
|
animation: slideInEvent 1s ease forwards;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.eventCard ul {
|
.eventCard ul {
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-left: 8%;
|
margin-left: 5%;
|
||||||
padding-left: 15px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.eventCard ul li {
|
.eventCard ul li {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
list-style-type: circle;
|
list-style-type: circle;
|
||||||
|
list-style: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.eventCard > h3 {
|
.eventCard > h3 {
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ function PendingMembers() {
|
|||||||
|
|
||||||
{pendingMembers.map((member, index) => (
|
{pendingMembers.map((member, index) => (
|
||||||
|
|
||||||
<div key={index} className={`glassCard ${styles.memberCard}`}>
|
<div key={index} className={`glassBorder ${styles.memberCard}`}>
|
||||||
|
|
||||||
<p>{member.name} {member.lastname}</p>
|
<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 Button from "../../../../components/ui/button/button.jsx";
|
||||||
import {AuthContext} from "../../../../contexts/auth/AuthContext.ts";
|
import {AuthContext} from "../../../../contexts/auth/AuthContext.ts";
|
||||||
|
|
||||||
function Calendar() {
|
function
|
||||||
|
Calendar() {
|
||||||
|
|
||||||
const { user } = useContext(AuthContext);
|
const { user } = useContext(AuthContext);
|
||||||
|
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ interface AuthContextType {
|
|||||||
|
|
||||||
function ProfilePage() {
|
function ProfilePage() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const { id } = useParams();
|
const {id} = useParams();
|
||||||
const { user, update } = useContext(AuthContext) as AuthContextType;
|
const {user, update} = useContext(AuthContext) as AuthContextType;
|
||||||
const [profileUser, setProfileUser] = useState<User | null>(null);
|
const [profileUser, setProfileUser] = useState<User | null>(null);
|
||||||
const [profilePicture, setProfilePicture] = useState<string | null>(null);
|
const [profilePicture, setProfilePicture] = useState<string | null>(null);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
@@ -164,7 +164,7 @@ function ProfilePage() {
|
|||||||
ref={fileInputRef}
|
ref={fileInputRef}
|
||||||
onChange={handleFileChange}
|
onChange={handleFileChange}
|
||||||
accept="image/*"
|
accept="image/*"
|
||||||
style={{ display: "none" }}
|
style={{display: "none"}}
|
||||||
/>
|
/>
|
||||||
{error && <p className={styles.errorMessage}>{error}</p>}
|
{error && <p className={styles.errorMessage}>{error}</p>}
|
||||||
{success && <p className={styles.successMessage}>{success}</p>}
|
{success && <p className={styles.successMessage}>{success}</p>}
|
||||||
@@ -175,14 +175,15 @@ function ProfilePage() {
|
|||||||
{profileUser?.name} {profileUser?.lastname}
|
{profileUser?.name} {profileUser?.lastname}
|
||||||
</h2>
|
</h2>
|
||||||
{user?.isAdmin && profileUser && !isOwnProfile && (
|
{user?.isAdmin && profileUser && !isOwnProfile && (
|
||||||
<ManageMember userToManage={profileUser} />
|
<ManageMember userToManage={profileUser}/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={styles.topDescription}>
|
<div className={styles.topDescription}>
|
||||||
<div className={`${styles.infoBlock} glassBorder`}>
|
<div className={`${styles.infoBlock} glassBorder`}>
|
||||||
<p><strong>Role :</strong> {profileUser?.role}</p>
|
<p><strong>Role :</strong> {profileUser?.role}</p>
|
||||||
<p><strong>Membre depuis :</strong> {profileUser && formatDate(profileUser.created_at)}</p>
|
<p><strong>Membre depuis :</strong> {profileUser && formatDate(profileUser.created_at)}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={`${styles.infoBlock} glassBorder`}>
|
<div className={`${styles.infoBlock} glassBorder`}>
|
||||||
@@ -192,14 +193,14 @@ function ProfilePage() {
|
|||||||
|
|
||||||
{isOwnProfile && (
|
{isOwnProfile && (
|
||||||
<div className={styles.settingImage}>
|
<div className={styles.settingImage}>
|
||||||
<SettingsModal />
|
<SettingsModal/>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h2>Tâches :</h2>
|
<h2>Tâches :</h2>
|
||||||
{profileUser?.tasks.length ? (
|
{profileUser?.tasks.length ? (
|
||||||
profileUser.tasks.map((task) => <Task key={task.id} task={task} />)
|
profileUser.tasks.map((task) =><Task key={task.id} task={task}/>)
|
||||||
) : (
|
) : (
|
||||||
<p>Aucune tâche.</p>
|
<p>Aucune tâche.</p>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in new issue
Block a user