User redirect after Signup

frg-fossee · Jun 5, 2020 · 9b29415 · 9b29415
1 parent d6655f1
commit 9b29415
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/eda-frontend/src/components/SchematicEditor/Header.js b/eda-frontend/src/components/SchematicEditor/Header.js
@@ -89,7 +89,7 @@ function Header () {
         noWrap
         className={classes.toolbarTitle}
       >
-        <Link color="inherit" target='blank' component={RouterLink} to="/">
+        <Link color="inherit" target='_blank' component={RouterLink} to="/">
           eSim
         </Link>
       </Typography>
@@ -153,23 +153,23 @@ function Header () {
                 style={{ marginTop: '25px' }}
               >
                 <MenuItem
-                  target='blank'
+                  target='_blank'
                   component={RouterLink}
                   to="/dashboard"
                   onClick={handleClose}
                 >
                   <ListItemText primary={auth.user.username} secondary={auth.user.email} />
                 </MenuItem>
                 <MenuItem
-                  target='blank'
+                  target='_blank'
                   component={RouterLink}
                   to="/dashboard/profile"
                   onClick={handleClose}
                 >
                   My Profile
                 </MenuItem>
                 <MenuItem
-                  target='blank'
+                  target='_blank'
                   component={RouterLink}
                   to="/dashboard/schematics"
                   onClick={handleClose}

diff --git a/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js b/eda-frontend/src/components/SchematicEditor/SchematicToolbar.js
@@ -147,6 +147,8 @@ export default function SchematicToolbar ({ mobileClose }) {
       var title = schSave.title
       var description = schSave.description
       dispatch(saveSchematic(title, description, xml))
+      setMessage('Saved Successfully')
+      handleSnacClick()
     }
   }
 

diff --git a/eda-frontend/src/components/SchematicEditor/SideComp.js b/eda-frontend/src/components/SchematicEditor/SideComp.js
@@ -70,7 +70,7 @@ export default function SideComp ({ component }) {
           </ListItemText>
 
           <ListItemText>
-            <b>Datasheet:</b> <a href={component.data_link} target='blank' >{component.data_link}</a>
+            <b>Datasheet:</b> <a href={component.data_link} rel="noreferrer" target='_blank' >{component.data_link}</a>
           </ListItemText>
 
           <ListItemText>

diff --git a/eda-frontend/src/pages/signUp.js b/eda-frontend/src/pages/signUp.js
@@ -13,8 +13,8 @@ import {
 } from '@material-ui/core'
 import { makeStyles } from '@material-ui/core/styles'
 import LockOutlinedIcon from '@material-ui/icons/LockOutlined'
-import { Link as RouterLink } from 'react-router-dom'
-import { useDispatch } from 'react-redux'
+import { Link as RouterLink, Redirect } from 'react-router-dom'
+import { useSelector, useDispatch } from 'react-redux'
 import { signUp } from '../redux/actions/index'
 
 const useStyles = makeStyles((theme) => ({
@@ -41,6 +41,8 @@ const useStyles = makeStyles((theme) => ({
 export default function SignUp () {
   const classes = useStyles()
 
+  const auth = useSelector(state => state.authReducer)
+
   useEffect(() => {
     document.title = 'Sign Up - eSim '
   })
@@ -50,6 +52,9 @@ export default function SignUp () {
   const [email, setEmail] = useState('')
   const dispatch = useDispatch()
 
+  if (auth.isRegistered) {
+    return <Redirect to="/login" />
+  }
   return (
     <Container component="main" maxWidth="xs">
       <Card className={classes.paper}>

diff --git a/eda-frontend/src/redux/actions/actions.js b/eda-frontend/src/redux/actions/actions.js
@@ -24,6 +24,7 @@ export const AUTHENTICATION_ERROR = 'AUTHENTICATION_ERROR'
 export const LOGIN_FAILED = 'LOGIN_FAILED'
 export const LOGOUT_SUCCESSFUL = 'LOGOUT_SUCCESSFUL'
 export const LOADING_FAILED = 'LOADING_FAILED'
+export const SIGNUP_SUCCESSFUL = 'SIGNUP_SUCCESSFUL'
 
 export const SAVE_SCHEMATICS = 'SAVE_SCHEMATICS'
 export const SET_SCH_SAVED = 'SET_SCH_SAVED'

diff --git a/eda-frontend/src/redux/actions/authActions.js b/eda-frontend/src/redux/actions/authActions.js
@@ -99,7 +99,8 @@ export const signUp = (email, username, password) => (dispatch) => {
 
   api.post('auth/users/', body, config)
     .then((res) => {
-      console.log(res)
+      // console.log(res)
+      dispatch({ type: actions.SIGNUP_SUCCESSFUL })
     })
     .catch((err) => { console.error(err) })
 }

diff --git a/eda-frontend/src/redux/reducers/authReducer.js b/eda-frontend/src/redux/reducers/authReducer.js
@@ -3,6 +3,7 @@ import * as actions from '../actions/actions'
 const initialState = {
   token: localStorage.getItem('esim_token'),
   isAuthenticated: null,
+  isRegistered: null,
   isLoading: false,
   user: null,
   errors: {}
@@ -17,6 +18,13 @@ export default function (state = initialState, action) {
       }
     }
 
+    case actions.SIGNUP_SUCCESSFUL: {
+      return {
+        ...state,
+        isRegistered: true
+      }
+    }
+
     case actions.USER_LOADED: {
       return {
         ...state,