Merge pull request #49 from acmutd/update/editing-alert

update/editing-alert
acmutd · May 18, 2020 · 38b54ec · 38b54ec
2 parents 7159214 + 204e9e3
commit 38b54ec
Show file tree

Hide file tree

Showing 9 changed files with 316 additions and 170 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/App.js b/src/App.js
@@ -4,25 +4,11 @@ import User from "./Components/User/User";
 import Pricing from "./Components/Pages/Pricing";
 import Error404 from "./Components/Pages/Error404";
 import { Route, Switch } from "react-router-dom";
-import firebase from "firebase";
-
-const firebaseConfig = {
-  apiKey: "AIzaSyC10N5kRDieKncmUESxswqkYQ_359f9Qes",
-  authDomain: "trackit-271619.firebaseapp.com",
-  databaseURL: "https://trackit-271619.firebaseio.com",
-  projectId: "trackit-271619",
-  storageBucket: "trackit-271619.appspot.com",
-  messagingSenderId: "972365141905",
-  appId: "1:972365141905:web:fbda064275f635298cec30",
-  measurementId: "G-HRLPFBGB1E",
-};
-
-let app = firebase.initializeApp(firebaseConfig);
+import app from "./Components/Firebase/firebase";
 
 function App() {
   return (
     <div>
-      {/* replace this with <User /> when wanting to test out the user side, we can decide at a later point when the admin side should appear and when the user side should apper */}
       <Switch>
         <Route path="/" render = {(props) => <User database = {app} />} exact />
         <Route path="/admin" render = {(props) => <Admin database = {app} />} exact />

diff --git a/src/Components/Admin/Admin.js b/src/Components/Admin/Admin.js
@@ -15,6 +15,9 @@ class Admin extends React.Component {
     workshop_data: null,
     student_data: null,
     dataLoaded: false,
+
+    alert: false,
+    alertText: "Unknown error occured",
   };
 
   /**
@@ -41,7 +44,6 @@ class Admin extends React.Component {
             .then((doc) => {
               // if the user has admin acess then set loggedIn to true
               if (doc.data().isAdmin === true) {
-                console.log("logging user in");
                 this.setState({
                   loggedIn: true,
                 });
@@ -62,6 +64,10 @@ class Admin extends React.Component {
               }
             })
             .catch((error) => {
+              this.setState({
+                alert: true,
+                alertText: error + " Error occurred in login process",
+              });
               console.log(error + " error occurred in login process");
             });
         }
@@ -168,6 +174,10 @@ class Admin extends React.Component {
         console.log("workshop level successfully updated");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in updating workshop level",
+        });
         console.log(error + " error occurred in updating workshop level");
       });
   };
@@ -190,6 +200,10 @@ class Admin extends React.Component {
         console.log("workshop status successfully updated");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in updating workshop status",
+        });
         console.log(error + " error occurred in updating workshop status");
       });
   };
@@ -211,6 +225,10 @@ class Admin extends React.Component {
         console.log("All student progress successfully cleared");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in erasing student progress",
+        });
         console.log(error + " error occured in erasing student progress");
       });
   };
@@ -237,6 +255,10 @@ class Admin extends React.Component {
         console.log("updating workshop successful");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in updating workshop",
+        });
         console.log(error + " error occurred in updating workshop");
       });
 
@@ -252,6 +274,10 @@ class Admin extends React.Component {
         console.log("workshop level successfully reset to 1");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in reseting workshop level to 1",
+        });
         console.log(error + " error occurred in reseting workshop level to 1");
       });
   };
@@ -279,6 +305,10 @@ class Admin extends React.Component {
         console.log("empty students at workshop entry created");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in adding empty students at workshop object",
+        });
         console.log(
           error + " error occured in adding empty sudents at workshop object"
         );
@@ -294,6 +324,10 @@ class Admin extends React.Component {
         console.log("new workshop created");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in creating new workshop",
+        });
         console.log(error + " error occurred in creating new workshop");
       });
   };
@@ -312,6 +346,10 @@ class Admin extends React.Component {
         console.log("successfully deleted students at workshop");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in deleting students at workshop",
+        });
         console.log(error + " error occurred in deleting students at workshop");
       });
 
@@ -324,6 +362,10 @@ class Admin extends React.Component {
         console.log("successfully deleted workshop");
       })
       .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in deleting workshop",
+        });
         console.log(error + " error occurred in deleting workshop");
       });
   };
@@ -345,11 +387,22 @@ class Admin extends React.Component {
           dataLoaded: false,
         });
       })
-      .catch((err) => {
-        console.log("error signing user out");
+      .catch((error) => {
+        this.setState({
+          alert: true,
+          alertText: error + " Error occurred in signing out the user",
+        });
+        console.log(error + " error signing user out");
       });
   };
 
+  resetAlertStatus = () => {
+    this.setState({
+      alert: false,
+      alertText: "Unknown error occurred",
+    })
+  }
+
   /**
    * renders the page
    */
@@ -374,6 +427,9 @@ class Admin extends React.Component {
             workshopListener={this.workshopListener}
             signOut={this.signOutUser}
             dataLoaded={this.state.workshop_data && this.state.student_data}
+            alert={this.state.alert}
+            alertText={this.state.alertText}
+            resetAlertStatus={this.resetAlertStatus}
           />
         ) : (
           <AdminAuth