|
|
@ -43,6 +43,7 @@ import ChatPage from "./view/chatPage"; |
|
|
|
import ShoppingCart from "./components/ShoppingCart"; |
|
|
|
import ShoppingCart from "./components/ShoppingCart"; |
|
|
|
import MyServices from "./view/my-services/MyServices"; |
|
|
|
import MyServices from "./view/my-services/MyServices"; |
|
|
|
import MobileMyServices from "./view/my-services/mobile/MyServices"; |
|
|
|
import MobileMyServices from "./view/my-services/mobile/MyServices"; |
|
|
|
|
|
|
|
import Exam from "./view/Exam2/Exam"; |
|
|
|
|
|
|
|
|
|
|
|
let data = [ |
|
|
|
let data = [ |
|
|
|
{ |
|
|
|
{ |
|
|
@ -675,13 +676,19 @@ function App() { |
|
|
|
setActiveUserFullInfo(false); |
|
|
|
setActiveUserFullInfo(false); |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//------------------------------------
|
|
|
|
|
|
|
|
console.log("hhhhhhhh--------------------"); |
|
|
|
|
|
|
|
console.log(location.split("/")); |
|
|
|
|
|
|
|
|
|
|
|
return ( |
|
|
|
return ( |
|
|
|
<Provider store={store}> |
|
|
|
<Provider store={store}> |
|
|
|
<div> |
|
|
|
<div> |
|
|
|
<Router> |
|
|
|
<Router> |
|
|
|
<div className="App"> |
|
|
|
<div className="App"> |
|
|
|
{LOGIN && <Header logOut={logOut} />} |
|
|
|
{LOGIN && location?.split("/")[3] !== "exam" && ( |
|
|
|
{LOGIN && <Nav />} |
|
|
|
<Header logOut={logOut} /> |
|
|
|
|
|
|
|
)} |
|
|
|
|
|
|
|
{LOGIN && location?.split("/")[3] !== "exam" && <Nav />} |
|
|
|
<Routes> |
|
|
|
<Routes> |
|
|
|
<Route |
|
|
|
<Route |
|
|
|
path="/" |
|
|
|
path="/" |
|
|
@ -704,7 +711,11 @@ function App() { |
|
|
|
path="/myServices" |
|
|
|
path="/myServices" |
|
|
|
element={ |
|
|
|
element={ |
|
|
|
LOGIN ? ( |
|
|
|
LOGIN ? ( |
|
|
|
window.innerWidth>1000 ?<MyServices /> : <MobileMyServices/> |
|
|
|
window.innerWidth > 1000 ? ( |
|
|
|
|
|
|
|
<MyServices /> |
|
|
|
|
|
|
|
) : ( |
|
|
|
|
|
|
|
<MobileMyServices /> |
|
|
|
|
|
|
|
) |
|
|
|
) : ( |
|
|
|
) : ( |
|
|
|
<LoginSignUp activeLogin={activeLogin} /> |
|
|
|
<LoginSignUp activeLogin={activeLogin} /> |
|
|
|
) |
|
|
|
) |
|
|
@ -758,7 +769,7 @@ function App() { |
|
|
|
<Route |
|
|
|
<Route |
|
|
|
exact |
|
|
|
exact |
|
|
|
path="/dashboard/azmoon_list/exam/:id" |
|
|
|
path="/dashboard/azmoon_list/exam/:id" |
|
|
|
element={<EXAM />} |
|
|
|
element={<Exam />} |
|
|
|
/> |
|
|
|
/> |
|
|
|
</> |
|
|
|
</> |
|
|
|
) : ( |
|
|
|
) : ( |
|
|
|