diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..6f7b11f
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+ presets: ["@babel/preset-env", "@babel/preset-react"]
+ }
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 5168a5e..3ba70b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ build/*.js
build
npm-debug.log
.DS_Store
+package-lock.json
diff --git a/__tests__/__snapshots__/enzyme.js.snap b/__tests__/__snapshots__/enzyme.js.snap
new file mode 100644
index 0000000..61485ba
--- /dev/null
+++ b/__tests__/__snapshots__/enzyme.js.snap
@@ -0,0 +1,102 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[` check snapshot 1`] = `
+
+
+ Scrum Board
+
+
+`;
+
+exports[` check snapshot 1`] = `
+
+ Card1
+
+
+
+`;
+
+exports[` check snapshot 1`] = `
+
+
+
+
+`;
diff --git a/__tests__/enzyme.js b/__tests__/enzyme.js
new file mode 100644
index 0000000..d78c0ed
--- /dev/null
+++ b/__tests__/enzyme.js
@@ -0,0 +1,94 @@
+import React from 'react';
+import { configure, shallow } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+import toJson from 'enzyme-to-json';
+import Card from '../client/components/Card';
+import Column from '../client/components/Column';
+import Board from '../client/components/Board';
+
+configure({ adapter: new Adapter() });
+
+
+describe('', () => {
+ const defaultProps = {
+ title: 'Card1'
+ }
+ it('renders the title and all text', () => {
+ const CardComponent = shallow();
+ //check for all text
+ expect(CardComponent.text()).toEqual(`${defaultProps.title}StoryTo-DoIn-ProgressTo-VerifyCompletedMove`);
+ });
+
+ it('has a move button, className move-button', () => {
+ const CardComponent = shallow().find('button');
+ // check for one button with class
+ expect(CardComponent.hasClass('move-button')).toEqual(true);
+ expect(CardComponent).toHaveLength(1);
+ });
+
+ it('has a selector called "column"', () => {
+ const CardComponent = shallow().find('select');
+ // check for one button with class
+ expect(CardComponent.hasClass('card-component-dropdown')).toEqual(true)
+ expect(CardComponent.prop('name')).toEqual('column')
+ });
+
+ it('5 select options', () => {
+ const CardComponent = shallow().find('option');
+ expect(CardComponent).toHaveLength(5);
+ });
+
+ it('check snapshot', () => {
+ const CardComponent = shallow();
+ expect(toJson(CardComponent)).toMatchSnapshot();
+ });
+});
+
+
+describe('', () => {
+ const defaultProps = {
+ column: [
+ { title: "Scrum Board Card", column: "Story" },
+ { title: "styling with css", column: "Story" }
+ ],
+ header: 'Story'
+ }
+ it('renders the column title', () => {
+ const ColumnComponent = shallow().find('h1');
+ expect(ColumnComponent.text()).toEqual('Story');
+ });
+ it('renders multiple cards', () => {
+ const ColumnComponent = shallow().find('Card');
+ expect(ColumnComponent).toHaveLength(2);
+ });
+ it('check snapshot', () => {
+ const CardComponent = shallow();
+ expect(toJson(CardComponent)).toMatchSnapshot();
+ });
+});
+
+
+describe('', () => {
+ const defaultProps = {
+ title: "Scrum Board",
+ board: "Scrum Board"
+ }
+ it('renders in a div called board-component', () => {
+ const BoardComponent = shallow().find('div');
+ expect(BoardComponent.hasClass('board-component')).toBe(true);
+ });
+
+ it('renders a link component', () => {
+ const BoardComponent = shallow().find('Link');
+ expect(BoardComponent.hasClass('board-component-link')).toBe(true);
+ expect(BoardComponent.prop('to')).toEqual('/board/Scrum Board');
+ expect(BoardComponent.prop('activeclassname')).toEqual('current');
+ expect(BoardComponent.text()).toEqual('Scrum Board');
+
+ })
+
+ it('check snapshot', () => {
+ const BoardComponent = shallow();
+ expect(toJson(BoardComponent)).toMatchSnapshot();
+ });
+});
diff --git a/client/App.js b/client/App.js
index 54a2f08..f2cdb7b 100644
--- a/client/App.js
+++ b/client/App.js
@@ -1,48 +1,76 @@
import React, { Component } from 'react';
import HomePage from './pages/HomePage';
import BoardPage from './pages/BoardPage';
+import Navigation from './Navigation'
import TestPage from './pages/TestPage';
+import LandingPage from './pages/LandingPage';
import { BrowserRouter as Router , Switch, Route, Link,
NavLink} from 'react-router-dom';
+// function Navigation(props) {
+// return (
+//
+// );
+// }
+ // const App = props => {
+ // return(
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+ //
+
+ //
+ //
+ //
+
+ // );
+ // };
-function Navigation(props) {
- return (
-
- );
- }
const App = props => {
return(
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -50,4 +78,24 @@ const App = props => {
);
};
+
+
+//
+//
+//
+//
+//
+//
+//
+//
+
+
+//
+
+//
+//
+
+//
+//
+
export default App;
\ No newline at end of file
diff --git a/client/Navigation.js b/client/Navigation.js
new file mode 100644
index 0000000..51756b2
--- /dev/null
+++ b/client/Navigation.js
@@ -0,0 +1,30 @@
+import { NavLink } from "react-router-dom";
+import React from 'react';
+import Board from './components/Board'
+
+function Navigation(props) {
+ return (
+
+ );
+}
+
+export default Navigation;
\ No newline at end of file
diff --git a/client/components/Column.jsx b/client/components/Column.jsx
index 200ef38..78d61ee 100644
--- a/client/components/Column.jsx
+++ b/client/components/Column.jsx
@@ -19,4 +19,5 @@ const Column = ({column, header}) =>{
);
};
-export default Column;
\ No newline at end of file
+export default Column;
+
\ No newline at end of file
diff --git a/client/components/Login.jsx b/client/components/Login.jsx
new file mode 100644
index 0000000..2cc0331
--- /dev/null
+++ b/client/components/Login.jsx
@@ -0,0 +1,64 @@
+import React, { useState } from 'react';
+import { useHistory } from 'react-router-dom'
+
+const Login = ({ setRegisteringState }) => {
+ const [username, setUsername] = useState('');
+ const [password, setPassword] = useState('');
+ const history = useHistory()
+
+ const handleUsername = (e) => {
+ return setUsername(e.target.value)
+ }
+
+ const handlePassword = (e) => {
+ return setPassword(e.target.value)
+ }
+
+ const onSubmit = (e) => {
+ e.preventDefault()
+ const user = {
+ username: username,
+ password: password
+ }
+ console.log("user", user)
+ fetch('/user/login', {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(user)
+ })
+ .then(response => response.json())
+ .then(data => console.log(data))
+ .then(history.push('/'))
+ .catch(err => console.log(err))
+ }
+
+ return (
+
+ )
+
+};
+
+export default Login
\ No newline at end of file
diff --git a/client/components/Register.jsx b/client/components/Register.jsx
new file mode 100644
index 0000000..2c963bb
--- /dev/null
+++ b/client/components/Register.jsx
@@ -0,0 +1,68 @@
+import React, { useState } from 'react';
+import { useHistory } from 'react-router-dom'
+
+const Register = () => {
+ const [username, setUsername] = useState('');
+ const [password, setPassword] = useState('');
+ const [password2, setPassword2] = useState('');
+ const history = useHistory()
+
+ const handleUsername = (e) => {
+ setUsername(e.target.value)
+ }
+
+ const handlePassword = (e) => {
+ setPassword(e.target.value)
+ }
+
+ const handlePassword2 = (e) => {
+ setPassword2(e.target.value)
+ }
+
+ const submit = (e) => {
+
+ e.preventDefault();
+ const newUser = {
+ username: username,
+ password: password,
+ password2: password2
+ }
+ console.log("from fetch", newUser)
+ fetch('/user/register', {
+ method: 'POST',
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(newUser)
+ })
+ .then(response => response.json())
+ .then(data => console.log("hello", data))
+ .then(history.push('/'))
+ .catch(err => console.log(err))
+
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Welcome to 'ProjectName' 2.0
+
+
+
+ {!isRegistering
+ ?
+ :
+ }
+
+