From f5a48e3d1a83d0f0848f94768724bb5c7ec3500d Mon Sep 17 00:00:00 2001 From: YOUR NAME Date: Fri, 15 Jun 2018 07:43:54 +1000 Subject: [PATCH] added why now text & testingt mailchimp --- package.json | 4 +++- src/App.css | 7 ++++--- src/App.js | 4 +++- src/components/Form.js | 27 ++++++++++++++++++++++++--- src/index.css | 2 +- src/index.js | 1 + src/layouts/WhatIs.js | 37 +++++++++++++++++++++++++++++++++++++ yarn.lock | 24 +++++++++++++++++++++++- 8 files changed, 96 insertions(+), 10 deletions(-) create mode 100644 src/layouts/WhatIs.js diff --git a/package.json b/package.json index cd7124f..5b8206b 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,10 @@ "bootstrap": "^4.1.1", "react": "^16.4.1", "react-dom": "^16.4.1", + "react-mailchimp-subscribe": "^2.0.2", "react-scripts": "1.1.4", - "reactstrap": "^6.1.0" + "reactstrap": "^6.1.0", + "typeface-roboto": "^0.0.54" }, "scripts": { "start": "react-scripts start", diff --git a/src/App.css b/src/App.css index 2d6c197..2f452ad 100644 --- a/src/App.css +++ b/src/App.css @@ -6,12 +6,13 @@ .App-logo { /* animation: App-logo-spin infinite 20s linear; */ - min-height: 55px; - max-height: 78.2px; + height: 78.2px; } - +.WhatIs { + font-family: 'Roboto'; +} diff --git a/src/App.js b/src/App.js index dda96d8..d55df19 100644 --- a/src/App.js +++ b/src/App.js @@ -2,7 +2,8 @@ import React, { Component } from "react"; import "./App.css"; // import HeadNavbar from "./components/Navbar"; import Drift from "./components/Drift"; -import AboveTheFold from "./layouts/AboveTheFold" +import AboveTheFold from "./layouts/AboveTheFold"; +import WhatIs from "./layouts/WhatIs?" // Make this DRY ~ DO NOT REPEAT YOURSELF class App extends Component { @@ -13,6 +14,7 @@ class App extends Component { {/* 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/Form.js b/src/components/Form.js index eb43776..39a8d98 100644 --- a/src/components/Form.js +++ b/src/components/Form.js @@ -1,6 +1,27 @@ 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 { render() { @@ -11,7 +32,7 @@ export default class EmailForm extends React.Component { @@ -20,13 +41,13 @@ export default class EmailForm extends React.Component {
- +
); diff --git a/src/index.css b/src/index.css index 491dcd2..0e493da 100644 --- a/src/index.css +++ b/src/index.css @@ -1,6 +1,6 @@ body { margin: 0; padding: 0; - font-family: sans-serif; + font-family: 'Roboto'; } diff --git a/src/index.js b/src/index.js index 4546afa..d1dd8ad 100644 --- a/src/index.js +++ b/src/index.js @@ -4,6 +4,7 @@ import './index.css'; import 'bootstrap/dist/css/bootstrap.min.css'; import App from './App'; import registerServiceWorker from './registerServiceWorker'; +import "typeface-roboto"; ReactDOM.render(, document.getElementById('root')); registerServiceWorker(); diff --git a/src/layouts/WhatIs.js b/src/layouts/WhatIs.js new file mode 100644 index 0000000..4e44cc1 --- /dev/null +++ b/src/layouts/WhatIs.js @@ -0,0 +1,37 @@ +import React, { Component } from "react"; +import { Container } from "reactstrap"; + +export default class WhatIs extends Component { + render() { + return ( +
+ +
+
+
+ +

What is Innovation Drive?

+

+ We turn great ideas into real physical products by Connecting a team + of experts to democratise the product development and manufacturing + process. +

+

+ For corporates: On demand design to manufacturing On demand product + development team +

+

+ For corporates: On demand design to manufacturing On demand product + development team +

+

+ For Everyday inventors On demand end-to end product development team +

+
+

Why Innovation Drive?

+

We exist to empower everyday inventors

+ +
+ ); + } +} diff --git a/yarn.lock b/yarn.lock index bde638b..2d7fc93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1862,7 +1862,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -4082,6 +4082,12 @@ jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" +jsonp@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/jsonp/-/jsonp-0.2.1.tgz#a65b4fa0f10bda719a05441ea7b94c55f3e15bae" + dependencies: + debug "^2.1.3" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -5579,6 +5585,14 @@ react-error-overlay@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4" +react-mailchimp-subscribe@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/react-mailchimp-subscribe/-/react-mailchimp-subscribe-2.0.2.tgz#64c86e9eb0282b3842f95dcf58446fe06feabd1b" + dependencies: + jsonp "^0.2.1" + prop-types "^15.5.10" + to-querystring "^1.0.4" + react-popper@^0.10.4: version "0.10.4" resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-0.10.4.tgz#af2a415ea22291edd504678d7afda8a6ee3295aa" @@ -6601,6 +6615,10 @@ to-object-path@^0.3.0: dependencies: kind-of "^3.0.2" +to-querystring@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/to-querystring/-/to-querystring-1.0.4.tgz#17454b79f45b3116a6f7fd3b153b01e6bc063b96" + to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" @@ -6677,6 +6695,10 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" +typeface-roboto@^0.0.54: + version "0.0.54" + resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-0.0.54.tgz#8f02c9a18d1cfa7f49381a6ff0d21ff061f38ad2" + ua-parser-js@^0.7.18: version "0.7.18" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"