Adding Organisation Tabs

frontend/src/components/article/index.js

@@ -6,4 +6,5 @@ const {
 
 // Main Contonent Wrapper Styles
 module.exports = styled.article`
+  background-color: #fafafa;
 `;

frontend/src/components/header/index.js

@@ -6,7 +6,7 @@ const Column = require('@ui/components/column');
 const Container = require('@ui/components/container');
 const Avatar = require('@ui/components/avatar');
 const fns = require('@ui/shared/functions');
-const logo = require('@resources/logo.png');
+const logo = require('@resources/logo.svg');
 const PropTypes = require('@root/prop-types');
 const Row = require('@ui/components/row');
 const Tooltip = require('@ui/components/tooltip');

frontend/src/components/navigation/index.js

@@ -0,0 +1,8 @@
+const Styled = require('styled-components');
+
+const {
+  default: styled
+} = Styled;
+
+module.exports = styled.nav`
+`;

frontend/src/components/navigation/org.js

@@ -0,0 +1,139 @@
+const React = require('react');
+const ReactRouter = require('react-router');
+const ReactRedux = require('react-redux');
+const Styled = require('styled-components');
+
+const Avatar = require('@ui/components/avatar');
+const Container = require('@ui/components/container');
+const PropTypes = require('@root/prop-types');
+const selectors = require('@state/selectors');
+const Ul = require('@ui/components/horizontal-list/ul');
+const fns = require('@ui/shared/functions');
+
+const {
+  connect
+} = ReactRedux;
+
+const {
+  Link,
+} = ReactRouter;
+
+const {
+  default: styled
+} = Styled;
+
+const {
+  orgsSelector
+} = selectors;
+
+const {
+  remcalc
+} = fns;
+
+const StyledNav = styled.div`
+  background-color: #f2f2f2;
+  border-bottom: ${remcalc(1)} solid #d8d8d8;
+
+  & ul {
+    height: ${remcalc(60)};
+    margin: 0px 0px 0px 0px !important;
+  }
+`;
+
+// TODO: refactor colours into constants in UI
+const NavigationLinkContainer = styled.div`
+  padding: ${remcalc(11)} ${remcalc(12)} ${remcalc(12)};
+  color: #646464;
+  border: solid ${remcalc(1)} #d8d8d8;
+  height: ${remcalc(24)};
+  background-color: #f2f2f2;
+
+  &.active {
+    background-color: #fafafa;
+    border-bottom: solid ${remcalc(1)} #fafafa;
+  }
+`;
+
+const OrgImage = styled.div`
+  float: left;
+`;
+
+const OrgAvatar = styled(Avatar)`
+  display: block !important;
+`;
+
+const OrgName = styled.span`
+  margin-left: ${remcalc(12)};
+  margin-top: ${remcalc(3)};
+`;
+
+const NavLi = styled.li`
+  display: inline-block;
+  padding-top: ${remcalc(12)};
+  padding-left: ${remcalc(3)};
+
+  & a {
+    text-decoration: none !important;
+  }
+`;
+
+const OrgNavigation = ({
+  orgs = []
+}) => {
+  const navLinks = orgs.map(({
+    id,
+    name,
+    image,
+  }) => {
+    const to = `/${id}`;
+
+    return (
+      <NavLi key={to}>
+        <Link activeClassName='active' to={to}>
+          {
+            ({
+              isActive,
+              href,
+              onClick,
+            }) =>
+              <a href={href} onClick={onClick}>
+                <NavigationLinkContainer className={isActive ? 'active' : ''}>
+                  <OrgImage>
+                    <OrgAvatar
+                      height={remcalc(26)}
+                      name={name}
+                      src={image}
+                      width={remcalc(26)}
+                    />
+                  </OrgImage>
+                  <OrgName>
+                    {name}
+                  </OrgName>
+                </NavigationLinkContainer>
+              </a>
+          }
+        </Link>
+      </NavLi>
+    );
+  });
+
+  return (
+    <StyledNav>
+      <Container>
+        <Ul>
+          {navLinks}
+        </Ul>
+      </Container>
+    </StyledNav>
+  );
+};
+
+OrgNavigation.propTypes = {
+  orgs: React.PropTypes.arrayOf(PropTypes.org)
+};
+
+const mapStateToProps = (state) => ({
+  orgs: orgsSelector(state)
+});
+
+module.exports = connect(mapStateToProps)(OrgNavigation);

frontend/src/containers/app.js

@@ -10,6 +10,8 @@ const Footer = require('@components/footer');
 const Header = require('@containers/header');
 const Home = require('@containers/home');
 const NotFound = require('@containers/not-found');
+const Nav = require('@components/navigation');
+const OrgNavigation = require('@components/navigation/org');
 
 const {
   updateRouter
@@ -71,6 +73,10 @@ module.exports = (props) => {
   return (
     <App {...props}>
       <Header />
+
+      <Nav>
+        <OrgNavigation />
+      </Nav>
       <Article>
         <Match component={Home} pattern='/:org?/:section?' />
         <Miss component={NotFound} />

frontend/src/containers/home/index.js

@@ -1,57 +1,30 @@
 const React = require('react');
 const ReactRedux = require('react-redux');
 const ReactRouter = require('react-router');
-const Styled = require('styled-components');
 
 const Container = require('@ui/components/container');
-const Li = require('@ui/components/horizontal-list/li');
 const Org = require('@containers/org');
 const PropTypes = require('@root/prop-types');
 const Redirect = require('@components/redirect');
 const selectors = require('@state/selectors');
-const Ul = require('@ui/components/horizontal-list/ul');
 const NotFound = require('@containers/not-found');
 
-
 const {
   connect
 } = ReactRedux;
 
 const {
-  Link,
   Match,
   Miss
 } = ReactRouter;
 
-const {
-  default: styled
-} = Styled;
-
 const {
   orgsSelector
 } = selectors;
 
-const StyledNav = styled.div`
-  background-color: #f2f2f2;
-`;
-
 const Home = ({
   orgs = []
 }) => {
-  const navLinks = orgs.map(({
-    id,
-    name
-  }) => {
-    const to = `/${id}`;
-
-    return (
-      <Li key={to}>
-        <Link activeClassName='active' to={to}>
-          {name}
-        </Link>
-      </Li>
-    );
-  });
 
   const notFound = !orgs.length
     ? <NotFound />
@@ -59,13 +32,6 @@ const Home = ({
 
   return (
     <div>
-      <StyledNav>
-        <Container>
-          <Ul>
-            {navLinks}
-          </Ul>
-        </Container>
-      </StyledNav>
       <Container>
         <Match component={Org} pattern='/:org/:section?' />
         <Miss component={notFound} />

frontend/src/mock-state.json

@@ -210,7 +210,8 @@
       ],
       "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
       "id": "nicola",
-      "name": "Your dashboard"
+      "name": "Your dashboard",
+      "image": "https://pbs.twimg.com/profile_images/641289584580493312/VBfsPlff_400x400.jpg"
     }, {
       "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
       "uuid": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
@@ -220,7 +221,8 @@
       "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
       "uuid": "551f316d-e414-480f-9787-b4c408db3edd",
       "id": "make-us-proud",
-      "name": "Make Us Proud"
+      "name": "Make Us Proud",
+      "image": "/static/images/make-us-proud.svg"
     }]
   },
   "projects": {

frontend/src/resources/logo.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="nav" xmlns="http://www.w3.org/2000/svg" width="133.5" height="36" viewBox="0 0 106.78 29.01"><defs><style>.cls-1{fill:#464646;fill-rule:evenodd;}</style></defs><title>logo</title><path class="cls-1" d="M112.32,36.78a5.3,5.3,0,0,0,3.31,1.32c2.1,0,2.65-1.27,2.65-2.94V20.54h2.28V32.46c0,1,0,2.16-.06,3.2C120.38,38.43,119,40,115.72,40a6.43,6.43,0,0,1-4.55-1.64ZM134,32.61c0-3.46-1-5.88-3.8-5.88s-4,2.3-4,5.42c0,2.85.58,6.22,3.86,6.22C132.77,38.37,134,35.75,134,32.61ZM130.32,25c2,0,5.91.63,5.91,7.14,0,5.62-2.79,8-6.39,8s-5.91-2.48-5.91-7.66C123.93,26.47,127.47,25,130.32,25ZM150,39.12V25.38h-2.19V34a3.23,3.23,0,0,1-3.51,3.37c-3.05,0-3.25-1.67-3.25-3.86V25.38h-2.25v8.7c0,3.28,1.59,4.47,4,4.72-1.41.92-3.17,2.59-3.17,4.93s1.41,3.63,4.35,3.63a5.24,5.24,0,0,0,5.62-4.26A18.85,18.85,0,0,0,150,39.12Zm-5.76,6.51c2.62,0,3.54-2.28,3.54-5.41V37.7c-3.46,1.44-6,3-6,5.73C141.84,44.85,142.68,45.63,144.26,45.63ZM159.3,25c-4.38,0-6.68,3.51-6.68,7.78s1.9,7.35,6.4,7.35a7.47,7.47,0,0,0,4.7-1.64L162.85,37a5.92,5.92,0,0,1-3.69,1.33c-3.05,0-4.21-2.48-4.32-4.84,0.23,0,.46,0,0.75,0,2.79,0,7.92-.69,7.92-5C163.51,26.41,162,25,159.3,25Zm-0.11,1.67c-3.08,0-4.26,2.91-4.35,5.19,0.17,0,.35,0,0.58,0,2,0,6-.46,6-3.05A2.06,2.06,0,0,0,159.19,26.64Zm9.53,13V30.3a3.84,3.84,0,0,1,3.89-3.54c2.42,0,2.88,1.73,2.88,3.86v9.07h2.25V29.93c0-3.28-1.61-5-4.58-5a5.48,5.48,0,0,0-4.64,2.48l-0.26-2.07h-1.93l0.14,2.16V39.69h2.25Zm12.33-20v16.1c0,2.1.12,4.32,3.95,4.32a6.09,6.09,0,0,0,3.26-1l-0.66-1.5a4.19,4.19,0,0,1-2.19.69c-1.35,0-2.1-.6-2.1-2.51V27.31h4.09V25.38H183.3v-5.7h-2.25ZM97.58,41.21A11.43,11.43,0,1,0,86.15,29.78,11.43,11.43,0,0,0,97.58,41.21Zm-2-17.55A0.43,0.43,0,0,1,96,23.22h3.21a0.43,0.43,0,0,1,.43.43v4.09h4.09a0.43,0.43,0,0,1,.43.43v3.21a0.43,0.43,0,0,1-.43.43H99.62V35.9a0.43,0.43,0,0,1-.43.43H96a0.43,0.43,0,0,1-.43-0.43V31.81H91.46A0.43,0.43,0,0,1,91,31.38V28.17a0.43,0.43,0,0,1,.43-0.43h4.09V23.65ZM190,21a1.46,1.46,0,1,0,1.46-1.45A1.45,1.45,0,0,0,190,21Zm0.26,0a1.2,1.2,0,1,1,1.2,1.25A1.2,1.2,0,0,1,190.27,21Zm0.63,0.85h0.26V21.11h0.28l0.46,0.73h0.28l-0.49-.75a0.44,0.44,0,0,0,.45-0.46,0.48,0.48,0,0,0-.59-0.49h-0.66v1.7Zm0.26-1.48h0.35c0.18,0,.37,0,0.37.26s-0.21.28-.45,0.28h-0.28V20.36Z" transform="translate(-86.15 -18.34)"/></svg>

ui/src/components/avatar/index.js

@@ -23,37 +23,41 @@ const Picture = styled.img`
 `;
 
 const Letter = styled.p`
-  font-size: 2rem;
+  ${verticallyAlignCenter}
-  margin-top: 0;
+  max-width: 100%;
-  margin-bottom: 1em;
+  margin: 0 0 0 0 !important;
-  line-height: 1.5;
+  color: #FFFFFF;
+  font-size: ${remcalc(13)};
+  font-weight: 600;
 `;
 
 const Avatar = styled.div`
   border-radius: 100%;
-  height: ${remcalc(42)};
   display: inline-block;
   overflow: hidden;
   position: relative;
   text-align: center;
-  width: ${remcalc(42)};
 `;
 
 module.exports = ({
   alt,
   className,
-  color,
+  color = '#ACC014',
   crossorigin,
+  height = remcalc(42),
   longdesc,
   name = '',
   sizes,
   src,
   srcset,
-  style
+  style,
+  width = remcalc(42),
 }) => {
   const _style = {
     ...style,
-    background: color
+    background: color,
+    width,
+    height,
   };
 
   const letter = name[0];
@@ -84,10 +88,12 @@ module.exports.propTypes = {
   className: React.PropTypes.string,
   color: React.PropTypes.string,
   crossorigin: React.PropTypes.string,
+  height: React.PropTypes.string,
   longdesc: React.PropTypes.string,
   name: React.PropTypes.string,
   sizes: React.PropTypes.string,
   src: React.PropTypes.string,
   srcset: React.PropTypes.string,
-  style: React.PropTypes.object
+  style: React.PropTypes.object,
+  width: React.PropTypes.string,
 };

ui/src/components/horizontal-list/li.js

@@ -16,7 +16,7 @@ const {
 
 module.exports = styled.li`
   display: inline-block;
-  margin-right: ${remcalc(64)};
+  margin-right: ${remcalc(24)};
   padding-top: ${remcalc(10)};
   padding-bottom: ${remcalc(10)};
 

yarn.lock

@@ -1,27 +1,95 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+
+
+abbrev@1:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+
 argparse@^1.0.7:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
   dependencies:
     sprintf-js "~1.0.2"
 
+asap@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+
+balanced-match@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+brace-expansion@^1.0.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
 buffer-shims@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
 
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+chalk@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+  dependencies:
+    ansi-styles "^1.1.0"
+    escape-string-regexp "^1.0.0"
+    has-ansi "^0.1.0"
+    strip-ansi "^0.3.0"
+    supports-color "^0.2.0"
+
 ci-info@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
 
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
 core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+debug@^2.2.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
+  dependencies:
+    ms "0.7.2"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
 duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
+escape-string-regexp@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
 esprima@^2.6.0:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
@@ -30,6 +98,30 @@ events-to-array@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.0.2.tgz#b3484465534fe4ff66fbdd1a83b777713ba404aa"
 
+glob@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+graceful-fs@^4.1.2:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+has-ansi@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  dependencies:
+    ansi-regex "^0.2.0"
+
+hosted-git-info@^2.1.4:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
+
 husky@^0.11.9:
   version "0.11.9"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.11.9.tgz#28cd1dc16bffdca1d4d93592814e5f3c327b38ee"
@@ -37,10 +129,23 @@ husky@^0.11.9:
     is-ci "^1.0.9"
     normalize-path "^1.0.0"
 
-inherits@~2.0.1:
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
 is-ci@^1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
@@ -51,6 +156,10 @@ isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
+jju@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"
+
 js-yaml@^3.2.7:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -58,22 +167,107 @@ js-yaml@^3.2.7:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
+json-parse-helpfulerror@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc"
+  dependencies:
+    jju "^1.1.0"
+
+license-checker@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-7.1.1.tgz#b0a3ec47f2469fe3a639e52a1151cd26fc2c2905"
+  dependencies:
+    chalk "~0.5.1"
+    debug "^2.2.0"
+    mkdirp "^0.3.5"
+    nopt "^2.2.0"
+    read-installed "~4.0.3"
+    treeify "^1.0.1"
+
+license-to-fail@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/license-to-fail/-/license-to-fail-2.2.0.tgz#6d5929f3b1edfb0866e05eb22919a5e1de32ff37"
+  dependencies:
+    license-checker "^7.1.0"
+
 lodash@^3.5.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
+"minimatch@2 || 3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  dependencies:
+    brace-expansion "^1.0.0"
+
 minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
+mkdirp@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+nopt@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.2.1.tgz#2aa09b7d1768487b3b89a9c5aa52335bff0baea7"
+  dependencies:
+    abbrev "1"
+
+normalize-package-data@^2.0.0:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
 
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
+read-installed@~4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
+  dependencies:
+    debuglog "^1.0.1"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    slide "~1.1.3"
+    util-extend "^1.0.1"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-json@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.4.tgz#61ed1b2256ea438d8008895090be84b8e799c853"
+  dependencies:
+    glob "^6.0.0"
+    json-parse-helpfulerror "^1.0.2"
+    normalize-package-data "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
 readable-stream@^2, readable-stream@^2.1.5:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
@@ -86,6 +280,37 @@ readable-stream@^2, readable-stream@^2.1.5:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+"semver@2 || 3 || 4 || 5":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+slide@~1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -94,6 +319,16 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
+strip-ansi@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  dependencies:
+    ansi-regex "^0.2.1"
+
+supports-color@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+
 tap-parser@~1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-1.2.2.tgz#5e2f6970611f079c7cf857de1dc7aa1b480de7a5"
@@ -122,10 +357,29 @@ through2@~2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+treeify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.0.1.tgz#69b3cd022022a168424e7cfa1ced44c939d3eb2f"
+
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
+util-extend@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
 xmlbuilder@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.1.0.tgz#687e84d9c4145af8db438d8bec88805df66249f4"
@@ -135,4 +389,3 @@ xmlbuilder@~4.1.0:
 xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-