Skip to content

WIP - Feature: Sharing PoC #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benoror wants to merge 7 commits into
base: master
Choose a base branch
from
Open

WIP - Feature: Sharing PoC #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25c3456
Ref[shell]: Restore contacts menu item
benoror Jan 17, 2019
d695991
Fix[shell]: Click-on-text only menu items
benoror Jan 17, 2019
ae53550
Ref[router]: Add User routes
benoror Jan 17, 2019
188a07d
Ref[profile]: Fetch user's blockstack & sundly profiles
benoror Jan 22, 2019
08caa2a
Issue: getFile not rejecting the Promise
benoror Jan 22, 2019
a915ba1
Feat[profile]: User not found
benoror Jan 22, 2019
df20190
Style: Remove unused-vars warnings
benoror Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 22 additions & 19 deletions src/Components/Contacts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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`}>
Expand Down
82 changes: 40 additions & 42 deletions src/Components/Global/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,48 +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>
);

Expand Down
Loading