🐛 fix(accounts): Improve disconnected user uix

fixes #36
infoderm · Nov 25, 2018 · e17da92 · e17da92
1 parent 2caa31e
commit e17da92
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/imports/ui/App.js b/imports/ui/App.js
@@ -48,7 +48,7 @@ class App extends React.Component {
 					<WholeWindowDropZone callback={handleDrop(history)}/>
 					<div className={classes.appFrame}>
 						<Header patients={patients} currentUser={currentUser}/>
-						<NavigationDrawer/>
+						<NavigationDrawer currentUser={currentUser}/>
 						<Router currentUser={currentUser} patients={patients}/>
 					</div>
 				</div>

diff --git a/imports/ui/Header.js b/imports/ui/Header.js
@@ -81,13 +81,13 @@ class Header extends React.Component {
 	<Toolbar>
 	  <Typography variant="h6" color="inherit" className={classes.title}>{location.pathname}</Typography>
 	  <div style={{flex:'1 1 auto'}}></div>
-	  <SearchBox
+	  { currentUser && <SearchBox
 	    filter={getSuggestions}
 	    suggestions={suggestions}
 	    itemToString={item => item ? item.label : ''}
 	    onChange={this.handleChange}
 	    stateReducer={this.reduceState}
-	  />
+	  /> }
 	  <AccountsUI currentUser={currentUser}/>
 	</Toolbar>
       </AppBar>

diff --git a/imports/ui/NavigationDrawer.js b/imports/ui/NavigationDrawer.js
@@ -45,7 +45,7 @@ const styles = theme => ({
   drawerHeader: theme.mixins.toolbar,
 });
 
-function NavigationDrawer ( { classes } ) {
+function NavigationDrawer ( { classes, currentUser } ) {
 
   const blocks = [
 
@@ -219,7 +219,7 @@ function NavigationDrawer ( { classes } ) {
           <List>
             {
               links.map( link => (
-                <ListItem key={link.to} disabled={link.disabled} button component={Link} to={link.to}>
+                <ListItem key={link.to} disabled={!currentUser || link.disabled} button component={Link} to={link.to}>
                   <ListItemIcon>{link.icon}</ListItemIcon>
                   <ListItemText primary={link.title}/>
                 </ListItem>

diff --git a/imports/ui/Router.js b/imports/ui/Router.js
@@ -79,6 +79,12 @@ class Main extends React.Component {
 
 		const { classes, patients, currentUser } = this.props;
 
+		if (!currentUser) return (
+			<main className={classes.main}>
+				<Typography variant="h5">Please sign in</Typography>
+			</main>
+		) ;
+
 		return (
 			<main className={classes.main}>
 				<Switch>