From 6ed0bda5f6fd3e8695da1966165286153cfc620f Mon Sep 17 00:00:00 2001
From: pawan-dot <71133473+pawan-dot@users.noreply.github.com>
Date: Fri, 10 Jun 2022 11:32:23 +0530
Subject: [PATCH] goodu

---
 src/App.js                          | 24 +++++++++++++-----------
 src/components/ProtectedRoute.js    | 18 ++++++++++++++++++
 src/index.js                        |  2 +-
 src/views/Directory/EditBisuness.js |  2 +-
 src/views/pages/login/Login.js      | 14 +++++++-------
 5 files changed, 40 insertions(+), 20 deletions(-)
 create mode 100644 src/components/ProtectedRoute.js

diff --git a/src/App.js b/src/App.js
index 5c31532..f2087e7 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,8 +1,11 @@
 import React, { Component } from 'react'
+import axios from 'axios';
 import { BrowserRouter, Route, Switch } from 'react-router-dom'
+import { useState, useEffect } from 'react';
 import './scss/style.scss'
 import ForgotPassword from './views/pages/register/ForgotPassword'
 import NewRegister from './views/pages/register/NewRegister'
+import ProtectedRoute from './components/ProtectedRoute';
 
 const loading = (
   <div className="pt-3 text-center">
@@ -25,23 +28,22 @@ class App extends Component {
       <BrowserRouter>
         <React.Suspense fallback={loading}>
           <Switch>
-            <Route exact path="/" name="Login Page" render={(props) => <Login {...props} />} />
+            < Route exact path="/" name="Login Page" render={(props) => <Login {...props} />} />
+
             <Route exact path="/forgot" name="Forgot Page" render={(props) => <ForgotPassword {...props} />} />
             <Route exact path="/newRegister" name="Register Page" render={(props) => <NewRegister {...props} />} />
 
-
-
-
-            {/* <Route exact path="/comproducts/edit/:_id" name="commerce-product-edit" render={(props) => <EditProducts {...props} />} /> */}
-            {/* <Route
-              exact
-              path="/register"
-              name="Register Page"
-              render={(props) => <Register {...props} />}
-            /> */}
             <Route exact path="/404" name="Page 404" render={(props) => <Page404 {...props} />} />
             <Route exact path="/500" name="Page 500" render={(props) => <Page500 {...props} />} />
+
+
+            {/* localStorage.getItem('authToken') ? */}
             <Route path="/" name="Home" render={(props) => <DefaultLayout {...props} />} />
+            {/* < ProtectedRoute path="/" name="Home" render={(props) => <DefaultLayout {...props} />} /> */}
+
+
+
+
           </Switch>
         </React.Suspense>
       </BrowserRouter>
diff --git a/src/components/ProtectedRoute.js b/src/components/ProtectedRoute.js
new file mode 100644
index 0000000..4bc87db
--- /dev/null
+++ b/src/components/ProtectedRoute.js
@@ -0,0 +1,18 @@
+import React, { useEffect, useState, } from "react";
+import { useHistory } from "react-router-dom";
+const ProtectedRoute = (props) => {
+    let Cmp = props;
+    const history = useHistory();
+    useEffect(() => {
+        if (!localStorage.getItem('authToken'))
+            history.push('/')
+    }, [])
+    return (
+        <>
+            <Cmp />
+            {/* {...props} */}
+        </>
+    )
+}
+
+export default ProtectedRoute
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index dc8165f..34efee9 100644
--- a/src/index.js
+++ b/src/index.js
@@ -11,7 +11,7 @@ import axios from 'axios'
 
 const setupAxios = () => {
   axios.defaults.baseURL = 'https://cms-api-dashboard.herokuapp.com/';
-  // axios.defaults.baseURL = 'http://localhost:5000'
+  //axios.defaults.baseURL = 'http://localhost:5000'
   axios.defaults.headers = {
     'Cache-Control': 'no-cache,no-store',
     'Pragma': 'no-cache',
diff --git a/src/views/Directory/EditBisuness.js b/src/views/Directory/EditBisuness.js
index 70cddc3..9018459 100644
--- a/src/views/Directory/EditBisuness.js
+++ b/src/views/Directory/EditBisuness.js
@@ -102,7 +102,7 @@ const EditBisuness = () => {
         let res = await axios.put(
             `/api/directory/update/${id}`,
             {
-                state,
+                ...state,
             },
             {
                 headers: {
diff --git a/src/views/pages/login/Login.js b/src/views/pages/login/Login.js
index ce7fc8e..ca5ddaf 100644
--- a/src/views/pages/login/Login.js
+++ b/src/views/pages/login/Login.js
@@ -31,8 +31,8 @@ const Login = () => {
   };
 
   const Login = async () => {
-    const res = await axios.post("/owner/signin", auth);
-    if (res.data.status == "ok") {
+    const res = await axios.post("/api/user/login/", auth);
+    if (res.data.success == true) {
       localStorage.setItem("authToken", res.data.token)
       console.log(res.data)
       localStorage.setItem("auth", JSON.stringify({
@@ -61,7 +61,7 @@ const Login = () => {
                 <CCardBody>
                   <CForm>
                     <h1>Login</h1>
-                    <p className="text-medium-emphasis">Sign In to your account</p>
+                    <p className="text-medium-emphasis">Sign In to Your CMP Dashboard Account.</p>
                     <CInputGroup className="mb-3">
                       <CInputGroupText>
                         <CIcon icon={cilUser} />
@@ -93,20 +93,20 @@ const Login = () => {
                     </Link>
                     <br />
 
-                    <CButton color="link" className="px-0">
+                    {/* <CButton color="link" className="px-0">
                       <Link to="/forgot">
                         Forgot password?
                       </Link>
-                    </CButton>
+                    </CButton> */}
 
 
                   </CForm>
                 </CCardBody>
-                <CButton color="" className="px-0">
+                {/* <CButton color="" className="px-0">
                   <Link to="/newRegister">
                     dont have an account? Sign Up
                   </Link>
-                </CButton>
+                </CButton> */}
               </CCard>
 
             </CCardGroup>