Code Refactor and Auth Bug Fixes

Author: amrita019

client/src/CreateAzureServices/Database.js

@@ -1,13 +1,10 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { connect } from "react-redux";
 
 import { userActions } from "../_actions/user.actions.js";
-// import "./HomePage.css";
-// import ServiceTable from "./ServiceTable";
 import NavBar from "../_components/NavBar";
 import SideBar from "../_components/SideBar";
-import { Loader, Modal, Form } from "semantic-ui-react";
+import { Form } from "semantic-ui-react";
 import InputTextField from "../_components/_formcomponents/InputTextField";
 import DropdownSelect from "../_components/_formcomponents/DropdownSelect";
 
@@ -106,14 +103,7 @@ class Database extends React.Component {
   }
 
   render() {
-    const {
-      fields,
-      selectedService,
-      showModal,
-      virtualMachine,
-      showSideBar,
-      provider
-    } = this.state;
+    const { fields, showSideBar, provider } = this.state;
     return (
       <div>
         <NavBar

client/src/CreateAzureServices/VirtualMachine.js

@@ -1,13 +1,10 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { connect } from "react-redux";
 
 import { userActions } from "../_actions/user.actions.js";
-// import "./HomePage.css";
-// import ServiceTable from "./ServiceTable";
 import NavBar from "../_components/NavBar";
 import SideBar from "../_components/SideBar";
-import { Loader, Modal, Form } from "semantic-ui-react";
+import { Form } from "semantic-ui-react";
 import InputTextField from "../_components/_formcomponents/InputTextField";
 import DropdownSelect from "../_components/_formcomponents/DropdownSelect";
 
@@ -84,14 +81,7 @@ class VirtualMachine extends React.Component {
   }
 
   render() {
-    const {
-      fields,
-      selectedService,
-      showModal,
-      virtualMachine,
-      showSideBar,
-      provider
-    } = this.state;
+    const { fields, showSideBar, provider } = this.state;
     return (
       <div>
         <NavBar

client/src/CreateAzureServices/VirtualNetwork.js

@@ -1,13 +1,10 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { connect } from "react-redux";
 
 import { userActions } from "../_actions/user.actions.js";
-// import "./HomePage.css";
-// import ServiceTable from "./ServiceTable";
 import NavBar from "../_components/NavBar";
 import SideBar from "../_components/SideBar";
-import { Loader, Modal, Form } from "semantic-ui-react";
+import { Form } from "semantic-ui-react";
 import InputTextField from "../_components/_formcomponents/InputTextField";
 import DropdownSelect from "../_components/_formcomponents/DropdownSelect";
 
@@ -109,14 +106,7 @@ class VirtualNetwork extends React.Component {
   }
 
   render() {
-    const {
-      fields,
-      selectedService,
-      showModal,
-      virtualMachine,
-      showSideBar,
-      provider
-    } = this.state;
+    const { fields, showSideBar, provider } = this.state;
     return (
       <div>
         <NavBar
@@ -132,29 +122,13 @@ class VirtualNetwork extends React.Component {
             />
           )}
           <div
-            // style={{
-            //   position: "fixed",
-            //   left: showSideBar ? 260 : 0,
-            //   right: 0,
-            //   top: "65px",
-            //   right: 0
-            // }}
             style={{
               margin: 50,
               width: "50%",
               marginLeft: showSideBar ? 250 : 0
             }}
           >
-            <div
-            //   style={{
-            //     maxWidth: "400px",
-            //     margin: "auto",
-            //     marginTop: "20px",
-            //     padding: "20px",
-            //     boxShadow: "0 0 10px rgba(169, 169, 169, 0.33)",
-            //     borderRadius: "5px"
-            //   }}
-            >
+            <div>
               <h1>Virtual Network </h1>
               {provider === "azure" ? (
                 <Form onSubmit={this.submitForm}>

client/src/HomePage/HomePage.js

@@ -1,5 +1,4 @@
 import React from "react";
-import { Link } from "react-router-dom";
 import { connect } from "react-redux";
 
 import { userActions } from "../_actions/user.actions.js";
@@ -14,7 +13,7 @@ class HomePage extends React.Component {
     super(props);
 
     this.state = {
-      selectedService: localStorage.getItem("currentProvider"),
+      selectedService: localStorage.getItem("currentProvider") || "azure",
       user: "",
       showModal: false,
       showSideBar: true,
@@ -45,10 +44,6 @@ class HomePage extends React.Component {
     this.props.dispatch(userActions.getAll(this.state.selectedService));
   }
 
-  // componentWillUnmount() {
-  //   this.props.onRef(undefined);
-  // }
-
   handleServiceChange(serviceName) {
     localStorage.setItem("currentProvider", serviceName);
     this.setState({

client/src/_components/NavBar.js

@@ -6,7 +6,6 @@ import { Dropdown } from "semantic-ui-react";
 class NavBar extends Component {
   constructor(props) {
     super(props);
-    // this._child = React.createRef();
     this.state = { visible: true };
     this.handleShowSideBar = this.handleShowSideBar.bind(this);
   }
@@ -78,14 +77,7 @@ class NavBar extends Component {
                   <a class="item">Logout</a>
                 </div>
               </div>
-              <div class="item">
-                {/* <div
-                  class="ui primary button"
-                  onClick={() => this.onCreateClick()}
-                >
-                  Create
-                </div> */}
-              </div>
+              <div class="item" />
             </div>
           </div>
         </div>

client/src/_components/SideBar.js

@@ -5,7 +5,6 @@ import { history } from "../_helpers/history.js";
 class SideBar extends Component {
   constructor(props) {
     super(props);
-    // this._child = React.createRef();
     this.state = { visible: true };
     this.navActiveState = true;
     this.changeSelectedDashboardService = this.changeSelectedDashboardService.bind(
@@ -27,7 +26,6 @@ class SideBar extends Component {
               ? "ui sidebar vertical left menu overlay visible navActive"
               : "ui sidebar vertical left menu overlay visible"
           }
-          // display="none"
         >
           <div class="ui accordion">
             <a class="item" onClick={() => history.push("/home")}>

client/src/_components/_formcomponents/DropdownSelect.js

@@ -4,15 +4,6 @@ import { Form } from "semantic-ui-react";
 function DropdownSelect({ name, placeholder, required, val, _handleChange }) {
   return (
     <div style={{ marginTop: "10px" }}>
-      {/* <label>{placeholder}</label>
-      <select name={name} required={required} onChange={_handleChange}>
-        <option value="">Select an option</option>
-        {val.map(values => (
-          <option value={values} key={values}>
-            {values}
-          </option>
-        ))}
-      </select> */}
       <Form.Select
         name={name}
         label={name}

client/src/_services/user.services.js

@@ -24,11 +24,13 @@ function login(username, password) {
 
   return fetch(Urls.BASE_URL + Urls.SUB_URL_LOGIN, requestOptions)
     .then(handleResponse)
-    .then(user => {
-      // store user details and jwt token in local storage to keep user logged in between page refreshes
-      localStorage.setItem("user", JSON.stringify(user.data));
-      localStorage.setItem("access_token", user.token);
-      return user;
+    .then(res => {
+      if (res.success) {
+        // store user details and jwt token in local storage to keep user logged in between page refreshes
+        localStorage.setItem("user", JSON.stringify(res.data));
+        localStorage.setItem("access_token", res.token);
+      }
+      return res;
     });
 }
 

server/helpers/listazureservices.js

@@ -23,7 +23,6 @@ module.exports = {
         {
           1: function(callback) {
             vm.list(resourceGroupName).then(res => {
-              console.log("hiii");
               if (res.length > 0) {
                 callback(null, res);
               } else {
@@ -57,9 +56,7 @@ module.exports = {
           Object.entries(results).map(([param1, param2]) => {
             store.insertService(param2[0]);
           });
-          // store.serviceList().then(res => response.json(res));
           store.serviceList().then(res => {
-            console.log("list methodd called");
             resolve();
           });
         }

server/routes/auth.js

@@ -9,7 +9,9 @@ router.post("/signup", jsonParser, function(req, response) {
   const body = req.body;
   store.signUp(body["email"], body["username"], body["password"]).then(res => {
     const user = res.data;
-    res["token"] = utils.generateToken(user);
+    if (res.success) {
+      res["token"] = utils.generateToken(user);
+    }
     response.json(res);
   });
 });
@@ -18,7 +20,9 @@ router.post("/login", jsonParser, function(req, response) {
   const body = req.body;
   store.login(body["username"], body["password"]).then(res => {
     const user = res.data;
-    res["token"] = utils.generateToken(user);
+    if (res.success) {
+      res["token"] = utils.generateToken(user);
+    }
     response.json(res);
   });
 });