Adding login page redirection.

feature/appm-store/pbac
sinthuja 7 years ago
parent 9f759f8aee
commit 4a880a9715

@ -63,7 +63,6 @@ class Base extends Component {
render() { render() {
this.setState(); this.setState();
if (this.state.user) {
return ( return (
<div className="container"> <div className="container">
<BaseLayout state={this.state}> <BaseLayout state={this.state}>
@ -74,8 +73,6 @@ class Base extends Component {
</div> </div>
) )
} }
return (<Redirect to={"/login"}/>)
}
setState() { setState() {
if (this.props.location.state){ if (this.props.location.state){

@ -21,16 +21,12 @@ import Badge from 'material-ui/Badge';
import React, {Component} from 'react'; import React, {Component} from 'react';
import AppBar from 'material-ui/AppBar'; import AppBar from 'material-ui/AppBar';
import Drawer from 'material-ui/Drawer'; import Drawer from 'material-ui/Drawer';
import {withRouter} from 'react-router-dom';
import IconButton from 'material-ui/IconButton'; import IconButton from 'material-ui/IconButton';
import {List, ListItem} from 'material-ui/List'; import {List, ListItem} from 'material-ui/List';
import Apps from 'material-ui/svg-icons/navigation/apps'; import Apps from 'material-ui/svg-icons/navigation/apps';
import Add from 'material-ui/svg-icons/content/add-circle';
import Feedback from 'material-ui/svg-icons/action/feedback';
import DevicesOther from 'material-ui/svg-icons/hardware/devices-other';
import NotificationsIcon from 'material-ui/svg-icons/social/notifications'; import NotificationsIcon from 'material-ui/svg-icons/social/notifications';
import ActionAccountCircle from 'material-ui/svg-icons/action/account-circle'; import ActionAccountCircle from 'material-ui/svg-icons/action/account-circle';
import FlatButton from 'material-ui/FlatButton'; import { Link } from 'react-router-dom';
/** /**
* Base Layout: * Base Layout:
@ -71,7 +67,7 @@ class BaseLayout extends Component {
); );
} else { } else {
return ( return (
<FlatButton label="Login"/> <Link to='/login'> Login</Link>
); );
} }
} }
@ -82,7 +78,7 @@ class BaseLayout extends Component {
<Badge <Badge
badgeContent={this.state.notifications} badgeContent={this.state.notifications}
secondary={true} secondary={true}
badgeStyle={{top: 12, right: 12}} > badgeStyle={{top: 12, right: 12}}>
<IconButton tooltip="Notifications"> <IconButton tooltip="Notifications">
<NotificationsIcon/> <NotificationsIcon/>
</IconButton> </IconButton>

Loading…
Cancel
Save