From 96bce4fc392ac18126b05ecce75eed24296e03eb Mon Sep 17 00:00:00 2001 From: Levin Faber Date: Wed, 15 May 2019 14:02:28 +0200 Subject: [PATCH 1/2] Added Router --- Frontend/src/components/App.js | 6 +++++- Frontend/src/components/Login.js | 7 ++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Frontend/src/components/App.js b/Frontend/src/components/App.js index 37d6b9b..2b80267 100644 --- a/Frontend/src/components/App.js +++ b/Frontend/src/components/App.js @@ -1,11 +1,15 @@ import React, { Component } from "react"; import CssBaseline from "@material-ui/core/Button"; +import { BrowserRouter as Router, Route, Link } from "react-router-dom"; +import Login from "./Login.js"; class App extends Component { state = {}; render() { return - + + + ; } } diff --git a/Frontend/src/components/Login.js b/Frontend/src/components/Login.js index ab5a99a..7403794 100644 --- a/Frontend/src/components/Login.js +++ b/Frontend/src/components/Login.js @@ -5,11 +5,8 @@ import Container from '@material-ui/core/Container'; class Login extends Component { state = {}; render() { - return - - - ; + return {} } } -export default App; \ No newline at end of file +export default Login; \ No newline at end of file From 0248913e811cd793b5d12cebfba62007d08b5977 Mon Sep 17 00:00:00 2001 From: Levin Faber Date: Wed, 15 May 2019 14:21:06 +0200 Subject: [PATCH 2/2] WIP --- Frontend/src/components/App.js | 13 ++++++++++--- Frontend/src/components/Login.js | 34 +++++++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/Frontend/src/components/App.js b/Frontend/src/components/App.js index 2b80267..b0b9c64 100644 --- a/Frontend/src/components/App.js +++ b/Frontend/src/components/App.js @@ -1,15 +1,22 @@ import React, { Component } from "react"; -import CssBaseline from "@material-ui/core/Button"; +import CssBaseline from "@material-ui/core/CssBaseline"; import { BrowserRouter as Router, Route, Link } from "react-router-dom"; import Login from "./Login.js"; +import { Box } from "@material-ui/core"; + class App extends Component { state = {}; render() { return - - + + + + ; } } diff --git a/Frontend/src/components/Login.js b/Frontend/src/components/Login.js index 7403794..946cbe7 100644 --- a/Frontend/src/components/Login.js +++ b/Frontend/src/components/Login.js @@ -1,11 +1,39 @@ import React, { Component } from "react"; -import Button from "@material-ui/core/Button"; -import Container from '@material-ui/core/Container'; +import TextField from '@material-ui/core/TextField'; +import Grid from '@material-ui/core/Grid'; class Login extends Component { state = {}; render() { - return {} + return ( +
+ + + + +
+ + ) } }