From 99f3612e8a4a8add35b821f87908f5312cdb642a Mon Sep 17 00:00:00 2001 From: Antreo Pukay Date: Wed, 9 Jan 2019 18:06:32 -0800 Subject: [PATCH 1/9] SigninForm ready for FormControl to be added --- src/components/login/login.component.tsx | 2 ++ src/components/signinForm/SignInForm.scss | 0 src/components/signinForm/SigninForm.js | 44 +++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 src/components/signinForm/SignInForm.scss create mode 100644 src/components/signinForm/SigninForm.js diff --git a/src/components/login/login.component.tsx b/src/components/login/login.component.tsx index 2b4a526..029bbf8 100644 --- a/src/components/login/login.component.tsx +++ b/src/components/login/login.component.tsx @@ -4,6 +4,7 @@ import { ReactElement } from "react"; import { createStore } from "redux"; import { FirebaseService } from "../../commons/firebase.service"; import { SVGs } from "../../commons/svg.list"; +import { SigninForm } from "../signinForm/SigninForm"; import { loginReducer } from "./login.reducer"; import './login.style.scss'; @@ -31,6 +32,7 @@ export class LoginComponent extends React.Component { return(

Please Login

+ + - -
- ); } } diff --git a/src/shared/FormControl.js b/src/shared/FormControl.js new file mode 100644 index 0000000..5117396 --- /dev/null +++ b/src/shared/FormControl.js @@ -0,0 +1,25 @@ +import React, { PureComponent } from 'react'; +import PropTypes from 'prop-types'; + +class FormControl extends PureComponent { + + static propTypes = { + children: PropTypes.element, + label: PropTypes.string, + }; + + render() { + const { label, children } = this.props; + + return ( +
+ { label && } +
+ {children} +
+
+ ); + } +} + +export default FormControl; \ No newline at end of file From f74c6c0af0ebc62f2b35774c07c5c93e8db1474c Mon Sep 17 00:00:00 2001 From: Antreo Pukay Date: Fri, 11 Jan 2019 09:10:07 -0800 Subject: [PATCH 3/9] started adding CSS --- src/components/signinForm/SignInForm.scss | 4 ++++ src/components/signinForm/SigninForm.js | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/signinForm/SignInForm.scss b/src/components/signinForm/SignInForm.scss index e69de29..5d41602 100644 --- a/src/components/signinForm/SignInForm.scss +++ b/src/components/signinForm/SignInForm.scss @@ -0,0 +1,4 @@ +.form-boxes { + border-width: 2px; + border-color: steelblue; +} \ No newline at end of file diff --git a/src/components/signinForm/SigninForm.js b/src/components/signinForm/SigninForm.js index cdb5f3b..0709b9e 100644 --- a/src/components/signinForm/SigninForm.js +++ b/src/components/signinForm/SigninForm.js @@ -2,6 +2,7 @@ import FormControl from '../../shared/FormControl'; import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; +import './SigninForm.scss'; export class SigninForm extends PureComponent { @@ -33,19 +34,18 @@ export class SigninForm extends PureComponent { return (
-

Sign in here

- + - - +
); From 818db5f5cc926fa82006b1292fa0f82b6410d7ea Mon Sep 17 00:00:00 2001 From: Antreo Pukay Date: Sun, 13 Jan 2019 19:36:41 -0800 Subject: [PATCH 4/9] minor fixes --- src/components/login/login.component.tsx | 8 ++++---- src/components/signinForm/SigninForm.js | 7 ++++--- src/shared/FormControl.js | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/login/login.component.tsx b/src/components/login/login.component.tsx index 029bbf8..6d85821 100644 --- a/src/components/login/login.component.tsx +++ b/src/components/login/login.component.tsx @@ -38,11 +38,11 @@ export class LoginComponent extends React.Component {
{SVGs.google}
- - Sign in with Google - + + Sign in with Google + ); } -} \ No newline at end of file +} diff --git a/src/components/signinForm/SigninForm.js b/src/components/signinForm/SigninForm.js index 0709b9e..7268d52 100644 --- a/src/components/signinForm/SigninForm.js +++ b/src/components/signinForm/SigninForm.js @@ -36,12 +36,13 @@ export class SigninForm extends PureComponent {
- + - + diff --git a/src/shared/FormControl.js b/src/shared/FormControl.js index 5117396..ddff13c 100644 --- a/src/shared/FormControl.js +++ b/src/shared/FormControl.js @@ -22,4 +22,4 @@ class FormControl extends PureComponent { } } -export default FormControl; \ No newline at end of file +export default FormControl; From ef9fb5157106048d2eacc1ab6ff0ee0896f46563 Mon Sep 17 00:00:00 2001 From: Antreo Pukay Date: Mon, 14 Jan 2019 12:19:54 -0800 Subject: [PATCH 5/9] fixed casing on SignInForm --- src/components/login/login.component.tsx | 4 ++-- src/components/signinForm/SigninForm.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/login/login.component.tsx b/src/components/login/login.component.tsx index 6d85821..b36bfd5 100644 --- a/src/components/login/login.component.tsx +++ b/src/components/login/login.component.tsx @@ -4,7 +4,7 @@ import { ReactElement } from "react"; import { createStore } from "redux"; import { FirebaseService } from "../../commons/firebase.service"; import { SVGs } from "../../commons/svg.list"; -import { SigninForm } from "../signinForm/SigninForm"; +import { SignInForm } from "../signInForm/SignInForm"; import { loginReducer } from "./login.reducer"; import './login.style.scss'; @@ -32,7 +32,7 @@ export class LoginComponent extends React.Component { return(

Please Login

- + - - +
+ + + + + + + + + + + + +
); } }