Danovin
/
danovin
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Danovin:65e7e9cfc4375b0f1dbdd9940a5855d991df99d6
Branches Tags
Danovin:front
Danovin:master
..
compare: Danovin:0331967decd4c74093691b9e12cffdeaa738da60
Branches Tags
Danovin:front
Danovin:master

2 Commits
65e7e9cfc4 ... 0331967dec

Author SHA1 Message Date
amir hosein gorji 0331967dec Merge branch 'front' of https://git.sitenevis.com/Reza_ashrafi/danovin into front
3 years ago
amir hosein gorji 042384df90 update public/index.html, AppRouter.js, src/views/Home/Navbar/Laptop/index.js and src/views/Home/Navbar/Laptop/index.scss
3 years ago
4 changed files with 117 additions and 94 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 24
      public/index.html
  2. 2
      src/AppRouter.js
  3. 48
      src/views/Home/Navbar/Laptop/index.js
  4. 11
      src/views/Home/Navbar/Laptop/index.scss

24
public/index.html
Unescape View File

@ -1,19 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta <meta name="viewport" content="width=device-width, initial-scale=1" user-scalable="false" />
name="viewport"
content="width=device-width, initial-scale=1"
user-scalable="false"
/>
<meta name="theme-color" content="#000000" /> <meta name="theme-color" content="#000000" />
<meta name="description" content="دانوین" /> <meta name="description" content="دانوین" />
<link <link href="https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css" rel="stylesheet" />
href="https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css"
rel="stylesheet"
/>
<meta name="mobile-web-app-capable" content="yes" /> <meta name="mobile-web-app-capable" content="yes" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
@ -25,6 +19,7 @@
<script src="en.js"></script> <script src="en.js"></script>
<script> <script>
const lang = localStorage.getItem("language"); const lang = localStorage.getItem("language");
window.lang = lang
window.ar = ar; window.ar = ar;
window.en = en; window.en = en;
function t(val) { function t(val) {
@ -53,14 +48,8 @@
<body> <body>
<!-- Google Tag Manager (noscript) --> <!-- Google Tag Manager (noscript) -->
<noscript <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WVV8H9L" height="0" width="0"
><iframe style="display: none; visibility: hidden"></iframe></noscript>
src="https://www.googletagmanager.com/ns.html?id=GTM-WVV8H9L"
height="0"
width="0"
style="display: none; visibility: hidden"
></iframe
></noscript>
<!-- End Google Tag Manager (noscript) --> <!-- End Google Tag Manager (noscript) -->
<div id="root"></div> <div id="root"></div>
<script> <script>
@ -82,4 +71,5 @@
} }
</script> </script>
</body> </body>
</html> </html>

2
src/AppRouter.js
Unescape View File

@ -218,7 +218,7 @@ class AppRouter extends Component {
)} )}
</Route> </Route>
<Route exact path={"/profile"}> <Route exact path={"/profile"}>
{mobile ? status ? <Auth page={"profile"} /> : null : null} {status ? <Auth page={"profile"} /> : null}
</Route> </Route>
<Route exact path={"/qr-scan"}> <Route exact path={"/qr-scan"}>
{mobile ? ( {mobile ? (

48
src/views/Home/Navbar/Laptop/index.js
Unescape View File

@ -142,11 +142,27 @@ class LaptopNavbar extends Component {
</Menu> </Menu>
<select <select
className="language-select" className="language-select"
onChange={(e) => changeLanguage(e.target.value)} onChange={(e) => {
defaultValue={localStorage.getItem("language") || "fa"} window.localStorage.setItem("language", e.target.value);
window.location.reload();
}}
>
{console.log(window.lang)}
{[
{ key: "فارسی", lang: "fa", default: true },
{ key: "English", lang: "en" },
{ key: "العربیه", lang: "ar" },
].map((el, index) => (
<option
key={el.lang}
value={el.lang}
selected={
(!window.lang && el.default) || el.lang == window.lang
}
> >
{["fa", "en", "ar"].map((lang, index) => ( {el.key}
<option key={index}>{lang}</option> </option>
))} ))}
</select> </select>
<div <div
@ -179,11 +195,27 @@ class LaptopNavbar extends Component {
<div className="d-flex"> <div className="d-flex">
<select <select
className="language-select" className="language-select"
onChange={(e) => changeLanguage(e.target.value)} onChange={(e) => {
defaultValue={localStorage.getItem("language") || "fa"} window.localStorage.setItem("language", e.target.value);
window.location.reload();
}}
>
{console.log(window.lang)}
{[
{ key: "فارسی", lang: "fa", default: true },
{ key: "English", lang: "en" },
{ key: "العربیه", lang: "ar" },
].map((el, index) => (
<option
key={el.lang}
value={el.lang}
selected={
(!window.lang && el.default) || el.lang == window.lang
}
> >
{["fa", "en", "ar"].map((lang, index) => ( {el.key}
<option key={index}>{lang}</option> </option>
))} ))}
</select> </select>
<Link <Link

11
src/views/Home/Navbar/Laptop/index.scss
Unescape View File

@ -3,15 +3,16 @@
margin: 0px auto; margin: 0px auto;
.language-select { .language-select {
border: none; border: 1px solid #6cbe44;
outline: none; outline: none;
width: 50px; width: 100px;
background-color: #6cbe44;
color: white; color: #6cbe44;
font-weight: 500; font-weight: 500;
margin: 0px 10px; margin: 0px 10px;
border-radius: 5px; border-radius: 5px;
padding: 0px 4px; padding: 3px;
} }
&__header { &__header {

Write Preview
Loading…
Cancel
Save