This repository was archived by the owner on Feb 26, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 3 files changed +31
-11
lines changed Expand file tree Collapse file tree 3 files changed +31
-11
lines changed Original file line number Diff line number Diff line change @@ -143,13 +143,23 @@ class Store extends React.Component {
143
143
}
144
144
145
145
filterEvents ( acc , { date, events } ) {
146
- const rooms = [ 'Sala Tapioca' , 'Sala Rapadura' , 'Sala Macaxeira' , 'Sala Jerimum' ] ;
146
+ const rooms = [ 'Sala Tapioca' , 'Sala Rapadura' , 'Sala Macaxeira' , 'Sala Jerimum' ]
147
+ . reverse ( ) ;
147
148
const filteredEvents = events . filter ( event => (
148
149
this . state . typeFilter . includes ( event . details . eventType )
149
150
&& ( ! event . details . category || this . state . categoryFilter . includes ( event . details . category ) )
150
151
&& ( ! this . state . searchFilter || this . checkSearchMatch ( event ) )
151
- ) ) . sort ( ( a , b ) => {
152
- const room = indexOf ( )
152
+ ) ) ;
153
+
154
+ filteredEvents . sort ( ( a , b ) => {
155
+ const roomA = rooms . indexOf ( a . location ) ;
156
+ const roomB = rooms . indexOf ( b . location ) ;
157
+
158
+ if ( roomA === roomB ) {
159
+ return 0 ;
160
+ }
161
+
162
+ return roomA > roomB ? 1 : - 1 ;
153
163
} )
154
164
if ( filteredEvents . length )
155
165
return [ ...acc , { date, events : filteredEvents } ] ;
Original file line number Diff line number Diff line change @@ -22,8 +22,8 @@ const EventTypes = (event) => ({
22
22
< h4 className = "schedule_office" >
23
23
{ event . details . title }
24
24
</ h4 >
25
- < h4 className = "schedule_office " >
26
- { event . location }
25
+ < h4 className = "schedule_location " >
26
+ < i className = "material-icons" > location_on </ i > { event . location }
27
27
</ h4 >
28
28
</ React . Fragment >
29
29
) ,
@@ -41,8 +41,8 @@ const EventTypes = (event) => ({
41
41
< h4 className = "schedule_office" >
42
42
{ event . details . title }
43
43
</ h4 >
44
- < h4 className = "schedule_office " >
45
- { event . location }
44
+ < h4 className = "schedule_location " >
45
+ < i className = "material-icons" > location_on </ i > { event . location }
46
46
</ h4 >
47
47
</ React . Fragment >
48
48
) ,
@@ -62,8 +62,8 @@ const EventTypes = (event) => ({
62
62
< h4 className = "schedule_office" >
63
63
{ event . details . title }
64
64
</ h4 >
65
- < h4 className = "schedule_office " >
66
- { event . location }
65
+ < h4 className = "schedule_location " >
66
+ < i className = "material-icons" > location_on </ i > { event . location }
67
67
</ h4 >
68
68
</ React . Fragment >
69
69
) ,
@@ -75,8 +75,8 @@ const EventTypes = (event) => ({
75
75
< h3 className = "schedule_speaker" >
76
76
{ event . details . description }
77
77
</ h3 >
78
- < h4 className = "schedule_office " >
79
- { event . location }
78
+ < h4 className = "schedule_location " >
79
+ < i className = "material-icons" > location_on </ i > { event . location }
80
80
</ h4 >
81
81
</ React . Fragment >
82
82
) ,
Original file line number Diff line number Diff line change 326
326
color : rgba ($background-light , 0.6 );
327
327
}
328
328
329
+ .schedule_location {
330
+ @extend .schedule_office ;
331
+ @extend .d-flex ;
332
+ @extend .align-items-center ;
333
+ .material-icons {
334
+ font-size : inherit ;
335
+ margin-right : 5px ;
336
+ }
337
+ }
338
+
329
339
.schedule_speaker {
330
340
font-size : 14px ;
331
341
font-weight : 400 ;
You can’t perform that action at this time.
0 commit comments