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 ( - {!currentPath.includes("marketing") ? ( - - - - ) : ( - - - - )} + {!currentPath.includes("marketing") ? : } {collapsed && overlay} 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 ( + + + + ); + } +} + +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 ( + + + + ); + } +} + +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 0000000..23f2c54 Binary files /dev/null and b/public/img/dtube.png differ diff --git a/public/img/steemit.png b/public/img/steemit.png new file mode 100644 index 0000000..cf6c231 Binary files /dev/null and b/public/img/steemit.png differ