Skip to content

Commit cd13f18

Browse files
RestutaRestuta
committed
Merge pull request #120 from Restuta/dev-update-mtb
* Adding moved status
2 parents 0e842b5 + dcbab86 commit cd13f18

File tree

5 files changed

+122
-10
lines changed

5 files changed

+122
-10
lines changed

‎src/client/calendar/events/Event.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class Event extends Component {
178178

179179
let opacity = 1
180180

181-
if (event.status === Statuses.Cancelled) {
181+
if (event.status === Statuses.Cancelled || event.status === Statuses.Moved) {
182182
eventColor = Colors.grey400
183183
}
184184

‎src/client/calendar/events/EventName.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ const EventName = (props) => {
3131
wrappedNameComp = <span>CANCELED: <span className="cancelled">{name}</span></span>
3232
}
3333

34+
if (eventStatus === Statuses.Moved) {
35+
wrappedNameComp = <span>MOVED: <span className="cancelled">{name}</span></span>
36+
}
37+
3438
return (
3539
<div className={className}>
3640
{wrappedNameComp}

‎src/client/temp/data/2016-mtb-manual.js

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,8 +1036,66 @@ export default [
10361036
"zip": ""
10371037
}
10381038
},
1039-
1040-
1039+
{
1040+
"discipline": "MTB",
1041+
"permit": "",
1042+
"name": "Mendocino Mountain Bike Madness (M5)",
1043+
"date": "Aug 18 2016",
1044+
"promoterUrl": "http://superproracing.com/dirt/mendocino-mtb-madness/",
1045+
"registrationUrl": "https://www.eventbrite.com/e/murphy-macks-mendocino-mtb-madness-aka-m5-2016-registration-24261277133",
1046+
"flyerUrl": "",
1047+
"location": {
1048+
"streetAddress": "Mendocino Woodlands State Park",
1049+
"city": "Fort Bragg",
1050+
"state": "CA",
1051+
"zip": "95437"
1052+
}
1053+
},
1054+
{
1055+
"discipline": "MTB",
1056+
"permit": "",
1057+
"name": "Mendocino Mountain Bike Madness (M5)",
1058+
"date": "Aug 19 2016",
1059+
"promoterUrl": "http://superproracing.com/dirt/mendocino-mtb-madness/",
1060+
"registrationUrl": "https://www.eventbrite.com/e/murphy-macks-mendocino-mtb-madness-aka-m5-2016-registration-24261277133",
1061+
"flyerUrl": "",
1062+
"location": {
1063+
"streetAddress": "Mendocino Woodlands State Park",
1064+
"city": "Fort Bragg",
1065+
"state": "CA",
1066+
"zip": "95437"
1067+
}
1068+
},
1069+
{
1070+
"discipline": "MTB",
1071+
"permit": "",
1072+
"name": "Mendocino Mountain Bike Madness (M5)",
1073+
"date": "Aug 20 2016",
1074+
"promoterUrl": "http://superproracing.com/dirt/mendocino-mtb-madness/",
1075+
"registrationUrl": "https://www.eventbrite.com/e/murphy-macks-mendocino-mtb-madness-aka-m5-2016-registration-24261277133",
1076+
"flyerUrl": "",
1077+
"location": {
1078+
"streetAddress": "Mendocino Woodlands State Park",
1079+
"city": "Fort Bragg",
1080+
"state": "CA",
1081+
"zip": "95437"
1082+
}
1083+
},
1084+
{
1085+
"discipline": "MTB",
1086+
"permit": "",
1087+
"name": "Mendocino Mountain Bike Madness (M5)",
1088+
"date": "Aug 21 2016",
1089+
"promoterUrl": "http://superproracing.com/dirt/mendocino-mtb-madness/",
1090+
"registrationUrl": "https://www.eventbrite.com/e/murphy-macks-mendocino-mtb-madness-aka-m5-2016-registration-24261277133",
1091+
"flyerUrl": "",
1092+
"location": {
1093+
"streetAddress": "Mendocino Woodlands State Park",
1094+
"city": "Fort Bragg",
1095+
"state": "CA",
1096+
"zip": "95437"
1097+
}
1098+
},
10411099
]
10421100

10431101
/*

‎src/client/temp/data/2016-mtb.js

Lines changed: 55 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -450,33 +450,81 @@ export default [
450450
"id": "evt-5c2ca773142675029358fab4e891d57d",
451451
"discipline": "MTB",
452452
"name": "Coolest 8 and 24hr",
453-
"date": "June 03 2016",
453+
"status": "Moved",
454+
"date": "June 3 2016",
454455
"promoterUrl": "http://northlanderevents.com/the-coolest-8-and-24-hour-race/4587854881",
455456
"location": {
457+
"streetAddress": "2634 County Road A23",
456458
"city": "Beckwourth",
457-
"state": "CA"
459+
"state": "CA",
460+
"zip": "96129"
461+
}
462+
},
463+
{
464+
"id": "evt-5c2ca773142675029358fab4e891d57d",
465+
"discipline": "MTB",
466+
"name": "Coolest 8 and 24hr",
467+
"status": "Moved",
468+
"date": "June 4 2016",
469+
"promoterUrl": "http://northlanderevents.com/the-coolest-8-and-24-hour-race/4587854881",
470+
"location": {
471+
"streetAddress": "2634 County Road A23",
472+
"city": "Beckwourth",
473+
"state": "CA",
474+
"zip": "96129"
475+
}
476+
},
477+
{
478+
"id": "evt-5c2ca773142675029358fab4e891d57d",
479+
"discipline": "MTB",
480+
"name": "Coolest 8 and 24hr",
481+
"status": "Moved",
482+
"date": "June 5 2016",
483+
"promoterUrl": "http://northlanderevents.com/the-coolest-8-and-24-hour-race/4587854881",
484+
"location": {
485+
"streetAddress": "2634 County Road A23",
486+
"city": "Beckwourth",
487+
"state": "CA",
488+
"zip": "96129"
489+
}
490+
},
491+
{
492+
"id": "evt-5c2ca773142675029358fab4e891d57d",
493+
"discipline": "MTB",
494+
"name": "Coolest 8 and 24hr",
495+
"date": "July 22 2016",
496+
"promoterUrl": "http://northlanderevents.com/the-coolest-8-and-24-hour-race/4587854881",
497+
"location": {
498+
"streetAddress": "2634 County Road A23",
499+
"city": "Beckwourth",
500+
"state": "CA",
501+
"zip": "96129"
458502
}
459503
},
460504
{
461505
"id": "evt-7c1137042a80e7849f24924cb1c0b052",
462506
"discipline": "MTB",
463507
"name": "Coolest 8 and 24hr",
464-
"date": "June 04 2016",
508+
"date": "July 23 2016",
465509
"promoterUrl": "http://northlanderevents.com/the-coolest-8-and-24-hour-race/4587854881",
466510
"location": {
511+
"streetAddress": "2634 County Road A23",
467512
"city": "Beckwourth",
468-
"state": "CA"
513+
"state": "CA",
514+
"zip": "96129"
469515
}
470516
},
471517
{
472518
"id": "evt-dfc5b7c2f203774af62283ce08ecd706",
473519
"discipline": "MTB",
474520
"name": "Coolest 8 and 24hr",
475-
"date": "June 05 2016",
521+
"date": "July 24 2016",
476522
"promoterUrl": "http://northlanderevents.com/the-coolest-8-and-24-hour-race/4587854881",
477523
"location": {
524+
"streetAddress": "2634 County Road A23",
478525
"city": "Beckwourth",
479-
"state": "CA"
526+
"state": "CA",
527+
"zip": "96129"
480528
}
481529
},
482530
{
@@ -566,6 +614,7 @@ export default [
566614
},
567615
{
568616
"id": "evt-9389ef253c140cc9df32999732ed6827",
617+
"status": "Cancelled",
569618
"discipline": "MTB",
570619
"name": "Mendocino 100",
571620
"date": "June 26 2016",

‎src/client/temp/events.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ const Disciplines = {
1212
}
1313

1414
const Statuses = {
15-
Cancelled: 'Cancelled'
15+
Cancelled: 'Cancelled',
16+
Moved: 'Moved'
1617
}
1718

1819
class Event {

0 commit comments

Comments
 (0)