john/deighton-ar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

New assets, fixed list box scrolling, header text, etc..

Browse Source
This commit is contained in:
John Lyon-Smith
2018-03-05 15:18:08 -08:00
parent eaf26343b8
commit 535fffaf41
33 changed files with 354 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/src/Auth/Login.js
View File

@@ -62,8 +62,8 @@ export class Login extends Component {
api.login(obj.email, obj.password, obj.rememberMe).then((user) => {
this.setState({ waitModal: false })
if (this.props.history) {
const landing = user.role === 'broker' ? '/broker-dashboard' : 'dashboard'
let url = new URLSearchParams(window.location.search).get('redirect') || landing
let url = new URLSearchParams(window.location.search).get('redirect') || '/'
try {
this.props.history.replace(url)
} catch (error) {
@@ -73,7 +73,7 @@ export class Login extends Component {
}).catch((error) => {
this.setState({
waitModal: false,
messageModal: { icon: 'hold', message: `Unable to login`, detail: error.message }
messageModal: { icon: 'hand', message: `Unable to login`, detail: error.message }
})
})
}