diff --git a/frontend/src/components/article/index.js b/frontend/src/components/article/index.js index b9f663c1..fc683ea1 100644 --- a/frontend/src/components/article/index.js +++ b/frontend/src/components/article/index.js @@ -1,3 +1,4 @@ +// TODO - I think this should go into @components/layout import styled from 'styled-components'; // Main content Wrapper Styles diff --git a/frontend/src/components/empty/services.js b/frontend/src/components/empty/services.js index 416f6185..5688afb3 100644 --- a/frontend/src/components/empty/services.js +++ b/frontend/src/components/empty/services.js @@ -1,6 +1,7 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import styled from 'styled-components'; +import { LayoutContainer } from '@components/layout'; import Button from '@ui/components/button'; import Column from '@ui/components/column'; import Row from '@ui/components/row'; @@ -18,7 +19,7 @@ const StyledBox = styled.div` `; export default () => ( -
+

@@ -63,5 +64,5 @@ export default () => ( -

+ ); diff --git a/frontend/src/components/breadcrumb/index.js b/frontend/src/components/navigation/breadcrumb.js similarity index 94% rename from frontend/src/components/breadcrumb/index.js rename to frontend/src/components/navigation/breadcrumb.js index e31055e9..c1167fd3 100644 --- a/frontend/src/components/breadcrumb/index.js +++ b/frontend/src/components/navigation/breadcrumb.js @@ -57,8 +57,6 @@ const StyledH2 = styled(H2)` `; const Breadcrumb = ({ - children, - links = [], name = [] }) => ( @@ -75,8 +73,6 @@ const Breadcrumb = ({ ); Breadcrumb.propTypes = { - children: React.PropTypes.node, - links: React.PropTypes.arrayOf(PropTypes.link), name: React.PropTypes.arrayOf(PropTypes.link) }; diff --git a/frontend/src/components/navigation/index.js b/frontend/src/components/navigation/index.js index b5def3e5..4e5c76e1 100644 --- a/frontend/src/components/navigation/index.js +++ b/frontend/src/components/navigation/index.js @@ -1,4 +1,2 @@ -import styled from 'styled-components'; - -export default styled.nav` -`; +export { default as Breadcrumb } from './breadcrumb'; +export { default as Menu } from './menu'; diff --git a/frontend/src/components/section/index.js b/frontend/src/components/navigation/menu.js similarity index 58% rename from frontend/src/components/section/index.js rename to frontend/src/components/navigation/menu.js index 6d81d0ba..2fa408e1 100644 --- a/frontend/src/components/section/index.js +++ b/frontend/src/components/navigation/menu.js @@ -8,7 +8,6 @@ import { breakpoints } from '@ui/shared/constants'; import { remcalc } from '@ui/shared/functions'; import PropTypes from '@root/prop-types'; import Ul from '@ui/components/horizontal-list/ul'; -import Breadcrumb from '@components/breadcrumb'; import { LayoutContainer } from '@components/layout'; const StyledHorizontalList = styled(Ul)` @@ -25,42 +24,32 @@ const StyledHorizontalListItem = styled(Li)` } `; -const Section = (props) => { - const { - children, - links = [] - } = props; +const Menu = ({ + links +}) => { const navLinks = links.map((link) => { - const to = link.name === 'instances' ? - // eslint-disable-next-line max-len - 'https://projects.invisionapp.com/share/YDAKI8CW4#/screens/224677771_instances' : - link.pathname; return ( - + ); }); + // TODO this could be any kind of nav, not just 'project-'... return ( -
- - - - {navLinks} - - - {children} -
+ + + {navLinks} + + ); }; -Section.propTypes = { - children: React.PropTypes.node, +Menu.propTypes = { links: React.PropTypes.arrayOf(PropTypes.link) }; -export default Section; +export default Menu; diff --git a/frontend/src/components/navigation/org.js b/frontend/src/components/navigation/org.js index 12c65edb..3a7b578a 100644 --- a/frontend/src/components/navigation/org.js +++ b/frontend/src/components/navigation/org.js @@ -1,3 +1,6 @@ +// TODO this is a CONTAINER!!! +// TODO get rid of this file - moved to @containers/navigation + import React from 'react'; import { connect } from 'react-redux'; import styled from 'styled-components'; @@ -99,6 +102,7 @@ const OrgNavigation = ({ orgs = [], orgsUI }) => { + const navLinks = orgs.map(({ id, name, diff --git a/frontend/src/components/redirect/index.js b/frontend/src/components/redirect/index.js deleted file mode 100644 index c54f399d..00000000 --- a/frontend/src/components/redirect/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react'; -import { Redirect } from 'react-router-dom'; - -export default (to) => () => ( - -); diff --git a/frontend/src/components/services/view.js b/frontend/src/components/services/view.js deleted file mode 100644 index 2d31bba4..00000000 --- a/frontend/src/components/services/view.js +++ /dev/null @@ -1,93 +0,0 @@ -import React from 'react'; -import EmptyServices from '@components/empty/services'; -import PropTypes from '@root/prop-types'; -import Row from '@ui/components/row'; -import Column from '@ui/components/column'; -import { LayoutContainer } from '@components/layout'; -import { H2 } from '@ui/components/base-elements'; -import { FormGroup, Toggle, ToggleList, Legend } from '@ui/components/form'; -import TopologyFilter from '@components/services/topology-filter'; -import { unitcalc, remcalc } from '@ui/shared/functions'; -import styled from 'styled-components'; - -const StyledLegend = styled(Legend)` - float: left; - padding-top: ${unitcalc(2)}; - margin-right: ${unitcalc(1.5)}; -`; - -const PaddedRow = styled(Row)` - margin-bottom: ${remcalc(18)} -`; - -const ServicesView = ({ - children, - onToggle, - project, - services, - toggleValue -}) => { - - const onToggleChange = (evt) => { - evt.preventDefault(); - - const value = evt.target.value; - - if(value !== toggleValue) { - onToggle(value); - } - }; - - const filter = ( - - - - ); - - const toggle = services ? ( - - - View - - Topology - List - - - - ) : null; - - const controls = services ? ( - - { toggle } - { filter } - - ) : null; - - const content = services.length ? children : ( - - ); - - return ( -
- - - -

Services

- { controls } - - - - { content } -
- ); -}; - -ServicesView.propTypes = { - children: React.PropTypes.node, - onToggle: React.PropTypes.func.isRequired, - project: React.PropTypes.arrayOf(PropTypes.project), - services: React.PropTypes.arrayOf(PropTypes.service), - toggleValue: React.PropTypes.string.isRequired -}; - -export default ServicesView; diff --git a/frontend/src/containers/app.js b/frontend/src/containers/app.js index e751dbdd..ae0bb15d 100644 --- a/frontend/src/containers/app.js +++ b/frontend/src/containers/app.js @@ -1,71 +1,55 @@ -import { connect } from 'react-redux'; -import { Switch, Route } from 'react-router-dom'; import { injectGlobal } from 'styled-components'; import Article from '@components/article'; import Base, { global } from '@ui/components/base'; import BaselineGrid from '@ui/components/baseline-grid'; -import Footer from '@components/footer'; -import Header from '@containers/header'; -import Home from '@containers/home'; -import NotFound from '@containers/not-found'; -import Nav from '@components/navigation'; -import OrgNavigation from '@components/navigation/org'; import { isProduction } from '@utils'; import PerfProfiler from '@perf-profiler'; import React from 'react'; -const App = connect()(React.createClass({ - propTypes: { - children: React.PropTypes.node - }, - componentWillMount: function() { +class App extends React.Component { + + componentWillMount() { injectGlobal` ${global} `; - }, - render: function() { + } + + render() { + const { children } = this.props; - let _children = children; - - if (!Array.isArray(_children)) { - return _children; - } - - if ( !isProduction() && process.env.BASELINE_GRID) { - _children = ( + const content = + !isProduction() && process.env.BASELINE_GRID ? + ( - {_children} + {children} + ) : + ( + + + {children} + ); - } + + const profiler = !isProduction() ? + : null; return ( - - {_children} - +
+ {profiler} +
+ {content} +
+
); } -})); +} -export default (props) => ( -
- { !isProduction() && } +App.propTypes = { + children: React.PropTypes.node +}; - -
- -
- - - - -
-
- -
-); +export default App; diff --git a/frontend/src/containers/home/index.js b/frontend/src/containers/home/index.js deleted file mode 100644 index 35dd6cb5..00000000 --- a/frontend/src/containers/home/index.js +++ /dev/null @@ -1,38 +0,0 @@ -import React from 'react'; -import { connect } from 'react-redux'; -import { Route, Switch } from 'react-router-dom'; - -import Org from '@containers/org'; -import PropTypes from '@root/prop-types'; -import Redirect from '@components/redirect'; -import { orgsSelector } from '@state/selectors'; -import NotFound from '@containers/not-found'; - -const Home = ({ - orgs = [] -}) => { - const notFound = orgs.length ? Redirect(`/${orgs[0].id}`) : ( - - ); - - return ( -
- - - - -
- ); -}; - -Home.propTypes = { - orgs: React.PropTypes.arrayOf(PropTypes.org) -}; - -const mapStateToProps = (state) => ({ - orgs: orgsSelector(state) -}); - -export default connect( - mapStateToProps -)(Home); diff --git a/frontend/src/containers/navigation/breadcrumb.js b/frontend/src/containers/navigation/breadcrumb.js new file mode 100644 index 00000000..8f0f5ac4 --- /dev/null +++ b/frontend/src/containers/navigation/breadcrumb.js @@ -0,0 +1,72 @@ +import React from 'react'; +import { connect } from 'react-redux'; +import { + orgByIdSelector, + projectByIdSelector, + serviceByIdSelector +} from '@root/state/selectors'; +import { Breadcrumb as BreadcrumbComponent } from '@components/navigation'; + +const Breadcrumb = ({ + location, + match, + org, + project, + service +}) => { + + const path = location.pathname.split('/'); + + const links = [{ + name: org.name, + pathname: path.slice(0, 2).join('/') + }]; + + if(project) { + links.push({ + name: project.name, + pathname: path.slice(0, 4).join('/') + }); + } + + if(service) { + links.push({ + name: service.name, + pathname: path.slice(0, 6).join('/') + }); + } + + // TODO add people etc + + return ( + + ); +}; + +Breadcrumb.propTypes = { + location: React.PropTypes.object.isRequired, + match: React.PropTypes.object.isRequired, + org: React.PropTypes.object.isRequired, + project: React.PropTypes.object, + service: React.PropTypes.object +}; + +const mapStateToProps = (state, { + location, + match = { + params: {} + } +}) => ({ + location, + match, + org: orgByIdSelector(match.params.org)(state), + project: projectByIdSelector(match.params.project)(state), + service: serviceByIdSelector(match.params.service)(state) +}); + +const mapDispatchToProps = (dispatch) => ({}); + +export default connect( + mapStateToProps, + mapDispatchToProps +)(Breadcrumb); diff --git a/frontend/src/containers/navigation/index.js b/frontend/src/containers/navigation/index.js new file mode 100644 index 00000000..f5a93997 --- /dev/null +++ b/frontend/src/containers/navigation/index.js @@ -0,0 +1,3 @@ +export { default as Breadcrumb } from './breadcrumb'; +export { default as Menu } from './menu'; +export { default as Org } from './org'; diff --git a/frontend/src/containers/navigation/menu.js b/frontend/src/containers/navigation/menu.js new file mode 100644 index 00000000..de995ffb --- /dev/null +++ b/frontend/src/containers/navigation/menu.js @@ -0,0 +1,51 @@ +import React from 'react'; +import { connect } from 'react-redux'; +import { + orgSectionsByIdSelector, + projectSectionsSelector, + serviceSectionsSelector +} from '@root/state/selectors'; +import { Menu as MenuComponent } from '@components/navigation'; + +const Menu = (props) => { + + const { + match, + sections + } = props; + + const links = sections.map((section) => ({ + name: section, + pathname: `${match.url}/${section}` + })); + + return ( + + ); +}; + +Menu.propTypes = { + match: React.PropTypes.object.isRequired, + sections: React.PropTypes.array.isRequired +}; + +const mapStateToProps = (state, { + match = { + params: {} + } +}) => ({ + location, + match, + sections: match.params.service ? + serviceSectionsSelector(state) : + match.params.project ? + projectSectionsSelector(state) : + orgSectionsByIdSelector(match.params.org)(state) +}); + +const mapDispatchToProps = (dispatch) => ({}); + +export default connect( + mapStateToProps, + mapDispatchToProps +)(Menu); diff --git a/frontend/src/containers/navigation/org.js b/frontend/src/containers/navigation/org.js new file mode 100644 index 00000000..a5ed2b5e --- /dev/null +++ b/frontend/src/containers/navigation/org.js @@ -0,0 +1,175 @@ +// TODO this is a CONTAINER!!! + +import React from 'react'; +import { connect } from 'react-redux'; +import styled from 'styled-components'; + +import Avatar from '@ui/components/avatar'; +import Container from '@ui/components/container'; +import NavLink from '@ui/components/nav-link'; +import { colors } from '@ui/shared/constants'; +import PropTypes from '@root/prop-types'; +import { orgsSelector, orgsUISelector } from '@state/selectors'; +import { remcalc } from '@ui/shared/functions'; +import { breakpoints } from '@ui/shared/constants'; +import Tabs, { Tab } from '@ui/components/tabs'; + + +const StyledNav = styled.div` + background-color: #f2f2f2; + + & ul { + height: ${remcalc(60)}; + margin: 0; + } +`; + +const NavigationLinkContainer = styled.div` + position: relative; + color: ${colors.base.grey}; + height: ${remcalc(24)}; + padding: ${remcalc(14)}; + + border: ${remcalc(1)} solid ${colors.base.grey}; + border-bottom-width: 0; + + &.active { + background-color: ${colors.base.background}; + } +`; + +const OrgImage = styled.div` + float: left; +`; + +const OrgAvatar = styled(Avatar)` + display: block; +`; + +const OrgName = styled.span` + margin-left: ${props => props.hasAvatar ? remcalc(12) : 0}; + margin-top: ${remcalc(3)}; + color: ${colors.base.text} +`; + +const NavLi = styled(NavLink)` + display: inline-block; + text-decoration: none; + font-size: 16px; +`; + +const StyledTabs = styled(Tabs)` + padding-top: ${remcalc(12)}; + + ${breakpoints.smallOnly` + display: inline-block; + white-space: nowrap; + `} +`; + +const StyledContainer = styled(Container)` + + ${breakpoints.smallOnly` + overflow: scroll; + display: flex; + + `} +`; + +const ManageTab = styled(Tab)` + + ${breakpoints.medium` + float: right; + `} +`; + +const DumbTab = ({ + children +}) => ( + {({ + isActive + }) => + + + {children} + + + } +); + +const OrgNavigation = ({ + orgs = [], + orgsUI +}) => { + console.log('orgs = ', orgs); + const navLinks = orgs.map(({ + id, + name, + image + }) => { + const to = `/${id}`; + const content = () => ( + {({ + isActive + }) => + + + + + + {name} + + + } + ); + + return ( + + ); + }); + + const manageTabs = () => orgsUI.hide_add_and_manage ? null : + ( + Manage Tabs ({orgs.length}) + ); + + const addOrgTab = () => orgsUI.hide_add_and_manage ? null : + ( + +   Add organisation + ); + + return ( + + + + {navLinks} + + + + + + ); +}; + +OrgNavigation.propTypes = { + orgs: React.PropTypes.arrayOf(PropTypes.org), + orgsUI: React.PropTypes.object +}; + +DumbTab.propTypes = { + children: React.PropTypes.node +}; + +const mapStateToProps = (state) => ({ + orgs: orgsSelector(state), + orgsUI: orgsUISelector(state) +}); + +export default connect( + mapStateToProps +)(OrgNavigation); diff --git a/frontend/src/containers/new-project/index.js b/frontend/src/containers/new-project/index.js deleted file mode 100644 index 2d866b72..00000000 --- a/frontend/src/containers/new-project/index.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from 'react'; -import { Switch, Route } from 'react-router-dom'; - -import NewProject from '@containers/new-project/new-project'; -import Billing from '@containers/new-project/billing'; -import NewBilling from '@containers/new-project/new-billing'; - -export default () => ( - - - - - -); diff --git a/frontend/src/containers/not-found/index.js b/frontend/src/containers/not-found/index.js index 32a556ff..9e30324c 100644 --- a/frontend/src/containers/not-found/index.js +++ b/frontend/src/containers/not-found/index.js @@ -1,3 +1,5 @@ +// TODO this is a component!!! + import React from 'react'; export default () => ( diff --git a/frontend/src/containers/org/index.js b/frontend/src/containers/org/index.js index 5addec78..130d05f2 100644 --- a/frontend/src/containers/org/index.js +++ b/frontend/src/containers/org/index.js @@ -1,75 +1,2 @@ -import isEmpty from 'lodash.isempty'; -import { connect } from 'react-redux'; -import { Switch, Route } from 'react-router-dom'; -import React from 'react'; - -import NotFound from '@containers/not-found'; -import PropTypes from '@root/prop-types'; -import Redirect from '@components/redirect'; -import { orgByIdSelector, orgSectionsSelector } from '@state/selectors'; -import NewProject from '@containers/new-project'; -import PeopleSection from './people'; -import SettingsSection from './settings'; -import ProjectSection from './projects'; - -const SectionComponents = { - people: PeopleSection, - settings: SettingsSection, - projects: ProjectSection -}; - -const Org = ({ - org = {}, - sections = [] -}) => { - if (isEmpty(org)) { - return ( - - ); - } - - const missMatch = !sections.length ? null : ( - - ); - - const navMatches = sections.map((name) => ( - - )); - - navMatches.push( - - ); - - return ( - - {missMatch} - {navMatches} - - ); -}; - -Org.propTypes = { - org: PropTypes.org, - sections: PropTypes.sections -}; - -const mapStateToProps = (state, ownProps) => ({ - org: orgByIdSelector(ownProps.match.params.org)(state), - sections: orgSectionsSelector(ownProps.match.params.org)(state) -}); - -export default connect( - mapStateToProps -)(Org); +export { default as OrgPeople } from './people'; +export { default as OrgSettings } from './settings'; diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js index 943c9c42..4d2c1c1f 100644 --- a/frontend/src/containers/org/people.js +++ b/frontend/src/containers/org/people.js @@ -2,7 +2,6 @@ import React from 'react'; import { connect } from 'react-redux'; import { LayoutContainer } from '@components/layout'; import PeopleSection from '@components/people-list'; -import Section from './section'; import { peopleByOrgIdSelector, @@ -21,11 +20,9 @@ import { } from '@state/actions'; const People = (props) => ( -
- - - -
+ + + ); const mapStateToProps = (state, { diff --git a/frontend/src/containers/org/projects.js b/frontend/src/containers/org/projects.js deleted file mode 100644 index 5f39df50..00000000 --- a/frontend/src/containers/org/projects.js +++ /dev/null @@ -1,30 +0,0 @@ -import React from 'react'; -import { Switch, Route } from 'react-router-dom'; -import Section from './section'; -import { LayoutContainer } from '@components/layout'; -import Projects from '@containers/projects'; -import Project from '@containers/project'; - -export default () => { - const list = (props) => ( -
- - - -
- ); - - return ( - - - - - ); -}; diff --git a/frontend/src/containers/org/section.js b/frontend/src/containers/org/section.js deleted file mode 100644 index 8e8a05bb..00000000 --- a/frontend/src/containers/org/section.js +++ /dev/null @@ -1,43 +0,0 @@ -import React from 'react'; -import { connect } from 'react-redux'; - -import PropTypes from '@root/prop-types'; -import { orgByIdSelector, orgSectionsSelector } from '@state/selectors'; -import Section from '@components/section'; - -const OrgSection = ({ - children, - org = {}, - sections = [] -}) => { - const navLinks = sections.map((name) => ({ - pathname: `/${org.id}/${name}`, - name - })); - - const nameLinks = [{ - pathname: `/${org.id}`, - name: org.name - }]; - - return ( -
- {children} -
- ); -}; - -OrgSection.propTypes = { - children: React.PropTypes.node, - org: PropTypes.org, - sections: PropTypes.sections -}; - -const mapStateToProps = (state, ownProps) => ({ - org: orgByIdSelector(ownProps.match.params.org)(state), - sections: orgSectionsSelector(ownProps.match.params.org)(state) -}); - -export default connect( - mapStateToProps -)(OrgSection); diff --git a/frontend/src/containers/org/settings.js b/frontend/src/containers/org/settings.js index a69539e7..1822a4d8 100644 --- a/frontend/src/containers/org/settings.js +++ b/frontend/src/containers/org/settings.js @@ -1,14 +1,11 @@ import React from 'react'; import { connect } from 'react-redux'; -import Section from './section'; import { LayoutContainer } from '@components/layout'; const Settings = (props) => ( -
- -

settings

- -
+ +

Settings

+ ); Settings.propTypes = {}; diff --git a/frontend/src/containers/project/feed.js b/frontend/src/containers/project/feed.js index 81588e5f..0252e00e 100644 --- a/frontend/src/containers/project/feed.js +++ b/frontend/src/containers/project/feed.js @@ -1,11 +1,8 @@ import React from 'react'; -import Section from './section'; import { LayoutContainer } from '@components/layout'; export default (props) => ( -
- -

Project Feed

- -
+ +

Project Feed

+ ); diff --git a/frontend/src/containers/project/index.js b/frontend/src/containers/project/index.js index 7daadea0..757d59b3 100644 --- a/frontend/src/containers/project/index.js +++ b/frontend/src/containers/project/index.js @@ -1,73 +1,6 @@ -import React from 'react'; -import { connect } from 'react-redux'; -import { Switch, Route } from 'react-router-dom'; -import PropTypes from '@root/prop-types'; -import Redirect from '@components/redirect'; -import InstancesSection from './instances'; -import ServicesSection from './services'; -import PeopleSection from './people'; -import SettingsSection from './settings'; -import ManifestSection from './manifest'; -import FeedSection from './feed'; -import RollbackSection from './rollback'; - -import { - orgByIdSelector, - projectSectionsSelector, - projectByIdSelector -} from '@state/selectors'; - -const SectionComponents = { - 'project-feed': FeedSection, - services: ServicesSection, - instances: InstancesSection, - people: PeopleSection, - settings: SettingsSection, - rollback: RollbackSection, - manifest: ManifestSection -}; - -const Project = ({ - org = {}, - project = {}, - sections = [] -}) => { - const navMatches = sections.map((name) => ( - - )); - - const missMatch = !sections.length ? null : ( - - ); - - return ( - - {navMatches} - {missMatch} - - ); -}; - -Project.propTypes = { - org: PropTypes.org, - project: PropTypes.project, - sections: PropTypes.sections -}; - -const mapStateToProps = (state, { - match = { - params: {} - } -}) => ({ - org: orgByIdSelector(match.params.org)(state), - project: projectByIdSelector(match.params.projectId)(state), - sections: projectSectionsSelector(state) -}); - -export default connect( - mapStateToProps -)(Project); +export { default as ProjectFeed } from './feed'; +export { default as ProjectInstances } from './instances'; +export { default as ProjectManifest } from './manifest'; +export { default as ProjectPeople } from './people'; +export { default as ProjectRollback } from './rollback'; +export { default as ProjectSettings } from './settings'; diff --git a/frontend/src/containers/project/instances.js b/frontend/src/containers/project/instances.js index 29bc933f..fd485653 100644 --- a/frontend/src/containers/project/instances.js +++ b/frontend/src/containers/project/instances.js @@ -4,7 +4,6 @@ import { toggleInstanceCollapsed } from '@state/actions'; import { LayoutContainer } from '@components/layout'; import EmptyInstances from '@components/empty/instances'; import PropTypes from '@root/prop-types'; -import Section from './section'; import InstanceList from '@components/instance-list'; import { instancesByProjectIdSelector } from '@state/selectors'; @@ -19,15 +18,13 @@ const Instances = (props) => { ); return ( -
- - {empty} - - -
+ + {empty} + + ); }; @@ -41,7 +38,7 @@ const mapStateToProps = (state, { params: {} } }) => ({ - instances: instancesByProjectIdSelector(match.params.projectId)(state) + instances: instancesByProjectIdSelector(match.params.project)(state) }); const mapDispatchToProps = (dispatch) => ({ diff --git a/frontend/src/containers/project/manifest.js b/frontend/src/containers/project/manifest.js index 88eeaed5..6c4938d6 100644 --- a/frontend/src/containers/project/manifest.js +++ b/frontend/src/containers/project/manifest.js @@ -1,11 +1,8 @@ import React from 'react'; -import Section from './section'; import { LayoutContainer } from '@components/layout'; export default (props) => ( -
- -

manifest

- -
+ +

manifest

+ ); diff --git a/frontend/src/containers/project/people.js b/frontend/src/containers/project/people.js index 2addc87a..7ca69582 100644 --- a/frontend/src/containers/project/people.js +++ b/frontend/src/containers/project/people.js @@ -2,7 +2,6 @@ import React from 'react'; import { connect } from 'react-redux'; import { LayoutContainer } from '@components/layout'; import PeopleSection from '@components/people-list'; -import Section from './section'; import { peopleByProjectIdSelector, @@ -21,11 +20,9 @@ import { } from '@state/actions'; const People = (props) => ( -
- - - -
+ + + ); const mapStateToProps = (state, { @@ -33,9 +30,9 @@ const mapStateToProps = (state, { params: {} } }) => ({ - people: peopleByProjectIdSelector(match.params.projectId)(state), + people: peopleByProjectIdSelector(match.params.project)(state), UI: projectUISelector(state), - parentIndex: projectIndexByIdSelect(match.params.projectId)(state), + parentIndex: projectIndexByIdSelect(match.params.project)(state), platformMembers: membersSelector(state) }); diff --git a/frontend/src/containers/project/rollback.js b/frontend/src/containers/project/rollback.js index cfa66bb3..af14cf6f 100644 --- a/frontend/src/containers/project/rollback.js +++ b/frontend/src/containers/project/rollback.js @@ -1,11 +1,8 @@ import React from 'react'; -import Section from './section'; import { LayoutContainer } from '@components/layout'; export default (props) => ( -
- -

Rollback

- -
+ +

Rollback

+ ); diff --git a/frontend/src/containers/project/section.js b/frontend/src/containers/project/section.js deleted file mode 100644 index 078f3841..00000000 --- a/frontend/src/containers/project/section.js +++ /dev/null @@ -1,65 +0,0 @@ -import React from 'react'; -import { connect } from 'react-redux'; -import PropTypes from '@root/prop-types'; -import Section from '@components/section'; - -import { - orgByIdSelector, - projectByIdSelector, - projectSectionsSelector -} from '@state/selectors'; - -const ProjectSection = ({ - children, - org = {}, - project = {}, - sections = [] -}) => { - const pathname = (props) => ( - `/${props.org}/projects/${props.project}/${props.section}` - ); - - const navLinks = sections.map((name) => ({ - pathname: pathname({ - org: org.id, - project: project.id, - section: name - }), - name - })); - - const nameLinks = [{ - pathname: `/${org.id}`, - name: org.name - }, { - pathname: `/${org.id}/projects/${project.id}`, - name: project.name - }]; - - return ( -
- {children} -
- ); -}; - -ProjectSection.propTypes = { - children: React.PropTypes.node, - org: PropTypes.org, - project: PropTypes.project, - sections: PropTypes.sections -}; - -const mapStateToProps = (state, { - match = { - params: {} - } -}) => ({ - org: orgByIdSelector(match.params.org)(state), - project: projectByIdSelector(match.params.projectId)(state), - sections: projectSectionsSelector(state) -}); - -export default connect( - mapStateToProps -)(ProjectSection); diff --git a/frontend/src/containers/project/services.js b/frontend/src/containers/project/services.js deleted file mode 100644 index ae6e5048..00000000 --- a/frontend/src/containers/project/services.js +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; -import { Switch, Route } from 'react-router-dom'; -import Section from './section'; -import ServicesTopology from '@containers/services/topology'; -import ServicesList from '@containers/services/list'; -import Services from '@containers/services'; -import Service from '@containers/service'; - -export default () => { - const topology = (props) => ( -
- - - -
- ); - - const list = (props) => ( -
- - - -
- ); - - return ( - - - - - - ); -}; diff --git a/frontend/src/containers/project/settings.js b/frontend/src/containers/project/settings.js index c7f879e0..e52e5c9e 100644 --- a/frontend/src/containers/project/settings.js +++ b/frontend/src/containers/project/settings.js @@ -1,11 +1,8 @@ import React from 'react'; -import Section from './section'; import { LayoutContainer } from '@components/layout'; export default (props) => ( -
- -

settings

- -
+ +

settings

+ ); diff --git a/frontend/src/containers/new-project/billing.js b/frontend/src/containers/projects/billing.js similarity index 72% rename from frontend/src/containers/new-project/billing.js rename to frontend/src/containers/projects/billing.js index 82e794f7..e6dcf3ec 100644 --- a/frontend/src/containers/new-project/billing.js +++ b/frontend/src/containers/projects/billing.js @@ -3,6 +3,7 @@ import { connect } from 'react-redux'; import { reduxForm } from 'redux-form'; import { orgByIdSelector } from '@state/selectors'; import { handleNewProject } from '@state/actions'; +import { LayoutContainer } from '@components/layout'; import PropTypes from '@root/prop-types'; import NewProjectBilling from '@components/new-project/billing'; @@ -16,8 +17,9 @@ const NewProjectBillingForm = reduxForm({ const Billing = ({ cards, handleNewProject, - router, - org + org, + match, + push }) => { const onSubmit = (values) => { // TODO will need to save exisiting card to project @@ -26,19 +28,21 @@ const Billing = ({ org }); - router.push(`/${org.id}/projects`); + push(`/${org.id}/projects`); }; const onNewBilling = (evt) => - router.push(`/${org.id}/new-project/new-billing`); + push(`${match.url}/create`); return ( - + + + ); }; @@ -46,16 +50,20 @@ Billing.propTypes = { cards: React.PropTypes.array, // TODO set up example card in thingie data handleNewProject: React.PropTypes.func.isRequired, org: PropTypes.org.isRequired, - router: React.PropTypes.object + match: React.PropTypes.object, + push: React.PropTypes.func }; const mapStateToProps = (state, { match = { params: {} - } + }, + push }) => ({ // TODO add cards - as above - org: orgByIdSelector(match.params.org)(state) + org: orgByIdSelector(match.params.org)(state), + match, + push }); const mapDispatchToProps = (dispatch) => ({ diff --git a/frontend/src/containers/projects/index.js b/frontend/src/containers/projects/index.js index 0f34615c..9e808246 100644 --- a/frontend/src/containers/projects/index.js +++ b/frontend/src/containers/projects/index.js @@ -1,66 +1,4 @@ -import React from 'react'; -import { FormattedMessage } from 'react-intl'; -import { connect } from 'react-redux'; -import Button from '@ui/components/button'; -import Column from '@ui/components/column'; -import NavLink from '@ui/components/nav-link'; -import { orgByIdSelector, projectsByOrgIdSelector } from '@state/selectors'; -import EmptyProjects from '@components/empty/projects'; -import PropTypes from '@root/prop-types'; -import Row from '@ui/components/row'; - -const Projects = ({ - org = {}, - projects = [] -}) => { - const empty = projects.length ? null : ( - - ); - - const _projects = projects.map((project) => ( -
  • - - {project.name} - -
    • - )); - - return ( -
    - {empty} - - - - - - -
      - {_projects} -
    -     -
    - ); -}; - -Projects.propTypes = { - org: PropTypes.org, - projects: React.PropTypes.arrayOf(PropTypes.project) -}; - -const mapStateToProps = (state, { - match = { - params: {} - } -}) => ({ - org: orgByIdSelector(match.params.org)(state), - projects: projectsByOrgIdSelector(match.params.org)(state) -}); - -export default connect( - mapStateToProps -)(Projects); +export { default as ProjectsList } from './list'; +export { default as ProjectsNewProject } from './new-project'; +export { default as ProjectsNewProjectBilling } from './billing'; +export { default as ProjectsNewProjectNewBilling } from './new-billing'; diff --git a/frontend/src/containers/projects/list.js b/frontend/src/containers/projects/list.js new file mode 100644 index 00000000..ed9023da --- /dev/null +++ b/frontend/src/containers/projects/list.js @@ -0,0 +1,67 @@ +import React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { connect } from 'react-redux'; +import { LayoutContainer } from '@components/layout'; +import Button from '@ui/components/button'; +import Column from '@ui/components/column'; +import NavLink from '@ui/components/nav-link'; +import { orgByIdSelector, projectsByOrgIdSelector } from '@state/selectors'; +import EmptyProjects from '@components/empty/projects'; +import PropTypes from '@root/prop-types'; +import Row from '@ui/components/row'; + +const Projects = ({ + org = {}, + projects = [] +}) => { + const empty = projects.length ? null : ( + + ); + + const _projects = projects.map((project) => ( +
  • + + {project.name} + +
    • + )); + + return ( + + {empty} + + + + + + +
      + {_projects} +
    +     +     + ); +}; + +Projects.propTypes = { + org: PropTypes.org, + projects: React.PropTypes.arrayOf(PropTypes.project) +}; + +const mapStateToProps = (state, { + match = { + params: {} + } +}) => ({ + org: orgByIdSelector(match.params.org)(state), + projects: projectsByOrgIdSelector(match.params.org)(state) +}); + +export default connect( + mapStateToProps +)(Projects); diff --git a/frontend/src/containers/new-project/new-billing.js b/frontend/src/containers/projects/new-billing.js similarity index 70% rename from frontend/src/containers/new-project/new-billing.js rename to frontend/src/containers/projects/new-billing.js index 7faabbb4..8d0f32e3 100644 --- a/frontend/src/containers/new-project/new-billing.js +++ b/frontend/src/containers/projects/new-billing.js @@ -3,6 +3,7 @@ import { connect } from 'react-redux'; import { reduxForm } from 'redux-form'; import { orgByIdSelector } from '@state/selectors'; import { handleNewProject } from '@state/actions'; +import { LayoutContainer } from '@components/layout'; import PropTypes from '@root/prop-types'; import CreateBilling from '@components/new-project/new-billing'; @@ -13,11 +14,12 @@ const NewBillingForm = reduxForm({ const NewBilling = ({ handleNewProject, - router, - org + org, + match, + push }) => { const onBack = (evt) => - router.push(`/${org.id}/new-project/billing`); + push(`/${org.id}/projects/~create/billing`); const onSubmit = (values) => { handleNewProject({ @@ -25,30 +27,36 @@ const NewBilling = ({ org }); - router.push(`/${org.id}/projects`); + push(`/${org.id}/projects`); }; return ( - + + + ); }; NewBilling.propTypes = { handleNewProject: React.PropTypes.func.isRequired, org: PropTypes.org.isRequired, - router: React.PropTypes.object + match: React.PropTypes.object, + push: React.PropTypes.func }; const mapStateToProps = (state, { match = { params: {} - } + }, + push }) => ({ // TODO add cards - as above - org: orgByIdSelector(match.params.org)(state) + org: orgByIdSelector(match.params.org)(state), + match, + push }); const mapDispatchToProps = (dispatch) => ({ diff --git a/frontend/src/containers/new-project/new-project.js b/frontend/src/containers/projects/new-project.js similarity index 66% rename from frontend/src/containers/new-project/new-project.js rename to frontend/src/containers/projects/new-project.js index 17e51ca4..bf2c11c9 100644 --- a/frontend/src/containers/new-project/new-project.js +++ b/frontend/src/containers/projects/new-project.js @@ -4,6 +4,7 @@ import { reduxForm } from 'redux-form'; import { orgByIdSelector } from '@state/selectors'; import PropTypes from '@root/prop-types'; import CreateProject from '@components/new-project'; +import { LayoutContainer } from '@components/layout'; const NewProjectForm = reduxForm({ form: 'create-project', @@ -13,35 +14,42 @@ const NewProjectForm = reduxForm({ const NewProject = ({ org, - router + match, + push }) => { const onCancel = (values) => - router.push(`/${org.id}/projects`); + push(`/${match.params.org}/projects`); const onSubmit = (values) => - router.push(`/${org.id}/new-project/billing`); + push(`${match.url}/billing`); return ( - + + + ); }; NewProject.propTypes = { org: PropTypes.org.isRequired, - router: React.PropTypes.object + match: React.PropTypes.object, + push: React.PropTypes.func }; // TODO we'll need to know whether there any cards // otherwise go to new billing straight away const mapStateToProps = (state, { match = { params: {} - } + }, + push }) => ({ - org: orgByIdSelector(match.params.org)(state) + org: orgByIdSelector(match.params.org)(state), + match, + push }); const mapDispatchToProps = (dispatch) => ({}); diff --git a/frontend/src/containers/service/index.js b/frontend/src/containers/service/index.js index cd153c73..2b2e58ab 100644 --- a/frontend/src/containers/service/index.js +++ b/frontend/src/containers/service/index.js @@ -1,120 +1,8 @@ -import React from 'react'; -import { connect } from 'react-redux'; -import { Switch, Route } from 'react-router-dom'; -import PropTypes from '@root/prop-types'; -import Redirect from '@components/redirect'; -import Section from '@components/section'; -import SummarySection from './summary'; -import InstancesSection from './instances'; -import MetricsSection from './metrics'; -import NetworksSection from './networks'; -import TagsMetadataSection from './tags-metadata'; -import ActivityFeedSection from './activity-feed'; -import ServiceManifestSection from './service-manifest'; -import FirewallSection from './firewall'; - -const SectionComponents = { - summary: SummarySection, - instances: InstancesSection, - metrics: MetricsSection, - networks: NetworksSection, - 'tags-metadata': TagsMetadataSection, - 'activity-feed': ActivityFeedSection, - 'service-manifest': ServiceManifestSection, - firewall: FirewallSection -}; - -import { - orgByIdSelector, - serviceSectionsSelector, - projectByIdSelector, - serviceByIdSelector -} from '@state/selectors'; - -const Service = ({ - org = {}, - project = {}, - sections = [], - service = {} -}) => { - const pathname = ({ - org, - project, - service, - section - }) => ( - `/${org}/projects/${project}/services/${service}/${section}` - ); - - const redirectHref = pathname({ - org: org.id, - project: project.id, - service: service.id, - section: 'summary' - }); - - const navLinks = sections.map((name) => ({ - pathname: pathname({ - org: org.id, - project: project.id, - service: service.id, - section: name - }), - name - })); - - const nameLinks = [{ - pathname: `/${org.id}`, - name: org.name - }, { - pathname: `/${org.id}/projects/${project.id}`, - name: project.name - }, { - pathname: redirectHref, - name: service.name - }]; - - const navMatches = sections.map((name) => ( - - )); - - - const missMatch = !sections.length ? null : ( - - ); - - return ( -
    - - {navMatches} - {missMatch} - -
    - ); -}; - -Service.propTypes = { - org: PropTypes.org, - project: PropTypes.project, - sections: PropTypes.sections, - service: PropTypes.service -}; - -const mapStateToProps = (state, { - match = { - params: {} - } -}) => ({ - org: orgByIdSelector(match.params.org)(state), - project: projectByIdSelector(match.params.projectId)(state), - sections: serviceSectionsSelector(state), - service: serviceByIdSelector(match.params.serviceId)(state) -}); - -export default connect( - mapStateToProps -)(Service); +export { default as ServiceActivityFeed } from './activity-feed'; +export { default as ServiceFirewall } from './firewall'; +export { default as ServiceInstances } from './instances'; +export { default as ServiceMetrics } from './metrics'; +export { default as ServiceNetworks } from './networks'; +export { default as ServiceManifest } from './service-manifest'; +export { default as ServiceSummary } from './summary'; +export { default as ServiceMetadata } from './tags-metadata'; diff --git a/frontend/src/containers/service/instances.js b/frontend/src/containers/service/instances.js index 7927e58d..9698f978 100644 --- a/frontend/src/containers/service/instances.js +++ b/frontend/src/containers/service/instances.js @@ -36,7 +36,7 @@ const mapStateToProps = (state, { params: {} } }) => ({ - instances: instancesByServiceIdSelector(match.params.serviceId)(state) + instances: instancesByServiceIdSelector(match.params.service)(state) }); const mapDispatchToProps = (dispatch) => ({ diff --git a/frontend/src/containers/service/metrics.js b/frontend/src/containers/service/metrics.js index 1a6b2446..b63d421b 100644 --- a/frontend/src/containers/service/metrics.js +++ b/frontend/src/containers/service/metrics.js @@ -13,9 +13,9 @@ const mapStateToProps = (state, { params: {} } }) => ({ - datasets: metricsByServiceIdSelector(match.params.serviceId)(state), + datasets: metricsByServiceIdSelector(match.params.service)(state), metricTypes: metricTypesSelector(state), - service: serviceByIdSelector(match.params.serviceId)(state) + service: serviceByIdSelector(match.params.service)(state) }); const mapDispatchToProps = (dispatch) => ({ diff --git a/frontend/src/containers/services/index.js b/frontend/src/containers/services/index.js index 7b52dfa5..3895adb9 100644 --- a/frontend/src/containers/services/index.js +++ b/frontend/src/containers/services/index.js @@ -1,93 +1,3 @@ -import React from 'react'; -import Styled from 'styled-components'; -import { connect } from 'react-redux'; -import PropTypes from '@root/prop-types'; -import ServicesView from '@components/services/view'; -import Button from '@ui/components/button'; - -import { - orgByIdSelector, - projectByIdSelector, - servicesForTopologySelector -} from '@state/selectors'; - -const Services = (props) => { - const { - org = {}, - project = {}, - services = [], - children, - path, - push - } = props; - - // TODO: Move into "components" and fix absolute - // positioning on responsive screens - const instances = (instances = 0) => { - - const StyledButton = Styled(Button)` - position: absolute; - top: 340px; - right: 193px; - `; - - if ( instances.length <= 0 || instances <= 0 ) return; - - return ( - - You have 5 instances - - ); - }; - - const toggleValue = path === '/:org/projects/:projectId/services' - ? 'topology' - : 'list'; - - const onToggle = (value) => { - const path = `/${org.id}/projects/${project.id}/services${ - value === 'list' ? '/list' : '' - }`; - - push(path); - }; - - return ( - - {instances()} - {children} - - ); -}; - -Services.propTypes = { - children: React.PropTypes.node, - org: PropTypes.org, - path: React.PropTypes.string.isRequired, - project: PropTypes.project, - push: React.PropTypes.func.isRequired, - services: React.PropTypes.arrayOf(PropTypes.service) -}; - -const mapStateToProps = (state, { - match = { - params: {}, - path: '' - }, - push -}) => ({ - org: orgByIdSelector(match.params.org)(state), - project: projectByIdSelector(match.params.projectId)(state), - services: servicesForTopologySelector(match.params.projectId)(state), - path: match.path, - push: push -}); - -export default connect( - mapStateToProps -)(Services); +export { default as ServicesTopology } from './topology'; +export { default as ServicesList } from './list'; +export { default as ServicesView } from './view'; diff --git a/frontend/src/containers/services/list.js b/frontend/src/containers/services/list.js index 22266ded..249f5ca9 100644 --- a/frontend/src/containers/services/list.js +++ b/frontend/src/containers/services/list.js @@ -119,8 +119,8 @@ const mapStateToProps = (state, { push }) => ({ org: orgByIdSelector(match.params.org)(state), - project: projectByIdSelector(match.params.projectId)(state), - services: servicesByProjectIdSelector(match.params.projectId, { + project: projectByIdSelector(match.params.project)(state), + services: servicesByProjectIdSelector(match.params.project, { duration, interval })(state), diff --git a/frontend/src/containers/services/topology.js b/frontend/src/containers/services/topology.js index 37472f96..ce1261ec 100644 --- a/frontend/src/containers/services/topology.js +++ b/frontend/src/containers/services/topology.js @@ -40,6 +40,10 @@ const Services = (props) => { push } = props; + if(!services || !services.length) { + return null; + } + const getService = (uuid) => services.reduce((acc, service) => service.uuid === uuid ? service : acc , {}); @@ -100,8 +104,8 @@ const mapStateToProps = (state, { push }) => ({ org: orgByIdSelector(match.params.org)(state), - project: projectByIdSelector(match.params.projectId)(state), - services: servicesForTopologySelector(match.params.projectId)(state), + project: projectByIdSelector(match.params.project)(state), + services: servicesForTopologySelector(match.params.project)(state), uiTooltip: serviceUiTooltipSelector(state), push: push }); diff --git a/frontend/src/containers/services/view.js b/frontend/src/containers/services/view.js new file mode 100644 index 00000000..9a100b5a --- /dev/null +++ b/frontend/src/containers/services/view.js @@ -0,0 +1,114 @@ +import React from 'react'; +import { connect } from 'react-redux'; +import EmptyServices from '@components/empty/services'; +import PropTypes from '@root/prop-types'; +import Row from '@ui/components/row'; +import Column from '@ui/components/column'; +import { LayoutContainer } from '@components/layout'; +import { H2 } from '@ui/components/base-elements'; +import { FormGroup, Toggle, ToggleList, Legend } from '@ui/components/form'; +import TopologyFilter from '@components/services/topology-filter'; +import { unitcalc, remcalc } from '@ui/shared/functions'; +import styled from 'styled-components'; + +import { + orgByIdSelector, + projectByIdSelector, + servicesForTopologySelector +} from '@state/selectors'; + +const StyledLegend = styled(Legend)` + float: left; + padding-top: ${unitcalc(2)}; + margin-right: ${unitcalc(1.5)}; +`; + +const PaddedRow = styled(Row)` + margin-bottom: ${remcalc(18)} +`; + +const ServicesView = ({ + org = {}, + project = {}, + services = {}, + location = {}, + match = {}, + push +}) => { + + if(!services || !services.length) { + return ( + + ); + } + + const toggleValue = location.pathname.split('-').pop(); + + const handleToggle = (evt) => { + + const value = evt.target.value; + if(value !== toggleValue) { + const index = location.pathname.lastIndexOf('-'); + const path = `${location.pathname.slice(0, index)}-${value}`; + push(path); + } + }; + + const filter = ( + + + + ); + + const toggle = ( + + + View + + Topology + List + + + + ); + + return ( + + + +

    Services

    + + { toggle } + { filter } + +     +     +     + ); +}; + +ServicesView.propTypes = { + org: PropTypes.org, + project: PropTypes.project, + services: React.PropTypes.arrayOf(PropTypes.service), + location: React.PropTypes.object, + match: React.PropTypes.object, + push: React.PropTypes.func.isRequired +}; + +const mapStateToProps = (state, { + location, + match, + push +}) => ({ + org: orgByIdSelector(match.params.org)(state), + project: projectByIdSelector(match.params.project)(state), + services: servicesForTopologySelector(match.params.project)(state), + location: location, + match: match, + push: push +}); + +export default connect( + mapStateToProps +)(ServicesView); diff --git a/frontend/src/index.js b/frontend/src/index.js index 1ca4aff6..d880dcaf 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,5 +1,4 @@ import { IntlProvider } from 'react-intl-redux'; -import { BrowserRouter } from 'react-router-dom'; import { Provider } from 'react-redux'; import qs from 'querystring'; import a11y from 'react-a11y'; @@ -7,13 +6,13 @@ import ReactDOM from 'react-dom'; import React from 'react'; import Perf from 'react-addons-perf'; -import App from '@containers/app'; import MockStateTesting from '@mock-states/testing'; import MockState from '@mock-states'; import LeakDatasets from './dataset-leak.json'; import NormalDatasets from './dataset-normal.json'; import Store from '@state/store'; import { isProduction } from '@utils'; +import Router from '@root/routing'; if ( !isProduction() ) { a11y(React, { @@ -29,7 +28,7 @@ const states = { }; const query = qs.parse(window.location.search.replace(/^\?/, '')); -const mockState = states[query.mock || 'testing']; +const mockState = states[query.mock || 'all']; // node_memory_rss_bytes // node_memory_heap_total_bytes @@ -114,9 +113,7 @@ mockState.metrics.data.datasets = datasets; ReactDOM.render( - - - + {Router} , document.getElementById('root') diff --git a/frontend/src/mock-states/shared/orgs.js b/frontend/src/mock-states/shared/orgs.js index c72e59da..98673c88 100644 --- a/frontend/src/mock-states/shared/orgs.js +++ b/frontend/src/mock-states/shared/orgs.js @@ -9,6 +9,10 @@ export const orgs = { "people", "settings" ], + "personal-sections": [ + "projects", + "settings" + ], "members_status": [ "Active", "Inactive", @@ -28,7 +32,8 @@ export const orgs = { "id": "nicola", "name": "Your dashboard", "image": "https://pbs.twimg.com/profile_images/641289584580493312/VBfsPlff_400x400.jpg", - "members": [] + "members": [], + "type": "personal" }, { "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01", "uuid": "e12ad7db-91b2-4154-83dd-40dcfc700dcc", @@ -54,4 +59,4 @@ export const orgs = { "image": "/static/images/make-us-proud.svg", "members": [] }] -} \ No newline at end of file +} diff --git a/frontend/src/mock-states/testing.js b/frontend/src/mock-states/testing.js index d379d692..bc18e0d6 100644 --- a/frontend/src/mock-states/testing.js +++ b/frontend/src/mock-states/testing.js @@ -28,7 +28,8 @@ export default { "id": "nicola", "name": "Personal", "image": "https://pbs.twimg.com/profile_images/641289584580493312/VBfsPlff_400x400.jpg", - "members": [] + "members": [], + "type": "personal" }] }, account, diff --git a/frontend/src/routing.js b/frontend/src/routing.js new file mode 100644 index 00000000..56d79720 --- /dev/null +++ b/frontend/src/routing.js @@ -0,0 +1,157 @@ +import React from 'react'; +import { + BrowserRouter, + Redirect, + Route, + Switch +} from 'react-router-dom'; + +import App from '@containers/app'; +import Header from '@containers/header'; + +import { + Breadcrumb, + Menu, + Org +} from '@containers/navigation'; + +import { + OrgPeople, + OrgSettings +} from '@containers/org'; + +import { + ProjectsList, + ProjectsNewProject, + ProjectsNewProjectBilling, + ProjectsNewProjectNewBilling +} from '@containers/projects'; + +import { + ProjectFeed, + ProjectInstances, + ProjectManifest, + // ProjectPeople, + ProjectRollback, + ProjectSettings +} from '@containers/project'; + +import { + ServicesTopology, + ServicesList, + ServicesView +} from '@containers/services'; + +import { + ServiceActivityFeed, + ServiceFirewall, + ServiceInstances, + ServiceMetrics, + ServiceNetworks, + ServiceManifest, + ServiceSummary, + ServiceMetadata +} from '@containers/service'; + +const orgRedirect = (p) => ( + +); + +const projectRedirect = (p) => ( + +); + +const servicesRedirect = (p) => ( + +); + +const serviceRedirect = (p) => ( + +); + +const emptyRoute = (p) => { + return null; +}; + +const orgPath = '/:org'; +const projectPath = `${orgPath}/projects/:project`; +const servicePath = `${projectPath}/services/:service`; + +/* eslint-disable */ +const Router = ( + + + + + {/* Navigation */} + + + + + + + + + + + + + + + + + {/* Projects */} + + + + {/* Redirect to services only for project root */} + {/* Projects - New Project */} + + + + {/* Project */} + + + + {/* Project / Feed */} + + {/* Project / Services */} + + + + + + {/* Project / Instances */} + + {/* Project / Rollback */} + + {/* Project / Manifest */} + + {/* Project / Settings */} + + + {/* Service */} + {/* Redirect to services only for service root */} + + + + {/* Instances */} + + {/* Metrics */} + + + + + + + {/* People - TODO This route is broken */} + + + {/* Settings */} + + + + +); +/* eslint-enable */ +export default Router; diff --git a/frontend/src/state/selectors.js b/frontend/src/state/selectors.js index b85934cf..3b2d0c87 100644 --- a/frontend/src/state/selectors.js +++ b/frontend/src/state/selectors.js @@ -11,6 +11,8 @@ const account = (state) => get(state, 'account.data', {}); const accountUi = (state) => get(state, 'account.ui', {}); const datacenters = (state) => get(state, 'datacenters.data', {}); const orgUiSections = (state) => get(state, 'orgs.ui.sections', []); +const orgUiPersonalSections = (state) => + get(state, 'orgs.ui.personal-sections', []); const projectUiSections = (state) => get(state, 'projects.ui.sections', []); const serviceUiTooltip = (state) => get(state, 'services.ui.tooltip', []); const serviceUiSections = (state) => get(state, 'services.ui.sections', []); @@ -58,6 +60,12 @@ const projectsByOrgId = (orgId) => createSelector( (projects, org) => projects.filter((p) => p.org === org.uuid) ); +const orgSectionsById = (orgId) => createSelector( + [orgById(orgId), orgUiSections, orgUiPersonalSections], + (org, sections, personalSections) => + org.type === 'personal' ? personalSections : sections +); + const orgSections = (orgId) => createSelector( [orgById(orgId), orgUiSections], (org, sections) => sections.filter( @@ -462,7 +470,8 @@ export { orgIndexById as orgIndexSelector, services as servicesSelector, serviceById as serviceByIdSelector, - orgSections as orgSectionsSelector, + orgSectionsById as orgSectionsByIdSelector, + orgSections as orgSectionsSelector, // TODO get rid of this projectUiSections as projectSectionsSelector, serviceUiSections as serviceSectionsSelector, projectsByOrgId as projectsByOrgIdSelector, diff --git a/frontend/test/components/index.js b/frontend/test/components/index.js index 768abf3c..8c29db20 100644 --- a/frontend/test/components/index.js +++ b/frontend/test/components/index.js @@ -12,12 +12,6 @@ test('renders without exploding', (t) => { t.deepEqual(wrapper.length, 1); }); -test('renders without exploding', (t) => { - const Home = require('@containers/home').default.WrappedComponent; - const wrapper = shallow(); - t.deepEqual(wrapper.length, 1); -}); - test('renders without exploding', (t) => { const NotFound = require('@containers/not-found').default; const wrapper = shallow(); diff --git a/frontend/test/components/project-section.js b/frontend/test/components/project-section.js deleted file mode 100644 index 343dd0ae..00000000 --- a/frontend/test/components/project-section.js +++ /dev/null @@ -1,20 +0,0 @@ -const test = require('ava'); -const enzyme = require('enzyme'); -const React = require('react'); - -const create = require('../helpers/create'); - -const { - render -} = enzyme; - -const { - withIntl -} = create; - -test('renders without exploding', (t) => { - // eslint-disable-next-line max-len - const Section = require('@containers/project/section').default.WrappedComponent; - const wrapper = render(withIntl(
    )); - t.deepEqual(wrapper.length, 1); -}); diff --git a/frontend/test/components/projects.js b/frontend/test/components/projects.js index a9d013a3..fef9468d 100644 --- a/frontend/test/components/projects.js +++ b/frontend/test/components/projects.js @@ -14,13 +14,15 @@ const { } = create; test('renders without exploding', (t) => { - const Projects = require('@containers/projects').default.WrappedComponent; + const Projects = + require('@containers/projects/list').default.WrappedComponent; const wrapper = render(withRouter(withIntl())); t.deepEqual(wrapper.length, 1); }); test('renders connected without exploding', (t) => { - const Projects = require('@containers/projects').default; + const Projects = + require('@containers/projects/list').default; const wrapper = render(create()); t.deepEqual(wrapper.length, 1); }); @@ -40,7 +42,8 @@ test('renders \'s list of projects ', (t) => { plan: '100.17$ per day' }]; - const Projects = require('@containers/projects').default.WrappedComponent; + const Projects = + require('@containers/projects/list').default.WrappedComponent; const wrapper = render(withRouter(withIntl( ))); @@ -55,7 +58,8 @@ test('renders \'s list of projects ', (t) => { }); test('renders \'s empty

    when no projects ', (t) => { - const Projects = require('@containers/projects').default.WrappedComponent; + const Projects = + require('@containers/projects/list').default.WrappedComponent; const wrapper = render(withRouter(withIntl())); const empty = wrapper.find('p[name=empty]'); diff --git a/frontend/test/components/service.js b/frontend/test/components/service.js index d8ea95eb..07709c36 100644 --- a/frontend/test/components/service.js +++ b/frontend/test/components/service.js @@ -13,14 +13,15 @@ const { withRouter } = create; -test('renders without exploding', (t) => { - const Service = require('@containers/service').default.WrappedComponent; +test.skip('renders without exploding', (t) => { + const Service = + require('@containers/service/summary').default.WrappedComponent; const wrapper = render(withRouter(withIntl())); t.deepEqual(wrapper.length, 1); }); test('renders connected without exploding', (t) => { - const Service = require('@containers/service').default; + const Service = require('@containers/service/summary').default; const wrapper = render(create()); t.deepEqual(wrapper.length, 1); }); diff --git a/frontend/test/components/services.js b/frontend/test/components/services.js index 2adb6806..9aade4ac 100644 --- a/frontend/test/components/services.js +++ b/frontend/test/components/services.js @@ -9,17 +9,19 @@ const { } = enzyme; const { - withIntl + withIntl, + withRouter } = create; test('renders without exploding', (t) => { - const Services = require('@containers/services').default.WrappedComponent; - const wrapper = render(withIntl()); + const Services = + require('@containers/services/view').default.WrappedComponent; + const wrapper = render(withRouter(withIntl())); t.deepEqual(wrapper.length, 1); }); -test('renders connected without exploding', (t) => { - const Services = require('@containers/services').default; +test.skip('renders connected without exploding', (t) => { + const Services = require('@containers/services/view').default; const wrapper = render(create()); t.deepEqual(wrapper.length, 1); }); diff --git a/spikes/routing-containers/routing-example/.gitignore b/spikes/routing-containers/routing-example/.gitignore new file mode 100644 index 00000000..927d17bb --- /dev/null +++ b/spikes/routing-containers/routing-example/.gitignore @@ -0,0 +1,18 @@ +# See https://help.github.com/ignore-files/ for more about ignoring files. + +# dependencies +/node_modules + +# testing +/coverage + +# production +/build + +# misc +.DS_Store +.env +npm-debug.log* +yarn-debug.log* +yarn-error.log* + diff --git a/spikes/routing-containers/routing-example/README.md b/spikes/routing-containers/routing-example/README.md new file mode 100644 index 00000000..a5203365 --- /dev/null +++ b/spikes/routing-containers/routing-example/README.md @@ -0,0 +1,1623 @@ +This project was bootstrapped with [Create React App](https://github.com/facebookincubator/create-react-app). + +Below you will find some information on how to perform common tasks.
    +You can find the most recent version of this guide [here](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md). + +## Table of Contents + +- [Updating to New Releases](#updating-to-new-releases) +- [Sending Feedback](#sending-feedback) +- [Folder Structure](#folder-structure) +- [Available Scripts](#available-scripts) + - [npm start](#npm-start) + - [npm test](#npm-test) + - [npm run build](#npm-run-build) + - [npm run eject](#npm-run-eject) +- [Supported Language Features and Polyfills](#supported-language-features-and-polyfills) +- [Syntax Highlighting in the Editor](#syntax-highlighting-in-the-editor) +- [Displaying Lint Output in the Editor](#displaying-lint-output-in-the-editor) +- [Debugging in the Editor](#debugging-in-the-editor) +- [Changing the Page ``](#changing-the-page-title) +- [Installing a Dependency](#installing-a-dependency) +- [Importing a Component](#importing-a-component) +- [Adding a Stylesheet](#adding-a-stylesheet) +- [Post-Processing CSS](#post-processing-css) +- [Adding a CSS Preprocessor (Sass, Less etc.)](#adding-a-css-preprocessor-sass-less-etc) +- [Adding Images and Fonts](#adding-images-and-fonts) +- [Using the `public` Folder](#using-the-public-folder) + - [Changing the HTML](#changing-the-html) + - [Adding Assets Outside of the Module System](#adding-assets-outside-of-the-module-system) + - [When to Use the `public` Folder](#when-to-use-the-public-folder) +- [Using Global Variables](#using-global-variables) +- [Adding Bootstrap](#adding-bootstrap) + - [Using a Custom Theme](#using-a-custom-theme) +- [Adding Flow](#adding-flow) +- [Adding Custom Environment Variables](#adding-custom-environment-variables) + - [Referencing Environment Variables in the HTML](#referencing-environment-variables-in-the-html) + - [Adding Temporary Environment Variables In Your Shell](#adding-temporary-environment-variables-in-your-shell) + - [Adding Development Environment Variables In `.env`](#adding-development-environment-variables-in-env) +- [Can I Use Decorators?](#can-i-use-decorators) +- [Integrating with an API Backend](#integrating-with-an-api-backend) + - [Node](#node) + - [Ruby on Rails](#ruby-on-rails) +- [Proxying API Requests in Development](#proxying-api-requests-in-development) +- [Using HTTPS in Development](#using-https-in-development) +- [Generating Dynamic `<meta>` Tags on the Server](#generating-dynamic-meta-tags-on-the-server) +- [Pre-Rendering into Static HTML Files](#pre-rendering-into-static-html-files) +- [Injecting Data from the Server into the Page](#injecting-data-from-the-server-into-the-page) +- [Running Tests](#running-tests) + - [Filename Conventions](#filename-conventions) + - [Command Line Interface](#command-line-interface) + - [Version Control Integration](#version-control-integration) + - [Writing Tests](#writing-tests) + - [Testing Components](#testing-components) + - [Using Third Party Assertion Libraries](#using-third-party-assertion-libraries) + - [Initializing Test Environment](#initializing-test-environment) + - [Focusing and Excluding Tests](#focusing-and-excluding-tests) + - [Coverage Reporting](#coverage-reporting) + - [Continuous Integration](#continuous-integration) + - [Disabling jsdom](#disabling-jsdom) + - [Snapshot Testing](#snapshot-testing) + - [Editor Integration](#editor-integration) +- [Developing Components in Isolation](#developing-components-in-isolation) +- [Making a Progressive Web App](#making-a-progressive-web-app) +- [Deployment](#deployment) + - [Static Server](#static-server) + - [Other Solutions](#other-solutions) + - [Serving Apps with Client-Side Routing](#serving-apps-with-client-side-routing) + - [Building for Relative Paths](#building-for-relative-paths) + - [Azure](#azure) + - [Firebase](#firebase) + - [GitHub Pages](#github-pages) + - [Heroku](#heroku) + - [Modulus](#modulus) + - [Netlify](#netlify) + - [Now](#now) + - [S3 and CloudFront](#s3-and-cloudfront) + - [Surge](#surge) +- [Advanced Configuration](#advanced-configuration) +- [Troubleshooting](#troubleshooting) + - [`npm start` doesn’t detect changes](#npm-start-doesnt-detect-changes) + - [`npm test` hangs on macOS Sierra](#npm-test-hangs-on-macos-sierra) + - [`npm run build` silently fails](#npm-run-build-silently-fails) + - [`npm run build` fails on Heroku](#npm-run-build-fails-on-heroku) +- [Something Missing?](#something-missing) + +## Updating to New Releases + +Create React App is divided into two packages: + +* `create-react-app` is a global command-line utility that you use to create new projects. +* `react-scripts` is a development dependency in the generated projects (including this one). + +You almost never need to update `create-react-app` itself: it delegates all the setup to `react-scripts`. + +When you run `create-react-app`, it always creates the project with the latest version of `react-scripts` so you’ll get all the new features and improvements in newly created apps automatically. + +To update an existing project to a new version of `react-scripts`, [open the changelog](https://github.com/facebookincubator/create-react-app/blob/master/CHANGELOG.md), find the version you’re currently on (check `package.json` in this folder if you’re not sure), and apply the migration instructions for the newer versions. + +In most cases bumping the `react-scripts` version in `package.json` and running `npm install` in this folder should be enough, but it’s good to consult the [changelog](https://github.com/facebookincubator/create-react-app/blob/master/CHANGELOG.md) for potential breaking changes. + +We commit to keeping the breaking changes minimal so you can upgrade `react-scripts` painlessly. + +## Sending Feedback + +We are always open to [your feedback](https://github.com/facebookincubator/create-react-app/issues). + +## Folder Structure + +After creation, your project should look like this: + +``` +my-app/ + README.md + node_modules/ + package.json + public/ + index.html + favicon.ico + src/ + App.css + App.js + App.test.js + index.css + index.js + logo.svg +``` + +For the project to build, **these files must exist with exact filenames**: + +* `public/index.html` is the page template; +* `src/index.js` is the JavaScript entry point. + +You can delete or rename the other files. + +You may create subdirectories inside `src`. For faster rebuilds, only files inside `src` are processed by Webpack.<br> +You need to **put any JS and CSS files inside `src`**, or Webpack won’t see them. + +Only files inside `public` can be used from `public/index.html`.<br> +Read instructions below for using assets from JavaScript and HTML. + +You can, however, create more top-level directories.<br> +They will not be included in the production build so you can use them for things like documentation. + +## Available Scripts + +In the project directory, you can run: + +### `npm start` + +Runs the app in the development mode.<br> +Open [http://localhost:3000](http://localhost:3000) to view it in the browser. + +The page will reload if you make edits.<br> +You will also see any lint errors in the console. + +### `npm test` + +Launches the test runner in the interactive watch mode.<br> +See the section about [running tests](#running-tests) for more information. + +### `npm run build` + +Builds the app for production to the `build` folder.<br> +It correctly bundles React in production mode and optimizes the build for the best performance. + +The build is minified and the filenames include the hashes.<br> +Your app is ready to be deployed! + +See the section about [deployment](#deployment) for more information. + +### `npm run eject` + +**Note: this is a one-way operation. Once you `eject`, you can’t go back!** + +If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. + +Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. + +You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. + +## Supported Language Features and Polyfills + +This project supports a superset of the latest JavaScript standard.<br> +In addition to [ES6](https://github.com/lukehoban/es6features) syntax features, it also supports: + +* [Exponentiation Operator](https://github.com/rwaldron/exponentiation-operator) (ES2016). +* [Async/await](https://github.com/tc39/ecmascript-asyncawait) (ES2017). +* [Object Rest/Spread Properties](https://github.com/sebmarkbage/ecmascript-rest-spread) (stage 3 proposal). +* [Class Fields and Static Properties](https://github.com/tc39/proposal-class-public-fields) (stage 2 proposal). +* [JSX](https://facebook.github.io/react/docs/introducing-jsx.html) and [Flow](https://flowtype.org/) syntax. + +Learn more about [different proposal stages](https://babeljs.io/docs/plugins/#presets-stage-x-experimental-presets-). + +While we recommend to use experimental proposals with some caution, Facebook heavily uses these features in the product code, so we intend to provide [codemods](https://medium.com/@cpojer/effective-javascript-codemods-5a6686bb46fb) if any of these proposals change in the future. + +Note that **the project only includes a few ES6 [polyfills](https://en.wikipedia.org/wiki/Polyfill)**: + +* [`Object.assign()`](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Object/assign) via [`object-assign`](https://github.com/sindresorhus/object-assign). +* [`Promise`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise) via [`promise`](https://github.com/then/promise). +* [`fetch()`](https://developer.mozilla.org/en/docs/Web/API/Fetch_API) via [`whatwg-fetch`](https://github.com/github/fetch). + +If you use any other ES6+ features that need **runtime support** (such as `Array.from()` or `Symbol`), make sure you are including the appropriate polyfills manually, or that the browsers you are targeting already support them. + +## Syntax Highlighting in the Editor + +To configure the syntax highlighting in your favorite text editor, head to the [relevant Babel documentation page](https://babeljs.io/docs/editors) and follow the instructions. Some of the most popular editors are covered. + +## Displaying Lint Output in the Editor + +>Note: this feature is available with `react-scripts@0.2.0` and higher. + +Some editors, including Sublime Text, Atom, and Visual Studio Code, provide plugins for ESLint. + +They are not required for linting. You should see the linter output right in your terminal as well as the browser console. However, if you prefer the lint results to appear right in your editor, there are some extra steps you can do. + +You would need to install an ESLint plugin for your editor first. + +>**A note for Atom `linter-eslint` users** + +>If you are using the Atom `linter-eslint` plugin, make sure that **Use global ESLint installation** option is checked: + +><img src="http://i.imgur.com/yVNNHJM.png" width="300"> + + +>**For Visual Studio Code users** + +>VS Code ESLint plugin automatically detects Create React App's configuration file. So you do not need to create `eslintrc.json` at the root directory, except when you want to add your own rules. In that case, you should include CRA's config by adding this line: + +>```js +{ + // ... + "extends": "react-app" +} +``` + +Then add this block to the `package.json` file of your project: + +```js +{ + // ... + "eslintConfig": { + "extends": "react-app" + } +} +``` + +Finally, you will need to install some packages *globally*: + +```sh +npm install -g eslint-config-react-app@0.3.0 eslint@3.8.1 babel-eslint@7.0.0 eslint-plugin-react@6.4.1 eslint-plugin-import@2.0.1 eslint-plugin-jsx-a11y@4.0.0 eslint-plugin-flowtype@2.21.0 +``` + +We recognize that this is suboptimal, but it is currently required due to the way we hide the ESLint dependency. The ESLint team is already [working on a solution to this](https://github.com/eslint/eslint/issues/3458) so this may become unnecessary in a couple of months. + +## Debugging in the Editor + +**This feature is currently only supported by [Visual Studio Code](https://code.visualstudio.com) editor.** + +Visual Studio Code supports live-editing and debugging out of the box with Create React App. This enables you as a developer to write and debug your React code without leaving the editor, and most importantly it enables you to have a continuous development workflow, where context switching is minimal, as you don’t have to switch between tools. + +You would need to have the latest version of [VS Code](https://code.visualstudio.com) and VS Code [Chrome Debugger Extension](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome) installed. + +Then add the block below to your `launch.json` file and put it inside the `.vscode` folder in your app’s root directory. + +```json +{ + "version": "0.2.0", + "configurations": [{ + "name": "Chrome", + "type": "chrome", + "request": "launch", + "url": "http://localhost:3000", + "webRoot": "${workspaceRoot}/src", + "userDataDir": "${workspaceRoot}/.vscode/chrome", + "sourceMapPathOverrides": { + "webpack:///src/*": "${webRoot}/*" + } + }] +} +``` + +Start your app by running `npm start`, and start debugging in VS Code by pressing `F5` or by clicking the green debug icon. You can now write code, set breakpoints, make changes to the code, and debug your newly modified code—all from your editor. + +## Changing the Page `<title>` + +You can find the source HTML file in the `public` folder of the generated project. You may edit the `<title>` tag in it to change the title from “React App” to anything else. + +Note that normally you wouldn’t edit files in the `public` folder very often. For example, [adding a stylesheet](#adding-a-stylesheet) is done without touching the HTML. + +If you need to dynamically update the page title based on the content, you can use the browser [`document.title`](https://developer.mozilla.org/en-US/docs/Web/API/Document/title) API. For more complex scenarios when you want to change the title from React components, you can use [React Helmet](https://github.com/nfl/react-helmet), a third party library. + +If you use a custom server for your app in production and want to modify the title before it gets sent to the browser, you can follow advice in [this section](#generating-dynamic-meta-tags-on-the-server). Alternatively, you can pre-build each page as a static HTML file which then loads the JavaScript bundle, which is covered [here](#pre-rendering-into-static-html-files). + +## Installing a Dependency + +The generated project includes React and ReactDOM as dependencies. It also includes a set of scripts used by Create React App as a development dependency. You may install other dependencies (for example, React Router) with `npm`: + +``` +npm install --save <library-name> +``` + +## Importing a Component + +This project setup supports ES6 modules thanks to Babel.<br> +While you can still use `require()` and `module.exports`, we encourage you to use [`import` and `export`](http://exploringjs.com/es6/ch_modules.html) instead. + +For example: + +### `Button.js` + +```js +import React, { Component } from 'react'; + +class Button extends Component { + render() { + // ... + } +} + +export default Button; // Don’t forget to use export default! +``` + +### `DangerButton.js` + + +```js +import React, { Component } from 'react'; +import Button from './Button'; // Import a component from another file + +class DangerButton extends Component { + render() { + return <Button color="red" />; + } +} + +export default DangerButton; +``` + +Be aware of the [difference between default and named exports](http://stackoverflow.com/questions/36795819/react-native-es-6-when-should-i-use-curly-braces-for-import/36796281#36796281). It is a common source of mistakes. + +We suggest that you stick to using default imports and exports when a module only exports a single thing (for example, a component). That’s what you get when you use `export default Button` and `import Button from './Button'`. + +Named exports are useful for utility modules that export several functions. A module may have at most one default export and as many named exports as you like. + +Learn more about ES6 modules: + +* [When to use the curly braces?](http://stackoverflow.com/questions/36795819/react-native-es-6-when-should-i-use-curly-braces-for-import/36796281#36796281) +* [Exploring ES6: Modules](http://exploringjs.com/es6/ch_modules.html) +* [Understanding ES6: Modules](https://leanpub.com/understandinges6/read#leanpub-auto-encapsulating-code-with-modules) + +## Adding a Stylesheet + +This project setup uses [Webpack](https://webpack.github.io/) for handling all assets. Webpack offers a custom way of “extending” the concept of `import` beyond JavaScript. To express that a JavaScript file depends on a CSS file, you need to **import the CSS from the JavaScript file**: + +### `Button.css` + +```css +.Button { + padding: 20px; +} +``` + +### `Button.js` + +```js +import React, { Component } from 'react'; +import './Button.css'; // Tell Webpack that Button.js uses these styles + +class Button extends Component { + render() { + // You can use them as regular CSS styles + return <div className="Button" />; + } +} +``` + +**This is not required for React** but many people find this feature convenient. You can read about the benefits of this approach [here](https://medium.com/seek-ui-engineering/block-element-modifying-your-javascript-components-d7f99fcab52b). However you should be aware that this makes your code less portable to other build tools and environments than Webpack. + +In development, expressing dependencies this way allows your styles to be reloaded on the fly as you edit them. In production, all CSS files will be concatenated into a single minified `.css` file in the build output. + +If you are concerned about using Webpack-specific semantics, you can put all your CSS right into `src/index.css`. It would still be imported from `src/index.js`, but you could always remove that import if you later migrate to a different build tool. + +## Post-Processing CSS + +This project setup minifies your CSS and adds vendor prefixes to it automatically through [Autoprefixer](https://github.com/postcss/autoprefixer) so you don’t need to worry about it. + +For example, this: + +```css +.App { + display: flex; + flex-direction: row; + align-items: center; +} +``` + +becomes this: + +```css +.App { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: horizontal; + -webkit-box-direction: normal; + -ms-flex-direction: row; + flex-direction: row; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; +} +``` + +If you need to disable autoprefixing for some reason, [follow this section](https://github.com/postcss/autoprefixer#disabling). + +## Adding a CSS Preprocessor (Sass, Less etc.) + +Generally, we recommend that you don’t reuse the same CSS classes across different components. For example, instead of using a `.Button` CSS class in `<AcceptButton>` and `<RejectButton>` components, we recommend creating a `<Button>` component with its own `.Button` styles, that both `<AcceptButton>` and `<RejectButton>` can render (but [not inherit](https://facebook.github.io/react/docs/composition-vs-inheritance.html)). + +Following this rule often makes CSS preprocessors less useful, as features like mixins and nesting are replaced by component composition. You can, however, integrate a CSS preprocessor if you find it valuable. In this walkthrough, we will be using Sass, but you can also use Less, or another alternative. + +First, let’s install the command-line interface for Sass: + +``` +npm install node-sass --save-dev +``` + +Then in `package.json`, add the following lines to `scripts`: + +```diff + "scripts": { ++ "build-css": "node-sass src/ -o src/", ++ "watch-css": "npm run build-css && node-sass src/ -o src/ --watch --recursive", + "start": "react-scripts start", + "build": "react-scripts build", + "test": "react-scripts test --env=jsdom", +``` + +>Note: To use a different preprocessor, replace `build-css` and `watch-css` commands according to your preprocessor’s documentation. + +Now you can rename `src/App.css` to `src/App.scss` and run `npm run watch-css`. The watcher will find every Sass file in `src` subdirectories, and create a corresponding CSS file next to it, in our case overwriting `src/App.css`. Since `src/App.js` still imports `src/App.css`, the styles become a part of your application. You can now edit `src/App.scss`, and `src/App.css` will be regenerated. + +To share variables between Sass files, you can use Sass imports. For example, `src/App.scss` and other component style files could include `@import "./shared.scss";` with variable definitions. + +At this point you might want to remove all CSS files from the source control, and add `src/**/*.css` to your `.gitignore` file. It is generally a good practice to keep the build products outside of the source control. + +As a final step, you may find it convenient to run `watch-css` automatically with `npm start`, and run `build-css` as a part of `npm run build`. You can use the `&&` operator to execute two scripts sequentially. However, there is no cross-platform way to run two scripts in parallel, so we will install a package for this: + +``` +npm install --save-dev npm-run-all +``` + +Then we can change `start` and `build` scripts to include the CSS preprocessor commands: + +```diff + "scripts": { + "build-css": "node-sass src/ -o src/", + "watch-css": "npm run build-css && node-sass src/ -o src/ --watch --recursive", +- "start": "react-scripts start", +- "build": "react-scripts build", ++ "start-js": "react-scripts start", ++ "start": "npm-run-all -p watch-css start-js", ++ "build": "npm run build-css && react-scripts build", + "test": "react-scripts test --env=jsdom", + "eject": "react-scripts eject" + } +``` + +Now running `npm start` and `npm run build` also builds Sass files. Note that `node-sass` seems to have an [issue recognizing newly created files on some systems](https://github.com/sass/node-sass/issues/1891) so you might need to restart the watcher when you create a file until it’s resolved. + +## Adding Images and Fonts + +With Webpack, using static assets like images and fonts works similarly to CSS. + +You can **`import` an image right in a JavaScript module**. This tells Webpack to include that image in the bundle. Unlike CSS imports, importing an image or a font gives you a string value. This value is the final image path you can reference in your code. + +Here is an example: + +```js +import React from 'react'; +import logo from './logo.png'; // Tell Webpack this JS file uses this image + +console.log(logo); // /logo.84287d09.png + +function Header() { + // Import result is the URL of your image + return <img src={logo} alt="Logo" />; +} + +export default Header; +``` + +This ensures that when the project is built, Webpack will correctly move the images into the build folder, and provide us with correct paths. + +This works in CSS too: + +```css +.Logo { + background-image: url(./logo.png); +} +``` + +Webpack finds all relative module references in CSS (they start with `./`) and replaces them with the final paths from the compiled bundle. If you make a typo or accidentally delete an important file, you will see a compilation error, just like when you import a non-existent JavaScript module. The final filenames in the compiled bundle are generated by Webpack from content hashes. If the file content changes in the future, Webpack will give it a different name in production so you don’t need to worry about long-term caching of assets. + +Please be advised that this is also a custom feature of Webpack. + +**It is not required for React** but many people enjoy it (and React Native uses a similar mechanism for images).<br> +An alternative way of handling static assets is described in the next section. + +## Using the `public` Folder + +>Note: this feature is available with `react-scripts@0.5.0` and higher. + +### Changing the HTML + +The `public` folder contains the HTML file so you can tweak it, for example, to [set the page title](#changing-the-page-title). +The `<script>` tag with the compiled code will be added to it automatically during the build process. + +### Adding Assets Outside of the Module System + +You can also add other assets to the `public` folder. + +Note that we normally encourage you to `import` assets in JavaScript files instead. +For example, see the sections on [adding a stylesheet](#adding-a-stylesheet) and [adding images and fonts](#adding-images-and-fonts). +This mechanism provides a number of benefits: + +* Scripts and stylesheets get minified and bundled together to avoid extra network requests. +* Missing files cause compilation errors instead of 404 errors for your users. +* Result filenames include content hashes so you don’t need to worry about browsers caching their old versions. + +However there is an **escape hatch** that you can use to add an asset outside of the module system. + +If you put a file into the `public` folder, it will **not** be processed by Webpack. Instead it will be copied into the build folder untouched. To reference assets in the `public` folder, you need to use a special variable called `PUBLIC_URL`. + +Inside `index.html`, you can use it like this: + +```html +<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico"> +``` + +Only files inside the `public` folder will be accessible by `%PUBLIC_URL%` prefix. If you need to use a file from `src` or `node_modules`, you’ll have to copy it there to explicitly specify your intention to make this file a part of the build. + +When you run `npm run build`, Create React App will substitute `%PUBLIC_URL%` with a correct absolute path so your project works even if you use client-side routing or host it at a non-root URL. + +In JavaScript code, you can use `process.env.PUBLIC_URL` for similar purposes: + +```js +render() { + // Note: this is an escape hatch and should be used sparingly! + // Normally we recommend using `import` for getting asset URLs + // as described in “Adding Images and Fonts” above this section. + return <img src={process.env.PUBLIC_URL + '/img/logo.png'} />; +} +``` + +Keep in mind the downsides of this approach: + +* None of the files in `public` folder get post-processed or minified. +* Missing files will not be called at compilation time, and will cause 404 errors for your users. +* Result filenames won’t include content hashes so you’ll need to add query arguments or rename them every time they change. + +### When to Use the `public` Folder + +Normally we recommend importing [stylesheets](#adding-a-stylesheet), [images, and fonts](#adding-images-and-fonts) from JavaScript. +The `public` folder is useful as a workaround for a number of less common cases: + +* You need a file with a specific name in the build output, such as [`manifest.webmanifest`](https://developer.mozilla.org/en-US/docs/Web/Manifest). +* You have thousands of images and need to dynamically reference their paths. +* You want to include a small script like [`pace.js`](http://github.hubspot.com/pace/docs/welcome/) outside of the bundled code. +* Some library may be incompatible with Webpack and you have no other option but to include it as a `<script>` tag. + +Note that if you add a `<script>` that declares global variables, you also need to read the next section on using them. + +## Using Global Variables + +When you include a script in the HTML file that defines global variables and try to use one of these variables in the code, the linter will complain because it cannot see the definition of the variable. + +You can avoid this by reading the global variable explicitly from the `window` object, for example: + +```js +const $ = window.$; +``` + +This makes it obvious you are using a global variable intentionally rather than because of a typo. + +Alternatively, you can force the linter to ignore any line by adding `// eslint-disable-line` after it. + +## Adding Bootstrap + +You don’t have to use [React Bootstrap](https://react-bootstrap.github.io) together with React but it is a popular library for integrating Bootstrap with React apps. If you need it, you can integrate it with Create React App by following these steps: + +Install React Bootstrap and Bootstrap from npm. React Bootstrap does not include Bootstrap CSS so this needs to be installed as well: + +``` +npm install react-bootstrap --save +npm install bootstrap@3 --save +``` + +Import Bootstrap CSS and optionally Bootstrap theme CSS in the beginning of your ```src/index.js``` file: + +```js +import 'bootstrap/dist/css/bootstrap.css'; +import 'bootstrap/dist/css/bootstrap-theme.css'; +// Put any other imports below so that CSS from your +// components takes precedence over default styles. +``` + +Import required React Bootstrap components within ```src/App.js``` file or your custom component files: + +```js +import { Navbar, Jumbotron, Button } from 'react-bootstrap'; +``` + +Now you are ready to use the imported React Bootstrap components within your component hierarchy defined in the render method. Here is an example [`App.js`](https://gist.githubusercontent.com/gaearon/85d8c067f6af1e56277c82d19fd4da7b/raw/6158dd991b67284e9fc8d70b9d973efe87659d72/App.js) redone using React Bootstrap. + +### Using a Custom Theme + +Sometimes you might need to tweak the visual styles of Bootstrap (or equivalent package).<br> +We suggest the following approach: + +* Create a new package that depends on the package you wish to customize, e.g. Bootstrap. +* Add the necessary build steps to tweak the theme, and publish your package on npm. +* Install your own theme npm package as a dependency of your app. + +Here is an example of adding a [customized Bootstrap](https://medium.com/@tacomanator/customizing-create-react-app-aa9ffb88165) that follows these steps. + +## Adding Flow + +Flow is a static type checker that helps you write code with fewer bugs. Check out this [introduction to using static types in JavaScript](https://medium.com/@preethikasireddy/why-use-static-types-in-javascript-part-1-8382da1e0adb) if you are new to this concept. + +Recent versions of [Flow](http://flowtype.org/) work with Create React App projects out of the box. + +To add Flow to a Create React App project, follow these steps: + +1. Run `npm install --save-dev flow-bin` (or `yarn add --dev flow-bin`). +2. Add `"flow": "flow"` to the `scripts` section of your `package.json`. +3. Run `npm run flow -- init` (or `yarn flow -- init`) to create a [`.flowconfig` file](https://flowtype.org/docs/advanced-configuration.html) in the root directory. +4. Add `// @flow` to any files you want to type check (for example, to `src/App.js`). + +Now you can run `npm run flow` (or `yarn flow`) to check the files for type errors. +You can optionally use an IDE like [Nuclide](https://nuclide.io/docs/languages/flow/) for a better integrated experience. +In the future we plan to integrate it into Create React App even more closely. + +To learn more about Flow, check out [its documentation](https://flowtype.org/). + +## Adding Custom Environment Variables + +>Note: this feature is available with `react-scripts@0.2.3` and higher. + +Your project can consume variables declared in your environment as if they were declared locally in your JS files. By +default you will have `NODE_ENV` defined for you, and any other environment variables starting with +`REACT_APP_`. + +**The environment variables are embedded during the build time**. Since Create React App produces a static HTML/CSS/JS bundle, it can’t possibly read them at runtime. To read them at runtime, you would need to load HTML into memory on the server and replace placeholders in runtime, just like [described here](#injecting-data-from-the-server-into-the-page). Alternatively you can rebuild the app on the server anytime you change them. + +>Note: You must create custom environment variables beginning with `REACT_APP_`. Any other variables except `NODE_ENV` will be ignored to avoid accidentally [exposing a private key on the machine that could have the same name](https://github.com/facebookincubator/create-react-app/issues/865#issuecomment-252199527). Changing any environment variables will require you to restart the development server if it is running. + +These environment variables will be defined for you on `process.env`. For example, having an environment +variable named `REACT_APP_SECRET_CODE` will be exposed in your JS as `process.env.REACT_APP_SECRET_CODE`. + +There is also a special built-in environment variable called `NODE_ENV`. You can read it from `process.env.NODE_ENV`. When you run `npm start`, it is always equal to `'development'`, when you run `npm test` it is always equal to `'test'`, and when you run `npm run build` to make a production bundle, it is always equal to `'production'`. **You cannot override `NODE_ENV` manually.** This prevents developers from accidentally deploying a slow development build to production. + +These environment variables can be useful for displaying information conditionally based on where the project is +deployed or consuming sensitive data that lives outside of version control. + +First, you need to have environment variables defined. For example, let’s say you wanted to consume a secret defined +in the environment inside a `<form>`: + +```jsx +render() { + return ( + <div> + <small>You are running this application in <b>{process.env.NODE_ENV}</b> mode.</small> + <form> + <input type="hidden" defaultValue={process.env.REACT_APP_SECRET_CODE} /> + </form> + </div> + ); +} +``` + +During the build, `process.env.REACT_APP_SECRET_CODE` will be replaced with the current value of the `REACT_APP_SECRET_CODE` environment variable. Remember that the `NODE_ENV` variable will be set for you automatically. + +When you load the app in the browser and inspect the `<input>`, you will see its value set to `abcdef`, and the bold text will show the environment provided when using `npm start`: + +```html +<div> + <small>You are running this application in <b>development</b> mode.</small> + <form> + <input type="hidden" value="abcdef" /> + </form> +</div> +``` + +The above form is looking for a variable called `REACT_APP_SECRET_CODE` from the environment. In order to consume this +value, we need to have it defined in the environment. This can be done using two ways: either in your shell or in +a `.env` file. Both of these ways are described in the next few sections. + +Having access to the `NODE_ENV` is also useful for performing actions conditionally: + +```js +if (process.env.NODE_ENV !== 'production') { + analytics.disable(); +} +``` + +When you compile the app with `npm run build`, the minification step will strip out this condition, and the resulting bundle will be smaller. + +### Referencing Environment Variables in the HTML + +>Note: this feature is available with `react-scripts@0.9.0` and higher. + +You can also access the environment variables starting with `REACT_APP_` in the `public/index.html`. For example: + +```html +<title>%REACT_APP_WEBSITE_NAME% +``` + +Note that the caveats from the above section apply: + +* Apart from a few built-in variables (`NODE_ENV` and `PUBLIC_URL`), variable names must start with `REACT_APP_` to work. +* The environment variables are injected at build time. If you need to inject them at runtime, [follow this approach instead](#generating-dynamic-meta-tags-on-the-server). + +### Adding Temporary Environment Variables In Your Shell + +Defining environment variables can vary between OSes. It’s also important to know that this manner is temporary for the +life of the shell session. + +#### Windows (cmd.exe) + +```cmd +set REACT_APP_SECRET_CODE=abcdef&&npm start +``` + +(Note: the lack of whitespace is intentional.) + +#### Linux, macOS (Bash) + +```bash +REACT_APP_SECRET_CODE=abcdef npm start +``` + +### Adding Development Environment Variables In `.env` + +>Note: this feature is available with `react-scripts@0.5.0` and higher. + +To define permanent environment variables, create a file called `.env` in the root of your project: + +``` +REACT_APP_SECRET_CODE=abcdef +``` + +These variables will act as the defaults if the machine does not explicitly set them.
    +Please refer to the [dotenv documentation](https://github.com/motdotla/dotenv) for more details. + +>Note: If you are defining environment variables for development, your CI and/or hosting platform will most likely need +these defined as well. Consult their documentation how to do this. For example, see the documentation for [Travis CI](https://docs.travis-ci.com/user/environment-variables/) or [Heroku](https://devcenter.heroku.com/articles/config-vars). + +## Can I Use Decorators? + +Many popular libraries use [decorators](https://medium.com/google-developers/exploring-es7-decorators-76ecb65fb841) in their documentation.
    +Create React App doesn’t support decorator syntax at the moment because: + +* It is an experimental proposal and is subject to change. +* The current specification version is not officially supported by Babel. +* If the specification changes, we won’t be able to write a codemod because we don’t use them internally at Facebook. + +However in many cases you can rewrite decorator-based code without decorators just as fine.
    +Please refer to these two threads for reference: + +* [#214](https://github.com/facebookincubator/create-react-app/issues/214) +* [#411](https://github.com/facebookincubator/create-react-app/issues/411) + +Create React App will add decorator support when the specification advances to a stable stage. + +## Integrating with an API Backend + +These tutorials will help you to integrate your app with an API backend running on another port, +using `fetch()` to access it. + +### Node +Check out [this tutorial](https://www.fullstackreact.com/articles/using-create-react-app-with-a-server/). +You can find the companion GitHub repository [here](https://github.com/fullstackreact/food-lookup-demo). + +### Ruby on Rails + +Check out [this tutorial](https://www.fullstackreact.com/articles/how-to-get-create-react-app-to-work-with-your-rails-api/). +You can find the companion GitHub repository [here](https://github.com/fullstackreact/food-lookup-demo-rails). + +## Proxying API Requests in Development + +>Note: this feature is available with `react-scripts@0.2.3` and higher. + +People often serve the front-end React app from the same host and port as their backend implementation.
    +For example, a production setup might look like this after the app is deployed: + +``` +/ - static server returns index.html with React app +/todos - static server returns index.html with React app +/api/todos - server handles any /api/* requests using the backend implementation +``` + +Such setup is **not** required. However, if you **do** have a setup like this, it is convenient to write requests like `fetch('/api/todos')` without worrying about redirecting them to another host or port during development. + +To tell the development server to proxy any unknown requests to your API server in development, add a `proxy` field to your `package.json`, for example: + +```js + "proxy": "http://localhost:4000", +``` + +This way, when you `fetch('/api/todos')` in development, the development server will recognize that it’s not a static asset, and will proxy your request to `http://localhost:4000/api/todos` as a fallback. The development server will only attempt to send requests without a `text/html` accept header to the proxy. + +Conveniently, this avoids [CORS issues](http://stackoverflow.com/questions/21854516/understanding-ajax-cors-and-security-considerations) and error messages like this in development: + +``` +Fetch API cannot load http://localhost:4000/api/todos. No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://localhost:3000' is therefore not allowed access. If an opaque response serves your needs, set the request's mode to 'no-cors' to fetch the resource with CORS disabled. +``` + +Keep in mind that `proxy` only has effect in development (with `npm start`), and it is up to you to ensure that URLs like `/api/todos` point to the right thing in production. You don’t have to use the `/api` prefix. Any unrecognized request without a `text/html` accept header will be redirected to the specified `proxy`. + +The `proxy` option supports HTTP, HTTPS and WebSocket connections.
    +If the `proxy` option is **not** flexible enough for you, alternatively you can: + +* Enable CORS on your server ([here’s how to do it for Express](http://enable-cors.org/server_expressjs.html)). +* Use [environment variables](#adding-custom-environment-variables) to inject the right server host and port into your app. + +## Using HTTPS in Development + +>Note: this feature is available with `react-scripts@0.4.0` and higher. + +You may require the dev server to serve pages over HTTPS. One particular case where this could be useful is when using [the "proxy" feature](#proxying-api-requests-in-development) to proxy requests to an API server when that API server is itself serving HTTPS. + +To do this, set the `HTTPS` environment variable to `true`, then start the dev server as usual with `npm start`: + +#### Windows (cmd.exe) + +```cmd +set HTTPS=true&&npm start +``` + +(Note: the lack of whitespace is intentional.) + +#### Linux, macOS (Bash) + +```bash +HTTPS=true npm start +``` + +Note that the server will use a self-signed certificate, so your web browser will almost definitely display a warning upon accessing the page. + +## Generating Dynamic `` Tags on the Server + +Since Create React App doesn’t support server rendering, you might be wondering how to make `` tags dynamic and reflect the current URL. To solve this, we recommend to add placeholders into the HTML, like this: + +```html + + + + + +``` + +Then, on the server, regardless of the backend you use, you can read `index.html` into memory and replace `__OG_TITLE__`, `__OG_DESCRIPTION__`, and any other placeholders with values depending on the current URL. Just make sure to sanitize and escape the interpolated values so that they are safe to embed into HTML! + +If you use a Node server, you can even share the route matching logic between the client and the server. However duplicating it also works fine in simple cases. + +## Pre-Rendering into Static HTML Files + +If you’re hosting your `build` with a static hosting provider you can use [react-snapshot](https://www.npmjs.com/package/react-snapshot) to generate HTML pages for each route, or relative link, in your application. These pages will then seamlessly become active, or “hydrated”, when the JavaScript bundle has loaded. + +There are also opportunities to use this outside of static hosting, to take the pressure off the server when generating and caching routes. + +The primary benefit of pre-rendering is that you get the core content of each page _with_ the HTML payload—regardless of whether or not your JavaScript bundle successfully downloads. It also increases the likelihood that each route of your application will be picked up by search engines. + +You can read more about [zero-configuration pre-rendering (also called snapshotting) here](https://medium.com/superhighfives/an-almost-static-stack-6df0a2791319). + +## Injecting Data from the Server into the Page + +Similarly to the previous section, you can leave some placeholders in the HTML that inject global variables, for example: + +```js + + + + +``` + +Then, on the server, you can replace `__SERVER_DATA__` with a JSON of real data right before sending the response. The client code can then read `window.SERVER_DATA` to use it. **Make sure to [sanitize the JSON before sending it to the client](https://medium.com/node-security/the-most-common-xss-vulnerability-in-react-js-applications-2bdffbcc1fa0) as it makes your app vulnerable to XSS attacks.** + +## Running Tests + +>Note: this feature is available with `react-scripts@0.3.0` and higher.
    +>[Read the migration guide to learn how to enable it in older projects!](https://github.com/facebookincubator/create-react-app/blob/master/CHANGELOG.md#migrating-from-023-to-030) + +Create React App uses [Jest](https://facebook.github.io/jest/) as its test runner. To prepare for this integration, we did a [major revamp](https://facebook.github.io/jest/blog/2016/09/01/jest-15.html) of Jest so if you heard bad things about it years ago, give it another try. + +Jest is a Node-based runner. This means that the tests always run in a Node environment and not in a real browser. This lets us enable fast iteration speed and prevent flakiness. + +While Jest provides browser globals such as `window` thanks to [jsdom](https://github.com/tmpvar/jsdom), they are only approximations of the real browser behavior. Jest is intended to be used for unit tests of your logic and your components rather than the DOM quirks. + +We recommend that you use a separate tool for browser end-to-end tests if you need them. They are beyond the scope of Create React App. + +### Filename Conventions + +Jest will look for test files with any of the following popular naming conventions: + +* Files with `.js` suffix in `__tests__` folders. +* Files with `.test.js` suffix. +* Files with `.spec.js` suffix. + +The `.test.js` / `.spec.js` files (or the `__tests__` folders) can be located at any depth under the `src` top level folder. + +We recommend to put the test files (or `__tests__` folders) next to the code they are testing so that relative imports appear shorter. For example, if `App.test.js` and `App.js` are in the same folder, the test just needs to `import App from './App'` instead of a long relative path. Colocation also helps find tests more quickly in larger projects. + +### Command Line Interface + +When you run `npm test`, Jest will launch in the watch mode. Every time you save a file, it will re-run the tests, just like `npm start` recompiles the code. + +The watcher includes an interactive command-line interface with the ability to run all tests, or focus on a search pattern. It is designed this way so that you can keep it open and enjoy fast re-runs. You can learn the commands from the “Watch Usage” note that the watcher prints after every run: + +![Jest watch mode](http://facebook.github.io/jest/img/blog/15-watch.gif) + +### Version Control Integration + +By default, when you run `npm test`, Jest will only run the tests related to files changed since the last commit. This is an optimization designed to make your tests runs fast regardless of how many tests you have. However it assumes that you don’t often commit the code that doesn’t pass the tests. + +Jest will always explicitly mention that it only ran tests related to the files changed since the last commit. You can also press `a` in the watch mode to force Jest to run all tests. + +Jest will always run all tests on a [continuous integration](#continuous-integration) server or if the project is not inside a Git or Mercurial repository. + +### Writing Tests + +To create tests, add `it()` (or `test()`) blocks with the name of the test and its code. You may optionally wrap them in `describe()` blocks for logical grouping but this is neither required nor recommended. + +Jest provides a built-in `expect()` global function for making assertions. A basic test could look like this: + +```js +import sum from './sum'; + +it('sums numbers', () => { + expect(sum(1, 2)).toEqual(3); + expect(sum(2, 2)).toEqual(4); +}); +``` + +All `expect()` matchers supported by Jest are [extensively documented here](http://facebook.github.io/jest/docs/expect.html).
    +You can also use [`jest.fn()` and `expect(fn).toBeCalled()`](http://facebook.github.io/jest/docs/expect.html#tohavebeencalled) to create “spies” or mock functions. + +### Testing Components + +There is a broad spectrum of component testing techniques. They range from a “smoke test” verifying that a component renders without throwing, to shallow rendering and testing some of the output, to full rendering and testing component lifecycle and state changes. + +Different projects choose different testing tradeoffs based on how often components change, and how much logic they contain. If you haven’t decided on a testing strategy yet, we recommend that you start with creating simple smoke tests for your components: + +```js +import React from 'react'; +import ReactDOM from 'react-dom'; +import App from './App'; + +it('renders without crashing', () => { + const div = document.createElement('div'); + ReactDOM.render(, div); +}); +``` + +This test mounts a component and makes sure that it didn’t throw during rendering. Tests like this provide a lot value with very little effort so they are great as a starting point, and this is the test you will find in `src/App.test.js`. + +When you encounter bugs caused by changing components, you will gain a deeper insight into which parts of them are worth testing in your application. This might be a good time to introduce more specific tests asserting specific expected output or behavior. + +If you’d like to test components in isolation from the child components they render, we recommend using [`shallow()` rendering API](http://airbnb.io/enzyme/docs/api/shallow.html) from [Enzyme](http://airbnb.io/enzyme/). You can write a smoke test with it too: + +```sh +npm install --save-dev enzyme react-addons-test-utils +``` + +```js +import React from 'react'; +import { shallow } from 'enzyme'; +import App from './App'; + +it('renders without crashing', () => { + shallow(); +}); +``` + +Unlike the previous smoke test using `ReactDOM.render()`, this test only renders `` and doesn’t go deeper. For example, even if `` itself renders a `