Moved sign in and sign up to main pages directory

compforge/src/pages/SignedOut/SignIn.js → compforge/src/pages/SignIn.js

@@ -12,7 +12,7 @@ import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
 import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import Container from '@material-ui/core/Container';
-import firebase from '../../firebase'
+import firebase from '../firebase'
 
 function Copyright() {
   return (
@@ -56,6 +56,7 @@ export default function SignIn() {
     var password = document.getElementById('password').value;
 
     firebase.auth().signInWithEmailAndPassword(email, password).catch(function (error) {
+      console.log("Signing user " + email + " in.");
       var errorCode = error.code;
       var errorMessage = error.message;
       if (errorCode === 'auth/wrong-password') {
@@ -64,6 +65,17 @@ export default function SignIn() {
         alert(errorMessage);
       }
       console.log(error);
+      console.log("Signed user " + email + " in(?)");
+    });
+
+    firebase.auth().onAuthStateChanged(function (user) {
+      if (user) {
+        console.log("User signed in.");
+
+      }
+      else {
+        console.log("User signed out.");
+      }
     });
   }
 
@@ -112,7 +124,9 @@ export default function SignIn() {
             className={classes.submit}
             onClick={signInUser}
           >
+            <Link to='/'>
               Sign In
+            </Link>
           </Button>
           <Grid container>
             <Grid item xs>

compforge/src/pages/SignedOut/SignUp.js → compforge/src/pages/SignUp.js

@@ -12,7 +12,7 @@ import LockOutlinedIcon from '@material-ui/icons/LockOutlined';
 import Typography from '@material-ui/core/Typography';
 import { makeStyles } from '@material-ui/core/styles';
 import Container from '@material-ui/core/Container';
-import firebase from '../../firebase'
+import firebase from '../firebase'
 
 function Copyright() {
   return (

compforge/src/pages/SignedOut.js

-import React from 'react';
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
-import SignIn from './SignedOut/SignIn';
-import SignUp from './SignedOut/SignUp';
-
-function SignedOut() {
-    return (
-        <Router>
-            <Switch>
-                <Route exact path='/' component={SignIn} />
-                <Route exact path='/SignUp' component={SignUp} />
-            </Switch>
-        </Router>
-    );
-}
-
-export default SignedOut
\ No newline at end of file