From 22e8c8f958eac86a07f0696ca7dae5f08a99c5de Mon Sep 17 00:00:00 2001 From: donavon Date: Sat, 27 Apr 2019 06:06:45 -0400 Subject: [PATCH 1/5] update to react router 5 --- app/components/Footer.js | 2 +- app/components/Header.js | 131 +++++++++++++-------------------------- index.js | 30 +++++---- package.json | 2 +- 4 files changed, 63 insertions(+), 102 deletions(-) diff --git a/app/components/Footer.js b/app/components/Footer.js index a50f4cb..840e540 100644 --- a/app/components/Footer.js +++ b/app/components/Footer.js @@ -1,5 +1,5 @@ import React from 'react'; -import {Link} from 'react-router'; +import {Link} from 'react-router-dom'; import constants from 'helpers/constants'; import Button from 'components/Button'; import Icon from 'components/Icon'; diff --git a/app/components/Header.js b/app/components/Header.js index 6a1a8c4..478eb0a 100644 --- a/app/components/Header.js +++ b/app/components/Header.js @@ -1,7 +1,6 @@ import React, {Component, useState} from 'react'; -import PropTypes from 'prop-types'; import cx from 'classnames'; -import {Link} from 'react-router'; +import {Route, NavLink} from 'react-router-dom'; import moment from 'moment'; import constants from 'helpers/constants'; import DateUtils from 'helpers/DateUtils'; @@ -44,9 +43,9 @@ const HomeHeader = () => {

{isConferenceLive ? ( - + Watch Live Stream - + ) : false ? ( { ); }; -const Navigation = ({onMenuClick = () => {}}) => { +const navItems = [ + ['Speakers', '/speakers'], + ['Schedule', '/schedule'], + ['Venue', '/venue'], + ['Sponsors', '/sponsors'], + ['Conduct', '/conduct'], + ['About', '/about'], +]; + +const Navigation = ({onMenuClick}) => { return (
- onMenuClick(false)}> +
    -
  • - onMenuClick(false)}> - Speakers - -
    • -
  • - onMenuClick(false)}> - Schedule - -
    • -
  • - onMenuClick(false)}> - Venue - -
    • -
  • - onMenuClick(false)}> - Sponsors - -
    • -
  • - onMenuClick(false)}> - Conduct - -
    • -
  • - onMenuClick(false)}> - About - -
    • + {navItems.map(([children, url]) => +
  • + onMenuClick(false)}> + {children} + +
    • + )}
@@ -159,39 +129,26 @@ const Navigation = ({onMenuClick = () => {}}) => { ); }; -export default class Header extends Component { - constructor(props) { - super(props); +const Header = ({ isHomeScreen }) => { + const [isMenuOpen, setMenuState] = useState(false); - this.state = { - isMenuOpen: false, - }; - } + return ( +
+ setMenuState(s => !s)} /> + {isHomeScreen && } +
+ ) +} - render() { - const isHomeScreen = this.context.router.isActive('/', true); - const {isMenuOpen} = this.state; +const HeaderRoute = () => ( +
} + /> +); - return ( -
- { - if (typeof isOpen === 'undefined') { - isOpen = !isMenuOpen; - } - this.setState({isMenuOpen: isOpen}); - }} - /> - {isHomeScreen && } -
- ); - } -} -Header.contextTypes = { - router: PropTypes.object, -}; +export default HeaderRoute; diff --git a/index.js b/index.js index 614f5c7..67ac4bc 100644 --- a/index.js +++ b/index.js @@ -1,6 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import {Router, Route, IndexRoute, browserHistory} from 'react-router'; +import {Router, Route, Switch} from 'react-router-dom'; +import {createBrowserHistory} from 'history'; import App from 'App'; import About from 'screens/About'; import Conduct from 'screens/Conduct'; @@ -48,23 +49,26 @@ const NotFound = () => { } })(); +const history = createBrowserHistory(); ReactDOM.render( { window.scrollTo(0, 0); }}> - - - - - - - - - - - + + + + + + + + + + + + + , document.getElementById('container'), ); diff --git a/package.json b/package.json index 45c0f52..39f5a02 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "prop-types": "15.6.1", "react": "^16.8.6", "react-dom": "^16.8.6", - "react-router": "^3.2.0" + "react-router-dom": "^5.0.0" }, "devDependencies": { "babel-core": "^6.7.2", From f7f67a88c65da6766ccbdb8fcf0dedd66bc313c7 Mon Sep 17 00:00:00 2001 From: donavon Date: Sat, 27 Apr 2019 06:11:54 -0400 Subject: [PATCH 2/5] break up Home component i.e. single responsibility --- app/screens/Home/FeaturedSpeakers.js | 24 +++++ app/screens/Home/TicketCard.js | 29 ++++++ app/screens/Home/Tickets.js | 12 +++ app/screens/Home/UpcomingDate.js | 27 ++++++ app/screens/Home/UpcomingDates.js | 25 ++++++ app/screens/Home/What.js | 15 ++++ app/screens/Home/index.js | 128 +++------------------------ 7 files changed, 145 insertions(+), 115 deletions(-) create mode 100644 app/screens/Home/FeaturedSpeakers.js create mode 100644 app/screens/Home/TicketCard.js create mode 100644 app/screens/Home/Tickets.js create mode 100644 app/screens/Home/UpcomingDate.js create mode 100644 app/screens/Home/UpcomingDates.js create mode 100644 app/screens/Home/What.js diff --git a/app/screens/Home/FeaturedSpeakers.js b/app/screens/Home/FeaturedSpeakers.js new file mode 100644 index 0000000..cb88cbb --- /dev/null +++ b/app/screens/Home/FeaturedSpeakers.js @@ -0,0 +1,24 @@ +import React from 'react'; +import {Link} from 'react-router-dom'; +import shuffle from 'helpers/shuffle'; +import Person from 'components/Person'; +import speakers from '../../../api/speakers'; + +const featuredSpeakers = Object.values(speakers).filter(({ featured }) => featured); + +const FeaturedSpeakers = () => + featuredSpeakers.length > 0 && ( +
+

Featured Speakers

+
+ {shuffle(featuredSpeakers) + .map(speaker => ) + } +
+ + See All the Speakers » + +
+ ); + +export default FeaturedSpeakers; diff --git a/app/screens/Home/TicketCard.js b/app/screens/Home/TicketCard.js new file mode 100644 index 0000000..314c732 --- /dev/null +++ b/app/screens/Home/TicketCard.js @@ -0,0 +1,29 @@ +import React from 'react'; +import cx from 'classnames'; +import constants from 'helpers/constants'; +import Button from 'components/Button'; + +const TicketCard = ({ name, description, price, soldOut }) => { + return ( +
+
+

{name}

+

{description}

+
+
+

{isNaN(price) ? '' : '$' + price}

+ +
+
+ ); +}; + +export default TicketCard; diff --git a/app/screens/Home/Tickets.js b/app/screens/Home/Tickets.js new file mode 100644 index 0000000..b1e36cb --- /dev/null +++ b/app/screens/Home/Tickets.js @@ -0,0 +1,12 @@ +import React from 'react'; +import TicketCard from './TicketCard'; +import tickets from '../../../api/tickets'; + +const Tickets = () => ( +
+

Tickets

+ {tickets.map((ticket, i) => )} +
+); + +export default Tickets; diff --git a/app/screens/Home/UpcomingDate.js b/app/screens/Home/UpcomingDate.js new file mode 100644 index 0000000..2ba983a --- /dev/null +++ b/app/screens/Home/UpcomingDate.js @@ -0,0 +1,27 @@ +import React from 'react'; +import cx from 'classnames'; +import moment from 'moment'; + +const UpcomingDate = ({ timestamp, description }) => { + const date = moment.utc(timestamp); + const isAfter = moment.utc().isAfter(date); + const iconSource = `assets/dist/img/icons/calendar${ + isAfter ? '-complete' : '' + }.svg`; + + return ( +
+ calendar +
+ + {description} +
+
+ ); +}; + +export default UpcomingDate; diff --git a/app/screens/Home/UpcomingDates.js b/app/screens/Home/UpcomingDates.js new file mode 100644 index 0000000..fe6d227 --- /dev/null +++ b/app/screens/Home/UpcomingDates.js @@ -0,0 +1,25 @@ +import React from 'react'; +import moment from 'moment'; +import UpcomingDate from './UpcomingDate'; +import constants from 'helpers/constants'; + +const {Dates} = constants; + +const dates = [ + [Dates.CFP_OPEN, 'Call for Proposals opens.'], + [Dates.CFP_CLOSE, 'Call for Proposals closes.'], + [Dates.TICKET_RELEASE, 'Early Bird Tickets (round one) go on sale.'], + [moment.utc(Dates.TICKET_RELEASE).add(7, 'days'), 'Early Bird Tickets (round two) go on sale.'], + [moment.utc(Dates.TICKET_RELEASE).add(14, 'days'), 'Standard tickets go on sale.'], +]; + +const UpcomingDates = () => ( +
+

Upcoming Dates

+ {dates.map( + ([timestamp, description]) => + )} +
+); + +export default UpcomingDates; diff --git a/app/screens/Home/What.js b/app/screens/Home/What.js new file mode 100644 index 0000000..ff8056a --- /dev/null +++ b/app/screens/Home/What.js @@ -0,0 +1,15 @@ +import React from 'react'; +import { Link } from 'react-router-dom'; +import About from 'components/About'; + +const What = () => ( +
+

What is React Rally?

+ + + More about React Rally » + +
+); + +export default What; diff --git a/app/screens/Home/index.js b/app/screens/Home/index.js index d1c30fa..c8176cb 100644 --- a/app/screens/Home/index.js +++ b/app/screens/Home/index.js @@ -1,118 +1,16 @@ import React from 'react'; -import {Link} from 'react-router'; -import moment from 'moment'; -import cx from 'classnames'; -import constants from 'helpers/constants'; -import shuffle from 'helpers/shuffle'; -import About from 'components/About'; -import Button from 'components/Button'; -import Person from 'components/Person'; -import SpeakerData from '../../../api/speakers'; -import Tickets from '../../../api/tickets'; +import What from './What'; +import FeaturedSpeakers from './FeaturedSpeakers'; +import Tickets from './Tickets'; +import UpcomingDates from './UpcomingDates'; -const {Dates} = constants; +const Home = () => ( +
+ + + + +
+); -const UpcomingDate = ({timestamp, description}) => { - const date = moment.utc(timestamp); - const isAfter = moment.utc().isAfter(date); - const iconSource = `assets/dist/img/icons/calendar${ - isAfter ? '-complete' : '' - }.svg`; - - return ( -
- -
- - {description} -
-
- ); -}; - -const TicketCard = ({name, description, price, soldOut}) => { - return ( -
-
-

{name}

-

{description}

-
-
-

{isNaN(price) ? '' : '$' + price}

- -
-
- ); -}; - -export default () => { - return ( -
-
-

What is React Rally?

- - - More about React Rally » - -
- {Object.keys(SpeakerData).length > 0 ? ( -
-

Featured Speakers

-
- {shuffle(Object.keys(SpeakerData)) - .filter(key => SpeakerData[key].featured) - .map(key => { - return ; - })} -
- - See All the Speakers » - -
- ) : null} - -
-

Upcoming Dates

- - - - - -
- -
-

Tickets

- {Tickets.map((t, i) => { - return ; - })} -
-
- ); -}; +export default Home; From 81ea8614595ad5eb4061e40813c767fb2b08da42 Mon Sep 17 00:00:00 2001 From: donavon Date: Sat, 27 Apr 2019 06:13:26 -0400 Subject: [PATCH 3/5] component refactoring --- app/components/Avatar.js | 16 ++++++---------- app/components/Button.js | 20 ++++++++------------ app/components/Icon.js | 12 +++++------- app/components/Person.js | 27 ++++++++++----------------- 4 files changed, 29 insertions(+), 46 deletions(-) diff --git a/app/components/Avatar.js b/app/components/Avatar.js index 2a8649e..b1f7110 100644 --- a/app/components/Avatar.js +++ b/app/components/Avatar.js @@ -1,12 +1,8 @@ import React from 'react' -export default (props) => { - let size = props.size || 200 - return ( - - ) -} +export default ({ url, size = 200 }) => ( + +) diff --git a/app/components/Button.js b/app/components/Button.js index eaeede1..e67328d 100644 --- a/app/components/Button.js +++ b/app/components/Button.js @@ -1,14 +1,10 @@ import React from 'react' -export default (props) => { - return ( - - {props.children} - - ) -} +export default ({ className = '', ...otherProps }) => ( + +) diff --git a/app/components/Icon.js b/app/components/Icon.js index 18fac84..1662c13 100644 --- a/app/components/Icon.js +++ b/app/components/Icon.js @@ -1,9 +1,7 @@ import React from 'react' -export default (props) => { - return ( - - - - ) -} +export default ({ href, type }) => ( + + + +); diff --git a/app/components/Person.js b/app/components/Person.js index a03decf..1e56e0d 100644 --- a/app/components/Person.js +++ b/app/components/Person.js @@ -2,21 +2,14 @@ import React from 'react' import Avatar from 'components/Avatar' import Icon from 'components/Icon' -export default (props) => { - return ( -
- - {props.name}
- {props.title} -
- {props.twitter && ( - - )} - {props.github && ( - - )} -
+export default ({ avatar, name, title, twitter, github }) => ( +
+ + {name}
+ {title} +
+ {twitter && } + {github && }
- ) -} - +
+); From 54e127724a72b3fe723c065cc03ee43d30a6e47f Mon Sep 17 00:00:00 2001 From: donavon Date: Sat, 27 Apr 2019 06:14:01 -0400 Subject: [PATCH 4/5] babel transform rest-spread --- package.json | 1 + webpack.config.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 39f5a02..e3a9e50 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "devDependencies": { "babel-core": "^6.7.2", "babel-loader": "^6.2.4", + "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-preset-es2015": "^6.6.0", "babel-preset-react": "^6.5.0", "css-loader": "^0.23.1", diff --git a/webpack.config.js b/webpack.config.js index dc552d6..70a77f0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -26,7 +26,8 @@ module.exports = { exclude: /node_modules/, loader: 'babel', query: { - presets: ['es2015', 'react'] + presets: ['es2015', 'react'], + plugins: ['transform-object-rest-spread'] } }, { From ed75353089e7575258c22cf08f43af0de3935f98 Mon Sep 17 00:00:00 2001 From: donavon Date: Sat, 27 Apr 2019 06:15:13 -0400 Subject: [PATCH 5/5] update package-lock --- package-lock.json | 418 +++++++++++++++++++++++++++++++++------------- 1 file changed, 306 insertions(+), 112 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ad8bc2..9745d3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,21 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@babel/runtime": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz", + "integrity": "sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==", + "requires": { + "regenerator-runtime": "^0.13.2" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" + } + } + }, "abbrev": { "version": "1.1.1", "resolved": "https://npm.apple.com/abbrev/-/abbrev-1.1.1.tgz", @@ -532,6 +547,12 @@ "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=", "dev": true }, + "babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", + "dev": true + }, "babel-plugin-transform-es2015-arrow-functions": { "version": "6.22.0", "resolved": "https://npm.apple.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", @@ -776,6 +797,16 @@ "babel-runtime": "^6.22.0" } }, + "babel-plugin-transform-object-rest-spread": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", + "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", + "dev": true, + "requires": { + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.26.0" + } + }, "babel-plugin-transform-react-display-name": { "version": "6.25.0", "resolved": "https://npm.apple.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz", @@ -1893,14 +1924,13 @@ "capture-stack-trace": "^1.0.0" } }, - "create-react-class": { - "version": "15.6.3", - "resolved": "https://npm.apple.com/create-react-class/-/create-react-class-15.6.3.tgz", - "integrity": "sha1-LXMjf7P5cK5uvgEanmb0bbyoADY=", + "create-react-context": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz", + "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==", "requires": { - "fbjs": "^0.8.9", - "loose-envify": "^1.3.1", - "object-assign": "^4.1.1" + "fbjs": "^0.8.0", + "gud": "^1.0.0" } }, "cross-spawn": { @@ -3131,24 +3161,29 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -3158,13 +3193,17 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": false, + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3172,34 +3211,43 @@ }, "chownr": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "2.6.9", - "bundled": true, + "resolved": false, + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "optional": true, "requires": { @@ -3208,25 +3256,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": false, + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -3235,13 +3287,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": false, + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -3257,7 +3311,8 @@ }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, "requires": { @@ -3271,13 +3326,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": false, + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -3286,7 +3343,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -3295,7 +3353,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": false, + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -3305,46 +3364,58 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3352,7 +3423,8 @@ }, "minizlib": { "version": "1.2.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, "requires": { @@ -3361,21 +3433,25 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } }, "ms": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true, "optional": true }, "needle": { "version": "2.2.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==", "dev": true, "optional": true, "requires": { @@ -3386,7 +3462,8 @@ }, "node-pre-gyp": { "version": "0.10.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==", "dev": true, "optional": true, "requires": { @@ -3404,7 +3481,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -3414,13 +3492,15 @@ }, "npm-bundled": { "version": "1.0.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==", "dev": true, "optional": true, "requires": { @@ -3430,7 +3510,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -3442,38 +3523,46 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": false, + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -3483,19 +3572,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": false, + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -3507,7 +3599,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -3515,7 +3608,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": false, + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -3530,7 +3624,8 @@ }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, "requires": { @@ -3539,43 +3634,52 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": false, + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": false, + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.6.0", - "bundled": true, + "resolved": false, + "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": false, + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3584,7 +3688,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": false, + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -3593,21 +3698,25 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": false, + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "bundled": true, + "resolved": false, + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, "requires": { @@ -3622,13 +3731,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": false, + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": false, + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -3637,13 +3748,17 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true, - "dev": true + "resolved": false, + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "dev": true, + "optional": true } } }, @@ -3896,6 +4011,11 @@ "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", "dev": true }, + "gud": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", + "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" + }, "gulp-decompress": { "version": "1.2.0", "resolved": "https://npm.apple.com/gulp-decompress/-/gulp-decompress-1.2.0.tgz", @@ -4148,20 +4268,25 @@ } }, "history": { - "version": "3.3.0", - "resolved": "https://npm.apple.com/history/-/history-3.3.0.tgz", - "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/history/-/history-4.9.0.tgz", + "integrity": "sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==", "requires": { - "invariant": "^2.2.1", + "@babel/runtime": "^7.1.2", "loose-envify": "^1.2.0", - "query-string": "^4.2.2", - "warning": "^3.0.0" + "resolve-pathname": "^2.2.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0", + "value-equal": "^0.4.0" } }, "hoist-non-react-statics": { - "version": "2.5.5", - "resolved": "https://npm.apple.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", - "integrity": "sha1-xZA89AnA39kI84jmGdhrnBF0y0c=" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz", + "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", + "requires": { + "react-is": "^16.7.0" + } }, "home-or-tmp": { "version": "2.0.0", @@ -4483,6 +4608,7 @@ "version": "2.2.4", "resolved": "https://npm.apple.com/invariant/-/invariant-2.2.4.tgz", "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=", + "dev": true, "requires": { "loose-envify": "^1.0.0" } @@ -7124,6 +7250,7 @@ "version": "4.3.4", "resolved": "https://npm.apple.com/query-string/-/query-string-4.3.4.tgz", "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "dev": true, "requires": { "object-assign": "^4.1.0", "strict-uri-encode": "^1.0.0" @@ -7273,17 +7400,71 @@ "integrity": "sha1-W7weLSkUHJ+9/tRWND/ivEMKahY=" }, "react-router": { - "version": "3.2.1", - "resolved": "https://npm.apple.com/react-router/-/react-router-3.2.1.tgz", - "integrity": "sha1-uaMnmWK9++aEyL0Egrge8ojw8kQ=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz", + "integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==", "requires": { - "create-react-class": "^15.5.1", - "history": "^3.0.0", - "hoist-non-react-statics": "^2.3.1", - "invariant": "^2.2.1", - "loose-envify": "^1.2.0", - "prop-types": "^15.5.6", - "warning": "^3.0.0" + "@babel/runtime": "^7.1.2", + "create-react-context": "^0.2.2", + "history": "^4.9.0", + "hoist-non-react-statics": "^3.1.0", + "loose-envify": "^1.3.1", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.6.2", + "react-is": "^16.6.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "requires": { + "isarray": "0.0.1" + } + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + } + } + }, + "react-router-dom": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz", + "integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==", + "requires": { + "@babel/runtime": "^7.1.2", + "history": "^4.9.0", + "loose-envify": "^1.3.1", + "prop-types": "^15.6.2", + "react-router": "5.0.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" + }, + "dependencies": { + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + } } }, "read-all-stream": { @@ -7879,6 +8060,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resolve-pathname": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz", + "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==" + }, "resolve-url": { "version": "0.2.1", "resolved": "https://npm.apple.com/resolve-url/-/resolve-url-0.2.1.tgz", @@ -8726,7 +8912,8 @@ "strict-uri-encode": { "version": "1.1.0", "resolved": "https://npm.apple.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true }, "string-width": { "version": "1.0.2", @@ -9016,6 +9203,16 @@ "setimmediate": "^1.0.4" } }, + "tiny-invariant": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.4.tgz", + "integrity": "sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g==" + }, + "tiny-warning": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz", + "integrity": "sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==" + }, "tmp": { "version": "0.0.33", "resolved": "https://npm.apple.com/tmp/-/tmp-0.0.33.tgz", @@ -9520,6 +9717,11 @@ "spdx-expression-parse": "^3.0.0" } }, + "value-equal": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz", + "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==" + }, "vary": { "version": "1.1.2", "resolved": "https://npm.apple.com/vary/-/vary-1.1.2.tgz", @@ -9625,14 +9827,6 @@ "wrap-fn": "^0.1.0" } }, - "warning": { - "version": "3.0.0", - "resolved": "https://npm.apple.com/warning/-/warning-3.0.0.tgz", - "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", - "requires": { - "loose-envify": "^1.0.0" - } - }, "watchpack": { "version": "0.2.9", "resolved": "https://npm.apple.com/watchpack/-/watchpack-0.2.9.tgz",