From faea222f02665dacc46a5db2aa022d629e32d457 Mon Sep 17 00:00:00 2001
From: David <poq-david@live.com>
Date: Mon, 6 Aug 2018 23:13:22 +0430
Subject: [PATCH] commit1

---
 client/src/App.js                     | 134 +-------------------------
 client/src/components/HomeNav.js      | 116 ++++++++++++++++++++++
 client/src/components/MarketingNav.js |  65 +++++++++++++
 client/src/index.css                  |   5 +
 public/img/dtube.png                  | Bin 0 -> 297 bytes
 public/img/steemit.png                | Bin 0 -> 362 bytes
 6 files changed, 191 insertions(+), 129 deletions(-)
 create mode 100644 client/src/components/HomeNav.js
 create mode 100644 client/src/components/MarketingNav.js
 create mode 100644 public/img/dtube.png
 create mode 100644 public/img/steemit.png

diff --git a/client/src/App.js b/client/src/App.js
index e3da715..558ca91 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -1,22 +1,9 @@
 import React from "react";
-import {
-  Navbar,
-  NavbarNav,
-  NavbarToggler,
-  Collapse,
-  NavItem,
-  Footer,
-  NavLink,
-  Row,
-  Col,
-  Container,
-  Modal,
-  ModalBody,
-  ModalHeader
-} from "mdbreact";
+import { Footer, Row, Col, Modal, ModalBody, ModalHeader } from "mdbreact";
 import { BrowserRouter as Router } from "react-router-dom";
-import { Link, Events, animateScroll as scroll, scrollSpy } from "react-scroll";
-
+import { Events, animateScroll as scroll, scrollSpy } from "react-scroll";
+import HomeNav from "./components/HomeNav";
+import MarketingNav from "./components/MarketingNav";
 import "./index.css";
 import "./static/css/palmpay.css";
 
@@ -98,118 +85,7 @@ class App extends React.Component {
     return (
       <Router>
         <span id="apppage">
-          {!currentPath.includes("marketing") ? (
-            <Navbar dark expand="md" fixed="top" id="mainNav" scrolling>
-              <Container hidden={this.state.showmenu}>
-                <Link
-                  activeClass="active"
-                  className="navbar-brand"
-                  to="home"
-                  href="/"
-                  spy={true}
-                  smooth={true}
-                  offset={0}
-                  duration={500}
-                  onSetActive={this.handleSetActive}>
-                  <img
-                    alt=""
-                    className="logo1"
-                    src="./img/logo.png"
-                    width="100%"
-                  />
-                  <img
-                    alt=""
-                    className="logo2"
-                    src="./img/logo54.png"
-                    width="100%"
-                    style={{ display: "none" }}
-                  />
-                </Link>
-
-                <NavbarToggler onClick={this.onClick} />
-                <Collapse isOpen={this.state.collapse} navbar>
-                  <NavbarNav right>
-                    <NavItem>
-                      <Link
-                        activeClass="active"
-                        className="nav-link"
-                        to="services"
-                        spy={true}
-                        smooth={true}
-                        offset={0}
-                        duration={500}
-                        onSetActive={this.handleSetActive}>
-                        <span id="nav_lang1">Services</span>
-                      </Link>
-                    </NavItem>
-                    <NavItem>
-                      <Link
-                        activeClass="active"
-                        className="nav-link"
-                        to="about"
-                        spy={true}
-                        smooth={true}
-                        offset={0}
-                        duration={500}
-                        onSetActive={this.handleSetActive}>
-                        <span id="nav_lang2">About</span>
-                      </Link>
-                    </NavItem>
-                    <NavItem>
-                      <Link
-                        activeClass="active"
-                        className="nav-link"
-                        href="#testimonies"
-                        to="testimonies"
-                        spy={true}
-                        smooth={true}
-                        offset={0}
-                        duration={500}
-                        onSetActive={this.handleSetActive}>
-                        <span id="nav_lang3">Testimonies</span>
-                      </Link>
-                    </NavItem>
-                    <NavItem>
-                      <NavLink to="#!" onClick={this.toggle2}>
-                        <span id="nav_lang4">Downloads</span>
-                      </NavLink>
-                    </NavItem>
-                  </NavbarNav>
-                </Collapse>
-              </Container>
-            </Navbar>
-          ) : (
-            <Navbar
-              dark
-              expand="md"
-              fixed="top"
-              id="mainNav"
-              scrolling
-              className="top-nav-collapse">
-              <Container hidden={this.state.showmenu}>
-                <a activeClass="active" className="navbar-brand" href="/">
-                  <img
-                    alt=""
-                    className="logo1"
-                    src="./img/logo.png"
-                    width="100%"
-                  />
-                  <img
-                    alt=""
-                    className="logo2"
-                    src="./img/logo54.png"
-                    width="100%"
-                    style={{ display: "none" }}
-                  />
-                </a>
-
-                <NavbarToggler onClick={this.onClick} />
-                <Collapse isOpen={this.state.collapse} navbar>
-                  <NavbarNav right />
-                </Collapse>
-              </Container>
-            </Navbar>
-          )}
+          {!currentPath.includes("marketing") ? <HomeNav /> : <MarketingNav />}
           {collapsed && overlay}
 
           <Routes />
diff --git a/client/src/components/HomeNav.js b/client/src/components/HomeNav.js
new file mode 100644
index 0000000..4408e99
--- /dev/null
+++ b/client/src/components/HomeNav.js
@@ -0,0 +1,116 @@
+import {
+  Navbar,
+  NavbarNav,
+  NavbarToggler,
+  Collapse,
+  NavItem,
+  NavLink,
+  Container
+} from "mdbreact";
+import { Link } from "react-scroll";
+import React from "react";
+
+class HomeNav extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { showmenu: true };
+    this.state = {
+      collapse: false
+    };
+    this.onClick = this.onClick.bind(this);
+    this.handleNavbarClick = this.handleNavbarClick.bind(this);
+  }
+
+  onClick() {
+    this.setState({
+      collapse: !this.state.collapse
+    });
+  }
+
+  handleNavbarClick() {
+    this.setState({
+      collapse: false
+    });
+  }
+
+  render() {
+    return (
+      <Navbar dark expand="md" fixed="top" id="mainNav" scrolling>
+        <Container className="menuc" hidden={this.state.showmenu}>
+          <Link
+            activeClass="active"
+            className="navbar-brand"
+            to="home"
+            href="/"
+            spy={true}
+            smooth={true}
+            offset={0}
+            duration={500}
+            onSetActive={this.handleSetActive}>
+            <img alt="" className="logo1" src="./img/logo.png" width="100%" />
+            <img
+              alt=""
+              className="logo2"
+              src="./img/logo54.png"
+              width="100%"
+              style={{ display: "none" }}
+            />
+          </Link>
+
+          <NavbarToggler onClick={this.onClick} />
+          <Collapse isOpen={this.state.collapse} navbar>
+            <NavbarNav right>
+              <NavItem>
+                <Link
+                  activeClass="active"
+                  className="nav-link"
+                  to="services"
+                  spy={true}
+                  smooth={true}
+                  offset={0}
+                  duration={500}
+                  onSetActive={this.handleSetActive}>
+                  <span id="nav_lang1">Services</span>
+                </Link>
+              </NavItem>
+              <NavItem>
+                <Link
+                  activeClass="active"
+                  className="nav-link"
+                  to="about"
+                  spy={true}
+                  smooth={true}
+                  offset={0}
+                  duration={500}
+                  onSetActive={this.handleSetActive}>
+                  <span id="nav_lang2">About</span>
+                </Link>
+              </NavItem>
+              <NavItem>
+                <Link
+                  activeClass="active"
+                  className="nav-link"
+                  href="#testimonies"
+                  to="testimonies"
+                  spy={true}
+                  smooth={true}
+                  offset={0}
+                  duration={500}
+                  onSetActive={this.handleSetActive}>
+                  <span id="nav_lang3">Testimonies</span>
+                </Link>
+              </NavItem>
+              <NavItem>
+                <NavLink to="#!" onClick={this.toggle2}>
+                  <span id="nav_lang4">Downloads</span>
+                </NavLink>
+              </NavItem>
+            </NavbarNav>
+          </Collapse>
+        </Container>
+      </Navbar>
+    );
+  }
+}
+
+export default HomeNav;
diff --git a/client/src/components/MarketingNav.js b/client/src/components/MarketingNav.js
new file mode 100644
index 0000000..74592aa
--- /dev/null
+++ b/client/src/components/MarketingNav.js
@@ -0,0 +1,65 @@
+import {
+  Navbar,
+  NavbarNav,
+  NavbarToggler,
+  Collapse,
+  Container
+} from "mdbreact";
+//import { Link } from "react-scroll";
+import React from "react";
+
+class MarketingNav extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { showmenu: true };
+    this.state = {
+      collapse: false
+    };
+    this.onClick = this.onClick.bind(this);
+    this.handleNavbarClick = this.handleNavbarClick.bind(this);
+  }
+
+  onClick() {
+    this.setState({
+      collapse: !this.state.collapse
+    });
+  }
+
+  handleNavbarClick() {
+    this.setState({
+      collapse: false
+    });
+  }
+
+  render() {
+    return (
+      <Navbar
+        dark
+        expand="md"
+        fixed="top"
+        id="mainNav"
+        scrolling
+        className="top-nav-collapse">
+        <Container hidden={this.state.showmenu}>
+          <a activeClass="active" className="navbar-brand" href="/">
+            <img alt="" className="logo1" src="./img/logo.png" width="100%" />
+            <img
+              alt=""
+              className="logo2"
+              src="./img/logo54.png"
+              width="100%"
+              style={{ display: "none" }}
+            />
+          </a>
+
+          <NavbarToggler onClick={this.onClick} />
+          <Collapse isOpen={this.state.collapse} navbar>
+            <NavbarNav right />
+          </Collapse>
+        </Container>
+      </Navbar>
+    );
+  }
+}
+
+export default MarketingNav;
diff --git a/client/src/index.css b/client/src/index.css
index 33ea5cd..56acc5d 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -95,3 +95,8 @@ strong.important {
 #testimonies {
   padding: 14rem 0 !important;
 }
+@media (min-width: 1200px) {
+  .menuc {
+    max-width: 90% !important;
+  }
+}
diff --git a/public/img/dtube.png b/public/img/dtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..23f2c543418b9d441540d180716bc1d152af7dd2
GIT binary patch
literal 297
zcmV+^0oMMBP)<h;3K|Lk000e1NJLTq0015U0015c0{{R34DMc#0000#P)t-s0002Z
z&CSZn%FN8n%gf8h$H)Kw|M2ke`T6<${QUOz_Tu8=)z#I{&(HJo^WNUx?d|R6=H}Pe
z*V59`>FMd<N_V;d000JbQchC<?ug8)BFK`OSO5S3lSxEDR4C8glFJUnAP7a#b`amM
z{{Od*Brc?#xSU1L?s^D81^&T>mK;N__~Yp_E*N;?aX|^yfeB3Wmc7uH;*!kJ3FJXp
ztB2P@54;$o-Zk1b<1vD}X(r8yxmM~)I=7nCM!T?Uo@YFNjaJ3QE~$-{&!S+>K@`j0
v(13|d&xC{hhxXk%BrWBqAkrk&2(RZ0y0Qnc=>Q*w00000NkvXXu0mjf{dAbK

literal 0
HcmV?d00001

diff --git a/public/img/steemit.png b/public/img/steemit.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf6c231c97652dd63553bc9318c1c9f071936e78
GIT binary patch
literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq0015U0015c0{{R34DMc#0000~P)t-s0001_
zq@>Hs%ciELr>CdM$;r*l&84NK%*@Q9qN2*m%E-vb|NsB``ug_v_U`WP=H}+t*Vp6Y
z<J;TY^78WC-QCmE)6&w?&(F{B@bJ~u)#~c%({X@R0000CbW%=J0EntYB4+Mp%*=>H
zKzm8l0002FNkl<ZD9`1ROR~Zs6hu2F(f9O_55#<Q|NHa?MuIwYVh@_4x(*F>(f4#6
zKczR;H_6zVLE3~O#cYFCrk*^8XoN=kV=GEApTOBNm_KU<Z}$eqS{|0-a8!vMuaD4W
z@c_P758Ntsur?+Be_#iz1*Q@YCrua_@k7z>RPFet(+qtU-(gn7FSQ(GaSMZ*mAC}R
zhvNw5U3%54@;K5|TXfH<ZGodSIAvPSO0+kB`zz@6NnXF92P5POv6BDujsO4v07*qo
IM6N<$f<EN6-T(jq

literal 0
HcmV?d00001