From e11e35db182731cba107354d38bb02b89d5c0578 Mon Sep 17 00:00:00 2001 From: Austin Kettner Date: Thu, 19 Apr 2018 22:05:33 -0400 Subject: [PATCH 1/7] Update README Close #5 --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b8e2bec5..f7235189 100644 --- a/README.md +++ b/README.md @@ -1 +1,9 @@ -# camerakit-website \ No newline at end of file +# CameraKit Webiste +This is the repository for the CameraKit Project's Website. We ue this as our central open-source website which anyone can contribute to, log bugs for, and help improve. + +### Run Instructions +1. `yarn install` +2. `yarn server-dev` + +### Licensse +MIT License \ No newline at end of file From c671a92917eb7c4371e78ecdcee606a7431512fa Mon Sep 17 00:00:00 2001 From: Austin Kettner Date: Sat, 28 Apr 2018 16:15:50 -0400 Subject: [PATCH 2/7] Update Content - Additionally resolve ESLint warnings noticed. More to do. --- src/components/public/footer/index.js | 11 +++-------- src/components/public/subscribe/index.js | 14 +++++++------- src/index.js | 4 ++-- src/pages/public/home/features.js | 12 ++++++------ src/pages/public/home/index.js | 13 +++++-------- src/pages/public/home/sponsors.js | 2 +- 6 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/components/public/footer/index.js b/src/components/public/footer/index.js index 067a0776..73c26caa 100644 --- a/src/components/public/footer/index.js +++ b/src/components/public/footer/index.js @@ -1,7 +1,7 @@ import React from 'react'; -import Subscribe from '../subscribe'; import logo from 'static/brand_wonderkiln_logo.svg'; import footer from 'static/il_footer.png'; +import Subscribe from '../subscribe'; import styles from './footer.scss'; const Footer = () => ( @@ -19,18 +19,13 @@ const Footer = () => (
  • - - Terms of Use - -
  • -
  • - + License
  • - © 2017 WonderKiln, Inc + © 2018 WonderKiln, Inc
    diff --git a/src/components/public/subscribe/index.js b/src/components/public/subscribe/index.js index aafda963..11aecc3a 100644 --- a/src/components/public/subscribe/index.js +++ b/src/components/public/subscribe/index.js @@ -1,5 +1,5 @@ import React from 'react'; -import MailchimpSubscribe from "react-mailchimp-subscribe"; +import MailchimpSubscribe from 'react-mailchimp-subscribe'; import styles from './subscribe.scss'; const url = 'https://wonderkiln.us12.list-manage.com/subscribe/post?u=45b5c2055f100d913f074055b&id=ec9df2ad9a'; @@ -12,12 +12,12 @@ class Subscribe extends React.Component { render={({ subscribe, status, message }) => (

    Stay Up To Date

    -

    Some text here. Some text here. Some text here. Some text here. Some text here. Some text here.

    -
    { - event.preventDefault() - console.log(this.email.value); - subscribe({ email: this.email.value }); - }}> +

    We sometimes send out important updates concerning CameraKit. Provide your email if you are interested in receiving emails from us.

    + { + event.preventDefault() + subscribe({ email: this.email.value }); + }}>
    (this.email = node)} name="email" className={styles.input} type="email" required />
    ); diff --git a/src/pages/public/home/features.js b/src/pages/public/home/features.js index 67b6cc85..ae212b85 100644 --- a/src/pages/public/home/features.js +++ b/src/pages/public/home/features.js @@ -8,22 +8,22 @@ import IconVR from './ic_vr_addons.svg'; export default [ { icon: , - text: 'Easy to implement', - description: 'Some text goes here. Some text goes here. Some text goes here.' + text: 'Easy Implementation', + description: 'CameraKit fits into your existing stack and can be run up almost immediately. Implement the library and start improving reliability immediately.' }, { icon: , text: 'Extensively Tested', - description: 'Some text goes here.' + description: 'CameraKit has been tested across thousands of Android devices, major Android OS versions, and is ready for upcoming flagship Android device releases.' }, { icon: , text: 'All Camera Features', - description: 'Some text goes here.' + description: 'CameraKit supports all camera features, including seamless photo and video capture, auto permission handling, continuous and tap focus, scaling, and more.' }, { icon: , - text: 'Addons Support', - description: 'Some text goes here.' + text: 'Camera 1 and 2', + description: 'CameraKit supports and improves, hooking in the library in minutes, Camera 1 and 2 APIs while drastically improving stability and reliability for your app.' }, ]; diff --git a/src/pages/public/home/index.js b/src/pages/public/home/index.js index 05ce2f2c..19bc6789 100644 --- a/src/pages/public/home/index.js +++ b/src/pages/public/home/index.js @@ -28,18 +28,15 @@ const Home = () => (
    -
    - {/* -

    The Best Camera API on Android

    */} -
    +
    -

    Completely
    Open Source

    -

    Proudly made by people just like you. Who really like cats. Austin don't forget to change this text.

    +

    Complete
    Camera Library

    +

    CameraKit is an open-source library to support the Android Camera 1 and 2 APIs. Massively increase stability and reliability of photo and video capture on all Android devices.

    Scroll Down - + preview-mockup
    @@ -64,7 +61,7 @@ const Home = () => (
    -

    Sponsors

    +

    Support

      {sponsors.map(sponsor => ( Date: Sat, 28 Apr 2018 16:16:56 -0400 Subject: [PATCH 3/7] Fix LICENSE link ref --- src/components/public/footer/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/public/footer/index.js b/src/components/public/footer/index.js index 73c26caa..0e429895 100644 --- a/src/components/public/footer/index.js +++ b/src/components/public/footer/index.js @@ -19,7 +19,7 @@ const Footer = () => (
    • - + License
    • From 371dc5ddbb5dae5479248486fc859b247f2d89dc Mon Sep 17 00:00:00 2001 From: Austin Kettner Date: Sat, 28 Apr 2018 16:56:40 -0400 Subject: [PATCH 4/7] Fix Nav Alignment --- src/components/public/floating-footer/index.js | 6 +++--- src/components/public/nav/index.js | 12 ++++++++---- src/components/public/nav/nav.scss | 15 +++++++++++++++ src/pages/public/home/index.js | 4 ++-- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/components/public/floating-footer/index.js b/src/components/public/floating-footer/index.js index 5bcee535..5b7fe2e5 100644 --- a/src/components/public/floating-footer/index.js +++ b/src/components/public/floating-footer/index.js @@ -6,12 +6,12 @@ import Github from 'static/ic_github.svg'; const FloatingFooter = () => ( diff --git a/src/components/public/nav/index.js b/src/components/public/nav/index.js index 7d9ea566..9e8d1119 100644 --- a/src/components/public/nav/index.js +++ b/src/components/public/nav/index.js @@ -8,10 +8,14 @@ import Menu from './ic_menu.svg'; const Nav = () => ( diff --git a/src/components/public/nav/nav.scss b/src/components/public/nav/nav.scss index 8b862cc9..4fae0bb4 100644 --- a/src/components/public/nav/nav.scss +++ b/src/components/public/nav/nav.scss @@ -10,6 +10,21 @@ display: flex; align-items: center; justify-content: space-between; + .Logo { + flex-basis: 30%; + display: flex; + justify-content: flex-start; + } + .Brand { + flex-basis: 30%; + display: flex; + justify-content: center; + } + .Menu { + flex-basis: 30%; + display: flex; + justify-content: flex-end; + } } @media (min-width: 34em) { diff --git a/src/pages/public/home/index.js b/src/pages/public/home/index.js index 19bc6789..12169292 100644 --- a/src/pages/public/home/index.js +++ b/src/pages/public/home/index.js @@ -18,7 +18,7 @@ import styles from './home.scss'; import featureStyles from './features.scss'; import intro from './intro.scss'; -function scrollDown () { +function scrollDown() { jump('#features'); } @@ -26,7 +26,7 @@ const Home = () => (
      -
      +
      From b809dcc24594f66701040df431723f699c65bbce Mon Sep 17 00:00:00 2001 From: Austin Kettner Date: Sat, 28 Apr 2018 16:58:22 -0400 Subject: [PATCH 5/7] Update News placeholder --- src/components/public/news/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/public/news/index.js b/src/components/public/news/index.js index 6f808c1b..3e6a79c3 100644 --- a/src/components/public/news/index.js +++ b/src/components/public/news/index.js @@ -40,8 +40,8 @@ class News extends React.Component { /> ))}
    - : -

    No recent news.

    + : +

    Hmm... nothing to show just yet! News coming soon!

    }
    From 8d2b0d6f0c587f652c950af51f0941a9c89b5982 Mon Sep 17 00:00:00 2001 From: Austin Kettner Date: Sat, 28 Apr 2018 18:01:23 -0400 Subject: [PATCH 6/7] Fix linting --- src/components/public/floating-footer/index.js | 3 +-- src/components/public/news/index.js | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/public/floating-footer/index.js b/src/components/public/floating-footer/index.js index 5b7fe2e5..d5208acb 100644 --- a/src/components/public/floating-footer/index.js +++ b/src/components/public/floating-footer/index.js @@ -1,7 +1,6 @@ import React from 'react'; -import styles from './floating-footer.scss'; - import Github from 'static/ic_github.svg'; +import styles from './floating-footer.scss'; const FloatingFooter = () => (
    diff --git a/src/components/public/news/index.js b/src/components/public/news/index.js index 3e6a79c3..76c43fb6 100644 --- a/src/components/public/news/index.js +++ b/src/components/public/news/index.js @@ -15,14 +15,14 @@ class News extends React.Component { }; } - componentDidMount () { + componentDidMount() { Feed.load('https://cors-anywhere.herokuapp.com/https://medium.com/feed/@camerakit', (err, rss) => { if (err) return console.log(err); this.setState({ items: rss.items }); }); } - render () { + render() { return (
    From 2c93c3b4bd38f7520569ae3f6c6f1b321fff8ce4 Mon Sep 17 00:00:00 2001 From: Austin Kettner Date: Sat, 28 Apr 2018 19:28:20 -0400 Subject: [PATCH 7/7] Hide Menu until finished --- src/components/public/nav/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/public/nav/index.js b/src/components/public/nav/index.js index 9e8d1119..70f28a19 100644 --- a/src/components/public/nav/index.js +++ b/src/components/public/nav/index.js @@ -15,7 +15,7 @@ const Nav = () => (
    - + { /* */ }