From 518502f62b9ff46e04cf9d3fd5654673fc913c2f Mon Sep 17 00:00:00 2001 From: pawan-dot <71133473+pawan-dot@users.noreply.github.com> Date: Tue, 9 Aug 2022 16:43:28 +0530 Subject: [PATCH] check --- src/App.js | 10 +++++----- src/components/AppFooter.js | 2 +- src/components/AppHeader.js | 2 +- src/components/AppSidebar.js | 2 +- src/index.js | 4 ++-- src/views/Banners/AddBanner.js | 2 +- src/views/Banners/Banner.js | 2 +- src/views/Banners/EditBanner.js | 2 +- src/views/Category/Category.js | 2 +- src/views/Directory/Add_Business.js | 4 ++-- src/views/Directory/Bisuness.js | 4 ++-- src/views/Directory/EditBisuness.js | 4 ++-- src/views/Directory/View_Bisuness.js | 2 +- src/views/Events/Event.js | 4 ++-- src/views/Events/ViewEvent.js | 1 - src/views/News/News.js | 2 +- src/views/News/ViewNews.js | 3 +-- src/views/Offers/AddOffer.js | 4 ++-- src/views/Offers/EditOffer.js | 4 ++-- src/views/Offers/Offer.js | 2 +- src/views/Offers/ViewOffer.js | 1 - src/views/pages/login/Login.js | 27 +++++++++++++++++++++++---- 22 files changed, 53 insertions(+), 37 deletions(-) diff --git a/src/App.js b/src/App.js index 1fe7b05..3aaec53 100644 --- a/src/App.js +++ b/src/App.js @@ -43,9 +43,9 @@ const App = () => { Authorization: `Bearer ${token}`, }, }) - //console.log(response) + // console.log(response.data) const data = response.data - if (data.success) { + if (data.success && data.user.role === 'admin') { setUserData(data.user); } else { @@ -77,10 +77,10 @@ const App = () => { - {/* ( - userdata && userdata?._id ? : + ( + userdata?.role === "admin" ? : userdata === false ? :
- )} /> */} + )} /> } /> diff --git a/src/components/AppFooter.js b/src/components/AppFooter.js index 90a810f..595a64b 100644 --- a/src/components/AppFooter.js +++ b/src/components/AppFooter.js @@ -6,7 +6,7 @@ const AppFooter = () => {
- {new Date().getFullYear()} © CMP. + {new Date().getFullYear()} © Sales Champions.
diff --git a/src/components/AppHeader.js b/src/components/AppHeader.js index 6ebfec6..d08bd5d 100644 --- a/src/components/AppHeader.js +++ b/src/components/AppHeader.js @@ -32,7 +32,7 @@ const AppHeader = () => { -

CMP

+

Sales Champions

 diff --git a/src/components/AppSidebar.js b/src/components/AppSidebar.js index a87d30a..25d33ea 100644 --- a/src/components/AppSidebar.js +++ b/src/components/AppSidebar.js @@ -31,7 +31,7 @@ const AppSidebar = () => { > {/* */} -

CMP

+

Sales Champions

{/* */} diff --git a/src/index.js b/src/index.js index 05329e4..4e23415 100644 --- a/src/index.js +++ b/src/index.js @@ -11,8 +11,8 @@ import store from './store' import axios from 'axios' const setupAxios = () => { - axios.defaults.baseURL = 'https://cms-api-dashboard.herokuapp.com/'; - // axios.defaults.baseURL = 'http://localhost:5000' + // axios.defaults.baseURL = 'https://cms-api-dashboard.herokuapp.com/'; + axios.defaults.baseURL = 'http://localhost:5000' axios.defaults.headers = { 'Cache-Control': 'no-cache,no-store', 'Pragma': 'no-cache', diff --git a/src/views/Banners/AddBanner.js b/src/views/Banners/AddBanner.js index 532c2bb..c2ce71a 100644 --- a/src/views/Banners/AddBanner.js +++ b/src/views/Banners/AddBanner.js @@ -185,7 +185,7 @@ const AddBanner = () => { {category.map((item, index) => ( - + ))} {/* */} diff --git a/src/views/Banners/Banner.js b/src/views/Banners/Banner.js index 8730db8..cd3e0c2 100644 --- a/src/views/Banners/Banner.js +++ b/src/views/Banners/Banner.js @@ -106,7 +106,7 @@ function banner() { {banner && banner.map((item, index) => - + {item?.title} diff --git a/src/views/Banners/EditBanner.js b/src/views/Banners/EditBanner.js index 49c61bb..d168f65 100644 --- a/src/views/Banners/EditBanner.js +++ b/src/views/Banners/EditBanner.js @@ -200,7 +200,7 @@ const EditBanner = () => { {category.map((item, index) => ( - + ))} {/* */} diff --git a/src/views/Category/Category.js b/src/views/Category/Category.js index c6921a0..1085f63 100644 --- a/src/views/Category/Category.js +++ b/src/views/Category/Category.js @@ -126,7 +126,7 @@ function Products() { {category && category.map((item, index) => - + {item?.name} diff --git a/src/views/Directory/Add_Business.js b/src/views/Directory/Add_Business.js index f18eb61..4e54d64 100644 --- a/src/views/Directory/Add_Business.js +++ b/src/views/Directory/Add_Business.js @@ -385,8 +385,8 @@ const Add_Business = () => { className="form-control input-field" > - {categoryName && categoryName.map(item => - + {categoryName && categoryName.map((item, index) => + )} diff --git a/src/views/Directory/Bisuness.js b/src/views/Directory/Bisuness.js index 5efe901..d8f1740 100644 --- a/src/views/Directory/Bisuness.js +++ b/src/views/Directory/Bisuness.js @@ -102,9 +102,9 @@ const Bisuness = () => { - {bisuness.map((item) => + {bisuness.map((item, index) => - + {item?.name} {item?.category} {item?.city} diff --git a/src/views/Directory/EditBisuness.js b/src/views/Directory/EditBisuness.js index fac52d6..acf11ee 100644 --- a/src/views/Directory/EditBisuness.js +++ b/src/views/Directory/EditBisuness.js @@ -398,8 +398,8 @@ const EditBisuness = () => { className="form-control input-field" > - {categoryName && categoryName.map(item => - + {categoryName && categoryName.map((item, index) => + )} diff --git a/src/views/Directory/View_Bisuness.js b/src/views/Directory/View_Bisuness.js index 44d4911..d8d21d4 100644 --- a/src/views/Directory/View_Bisuness.js +++ b/src/views/Directory/View_Bisuness.js @@ -25,7 +25,7 @@ const View_Bisuness = () => { }, } ); - console.log(res.data.directory) + // console.log(res.data.directory) setBisuness(res.data.directory) // changeState({ // ...res.data, diff --git a/src/views/Events/Event.js b/src/views/Events/Event.js index e48bfcb..ebc413f 100644 --- a/src/views/Events/Event.js +++ b/src/views/Events/Event.js @@ -21,7 +21,7 @@ function Event() { }, } ); - console.log(res.data) + // console.log(res.data) setEvent(res.data.Event) @@ -108,7 +108,7 @@ function Event() { {event && event.map((item, index) => - + )} diff --git a/src/views/Events/ViewEvent.js b/src/views/Events/ViewEvent.js index 2332aaf..b8efbc7 100644 --- a/src/views/Events/ViewEvent.js +++ b/src/views/Events/ViewEvent.js @@ -9,7 +9,6 @@ import { isAutheticated } from "../../auth"; function ViewEvent() { const [event, setEvent] = useState([]) const { id } = useParams(); - console.log(id) const token = isAutheticated(); const getEvent = useCallback(async () => { diff --git a/src/views/News/News.js b/src/views/News/News.js index 326a719..beb11e1 100644 --- a/src/views/News/News.js +++ b/src/views/News/News.js @@ -103,7 +103,7 @@ function News() { {news && news.map((item, index) => - + {item?.title} diff --git a/src/views/News/ViewNews.js b/src/views/News/ViewNews.js index deb0ca1..98ce43a 100644 --- a/src/views/News/ViewNews.js +++ b/src/views/News/ViewNews.js @@ -9,7 +9,6 @@ import { isAutheticated } from "../../auth"; function ViewNews() { const [news, setNews] = useState([]) const { id } = useParams(); - console.log(id) const token = isAutheticated(); const getNews = useCallback(async () => { @@ -21,7 +20,7 @@ function ViewNews() { }, } ); - console.log(res.data.news) + setNews(res.data.news) diff --git a/src/views/Offers/AddOffer.js b/src/views/Offers/AddOffer.js index 0b21fbf..607b1ff 100644 --- a/src/views/Offers/AddOffer.js +++ b/src/views/Offers/AddOffer.js @@ -173,8 +173,8 @@ const AddOffer = () => { > - {bisunessName.map(item => - + {bisunessName.map((item, index) => + )} diff --git a/src/views/Offers/EditOffer.js b/src/views/Offers/EditOffer.js index 5587654..f563735 100644 --- a/src/views/Offers/EditOffer.js +++ b/src/views/Offers/EditOffer.js @@ -180,8 +180,8 @@ const EditOffer = () => { > - {bisunessName.map(item => - + {bisunessName.map((item, index) => + )} diff --git a/src/views/Offers/Offer.js b/src/views/Offers/Offer.js index a85902d..81f824d 100644 --- a/src/views/Offers/Offer.js +++ b/src/views/Offers/Offer.js @@ -98,7 +98,7 @@ function Offer() { {offer && offer.map((item, index) => - + {item?.title} diff --git a/src/views/Offers/ViewOffer.js b/src/views/Offers/ViewOffer.js index c57f42b..6fea4c7 100644 --- a/src/views/Offers/ViewOffer.js +++ b/src/views/Offers/ViewOffer.js @@ -9,7 +9,6 @@ import { isAutheticated } from "../../auth"; function ViewOffer() { const [offer, setOffer] = useState([]) const { id } = useParams(); - console.log(id) const token = isAutheticated(); const getOffer = useCallback(async () => { diff --git a/src/views/pages/login/Login.js b/src/views/pages/login/Login.js index c3ac5ba..f85111b 100644 --- a/src/views/pages/login/Login.js +++ b/src/views/pages/login/Login.js @@ -42,9 +42,23 @@ const Login = () => { const res = await axios.post("/api/v1/user/login/", auth); if (res.data.success == true) { localStorage.setItem("authToken", res.data.token) - history.push('/dashboard') - setLoading(false); - window.location.reload() + let response = await axios.get(`/api/v1/user/details`, { + headers: { + Authorization: `Bearer ${res.data.token}`, + }, + }) + // console.log(response.data) + const data = response.data + if (data.user.role === 'admin') { + history.push('/dashboard') + setLoading(false); + window.location.reload() + } + else { + alert("please try with admin credential!!") + setLoading(false); + } + } @@ -70,7 +84,7 @@ const Login = () => {

Login

-

Sign In to Your CMP Dashboard Account.

+

Sign In to Your Sales Champions Dashboard Account.

@@ -129,3 +143,8 @@ const Login = () => { } export default Login + + // < Route path = "/" name = "Home" render = {(props) => ( + // userdata && userdata.role === 'admin' ? : + // <> + // )} /> \ No newline at end of file