From f6459ab06967081bf908360de656e5d59f2811e9 Mon Sep 17 00:00:00 2001 From: fmazzini <fmazzini@unibz.it> Date: Thu, 25 Mar 2021 16:22:11 +0100 Subject: [PATCH] Fixed Project --- src/App.tsx | 2 +- src/components/AuthUser/Homepage/Header.tsx | 52 +++++++------------ src/components/AuthUser/Homepage/HomePage.tsx | 43 +++++++-------- 3 files changed, 38 insertions(+), 59 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index f631093..29a6b1d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react'; import { BrowserRouter as Router, Switch, Route } from 'react-router-dom'; -import HomePage from './components/AuthUser/Homepage/HomePage'; +import { HomePage } from './components/AuthUser/Homepage/HomePage'; export const App: FC = () => ( <Router> diff --git a/src/components/AuthUser/Homepage/Header.tsx b/src/components/AuthUser/Homepage/Header.tsx index 0c1213a..df543e3 100644 --- a/src/components/AuthUser/Homepage/Header.tsx +++ b/src/components/AuthUser/Homepage/Header.tsx @@ -1,37 +1,23 @@ -import React from "react"; +import React, { FC } from 'react'; +import { AppBar, Toolbar, Button } from '@material-ui/core'; import { makeStyles } from '@material-ui/core/styles'; -import { AppBar, Toolbar, Button } from "@material-ui/core"; -//import { Home }from "@material-ui/icons"; const useStyles = makeStyles((theme) => ({ - button: { - margin: theme.spacing(1), - }, - })); - -const Header = () => { - - const classes = useStyles; - - return ( - - <AppBar position="static"> - - <Toolbar> - <Button - variant="contained" - //color="primary" - className={classes.button} - //startIcon={<Home />} - > - Home - </Button> - </Toolbar> - - </AppBar> - - - ); + button: { + margin: theme.spacing(1), + }, +})); + +export const Header: FC = () => { + const classes = useStyles(); + + return ( + <AppBar position="static"> + <Toolbar> + <Button variant="contained" className={classes.button}> + Home + </Button> + </Toolbar> + </AppBar> + ); }; - -export default Header; \ No newline at end of file diff --git a/src/components/AuthUser/Homepage/HomePage.tsx b/src/components/AuthUser/Homepage/HomePage.tsx index b021dd6..cc7caa4 100644 --- a/src/components/AuthUser/Homepage/HomePage.tsx +++ b/src/components/AuthUser/Homepage/HomePage.tsx @@ -1,27 +1,20 @@ -import React from "react"; -import Header from "./Header"; +import React, { FC } from 'react'; +import { CssBaseline, Grid } from '@material-ui/core'; -import { CssBaseline, Grid } from "@material-ui/core"; +import { Header } from './Header'; -const HomePage = () => { - - return ( - - <Grid container direction="column"> - <Grid item> - <CssBaseline /> - <Header /> - </Grid> - <Grid item container> - <Grid item xs={false} sm={2} /> - <Grid item xs={12} sm={8} > - - </Grid> - <Grid item xs={false} sm={2} /> - </Grid> - </Grid> - - ); -}; - -export default HomePage; \ No newline at end of file +export const HomePage: FC = () => ( + <Grid container direction="column"> + <Grid item> + <CssBaseline /> + <Header /> + </Grid> + <Grid item container> + <Grid item xs={false} sm={2} /> + <Grid item xs={12} sm={8}> + Content + </Grid> + <Grid item xs={false} sm={2} /> + </Grid> + </Grid> +); -- GitLab