From 15cb50183cedf712412da4f129795869e49d9d31 Mon Sep 17 00:00:00 2001
From: Jairo Campos <jairo.campos@janeirodigital.com>
Date: Tue, 2 Apr 2019 14:38:58 -0600
Subject: [PATCH 01/29] added mobile nav

---
 .../app/templates/public/img/bars-nav.svg     |  15 +++
 .../AuthNavBar/auth-nav-bar.component.js      |   2 +-
 .../nav-bar-profile.component.js              |   5 +-
 .../HamburgerButton/hamburger.component.js    |  15 +++
 .../NavBar/children/HamburgerButton/index.js  |   3 +
 .../NavBar/children/MobileNavigation/index.js |   3 +
 .../mobile.navigation.component.js            |  29 +++++
 .../mobile.navigation.style.js                |  22 ++++
 .../src/components/NavBar/children/index.js   |   4 +-
 .../components/NavBar/nav-bar.component.js    | 109 ++++++++++++------
 .../Utils/Dropdown/dropdown.style.js          |  11 +-
 .../language-dropdown.component.js            |   4 +-
 12 files changed, 176 insertions(+), 46 deletions(-)
 create mode 100644 generators/app/templates/public/img/bars-nav.svg
 create mode 100644 generators/app/templates/src/components/NavBar/children/HamburgerButton/hamburger.component.js
 create mode 100644 generators/app/templates/src/components/NavBar/children/HamburgerButton/index.js
 create mode 100644 generators/app/templates/src/components/NavBar/children/MobileNavigation/index.js
 create mode 100644 generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.component.js
 create mode 100644 generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.style.js

diff --git a/generators/app/templates/public/img/bars-nav.svg b/generators/app/templates/public/img/bars-nav.svg
new file mode 100644
index 00000000..be796841
--- /dev/null
+++ b/generators/app/templates/public/img/bars-nav.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="18px" viewBox="0 0 24 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 52.6 (67491) - http://www.bohemiancoding.com/sketch -->
+    <title>Group 13</title>
+    <desc>Created with Sketch.</desc>
+    <g id="DevKit-" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="01.04.Profile---Edit-Mode---Prrofile-Image-uploaded" transform="translate(-855.000000, -15.000000)" fill="#5361FD">
+            <g id="Group-13" transform="translate(855.000000, 15.000000)">
+                <rect id="Rectangle" x="0" y="0" width="24" height="2" rx="1"></rect>
+                <rect id="Rectangle" x="0" y="8" width="24" height="2" rx="1"></rect>
+                <rect id="Rectangle" x="0" y="16" width="24" height="2" rx="1"></rect>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js b/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js
index d22bf1ad..e0473727 100644
--- a/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js
+++ b/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js
@@ -26,7 +26,7 @@ const AuthNavBar = props => {
       sticky={true}
       toolbar={[
         {
-          component: () => <LanguageDropdown {...props} />,
+          component: () => <LanguageDropdown {...props} className={'accordion'} />,
           id: "language"
         },
         {
diff --git a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
index 10f3f626..df5429ff 100644
--- a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
+++ b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
@@ -45,7 +45,7 @@ class NavBarProfile extends Component {
     }
   };
   render() {
-    const { t, img } = this.props;
+    const { t, img, accordion } = this.props;
     const { imageLoaded } = this.state;
 
     const profileOpts = [
@@ -58,9 +58,8 @@ class NavBarProfile extends Component {
         onClick: this.logOut
       }
     ];
-
     return img ? (
-      <Dropdown actions={profileOpts} className="nav-bar--profile" hover={true}>
+      <Dropdown actions={profileOpts} className="nav-bar--profile" hover={true} accordion={accordion}>
         <ImageContainer show={imageLoaded}>
           <Img
             show={imageLoaded}
diff --git a/generators/app/templates/src/components/NavBar/children/HamburgerButton/hamburger.component.js b/generators/app/templates/src/components/NavBar/children/HamburgerButton/hamburger.component.js
new file mode 100644
index 00000000..7079d070
--- /dev/null
+++ b/generators/app/templates/src/components/NavBar/children/HamburgerButton/hamburger.component.js
@@ -0,0 +1,15 @@
+import React from 'react';
+
+const HamburgerButton = ({ toggleMobileMenu }) => {
+    return (
+        <div className="mobile-navigation__toggle">
+            <button onClick={toggleMobileMenu}>
+                <span className="icon">
+                    <img src="/img/bars-nav.svg" alt={'Icon Menu'}/>
+                </span>
+            </button>
+        </div>
+    );
+};
+
+export default HamburgerButton;
diff --git a/generators/app/templates/src/components/NavBar/children/HamburgerButton/index.js b/generators/app/templates/src/components/NavBar/children/HamburgerButton/index.js
new file mode 100644
index 00000000..4d6c7897
--- /dev/null
+++ b/generators/app/templates/src/components/NavBar/children/HamburgerButton/index.js
@@ -0,0 +1,3 @@
+import HamburgerButton  from './hamburger.component';
+
+export default HamburgerButton;
diff --git a/generators/app/templates/src/components/NavBar/children/MobileNavigation/index.js b/generators/app/templates/src/components/NavBar/children/MobileNavigation/index.js
new file mode 100644
index 00000000..a0021d45
--- /dev/null
+++ b/generators/app/templates/src/components/NavBar/children/MobileNavigation/index.js
@@ -0,0 +1,3 @@
+import MobileNavigation from './mobile.navigation.component';
+
+export default MobileNavigation;
diff --git a/generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.component.js b/generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.component.js
new file mode 100644
index 00000000..369fc13f
--- /dev/null
+++ b/generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.component.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import { LanguageDropdown } from "@util-components";
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { withTranslation } from "react-i18next";
+
+import { TopNavigation } from './mobile.navigation.style';
+
+const MobileNavigation = ({ children, toggleMobileMenu, isOpenMobile, t, i18n }) => {
+    const isActive = isOpenMobile ? 'active slideLeft' : 'hidden';
+
+    return (
+        <section className={`mobile-navigation-panel ${isActive}`}>
+            <div className="mobile-navigation-panel__wrap">
+                <TopNavigation>
+                  <LanguageDropdown {...{t, i18n}}/>
+                  <div className="close-panel__toggle">
+                      <button onClick={toggleMobileMenu}>
+                          <FontAwesomeIcon className="icon" icon="times"/>
+                      </button>
+                  </div>
+                </TopNavigation>
+                {children}
+            </div>
+        </section>
+    );
+};
+
+export default withTranslation()(MobileNavigation);
+
diff --git a/generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.style.js b/generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.style.js
new file mode 100644
index 00000000..f4718a38
--- /dev/null
+++ b/generators/app/templates/src/components/NavBar/children/MobileNavigation/mobile.navigation.style.js
@@ -0,0 +1,22 @@
+import styled from "styled-components";
+
+
+export const TopNavigation = styled.div`
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-gap: 10px;
+  margin: 15.5px 0;
+  
+  div:first-child {
+    grid-column: 1 / 3;
+  }
+  
+  button {
+    margin: 0;
+  }
+  
+  .close-panel__toggle {
+    text-align: right;
+    padding-right: 20px;
+  }
+`;
diff --git a/generators/app/templates/src/components/NavBar/children/index.js b/generators/app/templates/src/components/NavBar/children/index.js
index 6be9cf47..7806035e 100644
--- a/generators/app/templates/src/components/NavBar/children/index.js
+++ b/generators/app/templates/src/components/NavBar/children/index.js
@@ -1,3 +1,5 @@
 import Toolbar from "./Toolbar";
 import Navigation from "./Navigation";
-export { Toolbar, Navigation };
+import HamburgerButton from './HamburgerButton';
+import MobileNavigation from './MobileNavigation';
+export { Toolbar, Navigation, HamburgerButton, MobileNavigation};
diff --git a/generators/app/templates/src/components/NavBar/nav-bar.component.js b/generators/app/templates/src/components/NavBar/nav-bar.component.js
index 046cd637..bc9ca816 100644
--- a/generators/app/templates/src/components/NavBar/nav-bar.component.js
+++ b/generators/app/templates/src/components/NavBar/nav-bar.component.js
@@ -1,47 +1,86 @@
-import React, {useEffect} from "react";
-import { Link } from "react-router-dom";
-import { Navigation, Toolbar } from "./children";
-type Props = { navigation: Array<Object>, toolbar: Array<React.Node>, sticky: boolean };
+import React, { useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
+
+import {
+    Navigation,
+    Toolbar,
+    HamburgerButton,
+    MobileNavigation,
+} from './children';
+type Props = {
+    navigation: Array<Object>,
+    toolbar: Array<React.Node>,
+    sticky: boolean,
+};
 
 const NavBar = (props: Props) => {
-  const { navigation, toolbar, sticky } = props;
-  let componentElement = React.createRef();
-
-  const setNavFixed = () => {
-    const navHeight = componentElement.clientHeight;
-    const content = document.getElementsByClassName('contentApp');
-    if (content.length > 0) {
-      content[0].style['margin-top'] = `${navHeight}px`;
-    }
+    const { navigation, toolbar, sticky, t } = props;
+    const [ isOpenMobile, setOpenMobile ] = useState(false);
+    let componentElement = React.createRef();
+
+    const setNavFixed = () => {
+        if (componentElement) {
+          const navHeight = componentElement.clientHeight;
+          const content = document.getElementsByClassName('contentApp');
+          if (content.length > 0) {
+            content[0].style['margin-top'] = `${navHeight}px`;
+          }
+        }
+    };
+
+    const onComponentResize = () => {
+        setNavFixed();
+        window.addEventListener('resize', () => {
+          setNavFixed();
 
-  };
+          if (window.innerWidth >= 1024 && isOpenMobile) {
+            setOpenMobile(false);
+          }
+        });
+    };
 
-  const onComponentResize = () => {
-    window.addEventListener('resize', setNavFixed());
-  }
+    useEffect(() => {
+        if (sticky) {
+            onComponentResize();
+        }
+    });
 
-  useEffect(() => {
-    if (sticky) {
-      onComponentResize();
+    const toggleMobileMenu = () => {
+      setOpenMobile(!isOpenMobile);
     }
-  });
-  return (
-    <header role="navigation" className="header header__desktop fixed" ref={el => componentElement = el}>
-      <section className="header-wrap">
-        <div className="logo-block">
-          <Link to="/welcome">
-            <img src="/img/inrupt.svg" alt="inrupt" />
-          </Link>
-        </div>
-        {navigation ? <Navigation navigation={navigation} /> : ""}
-        {toolbar ? <Toolbar toolbar={toolbar} /> : ""}
-      </section>
-    </header>
-  );
+    return (
+        <header
+            role="navigation"
+            className="header header__desktop fixed"
+            ref={el => (componentElement = el)}
+        >
+            <section className="header-wrap">
+                <div className="logo-block">
+                    <Link to="/welcome">
+                        <img src="/img/inrupt.svg" alt="inrupt" />
+                    </Link>
+                </div>
+                {navigation && <Navigation navigation={navigation} />}
+                {toolbar && <Toolbar toolbar={toolbar} />}
+                {navigation && toolbar && (
+                    <MobileNavigation
+                        navigation={navigation}
+                        toolbar={toolbar}
+                        isOpenMobile={isOpenMobile}
+                        toggleMobileMenu={toggleMobileMenu}
+                        t={t}
+                    >
+                        <Navigation navigation={navigation} />
+                    </MobileNavigation>
+                )}
+                <HamburgerButton toggleMobileMenu={toggleMobileMenu} />
+            </section>
+        </header>
+    );
 };
 
 NavBar.defaultProps = {
-  sticky: true
+    sticky: true,
 };
 
 export default NavBar;
diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
index 0cf26684..73f4b88d 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
@@ -5,6 +5,10 @@ export const DropdownContainer = styled.div`
   height: 100%;
   width: 100%;
   padding: 0 !important;
+  
+  label {
+    display: none;
+  }
 `;
 
 export const DropdownMain = styled.button`
@@ -14,14 +18,13 @@ export const DropdownMain = styled.button`
   height: 100%;
   width: 100%;
   padding: 0 16px;
-  margin: 0;
+  margin: 5px 0;
   display: flex;
   align-items: center;
-  justify-content: center;
 
   &:focus {
     outline: none;
-  }
+  } 
 `;
 
 export const DropdownItemContainer = styled.div`
@@ -37,8 +40,8 @@ export const DropdownItemContainer = styled.div`
     right: 0;
     height: auto;
     background: #fff;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
     transition: all 0.25s ease-in-out;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
   }
 `;
 
diff --git a/generators/app/templates/src/components/Utils/LanguageDropdown/language-dropdown.component.js b/generators/app/templates/src/components/Utils/LanguageDropdown/language-dropdown.component.js
index 583474ff..ac044b29 100644
--- a/generators/app/templates/src/components/Utils/LanguageDropdown/language-dropdown.component.js
+++ b/generators/app/templates/src/components/Utils/LanguageDropdown/language-dropdown.component.js
@@ -36,7 +36,7 @@ class LanguageDropdown extends Component {
 
   };
   render() {
-    const { t } = this.props;
+    const { t }  = this.props;
     const { language } = this.state;
     const profileOpts = [
       {
@@ -53,7 +53,7 @@ class LanguageDropdown extends Component {
       }
     ];
     return (
-      <Dropdown actions={profileOpts} className="" hover={true}>
+      <Dropdown actions={profileOpts}  hover={true}>
         <div
           className={`flag-icon flag-icon-${
             language && languages[language] ? languages[language].icon : "us"

From 96abd909227884987e42893d56a95357702d2232 Mon Sep 17 00:00:00 2001
From: Jairo Campos <jairo.campos@janeirodigital.com>
Date: Tue, 2 Apr 2019 15:54:11 -0600
Subject: [PATCH 02/29] fixed loop re-render on navbar and remove language on
 profile mobile

---
 .../nav-bar-profile.component.js              | 127 +++++++++---------
 .../children/Toolbar/toolbar.component.js     |   4 +-
 .../components/NavBar/nav-bar.component.js    |  12 +-
 .../Utils/Dropdown/dropdown.component.js      |  15 ++-
 4 files changed, 92 insertions(+), 66 deletions(-)

diff --git a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
index df5429ff..8fbcf38f 100644
--- a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
+++ b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
@@ -1,79 +1,84 @@
-import React, { Component } from "react";
-import styled from "styled-components";
-import { Dropdown } from "@util-components";
+import React, { Component } from 'react';
+import styled from 'styled-components';
+import { Dropdown } from '@util-components';
 
-import auth from "solid-auth-client";
+import auth from 'solid-auth-client';
 
 export const ImageContainer = styled.div`
-  width: 42px;
-  height: 42px;
-  border-radius: 50%;
-  background-size: cover;
-  overflow: hidden;
-  visibility: ${({ show }) => (show ? "visible" : "hidden")};
-  display: ${({ show }) => (show ? "block" : "none")};
+    width: 42px;
+    height: 42px;
+    border-radius: 50%;
+    background-size: cover;
+    overflow: hidden;
+    visibility: ${({ show }) => (show ? 'visible' : 'hidden')};
+    display: ${({ show }) => (show ? 'block' : 'none')};
 `;
 
 export const Img = styled.img`
-  box-sizing: border-box;
-  width: 100%;
-  height: 100%;
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
 `;
 
 export const LoadingImage = styled(ImageContainer)`
-  background: #cccccc;
-  display: block;
+    background: #cccccc;
+    display: block;
 `;
 
 class NavBarProfile extends Component {
-  state = {
-    imageLoaded: false
-  };
+    state = {
+        imageLoaded: false,
+    };
 
-  profileRedirect = () => this.props.history.push("/profile");
+    profileRedirect = () => this.props.history.push('/profile');
 
-  onImageLoaded = async () => this.setState({ imageLoaded: true });
-  logOut = async () => {
-    try {
-      await auth.logout();
-      // Remove localStorage
-      localStorage.removeItem("solid-auth-client");
-      // Redirect to login page
-      this.props.history.push("/login");
-    } catch (error) {
-      // console.log(`Error: ${error}`);
-    }
-  };
-  render() {
-    const { t, img, accordion } = this.props;
-    const { imageLoaded } = this.state;
+    onImageLoaded = async () => this.setState({ imageLoaded: true });
+    logOut = async () => {
+        try {
+            await auth.logout();
+            // Remove localStorage
+            localStorage.removeItem('solid-auth-client');
+            // Redirect to login page
+            this.props.history.push('/login');
+        } catch (error) {
+            // console.log(`Error: ${error}`);
+        }
+    };
+    render() {
+        const { t, img, open } = this.props;
+        const { imageLoaded } = this.state;
 
-    const profileOpts = [
-      {
-        label:  t("navBar.profile"),
-        onClick: this.profileRedirect
-      },
-      {
-        label: t("navBar.logOut"),
-        onClick: this.logOut
-      }
-    ];
-    return img ? (
-      <Dropdown actions={profileOpts} className="nav-bar--profile" hover={true} accordion={accordion}>
-        <ImageContainer show={imageLoaded}>
-          <Img
-            show={imageLoaded}
-            src={img}
-            alt="profile"
-            onLoad={this.onImageLoaded}
-          />
-        </ImageContainer>
-        {!imageLoaded && <LoadingImage show={true} />}
-      </Dropdown>
-    ) : (
-      <div />
-    );
-  }
+        const profileOpts = [
+            {
+                label: t('navBar.profile'),
+                onClick: this.profileRedirect,
+            },
+            {
+                label: t('navBar.logOut'),
+                onClick: this.logOut,
+            },
+        ];
+        return img ? (
+            <Dropdown
+                actions={profileOpts}
+                className="nav-bar--profile"
+                hover={true}
+                open={open}
+            >
+                <ImageContainer show={imageLoaded}>
+                    <Img
+                        show={imageLoaded}
+                        src={img}
+                        alt="profile"
+                        onLoad={this.onImageLoaded}
+                    />
+                </ImageContainer>
+                {!imageLoaded && <LoadingImage show={true} />}
+            </Dropdown>
+        ) : (
+            <div />
+        );
+    }
 }
 
 export default NavBarProfile;
diff --git a/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js b/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js
index c721b1d5..1e2b7603 100644
--- a/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js
+++ b/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js
@@ -5,14 +5,14 @@ type Props = {
   t: Function
 };
 
-const Toolbar = ({ toolbar }: Props) => {
+const Toolbar = ({ toolbar, open }: Props) => {
   return (
     <nav className="nav nav__toolbar">
       <ul>
         {toolbar &&
           toolbar.map(({ component: Component, props }, i) => (
             <li key={i} data-testid="item">
-              <Component {...props} />
+              <Component {...props} open={open} />
             </li>
           ))}
       </ul>
diff --git a/generators/app/templates/src/components/NavBar/nav-bar.component.js b/generators/app/templates/src/components/NavBar/nav-bar.component.js
index bc9ca816..a8682142 100644
--- a/generators/app/templates/src/components/NavBar/nav-bar.component.js
+++ b/generators/app/templates/src/components/NavBar/nav-bar.component.js
@@ -16,6 +16,7 @@ type Props = {
 const NavBar = (props: Props) => {
     const { navigation, toolbar, sticky, t } = props;
     const [ isOpenMobile, setOpenMobile ] = useState(false);
+    const [profileOptions, setProfileOption] = useState([]);
     let componentElement = React.createRef();
 
     const setNavFixed = () => {
@@ -43,11 +44,19 @@ const NavBar = (props: Props) => {
         if (sticky) {
             onComponentResize();
         }
-    });
+
+        getUserProfileOptions();
+    }, [props]);
 
     const toggleMobileMenu = () => {
       setOpenMobile(!isOpenMobile);
     }
+
+    const getUserProfileOptions = () => {
+        const profile = toolbar ? toolbar.filter(bar => bar.id !== 'language') : [];
+        setProfileOption(profile);
+    }
+
     return (
         <header
             role="navigation"
@@ -71,6 +80,7 @@ const NavBar = (props: Props) => {
                         t={t}
                     >
                         <Navigation navigation={navigation} />
+                        <Toolbar toolbar={profileOptions} open={true} />
                     </MobileNavigation>
                 )}
                 <HamburgerButton toggleMobileMenu={toggleMobileMenu} />
diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
index 8d35bf40..4da61a62 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
@@ -10,7 +10,8 @@ import {
 type Props = {
   actions: Array<Object>,
   children: React.Node,
-  className: String
+  className: String,
+  open: boolean
 };
 
 type State = { open: Boolean };
@@ -21,7 +22,7 @@ class Dropdown extends Component<Props, State> {
     this.state = { open: false };
   }
 
-  toggleOpen = () => this.setState({ open: !this.state.open });
+  toggleOpen = () => this.props.open && this.setState({ open: !this.state.open });
 
   handleClickOutside() {
     this.setState({ open: false });
@@ -33,6 +34,16 @@ class Dropdown extends Component<Props, State> {
     /> : <FontAwesomeIcon icon={action.icon} className="checked" />
   }
 
+  componentDidMount(): void {
+    this.openByDefault();
+  }
+
+  openByDefault() {
+    if (this.props.open) {
+      this.setState({ open: true });
+    }
+  }
+
   render() {
     const { actions, children, className, hover } = this.props;
     const { open } = this.state;

From e59e889253a1a9f38fad2980cc4cc4d63a0d4717 Mon Sep 17 00:00:00 2001
From: Jairo Campos <jairo.campos@janeirodigital.com>
Date: Tue, 2 Apr 2019 16:35:04 -0600
Subject: [PATCH 03/29] added list profile nav version

---
 .../AuthNavBar/auth-nav-bar.component.js         |  4 ++--
 .../NavbarProfile/nav-bar-profile.component.js   |  4 ++--
 .../NavBar/children/Toolbar/toolbar.component.js |  4 ++--
 .../src/components/NavBar/nav-bar.component.js   |  4 ++--
 .../Utils/Dropdown/dropdown.component.js         | 16 +++-------------
 .../components/Utils/Dropdown/dropdown.style.js  |  3 +++
 6 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js b/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js
index e0473727..39201c11 100644
--- a/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js
+++ b/generators/app/templates/src/components/AuthNavBar/auth-nav-bar.component.js
@@ -26,11 +26,11 @@ const AuthNavBar = props => {
       sticky={true}
       toolbar={[
         {
-          component: () => <LanguageDropdown {...props} className={'accordion'} />,
+          component: () => <LanguageDropdown {...props} />,
           id: "language"
         },
         {
-          component: () => <NavBarProfile {...props} />,
+          component: ({open, customClass}) => <NavBarProfile {...props} open={open} customClass={customClass} />,
           id: "profile"
         }
       ]}
diff --git a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
index 8fbcf38f..967e1d8e 100644
--- a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
+++ b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
@@ -45,7 +45,7 @@ class NavBarProfile extends Component {
         }
     };
     render() {
-        const { t, img, open } = this.props;
+        const { t, img, open, customClass } = this.props;
         const { imageLoaded } = this.state;
 
         const profileOpts = [
@@ -61,7 +61,7 @@ class NavBarProfile extends Component {
         return img ? (
             <Dropdown
                 actions={profileOpts}
-                className="nav-bar--profile"
+                className={`nav-bar--profile ${customClass}`}
                 hover={true}
                 open={open}
             >
diff --git a/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js b/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js
index 1e2b7603..3aa15a28 100644
--- a/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js
+++ b/generators/app/templates/src/components/NavBar/children/Toolbar/toolbar.component.js
@@ -5,14 +5,14 @@ type Props = {
   t: Function
 };
 
-const Toolbar = ({ toolbar, open }: Props) => {
+const Toolbar = ({ toolbar, open, customClass }: Props) => {
   return (
     <nav className="nav nav__toolbar">
       <ul>
         {toolbar &&
           toolbar.map(({ component: Component, props }, i) => (
             <li key={i} data-testid="item">
-              <Component {...props} open={open} />
+              <Component {...props} open={open} customClass={customClass} />
             </li>
           ))}
       </ul>
diff --git a/generators/app/templates/src/components/NavBar/nav-bar.component.js b/generators/app/templates/src/components/NavBar/nav-bar.component.js
index a8682142..ffb18145 100644
--- a/generators/app/templates/src/components/NavBar/nav-bar.component.js
+++ b/generators/app/templates/src/components/NavBar/nav-bar.component.js
@@ -46,7 +46,7 @@ const NavBar = (props: Props) => {
         }
 
         getUserProfileOptions();
-    }, [props]);
+    }, [props, isOpenMobile]);
 
     const toggleMobileMenu = () => {
       setOpenMobile(!isOpenMobile);
@@ -80,7 +80,7 @@ const NavBar = (props: Props) => {
                         t={t}
                     >
                         <Navigation navigation={navigation} />
-                        <Toolbar toolbar={profileOptions} open={true} />
+                        <Toolbar toolbar={profileOptions} open={true} customClass={'profile-list'} />
                     </MobileNavigation>
                 )}
                 <HamburgerButton toggleMobileMenu={toggleMobileMenu} />
diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
index 4da61a62..dfc8cbcf 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
@@ -22,7 +22,7 @@ class Dropdown extends Component<Props, State> {
     this.state = { open: false };
   }
 
-  toggleOpen = () => this.props.open && this.setState({ open: !this.state.open });
+  toggleOpen = () => !this.props.open && this.setState({ open: !this.state.open });
 
   handleClickOutside() {
     this.setState({ open: false });
@@ -34,18 +34,8 @@ class Dropdown extends Component<Props, State> {
     /> : <FontAwesomeIcon icon={action.icon} className="checked" />
   }
 
-  componentDidMount(): void {
-    this.openByDefault();
-  }
-
-  openByDefault() {
-    if (this.props.open) {
-      this.setState({ open: true });
-    }
-  }
-
   render() {
-    const { actions, children, className, hover } = this.props;
+    const { actions, children, className, hover}  = this.props;
     const { open } = this.state;
 
     return (
@@ -56,7 +46,7 @@ class Dropdown extends Component<Props, State> {
         onMouseLeave={hover ? this.toggleOpen : null}
       >
         <DropdownMain onClick={this.toggleOpen} data-testid="dropdownMain">{children}</DropdownMain>
-        {open && (
+        {(open || this.props.open) && (
           <DropdownItemContainer className={'dropdownItem'}>
             <ul data-testid="list">
               {actions.map((action, i) => (
diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
index 73f4b88d..2487b624 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
@@ -43,6 +43,9 @@ export const DropdownItemContainer = styled.div`
     transition: all 0.25s ease-in-out;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
   }
+  .profile-list & {
+    position: relative;
+  }
 `;
 
 export const Item = styled.li`

From cb5a99752e887aa91d9d9677158ec002183a18ba Mon Sep 17 00:00:00 2001
From: Jairo Campos <jairo.campos@janeirodigital.com>
Date: Wed, 3 Apr 2019 08:16:46 -0600
Subject: [PATCH 04/29] added name and profile options by default on mobile

---
 .../NavbarProfile/nav-bar-profile.component.js       | 11 ++++++++++-
 .../components/Utils/Dropdown/dropdown.component.js  |  2 +-
 .../src/components/Utils/Dropdown/dropdown.style.js  | 12 +++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
index 967e1d8e..baa82657 100644
--- a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
+++ b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
@@ -25,6 +25,11 @@ export const LoadingImage = styled(ImageContainer)`
     display: block;
 `;
 
+export const UserName = styled.span`
+  display: inline-block;
+  margin-left: 10px;
+`;
+
 class NavBarProfile extends Component {
     state = {
         imageLoaded: false,
@@ -45,19 +50,22 @@ class NavBarProfile extends Component {
         }
     };
     render() {
-        const { t, img, open, customClass } = this.props;
+        const { t, img, open, customClass, name } = this.props;
         const { imageLoaded } = this.state;
 
         const profileOpts = [
             {
                 label: t('navBar.profile'),
                 onClick: this.profileRedirect,
+                icon: 'cog'
             },
             {
                 label: t('navBar.logOut'),
                 onClick: this.logOut,
+                icon: 'lock'
             },
         ];
+
         return img ? (
             <Dropdown
                 actions={profileOpts}
@@ -74,6 +82,7 @@ class NavBarProfile extends Component {
                     />
                 </ImageContainer>
                 {!imageLoaded && <LoadingImage show={true} />}
+                <UserName>{name}</UserName>
             </Dropdown>
         ) : (
             <div />
diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
index dfc8cbcf..a7b5fda8 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.component.js
@@ -31,7 +31,7 @@ class Dropdown extends Component<Props, State> {
   renderIcon = (action: Object) => {
     return action.customIcon ? <div
       className={`flag-icon flag-icon-${action.icon}`}
-    /> : <FontAwesomeIcon icon={action.icon} className="checked" />
+    /> : <FontAwesomeIcon icon={action.icon} className="checked icon" />
   }
 
   render() {
diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
index 2487b624..2ea166a4 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
@@ -1,13 +1,19 @@
 import styled from "styled-components";
 
+import { media } from '../../../utils';
+
 export const DropdownContainer = styled.div`
   position: relative;
   height: 100%;
   width: 100%;
   padding: 0 !important;
-  
-  label {
-    display: none;
+ 
+ 
+  .icon {
+    margin-right: 5px;
+    font-size: 1rem;
+    color: #7C4DFF;
+    ${media.desktop`display: none; path { display: none }`}
   }
 `;
 

From df48d426a6051378332c6a0fd5bf4f00839b2dc4 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Mon, 8 Apr 2019 16:00:10 -0400
Subject: [PATCH 05/29] Fixing css so the footer is conditionally at the bottom
 of the page or the bottom of content

---
 .../NotLoggedInLayout/not-logged-in.layout.js | 29 ++++++++++++++++---
 .../layouts/PrivateLayout/private.layout.js   | 22 +++++++++++---
 .../src/layouts/PublicLayout/public.layout.js | 28 +++++++++++++++---
 3 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js b/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
index 587d7756..4832e075 100644
--- a/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
+++ b/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
@@ -4,14 +4,33 @@ import { withTranslation } from "react-i18next";
 import { NavBar, Footer } from "@components";
 import { withWebId } from "@inrupt/solid-react-components";
 import { LanguageDropdown } from "@util-components";
+import styled from "styled-components";
+
+
+const Container = styled.div`
+height: 100%;
+position: relative;
+`;
+
+const FooterContainer = styled.div`
+position:absolute;
+bottom:0;
+width: 100%;
+`
+
 
 const NotLoggedInLayout = props => {
   const { component: Component, webId, ...rest } = props;
+  const ComponentWrapper = styled(Component)`
+    padding-bottom: 60px;
+    height: 100%;
+    padding-top: 60px;
+  `;
   return !webId ? (
     <Route
       {...rest}
       component={matchProps => (
-        <Fragment>
+        <Container>
           <NavBar
             {...matchProps}
             toolbar={[
@@ -21,9 +40,11 @@ const NotLoggedInLayout = props => {
               }
             ]}
           />
-          <Component {...matchProps}  className={'contentApp'} />
-          <Footer></Footer>
-        </Fragment>
+          <ComponentWrapper {...matchProps}  />
+          <FooterContainer>
+            <Footer></Footer>
+          </FooterContainer>
+        </Container>
       )}
     />
   ) : (
diff --git a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
index d6068cd6..26da3100 100644
--- a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
+++ b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
@@ -4,8 +4,20 @@ import { withAuthorization, LiveUpdate } from "@inrupt/solid-react-components";
 import { AuthNavBar, Footer } from "@components";
 import styled from "styled-components";
 
+const Container = styled.div`
+min-height: 100%;
+position: relative;
+`;
+
+const FooterContainer = styled.div`
+position:absolute;
+bottom:0;
+width: 100%;
+`;
+
 const Content = styled.div`
-min-height: calc(100% - 60px);
+padding-bottom: 60px;
+height: 100%;
 `;
 
 const PrivateLayout = ({ routes, ...rest }) => {
@@ -13,7 +25,7 @@ const PrivateLayout = ({ routes, ...rest }) => {
     <Route
       {...rest}
       component={matchProps => (
-        <Fragment>
+        <Container>
           <LiveUpdate>
             <AuthNavBar {...matchProps} />
           </LiveUpdate>
@@ -25,8 +37,10 @@ const PrivateLayout = ({ routes, ...rest }) => {
               <Redirect to="/404" />
             </Switch>
           </Content>
-          <Footer/>
-        </Fragment>
+          <FooterContainer>
+            <Footer/>
+          </FooterContainer>
+        </Container>
       )}
     />
   );
diff --git a/generators/app/templates/src/layouts/PublicLayout/public.layout.js b/generators/app/templates/src/layouts/PublicLayout/public.layout.js
index adef0293..1e207811 100644
--- a/generators/app/templates/src/layouts/PublicLayout/public.layout.js
+++ b/generators/app/templates/src/layouts/PublicLayout/public.layout.js
@@ -4,14 +4,32 @@ import { withTranslation } from "react-i18next";
 import { NavBar, AuthNavBar, Footer } from "@components";
 import { withWebId } from "@inrupt/solid-react-components";
 import { LanguageDropdown } from "@util-components";
+import styled from "styled-components";
+
+const Container = styled.div`
+min-height: 100%;
+position: relative;
+`;
+
+const FooterContainer = styled.div`
+position:absolute;
+bottom:0;
+width: 100%;
+`
 
 const PublicLayout = props => {
   const { component: Component, webId, i18n, ...rest } = props;
+  const ComponentWrapper = styled(Component)`
+    padding-bottom: 60px;
+    height: 100%;
+    padding-top: 60px;
+  `;
+
   return (
     <Route
       {...rest}
       component={matchProps => (
-        <Fragment>
+        <Container>
           {webId ? (
             <AuthNavBar {...matchProps} />
           ) : (
@@ -30,9 +48,11 @@ const PublicLayout = props => {
               ]}
             />
           )}
-          <Component {...matchProps} className={'contentApp'} />
-          <Footer></Footer>
-        </Fragment>
+          <ComponentWrapper {...matchProps} />
+          <FooterContainer>
+            <Footer />
+          </FooterContainer>
+        </Container>
       )}
     />
   );

From 6dacd5386e27666600c328e0ea204e3f119439a1 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Mon, 8 Apr 2019 17:03:05 -0400
Subject: [PATCH 06/29] Formatting updates

---
 .../src/layouts/NotLoggedInLayout/not-logged-in.layout.js       | 2 +-
 .../app/templates/src/layouts/PrivateLayout/private.layout.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js b/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
index 4832e075..4666c700 100644
--- a/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
+++ b/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
@@ -42,7 +42,7 @@ const NotLoggedInLayout = props => {
           />
           <ComponentWrapper {...matchProps}  />
           <FooterContainer>
-            <Footer></Footer>
+            <Footer />
           </FooterContainer>
         </Container>
       )}
diff --git a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
index 26da3100..68c7cfb6 100644
--- a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
+++ b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
@@ -38,7 +38,7 @@ const PrivateLayout = ({ routes, ...rest }) => {
             </Switch>
           </Content>
           <FooterContainer>
-            <Footer/>
+            <Footer />
           </FooterContainer>
         </Container>
       )}

From 76828be11c636fd9c8a9a2e1a0f40943de96d926 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Mon, 8 Apr 2019 17:23:10 -0400
Subject: [PATCH 07/29] Removing unused imports

---
 .../src/layouts/NotLoggedInLayout/not-logged-in.layout.js       | 2 +-
 .../app/templates/src/layouts/PrivateLayout/private.layout.js   | 2 +-
 .../app/templates/src/layouts/PublicLayout/public.layout.js     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js b/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
index 4666c700..7392a1c4 100644
--- a/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
+++ b/generators/app/templates/src/layouts/NotLoggedInLayout/not-logged-in.layout.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import React from "react";
 import { Route, Redirect } from "react-router-dom";
 import { withTranslation } from "react-i18next";
 import { NavBar, Footer } from "@components";
diff --git a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
index 68c7cfb6..59fdfd99 100644
--- a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
+++ b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import React from "react";
 import { Switch, Route, Redirect } from "react-router-dom";
 import { withAuthorization, LiveUpdate } from "@inrupt/solid-react-components";
 import { AuthNavBar, Footer } from "@components";
diff --git a/generators/app/templates/src/layouts/PublicLayout/public.layout.js b/generators/app/templates/src/layouts/PublicLayout/public.layout.js
index 1e207811..d8f4c9c8 100644
--- a/generators/app/templates/src/layouts/PublicLayout/public.layout.js
+++ b/generators/app/templates/src/layouts/PublicLayout/public.layout.js
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import React from "react";
 import { Route, Link } from "react-router-dom";
 import { withTranslation } from "react-i18next";
 import { NavBar, AuthNavBar, Footer } from "@components";

From d8efbbb32b1a130a19657307b39448ef9b17d2fe Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 10 Apr 2019 10:28:27 -0400
Subject: [PATCH 08/29] Adding new welcome page text

---
 .../public/locales/en-US/translation.json      |  6 ++++++
 .../public/locales/en/translation.json         |  6 ++++++
 .../containers/Welcome/welcome.component.js    | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/generators/app/templates/public/locales/en-US/translation.json b/generators/app/templates/public/locales/en-US/translation.json
index 88582af6..b6d2054c 100644
--- a/generators/app/templates/public/locales/en-US/translation.json
+++ b/generators/app/templates/public/locales/en-US/translation.json
@@ -48,6 +48,12 @@
     "title": "<0>This application was generated by the <1>React SDK for Solid.</1></0>",
     "description": "<0>The <1>React SDK for Solid</1>  is a combination of libraries, components, documentation, best practices, and an application generator meant to accelerate the development of high-quality Solid applications:</0>",
     "libraryList": "<0><0><0> Reusable Components </0>that you can use on your own in the applications that you build.</0><1><0>Application Generator</0>  that incorporates all of the components and best practices together for you, standing up THIS fully functional Solid React application. Note: The Solid React application illustrates the use of the components installed by the Generator. It should not be considered as a service provided by inrupt, and is subject to change.</1><1>Best practice patterns that you can reference as examples of how to accomplish particular things.</1></0>",
+    "fairUsageTitle": "Fair Usage",
+    "fairUsageText": "The Solid and inrupt logos included in the Generator are for the purposes of example and attribution. We expect application developers will fork the design system and customize to include your own brand in your Solid application projects, or override the example theme in your application code.",
+    "fairUsageExamples": "<0><0> If your application is Solid compatible, you can use the Solid logo to indicate that. If not, please don’t misrepresent yourself by using the Solid logo.</0><1>Please don't use the inrupt name as a part of your company name, website name, domain name, service name, or app name. Don't use our logo as your own or modify it to fit into your own logo.</1><2>If you’d like, you may use the inrupt logo to indicate that your application is powered by inrupt’s SDK, but please make sure the context is clear to the user. Your own logo should always be larger than inrupt’s logo, for example.</2></0>",
+    "fairUsageSummary": "In general, please apply common sense and honesty to your use of Solid or inrupt logos. Don’t use either to imply a partnership or official endorsement where none exists.",
+    "contactUsTitle": "Contact Us",
+    "contactUsText": "<0>If you have additional questions about the use of the React SDK for Solid, the Application Generator, or inrupt’s brand, please contact <1>support@inrupt.com<1>.</0>",
     "evolvingMessage": "<0>The SDK is continually evolving. Take a look at the <1>Release Timeline</1>  for what’s been implemented as part of the previous releases, and what's currently planned.</0>",
     "implementing": "This latest release builds on the prior versions:",
     "version010": "<0><0><0>Internationalization</0> best practices, with application session language selection.</0><0>Ability to update your profile image on the Welcome page.</0> </0>",
diff --git a/generators/app/templates/public/locales/en/translation.json b/generators/app/templates/public/locales/en/translation.json
index 88582af6..b6d2054c 100644
--- a/generators/app/templates/public/locales/en/translation.json
+++ b/generators/app/templates/public/locales/en/translation.json
@@ -48,6 +48,12 @@
     "title": "<0>This application was generated by the <1>React SDK for Solid.</1></0>",
     "description": "<0>The <1>React SDK for Solid</1>  is a combination of libraries, components, documentation, best practices, and an application generator meant to accelerate the development of high-quality Solid applications:</0>",
     "libraryList": "<0><0><0> Reusable Components </0>that you can use on your own in the applications that you build.</0><1><0>Application Generator</0>  that incorporates all of the components and best practices together for you, standing up THIS fully functional Solid React application. Note: The Solid React application illustrates the use of the components installed by the Generator. It should not be considered as a service provided by inrupt, and is subject to change.</1><1>Best practice patterns that you can reference as examples of how to accomplish particular things.</1></0>",
+    "fairUsageTitle": "Fair Usage",
+    "fairUsageText": "The Solid and inrupt logos included in the Generator are for the purposes of example and attribution. We expect application developers will fork the design system and customize to include your own brand in your Solid application projects, or override the example theme in your application code.",
+    "fairUsageExamples": "<0><0> If your application is Solid compatible, you can use the Solid logo to indicate that. If not, please don’t misrepresent yourself by using the Solid logo.</0><1>Please don't use the inrupt name as a part of your company name, website name, domain name, service name, or app name. Don't use our logo as your own or modify it to fit into your own logo.</1><2>If you’d like, you may use the inrupt logo to indicate that your application is powered by inrupt’s SDK, but please make sure the context is clear to the user. Your own logo should always be larger than inrupt’s logo, for example.</2></0>",
+    "fairUsageSummary": "In general, please apply common sense and honesty to your use of Solid or inrupt logos. Don’t use either to imply a partnership or official endorsement where none exists.",
+    "contactUsTitle": "Contact Us",
+    "contactUsText": "<0>If you have additional questions about the use of the React SDK for Solid, the Application Generator, or inrupt’s brand, please contact <1>support@inrupt.com<1>.</0>",
     "evolvingMessage": "<0>The SDK is continually evolving. Take a look at the <1>Release Timeline</1>  for what’s been implemented as part of the previous releases, and what's currently planned.</0>",
     "implementing": "This latest release builds on the prior versions:",
     "version010": "<0><0><0>Internationalization</0> best practices, with application session language selection.</0><0>Ability to update your profile image on the Welcome page.</0> </0>",
diff --git a/generators/app/templates/src/containers/Welcome/welcome.component.js b/generators/app/templates/src/containers/Welcome/welcome.component.js
index 75135fd0..7f14d1b5 100644
--- a/generators/app/templates/src/containers/Welcome/welcome.component.js
+++ b/generators/app/templates/src/containers/Welcome/welcome.component.js
@@ -166,6 +166,24 @@ const WelcomePageContent = props => {
               </li>
             </ul>
           </Trans>
+          <h3>{t('welcome.fairUsageTitle')}</h3>
+          <p>{t('welcome.fairUsageText')}</p>
+          <Trans i18nKey='welcome.fairUsageExamples'>
+            <ul>
+              <li>If your application is Solid compatible, you can use the Solid logo to indicate that. If not, please don’t misrepresent yourself by using the Solid logo.</li>
+              <li>Please don't use the inrupt name as a part of your company name, website name, domain name, service name, or app name. Don't use our logo as your own or modify it to fit into your own logo.</li>
+              <li>If you’d like, you may use the inrupt logo to indicate that your application is powered by inrupt’s SDK, but please make sure the context is clear to the user. Your own logo should always be larger than inrupt’s logo, for example.</li>
+            </ul>
+          </Trans>
+          <p>{t('welcome.fairUsageSummary')}</p>
+          <h3>{t('welcome.contactUsTitle')}</h3>
+          <Trans i18nKey={'welcome.contactUsText'}>
+            <p>
+              If you have additional questions about the use of the React SDK for Solid, the Application Generator, or inrupt’s brand, please contact
+              <a href='mailto:support@inrupt.com'>support@inrupt.com</a>.
+            </p>
+          </Trans>
+
         </WelcomeDetail>
       </WelcomeCard>
     </WelcomeWrapper>

From ade272e20b352c97efc647e8232e0869f588d213 Mon Sep 17 00:00:00 2001
From: Jairo Campos <jairo.campos@janeirodigital.com>
Date: Wed, 10 Apr 2019 12:38:37 -0600
Subject: [PATCH 09/29] added a new  spanish welcome text

---
 generators/app/templates/public/locales/es/translation.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/generators/app/templates/public/locales/es/translation.json b/generators/app/templates/public/locales/es/translation.json
index 45e3b0de..e1920df6 100644
--- a/generators/app/templates/public/locales/es/translation.json
+++ b/generators/app/templates/public/locales/es/translation.json
@@ -48,6 +48,12 @@
     "title": "<0>Esta aplicacion fue generada con <1>React SDK for Solid.</1></0>",
     "description": "<0>El <1>React SDK for Solid</1>  es una combinación de librerias, componentes, documentación, buenas prácticas y un generador de aplicaciones diseñada para acelerar el desarrollo de aplicaciones Solid de alta calidad:</0>",
     "libraryList": "<0><0><0> Componentes reutilizables </0>que puedes utilizar en tus propias aplicaciones.</0><1><0>Generador de aplicaciones</0>, incorpora todos los componentes y las buenas practicas en una misma aplicacion para el desarrollador. Nota: La aplicaciones Solid React, muestra el uso de los componentes instalados por el generador. No debe ser considerado como un servicio que Inrupt provee, y está sujeto a cambios.</0><0>Patrones de buenas prácticas que puedes referenciar como ejemplos para lograr resolver diferentes situaciones.</1></0>",
+    "fairUsageTitle": "Condiciones de uso",
+    "fairUsageText": "Los logos de Solid y Inrupt incluidos en este SDK son exclusivamente para ejemplo. Esperamos que los desarrolladores que utilicen nuestro SDK para propósitos comerciales los actualicen con sus propios logos.",
+    "fairUsageExamples": "<0><0>Si su aplicación es combatible con Solid, usted puede utilizarlo para indicarlo, de lo contrario no usarlo.</0><1>No utilice el nombre de Inrupt como parte del nombre de su empresa, sitio web, dominio,  servicio o nombre de la aplicación. No modifique o utilice nuestros logos como suyos.</1><2>Si lo desea, puede usar el logotipo de Inrupt para indicar que su aplicación funciona con el SDK de Inrupt, pero asegúrese de que el contexto sea claro para el usuario. Por ejemplo su propio logotipo siempre debe ser más grande que el logotipo de Inrupt.</2></0>",
+    "fairUsageSummary": "En general, aplique sentido común y honestidad a su uso de los logotipos de Solid o Inrupt. No utilice para implicar una asociación o respaldo oficial donde no exista.",
+    "contactUsTitle": "Contáctenos",
+    "contactUsText": "<0>\nSi tiene preguntas adicionales sobre el uso de nuestro React SDK for Solid, el Generador de aplicaciones o la marca de Inrupt, contáctese con <1>support@inrupt.com<1>.</0>",
     "evolvingMessage": "<0>El SDK se encuentra en constante evolución. Revisa el <1>Calendario de Desarrollo</1>  para lo que está planeado.</0>",
     "implementing": "Esta última version se basa en las anteriores, incluye:",
     "version010": "<0><0>Mejores prácticas para la <0>Internacionalización</0>, con selector de lenguaje para la sesión.</0><1>Habilidad para actualizar la imagen de perfil en la página de bienvenida.</1> </0>",

From ae951fddfded8439ec2fe8ce31a940c0d7848b58 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 10 Apr 2019 15:48:34 -0400
Subject: [PATCH 10/29] Updating version number

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9d69a471..3c963f8e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@inrupt/generator-solid-react",
-  "version": "0.4.1",
+  "version": "0.4.2-rc.0",
   "description": "Solid React Application Generator",
   "homepage": "https://solid.inrupt.com/docs",
   "contributors": [

From 192c769e282b7f8a391786375802c30bc11c0770 Mon Sep 17 00:00:00 2001
From: Pablo Rodriguez <pablo.rodriguez@janeirodigital.com>
Date: Wed, 10 Apr 2019 15:31:16 -0600
Subject: [PATCH 11/29] Profile i18n

---
 .../Profile/components/Form/form.component.js | 147 ++++++++-------
 .../components/Image/image.component.js       | 171 ++++++++++--------
 .../containers/Profile/profile.container.js   |   7 +-
 3 files changed, 177 insertions(+), 148 deletions(-)

diff --git a/generators/app/templates/src/containers/Profile/components/Form/form.component.js b/generators/app/templates/src/containers/Profile/components/Form/form.component.js
index cc5fc011..88296c40 100644
--- a/generators/app/templates/src/containers/Profile/components/Form/form.component.js
+++ b/generators/app/templates/src/containers/Profile/components/Form/form.component.js
@@ -1,72 +1,87 @@
 import React, { Fragment } from 'react';
-import { Button, Form, FullGridSize, WebId } from "../../profile.style";
+import { Button, Form, FullGridSize, WebId } from '../../profile.style';
 import { Input } from '@util-components';
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useTranslation } from 'react-i18next';
 
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
-export const FormUi = ({ onSubmit, formFields, mode, onCancel, onInputChange, updatedFields, webId }) => {
-
-  function getProfileValue(updatedFields: Object, item: Object) {
-    const currentKey = item.nodeBlank || item.property;
-    if (updatedFields[currentKey]) {
-      if (
-        updatedFields[currentKey].value ||
-        updatedFields[currentKey].value === ''
-      )
-        return updatedFields[currentKey].value;
+export const FormUi = ({
+    onSubmit,
+    formFields,
+    mode,
+    onCancel,
+    onInputChange,
+    updatedFields,
+    webId,
+}) => {
+    function getProfileValue(updatedFields: Object, item: Object) {
+        const currentKey = item.nodeBlank || item.property;
+        if (updatedFields[currentKey]) {
+            if (
+                updatedFields[currentKey].value ||
+                updatedFields[currentKey].value === ''
+            )
+                return updatedFields[currentKey].value;
+        }
+        return item.value || '';
     }
-    return item.value || '';
-  }
 
-  return(
-    <Fragment>
-      <Form onSubmit={onSubmit}>
-        {formFields &&
-        formFields.map(item => (
-          <Input
-            key={item.label}
-            placeholder={item.label}
-            name={item.nodeBlank || item.property}
-            value={getProfileValue(updatedFields, item)}
-            onChange={onInputChange}
-            icon={item.icon}
-            readOnly={mode}
-            required={item.required}
-            data-nodeparenturi={item.nodeParentUri}
-            data-nodeblank={item.nodeBlank}
-            data-label={item.label}
-            data-icon={item.icon}
-            type={'text'}
-          />
-        ))}
-        <FullGridSize>
-          {!mode && (
-            <>
-              <Button
-                type='button'
-                onClick={onCancel}
-                className='ids-link-stroke ids-link-stroke--primary'
-              >
-                Cancel
-              </Button>
-              <Button
-                type='submit'
-                className='ids-link-filled ids-link-filled--primary'
-              >
-                Save
-              </Button>
-            </>
-          )}
-        </FullGridSize>
-      </Form>
-      {mode && (
-        <WebId>
-          <FontAwesomeIcon icon='id-card' />
-          <a href={webId} target='_blank' rel='noopener noreferrer'>
-            {webId}
-          </a>
-        </WebId>
-      )}
-    </Fragment>
-  );
-}
+    const { t } = useTranslation();
+    return (
+        <Fragment>
+            <Form onSubmit={onSubmit}>
+                {formFields &&
+                    formFields.map(item => (
+                        <Input
+                            key={item.label}
+                            placeholder={item.label}
+                            name={item.nodeBlank || item.property}
+                            value={getProfileValue(updatedFields, item)}
+                            onChange={onInputChange}
+                            icon={item.icon}
+                            readOnly={mode}
+                            required={item.required}
+                            data-nodeparenturi={item.nodeParentUri}
+                            data-nodeblank={item.nodeBlank}
+                            data-label={item.label}
+                            data-icon={item.icon}
+                            type={'text'}
+                            onInvalid={e =>
+                                e.target.setCustomValidity(
+                                    t('profile.nameRequired')
+                                )
+                            }
+                            onInput={e => e.target.setCustomValidity('')}
+                        />
+                    ))}
+                <FullGridSize>
+                    {!mode && (
+                        <>
+                            <Button
+                                type="button"
+                                onClick={onCancel}
+                                className="ids-link-stroke ids-link-stroke--primary"
+                            >
+                                {t('profile.cancelBtn')}
+                            </Button>
+                            <Button
+                                type="submit"
+                                className="ids-link-filled ids-link-filled--primary"
+                            >
+                                {t('profile.saveBtn')}
+                            </Button>
+                        </>
+                    )}
+                </FullGridSize>
+            </Form>
+            {mode && (
+                <WebId>
+                    <FontAwesomeIcon icon="id-card" />
+                    <a href={webId} target="_blank" rel="noopener noreferrer">
+                        {webId}
+                    </a>
+                </WebId>
+            )}
+        </Fragment>
+    );
+};
diff --git a/generators/app/templates/src/containers/Profile/components/Image/image.component.js b/generators/app/templates/src/containers/Profile/components/Image/image.component.js
index 9b72f0f6..2ef48196 100644
--- a/generators/app/templates/src/containers/Profile/components/Image/image.component.js
+++ b/generators/app/templates/src/containers/Profile/components/Image/image.component.js
@@ -1,97 +1,108 @@
 import React, { useState, useEffect } from 'react';
-import data from "@solid/query-ldflex";
+import data from '@solid/query-ldflex';
 import { Uploader, useLiveUpdate } from '@inrupt/solid-react-components';
-import { useTranslation } from "react-i18next";
+import { useTranslation } from 'react-i18next';
 
 import { ImageProfile } from '@components';
 
 type Props = {
-  webId: String,
-  toastManager: String
+    webId: String,
+    toastManager: String,
 };
 
-
 export const Image = ({ webId, toastManager, defaultProfilePhoto }: Props) => {
-  const [image, setImage] = useState('');
+    const [image, setImage] = useState('');
 
-  const latestUpdate = useLiveUpdate();
+    const latestUpdate = useLiveUpdate();
 
-  const {t} = useTranslation();
+    const { t } = useTranslation();
 
-  useEffect( () => {
-    fetchPhoto();
-  }, [webId, latestUpdate]);
-  /**
-   * Fetch profile photo from card
-   */
-  const fetchPhoto = async () => {
-    try {
-      if (webId) {
-        // We are fetching profile card document
-        const user = data.user;
-        /**
-         * We access to document node using a node name
-         * hasPhoto is a new context that ldflex doesn't having
-         * we need to add it manually.
-         * if you want to know more about context please go to:
-         * https://github.com/digitalbazaar/jsonld.js
-         */
-        const image = await user.image || await user.vcard_hasPhoto;
+    useEffect(() => {
+        fetchPhoto();
+    }, [webId, latestUpdate]);
+    /**
+     * Fetch profile photo from card
+     */
+    const fetchPhoto = async () => {
+        try {
+            if (webId) {
+                // We are fetching profile card document
+                const user = data.user;
+                /**
+                 * We access to document node using a node name
+                 * hasPhoto is a new context that ldflex doesn't having
+                 * we need to add it manually.
+                 * if you want to know more about context please go to:
+                 * https://github.com/digitalbazaar/jsonld.js
+                 */
+                const image = (await user.image) || (await user.vcard_hasPhoto);
 
-        setImage(image && image.value);
-      }
-    } catch (error) {
-      toastManager.add (['Error', error.message], {
-        appearance: 'error',
-      });
-    }
-  };
-  /**
-   * updatedPhoto will update the photo url on vcard file
-   * this function will check if user has image or hasPhoto node if not
-   * will just update it, the idea is use image instead of hasPhoto
-   * @params{String} uri photo url
-   */
-  const updatePhoto = async (uri: String) => {
-    try {
-      const {user} = data;
+                setImage(image && image.value);
+            }
+        } catch (error) {
+            toastManager.add(['Error', error.message], {
+                appearance: 'error',
+            });
+        }
+    };
+    /**
+     * updatedPhoto will update the photo url on vcard file
+     * this function will check if user has image or hasPhoto node if not
+     * will just update it, the idea is use image instead of hasPhoto
+     * @params{String} uri photo url
+     */
+    const updatePhoto = async (uri: String) => {
+        try {
+            const { user } = data;
 
-      await user.image.set (uri)
+            await user.image.set(uri);
 
-      toastManager.add (['', t('profile.uploadSuccess')], {
-        appearance: 'success',
-      });
-    } catch (error) {
-      toastManager.add (['Error', error.message], {
-        appearance: 'error',
-      });
-    }
-  };
-  const limit = 2100000 ;
-  return (
-    <Uploader
-      {...{
-        fileBase: webId && webId.split('/card')[0],
-        limitFiles: 1,
-        limitSize: limit,
-        accept: 'png,jpeg,jpg',
-        errorsText: {
-          sizeLimit: t('profile.errors.sizeLimit', {limit: `${limit/1000000}Mbs`}),
-          unsupported: t('profile.errors.unsupported'),
-          maximumFiles: t('profile.errors.maximumFiles')
-        },
-        onError: error => {
-          if (error && error.statusText) {
-            toastManager.add(['', error.statusText], {
-              appearance: 'error'
+            toastManager.add(['', t('profile.uploadSuccess')], {
+                appearance: 'success',
+            });
+        } catch (error) {
+            toastManager.add(['Error', error.message], {
+                appearance: 'error',
             });
-          }
-        },
-        onComplete: uploadedFiles => {
-          updatePhoto(uploadedFiles[uploadedFiles.length - 1].uri)
-        },
-        render: props => <ImageProfile {...{ ...props, webId, photo: image || defaultProfilePhoto }} />
-      }}
-    />
-  );
+        }
+    };
+    const limit = 2100000;
+    return (
+        <Uploader
+            {...{
+                fileBase: webId && webId.split('/card')[0],
+                limitFiles: 1,
+                limitSize: limit,
+                accept: 'png,jpeg,jpg',
+                errorsText: {
+                    sizeLimit: t('profile.errors.sizeLimit', {
+                        limit: `${limit / 1000000}Mbs`,
+                    }),
+                    unsupported: t('profile.errors.unsupported'),
+                    maximumFiles: t('profile.errors.maximumFiles'),
+                },
+                onError: error => {
+                    if (error && error.statusText) {
+                        toastManager.add(['', error.statusText], {
+                            appearance: 'error',
+                        });
+                    }
+                },
+                onComplete: uploadedFiles => {
+                    updatePhoto(uploadedFiles[uploadedFiles.length - 1].uri);
+                },
+                render: props => (
+                    <ImageProfile
+                        {...{
+                            ...props,
+                            webId,
+                            photo: image || defaultProfilePhoto,
+                            text: t('profile.upload'),
+                            uploadingText: t('profile.uploadingText'),
+                        }}
+                    />
+                ),
+            }}
+        />
+    );
 };
diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js
index c2f821f7..b380aed1 100644
--- a/generators/app/templates/src/containers/Profile/profile.container.js
+++ b/generators/app/templates/src/containers/Profile/profile.container.js
@@ -1,5 +1,7 @@
 import React, { useState } from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { useTranslation } from 'react-i18next';
+
 import { withToastManager } from 'react-toast-notifications';
 import { LiveUpdate, useWebId } from '@inrupt/solid-react-components';
 import { Header, ProfileContainer, ProfileWrapper } from './profile.style';
@@ -22,7 +24,7 @@ const Profile = ({ toastManager }) => {
     const onCancel = () => {
         setMode(!mode);
     };
-
+    const { t } = useTranslation();
     return (
         <ProfileWrapper data-testid="profile-component">
             <ProfileContainer>
@@ -36,7 +38,8 @@ const Profile = ({ toastManager }) => {
                                     onClick={onCancel}
                                     data-testid="edit-profile-button"
                                 >
-                                    <FontAwesomeIcon icon="pencil-alt" /> EDIT
+                                    <FontAwesomeIcon icon="pencil-alt" />{' '}
+                                    {t('profile.edit')}
                                 </button>
                             )}
                             <Image

From e40b3a1e8f1d7f7eb88a60d75f01d56149928930 Mon Sep 17 00:00:00 2001
From: Pablo Rodriguez <pablo.rodriguez@janeirodigital.com>
Date: Wed, 10 Apr 2019 15:37:47 -0600
Subject: [PATCH 12/29] Exit edit mode and success message translations

---
 .../containers/Profile/components/Form/form.component.js   | 2 +-
 .../containers/Profile/components/Form/form.container.js   | 7 ++++---
 .../templates/src/containers/Profile/profile.container.js  | 6 +++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/generators/app/templates/src/containers/Profile/components/Form/form.component.js b/generators/app/templates/src/containers/Profile/components/Form/form.component.js
index 88296c40..9c61f486 100644
--- a/generators/app/templates/src/containers/Profile/components/Form/form.component.js
+++ b/generators/app/templates/src/containers/Profile/components/Form/form.component.js
@@ -29,7 +29,7 @@ export const FormUi = ({
     const { t } = useTranslation();
     return (
         <Fragment>
-            <Form onSubmit={onSubmit}>
+            <Form onSubmit={e => onSubmit(e, t('profile.updateSuccess'))}>
                 {formFields &&
                     formFields.map(item => (
                         <Input
diff --git a/generators/app/templates/src/containers/Profile/components/Form/form.container.js b/generators/app/templates/src/containers/Profile/components/Form/form.container.js
index ae10d74e..a9ed4ac4 100644
--- a/generators/app/templates/src/containers/Profile/components/Form/form.container.js
+++ b/generators/app/templates/src/containers/Profile/components/Form/form.container.js
@@ -90,7 +90,7 @@ export class ProfileForm extends Component {
    * onSubmit will send all the updated fields to POD
    * fields that was not updated will be not send it.
    */
-  onSubmit = async (e: Event) => {
+  onSubmit = async (e: Event, successMessage: String) => {
     try {
       e.preventDefault ();
       let node;
@@ -140,10 +140,11 @@ export class ProfileForm extends Component {
         formMode: true,
         isLoading: false,
       });
-
-      this.props.toastManager.add (['', 'Profile was updated successfully'], {
+      this.props.exitEditMode();
+      this.props.toastManager.add (['', successMessage], {
         appearance: 'success',
       });
+      
     } catch (error) {
       this.props.toastManager.add (['Error', error.message], {
         appearance: 'error',
diff --git a/generators/app/templates/src/containers/Profile/profile.container.js b/generators/app/templates/src/containers/Profile/profile.container.js
index b380aed1..d06e4d5f 100644
--- a/generators/app/templates/src/containers/Profile/profile.container.js
+++ b/generators/app/templates/src/containers/Profile/profile.container.js
@@ -21,6 +21,10 @@ const Profile = ({ toastManager }) => {
     const webId = useWebId();
     const [mode, setMode] = useState(true);
 
+  const exitEditMode = () => {
+    setMode(true);
+  };
+
     const onCancel = () => {
         setMode(!mode);
     };
@@ -50,7 +54,7 @@ const Profile = ({ toastManager }) => {
                                 }}
                             />
                         </Header>
-                        <Form {...{ mode, toastManager, webId, onCancel }} />
+                            <Form {...{ mode, toastManager, webId, onCancel, exitEditMode }} />
                     </LiveUpdate>
                 )}
             </ProfileContainer>

From 35de00885d47788531933b98f7c648ac41f9cf8e Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Thu, 11 Apr 2019 15:21:46 -0400
Subject: [PATCH 13/29] Updating style guide version

---
 generators/app/templates/package-lock.json | 49 +++++++---------------
 generators/app/templates/package.json      |  2 +-
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/generators/app/templates/package-lock.json b/generators/app/templates/package-lock.json
index 22f74e4e..c12800d8 100644
--- a/generators/app/templates/package-lock.json
+++ b/generators/app/templates/package-lock.json
@@ -2040,9 +2040,9 @@
       }
     },
     "@inrupt/solid-style-guide": {
-      "version": "0.1.26",
-      "resolved": "https://registry.npmjs.org/@inrupt/solid-style-guide/-/solid-style-guide-0.1.26.tgz",
-      "integrity": "sha512-EsK1Oc0jpUbW3cRaBsoSZkJY+z5Zc07XVEq3L4zm3zH6FcBpmUklHlHpabMC62U8wcDv74+LAxp3mAy5f6BahQ=="
+      "version": "0.1.33",
+      "resolved": "https://registry.npmjs.org/@inrupt/solid-style-guide/-/solid-style-guide-0.1.33.tgz",
+      "integrity": "sha512-NDkHFzJsVPgneR5ef3gB+gqympV3d+HH0Q+eLKxB6XFazD5dVUQvvalylu6CFnsMXRhtKMenOlkMFKqc3in7sw=="
     },
     "@jest/console": {
       "version": "24.3.0",
@@ -8434,8 +8434,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": false,
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "optional": true
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "aproba": {
           "version": "1.2.0",
@@ -8456,14 +8455,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "resolved": false,
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "optional": true
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -8478,20 +8475,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "resolved": false,
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "optional": true
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "optional": true
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "optional": true
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -8608,8 +8602,7 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": false,
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "optional": true
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
         },
         "ini": {
           "version": "1.3.5",
@@ -8621,7 +8614,6 @@
           "version": "1.0.0",
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -8636,7 +8628,6 @@
           "version": "3.0.4",
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -8644,14 +8635,12 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": false,
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "optional": true
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
         },
         "minipass": {
           "version": "2.2.4",
           "resolved": false,
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -8670,7 +8659,6 @@
           "version": "0.5.1",
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -8751,8 +8739,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "resolved": false,
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "optional": true
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
         },
         "object-assign": {
           "version": "4.1.1",
@@ -8764,7 +8751,6 @@
           "version": "1.4.0",
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -8850,8 +8836,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "resolved": false,
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
-          "optional": true
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -8887,7 +8872,6 @@
           "version": "1.0.2",
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -8907,7 +8891,6 @@
           "version": "3.0.1",
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -8951,14 +8934,12 @@
         "wrappy": {
           "version": "1.0.2",
           "resolved": false,
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "optional": true
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "yallist": {
           "version": "3.0.2",
           "resolved": false,
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "optional": true
+          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
         }
       }
     },
@@ -12413,7 +12394,7 @@
       "integrity": "sha1-CH52u+t+jcVmhrJdtOYMX/nbCR8=",
       "requires": {
         "is-stream": "^1.1.0",
-        "web-streams-polyfill": "git://github.com/gwicke/web-streams-polyfill.git#spec_performance_improvements"
+        "web-streams-polyfill": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded"
       }
     },
     "nopt": {
diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json
index 22955d4e..30563455 100644
--- a/generators/app/templates/package.json
+++ b/generators/app/templates/package.json
@@ -5,7 +5,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.6.3",
     "@fortawesome/react-fontawesome": "^0.1.4",
     "@inrupt/solid-react-components": "^0.4.0-rc",
-    "@inrupt/solid-style-guide": "^0.1.26",
+    "@inrupt/solid-style-guide": "^0.1.33",
     "@rdfjs/data-model": "^1.1.1",
     "@solid/query-ldflex": "^2.4.0",
     "@svgr/webpack": "2.4.1",

From 774cbae03b4e15ebcd09b48f6d9e4076a6785df8 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Thu, 11 Apr 2019 16:09:43 -0400
Subject: [PATCH 14/29] Adding margin to the notification container

---
 .../Utils/ToasterNotification/toaster-notification.style.js     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generators/app/templates/src/components/Utils/ToasterNotification/toaster-notification.style.js b/generators/app/templates/src/components/Utils/ToasterNotification/toaster-notification.style.js
index b26e3da3..b3821734 100644
--- a/generators/app/templates/src/components/Utils/ToasterNotification/toaster-notification.style.js
+++ b/generators/app/templates/src/components/Utils/ToasterNotification/toaster-notification.style.js
@@ -3,6 +3,8 @@ import styled from "styled-components";
 import { media } from '../../../utils';
 
 export const ToasterWrapper = styled.section`
+  //Temporary fix to a z-index problem with fixed headers
+  margin-top: 60px;
   min-width: 310px;
   &.toaster-wrap--primary {
     box-sizing: border-box;

From 1a589bc2c7f0ab0a6fcf5b8a6e76c7d658c03fe6 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Thu, 11 Apr 2019 17:12:21 -0400
Subject: [PATCH 15/29] Updating version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3c963f8e..d40d3dc7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@inrupt/generator-solid-react",
-  "version": "0.4.2-rc.0",
+  "version": "0.4.2-rc.1",
   "description": "Solid React Application Generator",
   "homepage": "https://solid.inrupt.com/docs",
   "contributors": [

From 8b252363ba303db2eb1a3f15bbd226ce22d6902d Mon Sep 17 00:00:00 2001
From: Jairo Campos <jairo.campos@janeirodigital.com>
Date: Tue, 16 Apr 2019 08:41:27 -0600
Subject: [PATCH 16/29] removed user name on navBar

---
 generators/app/templates/package-lock.json    | 54 +++++++++++++------
 .../nav-bar-profile.component.js              |  3 +-
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/generators/app/templates/package-lock.json b/generators/app/templates/package-lock.json
index 01c65a06..67277966 100644
--- a/generators/app/templates/package-lock.json
+++ b/generators/app/templates/package-lock.json
@@ -8434,7 +8434,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": false,
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -8455,12 +8456,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "resolved": false,
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -8475,17 +8478,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "resolved": false,
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -8602,7 +8608,8 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": false,
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -8614,6 +8621,7 @@
           "version": "1.0.0",
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -8628,6 +8636,7 @@
           "version": "3.0.4",
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -8635,12 +8644,14 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": false,
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "resolved": false,
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -8659,6 +8670,7 @@
           "version": "0.5.1",
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -8739,7 +8751,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "resolved": false,
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -8751,6 +8764,7 @@
           "version": "1.4.0",
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -8836,7 +8850,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "resolved": false,
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -8872,6 +8887,7 @@
           "version": "1.0.2",
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -8891,6 +8907,7 @@
           "version": "3.0.1",
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -8934,12 +8951,14 @@
         "wrappy": {
           "version": "1.0.2",
           "resolved": false,
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "resolved": false,
-          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k="
+          "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+          "optional": true
         }
       }
     },
@@ -12393,8 +12412,13 @@
       "resolved": "https://registry.npmjs.org/node-web-streams/-/node-web-streams-0.2.2.tgz",
       "integrity": "sha1-CH52u+t+jcVmhrJdtOYMX/nbCR8=",
       "requires": {
-        "is-stream": "^1.1.0",
-        "web-streams-polyfill": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded"
+        "is-stream": "^1.1.0"
+      },
+      "dependencies": {
+        "web-streams-polyfill": {
+          "version": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded",
+          "from": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded"
+        }
       }
     },
     "nopt": {
@@ -22596,10 +22620,6 @@
       "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.2.tgz",
       "integrity": "sha512-II+n2ms4mPxK+RnIxRPOw3zwF2jRscdJIUE9BfkKHm4FYEg9+biIoTMnaZF5MpemE3T+VhMLrhbyD4ilkPCSbg=="
     },
-    "web-streams-polyfill": {
-      "version": "git://github.com/gwicke/web-streams-polyfill.git#42c488428adea1dc0c0245014e4896ad456b1ded",
-      "from": "git://github.com/gwicke/web-streams-polyfill.git#spec_performance_improvements"
-    },
     "webidl-conversions": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
diff --git a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
index baa82657..7d7c38b6 100644
--- a/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
+++ b/generators/app/templates/src/components/AuthNavBar/children/NavbarProfile/nav-bar-profile.component.js
@@ -50,7 +50,7 @@ class NavBarProfile extends Component {
         }
     };
     render() {
-        const { t, img, open, customClass, name } = this.props;
+        const { t, img, open, customClass } = this.props;
         const { imageLoaded } = this.state;
 
         const profileOpts = [
@@ -82,7 +82,6 @@ class NavBarProfile extends Component {
                     />
                 </ImageContainer>
                 {!imageLoaded && <LoadingImage show={true} />}
-                <UserName>{name}</UserName>
             </Dropdown>
         ) : (
             <div />

From 1e5bd38c4d2a4bca28c5951f775d7b5a5e68a082 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Tue, 16 Apr 2019 13:10:02 -0400
Subject: [PATCH 17/29] Updating translations to reflect new SDK branding

---
 .../app/templates/public/locales/en-US/translation.json     | 6 +++---
 generators/app/templates/public/locales/en/translation.json | 6 +++---
 generators/app/templates/public/locales/es/translation.json | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/generators/app/templates/public/locales/en-US/translation.json b/generators/app/templates/public/locales/en-US/translation.json
index b6d2054c..ffcd996c 100644
--- a/generators/app/templates/public/locales/en-US/translation.json
+++ b/generators/app/templates/public/locales/en-US/translation.json
@@ -45,15 +45,15 @@
   "welcome": {
     "welcome": "Welcome",
     "doneMessage": "All done ?",
-    "title": "<0>This application was generated by the <1>React SDK for Solid.</1></0>",
-    "description": "<0>The <1>React SDK for Solid</1>  is a combination of libraries, components, documentation, best practices, and an application generator meant to accelerate the development of high-quality Solid applications:</0>",
+    "title": "<0>This application was generated by the <1>Solid React SDK by inrupt.</1></0>",
+    "description": "<0>The <1>Solid React SDK by inrupt</1>  is a combination of libraries, components, documentation, best practices, and an application generator meant to accelerate the development of high-quality Solid applications:</0>",
     "libraryList": "<0><0><0> Reusable Components </0>that you can use on your own in the applications that you build.</0><1><0>Application Generator</0>  that incorporates all of the components and best practices together for you, standing up THIS fully functional Solid React application. Note: The Solid React application illustrates the use of the components installed by the Generator. It should not be considered as a service provided by inrupt, and is subject to change.</1><1>Best practice patterns that you can reference as examples of how to accomplish particular things.</1></0>",
     "fairUsageTitle": "Fair Usage",
     "fairUsageText": "The Solid and inrupt logos included in the Generator are for the purposes of example and attribution. We expect application developers will fork the design system and customize to include your own brand in your Solid application projects, or override the example theme in your application code.",
     "fairUsageExamples": "<0><0> If your application is Solid compatible, you can use the Solid logo to indicate that. If not, please don’t misrepresent yourself by using the Solid logo.</0><1>Please don't use the inrupt name as a part of your company name, website name, domain name, service name, or app name. Don't use our logo as your own or modify it to fit into your own logo.</1><2>If you’d like, you may use the inrupt logo to indicate that your application is powered by inrupt’s SDK, but please make sure the context is clear to the user. Your own logo should always be larger than inrupt’s logo, for example.</2></0>",
     "fairUsageSummary": "In general, please apply common sense and honesty to your use of Solid or inrupt logos. Don’t use either to imply a partnership or official endorsement where none exists.",
     "contactUsTitle": "Contact Us",
-    "contactUsText": "<0>If you have additional questions about the use of the React SDK for Solid, the Application Generator, or inrupt’s brand, please contact <1>support@inrupt.com<1>.</0>",
+    "contactUsText": "<0>If you have additional questions about the use of the Solid React SDK by inrupt, the Application Generator, or inrupt’s brand, please contact <1>support@inrupt.com<1>.</0>",
     "evolvingMessage": "<0>The SDK is continually evolving. Take a look at the <1>Release Timeline</1>  for what’s been implemented as part of the previous releases, and what's currently planned.</0>",
     "implementing": "This latest release builds on the prior versions:",
     "version010": "<0><0><0>Internationalization</0> best practices, with application session language selection.</0><0>Ability to update your profile image on the Welcome page.</0> </0>",
diff --git a/generators/app/templates/public/locales/en/translation.json b/generators/app/templates/public/locales/en/translation.json
index b6d2054c..ffcd996c 100644
--- a/generators/app/templates/public/locales/en/translation.json
+++ b/generators/app/templates/public/locales/en/translation.json
@@ -45,15 +45,15 @@
   "welcome": {
     "welcome": "Welcome",
     "doneMessage": "All done ?",
-    "title": "<0>This application was generated by the <1>React SDK for Solid.</1></0>",
-    "description": "<0>The <1>React SDK for Solid</1>  is a combination of libraries, components, documentation, best practices, and an application generator meant to accelerate the development of high-quality Solid applications:</0>",
+    "title": "<0>This application was generated by the <1>Solid React SDK by inrupt.</1></0>",
+    "description": "<0>The <1>Solid React SDK by inrupt</1>  is a combination of libraries, components, documentation, best practices, and an application generator meant to accelerate the development of high-quality Solid applications:</0>",
     "libraryList": "<0><0><0> Reusable Components </0>that you can use on your own in the applications that you build.</0><1><0>Application Generator</0>  that incorporates all of the components and best practices together for you, standing up THIS fully functional Solid React application. Note: The Solid React application illustrates the use of the components installed by the Generator. It should not be considered as a service provided by inrupt, and is subject to change.</1><1>Best practice patterns that you can reference as examples of how to accomplish particular things.</1></0>",
     "fairUsageTitle": "Fair Usage",
     "fairUsageText": "The Solid and inrupt logos included in the Generator are for the purposes of example and attribution. We expect application developers will fork the design system and customize to include your own brand in your Solid application projects, or override the example theme in your application code.",
     "fairUsageExamples": "<0><0> If your application is Solid compatible, you can use the Solid logo to indicate that. If not, please don’t misrepresent yourself by using the Solid logo.</0><1>Please don't use the inrupt name as a part of your company name, website name, domain name, service name, or app name. Don't use our logo as your own or modify it to fit into your own logo.</1><2>If you’d like, you may use the inrupt logo to indicate that your application is powered by inrupt’s SDK, but please make sure the context is clear to the user. Your own logo should always be larger than inrupt’s logo, for example.</2></0>",
     "fairUsageSummary": "In general, please apply common sense and honesty to your use of Solid or inrupt logos. Don’t use either to imply a partnership or official endorsement where none exists.",
     "contactUsTitle": "Contact Us",
-    "contactUsText": "<0>If you have additional questions about the use of the React SDK for Solid, the Application Generator, or inrupt’s brand, please contact <1>support@inrupt.com<1>.</0>",
+    "contactUsText": "<0>If you have additional questions about the use of the Solid React SDK by inrupt, the Application Generator, or inrupt’s brand, please contact <1>support@inrupt.com<1>.</0>",
     "evolvingMessage": "<0>The SDK is continually evolving. Take a look at the <1>Release Timeline</1>  for what’s been implemented as part of the previous releases, and what's currently planned.</0>",
     "implementing": "This latest release builds on the prior versions:",
     "version010": "<0><0><0>Internationalization</0> best practices, with application session language selection.</0><0>Ability to update your profile image on the Welcome page.</0> </0>",
diff --git a/generators/app/templates/public/locales/es/translation.json b/generators/app/templates/public/locales/es/translation.json
index e1920df6..e14d0ea2 100644
--- a/generators/app/templates/public/locales/es/translation.json
+++ b/generators/app/templates/public/locales/es/translation.json
@@ -45,15 +45,15 @@
   "welcome": {
     "welcome": "Bienvenido",
     "doneMessage": "¿Terminaste?",
-    "title": "<0>Esta aplicacion fue generada con <1>React SDK for Solid.</1></0>",
-    "description": "<0>El <1>React SDK for Solid</1>  es una combinación de librerias, componentes, documentación, buenas prácticas y un generador de aplicaciones diseñada para acelerar el desarrollo de aplicaciones Solid de alta calidad:</0>",
+    "title": "<0>Esta aplicacion fue generada con <1>Solid React SDK by inrupt.</1></0>",
+    "description": "<0>El <1>Solid React SDK by inrupt</1>  es una combinación de librerias, componentes, documentación, buenas prácticas y un generador de aplicaciones diseñada para acelerar el desarrollo de aplicaciones Solid de alta calidad:</0>",
     "libraryList": "<0><0><0> Componentes reutilizables </0>que puedes utilizar en tus propias aplicaciones.</0><1><0>Generador de aplicaciones</0>, incorpora todos los componentes y las buenas practicas en una misma aplicacion para el desarrollador. Nota: La aplicaciones Solid React, muestra el uso de los componentes instalados por el generador. No debe ser considerado como un servicio que Inrupt provee, y está sujeto a cambios.</0><0>Patrones de buenas prácticas que puedes referenciar como ejemplos para lograr resolver diferentes situaciones.</1></0>",
     "fairUsageTitle": "Condiciones de uso",
     "fairUsageText": "Los logos de Solid y Inrupt incluidos en este SDK son exclusivamente para ejemplo. Esperamos que los desarrolladores que utilicen nuestro SDK para propósitos comerciales los actualicen con sus propios logos.",
     "fairUsageExamples": "<0><0>Si su aplicación es combatible con Solid, usted puede utilizarlo para indicarlo, de lo contrario no usarlo.</0><1>No utilice el nombre de Inrupt como parte del nombre de su empresa, sitio web, dominio,  servicio o nombre de la aplicación. No modifique o utilice nuestros logos como suyos.</1><2>Si lo desea, puede usar el logotipo de Inrupt para indicar que su aplicación funciona con el SDK de Inrupt, pero asegúrese de que el contexto sea claro para el usuario. Por ejemplo su propio logotipo siempre debe ser más grande que el logotipo de Inrupt.</2></0>",
     "fairUsageSummary": "En general, aplique sentido común y honestidad a su uso de los logotipos de Solid o Inrupt. No utilice para implicar una asociación o respaldo oficial donde no exista.",
     "contactUsTitle": "Contáctenos",
-    "contactUsText": "<0>\nSi tiene preguntas adicionales sobre el uso de nuestro React SDK for Solid, el Generador de aplicaciones o la marca de Inrupt, contáctese con <1>support@inrupt.com<1>.</0>",
+    "contactUsText": "<0>\nSi tiene preguntas adicionales sobre el uso de nuestro Solid React SDK by inrupt, el Generador de aplicaciones o la marca de Inrupt, contáctese con <1>support@inrupt.com<1>.</0>",
     "evolvingMessage": "<0>El SDK se encuentra en constante evolución. Revisa el <1>Calendario de Desarrollo</1>  para lo que está planeado.</0>",
     "implementing": "Esta última version se basa en las anteriores, incluye:",
     "version010": "<0><0>Mejores prácticas para la <0>Internacionalización</0>, con selector de lenguaje para la sesión.</0><1>Habilidad para actualizar la imagen de perfil en la página de bienvenida.</1> </0>",

From 5af08ef542d50fc00d02f3750336f6ba113bd678 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Tue, 16 Apr 2019 14:22:40 -0400
Subject: [PATCH 18/29] Removing height: 100% at designer's request

---
 .../templates/src/components/Utils/Dropdown/dropdown.style.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
index 2ea166a4..31da32bc 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
@@ -4,7 +4,7 @@ import { media } from '../../../utils';
 
 export const DropdownContainer = styled.div`
   position: relative;
-  height: 100%;
+  height: auto;
   width: 100%;
   padding: 0 !important;
  

From 0181fe82abc49d37534841aedb75fc74baed0d62 Mon Sep 17 00:00:00 2001
From: Pablo Rodriguez <pablo.rodriguez@janeirodigital.com>
Date: Tue, 16 Apr 2019 14:42:24 -0600
Subject: [PATCH 19/29] menu showing while not logged in

---
 .../components/NavBar/nav-bar.component.js    | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/generators/app/templates/src/components/NavBar/nav-bar.component.js b/generators/app/templates/src/components/NavBar/nav-bar.component.js
index ffb18145..71a71bc7 100644
--- a/generators/app/templates/src/components/NavBar/nav-bar.component.js
+++ b/generators/app/templates/src/components/NavBar/nav-bar.component.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, Fragment } from 'react';
 import { Link } from 'react-router-dom';
 
 import {
@@ -15,28 +15,28 @@ type Props = {
 
 const NavBar = (props: Props) => {
     const { navigation, toolbar, sticky, t } = props;
-    const [ isOpenMobile, setOpenMobile ] = useState(false);
+    const [isOpenMobile, setOpenMobile] = useState(false);
     const [profileOptions, setProfileOption] = useState([]);
     let componentElement = React.createRef();
 
     const setNavFixed = () => {
         if (componentElement) {
-          const navHeight = componentElement.clientHeight;
-          const content = document.getElementsByClassName('contentApp');
-          if (content.length > 0) {
-            content[0].style['margin-top'] = `${navHeight}px`;
-          }
+            const navHeight = componentElement.clientHeight;
+            const content = document.getElementsByClassName('contentApp');
+            if (content.length > 0) {
+                content[0].style['margin-top'] = `${navHeight}px`;
+            }
         }
     };
 
     const onComponentResize = () => {
         setNavFixed();
         window.addEventListener('resize', () => {
-          setNavFixed();
+            setNavFixed();
 
-          if (window.innerWidth >= 1024 && isOpenMobile) {
-            setOpenMobile(false);
-          }
+            if (window.innerWidth >= 1024 && isOpenMobile) {
+                setOpenMobile(false);
+            }
         });
     };
 
@@ -49,13 +49,15 @@ const NavBar = (props: Props) => {
     }, [props, isOpenMobile]);
 
     const toggleMobileMenu = () => {
-      setOpenMobile(!isOpenMobile);
-    }
+        setOpenMobile(!isOpenMobile);
+    };
 
     const getUserProfileOptions = () => {
-        const profile = toolbar ? toolbar.filter(bar => bar.id !== 'language') : [];
+        const profile = toolbar
+            ? toolbar.filter(bar => bar.id !== 'language')
+            : [];
         setProfileOption(profile);
-    }
+    };
 
     return (
         <header
@@ -69,9 +71,8 @@ const NavBar = (props: Props) => {
                         <img src="/img/inrupt.svg" alt="inrupt" />
                     </Link>
                 </div>
-                {navigation && <Navigation navigation={navigation} />}
-                {toolbar && <Toolbar toolbar={toolbar} />}
-                {navigation && toolbar && (
+
+                {isOpenMobile ? (
                     <MobileNavigation
                         navigation={navigation}
                         toolbar={toolbar}
@@ -80,8 +81,17 @@ const NavBar = (props: Props) => {
                         t={t}
                     >
                         <Navigation navigation={navigation} />
-                        <Toolbar toolbar={profileOptions} open={true} customClass={'profile-list'} />
+                        <Toolbar
+                            toolbar={profileOptions}
+                            open={true}
+                            customClass={'profile-list'}
+                        />
                     </MobileNavigation>
+                ) : (
+                    <Fragment>
+                        {navigation && <Navigation navigation={navigation} />}
+                        {toolbar && <Toolbar toolbar={toolbar} />}
+                    </Fragment>
                 )}
                 <HamburgerButton toggleMobileMenu={toggleMobileMenu} />
             </section>

From bd94a04cde571b1df96025b8c95fb5c13036d1ff Mon Sep 17 00:00:00 2001
From: Jairo Campos <jairo.campos@janeirodigital.com>
Date: Tue, 16 Apr 2019 15:07:36 -0600
Subject: [PATCH 20/29] fixed mobile issue on firefox

---
 .../templates/src/components/Utils/Dropdown/dropdown.style.js  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
index 2ea166a4..47f475e6 100644
--- a/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
+++ b/generators/app/templates/src/components/Utils/Dropdown/dropdown.style.js
@@ -21,7 +21,6 @@ export const DropdownMain = styled.button`
   position: relative;
   border: none;
   background: none;
-  height: 100%;
   width: 100%;
   padding: 0 16px;
   margin: 5px 0;
@@ -31,6 +30,7 @@ export const DropdownMain = styled.button`
   &:focus {
     outline: none;
   } 
+  ${media.desktop`height: 100%;`}
 `;
 
 export const DropdownItemContainer = styled.div`
@@ -51,6 +51,7 @@ export const DropdownItemContainer = styled.div`
   }
   .profile-list & {
     position: relative;
+    top: 0;
   }
 `;
 

From 4453b05938f235a919ae15d4e0c09f405ce3220d Mon Sep 17 00:00:00 2001
From: Pablo Rodriguez <pablo.rodriguez@janeirodigital.com>
Date: Tue, 16 Apr 2019 15:19:09 -0600
Subject: [PATCH 21/29] solid-style-guide v0.1.34

---
 generators/app/templates/package-lock.json | 6 +++---
 generators/app/templates/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generators/app/templates/package-lock.json b/generators/app/templates/package-lock.json
index 01c65a06..c1d84921 100644
--- a/generators/app/templates/package-lock.json
+++ b/generators/app/templates/package-lock.json
@@ -2040,9 +2040,9 @@
       }
     },
     "@inrupt/solid-style-guide": {
-      "version": "0.1.33",
-      "resolved": "https://registry.npmjs.org/@inrupt/solid-style-guide/-/solid-style-guide-0.1.33.tgz",
-      "integrity": "sha512-NDkHFzJsVPgneR5ef3gB+gqympV3d+HH0Q+eLKxB6XFazD5dVUQvvalylu6CFnsMXRhtKMenOlkMFKqc3in7sw=="
+      "version": "0.1.34",
+      "resolved": "https://registry.npmjs.org/@inrupt/solid-style-guide/-/solid-style-guide-0.1.34.tgz",
+      "integrity": "sha512-vfjVRYz+lyscskzDJGT5vjpjqNOwKUQXIB8NgUVwoO8aknmecHDenRep1X/kwYf+RvSibjNbH/0bwm3jVbhjIQ=="
     },
     "@jest/console": {
       "version": "24.3.0",
diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json
index 0aecda53..cbcea0b3 100644
--- a/generators/app/templates/package.json
+++ b/generators/app/templates/package.json
@@ -5,7 +5,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.6.3",
     "@fortawesome/react-fontawesome": "^0.1.4",
     "@inrupt/solid-react-components": "^0.3.2",
-    "@inrupt/solid-style-guide": "^0.1.33",
+    "@inrupt/solid-style-guide": "^0.1.34",
     "@rdfjs/data-model": "^1.1.1",
     "@solid/query-ldflex": "^2.4.0",
     "@svgr/webpack": "2.4.1",

From f3c8f6c09c2c14ae4590af401121a635845eb763 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 17 Apr 2019 14:34:51 -0400
Subject: [PATCH 22/29] Updating favicon

---
 generators/app/templates/public/favicon.ico | Bin 32988 -> 113173 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/generators/app/templates/public/favicon.ico b/generators/app/templates/public/favicon.ico
index 283a83a98394ad0ef5c00797979c463164895c44..ef5bb772a8c00ad089f61b950431857d890eb1ac 100644
GIT binary patch
literal 113173
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
Jx=j9@e*mdEl<)um

literal 32988
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
F_&>A;!Gr(+


From 49bf6090daffdc7235b2b6051f6479996b79835f Mon Sep 17 00:00:00 2001
From: Pablo Rodriguez <pablo.rodriguez@janeirodigital.com>
Date: Wed, 17 Apr 2019 13:22:59 -0600
Subject: [PATCH 23/29] i18n placeholders

---
 .../Profile/components/Form/form.component.js | 45 ++++++++++---------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/generators/app/templates/src/containers/Profile/components/Form/form.component.js b/generators/app/templates/src/containers/Profile/components/Form/form.component.js
index 9c61f486..ad940890 100644
--- a/generators/app/templates/src/containers/Profile/components/Form/form.component.js
+++ b/generators/app/templates/src/containers/Profile/components/Form/form.component.js
@@ -31,29 +31,32 @@ export const FormUi = ({
         <Fragment>
             <Form onSubmit={e => onSubmit(e, t('profile.updateSuccess'))}>
                 {formFields &&
-                    formFields.map(item => (
+                    formFields.map(item => {
+                      console.log(item);
+                      return (
                         <Input
-                            key={item.label}
-                            placeholder={item.label}
-                            name={item.nodeBlank || item.property}
-                            value={getProfileValue(updatedFields, item)}
-                            onChange={onInputChange}
-                            icon={item.icon}
-                            readOnly={mode}
-                            required={item.required}
-                            data-nodeparenturi={item.nodeParentUri}
-                            data-nodeblank={item.nodeBlank}
-                            data-label={item.label}
-                            data-icon={item.icon}
-                            type={'text'}
-                            onInvalid={e =>
-                                e.target.setCustomValidity(
-                                    t('profile.nameRequired')
-                                )
-                            }
-                            onInput={e => e.target.setCustomValidity('')}
+                          key={item.key}
+                          placeholder={t(`profile.${item.key}`)}
+                          name={item.nodeBlank || item.property}
+                          value={getProfileValue(updatedFields, item)}
+                          onChange={onInputChange}
+                          icon={item.icon}
+                          readOnly={mode}
+                          required={item.required}
+                          data-nodeparenturi={item.nodeParentUri}
+                          data-nodeblank={item.nodeBlank}
+                          data-label={item.label}
+                          data-icon={item.icon}
+                          type={'text'}
+                          onInvalid={e =>
+                            e.target.setCustomValidity(
+                              t('profile.nameRequired')
+                            )
+                          }
+                          onInput={e => e.target.setCustomValidity('')}
                         />
-                    ))}
+                      )
+                    })}
                 <FullGridSize>
                     {!mode && (
                         <>

From 3749206c1ddee85faf916e1400f7e05697513a1d Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 17 Apr 2019 17:46:08 -0400
Subject: [PATCH 24/29] Updating the favicon

---
 generators/app/templates/public/favicon.ico | Bin 113173 -> 10462 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/generators/app/templates/public/favicon.ico b/generators/app/templates/public/favicon.ico
index ef5bb772a8c00ad089f61b950431857d890eb1ac..21c9c8211e9eda51182bbf7613dd98af1e22a7f2 100644
GIT binary patch
literal 10462
zcmeI2eM}rh6u^gEQd0e+_8(#+5fe@9hZ@V>-T`8fMk?}gAJFBl)+W|8A{G)qN}E_M
zXrfK3HcgsnY%%&rO&V=$G`0pm(jzUTwm^GO5}S78MH2rI+1umb__#ZsZ|`m`Y-YB5
z#~zx?9lU$Y?97|_z1cT2I}0Is_)}a=@cRLBX)PfIgb-8&v&b$KIbZ(V^DrR~K9-Pp
zM(!);ft&|&9$<I?-fUPiyT6v7eFx<r%AsmL{1M90Dn9%%N*BuKoB7a}C?_lU(AOwu
zP`*X^zMK#JSk6nopm<9YashQ8%CA;_s^7eZ(X8Rwk$v{lb8poFa=^^{H869i8m13F
z1Jg&hK=_j?nCf~OroPw=lP4-+^5j#191!|u6NJ9o1QTbUgo*BQ2>$#81kaa2u%{HH
zizOiSp<J?obeTJ4c!wzlBd^;l=l0nla~xKXuGp$5O&gX4Ja3A;=I~{jBhYX4!B@P=
zu#T$?#dbSekOP*11H?h=%c|xLNkU8Q>S&vDY`HiBgWQ-jRKD7f&Mz<$X?7inwmN~q
zF*bd;TEI9LFwO;xa{=RA2%V@DaJ~{S&IOEf0pnc2I2SO^1&nhc=q(e1J!NBy<J<~(
zUjcGJ;3{`yK^K<%C%n+OHrm`U$KVK0e^^tLZX@I8ZH34&d3(NE#1R?4#%)N~wz}T@
z&c<`d0W^;3_i8%T<x@=uE|hdKI3VETeoECItvqbsS{K{d2n>!<_+ZQ3w0f!JjrNtU
zL=Jyq{a7>}5V*#HIBc#>#h$t>&a*4#pXYyLa=csXQP)W~9qcRJ#^e~X+=QDC<)>>K
zJWYF$0~j2=0QhKQ;0HN+q|21?7_z|lu=$O2ngZ930&q7;435~`+x1*JcD3pR`bsw<
zM{L1-mAJ2vLmakD{58Vet5u(N4P2gM$N>zFE?ONU@^G*C8G{4F>y}SbX#<?kJ&qhv
z2FHZF-%Z6{DrG~xWd+C~CD)II;~{gzq+zQ?uRU;jyvPA`4tu*^JL#5_u2}anIAoTK
zdg2ls9yf9TgX0#oJ)8Etp_dCrHmpF78@QgU$3y18nCF_bY~eh+5*dDHa<n<>wdxyr
zEih=YvpA6Dk3aj(cd^<7m-|4RfjS<pZdSca<%?G>-SKrWF<-^ULLLuU0wdf3TDwrk
z--is7435a`OO8ir^)i|F_dv-y<d_pF9O8&2ERLA(SGNxh+Y6Clip2rV{CahrOsB^O
zZR?RELglz_nHu-m3Tb`FhWkq9O2)ZAJ|?tzceksK#-E8iae%AWi1SgcIFGZq+#V)J
ztMmUd@4EH)4qV%M80!Z_UUlrzV`C|0qycNY#yY5be+qWb#%$P^B=4`|^nD4Qm+Y-S
zz7&6J)x|wY7ki&*KBiTdcI}S)_Wd=w_iHr!w7g90+vRq^&9^i5?eck|?)#M1XIh^2
za}<|$Tqd7uZ!n$*@qD*V*StaNvpO%>Yx8J4*WOynbFJJK>}aZIbJQ-=IYY4_>(=~>
zTYq4jm%!}7nhv#ZQ%x_&xlepdcDdI5SLbk|&+<sBe$gtQ4d<fqG0Bp1YMCY0>Uf25
zPHo`(sKoh|ILNhV-5*Q2hVyV%yvLD!kPYwEl(EG3oM$rke$aMWX(!V<Ti!co+D|$A
zIS=GKV5|oq{_&DK>KQ`v0m~^`BE%%8{rLZO3$+*fC#MzNSplR2)14joi<+RW@RE6K
z(OZ<ze$>%C0RJk~CIAWbjI8rf=L5``yhKWB|0;lJo|pKG0OnD9Wle5tC0{A0)Klyz
lc9nLNcIE!a{ZRU)^z+|-D;x@!qWvm<#V?AV6s^<G{{X4LrSt#*

literal 113173
zcmeF31zc2F-^Yhm5D<$76%`c~m5>HOvBjh%L;*!YP&$TIL{L#_5Jj;FMY=%=C8ay1
z83u+aCeC{YR##lz-Dh{7*nRK$e9qiD_uTXU{_g2>2Z5kNFe7M=4zU`MAc;VjLi<SM
z{PD&`bO?4S1VTmSr(;zFLQ0Viv3>je@zeDP#2F9h&ecC1FGV1j9@8O~LR(sV=8OnL
zVj3Od`mv+?*jf2lp{Usp?B8>Oc9rIr(jL8}?+O%+q}72vyH7c`O>~+Wo!Z;(KQ$KB
zS!LzCe^H))(0;CwGZ)rATpi$rTy4Jvsg01|?8TJA!1{2t*P?4H*jBGSeXC1vSSnsr
zuZFayZpg_^<w8XO*~9SucuaVfnSHB-%X`JuYhm{vAz-Vs^QFFr`<k@!iuDMKSke?5
z0v}fS7V}KT)xB~P(wV6}meIz?cbwJUZ10{u>-;H~#9wwuOd22`3s<4(8RbYXqP5<w
z6evTS{m2^4n0ax}BLjp&k&lss?w&mZ2hFI&>jRt0L>XSj$WE#u3!h=yr$F_tay>yK
zBCa(A@o_fVo;fEKvh+@W@M2^}T+a4FPW)kA_FF3>@_SE6+SpVF`6HU-+_#ITZ{y<P
z%95mJG8;8#6x?JEdyQ+{iV)Jk^&V<H_9m}qIU;X}gS2e5{rS2bMX20s*UFWHqVGld
zY^{D-Pd$(_v<<(^Bgal$NVg(T!rd!dV{fi?!Q!=@gWDbr^F~~beV@JDsDe7e3&ogz
z6;&0L(_oU&gxHciTSbpdPsUp@8S$S3N*?<(A+ut|9)|*C8lCf*oT2PDdFU|)-dA0j
zcH+W)(uO<iOBNYcJnMCd6ZT!KSkGwG`QEpNVZ7ji#Q}s;4=#83)=IOjjM^cDPB|nW
zb&#Fz;ISRT{-^isp^mSqNy?DeT%3MS=bl?Ta_^gRr+1la96~BQE-45UX2xhC!l=Mv
zr~3!WJ{?5Y2V#G}<tOW#xeN!(d<3>Dv)WsOtd~iZecJ<%$kZvjY`7E_yK+QqkxARV
z%X^x9<!~v&<CGeME|RPi&mwOTj@;Wy{05fJ@$OAmYu9hKPqpJ*kyUfNj+}fQ*=d@}
zO}AY-;<0V4#jQ|5NsU$|`t6j#+#Zg!Yu6Cxf)>qWJm0PR#3S<_tE<NCD6PQGtVjWh
zNq;}0bd!ZL0tF01df!v_@gVQXD=xZ};#arIoUg;3nPXZ`&nQ)V%%?!v)nVPcp%Df>
ziP!H5*4{2BSt)(aOr!Q3;3M@4wJc-e(|83n*{FDS`Hj~haZZs>r-S6<NEw%3L?^Cx
z&P;qT)$B5?HshTzxmkM07B<xIs~lV1<vgkVEg!e+QYgrC>_t!YJUzFko~3ehBH}K~
z#>Ui->lKH9nfkRl?w$yS#9{<%x4~dDS=a!2qfQ8BmC3J7VL-WC2a8#*Um|N?8-APJ
z(Ed<ce-JV!zpZoUgj35Y<*{vGD^a++op)dRxg)*|b_$0W3=8XXZg8++RA+4T1p5`-
zBX(H`Hj2h8b;zx=w<|wPcse$vmpW9KU0!ME<_RvD$uSt0(doYJtm7+e-FRuY!Idqe
zQ(lJjlG=4sM-X~UF8)6yXrk?|TZXa_PGPKT%$l`^bCb|=Dv#?$4M$PijRM<xqDM45
zlQp80My#SdE^k%5?H;|0?MdQ+hzVxYwZO=+TrR%moBAV*qCDK<GI*7mO6vJ<9Ay`0
zr)piO(sy*5<=S~jrSx^-sk2luu47Y^Vq55+;*OSFL|9mp<2Vr*UXLAu65Wy?=o=Kf
z>^G`Z`cE-othJ%6Z%ZI+vbZy}kKIk++7b~uiq2)W;6C4BCheu-cQq>e*ib9_I<5?(
z6thGG9skKUqgzo|ag61fm9dybgKs{GmHo;+Iz6de$sF|T2i(<&!DO3mFI5-)3Upm*
ze|@T<-{k0Hg^>}Wp%X&jo!#_|WVfvg4^l$x(!k?kqi4mZ^$}^Y7p24|{ZB#}uu@ln
zKkZ{3t2*(Z+1_=9uUCz@<@p-x5NDXWKGqJVnd_CWGhe|)j59gZRn{+ViZvBnr!`ez
zX6bW{l73m8=WWt!L22b&!tBkxr`GcI31@I_Z}u)oY>fVND{8o46S|UjC*7*B(~eRq
zkNoA+8B+3$`EA#*x99k-V~}(v-9LcfDkxp|iDDCQ?OIeg5y9|`F@rrI=iP`;<C?}<
zZggRQZDVO^E@!Oz1_c4)vOT_$34t%Bm13UCL^kh7(rMmqFYzn%oJCDC^!JuL7Y#U%
zEg;MWN6onNx3F8U6F74pD=pa~WZcTKThzfbrdr42)hd<f9hNZ&8!JwJ_MV{ky6#Hs
z{xt!*EXS0dnN|mR$TVWyWgv;D5sH4;jz#y<GgCe(U`6&Kj}QgQnUmJ8YFlx0Tc0*d
zmGoZ4-eLM!A^8LLoWo5!lTyVvo(C_cRN60jsy^I`Zv(yUMW-u0>$(MQR86amp7Pk!
zV>YanTAstTX(`3mGT`{Q_y)x7#Iu43cD<_tw@3}h0&84gz!2sZghF4sQY5hFqNCM?
zDJx^Up1~%0`-F6Vt%CxnTbGw98JuZab(&lCMR>~W<e1*nUgvbYI*+i^*+V$SOgqyK
zwWQM8zC8o|Yw|m8O51L;TMQNU6&70Di}fxV(&Yub3${=6<65&X;(R{CglL(heTJW|
zu;0yB-DEsAaM*d^{>zf3GDc_Amh-%M{gf-6TeYN;=MG4X-hhCr7J$G_ue0UuP|m77
zlcb9F#hl6+52zKtmARU-ZPAS#{u0>9u>%KjSuY)odb-w%`&N1SY)|-bSV_&L2!$><
z-NWax7a16Kw-~{@E5Vhi$NH1UX!85Lf!Bo=EtSnvIgP-Cbv-QTJ21mc;QA=2lh!(A
zDE_v7@oL+%+6t$OE(cRQZ)8QQCvAzz)8r8^s@U#u+(IT^5fy#uG}9QPi!5_tV^*X(
zLuOlx>IkRr6M5yG-Cijx(-T^_#|_FqJ=f+eQ%Mza6);4NlpiCc9a7(GD8G7{_;PB#
zD}f``v)6~?>RC-$2RgHgB0^c$dN;LcF~p05HDZz6f~+IMxqJ_%`i?eki+3GFH%!vG
zv+2mN7k0|Oc=!04*q~7y36bQURbh@G-MwWnbYffW`)+~NPBV*__n^DZoTS6e=nJ#k
z5J-xGbg%0rwjd^j@TU+KHa*0G=gm`3#&#nYSyw6`Sp_Y2F+H8ur))qliLEGLC|q?R
z*>=;chqRdbHa0q$mXX35#7n7Vc81yEsKOVe)|cokB5t#)+^^$9ZhcwaTA6!qT@ON7
z*QIFG+?DZIn(Djeo7Fa_A6(pPN_G=yV*bE(>*Jb4PBx=<bl#y%Va<J30jwSLBqe#t
zlIIMqdU=nhyst*q(G~JoJ~8oUDYi~D*7SaX+7x`*Z<aIP_2DjKv|X{ED8tI4i{>-y
z7MGi5r*RkZEGd)|F>|`4JUMt*()M+fxbbQvHf%?18C@Wj%osm-Znt=g($0n!4$Gqr
zSHfGJh(VuPbjMqwRHVte<0>STGbtPRZrJr(2D8Xip0E(HdFv>XvERznzW*X(jQKvj
z%}lTWTAA*a=}f%H-3cLy@{UDE9740}?R$#*6(prZDlc*>C&{7jPiid+Oh>)qK&F)v
zC`pgXZ2K=RDl{IP7P5Jp8F3j=P{1i`5h@efPD0b`XT%Td1%)4T)HA<q^0Bo&V;S+5
z$*rittWI5)NVOAUM8TBjb<et#*rYo{Msdx)Z>IBe5+@5WA&q{VMSPV!2kCfZFPvSb
zLvQrL#G-0!sZuqL$3ZQe-gw^;&ITZ3pCiI|@$OCchV(@N+Z;F~@JI^XBSnWn%8+qW
zc1X9&V9^xP;pFNe{!|Opp{z|VH!mVYrJZmrR?P2rtQYSK!!>L&!)agRHBq+GR196F
z{;9*mhoK`|M!L<3<t;~w<xaoBPDh=^fhPQyh9jj4yE*LrOf9F&isRNzx>1LEs<rw@
zGfP!+%cu`;hkj@wKHa@Ua>Lmq2J^#=K}Fo!%@{L}5#{B`_yH}tRYxLi57@u-SVh&l
zEBIgsw+x-*)~now;+!>6jJKqBjtu)YV9Xv*CT8<LIEZyVZOc56EQ;{YZ^;ts$w(27
zWol7!xN3*I`zFK=@sgAnm7I`FO)#&Xtbb0%mYM2TCx##J4SvJYV(19vBH?i5B@d43
zk8MFdNxqWBT&P*qbx$E>EjctFAr@<3z+1Spl1nz3$1r8(%Uw5LHSzUakQhSUswzE%
z&^#^TK!3sIdPU*3eytDm7FkntDhcHrFGd)(j;B4G;+`NmFmFbX-#C6c)5NE}onYpF
zmDS!oJhP>ZNt4NL=St)ylb2YzV@-~1h3|JN(`|oPxxtU&HNT_#lWhogSvA(@3@d}X
zE%O*pD(PvrgGJh@+Eqg;eyxqu3_LIBUecF3AlC7=+a8QCL}+&p7znsLBC@s9Raz&W
zE_6_rRC)LI?7K?wICiO6sR|dp7`b%0?QBYkuLo~AtVf64jw0oE*0`tm@mOpXM?bsm
z68h?uGXAmxGOfHkYol|))CCk~j86MfZiSq=(yMX3^!5jv9;4oz*%Rge<cU9%74o`C
zy4!#(B7c#^jZbv5yjh_#yahvRDtN(~QhOX-EYGCw2Y|^ZD{<Y>U%Ioqg|$(=^ldB3
ztJuf(34zR#xMfwbLyh33-cI(^JpT<YEJgS4J?p1DE;78H*t9I=`5lbAhta^xAl*`)
zw>&*|{rC$O)%_eM%aPdBDJ2F^?SAR8#VyMtTbp8;*!D%eb_!O#?QmvSILm{gBd^#5
z)p~IZd-eR{Ri536iyLHc!aIezl~h<LVvJ5!RMxo3K0D{3%%Qo-ft+7OAu$Si+LjWf
zFCTs46oR@M%7_}`c9#uZ=8+4q2;IPIF9l94JNxQ(=yK$8<9svv#kDU9_u~iZZ?)AI
zY)D}ZEH33#U(=%8s<`XeV!zW{bT;R%$+YJo>D+gi8jun+r1Fb)`rkpgw-FyR7}bwH
zCegV%I62U##AIMZf*MvOv@vXPz5Lz+!NNHqz*;+%@6SxP$BidLxy9t_CIMbIvZaz=
zutdHj!|fES=_db7b~5x1ZV^`La@}1~(4N1Ix0%_#_^E9BiH<WyRWtG8u60Wt?`;?3
z+IW^=mtGlJ(|mgw%7J0MacRyz&CFfJ<O<OMm-{OCu)b#bZvV)PRry=vSFhM_*KzU6
zVx0LIr<d-Py^C_Kh4{l2mncvY*EGG@POP6MJ<9id*PPHbWXU)=BZt$|-1tUMuwH82
z;v`YleJS1ri-=Q?23{}Q&)R@!aq5h)rpv!1^-!QN``L|bIzn--37vLL-vdU%mJGx=
zUkZ)`=@fj^gR7AAj5PFsqhoJdowJ6x6|yc>*^2*~Pg;Q$xoDJ;s_Ch*wfkMOxK@~|
zYvln#8sV7%RT|xa!$zj+m5e@4xRhVE8vXoqoi4Xe<|-Qj@pGj_3mx{J5I2_oPPSfO
z#hkv>E+03ER8wX@uQYF7{W~U6w%h2ZT-DbS+<W)B`xYJvG+RC%ao>_KR{U&H_f(<$
zvEj`A2U$V^>-}7f(>d%LxHXm|^_zNBmKBz|9U7#sd@6NOyzsWEi&rl4Q#jLRW@d&<
zooQ=1j4WG)_2`ck%O(39DY7@m)!nc3#)lrg#Gkp!e$S+(6_nvm*|s`Ir=2UFbxUX_
z4wayH?W(EX#^Ca>J|Abj$leBgh%`F#y0qwha)_8ScZmenK|ds%J@Qb38A+Mb{)!ey
zd#dYhH^(=-d*kAIkC~W;RpqnBPzHNMczt_cnB7s&6jN!>4BNKm)0()XR8LF%yA1wI
z5r}~{%S1z_?Yk~@q#{NxSBQBD)@PxUr*AT8OS=p*Bd_R9j~kU;*>*x{KQ@J-D|UNa
zoD>ts75R<;PA|cG`Y4X-nht^e$lgfls_Oj3K~@!O(e^2i<XB=;f-kkW9MW_EOC7DM
zl6b>2iu`tutR&-^<TJ(g72zkM1Bu&5sJ8VY1zzu1o<{|>vbp3Z>WHD%J7(yOXsp%s
zl4uWmA6gWI>pL^mj99lzxr?jE-#2z8OF3DgQE)tL+nzgP!y$;sNO6lL$AWQ193z3Q
zhsbs3ioN8y-AstaB$u3mv<-;FO$WGoN{#ky3>DFEHrj&et!K^I<v3d0Tdi~4b0^}G
z=uq43cSS){u24tH!04XeE~{=Wk+Ic*?)kRP1p905T|&mESnaQXvp285rCZ6L!`FIn
z_g?*$gLFBv_gr>N$sQ0zFO}YJHO9Y!hoSf8B}!oZQrY6DOLrMbrX>d)9;^#8qAn@u
z3r56uIK5u2@-b5+^ivS1Nf*-NV(rP2wa`d0kqwzh9&fAOAEs<lx2?@nY6E)WUGruw
zIR`V3D6EV?%pG1X^A+Rf+hR_a&UVSM%lnxs2ybK))@HH3qQ&G8TDSwX*#3&Gv`&HU
zl%${8NlyD3b7rY@D`(V<cIK-OLD8GIYLoZ&`CZv{_?g@2Qx~ptWjb6PD{>u^2_gs}
zoq!WoT69a2Y%Z<BHN7segsDBtq$apY8m-4@8=EcGvg11Wq|O0X6G8v1tr|<FbD6Go
z*6qE7S7l?>4#hMM0cjMgrrvC!*gFpY^C(Zw%|c*@1>((%6_f+}c?hiau_b8A-3F@|
zq3szC(<f?Dk8M?wY|Lj$+7NgnD-ox9W@;aTYWXoCehc0H*su<fmRC^+9=NU+Evo!z
zm&32UPC1Ou<o@xMs*36RO<4D=x~gC-;Crp!zTg$7zE1kH(srZ3!Sy1G>@MO%JY~i%
z6Z+a89qAacX`9SxogJV2aC&r=LA55`#f)Hua~WzAxZCo!!rY$})K8_fuetPU0^2R2
zKj8cPkeYmpu)jrsufP1kn0gaUl*#i)>wFZA#Bf@?r(WWTehlam!Dr1bIYn&3!a+5c
zSnM<s-r!t08jM*kI5ijOTu2b<Oze#wEW??-E5RD>DG->ZJ1lS)t$j{7tSjC%`RUp1
z7cE8tuU(Rvx^I2pfz+0<i2PRmXot%bK|#7q6?F|eVU_U8iyHJR+V30D`*ci<(%q_)
ze7seq@5$D7x*+Vqm#(|nqeZ)~XebnpOqCh1;&_<U#w&)!Z<30r*G<-{ty$N!L%d~2
zg>tavO=CXx2Omp^H|lMcJg}*u+Fj(7yZFU$%VlphY~79HJw=ypELNA9@<}+|Bh-?<
zcEZBLL)-qtv;2I?7Fjuw9km>;$g4s_*Tfr|ym>i*tM(45PuC_b%^l1Hf>37N?zPwM
z9EhV(^Sg5VC&D6>1f)ZB+VK^SgGt1D>vjFDeP5?Wov)g)+dN$xOI5;Y@lSfxWA;A~
zRp>D9)*9hADpPD#>ek$NN%m-XyYUF>x#6m7evDCSm59(NVBr2_U6`2Twd`8Uiyaq+
zC`&Kr$-ZB-#w@&-<v|r&-K#a2xcxql{G65yQtnQBiPE8B&zL_S`{<9&kff8@m)<@h
zf>@USf{U&;-g?M|E<h;)y+~z${0lzh?Q`)6M!(s8bmtBqKEh16iuJNV#>Pa*F%^2G
zDr?k`<Est^F!l&L3G{TdTC|k$Tt4=6f6;y+<O$w)&OEWIpB$Er*7F>^yYY44yJMp_
z&erf)6d9DK`#mvQ$M3($6a6Yqd^vk=Y5a|wd$*YcpA28R@$~9(K?!=4b4th1nve$-
zH+**rMz22Wowqree#|kP9_Zz+4V3is>+FwtHR;)o+VbkX4)=Y*BhKYH%o|R1fo#&=
z{jSO{f|Tz>E!T5G->5&isW!TIdq2+POov)rRZJ$gpkCpYvec-P0i7PAWkQc6OICm2
zdV2l{i><`|Z0nS+ekK|F=!`QD)~xHP3@PbiKOyp7MqRBV6vrP}V^pnCVeL3u#EyUG
z<A2vLrO#B+gxB@t%#2nHch5P+?!ZF&6oU+d#~TRFCxWt!V#|fBGKX!d!#5y2N{&}w
zU@^CSieW)uEq757OS3ng?Kiw9VVI%FzVv`+0$l`W=ENpsJaOL*hL_f<Pi2r-BTugr
z?>p*7X>dh2qm5F^(5^BkCh~5Y@7F#vxLL?o+9HBoibIu1cfN^#dE9X7l!z>&disuS
z8T&sdvl;@!mG3@1k!uVB0j4i^wJlqGFF8QxENL-w=PB%&=AHW;*Gz}CG6hyEI4Iq~
z@x)HCep<auKFX)*23y{Q4E<t5|JW2u&o$lFZjz}I<6vh_x(BljzhQ{;2q|sCxAHl4
zeTulOg^tnAyZnLyS?gLJ2`Wq(<G8CHqt9W_sujB<TNyMmY%-9#RmHp7BGo7sYe!qG
zJ#%$N5C;{xKQ_CrOgh7F&^e`0dEijjXe)bJ#`t(hHvO`st5vV6yt8UVcVXVD`0h<g
zm+on_K4j{%3*iz??wkTgmm^bc+y(d+*D6fdbF1_>9JQva9V{M|NDoh@ljLoGwxKXT
znqLdC&aO|`Db3wotS;UBWS7s;#<t*{598|MEk5uG7HYl~Ae5<d(hb?joE&gCe{!vE
zo0VtW`6RwEK9=>%OFl%_Z#zR#S3|{Zylc%9lqFzrNn2KG%M!n!Zk*oWX`8~^c{Q;t
zS$%nGiQY{^DOU^+dO0BOiZo1A78p~?F30m8aiSNBKXy{9+NAp8zP#2@;fz(0Ov7qA
zJcRvqF>yy8*u?i6*fCz(6y4b7u)I<*+O@%Msp^S9`by85w)K|+oY|g_+n&ydE*q*l
zQ$AYrC?#FDls*4+N<rWdJ20umT_4`1*0(zQd1An2N>+2i4Fq_b5-5aV*SHczSNp)$
ze+{=*Kj8Mr-NTK{OnjF-9FHqCPN%<%301O`^rw?RDW9K>JK&j}cypDJ*x4jD`#@Ww
zZRZ6${ztuCfdLXx*N?s4>-doO4t_#&|4qjVeU{Fc&AlAqoYKL!tt2bF{dDyTZnN@p
zCq(AEtienbrVV^Jtv;=F(Q-+oxiy1G$w9%zu`DN*#e}&|uX2~w$A*Skr4StNT?-RA
zw!Q=#G_hoH%**v#KCO#l#aL!I7frW+bRePphUA3#B3oDTDP}*uGF?+UH5ToCVphcv
zm;Lc#5yNu4rAC3^QHAj_Qz-?!qZA$C%#~{0%X{0`1u{H!Fe6<=q@NBt<Xn}!qvZ|V
ziW}mf@m<qZ*&7o&M&ZX-3c2Uj(Dy5Cl#Od~clMg{sk?s7XrE|k4qwI!9wQ6ZG`W?8
zDowty!mE1*-EvAds2}6fJ-2Ghz%~E(-fNRyIZZ!^+d{9M(j6(tPe6R!Fw3l)FrDvV
zYgH*sxOIQ2W$GErH~xL1g8r3B$F?*~`RQ=TsBZ0}W^|CBY>HI8T<g@8#Bw53)nzD1
zX%p}E>2{H%%KJTzWrX{)=u@8_3YHA2#v1lpCN0}u@8*1y#5>IWda{2;(S~3;`N%V*
zQ1>-DR`F;wefjwU#dU%Yrt0(zSQf=Db-QYiuGLegDr>RiZp94=AK+@Kzct@X?(Rih
zGJ6s|^|siy@=u#zhxhZFh_&D&^lX!tImsKgdsO5%l>3;T=})@6uDEH(h#f_$h%^6C
z)}p$p@R$}A#quzewehDd9WSvv#Z6A)qn?j+vGG4K&F{4<y44(TmGi|CLDsid*q+g^
zRL?=Z?j*%dbl!LwH{<(4)W`CQD}C@SZ4pcP@yIlZYUL#x4sXVv9-tiK)pBU(-MN2s
zkxJ67ZhbwvfPz!*=iT3M%ZZbHjqtKz`t{Mvy#&4Y$F%O2KO0w?T<3Pl!8`Ru;-+N%
zS<}}iD8hOZt1;;+iib9NiR)<!<_{pqa*85dySPWm%iN>$Hq3|{47ApA#}%80UXU+&
zw$6;Le|>53ncx*2C^DZqcFP&Xwe&%6rnf9!r<(9gKH;&wZ^^wpMS3=BM(zegR-jq<
z5+mu1^DOeKxQGrL6-D19$SxJ=48#X2<O&a&AIHB}i8I3Ex<9m4YY6zgQ>(YaC@r>#
zseU;b=`=E`jGB>tB?q;HyM`DJJ?O2y<{Xq_CvIKfmv{x)wUzCt-Acbm!)set?i8^1
z2vKY@<Rx!SY;tw=vn>+R=DO|iVq?Agi{l)Z6a$kQ=xZN4hk6G-_T;+jH`L+Z_5LaI
zNr%|%*1T05?3g7p);>=o(zmB7<Zdr`+h`opTldUY%Qt<!1NH&N+8R3=DAlFZ({6sc
z&-iHwZ&#f=S2!<ztGyvVf%(0p-G){UwF>H*&Z=0dgS;T!QZ6o{xcvKb!qc%nH7{bL
zA{DvbpSD#px#5FHZ8TBm@Z$^in|NdCJrtuXBZgT_7{{D+$Pyojw~|P|#mFD?VM}ig
z^TU0u3hIg*aW?z0Y!%vJI*Mri(?(|4ab0TTF%!*}-R)0Pt&>Hdkz%KHA|I4v`<Cuc
znKeO(qM7A45MAW?&zBK!o|6_YHV79XkL;aXWVv{kn~=o%0kx-kB7M6_0_HB~T<qUd
zQWDjgP8gzIn+}Bp7vVXo!s*I1X7xQSR?GH?^Mx($R*tp}&R}TRu!J;fmuy|;(n{BT
zMMklsdFL(Gn;-VM_ibh(1IY^>wOk0U+X}X;caFJ$6X*?k!MaYjOn^i0Ncx2O*%TKS
zV(JO)ipwn?wG#4ZM#o2q=koooYM5@rbS~K>PSn!tF1bId^TdNbO26-npySffiGZ+A
znaCRo6UO61Ry=KSE#qk8T54~YMHIg1&^^wAds90UdRiS6+}6eyEaTZ<$=fGbsSs4$
zE8BJ3^9&m6RsTVOVa@iN7uKnLdZC}(o=m!d^H%IxyEe4#Sp>?vNgI84(YZTI)`Srw
z_u4YbS9m498kr=X=|L@jS|L`rys+|6bD-0U9bHf9nEKUBBUlhJ@87zP4;2LNxcPdI
zYUqVm&2ntT#Rr}xDts_H*K%7u{J?gzk0aADdc8e|CpUxOrDLxqw;TFcoGmeHv0xa=
z$#qh#mSVU(f{Q4<!h_Kq3E;|5dwbdL&gJEYh3rP%@JdEJH4=-3Ec6DvYxmx2sgRJ^
zz9ip$`-Rse1H!w*v18bxUbUE2o)!-}OouwtcO092im|lYf-pO5p0F6XU+BGKHRVR*
zN}fpN38FKLZIH?~sC(sYak6}*m3lG7<lN{D>evJ6SH$ctXWZMuk{QpHc}KaiolEi$
zHgQ-CKDHL!)^z-%<6_la;fmFFwbiTZ6<4fXad7!`oa{0s)Ny;4cqX-zoShLmT=or>
z2l4W~MUB3zd{F-Pa~`JqZ$X}&lz9?SW9W*R3T_vccv750c|Q|4%yiju{9d5(_UwUI
zF0buNUdAMdIyx8CS#`BhMV3aMjkQ!_sxsSSX(#C^I=X^)dHPa5ha38+7Pj*lvi@OL
ztGi;LIS{AeHxiH5<5h9GlPi)~v@FX6ujI^3L=m=jTAnXCfsf&*mlab<S|{6*$0;<a
z^de7+xpY^DZ1u@S@5f&@R-P6(d&q};?hQ0y2CAEOUznUtH9Frn@+d#bE>lqais0>n
z6XS0%EUDY~@T6ClW^GLs8;aYX{pikxLYG&M_wAcu>1N!VvQ%H~X7KhRZ4J)p)pmh)
zfje$5Mo(uiBbAh?w9Zy%rRSxLmIUT2DeEh5d7jq4-u#T>tYf+Kwau0mW<F}=8q8Z5
z((8Kk+v=ncwtMZGSi=uo>S~<i?RSalHu_NM-S`s4ZP*>lv`V`>g*!jnm~yfEa!cCi
zfSsq8Q*-Qxs{6*9*eGenx@B)ycBS`NoR<>i46#XQb7e?mN4NTUAL>M!86d{)ByG6!
zVo!B;`s20wjh8r8_h{*fi*Pn&6`cAgM{3q7^A>#PYqySftD}&r_0HEicXIkQ%Khyv
z_#O|l;BlMYG&Zu8vWr^;6NFH%a;R-X<{L9>l*$QAs_r{yC1%NE&5SBZ=2Q0`c9x=Z
zUvv+lJ<6Q5alJuA>iV9}(by}SIBG}|iDNB{H@dosJ{}B}&gPGLty!tEo-Y#5Kvo2{
zb-mM^%zXh)VB7>9J0dtw+D}rNPO?66i_orVXH&Sr@L}5k8|D(ZKGAy%@|D*5YFkd9
z)8{oDrUc*Txbp_{=G{DT%;Dmx3#6My$(DO+*Vp)CyexASQzMh@sc9J=aYI-YGi~z4
zw$3gyW5cT&`aQ=Vtcw&c8yFkR34FLIOpoA$(Vm#J9%HvJ+v8Occ0qFevT=NS1W)Ld
z)&v1fi>}wNjg4cg1nKdGZNa!w#^>H?zGK_s^W!sisy#!*ZZ*XEP4457z$B3J{0j@D
zkG;#j_IAzCMGIWTEFIgj?)^GevdDZ_HQlZZmse!=ttGlFCiscATW*XSwsfa9pW#0$
zj&4h|-j>_7oYV2Wu3Ar(i$g{YiXqiqb~;{EfE=rLpa~CQs=YjjtwcJrJrr#r4UueO
zGLq#t+;hnAxtd|df#0WQw8Oh~rl6fz%2l?aWmnZnsbj)}ni`AoFa3vD1^B{r76tL=
z(`#0wW~81!V$TKIYe#b|UsZ_oJ|PIcJ1OKlb~eL3wu4pk@CWlTey;I4!cZ;kjbzgq
z96l<0&1$()%%IKAV0WQ&$(ZVN=|YxtVNL>0&6y2P!WGpTsr%kGJ!#XB-ubrC$iU*|
zI*wd5%7iwXPGTNE57U^t!m%|eEAwMgsX~VGEqSx&>I!Ah*<1b7SoiPh&~{QbxUjEt
z`OD{M{m5ABiWvH44}DV~%6juu(KT<~x!;DeVR;%cN<kP-0pV4Ss`MmB{tf=9_OWnI
z{*DR@%IODX!JkHDCp|ZRc=WveW06jYK;a9cbjkb2me3#9l#DEtkh4(~E_t4qAdGoe
zq_ve(3v<QmYVwn8*ImfQh&7tk92+>R2@F-&N;%k*0(eo5EDr^wlXr-;c$4rr<$;l9
z!z^muiedM;n6BRN*GLWa4ilc32s8z)R(O}zN8}^M9u68~g{NdXI!RU!cFAP$d51He
zkt@@@%;B%vQsa1hXqR%7&?qlUMH)FZ@gjOZrMRRdyC~;F@V%PN%!Z-++lEne*u~A&
zoJSA?tV5#$w(>XQY6s|(`D%&}oJi2K{&dEr%>D2)>w8|eMTfRxvL9T@YrKD%=RIn(
zWaTx+p><_>>JBouZs~7JS<2yRH@i)Y?SxWI(m5<*TwPX)`6zFH;sJ#Em3)qt{hEEA
zlz0U`bC#3AmWqQ_J^`dY=kUj?^YzX14J<w4T<aNvbudPP30frN)t7>UF3SUmC4-Un
z8$Ddk?P_<tmNbyr=qPwpYWhuTP$6o0_)W^A9`nd?U(ZNnSLw2yMbC{^n5;&=k`(U`
zGC!YFjaDrSnlfIKDBB%b?Nu6J`uHkqkWxSK9cN`}NL0?j2>=wSB!9Dj9sW_di!<oX
zot<E8q1xbdJ$CBvHIJ2Wt7d&C^Mq$o757TTFv<I!@?&;vrGH?j=lv$cHSxYhVQh4c
zVIO+R4;a+bN+08@XrVUMSGJcspK<D0?ceg&)aa1Vu8#1G3ZJ*jM73CAeBCVXpcssz
zrj}+f@QBl=G$Dmlwr-t{5awuq&C23xW4^cPnu^AQH^z0#(fqM==)B|Whi(g=8}x8Z
z6As8OieZ-0=Mo(kvyIIKePd}_tD}z=I(Jn8gXkQr-cC;EP}LzhrbV(PV-Bu74wX_X
z>@6!f2)jxix<A7^X%#VqusS%nAsjL`5<<p~^b8r{2V!?OBg$7+#TZ8(WP1AMO~b}V
z%fhx{&QIfaU5(kfHn15(<nbKvEZ;Z&D9|Ree`sxn+zW5aUEX4!Ls}la@~S9lEqzx-
zCriEPms8Z0w<u2=1N5l)tIfJ5qKA4uty=%ExWu@t{Gf3i*638liL$kPDjhYr_oZ(R
z35QA{N5=ie*)<PY`C6u?l8A<$2ZEylYz#R?t+0w#XO@rGkqjdc*AQ5tXA1S>EXHw3
z6{Vd;L4$q1IQv}VC4MjTRvp>V&LST{9wN7-cRL~~x0Sj-I-K$-%jU_uF?FY5xd+#}
zo%m0AtbOP;k$<TB=qLZ;q*SRT&^oTJks@k!)Bct;<(zv!JgAVTyDog$Qp+|z-jx`o
zq<e`HC@j0zlaP$VN78p=&+_*l^<Y)(Zq3_%m9=BErFHdH#dS&}&$u%g_g&hy@(5xN
zl76`e|8}lXH!b4Ie$yU_m?idyxr@`v4cd4ZGj=6jXkGrGDDI<11oy2+WLvGV68aC8
z4k~*MPi?ZZO?f2ik-nky+#|V$PNDwST1a`b6<dc7(~<V{t2-Oa;*x?mgWqWQww%Q&
z4fYqID6NmRrj?C}M*b3{YaWZYN7rY13$A?WxK{BaiEmuD2Q{k9tiid>USSKrpQ7GF
z(>=#qB-e`7If%}PWm+GdHMJon4moXXIc`C}dK$dp*Us>6<?eg^h=cE>w_sIPs+-X&
z$t3?E)TsBw*n<yaQqC<Val@jwEh|Yyxt&jq^##W_Vl>|F3ff(|W|(xwSFrl>vEf5n
zM=(W3`>t|a<hm}ntZQ*jQxp?J(zd)0*v&rD+q*xN<yxc{57wHuUwGQEWn4rr%ZRhM
zmFWKFz3xflvFk6(+}MhQcUw=-y#8R9`ovUycelk-<wj~imVglPrA>70i=KQ@Hm%Dy
zeRn>JQf?dcO1&=|%2MQtjNG(p{HYY(QliJ^&SS4r>K38&TXuG8a;P%5hw`O)2{yK7
zEfWa2DH=B!%zi^ING14c^OKfXpId$DaUFE)L%B1%GMNHO_f$y-u*kQOwd{<?9raG~
zbi~bSByk+;vDt6;2-0TOP<{8KkmHMz!iBCzD{>jM8pgSXaUR@ud3{*bwtQ;A@>yRe
z2IUfOrhulaoh(eHEn;Dy$46sq?EDjwCNd-7UeVJV$&+Vg4R_q<y>7FywY{!@k$Fj*
z;aaz)OU(1SL%Ia)h2C#N$up)!_;nfuvyjY1LOcoy7wK2qGFP2VPBQ1K%~I>XGpKHp
zZqpzc!7RTyMbS9>DdS?czUGM7qWTYdH(A4(1WAV2dzPzYE=IO?5Mn28yxZ4lbj8Py
z?VzEhJA?Z9e!)lPDK59c#jQ80UZ;5#VUk9dwJl#Zx+njV%d$$v(iyVMK3D19=5{_l
z`JPgXKD-=9@ePbv1E(I_`XyQiBo^(vwE4;sx9)WQS&mJ%<@cDl3|q%bm4}&ElpRjZ
z-m#Q^$6-<SE#fZ@Kof4;r$<gaDsd@dFkHELnH-zxeWkpbdXD>VA6Mg(d^N@Qh(pPp
zNLaCPAb0T+ZgwIIS-HUyxz?=bQvdLNwPCq8drkP49+!2EJihn|O7FybAP|4IqS$#2
z=-bq?<DoC_VnMCuOJ~Ixx8^50W@Pd7bq72(nPGB{&WhUlG3<cOaMY<hf69vS*-aPJ
zjD%iN`pOeMH$D)v)(JJf*nm0jQyW5m4CHyW?2L1yq#TI5VLbZb`XdEP<LU?zsayx7
zbsqMC)Ot>a@B<<b<DmI_!<IJHN$>Ru^1^<mhx(t(<$K*4x~Z7UJYdq+0ZggyCHYhm
zW|?yQ6*!Lu%SImNX$LKt<CkP+pCp*MZ<95eG?NKz?`=b0dxG<SaGq4|y{7$v)#|?U
zq$5is%wHxbGm-}1g&jy24Md?`)B4Jaqie_O%8!+49eeCBEQ%w=1-3h-5!bXhzZT`m
z2#%=|UXB=Qs!d0%3~0#zRQy6-UaKO7U;Ig~NZlv8jV{k;*%3N+^>T(E39SAZ^fr|o
ztqixC53F6gs??tGDcWwrZ2BR!c+=zM;!j+|Z=M&UJLh0)$X3`{I=SzLQXGSJ2H&gF
zPL-(e5NXjMZp2F&5m_?{iI@sx4IyH(kk82VE+&_YWht=hFex4F;KR(ukZu?$-3e*=
z^dxl5%{a)vbl>yRFiT_mqSJ2VdgH3D&Tbvf63@1TuEh$>U1?1j+#io>zq?ghYP6B8
zKC`BO(J3D7b1|~)qc=C>y@?3@5Z$)(M;V)4NmsHF)^!|ZS<S+`wvDTatTNDcp)d|H
z6Lz|u6f-=aO~iQCxb9oML-PDHDaO}_W)pP!!NZ4qD~dRbCj>T?ZrNyeq|(T4)1IrG
zyvCWx`vXs`h-P9$lNRk%-X$%^J}EX|9{!lz(6p4(mGu6$L05*+k;wWFuF-2=IhejE
zR4;$dUnm!xvni0NG(_ELqrhZtl{QCXSMbFP$#gdlmUdk#V9-q$Cxkp&<MVQR`bR!T
zAC}Cg*5!vj=ogtacyoxDaQdFxt)_9eeFtN{D|uii{<!wNTUJg5{&`Ftc)|@e(_KL3
z#V9djIW=p7zkkIFlI*|{J+`Olhhp`EUfIp+Mg{z%!K})IPw8JB$2H&FY?Qlq-3`xG
zxeiLPfV?cfRp2_m)w)5v0+Yk#?JdWnqm3yjwHMowW=Aw*&K;C4<&C6MrH|u&GZT<j
zIZEG?Cz7LxY%I-=PY@4WT*`sG#iLbyHm(d~UstQ*0oV{-R~&@SJz$CKG~g+u8k93V
zUWW~wYG6i-<G_8=sa|EvY0_g=S(exCv5nNyNy?_u#R&azL=Wg>8gmqnUvs*st70%g
z#UN0ni}g*$!B@g}G~+wp<=IT%d&Ayz)#lvPNS`LFK*#Mj<$Rp^o}MII+c4f5`jm+C
z2qx!!O*@r*RUbdh=DU8(-0+la3CnRiRpmkUYh%lLrR=>Ey)G+=YYMXEp5J<wd)>YA
zh_gC2&rb|?YVMYqK0F)Jw7pyiWpVzK{$qX4Lh{?Fy>f5wEz+}U@_%}4Xp_Cl;T=P3
zP1sj#9N&E2$2%|Sf^z6-4$Z4_nzdk?f}*L@$T(*a{&r)FF7p<un=YYj#zqP$^|qyE
zY0vupOzcOG0%}=*9zt^{svy}Tx#e=%3P)#aEMq9Ys={FVjJ*HlXF(y@TPsioCRN@c
zY>M65hDAj&I_>289`oDdaZM$+?B6<6K4&?{E1NTsw#9_;ZIW&J&gZ*}vBriGY-`-}
z?Q*jg1(18jEvlK!3{#aR^=I)C1==NH@9AW)@z&3=>!Qp@jx4&1bW`l?CyN(RjZsw3
zMQE!x2X!aum)mtm3zdq#@g_J3?5*-THf%}Kwv%3Axpex;i1#pWdY7sAHGVTZkG0pM
z<l8peCPVe3ls6!XIQHyG5&#X0k>&UHaMRHil6p$g#{IJBFVI7uf!H#AWK@CH{IbR`
zMna4FSMFbq;NrS1c57~Fr`BqyeFNRE0=2|`>&9}Sam1d1_scO!slHsS>^ZAOF1T>I
zcIzGqqt~}^jY;*reLrX9EW&*UPJ(Hp3O?%U(9QUc38gAGSN6iqD%Qw=8;?fAj}%?9
z2sCp`aS{8Ee4PP51R@Yx3+S#Dyz0j)Eh0f5AR!LyJ-R1J)yQijw2!2nfWA(meZDmB
z=ny3wh&lh$33vk&fC<0^U;;1!m;g)wCIAzF3BUwk0x$uX089WT026=-zyx3dFaekV
zOaLYT6MzZ81YiO%0hj<x044wvfC<0^U;;1!m;g)wCIAzF3BUwk0x$uX089WT026=-
zzyx3dFaekVOaLYT6MzZ81YiO%0hj<x044wvfC<0^U;;1!m;g)wCIAzF3BUwk0x$uX
z089WT026=-zyx3dFaekVOaLbE7ZU&gAYuP~22}hw5?|&Fc}FC!9P$;A|KNzkHwGgC
zmGV#F2FVY*?-8J21^^~W1z?hu0Opkvn0~DYrr#)nnGyp4sO0b60-yT_5rFmo2Z{Ly
zOo8?P1JM3Kx4`=UgT(v;roj6D0ciiATVVbFL1O*^Q~qD*Pn-oHyYiPluX-UdA_;)J
zn(v1r{h%*|!TmBk?OA0_3*#Oh0U$RYiXZa%kT1vs)FQ~&L(lsc9Cfr0kn>`}Y=Rpg
zKDq*kPaVK)W)L8MOb1jf>K8Flrv|`mWi%k<y8}Xj8z7Y51mwZ@U&8$!{i$R;m>tXj
zxF#PkQ)2;nbAWAf2E<R#0EIaAC9dDxq0Ry#Dih4~A;EO#dB~pwnBFS@H+&zEW}q}d
z*Z(bU5(B^y*I)Wmo(ms0g#|#<>-*tm@C(C!KI(;Z{a)NQ_dbW1-@Yva;Di>So`$@(
zCZOt_1{8x+fO6AkVYnY1Q7M32^b8QaG$4Nv5PTu;e*h2y_5*w%<b(DB{M|!fw%|6P
z;?Q%kP*6Pp_wX3N#;5`8166>1s0wD{cSG+$z?Y}|y8a|U8Yu#p;^SZ{R~}5|$$_Z?
z$QQ~2bTQ;hWWiLK3Lx~y{-$=6*%2_^Y5-8RQUFy4`HwU&2~hPv`^jb~orBk)xF}!J
z_uU;T2?`egy*D9HP)OU~a{mDRDb=}v=y3!Pk%xY)|1EWZyQ2>9kIw??B$V&ph5&37
z#Pkp9Kl>>YOlK>DsT@fAALx&MD+AD_G637^1ZhF|z7mk0Go3bIlBWHy=#OfU1n9P7
zzd7ziKqW(Ehas5mG6BTNH{XBe*JuCk`jbguHoyoF-46dQ{c-p90(^ooAS7M<!}?=#
z4+Bi@J}{L9Y5zO)N0-R}d`}QWo%%KTxqULe1JYjZcj-Sf;PH$5zdb?5HA3aaPJn8V
z1|&?yx0io;{5RL1+EELLE>Pb87xc%4?ghArJ%3pL>2w7!ovH9I>5s0E1ElG1+EkDl
z#EA?rStIqk^e0Zfp3{$vZwG|&CqJxLsALS(_UQYi*55nxH`kw1^b*n^%KP8ZpZLH6
zYWrmXa&sP-&A$Wi;l}|j|Ig_k{vG`j4uILFr(Y=jsQ&+1e+4k}!2%HblfdjqF2J`1
zgXy>GU+VwQ<v%U|qsw=JnHK9Waev++j;H)Ue<^@&JqnfOCIH=X5TF`&0WzU`?zXA6
zlTiMa0JGDDpQHKX+rPQ~<k#Wf)t`9J0BZBkxAi{5p`!W#;i>5l^`C8g_BrU>_Sf}S
z1cZ(lC=WvYqOTlzrX5UI9Gh$ZeXIZEdpRgyj(!yy%Ktymf2vIznqr!s3rnTopgsW9
zZ=w?Cj)~|DsBd5gU7uPI*B?6gyX*h-#&`86<wkrL2W6rg;G;DF?mPLP)LXRRo?p`+
z-xvsm{bhYli-0s)3D9rlAV1&!`<(wLD|P|mSlWVT{78T7fZu{}zkL9u<yYn;Da8J{
z@`6hJrXBis*FWL<cl9S%FXa3+Kf)V_Kczn==OC07C%=wz;Xc%+$JCjASASgJtp#C!
zsQ;(y3&Q={0hNLWm~L}`Zr%fE?f-8b30nsyn-l@2#{$|aLuH38)E|NR^ECHQ)xRcl
z-oEer65creDgA%X{6D_?-got%>2O()qQ63aTHP?!ej1SR&0wnS_=5OJP=8>uNePf~
z^J8wb{7>s2lCU4=!@>H08UOjc<^S)|pD^(F`}(&#Ezsw$(4R_1gULpy57{USa6=2r
z7t%}>R5n~(@J#$@B*2eCZ5NvREA*$0^M23$2gd)%KPvzK>-j(AyZU20Jr<DqEA;;y
z;dlFdP@8eGN#%18XiJ?NADroTn?Ltw_1A#nDR2HN{;zf$d;Z+`uQSwNBK%-%`KQPH
zSM)E^1Awxy-T#%<5MmO*)EItOe|&%Ff}nq;{tF`h>R_rv7b^3iF)!3Bfc@kH?Hm1d
z^*?QV|2#CdHS(SIQ1aV9r@t{Y2XF^!2cv&Eck|i2|Azk48A^aOys)qEIX$%P>_`UG
z|NDOXe|EC?>!3gE|6%`y_TPdCp#u`O8mb3^0Ii=m=b*VG61Em#2Ry;d01|pXznV+>
zv-$t?{Elfb0Ck-JkfHerD%2Mlfabmop*HO2>tAoLgfC3;kLG`9`kR~tWScX9k`NB4
zjaAUQFadR%p)!H?49NXg^oPd(Xyd=LgV|6zzMA`l^8M^cHkf+5`@8*rbmbl>-z}^w
z|JD3YYwOe6@U;1z?>Sohla2Dw_+SE{%^A&Npt-eQbAOfopY^>2rRyrB@9FQ%6@CtL
z{pT^ZxupG;{-!4Y`NDBPwm1$*R>uIzNe58J2Ip@5Z|Ofj{tJ!&l^Fqi%T35%2Q%-_
zfT<!V-~TlK_ig_l*L&xS60<01&T9M(!1j23cl>X<>jE@?llsMzaP#eTn*LKAI)E_o
z{7YP4?~riy(0HNxTppk4vxmxntgkQsa{sT^|Fg!wwoP1E27({yZ)H56|G(A$@-aXi
z{WNFGe^>wCKmRjbeFQ3Yp|a~IH}&x_n5>cplhu&_9pnGlLI2OU{>B!XPwaP@D+8w5
zPyO~7;h)tX`4E8P9^WtLzxNKDgzBH+Z|d_O=uged1Qg3Nfc(Fte>${Qpv?SVn*W)q
zPzEIQ!gBbp)Sot%Lzx|d-V3Pir8%fhnxFfhuOsJA{^0k|>i?!3fGlWi`q#?)&+oxe
zsIB-Asx!ZJKhnSPBcRrP0Awq@h2{T$GyiAo0hH->fPHWEyXOC<-b3vK)HmfFWdC2M
zKNafVUznTk{ZX6XTigqd|E&ILkp48+0hPx-j{%_N@6URFy*=RpKvX)^IQ~w*=~wip
zMNRE$1(fUdKiB{NZT)dWP!_`jLR%P^E`Zhnd~f~7J7s`vb^;W9AI*ecxW7(+FxQ`>
zjs4Qr{rt<0wsx<+>zBTvdtp?xaJ2sXw_(S>nuDUX$w#4nU|}5q@wos*LweJE$~ypP
zV?jT)*%w9(9igE(8XD()BeZRTd~*W;*qNV$l1PBs(F7>@DS(pm0=o9o+}KDT^nO6)
zMEAU>^n3&~PsRLP*Zv&I{2pbz6Ho?g=lu}0g*<t<7Etlu^kK;aKpw04*^fi}6SYt=
zOZ*Zgl`sxwhq3^nGYsI{p*iNxdw@9f8q%HCKKXI^OPcuzt<R_exPjZ>t^YASSLWvY
zXk)uHPbT($dFHn}wE2EopKn3G?wdd)T*F*nfYu+FUr+e64c`QX5C4M%{?-29A4wW*
zUSP6O23lL{Fz0D=1hg^WFYepC-2}aBlpnvlU+#l<{xpGqzy8#@xuIFiPxUmEVk&uZ
zZcLa$8l6vn)&~HNLgTof>ucKnht@xB8yvxJ6ZkXw)7tzq{Z3GM4vmZbz!A~e&|1)Q
zzqpDYdjypQPEg|k2Y?aOZuqSI=k3MY-*2n^A}096pCRyP^ry}F&-7h|^7pA9CSi8E
zcy7Gt+qMXPBpjLx@B$zPnkWCP`M2BGr9X@pzVO!&_%r&`#`Y$gp>GyYDZiSS=}rSM
zJC*k(423i{cOPxu7(_#J1mEiZ`Iy#jhuy!G02$W?2qSTG9uIBtqx1gj`ufi%fK2Fu
z#s?(l>H%6^FxjjM@Z<6G(bB%_`QAJYt^B8b8wR_71OW=ve<b5ufAa0LM&QqOeXspj
z(fspuc<-M~012=JBzTmA1Th)&{z)DZkjc<M-uM3(2|oYN;qn*%ofsS)OaLYT6MzZ8
z1YiO%0hj<x044wvfC<0^U;;1!m;g)wCIAzF3BUwk0x$uX089WT026=-zyx3dFaekV
zOaLYT6MzZ81YiO%0hj<x044wvfC<0^U;;1!m;g)wCIAzF3BUwk0x$uX089WT026=-
zzyx3dFaekVOaLYT6MzZ81YiO%0hj<x044wvfC<0^U;;1!m;g)wCIAzF3BUwk0x*I9
z_XPgQe{2rh_WzH-|N9IL1NgTR`2UxqV2l6B1U5psMFsLm$kQQKL%)zyK_E&v=Kb6;
z`~wq!3BUwk0x$uX089WT026=-zyx3dFaekVOaLYT6MzZ81YiRHSOU-(xXS;Er;>0g
z_%bIIT!o_wuGSk$7xh1pw*Q%F04i|`V3L)=^eaVx$vFa<Px+ro+kYY<u>Jo9{l}*O
z=op;$D9pUf6VpGRqwRloWaxeT9JXh8{w#48fUYh8x*<Q%|2gEs?JNOMT1x@>V>Y1l
z)d4^z&0i-I0J#r3-&+i*#A(R?(tavo49t$?Kt2;t@ShgO`_mDHG!BT9S&&ZyWPA&B
zmipar-#r<V0l*R0dH=j{KFFiopU=fZ`=1?p=I8SU*XPgnK{lV#0#u#TfMS2?bI31S
z>NE<>-aZEiJ_iBe`T>ByxepMcbs-K_fRO72u(4`j=Fx6I?tk|S`-y#tU@A`qOy$b~
zbdfATzm)^{o{$CQ0vX!~CO;|zRGkz+)l1I#srFOQ^A|E8j6Vj1@q{nw`m*zHwx664
z1Bf1n7TAx!tqyPzhXL-vkssPWov|BCXDNZH9Qm*8mjUQf89*3({3ZF=UQaMt3)%ja
z{nOp1P|=A4l-Z##;by1u0TG?~<@n3azuA6Lgu@s6XI~-#WwaBJ>Rtg{BxHNUo;mw*
zDQ5r`JF-Ck=`^SgC^`*DWA6YN{SnO6SwQ;F+doyQ4#^AUJIKv++J3Pg(_;r|{1mb?
z1I$hr1Kh~{FJ}I5=ihDrZHq7VQ~K(^B!g7*?2G+`BG0+=U+4enbQM6sKxN8Lj!K#a
zQ)PSR^hcNP0wfGnjzI2f`)8+1ehU5dh5`r^&j5uqHg}Rr!2sNF2z2iGd_MXQ+D{#7
z|B^6rTkfyg|GoNurvBm=`)4Qe=Hgmt|JyI|f8L>zPyo|y{^i}L*-oWk0dXo9Dl0nx
z_$~WGQ$I%q0Ie?gTvmRs{JU%h0A*pDh4hvFf6jg?n6A?P*?#o9-(^275S2psVgq43
z9?BbU0e&<RkO{xT{*y=m%A24_pz<`g`e*wM1LouWy8Jgh1t|Bf18R3G0JFro>wnaK
zTK=EyOM&8`mE%-E{PYsa|4<zOm4E08IVk(1=Hma6{-l{IKp_syg`xe-P8R~~P#~a^
z(SU?&fNcLMZ~d13pY=9`>N^d$pY6XAJ|Fkj_M2z{^7#{heDOFST|NN-b{hN{`=>J%
z0Op+zz?5tLRR7JFf7p)s@&eoC3a080d@28?JB$IQ*A9?zO^}WCQ29Ul#eO`bJ9Ypn
ze@Q=|o4fd1_6H|IcDw&<_h%j%?|)%GHRL9s_*|X0-})F-IQ?<^aTT^;I&c3k>Oag!
zBS0lVZ8pfEYj%UlYUwZbf3E+(E(giDW~i)t35AB<BPx0Bz6C$U9|5=p*+}#6X>BLS
zl{Wr-ZWwycn)?8_lMH}EBmmCQ0Hl^danasO$W2TDaQ8l-hTa3zLa42Thw9zbCxCq4
z1KP&|a`r<&N)863*Fk`a9+|s^_CpzN1jNDsKrFcqNG-JY9Ey^J1B5DnfUougq`^Eu
z!S(}ua{!pBG6ORotpMRu!h*bv>%9i18V-N4f4b`;n1M7V<DvZblcT-sgz+bz59hX&
z*}<Rk22@tj>=>B@U=;FyL-(Wn|07dKGw-3YFB%X~iGYZD1waW@Cx3pYD}Uzpqx=8Y
z&i|VIv@!tu$!9^5aYI30j_3BTM*M8QN8Fcdf0rHnU>Lx3SO83y1t4J?79^Wi_tWb6
zuN?_n4YdpJ0a|%T>n{OX{{O81hrgfxU)%P3_i0?HP@fUX{7}V6QUMRLRKUY*sKNOk
z8E^VejA{MuXZ&LaHethH0x$uX089WT026=-zyx3dFaekVOaLYT6MzZ81YiO%0hqx5
za{|A2%=~{P-2b{<|0|q+Z#roI6R{ogMv(vVKN0KT|A~Nbzz!w=6MzZ81YiO%0hj<x
z044wv_?r@d`a`q@p8s}FC1EFL-W;67WFDBLOn3a1&-=Yyx<3^TO8@*fh^dNzGS&8{
z;#zPsZJq6BPrLB-{^x+-p8NLrb2tjLj+p>`i$&XhcF?zE(Bf`rUEeq9hrXetk}%No
zz6$&K9_SkyDjB*47Jjqv`SOBo=xYFsZvYSreM3ZnY@w}xrybMQPtqI~dOq!#=KG;F
z=I_b?^}+=}^>CcO{?jjYs2j}QH3ft~4M2$02c)X!fYh7{u<?fhp~!7P`iZ?S0j5kB
zOckqu=?^Et>_pL*xJc8b0Nn_!eQ$uik7_#st?&Q&+ZPJ))BM`bFQK8GfM@gTJZbB=
zY3Vl!oIlQ~nh!ODpFgIp1?`5u?aMC&R837lv4+0s_{x#uy#dh^`kw1L<im9V?%qCt
zi=}<Xr3&zQ_6yQK4K1sjE;<CIUlpKBpl=t-6#*GL|4z}?tj>S4B@IvwyXL-En#GjP
zJ&8)5Twu@K$-gN5v%zL_=_lnt`a$moxg`hs7HjWZ`scpE`|AC{*Lgv#h;!c^PQO0_
z&}A|J*8}MbIZT_$T>7z}0_VOnqf%y|^|#RXA<(--`^Jdos8s0t#<{iV(EIgQr9aSQ
zF8$;h=(|PQGl*D#i#|A?{^8mM{K@E+xiGXJT<49s^kbSW=FWXiKYsMVmoT)Q|7-8+
zdg7?Ua4-A;{se!7iBXfL7xkh|G(?Rg8e(cpH5k;32Gpil3yoYDD^}8`P`6e|6fLFl
zQLPXf`eCt+z=p3aY<DSiODVA5vpX|8^Z2}HW|z>gWU;o?bWSp}?3puj-g)MnGl%oM
z&%5#r(zohVp6I5;huVnu7q`E)PnE@TV(s?x?wjlz?5l1vHe&y>+qZabdb~#2p9<_z
zS1M+|I%snoV80f<pZK|(>EYt`zf674iQj=Q+E(n3&^I{W{zcPMvl~|1G1v=p*ogh9
zixn^;-N;NgQoHlKvR}W`PJK!MiHUNj{mj+FOkLx1TT&Vwu|KEJAa%2v!x`=1y{J^I
z{p>lqVz>0&%0|HCSm)Yr@2f_R_M25@utx_=wx91Wr9X`Ka(p>Y{VDrzYP?GIht$-E
zhz_}$OaIe|j&G%%jvi6;7NR?ncEe1^cG-)D>X!lF8vDPD>pg?cchS^d8U>nroaZ2V
z6G>rePC7bZU!l$`wgl_!Pq1&#z#8m9?qVD4`JhuSXHZYs2E$KnNQ(Lr%YYteg%N6J
z-&jUA^c^x&UqYYnDqv|W_aZ*_lEOb3dY``Vq9=9U0cP4y`&qZ-P%|k0^GZiG8UmWA
zmzZ>psREn0TdVzxt}mxiyW=L&{n)ndXdUH!CGBJHxB0`H`k9_NfW-9*YEU{0c8Ffr
zh`ZwnbM@#M^&U`K&0jA^QPB{^Z&&}zIn{%`7GGr4+eO)jqyN)svuC!4fQNvGfQNvG
zfQNvGfQNvGfQP_ih=B7?+LkSw{rRw=-|YL%*DrorPjTDEt>CBir01taIK1Q`;3424
z@JJxQ@!EIaTTb^SyLbBZ(9i$oTCDy)6S>r6$5!aUl{kwfU-1-q$PTXA&)s#_%jMG`
zA0cb!L(_~m#5k9&D{*%0kRL|-L6`&0up%SmK<l`UA5ryZ#~T^{sR3G`o*dk)GQo(Q
zXN<3E#;`e3Fv;N>+^-VPN7lGU$PdVRxBmv?Q0dO!rx_ow`8e!%b`{PwzF~aAL*+1f
zK8Myq9_@!6j5|1|>Q9{84sEOs@yjnDF<j1b7=w<yO>}HKQnR(>Z5-}2mvy-ax#~vi
zZ+HV{7dacI?Ag80I^H4y<lvtT@LnYU){o?lo`IE}MSS8_aznf?Hwiaq8S`qLT=87@
z)-Rlk#I_PF-21n7y$*Yt+#vZ+L+bB7tgfb?+rO&*%%~G9DHA-TxGT$8bnD-z$}4_~
zyoss#iN#fid$_lLi4!Oso76Ay#RUJ#w~_mRF;F{Cu3LYy??ogAb|5zJEVStZ(C?mR
ztgq+Dd2fSu`zvyMQ9>0aXL*J9;_y%Sn=uxL`8?v}mHs5>6iqrDeLl8PI1G%DZ(4}J
zo(;mfPVUX+lB_!u$VJHE5*IUa0hUHw=X+r;u{|@-%FZA*x)X`uZWUurK*-0@lQ!t!
zPoCxD;|iY#u}e-@A{}v_i;Cr!9#Yi^Po>AmV>X@f;aHcCnGba%*X^^djPH>cggqlX
z1Uv*h1Rg^K)XSj6U8(StcsW%})+x9wq1Gx2>l9CT>lCG8U1~Xk%>c9OY<8|p`|Fe9
zWhQ2T8xd!2JjuCrAfTR~H9N)_<x{X0C!t-cg1LBsQ=hDw>xy5Y__?X{Q41ikab<pA
zdjj@npQ>!*=zA~*4#OBZiBw-Xvf&nFW?PU5aGt4rYv{uxaf$Qif87ooY=ynQ7IuFZ
z3||d$!G4(Ir;zG>4ccTqGB=wz?|g;6bl25<OX9cU`#+$3&gAzC5@{z6Z8F9fvkROG
zrs?~`-xJ6zFotZHHfN9wR&u@=S3W(;&+tfRactJZmB)xjS*g#-E4MZRfUG62-qtR;
Jx=j9@e*mdEl<)um


From ce51e4f941da5d81c8bdde9264d298f47b8124d0 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 17 Apr 2019 17:48:23 -0400
Subject: [PATCH 25/29] Updating version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d40d3dc7..1e24cd7a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@inrupt/generator-solid-react",
-  "version": "0.4.2-rc.1",
+  "version": "0.4.2",
   "description": "Solid React Application Generator",
   "homepage": "https://solid.inrupt.com/docs",
   "contributors": [

From 892b5a22f513a489dda307b9bd5b6d8fe4e34b77 Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 17 Apr 2019 20:18:24 -0400
Subject: [PATCH 26/29] Updating changelog

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fe78731..374d7854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Solid React Application Generator
 
+## 0.4.1 (April 4, 2019)
+
+#### Solid React Application Base
+
+##### Added
+- Profile page now receives updates in real time. If you change your profile elsewhere, such as the data browser, the profile page will immediately be updated to reflect those changes
+- Language Selection dropdown now includes flag icons
+
+##### Removed
+- Welcome page no longer has a logout button
+
+##### Fixed
+- Max image size is now displayed in the error message displayed when the size is exceeded
+- Profile image in top nav is now updated immediately when a new profile image is uploaded
+- Footer now has a mobile-friendly display when resolution is too low
+
 ## 0.4.0 (March 20, 2019)
 
 #### Solid React Application Base

From b7511c215c0402c774159bd70721fffaa7bfd2ee Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 17 Apr 2019 20:23:53 -0400
Subject: [PATCH 27/29] Updating changelog

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 374d7854..acefef28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Solid React Application Generator
 
+## 0.4.2 (April 17, 2019)
+
+#### Solid React Application Base
+
+##### Updated
+* Changed favicon
+* Version number increment for the Solid Style Guide
+* Changed the name of the SDK across the site to "Solid React SDK by inrupt"
+
+##### Fixed
+* Form placeholder text now properly translates to Spanish
+* Responsive top navbar is more consistent in when it appears
+* Language selection dropdown now appears in the responsive top navbar when the user is not logged in
+* [FireFox] Responsive top navbar menu hover state is position properly
+* [Safari] Responsive top navbar hamburger menu list now displays properly
+
+
 ## 0.4.1 (April 4, 2019)
 
 #### Solid React Application Base

From bccdb764d94388e90c8e6325f069ba4568a60aeb Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 17 Apr 2019 20:42:27 -0400
Subject: [PATCH 28/29] Fixing missing tag

---
 .../app/templates/src/layouts/PrivateLayout/private.layout.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
index 192d281b..be1dd220 100644
--- a/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
+++ b/generators/app/templates/src/layouts/PrivateLayout/private.layout.js
@@ -29,7 +29,7 @@ const PrivateLayout = ({ routes, ...rest }) => {
           <LiveUpdate>
             <AuthNavBar {...matchProps} />
           </LiveUpdate>
-          <Fragment>
+          <Content>
             <Switch>
               {routes.map(route => (
                 <Route key={route.id} {...route} exact />

From 542c0161e0d7680dcf27a832b7e0a1578448ccda Mon Sep 17 00:00:00 2001
From: James Martin <james.martin@janeirodigital.com>
Date: Wed, 17 Apr 2019 20:52:16 -0400
Subject: [PATCH 29/29] Minor style tweaks

---
 generators/app/templates/src/containers/Login/login.style.js   | 1 +
 .../app/templates/src/containers/Register/register.style.js    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/generators/app/templates/src/containers/Login/login.style.js b/generators/app/templates/src/containers/Login/login.style.js
index 2b53a215..3c0d356d 100644
--- a/generators/app/templates/src/containers/Login/login.style.js
+++ b/generators/app/templates/src/containers/Login/login.style.js
@@ -5,6 +5,7 @@ export const LoginWrapper = styled(GradientBackground)`
   h1 {
     color: #ffffff;
   }
+  margin-top: 60px;
 `;
 
 export const LoginPanel = styled(Panel)``;
diff --git a/generators/app/templates/src/containers/Register/register.style.js b/generators/app/templates/src/containers/Register/register.style.js
index 1eb78637..821777fc 100644
--- a/generators/app/templates/src/containers/Register/register.style.js
+++ b/generators/app/templates/src/containers/Register/register.style.js
@@ -5,6 +5,9 @@ export const RegisterWrapper = styled.section`
   h1 {
     color: #ffffff;
   }
+  
+  //Todo: figure out why this is necessary
+  margin-top: 100px;
 `;
 
 export const RegisterPanel = styled(Panel)`