From 28a65d34a674081b81a86214e5054f1eb97645ab Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Wed, 10 Jun 2020 22:47:04 +0300 Subject: [PATCH] grid fixed --- client/public/index.html | 25 +------- .../components/DrawerContent/DrawerContent.js | 11 ++++ client/src/components/Main/Main.js | 58 ++++++++++--------- 3 files changed, 42 insertions(+), 52 deletions(-) diff --git a/client/public/index.html b/client/public/index.html index aa069f2..c99bae0 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -10,34 +10,11 @@ content="Web site created using create-react-app" /> - - - React App + Todo App
- diff --git a/client/src/components/DrawerContent/DrawerContent.js b/client/src/components/DrawerContent/DrawerContent.js index f4ec7d0..d0817a3 100644 --- a/client/src/components/DrawerContent/DrawerContent.js +++ b/client/src/components/DrawerContent/DrawerContent.js @@ -2,6 +2,7 @@ import React from 'react'; import Divider from '@material-ui/core/Divider'; import FormatListBulletedIcon from '@material-ui/icons/FormatListBulleted'; import CategoryIcon from '@material-ui/icons/Category'; +import AddIcon from '@material-ui/icons/Add'; import DeleteIcon from '@material-ui/icons/Delete'; import List from '@material-ui/core/List'; import ListItem from '@material-ui/core/ListItem'; @@ -10,12 +11,17 @@ import ListItemText from '@material-ui/core/ListItemText'; import Collapse from '@material-ui/core/Collapse' import ExpandLess from '@material-ui/icons/ExpandLess' import ExpandMore from '@material-ui/icons/ExpandMore' +import IconButton from '@material-ui/core/IconButton' import { makeStyles } from '@material-ui/core/styles' const useStyles = makeStyles((theme) => ({ toolbar: theme.mixins.toolbar, nested: { paddingLeft: theme.spacing(4) + }, + addCategoryItem: { + display: 'flex', + justifyContent: 'center' } })) @@ -58,6 +64,11 @@ const Drawer = () => { + + + + + diff --git a/client/src/components/Main/Main.js b/client/src/components/Main/Main.js index a06700c..b941868 100644 --- a/client/src/components/Main/Main.js +++ b/client/src/components/Main/Main.js @@ -63,34 +63,36 @@ const Main = () => { - - - - - - Категория 1 - - - 18:00 - - - - Todo 1 - - - But I must explain to you how all this mistaken idea of denouncing pleasure and praising. - - - - - - - - - - - - + + {[1,2,3,4,5,6].map((e) => + + + + + Категория 1 + + + 18:00 + + + + Todo 1 + + + But I must explain to you how all this mistaken idea of denouncing pleasure and praising. + + + + + + + + + + + + + )} )