From 25c3456056365512bdd4997309cd13ef231ac4ba Mon Sep 17 00:00:00 2001
From: Ben Orozco <benoror@gmail.com>
Date: Thu, 17 Jan 2019 16:09:25 -0600
Subject: [PATCH 1/7] Ref[shell]: Restore contacts menu item

---
 src/Components/Global/Header.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Components/Global/Header.js b/src/Components/Global/Header.js
index c2f95fb..a99ba3e 100644
--- a/src/Components/Global/Header.js
+++ b/src/Components/Global/Header.js
@@ -154,7 +154,6 @@ class Header extends Component {
             <ListItemText primary="Timeline" />
           </Link>
         </ListItem>
-        {/**}
         <ListItem button>
           <ListItemIcon>
             <ContactsIcon />
@@ -163,7 +162,6 @@ class Header extends Component {
             <ListItemText primary="Contacts" />
           </Link>
         </ListItem>
-        {**/}
         <ListItem button>
           <ListItemIcon>
             <SettingsIcon />

From d69599179435af27af05993b4ae70dfa71f91fa2 Mon Sep 17 00:00:00 2001
From: Ben Orozco <benoror@gmail.com>
Date: Thu, 17 Jan 2019 16:11:49 -0600
Subject: [PATCH 2/7] Fix[shell]: Click-on-text only menu items

Part of: https://github.com/Sundly/sundly/issues/13
---
 src/Components/Global/Header.js | 80 ++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/Components/Global/Header.js b/src/Components/Global/Header.js
index a99ba3e..5a2fa1d 100644
--- a/src/Components/Global/Header.js
+++ b/src/Components/Global/Header.js
@@ -138,46 +138,46 @@ class Header extends Component {
 
     const mainList = (
       <List component="nav">
-        <ListItem button>
-          <ListItemIcon>
-            <AccountCircle />
-          </ListItemIcon>
-          <Link to="/">
-            <ListItemText primary="Profile" />
-          </Link>
-        </ListItem>
-        <ListItem button>
-          <ListItemIcon>
-            <TimelineIcon />
-          </ListItemIcon>
-          <Link to="/timeline">
-            <ListItemText primary="Timeline" />
-          </Link>
-        </ListItem>
-        <ListItem button>
-          <ListItemIcon>
-            <ContactsIcon />
-          </ListItemIcon>
-          <Link to="/contacts">
-            <ListItemText primary="Contacts" />
-          </Link>
-        </ListItem>
-        <ListItem button>
-          <ListItemIcon>
-            <SettingsIcon />
-          </ListItemIcon>
-          <Link to="/settings">
-            <ListItemText primary="Settings" />
-          </Link>
-        </ListItem>
-        <ListItem button>
-          <ListItemIcon>
-            <LogoutIcon />
-          </ListItemIcon>
-          <Link to="/logout">
-            <ListItemText primary="Logout" />
-          </Link>
-        </ListItem>
+        <Link to="/">
+          <ListItem button>
+            <ListItemIcon>
+              <AccountCircle />
+            </ListItemIcon>
+              <ListItemText primary="Profile" />
+          </ListItem>
+        </Link>
+        <Link to="/timeline">
+          <ListItem button>
+            <ListItemIcon>
+              <TimelineIcon />
+            </ListItemIcon>
+              <ListItemText primary="Timeline" />
+          </ListItem>
+        </Link>
+        <Link to="/contacts">
+          <ListItem button>
+            <ListItemIcon>
+              <ContactsIcon />
+            </ListItemIcon>
+              <ListItemText primary="Contacts" />
+          </ListItem>
+        </Link>
+        <Link to="/settings">
+          <ListItem button>
+            <ListItemIcon>
+              <SettingsIcon />
+            </ListItemIcon>
+              <ListItemText primary="Settings" />
+          </ListItem>
+        </Link>
+        <Link to="/logout">
+          <ListItem button>
+            <ListItemIcon>
+              <LogoutIcon />
+            </ListItemIcon>
+              <ListItemText primary="Logout" />
+          </ListItem>
+        </Link>
       </List>
     );
 

From ae53550cd4469bad2d7f810584b7c98e2d9100c4 Mon Sep 17 00:00:00 2001
From: Ben Orozco <benoror@gmail.com>
Date: Thu, 17 Jan 2019 16:13:43 -0600
Subject: [PATCH 3/7] Ref[router]: Add User routes

---
 src/Components/Contacts/index.js | 41 +++++++++++++++++---------------
 src/private-routes.js            |  8 ++++---
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/Components/Contacts/index.js b/src/Components/Contacts/index.js
index 6e89af7..51bff32 100644
--- a/src/Components/Contacts/index.js
+++ b/src/Components/Contacts/index.js
@@ -1,6 +1,7 @@
 // Dependencies
 import React from "react";
 import PropTypes from "prop-types";
+import { Link } from 'react-router-dom';
 
 // Styles
 import { withStyles } from "@material-ui/core/styles";
@@ -78,25 +79,27 @@ class Contacts extends React.Component {
           <Grid item xs={12}>
             <List>
               {this.state.contacts.map(contact => (
-                <ListItem
-                  key={contact.id}
-                  dense
-                  button
-                  className={classes.listItem}
-                >
-                  <Avatar
-                    src={`https://api.adorable.io/avatars/285/${contact.name}.png`}
-                  />
-                  <ListItemText
-                    primary={contact.name}
-                    secondary={contact.specialty}
-                  />
-                  <ListItemSecondaryAction>
-                    <IconButton aria-label="Comments">
-                      <ShareIcon />
-                    </IconButton>
-                  </ListItemSecondaryAction>
-                </ListItem>
+                <Link to={`/user/${contact.id}`}>
+                  <ListItem
+                    key={contact.id}
+                    dense
+                    button
+                    className={classes.listItem}
+                  >
+                    <Avatar
+                      src={`https://api.adorable.io/avatars/285/${contact.name}.png`}
+                    />
+                    <ListItemText
+                      primary={contact.name}
+                      secondary={contact.specialty}
+                    />
+                    <ListItemSecondaryAction>
+                      <IconButton aria-label="Comments">
+                        <ShareIcon />
+                      </IconButton>
+                    </ListItemSecondaryAction>
+                  </ListItem>
+                </Link>
               ))}
             </List>
             <Button variant="fab" className={classes.fab} color={`primary`}>
diff --git a/src/private-routes.js b/src/private-routes.js
index 6faf5dd..20825a5 100644
--- a/src/private-routes.js
+++ b/src/private-routes.js
@@ -13,9 +13,11 @@ const PrivateRoutes = () =>
 <App>
     <Switch>
         <Route exact path ="/" component={Profile}/>
-        <Route exact path ="/contacts" component={Contacts}/>
-        <Route exact path ="/timeline" component={TimeLine}/>
-        <Route exact path ="/settings" component={Settings}/>
+        <Route path ="/contacts" component={Contacts}/>
+        <Route path ="/timeline" component={TimeLine}/>
+        <Route path ="/settings" component={Settings}/>
+        <Route exact path ="/user/:username" component={Profile}/>
+        <Route exact path ="/user/:username/timeline" component={TimeLine}/>
     </Switch>
 </App>
 

From 188a07dcb94ed26ab0f4ee601df81586ac5ffc30 Mon Sep 17 00:00:00 2001
From: Ben Orozco <benoror@gmail.com>
Date: Mon, 21 Jan 2019 21:50:35 -0600
Subject: [PATCH 4/7] Ref[profile]: Fetch user's blockstack & sundly profiles

---
 src/Components/Profile/index.js | 42 ++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/src/Components/Profile/index.js b/src/Components/Profile/index.js
index 0f32b2f..0b1b186 100644
--- a/src/Components/Profile/index.js
+++ b/src/Components/Profile/index.js
@@ -88,26 +88,47 @@ class Profile extends React.Component {
     super(props)
 
     this.state = {
-      user: blockstack.loadUserData(),
+      user: {
+        profile: {}
+      },
       sundlyProfile: {
         firstName: '',
         lastName: '',
         sex: '',
         dob: '',
       },
+      userNotFound: false,
       open: false,
     }
 
     this.handleChange = this.handleChange.bind(this)
   }
 
-  fetchProfile() {
-    blockstack.getFile(STORAGE_FILE).then((profileText) => {
-      const sundlyProfile = JSON.parse(profileText)
-      if(!!sundlyProfile && !!sundlyProfile.firstName) {
-        this.setState({ sundlyProfile })
-      }
-    })
+  fetchBlockstackProfile(username) {
+    if(username) {
+      return blockstack.lookupProfile(username)
+        .then((profile) => {
+          return this.setState({ user: { profile } })
+        })
+        .catch((error) => {
+          console.log(`could not resolve '${username}' profile`)
+          console.log(error)
+        })
+    } else {
+      return this.setState({ user: blockstack.loadUserData() })
+    }
+  }
+
+  fetchProfile(username) {
+    const prefix = username ? `shared/${username}/` : '';
+
+    blockstack.getFile(`${prefix}${STORAGE_FILE}`)
+      .then((profileText) => {
+        const sundlyProfile = JSON.parse(profileText)
+        if(!!sundlyProfile && !!sundlyProfile.firstName) {
+          this.setState({ sundlyProfile })
+        }
+      })
   }
 
   saveProfile() {
@@ -136,7 +157,10 @@ class Profile extends React.Component {
   }
 
   componentDidMount() {
-    this.fetchProfile()
+    const { match: { params: { username } } } = this.props
+
+    this.fetchBlockstackProfile(username)
+    this.fetchProfile(username)
   }
 
   render() {

From 08caa2a3543230c2bdbe935b40c4caee3e862031 Mon Sep 17 00:00:00 2001
From: Ben Orozco <benoror@gmail.com>
Date: Mon, 21 Jan 2019 22:00:09 -0600
Subject: [PATCH 5/7] Issue: getFile not rejecting the Promise

https://github.com/blockstack/blockstack.js/issues/601
---
 src/Components/Profile/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Components/Profile/index.js b/src/Components/Profile/index.js
index 0b1b186..a1dd8ae 100644
--- a/src/Components/Profile/index.js
+++ b/src/Components/Profile/index.js
@@ -111,7 +111,7 @@ class Profile extends React.Component {
           return this.setState({ user: { profile } })
         })
         .catch((error) => {
-          console.log(`could not resolve '${username}' profile`)
+          console.log(`could not resolve blockstack profile for '${username}'`)
           console.log(error)
         })
     } else {
@@ -124,11 +124,16 @@ class Profile extends React.Component {
 
     blockstack.getFile(`${prefix}${STORAGE_FILE}`)
       .then((profileText) => {
+        console.log(profileText)
         const sundlyProfile = JSON.parse(profileText)
         if(!!sundlyProfile && !!sundlyProfile.firstName) {
           this.setState({ sundlyProfile })
         }
       })
+      .catch((error) => {
+        console.log(`error getting Sundly profile for ${username}`)
+        console.log(error)
+      })
   }
 
   saveProfile() {

From a915ba113c33dfe9663316eb7534fa1590497db7 Mon Sep 17 00:00:00 2001
From: Ben Orozco <benoror@gmail.com>
Date: Mon, 21 Jan 2019 22:51:57 -0600
Subject: [PATCH 6/7] Feat[profile]: User not found

---
 src/Components/Profile/index.js | 193 +++++++++++++++++---------------
 1 file changed, 103 insertions(+), 90 deletions(-)

diff --git a/src/Components/Profile/index.js b/src/Components/Profile/index.js
index a1dd8ae..a36c7a8 100644
--- a/src/Components/Profile/index.js
+++ b/src/Components/Profile/index.js
@@ -124,13 +124,16 @@ class Profile extends React.Component {
 
     blockstack.getFile(`${prefix}${STORAGE_FILE}`)
       .then((profileText) => {
-        console.log(profileText)
+        if(!profileText) {
+          throw Error(profileText);
+        }
         const sundlyProfile = JSON.parse(profileText)
         if(!!sundlyProfile && !!sundlyProfile.firstName) {
           this.setState({ sundlyProfile })
         }
       })
       .catch((error) => {
+        this.setState({ userNotFound: true })
         console.log(`error getting Sundly profile for ${username}`)
         console.log(error)
       })
@@ -186,98 +189,108 @@ class Profile extends React.Component {
             </Typography>
           </Paper>
         </Grid>
-        <Grid item xs={12}>
-          <Paper className={classes.paper}>
-            <Typography variant="title" gutterBottom>
-              Clinical Profile:
-            </Typography>
-            <form className={classes.form} noValidate autoComplete="off">
-              <FormControl className={classes.formControl}>
-                <InputLabel shrink htmlFor="firstName">First Name</InputLabel>
-                <TextField
-                  required
-                  id="firstName"
-                  name="firstName"
-                  autoComplete="fname"
-                  value={this.state.sundlyProfile.firstName}
-                  onChange={this.handleChange}
-                  margin="normal"
-                />
-              </FormControl>
-              <FormControl className={classes.formControl}>
-                <InputLabel shrink htmlFor="lastName">Last Name</InputLabel>
-                <TextField
-                  required
-                  id="lastName"
-                  name="lastName"
-                  autoComplete="lname"
-                  value={this.state.sundlyProfile.lastName}
-                  onChange={this.handleChange}
-                  margin="normal"
-                />
-              </FormControl>
-              <FormControl className={classes.formControl}>
-                <InputLabel shrink htmlFor="sex">
-                  Biological Sex
-                </InputLabel>
-                <Select
-                  value={this.state.sundlyProfile.sex}
-                  onChange={this.handleChange}
-                  input={<Input name="sex" id="sex" />}
-                >
-                  <MenuItem value={'m'}>Male</MenuItem>
-                  <MenuItem value={'f'}>Female</MenuItem>
-                </Select>
-              </FormControl>
-              <FormControl className={classes.formControl}>
-                <InputLabel shrink htmlFor="dob">Date of Birth</InputLabel>
-                <TextField
-                  required
-                  type="date"
-                  id="dob"
-                  name="dob"
-                  autoComplete="dob"
-                  value={moment(this.state.sundlyProfile.dob).format('YYYY-MM-DD')}
-                  onChange={this.handleChange}
-                  margin="normal"
-                />
-              </FormControl>
-            </form>
-          </Paper>
-          <Grid container spacing={24} style={{ marginLeft: 20, marginTop: 10}}>
-            <Grid item xs={4}>
-              <Button variant="fab" color={`primary`}>
-                <Link to="/timeline">
-                  <TimelineIcon />
-                </Link>
-              </Button>
-            </Grid>
-            <Grid item xs={4}>
-              <Button variant="fab" color={`primary`}>
-                <Link to="/contacts">
-                  <Share />
-                </Link>
-              </Button>
-            </Grid>
-            <Grid item xs={4}>
-              <Button variant="fab" color={`primary`}>
-                <BorderBottom onClick={this.handleOpen} />
-                <Modal
-                  aria-labelledby="simple-modal-title"
-                  aria-describedby="simple-modal-description"
-                  open={this.state.open}
-                  onClose={this.handleClose}
-                >
-                  <div style={getModalStyle()}>
-                    <img src={qrGoolge} alt="google"/>
-                  </div>
-                </Modal>
-              </Button>
+        {this.state.userNotFound ? (
+          <Grid item xs={12}>
+            <Paper className={classes.paper}>
+              <Typography variant="headline" gutterBottom>
+                User {this.props.match.params.username} hasn't shared their records with you
+              </Typography>
+            </Paper>
+          </Grid>
+        ) : (
+          <Grid item xs={12}>
+            <Paper className={classes.paper}>
+              <Typography variant="title" gutterBottom>
+                Clinical Profile:
+              </Typography>
+              <form className={classes.form} noValidate autoComplete="off">
+                <FormControl className={classes.formControl}>
+                  <InputLabel shrink htmlFor="firstName">First Name</InputLabel>
+                  <TextField
+                    required
+                    id="firstName"
+                    name="firstName"
+                    autoComplete="fname"
+                    value={this.state.sundlyProfile.firstName}
+                    onChange={this.handleChange}
+                    margin="normal"
+                  />
+                </FormControl>
+                <FormControl className={classes.formControl}>
+                  <InputLabel shrink htmlFor="lastName">Last Name</InputLabel>
+                  <TextField
+                    required
+                    id="lastName"
+                    name="lastName"
+                    autoComplete="lname"
+                    value={this.state.sundlyProfile.lastName}
+                    onChange={this.handleChange}
+                    margin="normal"
+                  />
+                </FormControl>
+                <FormControl className={classes.formControl}>
+                  <InputLabel shrink htmlFor="sex">
+                    Biological Sex
+                  </InputLabel>
+                  <Select
+                    value={this.state.sundlyProfile.sex}
+                    onChange={this.handleChange}
+                    input={<Input name="sex" id="sex" />}
+                  >
+                    <MenuItem value={'m'}>Male</MenuItem>
+                    <MenuItem value={'f'}>Female</MenuItem>
+                  </Select>
+                </FormControl>
+                <FormControl className={classes.formControl}>
+                  <InputLabel shrink htmlFor="dob">Date of Birth</InputLabel>
+                  <TextField
+                    required
+                    type="date"
+                    id="dob"
+                    name="dob"
+                    autoComplete="dob"
+                    value={moment(this.state.sundlyProfile.dob).format('YYYY-MM-DD')}
+                    onChange={this.handleChange}
+                    margin="normal"
+                  />
+                </FormControl>
+              </form>
+            </Paper>
+            <Grid container spacing={24} style={{ marginLeft: 20, marginTop: 10}}>
+              <Grid item xs={4}>
+                <Button variant="fab" color={`primary`}>
+                  <Link to="/timeline">
+                    <TimelineIcon />
+                  </Link>
+                </Button>
+              </Grid>
+              <Grid item xs={4}>
+                <Button variant="fab" color={`primary`}>
+                  <Link to="/contacts">
+                    <Share />
+                  </Link>
+                </Button>
+              </Grid>
+              <Grid item xs={4}>
+                <Button variant="fab" color={`primary`}>
+                  <BorderBottom onClick={this.handleOpen} />
+                  <Modal
+                    aria-labelledby="simple-modal-title"
+                    aria-describedby="simple-modal-description"
+                    open={this.state.open}
+                    onClose={this.handleClose}
+                  >
+                    <div style={getModalStyle()}>
+                      <img src={qrGoolge} alt="google"/>
+                    </div>
+                  </Modal>
+                </Button>
+              </Grid>
             </Grid>
           </Grid>
-        </Grid>
+        )}
       </Grid>
-    );
+    )
   }
 }
 

From df20190520040e681f2e511f1c075e7463eb49b2 Mon Sep 17 00:00:00 2001
From: Ben Orozco <benoror@gmail.com>
Date: Mon, 21 Jan 2019 23:00:40 -0600
Subject: [PATCH 7/7] Style: Remove unused-vars warnings

---
 src/Components/Settings/index.js | 1 -
 src/Components/Timeline/index.js | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Components/Settings/index.js b/src/Components/Settings/index.js
index ec32e06..590420f 100644
--- a/src/Components/Settings/index.js
+++ b/src/Components/Settings/index.js
@@ -1,6 +1,5 @@
 import React from "react";
 import PropTypes from "prop-types";
-import classNames from "classnames";
 import { withStyles } from "@material-ui/core/styles";
 import Grid from "@material-ui/core/Grid";
 import Paper from "@material-ui/core/Paper";
diff --git a/src/Components/Timeline/index.js b/src/Components/Timeline/index.js
index 9a86251..03a9940 100644
--- a/src/Components/Timeline/index.js
+++ b/src/Components/Timeline/index.js
@@ -1,11 +1,10 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { Link } from "react-router-dom";
 import { withStyles } from "@material-ui/core/styles";
 import classNames from 'classnames';
 import Grid from "@material-ui/core/Grid";
 import Paper from "@material-ui/core/Paper";
-import { Formik, Field, FieldArray, Form } from 'formik';
+import { Formik, Field, Form } from 'formik';
 import TextField from "@material-ui/core/TextField";
 import Button from "@material-ui/core/Button";
 import InputAdornment from '@material-ui/core/InputAdornment';