diff --git a/package-lock.json b/package-lock.json index 37ec08e..0d2a38a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8342,6 +8342,11 @@ "prop-types": "^15.6.0" } }, + "react-driftjs": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/react-driftjs/-/react-driftjs-1.0.8.tgz", + "integrity": "sha512-vweesHcyDcGObxExoYHMATBMbYXGogEFZufrqfdcfIJkLIcZLyfKdFRBNknehyJACEJRQpFr9L6a3W5uy3iM8Q==" + }, "react-error-overlay": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-4.0.0.tgz", diff --git a/package.json b/package.json index 5b8206b..08b68b7 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,9 @@ "bootstrap": "^4.1.1", "react": "^16.4.1", "react-dom": "^16.4.1", + "react-driftjs": "^1.0.8", "react-mailchimp-subscribe": "^2.0.2", + "react-router-dom": "^4.3.1", "react-scripts": "1.1.4", "reactstrap": "^6.1.0", "typeface-roboto": "^0.0.54" diff --git a/src/App.css b/src/App.css index 2f452ad..47b27cb 100644 --- a/src/App.css +++ b/src/App.css @@ -1,6 +1,6 @@ .App { text-align: center; - + background-color: #FCFCFC; } diff --git a/src/App.js b/src/App.js index 3d4108f..8fabcbb 100644 --- a/src/App.js +++ b/src/App.js @@ -1,21 +1,23 @@ import React, { Component } from "react"; import "./App.css"; // import HeadNavbar from "./components/Navbar"; -import Drift from "./components/Drift"; -import AboveTheFold from "./layouts/AboveTheFold"; +import DriftChat from "./components/Drift"; +import Homepage from "./pages/Homepage"; import WhatIs from "./layouts/WhatIs" +import Footer from "./components/Footer"; // Make this DRY ~ DO NOT REPEAT YOURSELF class App extends Component { render() { return (
- + {/* Above the fold but below navbar */} {/* FIX BACKground image to only render before scroll on mobile/web */} {/* BELOW THE FOLD */} - - + {/* */} +
); } diff --git a/src/components/Drift.js b/src/components/Drift.js index 3a5f60d..501e72e 100644 --- a/src/components/Drift.js +++ b/src/components/Drift.js @@ -1,43 +1,16 @@ import React from "react"; +import Drift from 'react-driftjs' -export default class Drift extends React.Component { +export default class DriftChat extends React.Component { render() { return (
- {/* Add Drift here - "use strict"; */} -{/* !function() { - var t = window.driftt = window.drift = window.driftt || []; - if (!t.init) { - if (t.invoked) return void (window.console && console.error && console.error("Drift snippet included twice.")); - t.invoked = !0, t.methods = [ "identify", "config", "track", "reset", "debug", "show", "ping", "page", "hide", "off", "on" ], - t.factory = function(e) { - return function() { - var n = Array.prototype.slice.call(arguments); - return n.unshift(e), t.push(n), t; - }; - }, t.methods.forEach(function(e) { - t[e] = t.factory(e); - }), t.load = function(t) { - var e = 3e5, n = Math.ceil(new Date() / e) * e, o = document.createElement("script"); - o.type = "text/javascript", o.async = !0, o.crossorigin = "anonymous", o.src = "https://js.driftt.com/include/" + n + "/" + t + ".js"; - var i = document.getElementsByTagName("script")[0]; - i.parentNode.insertBefore(o, i); - }; - } -}(); -drift.SNIPPET_VERSION = '0.3.1'; -drift.load('g4nnbv58ni3w'); */} + + {/* //get the appId from drift.com */}
); } } - -// - -// \ No newline at end of file diff --git a/src/components/Footer.js b/src/components/Footer.js new file mode 100644 index 0000000..642d2e0 --- /dev/null +++ b/src/components/Footer.js @@ -0,0 +1,36 @@ +import React, { Component } from "react"; +import { Container, Row, Col } from "reactstrap"; + + +export default class Footer extends Component { + render() { + return ( + // + + Back to top + + + {" "} + + {" "} +

+ © 2017 Company, Inc. | Privacy |{" "} + Terms{" "} +

{" "} + + + + ); + } +} + +var FooterStyle = { + // color: "DodgerBlue", + textAlign: "center" +}; diff --git a/src/components/Form.js b/src/components/Form.js index 0a55124..b7133d4 100644 --- a/src/components/Form.js +++ b/src/components/Form.js @@ -2,34 +2,20 @@ import React, { Component } from "react"; import ThankYouAlert from "./ThankYouAlert"; import { Button, Input, InputGroup, Form, FormGroup, Label } from "reactstrap"; -// import MailchimpSubscribe from "react-mailchimp-subscribe" - -// const url = "https://innovationdrive.us18.list-manage.com/subscribe/post"; - -// // simplest form (only email) -// const SimpleForm = () => - -// // use the render prop and your custom form -// const CustomForm = () => ( -// ( -//
-// subscribe(formData)} /> -// {status === "sending" &&
sending...
} -// {status === "error" &&
} -// {status === "success" &&
Subscribed !
} -//
-// )} -// /> -// ) - -export default class EmailForm extends React.Component { +export default class EmailForm extends Component { render() { return ( -
+
-

Sign Up to our newsletter

+

Free video consultation

+ + + >>>>>>>>>>>>>>>>>>>>>>>>>>>> + +// import MailchimpSubscribe from "react-mailchimp-subscribe" + +// const url = "https://innovationdrive.us18.list-manage.com/subscribe/post"; + +// // simplest form (only email) +// const SimpleForm = () => + +// // use the render prop and your custom form +// const CustomForm = () => ( +// ( +//
+// subscribe(formData)} /> +// {status === "sending" &&
sending...
} +// {status === "error" &&
} +// {status === "success" &&
Subscribed !
} +//
+// )} +// /> +// ) \ No newline at end of file diff --git a/src/components/Navbar.js b/src/components/Navbar.js index c2af35a..484588f 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -11,9 +11,9 @@ import { DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; - import logo from '../logo.png'; + import logo from '../images/logo.png'; -export default class HeadNavbar extends React.Component { +export default class HeadNavbar extends Component { constructor(props) { super(props); @@ -30,19 +30,22 @@ export default class HeadNavbar extends React.Component { render() { return (
- + logo + +