Merge branch 'master' of https://github.com/rodaynahassan/Deployment-…

…Int-Elligence
MohamedAboushnief · May 3, 2019 · 44b3669 · 44b3669
2 parents 59bcb6e + 5a2161e
commit 44b3669
Show file tree

Hide file tree

Showing 33 changed files with 252 additions and 174 deletions.
diff --git a/client/package.json b/client/package.json
@@ -51,6 +51,7 @@
 		"redux-thunk": "^2.3.0",
 		"semantic-ui-react": "^0.86.0",
 		"styled-components": "^4.2.0",
+		"sweetalert": "^2.1.2",
 		"validator": "^10.11.0"
 	},
 	"scripts": {

diff --git a/client/src/App.js b/client/src/App.js
@@ -42,6 +42,7 @@ import AttributeArray from './components/pages/AttributeArray';
 import InProgressInvestorCases from './components/pages/inProgressInvestorCases';
 import EditInvCompany from './components/pages/EditInvCompany';
 import EditLawyerCompany from './components/pages/editLawyerForms';
+// import.meta;
 class App extends Component {
 	constructor() {
 		super();

diff --git a/client/src/actions/authentication.js b/client/src/actions/authentication.js
@@ -3,17 +3,20 @@ import axios from 'axios';
 import { GET_ERRORS, SET_CURRENT_USER } from './types';
 import setAuthToken from '../setAuthToken';
 import jwt_decode from 'jwt-decode';
+import swal from 'sweetalert';
+
 
 export const registerUser = (user) => (dispatch) => {
 	axios
 		.post('/routes/api/users/register', user)
 		//.then(res => history.push('/login'))
 		//.catch(err => console.log(err))
 		.then(function(response) {
-			alert("You have registered successfully. Congratulations :)! ")
+			swal("You have registered successfully. Congratulations :)! ")
+
 		})
 		.catch((err) => {
-			alert(err.response.data.error|| err.response.data);
+			swal(err.response.data.error|| err.response.data);
 			console.log(err.response);
 		});
 
@@ -29,7 +32,7 @@ export const registerLR = (user) => (dispatch) => {
 			.then(res => {
 				alert('the account has been created')
 			  })
-			.catch((err) => alert(err.response.data.errmsg || err.response.data));
+			.catch((err) => swal(err.response.data.errmsg || err.response.data));
 	}
 
 	if (user.userType === 'Reviewer') {
@@ -41,7 +44,7 @@ export const registerLR = (user) => (dispatch) => {
 				alert('the account has been created')
 			  })
 			.catch((err) => {
-				alert(err.response.data.errmsg || err.response.data);
+				swal(err.response.data.errmsg || err.response.data);
 				console.log(err.response);
 			});
 	}
@@ -78,7 +81,9 @@ export const loginUser = (user) => (dispatch) => {
 			(err) => {
 				console.log(err);
 				localStorage.setItem('isLoggedIn', false);
-				alert('Wrong email or password');
+				swal("Wrong Email or Password!");
+
+				// alert('wrong password');
 				return err;
 			}
 			// {

diff --git a/client/src/components/pages/AddCommentsLawyer.js b/client/src/components/pages/AddCommentsLawyer.js
@@ -6,8 +6,8 @@ import '../../App.css';
 import GetAllUserForms from '../form/GetAllUserForms'
 import { black } from 'material-ui/styles/colors';
 import { blue200 } from 'material-ui/styles/colors';
-const mongoose = require('mongoose')
-
+import swal from 'sweetalert';
+const mongoose = require('mongoose');
 
 
 class AddCommentsLawyer extends Component{
@@ -104,7 +104,7 @@ class AddCommentsLawyer extends Component{
                 variant="omar"
                 value="Add Comment"
                 style={{width: "110px",backgroundColor:"#a3dbff",color:black}}
-                onClick={() => (this.handleClick(this.props.formId), alert('Comments added Succesfully'))}
+                onClick={() => (this.handleClick(this.props.formId), swal('Comments added Succesfully'))}
                 disabled={!this.validateForm()}
                 >Comment</Button>
                 </Modal.Body>

diff --git a/client/src/components/pages/AddCommentsReviewer.js b/client/src/components/pages/AddCommentsReviewer.js
@@ -5,7 +5,8 @@ import { Modal } from 'react-bootstrap';
 import '../../App.css';
 import { black } from 'material-ui/styles/colors';
 import { blue200 } from 'material-ui/styles/colors';
-const mongoose = require('mongoose')
+import swal from 'sweetalert';
+const mongoose = require('mongoose');
 
 
 
@@ -71,7 +72,7 @@ class AddCommentsReviewer extends Component{
       };
 
       handleEvent = () => {
-        alert("I was clicked");
+        swal("I was clicked");
       };
 
 
@@ -109,7 +110,7 @@ class AddCommentsReviewer extends Component{
                 value="Comment"
                 style={{width: "110px",backgroundColor:"#a3dbff",color:black}}   
                 disabled={!this.validateForm()}
-                onClick={() => (this.handleClick(this.props.formId) , alert('Comments added Succesfully'))}
+                onClick={() => (this.handleClick(this.props.formId) , swal('Comments added Succesfully'))}
                 >Comment</Button>
                 </Modal.Body>
                 <Modal.Footer>

diff --git a/client/src/components/pages/ApprovedCompanies.js b/client/src/components/pages/ApprovedCompanies.js
@@ -1,7 +1,6 @@
 import  React, { Component } from 'react';
 import axios from 'axios';
 import '../../App.css';
-// import ApprovedCompaniesFields from '../user/ApprovedCompaniesFields';
 import Table from 'react-bootstrap/Table'
 import Navbar from 'react-bootstrap/Navbar'
 import {Badge} from 'react-bootstrap'
@@ -16,6 +15,7 @@ import {MDBIcon } from "mdbreact";
 import {Button,Card} from"react-bootstrap"
 import egypt from '../../egypt.jpeg'
 import gafi from '../../gafi.jpeg'
+import swal from 'sweetalert';
 
 
 class ApprovedCompanies extends Component {
@@ -27,18 +27,14 @@ class ApprovedCompanies extends Component {
       axios.defaults.headers.common['Authorization'] = 'Bearer ' + localStorage.getItem('jwtToken');
       axios.get('/routes/api/userDynamicForms/getInvestorApprovedCompanies',{headers: { "Authorization": localStorage.getItem('jwtToken') }})
       .then(res => {
-        if(Array.isArray(res.data.data)){
+        if(Array.isArray(res.data.data)&& res.data.data.length>0){
           this.setState({approvedCompanies: res.data.data,sscManagers:[]})
-
+         }
+         else{
+           swal('You do not have any Approved Companies yet!')
          }
       })
     }
-      // tabRow(){
-      //  return (
-      //   this.state.approvedCompanies.map(function(approvedCompany,i){
-      //   return <ApprovedCompaniesFields approvedCompany={approvedCompany} key={i}/>})
-      //   )
-      // }
 
       printDocument() {
         const input = document.getElementById('divToPrint');

diff --git a/client/src/components/pages/AttributeArray.js b/client/src/components/pages/AttributeArray.js
@@ -5,6 +5,7 @@ import axios from 'axios';
 import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 import AppBar from 'material-ui/AppBar';
 import RaisedButton from 'material-ui/RaisedButton';
+import swal from 'sweetalert';
 import TextField from 'material-ui/TextField';
 import {
 	MDBRow,
@@ -244,10 +245,10 @@ class AttributeArray extends Component {
 		axios
 			.put(apiBaseUrl, payload2, { headers: { Authorization: localStorage.getItem('jwtToken') } })
 			.then(function(response) {
-				alert('The SSC Manager has been created successfully');
+				swal('The SSC Manager has been created successfully');
 			})
 			.catch((error) => {
-				alert(error.response.data.error.details['0'].message||error.response.data.msg || error.response.data.error || error.response.data);
+				swal(error.response.data.error.details['0'].message||error.response.data.msg || error.response.data.error || error.response.data);
 				console.log(error);
 			});
 	};

diff --git a/client/src/components/pages/ChangePassword.js b/client/src/components/pages/ChangePassword.js
@@ -10,6 +10,7 @@ import { MDBRow, MDBCol, MDBInput, MDBBtn } from 'mdbreact';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
 import trans from '../translations/changePasswordTranslation'
+import swal from 'sweetalert';
 var mongoose = require('mongoose');
 
 class ChangePassword extends React.Component {
@@ -34,10 +35,10 @@ class ChangePassword extends React.Component {
 			.then(function(response) {
 				console.log(response);
 				if (response.data.code === 200) {
-					alert('Password updated Succesfully');
+					swal('Password updated Succesfully');
 				}
 			})
-			.catch((err) => alert(err.response.data.errmsg || err.response.data));
+			.catch((err) => swal(err.response.data.errmsg || err.response.data));
 	}
 
 	changeHandler = (event) => {
@@ -108,7 +109,7 @@ class ChangePassword extends React.Component {
 								style={style}
 								disabled={!this.validatePassword()}
 								onClick={(event) => (
-									this.handleClick(event), alert('Password updated Successfully')
+									this.handleClick(event), swal('Password updated Successfully')
 								)}
 							/>
 						</div>

diff --git a/client/src/components/pages/CreateANewCompany.js b/client/src/components/pages/CreateANewCompany.js
@@ -6,6 +6,7 @@ import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
 import AppBar from 'material-ui/AppBar';
 import RaisedButton from 'material-ui/RaisedButton';
 import TextField from 'material-ui/TextField';
+import swal from 'sweetalert';
 import {
 	MDBRow,
 	MDBCol,
@@ -315,13 +316,13 @@ class CreateANewCompany extends Component {
 		axios
 			.post(apiBaseUrl, payload2, { headers: { Authorization: localStorage.getItem('jwtToken') } })
 			.then(function(response) {
-				alert('The Form has been created successfully');
+				swal('The Form has been created successfully');
 			})
 			.catch((error) => {
 				//console.log(error.response.data.error.details['0'].message)
 
 			//	alert(error.response.data.error.details['0'].message)
-				alert(error.response.data.error.details['0'].message || error.response.data.error || error.response.data.errmsg||error.response.data);
+		alert(error.response.data.error.details['0'].message || error.response.data.error || error.response.data.errmsg||error.response.data);
 				//console.log(error);
 			});
 	};

diff --git a/client/src/components/pages/Delete.js b/client/src/components/pages/Delete.js
@@ -0,0 +1,73 @@
+import React, { Component } from 'react';
+import { Button } from 'react-bootstrap';
+import { Modal } from 'react-bootstrap';
+import '../../App.css';
+import swal from 'sweetalert';
+import axios from 'axios';
+import Mongoose from 'mongoose';
+
+class Delete extends Component
+{
+    constructor(props)
+    {
+        super(props);
+    }
+
+    DeleteForm = (formId) => {
+		axios.defaults.headers.common['Authorization'] = localStorage.getItem('jwtToken');
+		axios
+			.delete('/routes/api/userDynamicForms/investorDeleteForm/' + Mongoose.Types.ObjectId(formId), {
+				headers: { Authorization: localStorage.getItem('jwtToken') }
+			})
+			.then((res) => {
+				//document.getElementById('Flip').flipOnClick = false;
+				swal('This case has been deleted successfully!!');
+				setTimeout("document.location.href = '/investorInProgressform';",3500);
+			})
+			.catch((err) => {
+				console.log(err);
+			});
+    };
+
+    render() {
+
+        return (
+            <div >
+
+            <Modal
+                {...this.props}
+                size="lg"
+                aria-labelledby="contained-modal-title-vcenter"
+                centered
+
+            >
+
+            <Modal.Header closeButton >
+                <Modal.Title id="contained-modal-title-vcenter" style={{color:'#64b9e0'}}>
+                Are you sure you want to delete this form?
+                </Modal.Title>
+                </Modal.Header>
+                <Modal.Footer>
+                <Button
+											variant="dark"
+											type="button"
+											onClick={() => (
+												this.DeleteForm(this.props.formId)
+											)}
+											class="btn btn-info"
+
+										>
+											<h3 style={{ color: '#64b9e0', fontSize: '15px' }}>
+												Delete<br />
+												{/* <i class="fas fa-trash" /> */}
+											</h3>
+										</Button>
+                <Button variant='dark' onClick={this.props.onHide} ><h3 style={{ color: '#64b9e0', fontSize: '15px' }} >Cancel</h3></Button>
+                </Modal.Footer>
+            </Modal>
+           </div>
+          )
+    }
+}
+
+export default Delete;
diff --git a/client/src/components/pages/EditInvCompany.js b/client/src/components/pages/EditInvCompany.js
@@ -16,6 +16,8 @@ import DropdownItem from 'react-bootstrap/DropdownItem';
 import Footer from "../layout/footer"
 import { Button } from "react-bootstrap"
 import { conditionalExpression } from '@babel/types';
+import { CommunicationSwapCalls } from 'material-ui/svg-icons';
+import swal from 'sweetalert';
 
 var mongoose = require('mongoose')
 
@@ -273,6 +275,7 @@ class EditInvCompany extends Component {
         handleClick = (error) => {
             error.preventDefault();
             console.log("hey")
+            swal('Form editted successfully')
             // console.log(this.state.certainFormType)
             const keys = this.state.certainFormType["0"]
             //const keys = Object.keys(this.state.certainFormType)
@@ -307,7 +310,7 @@ class EditInvCompany extends Component {
             axios.put(apiBaseUrl, payload2, { headers: { "Authorization": localStorage.getItem('jwtToken') } })
                 .then(function (response) {
 
-                    alert('The Form has been updated successfully');
+                    CommunicationSwapCalls('The Form has been updated successfully');
 
                 })
                 .catch((error) => {

diff --git a/client/src/components/pages/EditProfile.js b/client/src/components/pages/EditProfile.js
@@ -10,6 +10,7 @@ import { MDBRow, MDBCol, MDBInput, MDBBtn, MDBSelect } from 'mdbreact';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
 import trans from '../translations/editProfileTranslation'
+import swal from 'sweetalert';
 var mongoose = require('mongoose');
 
 class EditProfile extends React.Component {
@@ -80,10 +81,10 @@ class EditProfile extends React.Component {
 		axios
 			.put(apiBaseUrl, payload, { headers: { Authorization: localStorage.getItem('jwtToken') } })
 			.then(function(response) {
-				alert('The profile has been updated successfully');
+				swal('The profile has been updated successfully');
 			})
 			.catch((error) => {
-				alert(error.response.data.errmsg || error.response.data);
+				swal(error.response.data.errmsg || error.response.data);
 				console.log(error);
 			});
 	}

diff --git a/client/src/components/pages/EditSPCForm.js b/client/src/components/pages/EditSPCForm.js
@@ -9,6 +9,7 @@ import TextField from 'material-ui/TextField';
 import { MDBRow, MDBCol, MDBInput, MDBBtn } from 'mdbreact';
 import DropDownMenu from 'material-ui/DropDownMenu';
 import MenuItem from 'material-ui/MenuItem';
+import swal from 'sweetalert';
 var mongoose = require('mongoose');
 
 class EditSPCForm extends React.Component {
@@ -49,7 +50,7 @@ class EditSPCForm extends React.Component {
 					equityCapital: response.data.data.equityCapital
 				});
 			})
-			.catch((err) => alert(err.response.data.errmsg || err.response.data));
+			.catch((err) => swal(err.response.data.errmsg || err.response.data));
 		axios.get('/routes/api/governorates/').then((res) => {
 			this.setState({ governorate: res.data.data });
 		});
@@ -72,10 +73,10 @@ class EditSPCForm extends React.Component {
 		axios
 			.put(apiBaseUrl, payload, { headers: { Authorization: localStorage.getItem('jwtToken') } })
 			.then(function(response) {
-				alert('The SPC form has been updated successfully');
+				swal('The SPC form has been updated successfully');
 			})
 			.catch((error) => {
-				alert(error.response.data.errmsg || error.response.data);
+				swal(error.response.data.errmsg || error.response.data);
 				console.log(error);
 			});
 	}