Skip to content

Commit 9f2f47d

Browse files
author
Emmanuelle BONOLI
committed
merge create activity card after missing things..
2 parents 6a8b71a + 0b76065 commit 9f2f47d

File tree

9 files changed

+27
-23
lines changed

9 files changed

+27
-23
lines changed

public/activities/tempActivitiesData.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
"id": 2,
2323
"title": "Collecte alimentaire",
2424
"description": "Aidez-nous à collecter et distribuer des denrées aux personnes dans le besoin.",
25-
"image": ["/activities/tempImageData/maraude.png"],
25+
"image": ["/activities/tempImageData/collecteAlimentaire.png"],
2626
"organization": {
2727
"name": "Les Restos du Cœur",
28-
"logo": "/activities/tempImageData/logoCroixRouge.png",
28+
"logo": "/activities/tempImageData/restoDuCoeur.png",
2929
"isFollow": true
3030
},
3131
"location": "Lyon",
@@ -41,10 +41,10 @@
4141
"id": 3,
4242
"title": "Soutien scolaire",
4343
"description": "Nous recherchons des bénévoles pour aider des enfants en difficulté scolaire.",
44-
"image": ["/activities/tempImageData/maraude.png"],
44+
"image": ["/activities/tempImageData/soutienScolaire.jpg"],
4545
"organization": {
4646
"name": "Éducation Pour Tous",
47-
"logo": "/activities/tempImageData/logoCroixRouge.png",
47+
"logo": "/activities/tempImageData/educationPourTous.png",
4848
"isFollow": true
4949
},
5050
"location": "Paris",
@@ -63,7 +63,7 @@
6363
"image": ["/activities/tempImageData/SPA.png"],
6464
"organization": {
6565
"name": "SPA",
66-
"logo": "/activities/tempImageData/logoCroixRouge.png",
66+
"logo": "/activities/tempImageData/logoSPA.png",
6767
"isFollow": false
6868
},
6969
"location": "Marseille",
132 KB
Loading
93.7 KB
Loading
9.78 KB
Loading

src/app/features/activity/components/activity-card/activity-card.component.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
<div class="header-description">
55
<h3>{{ activity.title }}</h3>
66
@if (activity) {
7-
<app-inscription-badge [participants]="activity.participants"></app-inscription-badge>
7+
<app-inscription-badge [participants]="activity.participants"></app-inscription-badge>
88
}
9-
<!-- TODO: changer pour le composant réutilisable -->
109
</div>
1110
<p>
1211
{{ activity.description }}
@@ -21,15 +20,13 @@ <h3>{{ activity.title }}</h3>
2120
<div class="footer-details">
2221
<div class="location">
2322
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512">
24-
<!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
2523
<path
2624
d="M215.7 499.2C267 435 384 279.4 384 192C384 86 298 0 192 0S0 86 0 192c0 87.4 117 243 168.3 307.2c12.3 15.3 35.1 15.3 47.4 0zM192 128a64 64 0 1 1 0 128 64 64 0 1 1 0-128z" />
2725
</svg>
2826
<p class="mini-p">{{ activity.location }}</p>
2927
</div>
3028
<div class="date">
3129
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
32-
<!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
3330
<path
3431
d="M128 0c17.7 0 32 14.3 32 32l0 32 128 0 0-32c0-17.7 14.3-32 32-32s32 14.3 32 32l0 32 48 0c26.5 0 48 21.5 48 48l0 48L0 160l0-48C0 85.5 21.5 64 48 64l48 0 0-32c0-17.7 14.3-32 32-32zM0 192l448 0 0 272c0 26.5-21.5 48-48 48L48 512c-26.5 0-48-21.5-48-48L0 192zm64 80l0 32c0 8.8 7.2 16 16 16l32 0c8.8 0 16-7.2 16-16l0-32c0-8.8-7.2-16-16-16l-32 0c-8.8 0-16 7.2-16 16zm128 0l0 32c0 8.8 7.2 16 16 16l32 0c8.8 0 16-7.2 16-16l0-32c0-8.8-7.2-16-16-16l-32 0c-8.8 0-16 7.2-16 16zm144-16c-8.8 0-16 7.2-16 16l0 32c0 8.8 7.2 16 16 16l32 0c8.8 0 16-7.2 16-16l0-32c0-8.8-7.2-16-16-16l-32 0zM64 400l0 32c0 8.8 7.2 16 16 16l32 0c8.8 0 16-7.2 16-16l0-32c0-8.8-7.2-16-16-16l-32 0c-8.8 0-16 7.2-16 16zm144-16c-8.8 0-16 7.2-16 16l0 32c0 8.8 7.2 16 16 16l32 0c8.8 0 16-7.2 16-16l0-32c0-8.8-7.2-16-16-16l-32 0zm112 16l0 32c0 8.8 7.2 16 16 16l32 0c8.8 0 16-7.2 16-16l0-32c0-8.8-7.2-16-16-16l-32 0c-8.8 0-16 7.2-16 16z" />
3532
</svg>

src/app/features/activity/components/activity-card/activity-card.component.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
.activity-image {
1212
width: 100%;
1313
filter: brightness(80%);
14+
border-radius: var(--border-radius) var(--border-radius) 0 0;
1415
}
1516

1617
h3 {
@@ -26,7 +27,7 @@
2627
display: flex;
2728
flex-direction: column;
2829
justify-content: space-between;
29-
padding: 5% 5% 0% 5%;
30+
padding: 5% 5% 0 5%;
3031

3132
.header-description {
3233
display: flex;
@@ -38,6 +39,10 @@
3839
display: flex;
3940
align-items: center;
4041
gap: 2%;
42+
43+
img {
44+
width: 25px;
45+
}
4146
}
4247

4348
.push-footer {
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@if (participants) {
2-
<div class="badge-container">
3-
@if (participants.current === participants.max) {
4-
<p class="badge full">Complet</p>
5-
} @else {
6-
<p class="badge">{{ participants.current }} / {{ participants.max }} pers.</p>
7-
}
8-
</div>
2+
<div class="badge-container">
3+
@if (participants.current === participants.max) {
4+
<p class="badge full">Complet</p>
5+
} @else {
6+
<p class="badge">{{ participants.current }} / {{ participants.max }} pers.</p>
7+
}
8+
</div>
99
}
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.badge-container {
22
width: 75px;
33
height: 30px;
4+
45
.badge {
56
border-radius: 8px;
67
display: flex;
@@ -10,12 +11,13 @@
1011
text-align: center;
1112
width: 75px;
1213
height: 30px;
13-
background-color: var(--secondaryValidateColor);
14-
color: white;
15-
font-size: var(--fontSizePMini);
16-
font-family: var(--fontFamilyP);
14+
background-color: var(--secondary-validate-color);
15+
color: var(--background-color-white);
16+
font-size: var(--font-size-p-mini);
17+
font-family: var(--font-family-p);
18+
1719
&.full {
18-
background-color: var(--secondaryCompleteColor);
20+
background-color: var(--secondary-complete-color);
1921
}
2022
}
2123
}

src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5-
<title>to_rename</title>
5+
<title>A l'asso</title>
66
<base href="/" />
77
<meta name="viewport" content="width=device-width, initial-scale=1" />
88
<link rel="icon" type="image/x-icon" href="favicon.ico" />

0 commit comments

Comments
 (0)