diff --git a/public/assets/locales/en/translation.json b/public/assets/locales/en/translation.json
index 1389821..c9104ec 100644
--- a/public/assets/locales/en/translation.json
+++ b/public/assets/locales/en/translation.json
@@ -631,5 +631,102 @@
"needKYC" : "Access denied for KYC status",
"reload" : "Try Again",
"errorText" : "Server connection error"
+ },
+ "aboutUs": {
+ "title": "About US",
+ "text1": "About US content",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "text2": "",
+ "subTitle1": "",
+ "text3": "",
+ "p5": "",
+ "p6": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "p10": "",
+ "subTitle2": "",
+ "text4": "",
+ "subTitle3": "",
+ "p11": "",
+ "p12": "",
+ "p13": "",
+ "text5": ""
+ },
+ "commissions": {
+ "title": "Commission",
+ "subTitle1": "Commission content",
+ "text1": "",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "p6": "",
+ "text2": "",
+ "text3": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "text4": ""
+
+ },
+ "transferFees": {
+ "title": "Transfer Fees",
+ "text1": "Transfer Fees content",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "text2": "",
+ "text3": "",
+ "text4": "",
+ "subTitle1": "",
+ "text5": "",
+ "subTitle2": "",
+ "text6": "",
+ "subTitle3": "",
+ "text7": "",
+ "subTitle4": "",
+ "text8": ""
+ },
+ "guide": {
+ "title": "Guide",
+ "subTitle1": "Guide content",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "p6": "",
+ "subTitle2": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "p10": ""
+ },
+ "rules": {
+ "title": "Rules",
+ "subTitle1": "Rules content",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "p6": "",
+ "subTitle2": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "p10": ""
+ },
+ "contactUs": {
+ "title": "Contact Us",
+ "subTitle1": "Contact Us content",
+ "text1": ""
}
}
\ No newline at end of file
diff --git a/public/assets/locales/fa/translation.json b/public/assets/locales/fa/translation.json
index e68c379..c8639de 100644
--- a/public/assets/locales/fa/translation.json
+++ b/public/assets/locales/fa/translation.json
@@ -46,7 +46,7 @@
"unit": "واحد",
"offline": "اتصال اینترنت را بررسی کنید!",
"improperMobileView ": "فعلاً برای موبایل بهینه نشده است.",
- "home": "صفحهاصلی",
+ "home": "صفحه اصلی",
"country": {
"iran" : "ایران",
"germany" : "آلمان",
@@ -631,5 +631,102 @@
"needKYC" : "دسترسی این بخش فقط برای کاربران احراز هویت شده مجاز است!",
"reload" : "تلاش مجدد",
"errorText" : "خطا در ارتباط با سرور"
+ },
+ "aboutUs": {
+ "title": "درباره ما",
+ "text1": "متن درباره ما",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "text2": "",
+ "subTitle1": "",
+ "text3": "",
+ "p5": "",
+ "p6": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "p10": "",
+ "subTitle2": "",
+ "text4": "",
+ "subTitle3": "",
+ "p11": "",
+ "p12": "",
+ "p13": "",
+ "text5": ""
+ },
+ "commissions": {
+ "title": "کارمزد",
+ "subTitle1": "متن کارمزدها",
+ "text1": "",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "p6": "",
+ "text2": "",
+ "text3": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "text4": ""
+
+ },
+ "transferFees": {
+ "title": "کارمزد انتقال",
+ "text1": "متن کارمزد انتقال",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "text2": "",
+ "text3": "",
+ "text4": "",
+ "subTitle1": "",
+ "text5": "",
+ "subTitle2": "",
+ "text6": "",
+ "subTitle3": "",
+ "text7": "",
+ "subTitle4": "",
+ "text8": ""
+ },
+ "guide": {
+ "title": "راهنما",
+ "subTitle1": "متن راهنما",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "p6": "",
+ "subTitle2": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "p10": ""
+ },
+ "rules": {
+ "title": "قوانین",
+ "subTitle1": "متن قوانین",
+ "p1": "",
+ "p2": "",
+ "p3": "",
+ "p4": "",
+ "p5": "",
+ "p6": "",
+ "subTitle2": "",
+ "p7": "",
+ "p8": "",
+ "p9": "",
+ "p10": ""
+ },
+ "contactUs": {
+ "title": "تماس با ما",
+ "subTitle1": "متن تماس با ما",
+ "text1": ""
}
}
\ No newline at end of file
diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js
new file mode 100644
index 0000000..0bb82ff
--- /dev/null
+++ b/src/components/Layout/Layout.js
@@ -0,0 +1,22 @@
+import React from 'react';
+import classes from './Layout.module.css'
+import {Outlet} from "react-router-dom";
+import LayoutHeader from "./LayoutHeader/LayoutHeader";
+import ScrollBar from "../ScrollBar";
+import Footer from "../Footer/Footer";
+
+const Layout = () => {
+ return (
+
+ );
+};
+
+export default Layout;
diff --git a/src/components/Layout/Layout.module.css b/src/components/Layout/Layout.module.css
new file mode 100644
index 0000000..91e2bd0
--- /dev/null
+++ b/src/components/Layout/Layout.module.css
@@ -0,0 +1,8 @@
+.container {
+ height: 100%;
+ background-color: var(--mainContent);
+ position: relative;
+}
+.content {
+ height: 90%;
+}
\ No newline at end of file
diff --git a/src/components/Layout/LayoutHeader/LayoutHeader.js b/src/components/Layout/LayoutHeader/LayoutHeader.js
new file mode 100644
index 0000000..7c62ca7
--- /dev/null
+++ b/src/components/Layout/LayoutHeader/LayoutHeader.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import classes from './LayoutHeader.module.css'
+import Icon from "../../Icon/Icon";
+import {setMarketInterval, showSideMenu} from "../../../store/actions/global";
+import {Link, NavLink, Route, Routes, useLocation, useParams} from "react-router-dom";
+import * as RoutesName from "../../../main/Mobile/Routes/routes";
+import {toAbsoluteUrl} from "../../../utils/utils";
+import {useTranslation} from "react-i18next";
+import {useDispatch, useSelector} from "react-redux";
+
+
+const LayoutHeader = () => {
+
+ const {t} = useTranslation();
+
+ const dispatch = useDispatch();
+
+ const isLogin = useSelector((state) => state.auth.isLogin)
+ const firstName = useSelector((state) => state.auth.firstName)
+ const lastName = useSelector((state) => state.auth.lastName)
+ const location = useLocation();
+
+ const interval = useSelector((state) => state.global.marketInterval)
+
+
+ return (
+
+
+
+
+
+ dispatch(showSideMenu(true))}/>
+
+
+
+
+
+
+
+
+ {t("Landing.title")}}/>
+ {t("commissions.title")}}/>
+ {t("aboutUs.title")}}/>
+ {t("transferFees.title")}}/>
+ {t("guide.title")}}/>
+ {t("rules.title")}}/>
+ {t("contactUs.title")}}/>
+
+ {t("market.title")}
+
+ dispatch(setMarketInterval("24h"))}>{t("marketIntervalMini.24h")}
+ dispatch(setMarketInterval("7d"))}>{t("marketIntervalMini.7d")}
+ dispatch(setMarketInterval("1M"))}>{t("marketIntervalMini.1M")}
+
+ }/>
+
+
+
+
+
+
+
})
+
+
+
+
+
+
+ );
+};
+
+export default LayoutHeader;
diff --git a/src/components/Layout/LayoutHeader/LayoutHeader.module.css b/src/components/Layout/LayoutHeader/LayoutHeader.module.css
new file mode 100644
index 0000000..a81b8a1
--- /dev/null
+++ b/src/components/Layout/LayoutHeader/LayoutHeader.module.css
@@ -0,0 +1,9 @@
+.container{
+ height: 10%;
+ background-color: var(--menu);
+}
+
+.active {
+ background-color: var(--activeTitle);
+ color: var(--activeTab);
+}
\ No newline at end of file
diff --git a/src/components/ScrollBar/index.js b/src/components/ScrollBar/index.js
index 6711331..9fcc138 100644
--- a/src/components/ScrollBar/index.js
+++ b/src/components/ScrollBar/index.js
@@ -1,7 +1,16 @@
-import React from "react";
+import React, {useEffect, useRef} from "react";
import {Scrollbars} from "rc-scrollbars";
+import {useLocation} from "react-router-dom";
const ScrollBar = ({customClass, ...props}) => {
+
+ const location = useLocation();
+ const scrollRef = useRef(null);
+
+ useEffect(() => {
+ scrollRef.current.scrollTop()
+ }, [location.pathname]);
+
const style = props.style ? props.style : {width: "100%", height: "100%"};
return (
{
)}
renderView={(props) => }
+ ref={scrollRef}
style={style}>
{props.children}
diff --git a/src/components/SideMenu/SideMenu.js b/src/components/SideMenu/SideMenu.js
index dc7e313..2df0f28 100644
--- a/src/components/SideMenu/SideMenu.js
+++ b/src/components/SideMenu/SideMenu.js
@@ -15,6 +15,7 @@ import ToggleSwitch from "../ToggleSwitch/ToggleSwitch";
import * as Routes from "../../main/Mobile/Routes/routes";
import {toAbsoluteUrl} from "../../utils/utils";
import packageJson from "../../../package.json"
+import {Overview} from "../../main/Mobile/Routes/routes";
@@ -48,9 +49,7 @@ const SideMenu = () => {
<>
dispatch(showSideMenu(false))}/>
-
-
-
+
{firstName === null ? (
@@ -64,8 +63,7 @@ const SideMenu = () => {
>
)}
-
-
+
{isLogin ? (
![]()
{
alt={t("signIn")}
/>
-
-
-
-
-
-
dispatch(showSideMenu(false))} >
-
- {t("footer.aboutUs")}
+
+ {t("home")}
-
- {t("footer.contactUS")}
+
+ {t("MarketTitle.advancedTrading")}
-
- {t("footer.blog")}
+
+ {t("market.title")}
-
- {t("footer.guide")}
+
+ {t("aboutUs.title")}
-
- {t("footer.rules")}
+
+ {t("contactUs.title")}
-
- {t("commission")}
+
+ {t("commissions.title")}
-
- {t("footer.api")}
+
+ {t("transferFees.title")}
-
- {t("footer.addCoin")}
+
+ {t("guide.title")}
-
- {t("footer.demo")}
+
+ {t("rules.title")}
-
- {t("footer.errorReport")}
-
-
-
@@ -161,7 +148,7 @@ const SideMenu = () => {
- {t("footer.darkMode")}:
+ {t("Footer.darkMode")}:
dispatch(setThemeInitiate(e.target.checked))} checked={isDark}/>
diff --git a/src/main/Mobile/Mobile.js b/src/main/Mobile/Mobile.js
index 01c37e9..01a1293 100644
--- a/src/main/Mobile/Mobile.js
+++ b/src/main/Mobile/Mobile.js
@@ -16,9 +16,15 @@ import Login from "./Pages/Login/Login";
import User from "./Pages/User/User";
import Landing from "./Pages/Landing/Landing";
import AllMarket from "./Pages/AllMarket/AllMarket";
-import Guide from "./Pages/Guide/Guide";
import UserPanel from "./Pages/UserPanel/UserPanel";
import SideMenu from "../../components/SideMenu/SideMenu";
+import Layout from "../../components/Layout/Layout";
+import AboutUs from "./Pages/Info/AboutUs/AboutUs";
+import Commission from "./Pages/Info/Commission/Commission";
+import TransferFees from "./Pages/Info/TransferFees/TransferFees";
+import Guide from "./Pages/Info/Guide/Guide";
+import Rules from "./Pages/Info/Rules/Rules";
+import ContactUs from "./Pages/Info/ContactUs/ContactUs";
const Mobile = () => {
@@ -98,10 +104,24 @@ const Mobile = () => {
}/>
}/>
- }/>
- }/>
- }/>
+ {/*}/>*/}
+ {/*}/>*/}
+ {/*}/>*/}
}/>
+
+
+ }>
+ }/>
+ }/>
+ }/>
+ }/>
+ }/>
+ }/>
+ }/>
+ }/>
+
+
+
diff --git a/src/main/Mobile/Pages/AllMarket/AllMarket.js b/src/main/Mobile/Pages/AllMarket/AllMarket.js
index 0cb1fc1..f7bf91c 100644
--- a/src/main/Mobile/Pages/AllMarket/AllMarket.js
+++ b/src/main/Mobile/Pages/AllMarket/AllMarket.js
@@ -1,16 +1,15 @@
import React from 'react';
import classes from "./AllMarket.module.css";
-import AllMarketHeader from "./Sections/AllMarketHeader/AllMarketHeader";
-import AllMarketContent from "./Sections/AllMarketContent/AllMarketContent";
import {images} from "../../../../assets/images";
+import MarketStats from "./components/MarketStats/MarketStats";
+import AllMarketInfo from "./components/AllMarketInfo/AllMarketInfo";
const AllMarket = () => {
return (
-
-
-
-
+
);
diff --git a/src/main/Mobile/Pages/AllMarket/AllMarket.module.css b/src/main/Mobile/Pages/AllMarket/AllMarket.module.css
index 120e034..2e42408 100644
--- a/src/main/Mobile/Pages/AllMarket/AllMarket.module.css
+++ b/src/main/Mobile/Pages/AllMarket/AllMarket.module.css
@@ -1,7 +1,5 @@
-.container{
- height: 100%;
- background-color: var(--mainContent);
- position: relative;
+.container {
+ min-height: 100%;
background-repeat: repeat;
background-position: center center;
background-size: 400px 800px;
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/AllMarketContent.js b/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/AllMarketContent.js
deleted file mode 100644
index 3106570..0000000
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/AllMarketContent.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-import classes from './AllMarketContent.module.css'
-import ScrollBar from "../../../../../../components/ScrollBar";
-import Footer from "../../../../../../components/Footer/Footer";
-import Swing from "./components/Swing/Swing";
-import MarketStats from "./components/MarketStats/MarketStats";
-import AllMarketInfo from "./components/AllMarketInfo/AllMarketInfo";
-
-const AllMarketContent = () => {
- return (
-
- );
-};
-
-export default AllMarketContent;
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/AllMarketContent.module.css b/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/AllMarketContent.module.css
deleted file mode 100644
index d00e0a6..0000000
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/AllMarketContent.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.container{
- height: 90%;
-}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketHeader/AllMarketHeader.js b/src/main/Mobile/Pages/AllMarket/Sections/AllMarketHeader/AllMarketHeader.js
deleted file mode 100644
index 9143b68..0000000
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketHeader/AllMarketHeader.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import {useTranslation} from "react-i18next";
-import HeaderBuilder from "../../../../../../components/HeaderBuilder/HeaderBuilder";
-import {useDispatch, useSelector} from "react-redux";
-import classes from "../AllMarketContent/components/AllMarketInfo/AllMarketInfo.module.css";
-import {setMarketInterval} from "../../../../../../store/actions";
-
-const AllMarketHeader = () => {
-
- const {t} = useTranslation();
- const interval = useSelector((state) => state.global.marketInterval)
-
- const dispatch = useDispatch();
-
- return (
-
-
-
{t("market.title")}
- {/*
( {t("marketInterval." + interval)} )*/}
-
-
-
- dispatch(setMarketInterval("24h"))}>{t("marketIntervalMini.24h")}
- dispatch(setMarketInterval("7d"))}>{t("marketIntervalMini.7d")}
- dispatch(setMarketInterval("1M"))}>{t("marketIntervalMini.1M")}
-
-
-
-
-
-
-
-
-
- );
-};
-
-export default AllMarketHeader;
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.js b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
similarity index 85%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.js
rename to src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
index e4b4a4a..0a07baa 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.js
+++ b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js
@@ -1,18 +1,15 @@
import React, {useState} from 'react';
import {useTranslation} from "react-i18next";
import classes from "./AllMarketInfo.module.css"
-import {useDispatch, useSelector} from "react-redux";
-import {useGetQuoteCurrencies, useOverview} from "../../../../../../../../queries";
+import {useSelector} from "react-redux";
+import {useGetQuoteCurrencies, useOverview} from "../../../../../../queries";
import AllMarketInfoTable from "./components/AllMarketInfoTable/AllMarketInfoTable";
-import Icon from "../../../../../../../../components/Icon/Icon";
-import Loading from "../../../../../../../../components/Loading/Loading";
-import Error from "../../../../../../../../components/Error/Error";
-import {setMarketInterval} from "../../../../../../../../store/actions";
+import Loading from "../../../../../../components/Loading/Loading";
+import Error from "../../../../../../components/Error/Error";
const AllMarketInfo = () => {
const {t} = useTranslation();
- const dispatch = useDispatch();
const [card, setCard] = useState(false)
const [activeCurrency, setActiveCurrency] = useState("")
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.module.css b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.module.css
similarity index 100%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/AllMarketInfo.module.css
rename to src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.module.css
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
similarity index 94%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
rename to src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
index 34a6a76..aae0fd0 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
+++ b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js
@@ -3,13 +3,13 @@ import classes from './AllMarketInfoTable.module.css'
import {useNavigate} from "react-router-dom";
import {useTranslation} from "react-i18next";
import {useDispatch, useSelector} from "react-redux";
-import {setActivePairInitiate} from "../../../../../../../../../../store/actions";
-import {images} from "../../../../../../../../../../assets/images";
+import {setActivePairInitiate} from "../../../../../../../../store/actions";
+import {images} from "../../../../../../../../assets/images";
import i18n from "i18next";
-import {BN} from "../../../../../../../../../../utils/utils";
-import {Order, Panel} from "../../../../../../../../Routes/routes";
-import Button from "../../../../../../../../../../components/Button/Button";
-import Icon from "../../../../../../../../../../components/Icon/Icon";
+import {BN} from "../../../../../../../../utils/utils";
+import {Order, Panel} from "../../../../../../Routes/routes";
+import Button from "../../../../../../../../components/Button/Button";
+import Icon from "../../../../../../../../components/Icon/Icon";
import {LeadingActions, SwipeableList, SwipeableListItem, SwipeAction, TrailingActions} from "react-swipeable-list";
const AllMarketInfoTable = ({data, activeCurrency}) => {
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css b/src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css
similarity index 100%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css
rename to src/main/Mobile/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/MarketStats.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/MarketStats.js
similarity index 91%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/MarketStats.js
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/MarketStats.js
index 7bef1a0..3a398e9 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/MarketStats.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/MarketStats.js
@@ -3,14 +3,14 @@ import classes from './MarketStats.module.css'
import StatsCard from "./components/StatsCard/StatsCard";
import {useTranslation} from "react-i18next";
import {useSelector} from "react-redux";
-import {useGetMarketStats} from "../../../../../../../../queries";
-import Loading from "../../../../../../../../components/Loading/Loading";
-import Error from "../../../../../../../../components/Error/Error";
+import {useGetMarketStats} from "../../../../../../queries";
+import Loading from "../../../../../../components/Loading/Loading";
+import Error from "../../../../../../components/Error/Error";
import MostVolume from "./components/MostVolume/MostVolume";
import MostIncreasedPrice from "./components/MostIncreasedPrice/MostIncreasedPrice";
import MostDecreasedPrice from "./components/MostDecreasedPrice/MostDecreasedPrice";
import MostTrades from "./components/MostTrades/MostTrades";
-import ScrollBar from "../../../../../../../../components/ScrollBar";
+import ScrollBar from "../../../../../../components/ScrollBar";
const MarketStats = () => {
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/MarketStats.module.css b/src/main/Mobile/Pages/AllMarket/components/MarketStats/MarketStats.module.css
similarity index 100%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/MarketStats.module.css
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/MarketStats.module.css
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
similarity index 94%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
index f65317b..9da8e88 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostDecreasedPrice/MostDecreasedPrice.js
@@ -1,7 +1,7 @@
import React from 'react';
-import {images} from "../../../../../../../../../../assets/images";
+import {images} from "../../../../../../../../assets/images";
import i18n from "i18next";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN} from "../../../../../../../../utils/utils";
import {useTranslation} from "react-i18next";
const MostDecreasedPrice = ({mostDecreasedPrice}) => {
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
similarity index 92%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
index 41d120d..1b7df0b 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostIncreasedPrice/MostIncreasedPrice.js
@@ -1,7 +1,7 @@
import React from 'react';
-import {images} from "../../../../../../../../../../assets/images";
+import {images} from "../../../../../../../../assets/images";
import i18n from "i18next";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN} from "../../../../../../../../utils/utils";
import {useTranslation} from "react-i18next";
const MostIncreasedPrice = ({mostIncreasedPrice}) => {
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostTrades/MostTrades.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostTrades/MostTrades.js
similarity index 92%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostTrades/MostTrades.js
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostTrades/MostTrades.js
index da61ba9..706ce43 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostTrades/MostTrades.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostTrades/MostTrades.js
@@ -1,7 +1,7 @@
import React from 'react';
-import {images} from "../../../../../../../../../../assets/images";
+import {images} from "../../../../../../../../assets/images";
import i18n from "i18next";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN} from "../../../../../../../../utils/utils";
import {useTranslation} from "react-i18next";
const MostTrades = ({mostTrades}) => {
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostVolume/MostVolume.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostVolume/MostVolume.js
similarity index 94%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostVolume/MostVolume.js
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostVolume/MostVolume.js
index 2f51827..eee6488 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/MostVolume/MostVolume.js
+++ b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/MostVolume/MostVolume.js
@@ -1,7 +1,7 @@
import React from 'react';
-import {images} from "../../../../../../../../../../assets/images";
+import {images} from "../../../../../../../../assets/images";
import i18n from "i18next";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {BN} from "../../../../../../../../utils/utils";
import {useTranslation} from "react-i18next";
const MostVolume = ({mostVolume}) => {
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/StatsCard/StatsCard.js b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/StatsCard/StatsCard.js
similarity index 100%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/StatsCard/StatsCard.js
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/components/StatsCard/StatsCard.js
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/StatsCard/StatsCard.module.css b/src/main/Mobile/Pages/AllMarket/components/MarketStats/components/StatsCard/StatsCard.module.css
similarity index 100%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/MarketStats/components/StatsCard/StatsCard.module.css
rename to src/main/Mobile/Pages/AllMarket/components/MarketStats/components/StatsCard/StatsCard.module.css
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/Swing/Swing.js b/src/main/Mobile/Pages/AllMarket/components/Swing/Swing.js
similarity index 96%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/Swing/Swing.js
rename to src/main/Mobile/Pages/AllMarket/components/Swing/Swing.js
index 7b692a6..f5e6cca 100644
--- a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/Swing/Swing.js
+++ b/src/main/Mobile/Pages/AllMarket/components/Swing/Swing.js
@@ -1,6 +1,6 @@
import React, {useState} from 'react';
import classes from './Swing.module.css'
-import {images} from "../../../../../../../../assets/images";
+import {images} from "../../../../../../assets/images";
const Swing = () => {
diff --git a/src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/Swing/Swing.module.css b/src/main/Mobile/Pages/AllMarket/components/Swing/Swing.module.css
similarity index 100%
rename from src/main/Mobile/Pages/AllMarket/Sections/AllMarketContent/components/Swing/Swing.module.css
rename to src/main/Mobile/Pages/AllMarket/components/Swing/Swing.module.css
diff --git a/src/main/Mobile/Pages/Info/AboutUs/AboutUs.js b/src/main/Mobile/Pages/Info/AboutUs/AboutUs.js
new file mode 100644
index 0000000..209486a
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/AboutUs/AboutUs.js
@@ -0,0 +1,44 @@
+import React from 'react';
+import classes from "./AboutUs.module.css";
+import {useTranslation} from "react-i18next";
+
+const AboutUs = () => {
+
+ const {t} = useTranslation();
+
+ return (
+
+
+
{t("aboutUs.text1")}
+
+ {t("aboutUs.p1")}
+ {t("aboutUs.p2")}
+ {t("aboutUs.p3")}
+ {t("aboutUs.p4")}
+
+
{t("aboutUs.text2")}
+
{t("aboutUs.subTitle1")}
+
{t("aboutUs.text3")}
+
+ {t("aboutUs.p5")}
+ {t("aboutUs.p6")}
+ {t("aboutUs.p7")}
+ {t("aboutUs.p8")}
+ {t("aboutUs.p9")}
+ {t("aboutUs.p10")}
+
+
{t("aboutUs.subTitle2")}
+
{t("aboutUs.text4")}
+
{t("aboutUs.subTitle3")}
+
+ {t("aboutUs.p11")}
+ {t("aboutUs.p12")}
+ {t("aboutUs.p13")}
+
+
{t("aboutUs.text5")}
+
+
+ );
+};
+
+export default AboutUs;
diff --git a/src/main/Mobile/Pages/Info/AboutUs/AboutUs.module.css b/src/main/Mobile/Pages/Info/AboutUs/AboutUs.module.css
new file mode 100644
index 0000000..7b6553b
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/AboutUs/AboutUs.module.css
@@ -0,0 +1,3 @@
+.container {
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/Info/Commission/Commission.js b/src/main/Mobile/Pages/Info/Commission/Commission.js
new file mode 100644
index 0000000..4dcb78c
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/Commission/Commission.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import classes from './Commission.module.css'
+import {useTranslation} from "react-i18next";
+
+const Commission = () => {
+ const {t} = useTranslation();
+
+ return (
+
+
+
{t("commissions.subTitle1")}
+
{t("commissions.text1")}
+
+ {t("commissions.p1")}
+ {t("commissions.p2")}
+ {t("commissions.p3")}
+ {t("commissions.p4")}
+
+
{t("commissions.p5")}
+
{t("commissions.p6")}
+
{t("commissions.text2")}
+
{t("commissions.text3")}
+
+ {t("commissions.p7")}
+ {t("commissions.p8")}
+ {t("commissions.p9")}
+
+
{t("commissions.text4")}
+
+
+ );
+};
+
+export default Commission;
diff --git a/src/main/Mobile/Pages/Info/Commission/Commission.module.css b/src/main/Mobile/Pages/Info/Commission/Commission.module.css
new file mode 100644
index 0000000..7b6553b
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/Commission/Commission.module.css
@@ -0,0 +1,3 @@
+.container {
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/Info/ContactUs/ContactUs.js b/src/main/Mobile/Pages/Info/ContactUs/ContactUs.js
new file mode 100644
index 0000000..a2ddbd4
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/ContactUs/ContactUs.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import classes from './ContactUs.module.css';
+import {useTranslation} from "react-i18next";
+
+const ContactUs = () => {
+ const {t} = useTranslation();
+
+ return (
+
+
+ {t("contactUs.subTitle1")}
+ {t("contactUs.text1")}
+
+
+ );
+};
+
+export default ContactUs;
diff --git a/src/main/Mobile/Pages/Info/ContactUs/ContactUs.module.css b/src/main/Mobile/Pages/Info/ContactUs/ContactUs.module.css
new file mode 100644
index 0000000..7b6553b
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/ContactUs/ContactUs.module.css
@@ -0,0 +1,3 @@
+.container {
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/Info/Guide/Guide.js b/src/main/Mobile/Pages/Info/Guide/Guide.js
new file mode 100644
index 0000000..e558ebb
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/Guide/Guide.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import classes from "./Guide.module.css";
+import {useTranslation} from "react-i18next";
+
+const Guide = () => {
+
+ const {t} = useTranslation();
+
+ return (
+
+
+
{t("guide.subTitle1")}
+
{t("guide.p1")}
+
{t("guide.p2")}
+
{t("guide.p3")}
+
{t("guide.p4")}
+
{t("guide.p5")}
+
{t("guide.p6")}
+
{t("guide.subTitle2")}
+
+ {t("guide.p7")}
+ {t("guide.p8")}
+ {t("guide.p9")}
+ {t("guide.p10")}
+
+
+
+ );
+};
+
+export default Guide;
diff --git a/src/main/Mobile/Pages/Info/Guide/Guide.module.css b/src/main/Mobile/Pages/Info/Guide/Guide.module.css
new file mode 100644
index 0000000..7b6553b
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/Guide/Guide.module.css
@@ -0,0 +1,3 @@
+.container {
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/Info/Rules/Rules.js b/src/main/Mobile/Pages/Info/Rules/Rules.js
new file mode 100644
index 0000000..2208b78
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/Rules/Rules.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import classes from './Rules.module.css'
+import {useTranslation} from "react-i18next";
+
+const Rules = () => {
+
+ const {t} = useTranslation();
+
+ return (
+
+
+
{t("rules.subTitle1")}
+
{t("rules.p1")}
+
{t("rules.p2")}
+
{t("rules.p3")}
+
{t("rules.p4")}
+
{t("rules.p5")}
+
{t("rules.p6")}
+
{t("rules.subTitle2")}
+
+ {t("rules.p7")}
+ {t("rules.p8")}
+ {t("rules.p9")}
+ {t("rules.p10")}
+
+
+
+ );
+};
+
+export default Rules;
diff --git a/src/main/Mobile/Pages/Info/Rules/Rules.module.css b/src/main/Mobile/Pages/Info/Rules/Rules.module.css
new file mode 100644
index 0000000..7b6553b
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/Rules/Rules.module.css
@@ -0,0 +1,3 @@
+.container {
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/Info/TransferFees/TransferFees.js b/src/main/Mobile/Pages/Info/TransferFees/TransferFees.js
new file mode 100644
index 0000000..c7bf7a1
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/TransferFees/TransferFees.js
@@ -0,0 +1,44 @@
+import React from 'react';
+import classes from './TransferFees.module.css'
+import {useTranslation} from "react-i18next";
+
+const TransferFees = () => {
+
+ const {t} = useTranslation();
+
+ return (
+
+
+
{t("transferFees.text1")}
+
+ {t("transferFees.p1")}
+ {t("transferFees.p2")}
+ {t("transferFees.p3")}
+ {t("transferFees.p4")}
+ {t("transferFees.p5")}
+
+
{t("transferFees.text2")}
+
{t("transferFees.text3")}
+
{t("transferFees.text4")}
+
+
+
+
+
{t("transferFees.subTitle1")}
+
{t("transferFees.text5")}
+
+
{t("transferFees.subTitle2")}
+
{t("transferFees.text6")}
+
+
{t("transferFees.subTitle3")}
+
{t("transferFees.text7")}
+
+
{t("transferFees.subTitle4")}
+
{t("transferFees.text8")}
+
+
+
+ );
+};
+
+export default TransferFees;
diff --git a/src/main/Mobile/Pages/Info/TransferFees/TransferFees.module.css b/src/main/Mobile/Pages/Info/TransferFees/TransferFees.module.css
new file mode 100644
index 0000000..7b6553b
--- /dev/null
+++ b/src/main/Mobile/Pages/Info/TransferFees/TransferFees.module.css
@@ -0,0 +1,3 @@
+.container {
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/Landing/Landing.js b/src/main/Mobile/Pages/Landing/Landing.js
index 9f749e9..802b50a 100644
--- a/src/main/Mobile/Pages/Landing/Landing.js
+++ b/src/main/Mobile/Pages/Landing/Landing.js
@@ -1,14 +1,20 @@
import React from 'react';
import classes from "./Landing.module.css";
import {images} from "../../../../assets/images";
-import LandingHeader from "./Sections/LandingHeader/LandingHeader";
-import LandingContent from "./Sections/LandingContent/LandingContent";
+import MarketTitle from "./components/MarketTitle/MarketTitle";
+import Spinner from "./components/Spinner/Spinner";
+import MarketView from "./components/MarketView/MarketView";
+import MarketInfo from "./components/MarketInfo/MarketInfo";
+import GeneralInfo from "./components/GeneralInfo/GeneralInfo";
const Landing = () => {
return (
-
-
-
+
+
+
+
+
+
);
};
diff --git a/src/main/Mobile/Pages/Landing/Landing.module.css b/src/main/Mobile/Pages/Landing/Landing.module.css
index 120e034..2e42408 100644
--- a/src/main/Mobile/Pages/Landing/Landing.module.css
+++ b/src/main/Mobile/Pages/Landing/Landing.module.css
@@ -1,7 +1,5 @@
-.container{
- height: 100%;
- background-color: var(--mainContent);
- position: relative;
+.container {
+ min-height: 100%;
background-repeat: repeat;
background-position: center center;
background-size: 400px 800px;
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/LandingContent.js b/src/main/Mobile/Pages/Landing/Sections/LandingContent/LandingContent.js
deleted file mode 100644
index 0bfc3e9..0000000
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/LandingContent.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import classes from './LandingContent.module.css'
-import ScrollBar from "../../../../../../components/ScrollBar";
-import MarketTitle from "./components/MarketTitle/MarketTitle";
-import Spinner from "./components/Spinner/Spinner";
-import MarketView from "./components/MarketView/MarketView";
-import MarketInfo from "./components/MarketInfo/MarketInfo";
-import Footer from "../../../../../../components/Footer/Footer";
-import GeneralInfo from "./components/GeneralInfo/GeneralInfo";
-
-const LandingContent = () => {
- return (
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-export default LandingContent;
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/LandingContent.module.css b/src/main/Mobile/Pages/Landing/Sections/LandingContent/LandingContent.module.css
deleted file mode 100644
index d00e0a6..0000000
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/LandingContent.module.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.container{
- height: 90%;
-}
\ No newline at end of file
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingHeader/LandingHeader.js b/src/main/Mobile/Pages/Landing/Sections/LandingHeader/LandingHeader.js
deleted file mode 100644
index 036b161..0000000
--- a/src/main/Mobile/Pages/Landing/Sections/LandingHeader/LandingHeader.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import HeaderBuilder from "../../../../../../components/HeaderBuilder/HeaderBuilder";
-import {useTranslation} from "react-i18next";
-
-const LandingHeader = () => {
-
- const {t} = useTranslation();
-
- return (
-
- {t("Landing.title")}
-
- );
-};
-
-export default LandingHeader;
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/GeneralInfo/GeneralInfo.js b/src/main/Mobile/Pages/Landing/components/GeneralInfo/GeneralInfo.js
similarity index 70%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/GeneralInfo/GeneralInfo.js
rename to src/main/Mobile/Pages/Landing/components/GeneralInfo/GeneralInfo.js
index 63bef54..c24f838 100644
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/GeneralInfo/GeneralInfo.js
+++ b/src/main/Mobile/Pages/Landing/components/GeneralInfo/GeneralInfo.js
@@ -1,9 +1,9 @@
import React from 'react';
import classes from './GeneralInfo.module.css'
import {useTranslation} from "react-i18next";
-import {useGetExchangeInfo} from "../../../../../../../../queries";
-import Loading from "../../../../../../../../components/Loading/Loading";
-import Error from "../../../../../../../../components/Error/Error";
+import {useGetExchangeInfo} from "../../../../../../queries";
+import Loading from "../../../../../../components/Loading/Loading";
+import Error from "../../../../../../components/Error/Error";
const GeneralInfo = () => {
@@ -18,15 +18,15 @@ const GeneralInfo = () => {
if (error) return
else return <>
- {data.activeUsers.toLocaleString()}
+ {data?.activeUsers?.toLocaleString()}
{t("GeneralInfo.activeUsers")}
- {data.totalOrders.toLocaleString()}
+ {data?.totalOrders?.toLocaleString()}
{t("GeneralInfo.totalOrders")}
- {data.totalTrades.toLocaleString()}
+ {data?.totalTrades?.toLocaleString()}
{t("GeneralInfo.totalTrades")}
>
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/GeneralInfo/GeneralInfo.module.css b/src/main/Mobile/Pages/Landing/components/GeneralInfo/GeneralInfo.module.css
similarity index 100%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/GeneralInfo/GeneralInfo.module.css
rename to src/main/Mobile/Pages/Landing/components/GeneralInfo/GeneralInfo.module.css
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.js b/src/main/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.js
similarity index 93%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.js
rename to src/main/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.js
index c788643..5e7937f 100644
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.js
+++ b/src/main/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.js
@@ -1,13 +1,13 @@
import React, {useState} from 'react';
import classes from './MarketInfo.module.css'
-import Title from "../../../../../../../../components/Title/Title";
+import Title from "../../../../../../components/Title/Title";
import {Link} from "react-router-dom";
-import Icon from "../../../../../../../../components/Icon/Icon";
-import * as Routes from "../../../../../../Routes/routes";
+import Icon from "../../../../../../components/Icon/Icon";
+import * as Routes from "../../../../Routes/routes";
import MarketInfoTable from "./components/MarketInfoTable/MarketInfoTable";
-import {useGetQuoteCurrencies, useOverview} from "../../../../../../../../queries";
-import Loading from "../../../../../../../../components/Loading/Loading";
-import Error from "../../../../../../../../components/Error/Error";
+import {useGetQuoteCurrencies, useOverview} from "../../../../../../queries";
+import Loading from "../../../../../../components/Loading/Loading";
+import Error from "../../../../../../components/Error/Error";
import MarketInfoCard from "./components/MarketInfoCard/MarketInfoCard";
import {useTranslation} from "react-i18next";
import i18n from "i18next";
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.module.css b/src/main/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.module.css
similarity index 100%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/MarketInfo.module.css
rename to src/main/Mobile/Pages/Landing/components/MarketInfo/MarketInfo.module.css
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js
similarity index 100%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js
rename to src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css
similarity index 100%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css
rename to src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
similarity index 93%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
rename to src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
index 062e9e2..a05e1b2 100644
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
+++ b/src/main/Mobile/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js
@@ -1,14 +1,14 @@
import React, {useState} from 'react';
import classes from './MarketInfoTable.module.css'
import {useTranslation} from "react-i18next";
-import {images} from "../../../../../../../../../../assets/images";
-import {Order} from "../../../../../../../../Routes/routes";
+import {images} from "../../../../../../../../assets/images";
+import {Order} from "../../../../../../Routes/routes";
import {useDispatch, useSelector} from "react-redux";
import {useNavigate} from "react-router-dom";
-import {setActivePairInitiate} from "../../../../../../../../../../store/actions";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {setActivePairInitiate} from "../../../../../../../../store/actions";
+import {BN} from "../../../../../../../../utils/utils";
import {LeadingActions, SwipeableList, SwipeableListItem, SwipeAction, TrailingActions} from "react-swipeable-list";
-import Button from "../../../../../../../../../../components/Button/Button";
+import Button from "../../../../../../../../components/Button/Button";
import i18n from "i18next";
const MarketInfoTable = ({data, activeCurrency}) => {
@@ -40,7 +40,7 @@ const MarketInfoTable = ({data, activeCurrency}) => {
return setSwipLeft(prevState => prevState === index ? null : index)
}
}}
- />
+ ><>>
);
@@ -57,7 +57,7 @@ const MarketInfoTable = ({data, activeCurrency}) => {
return setSwipRight(prevState => prevState === index ? null : index)
}
}}
- />
+ ><>>
);
@@ -84,7 +84,7 @@ const MarketInfoTable = ({data, activeCurrency}) => {
<>
{data.map((tr, index) => {
return (
-
+
{
const {t} = useTranslation();
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketTitle/MarketTitle.module.css b/src/main/Mobile/Pages/Landing/components/MarketTitle/MarketTitle.module.css
similarity index 75%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketTitle/MarketTitle.module.css
rename to src/main/Mobile/Pages/Landing/components/MarketTitle/MarketTitle.module.css
index e26f58e..bf42588 100644
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketTitle/MarketTitle.module.css
+++ b/src/main/Mobile/Pages/Landing/components/MarketTitle/MarketTitle.module.css
@@ -4,4 +4,5 @@
.thisButton{
height: 5.75vh;
background-color: var(--cardBody);
+ color: var(--textColor);
}
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/MarketView.js b/src/main/Mobile/Pages/Landing/components/MarketView/MarketView.js
similarity index 93%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/MarketView.js
rename to src/main/Mobile/Pages/Landing/components/MarketView/MarketView.js
index 494dfc5..3c56ca5 100644
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/MarketView.js
+++ b/src/main/Mobile/Pages/Landing/components/MarketView/MarketView.js
@@ -1,7 +1,7 @@
import React from 'react';
-import Title from "../../../../../../../../components/Title/Title";
+import Title from "../../../../../../components/Title/Title";
import {useTranslation} from "react-i18next";
-import {useGetMarketStats} from "../../../../../../../../queries";
+import {useGetMarketStats} from "../../../../../../queries";
import MarketViewCard from "./components/MarketViewCard/MarketViewCard";
import {useSelector} from "react-redux";
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/MarketView.module.css b/src/main/Mobile/Pages/Landing/components/MarketView/MarketView.module.css
similarity index 100%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/MarketView.module.css
rename to src/main/Mobile/Pages/Landing/components/MarketView/MarketView.module.css
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/components/MarketViewCard/MarketViewCard.js b/src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.js
similarity index 86%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/components/MarketViewCard/MarketViewCard.js
rename to src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.js
index caf649c..75cd8b6 100644
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/components/MarketViewCard/MarketViewCard.js
+++ b/src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.js
@@ -1,11 +1,11 @@
import React from 'react';
import classes from './MarketViewCard.module.css'
import {useTranslation} from "react-i18next";
-import {images} from "../../../../../../../../../../assets/images";
-import {BN} from "../../../../../../../../../../utils/utils";
+import {images} from "../../../../../../../../assets/images";
+import {BN} from "../../../../../../../../utils/utils";
import i18n from "i18next";
-import Loading from "../../../../../../../../../../components/Loading/Loading";
-import Error from "../../../../../../../../../../components/Error/Error";
+import Loading from "../../../../../../../../components/Loading/Loading";
+import Error from "../../../../../../../../components/Error/Error";
const MarketViewCard = ({title , data , error , isLoading ,volume}) => {
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/components/MarketViewCard/MarketViewCard.module.css b/src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.module.css
similarity index 100%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/MarketView/components/MarketViewCard/MarketViewCard.module.css
rename to src/main/Mobile/Pages/Landing/components/MarketView/components/MarketViewCard/MarketViewCard.module.css
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/Spinner/Spinner.js b/src/main/Mobile/Pages/Landing/components/Spinner/Spinner.js
similarity index 93%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/Spinner/Spinner.js
rename to src/main/Mobile/Pages/Landing/components/Spinner/Spinner.js
index 6f47637..e5cdfe5 100644
--- a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/Spinner/Spinner.js
+++ b/src/main/Mobile/Pages/Landing/components/Spinner/Spinner.js
@@ -1,6 +1,6 @@
import React from 'react';
import classes from './Spinner.module.css'
-import {images} from "../../../../../../../../assets/images";
+import {images} from "../../../../../../assets/images";
const Spinner = () => {
return (
diff --git a/src/main/Mobile/Pages/Landing/Sections/LandingContent/components/Spinner/Spinner.module.css b/src/main/Mobile/Pages/Landing/components/Spinner/Spinner.module.css
similarity index 100%
rename from src/main/Mobile/Pages/Landing/Sections/LandingContent/components/Spinner/Spinner.module.css
rename to src/main/Mobile/Pages/Landing/components/Spinner/Spinner.module.css
diff --git a/src/main/Mobile/Routes/routes.js b/src/main/Mobile/Routes/routes.js
index fc6571c..7f0b1dd 100644
--- a/src/main/Mobile/Routes/routes.js
+++ b/src/main/Mobile/Routes/routes.js
@@ -1,8 +1,15 @@
export const Landing = "/";
export const Login = "/login";
-export const Guide = "/guide";
export const AllMarket = "/all-market";
+export const AboutUs = "/about-us";
+export const Commission = "/commission";
+export const TransferFees = "/transfer-fees";
+export const Guide = "/guide";
+export const Rules = "/rules";
+export const ContactUs = "/contact-us";
+
+
export const User = "/user";
export const UserVerifyRelative = "verify";
export const UserForgetPasswordRelative = "forget-password";