Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 5ff5974

Browse files
LucasTrgs314cy
andauthored
212 hugo events (#216)
* update events * Rajoute SDF et SS au calendrier * sort events by date Co-authored-by: s314cy <hugo.elguedj@epfl.ch>
1 parent 47d69c1 commit 5ff5974

File tree

2 files changed

+83
-43
lines changed

2 files changed

+83
-43
lines changed
+80-41
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,81 @@
1-
[
2-
{
3-
"title": "Hello World",
4-
"organizer": {
5-
"name": "CLIC",
6-
"url": "/about",
7-
},
8-
"time": null,
9-
"place": {
10-
"name": "Hall BC",
11-
"url": "https://map.epfl.ch/?dim_floor=0&lang=en&dim_lang=en&tree_groups=centres_nevralgiques%2Cacces%2Cmobilite_reduite%2Censeignement%2Ccommerces_et_services%2Cvehicules%2Cinfrastructure_plan_grp&tree_group_layers_centres_nevralgiques=information_epfl%2Cguichet_etudiants&tree_group_layers_acces=metro&tree_group_layers_mobilite_reduite=&tree_group_layers_enseignement=&tree_group_layers_commerces_et_services=&tree_group_layers_vehicules=&tree_group_layers_infrastructure_plan_grp=batiments_query_plan&baselayer_ref=grp_backgrounds&map_x=2532727&map_y=1152292&map_zoom=12"
12-
},
13-
"date": {
14-
"day": 11,
15-
"month": 11,
16-
"year": 2021
17-
},
18-
"image": "/events/banner.png",
19-
"shortText": "La CLIC vous invite à son événement du 11 Novembre !",
20-
"moreInfoUrl": "/news/30"
21-
},
22-
{
23-
"title": "PolyLAN 36",
24-
"organizer": {
25-
"name": "PolyLAN",
26-
"url": "https://polylan.ch",
27-
},
28-
"time": "18h00",
29-
"place": {
30-
"name": "RLC",
31-
"url": null
32-
},
33-
"date": {
34-
"day": 26,
35-
"month": 11,
36-
"year": 2021
37-
},
38-
"image": null,
39-
"shortText": "LAN de 300 personnes sur 3 jours, organisée par des étudiants EPFL",
40-
"moreInfoUrl": "https://polylan.ch"
41-
}
1+
[{
2+
"title": "Hello World",
3+
"organizer": {
4+
"name": "CLIC",
5+
"url": "/about"
6+
},
7+
"time": null,
8+
"place": {
9+
"name": "Hall BC",
10+
"url": "https://map.epfl.ch/?dim_floor=0&lang=en&dim_lang=en&tree_groups=centres_nevralgiques%2Cacces%2Cmobilite_reduite%2Censeignement%2Ccommerces_et_services%2Cvehicules%2Cinfrastructure_plan_grp&tree_group_layers_centres_nevralgiques=information_epfl%2Cguichet_etudiants&tree_group_layers_acces=metro&tree_group_layers_mobilite_reduite=&tree_group_layers_enseignement=&tree_group_layers_commerces_et_services=&tree_group_layers_vehicules=&tree_group_layers_infrastructure_plan_grp=batiments_query_plan&baselayer_ref=grp_backgrounds&map_x=2532727&map_y=1152292&map_zoom=12"
11+
},
12+
"date": {
13+
"day": 11,
14+
"month": 11,
15+
"year": 2021
16+
},
17+
"image": "/events/banner.png",
18+
"shortText": "La CLIC vous invite à son événement du 11 Novembre !",
19+
"moreInfoUrl": "/news/30"
20+
},
21+
{
22+
"title": "Souper de Faculté",
23+
"organizer": {
24+
"name": "CLIC",
25+
"url": "/about"
26+
},
27+
"time": null,
28+
"place": {
29+
"name": "Hall BC",
30+
"url": "https://map.epfl.ch/?dim_floor=0&lang=en&dim_lang=en&tree_groups=centres_nevralgiques%2Cacces%2Cmobilite_reduite%2Censeignement%2Ccommerces_et_services%2Cvehicules%2Cinfrastructure_plan_grp&tree_group_layers_centres_nevralgiques=information_epfl%2Cguichet_etudiants&tree_group_layers_acces=metro&tree_group_layers_mobilite_reduite=&tree_group_layers_enseignement=&tree_group_layers_commerces_et_services=&tree_group_layers_vehicules=&tree_group_layers_infrastructure_plan_grp=batiments_query_plan&baselayer_ref=grp_backgrounds&map_x=2532727&map_y=1152292&map_zoom=12"
31+
},
32+
"date": {
33+
"day": 9,
34+
"month": 12,
35+
"year": 2021
36+
},
37+
"image": null,
38+
"shortText": "La CLIC vous invite à un repas convivial en compagnie de vos professeurs et de la Faculté",
39+
"moreInfoUrl": null
40+
},
41+
{
42+
"title": "Secret Santa",
43+
"organizer": {
44+
"name": "CLIC",
45+
"url": "/about"
46+
},
47+
"time": null,
48+
"place": {
49+
"name": "Hall BC",
50+
"url": "https://map.epfl.ch/?dim_floor=0&lang=en&dim_lang=en&tree_groups=centres_nevralgiques%2Cacces%2Cmobilite_reduite%2Censeignement%2Ccommerces_et_services%2Cvehicules%2Cinfrastructure_plan_grp&tree_group_layers_centres_nevralgiques=information_epfl%2Cguichet_etudiants&tree_group_layers_acces=metro&tree_group_layers_mobilite_reduite=&tree_group_layers_enseignement=&tree_group_layers_commerces_et_services=&tree_group_layers_vehicules=&tree_group_layers_infrastructure_plan_grp=batiments_query_plan&baselayer_ref=grp_backgrounds&map_x=2532727&map_y=1152292&map_zoom=12"
51+
},
52+
"date": {
53+
"day": 17,
54+
"month": 12,
55+
"year": 2021
56+
},
57+
"image": null,
58+
"shortText": "Venez offrir et recevoir vos cadeaux !",
59+
"moreInfoUrl": null
60+
},
61+
{
62+
"title": "PolyLAN 36",
63+
"organizer": {
64+
"name": "PolyLAN",
65+
"url": "https://polylan.ch"
66+
},
67+
"time": "18h00",
68+
"place": {
69+
"name": "RLC",
70+
"url": null
71+
},
72+
"date": {
73+
"day": 26,
74+
"month": 11,
75+
"year": 2021
76+
},
77+
"image": null,
78+
"shortText": "LAN de 300 personnes sur 3 jours, organisée par des étudiants EPFL",
79+
"moreInfoUrl": "https://polylan.ch"
80+
}
4281
]

src/components/events/events.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,13 @@ class EventsComponent {
131131
* Returns all events in fresh array
132132
*/
133133
list(): Array<Event> {
134-
return Object.assign([], this.eventsList)
134+
let sortedEventsList = Object.assign([], this.eventsList)
135+
return sortedEventsList.sort((e1, e2) => e1.date - e2.date)
135136
}
136137

137138
listValid(): Array<Event> {
138139
const now = new Date()
139-
const valid = this.eventsList.filter((event) =>
140+
const valid = this.list().filter((event) =>
140141
event.date === null || event.date >= now)
141142
return Object.assign([], valid)
142143
}

0 commit comments

Comments
 (0)