Add market-order

public/assets/locales/en/translation.json

@@ -52,12 +52,14 @@
   "from": "from",
   "row": "Row",
   "until": "until",
+  "with": "With",
   "withPrice": "with price",
   "description": "Description",
   "first": "First",
   "offline": "Check your connection!",
   "improperMobileView": "Not optimized for mobile view.",
   "home": "Home",
+  "convert": "Convert",
   "country": {
     "iran": "IRAN",
     "germany": "Germany",
@@ -583,6 +585,7 @@
     "emptyCaptcha": "Captcha required!",
     "forgetPassServerError": "Error recovering password, try again!",
     "UserAlreadyExists": "User with this email is already registered",
+    "RegisterIsLimited": "It is not possible to register for you at this time.",
     "forgetPassEmailForgetError": "Email format is incorrect!",
     "forDemoLogin": "Click here for a testing login!"
   },

public/assets/locales/fa/translation.json

@@ -52,12 +52,14 @@
   "from": "از",
   "row": "ردیف",
   "until": "تا",
+  "with": "با",
   "withPrice": "با قیمت",
   "description": "توضیحات",
   "first": "ابتدا",
   "offline": "اتصال اینترنت را بررسی کنید!",
   "improperMobileView": "فعلاً برای موبایل بهینه نشده است.",
   "home": "صفحه اصلی",
+  "convert": "تبدیل",
   "country": {
     "iran": "ایران",
     "germany": "آلمان",
@@ -582,7 +584,8 @@
     "minCaptcha": "Captcha باید ۵ کاراکتر باشد!",
     "emptyCaptcha": "وارد کردن Captcha الزامی است",
     "forgetPassServerError": "خطا در بازیابی رمز، دوباره تلاش کنید",
-    "UserAlreadyExists": "ایمل واردشده تکراری است",
+    "UserAlreadyExists": "ایمیل واردشده تکراری است.",
+    "RegisterIsLimited": "در حال حاضر امکان ثبت نام برای شما وجود ندارد.",
     "forgetPassEmailForgetError": "فرمت ایمیل صحیح نیست.",
     "forDemoLogin": "برای ورود آزمایشی، اینجا کلیک کنید!"
   },

public/assets/locales/uzb/translation.json

@@ -52,12 +52,14 @@
   "from": "dan",
   "row": "Qator",
   "until": "gacha",
+  "with": "Bilan",
   "withPrice": "narx bilan",
   "description": "Tavsif",
   "first": "Birinchi",
   "offline": "Internetga ulanganligini tekshiring!",
   "improperMobileView": "Mobil versiya uchun optimallashtirilmagan.",
   "home": "Bosh sahifa",
+  "convert": "Konvertatsiya",
   "country": {
     "iran": "IRAN",
     "germany": "Germany",
@@ -583,6 +585,7 @@
     "emptyCaptcha": "Captcha talab qilinadi!",
     "forgetPassServerError": "Parolni tiklashda xatolik yuz berdi, qaytadan urinib ko'ring!",
     "UserAlreadyExists": "Ushbu email manziliga ega foydalanuvchi allaqachon ro'yxatdan o'tgan",
+    "RegisterIsLimited": "Ayni paytda siz uchun ro'yxatdan o'tish mumkin emas.",
     "forgetPassEmailForgetError": "Email manzili formati noto'g'ri!",
     "forDemoLogin": "Sinov uchun kirish uchun bu yerni bosing!"
   },

src/assets/fontIcon/opex-icon/config.json

@@ -937,6 +937,20 @@
       "search": [
         "cicle-plus-01"
       ]
+    },
+    {
+      "uid": "f022243a5960b8c63529a647d92d78bf",
+      "css": "exchange-arrow",
+      "code": 528,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M304.5 1000C290.9 1000 281.8 995.5 272.7 986.4L13.6 727.3C-4.5 709.1-4.5 681.8 13.6 663.6S59.1 645.5 77.3 663.6L259.1 845.5V45.5C259.1 18.2 277.3 0 304.5 0S350 18.2 350 45.5V954.5C350 972.7 340.9 990.9 322.7 995.5 318.2 1000 309.1 1000 304.5 1000ZM500 1000C472.7 1000 454.5 981.8 454.5 954.5V45.5C454.5 27.3 463.6 9.1 481.8 4.5 500-4.5 518.2 0 531.8 13.6L790.9 272.7C809.1 290.9 809.1 318.2 790.9 336.4S745.5 354.5 727.3 336.4L545.5 154.5V954.5C545.5 981.8 527.3 1000 500 1000Z",
+        "width": 818
+      },
+      "search": [
+        "exchange-arrow"
+      ]
     }
   ]
 }

src/assets/fontIcon/opex-icon/css/opex-icon-codes.css

@@ -75,6 +75,7 @@
 .icon-trash-1:before { content: '\0207'; } /* 'ȇ' */
 .icon-trash-2:before { content: '\0208'; } /* 'Ȉ' */
 .icon-cicle-plus-01:before { content: '\0209'; } /* 'ȉ' */
+.icon-exchange-arrow:before { content: '\0210'; } /* 'Ȑ' */
 .icon-market:before { content: '\e800'; } /* '' */
 .icon-cancel-circled2:before { content: '\e801'; } /* '' */
 .icon-settings:before { content: '\e802'; } /* '' */

src/assets/fontIcon/opex-icon/css/opex-icon-ie7-codes.css

@@ -75,6 +75,7 @@
 .icon-trash-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȇ '); }
 .icon-trash-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȉ '); }
 .icon-cicle-plus-01 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȉ '); }
+.icon-exchange-arrow { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȑ '); }
 .icon-market { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-settings { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

src/assets/fontIcon/opex-icon/css/opex-icon-ie7.css

@@ -86,6 +86,7 @@
 .icon-trash-1 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȇ '); }
 .icon-trash-2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȉ '); }
 .icon-cicle-plus-01 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'ȉ '); }
+.icon-exchange-arrow { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = 'Ȑ '); }
 .icon-market { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-cancel-circled2 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
 .icon-settings { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }

src/assets/fontIcon/opex-icon/css/opex-icon.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'opex-icon';
-  src: url('../font/opex-icon.eot?26088334');
-  src: url('../font/opex-icon.eot?26088334#iefix') format('embedded-opentype'),
-       url('../font/opex-icon.woff2?26088334') format('woff2'),
-       url('../font/opex-icon.woff?26088334') format('woff'),
-       url('../font/opex-icon.ttf?26088334') format('truetype'),
-       url('../font/opex-icon.svg?26088334#opex-icon') format('svg');
+  src: url('../font/opex-icon.eot?50181082');
+  src: url('../font/opex-icon.eot?50181082#iefix') format('embedded-opentype'),
+       url('../font/opex-icon.woff2?50181082') format('woff2'),
+       url('../font/opex-icon.woff?50181082') format('woff'),
+       url('../font/opex-icon.ttf?50181082') format('truetype'),
+       url('../font/opex-icon.svg?50181082#opex-icon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'opex-icon';
-    src: url('../font/opex-icon.svg?26088334#opex-icon') format('svg');
+    src: url('../font/opex-icon.svg?50181082#opex-icon') format('svg');
   }
 }
 */
@@ -130,6 +130,7 @@
 .icon-trash-1:before { content: '\0207'; } /* 'ȇ' */
 .icon-trash-2:before { content: '\0208'; } /* 'Ȉ' */
 .icon-cicle-plus-01:before { content: '\0209'; } /* 'ȉ' */
+.icon-exchange-arrow:before { content: '\0210'; } /* 'Ȑ' */
 .icon-market:before { content: '\e800'; } /* '' */
 .icon-cancel-circled2:before { content: '\e801'; } /* '' */
 .icon-settings:before { content: '\e802'; } /* '' */

src/assets/fontIcon/opex-icon/demo.html

@@ -146,11 +146,11 @@
     }
     @font-face {
       font-family: 'opex-icon';
-      src: url('./font/opex-icon.eot?43374703');
-      src: url('./font/opex-icon.eot?43374703#iefix') format('embedded-opentype'),
-           url('./font/opex-icon.woff?43374703') format('woff'),
-           url('./font/opex-icon.ttf?43374703') format('truetype'),
-           url('./font/opex-icon.svg?43374703#opex-icon') format('svg');
+      src: url('./font/opex-icon.eot?44260891');
+      src: url('./font/opex-icon.eot?44260891#iefix') format('embedded-opentype'),
+           url('./font/opex-icon.woff?44260891') format('woff'),
+           url('./font/opex-icon.ttf?44260891') format('truetype'),
+           url('./font/opex-icon.svg?44260891#opex-icon') format('svg');
       font-weight: normal;
       font-style: normal;
     }
@@ -477,6 +477,9 @@ <h1>opex-icon <small>font demo</small></h1>
         </div>
       </div>
       <div class="row">
+        <div class="span3" title="Code: 0x0210">
+          <i class="demo-icon icon-exchange-arrow">&#x0210;</i> <span class="i-name">icon-exchange-arrow</span><span class="i-code">0x0210</span>
+        </div>
         <div class="span3" title="Code: 0xe800">
           <i class="demo-icon icon-market">&#xe800;</i> <span class="i-name">icon-market</span><span class="i-code">0xe800</span>
         </div>
@@ -486,11 +489,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe802">
           <i class="demo-icon icon-settings">&#xe802;</i> <span class="i-name">icon-settings</span><span class="i-code">0xe802</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe803">
           <i class="demo-icon icon-wallet">&#xe803;</i> <span class="i-name">icon-wallet</span><span class="i-code">0xe803</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe804">
           <i class="demo-icon icon-account">&#xe804;</i> <span class="i-name">icon-account</span><span class="i-code">0xe804</span>
         </div>
@@ -500,11 +503,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe806">
           <i class="demo-icon icon-messages">&#xe806;</i> <span class="i-name">icon-messages</span><span class="i-code">0xe806</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe807">
           <i class="demo-icon icon-messages-dotted">&#xe807;</i> <span class="i-name">icon-messages-dotted</span><span class="i-code">0xe807</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe808">
           <i class="demo-icon icon-safe">&#xe808;</i> <span class="i-name">icon-safe</span><span class="i-code">0xe808</span>
         </div>
@@ -514,11 +517,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe80a">
           <i class="demo-icon icon-filternfilled">&#xe80a;</i> <span class="i-name">icon-filternfilled</span><span class="i-code">0xe80a</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe80b">
           <i class="demo-icon icon-microsoft_excel">&#xe80b;</i> <span class="i-name">icon-microsoft_excel</span><span class="i-code">0xe80b</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe80c">
           <i class="demo-icon icon-clear-filters">&#xe80c;</i> <span class="i-name">icon-clear-filters</span><span class="i-code">0xe80c</span>
         </div>
@@ -528,11 +531,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe80e">
           <i class="demo-icon icon-copy">&#xe80e;</i> <span class="i-name">icon-copy</span><span class="i-code">0xe80e</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe80f">
           <i class="demo-icon icon-menu_vertical">&#xe80f;</i> <span class="i-name">icon-menu_vertical</span><span class="i-code">0xe80f</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe810">
           <i class="demo-icon icon-profilesetting">&#xe810;</i> <span class="i-name">icon-profilesetting</span><span class="i-code">0xe810</span>
         </div>
@@ -542,11 +545,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe812">
           <i class="demo-icon icon-verifiedsetting">&#xe812;</i> <span class="i-name">icon-verifiedsetting</span><span class="i-code">0xe812</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe813">
           <i class="demo-icon icon-fileSubsetting">&#xe813;</i> <span class="i-name">icon-fileSubsetting</span><span class="i-code">0xe813</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe814">
           <i class="demo-icon icon-closed_eye">&#xe814;</i> <span class="i-name">icon-closed_eye</span><span class="i-code">0xe814</span>
         </div>
@@ -556,11 +559,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe816">
           <i class="demo-icon icon-lasttrades">&#xe816;</i> <span class="i-name">icon-lasttrades</span><span class="i-code">0xe816</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe817">
           <i class="demo-icon icon-myorder">&#xe817;</i> <span class="i-name">icon-myorder</span><span class="i-code">0xe817</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe818">
           <i class="demo-icon icon-order">&#xe818;</i> <span class="i-name">icon-order</span><span class="i-code">0xe818</span>
         </div>
@@ -570,11 +573,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe81a">
           <i class="demo-icon icon-overview">&#xe81a;</i> <span class="i-name">icon-overview</span><span class="i-code">0xe81a</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe81b">
           <i class="demo-icon icon-op-06">&#xe81b;</i> <span class="i-name">icon-op-06</span><span class="i-code">0xe81b</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe81c">
           <i class="demo-icon icon-op-05">&#xe81c;</i> <span class="i-name">icon-op-05</span><span class="i-code">0xe81c</span>
         </div>
@@ -584,11 +587,11 @@ <h1>opex-icon <small>font demo</small></h1>
         <div class="span3" title="Code: 0xe81e">
           <i class="demo-icon icon-op-02">&#xe81e;</i> <span class="i-name">icon-op-02</span><span class="i-code">0xe81e</span>
         </div>
+      </div>
+      <div class="row">
         <div class="span3" title="Code: 0xe81f">
           <i class="demo-icon icon-op-03">&#xe81f;</i> <span class="i-name">icon-op-03</span><span class="i-code">0xe81f</span>
         </div>
-      </div>
-      <div class="row">
         <div class="span3" title="Code: 0xe820">
           <i class="demo-icon icon-row">&#xe820;</i> <span class="i-name">icon-row</span><span class="i-code">0xe820</span>
         </div>

src/components/Layout/LayoutHeader/LayoutHeader.js

@@ -41,6 +41,7 @@ const LayoutHeader = () => {
                 <div className={`width-30 `}>
                     <Routes>
                         <Route path={RoutesName.Landing} element={<h2>{t("Landing.title")}</h2>}/>
+                        <Route path={RoutesName.EasyTrading} element={<h2>{t("MarketTitle.easyTrading")}</h2>}/>
                         <Route path={RoutesName.Commission} element={<h2>{t("commissions.title")}</h2>}/>
                         <Route path={RoutesName.AboutUs} element={<h2>{t("aboutUs.title")}</h2>}/>
                         <Route path={RoutesName.TransferFees} element={<h2>{t("transferFees.title")}</h2>}/>
@@ -59,10 +60,10 @@ const LayoutHeader = () => {
                         to={RoutesName.Landing}
                         className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}
                     >{t("home")}</NavLink>
-                    {/* <NavLink
-                        to="#"
-                        className={`mx-1 cursor-pointer hover-text`}
-                    >{t("MarketTitle.easyTrading")}</NavLink>*/}
+                     <NavLink
+                        to={RoutesName.EasyTrading}
+                        className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}
+                    >{t("MarketTitle.easyTrading")}</NavLink>
                     <NavLink
                         to={RoutesName.Panel}
                         className={({ isActive }) => isActive ? 'text-orange mx-1 cursor-pointer hover-text' : 'mx-1 cursor-pointer hover-text'}

src/components/TextInput/TextInput.js

@@ -38,7 +38,6 @@ const TextInput = (props) => {
             if (state.isSelected) {
                 className = className + " " + classes.isSelected
             }
-        console.log("className", className)
         return className;
     }
 

src/main/Browser/Browser.js

@@ -22,6 +22,7 @@ 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";
+import EasyTrading from "./Pages/EasyTrading/EasyTrading";
 
 const Browser = () => {
     const query = useQuery();
@@ -94,6 +95,7 @@ const Browser = () => {
                 <Route element={<Layout/>}>
                     <Route path={RoutesName.Landing} element={<Landing/>}/>
                     <Route path={RoutesName.AllMarket} element={<AllMarket/>}/>
+                    <Route path={RoutesName.EasyTrading} element={<EasyTrading/>}/>
                     <Route path={RoutesName.AboutUs} element={<AboutUs/>}/>
                     <Route path={RoutesName.Commission} element={<Commission/>}/>
                     <Route path={RoutesName.TransferFees} element={<TransferFees/>}/>

src/main/Browser/Pages/EasyTrading/EasyTrading.js

@@ -0,0 +1,8 @@
+import React from 'react';
+import EasyOrder from "./components/EasyOrder/EasyOrder";
+
+const EasyTrading = () => {
+    return <EasyOrder/>;
+};
+
+export default EasyTrading;