diff --git a/package-lock.json b/package-lock.json index 9a701fe..8647a79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1149,6 +1149,77 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz", "integrity": "sha512-6PYY5DVdAY1ifaQW6XYTnOMihmBVT27elqSjEoodchsGjzYlEsTQMcEhSud99kVawatyTZRTiVkJ/c6lwbQ7nA==" }, + "@material-ui/core": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.6.1.tgz", + "integrity": "sha512-TljDMCJmi1zh7JhAFTp8qjIlbkVACiNftrcitzJJ+hAqpuP9PTO4euEkkAuYjISfUFZl3Z4kaOrBwN1HDrhIOQ==", + "requires": { + "@babel/runtime": "^7.4.4", + "@material-ui/styles": "^4.6.0", + "@material-ui/system": "^4.5.2", + "@material-ui/types": "^4.1.1", + "@material-ui/utils": "^4.5.2", + "@types/react-transition-group": "^4.2.0", + "clsx": "^1.0.2", + "convert-css-length": "^2.0.1", + "hoist-non-react-statics": "^3.2.1", + "normalize-scroll-left": "^0.2.0", + "popper.js": "^1.14.1", + "prop-types": "^15.7.2", + "react-transition-group": "^4.3.0" + } + }, + "@material-ui/styles": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@material-ui/styles/-/styles-4.6.0.tgz", + "integrity": "sha512-lqqh4UEMdIYcU1Yth4pQyMTah02uAkg3NOT3MirN9FUexdL8pNA6zCHigEgDSfwmvnXyxHhxTkphfy0DRfnt9w==", + "requires": { + "@babel/runtime": "^7.4.4", + "@emotion/hash": "^0.7.1", + "@material-ui/types": "^4.1.1", + "@material-ui/utils": "^4.5.2", + "clsx": "^1.0.2", + "csstype": "^2.5.2", + "hoist-non-react-statics": "^3.2.1", + "jss": "^10.0.0", + "jss-plugin-camel-case": "^10.0.0", + "jss-plugin-default-unit": "^10.0.0", + "jss-plugin-global": "^10.0.0", + "jss-plugin-nested": "^10.0.0", + "jss-plugin-props-sort": "^10.0.0", + "jss-plugin-rule-value-function": "^10.0.0", + "jss-plugin-vendor-prefixer": "^10.0.0", + "prop-types": "^15.7.2" + } + }, + "@material-ui/system": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/@material-ui/system/-/system-4.5.2.tgz", + "integrity": "sha512-h9RWvdM9XKlHHqwiuhyvWdobptQkHli+m2jJFs7i1AI/hmGsIc4reDmS7fInhETgt/Txx7uiAIznfRNIIVHmQw==", + "requires": { + "@babel/runtime": "^7.4.4", + "@material-ui/utils": "^4.5.2", + "prop-types": "^15.7.2" + } + }, + "@material-ui/types": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@material-ui/types/-/types-4.1.1.tgz", + "integrity": "sha512-AN+GZNXytX9yxGi0JOfxHrRTbhFybjUJ05rnsBVjcB+16e466Z0Xe5IxawuOayVZgTBNDxmPKo5j4V6OnMtaSQ==", + "requires": { + "@types/react": "*" + } + }, + "@material-ui/utils": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/@material-ui/utils/-/utils-4.5.2.tgz", + "integrity": "sha512-zhbNfHd1gLa8At6RPDG7uMZubHxbY+LtM6IkSfeWi6Lo4Ax80l62YaN1QmUpO1IvGCkn/j62tQX3yObiQZrJsQ==", + "requires": { + "@babel/runtime": "^7.4.4", + "prop-types": "^15.7.2", + "react-is": "^16.8.6" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -1403,6 +1474,16 @@ "webpack-hot-middleware": "^2.25.0" }, "dependencies": { + "file-loader": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", + "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", + "dev": true, + "requires": { + "loader-utils": "^1.0.2", + "schema-utils": "^1.0.0" + } + }, "find-cache-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.1.0.tgz", @@ -1880,6 +1961,14 @@ "@types/react": "*" } }, + "@types/react-transition-group": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.2.3.tgz", + "integrity": "sha512-Hk8jiuT7iLOHrcjKP/ZVSyCNXK73wJAUz60xm0mVhiRujrdiI++j4duLiL282VGxwAgxetHQFfqA29LgEeSkFA==", + "requires": { + "@types/react": "*" + } + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", @@ -3792,6 +3881,11 @@ } } }, + "clsx": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.0.4.tgz", + "integrity": "sha512-1mQ557MIZTrL/140j+JVdRM6e31/OA4vTYxXgqIIZlndyfjHpyawKZia1Im05Vp9BWmImkcNrNtFYQMyFcgJDg==" + }, "coa": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", @@ -3975,6 +4069,11 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", "dev": true }, + "convert-css-length": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/convert-css-length/-/convert-css-length-2.0.1.tgz", + "integrity": "sha512-iGpbcvhLPRKUbBc0Quxx7w/bV14AC3ItuBEGMahA5WTYqB8lq9jH0kTXFheCBASsYnqeMFZhiTruNxr1N59Axg==" + }, "convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -4295,6 +4394,15 @@ } } }, + "css-vendor": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.7.tgz", + "integrity": "sha512-VS9Rjt79+p7M0WkPqcAza4Yq1ZHrsHrwf7hPL/bjQB+c1lwmAI+1FXxYTYt818D/50fFVflw0XKleiBN5RITkg==", + "requires": { + "@babel/runtime": "^7.6.2", + "is-in-browser": "^1.0.2" + } + }, "css-what": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", @@ -4580,6 +4688,15 @@ "utila": "~0.4" } }, + "dom-helpers": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.3.tgz", + "integrity": "sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==", + "requires": { + "@babel/runtime": "^7.6.3", + "csstype": "^2.6.7" + } + }, "dom-serializer": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz", @@ -5242,16 +5359,6 @@ "escape-string-regexp": "^1.0.5" } }, - "file-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", - "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", - "dev": true, - "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^1.0.0" - } - }, "file-system-cache": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-1.0.5.tgz", @@ -6745,6 +6852,11 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, + "hyphenate-style-name": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz", + "integrity": "sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==" + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -7122,6 +7234,11 @@ "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.3.tgz", "integrity": "sha512-zxQ9//Q3D/34poZf8fiy3m3XVpbQc7ren15iKqrTtLPwkPD/t3Scy9Imp63FujULGxuK0ZlCwoo5xNpktFgbOA==" }, + "is-in-browser": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", + "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=" + }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -7332,6 +7449,83 @@ "graceful-fs": "^4.1.6" } }, + "jss": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss/-/jss-10.0.0.tgz", + "integrity": "sha512-TPpDFsiBjuERiL+dFDq8QCdiF9oDasPcNqCKLGCo/qED3fNYOQ8PX2lZhknyTiAt3tZrfOFbb0lbQ9lTjPZxsQ==", + "requires": { + "@babel/runtime": "^7.3.1", + "csstype": "^2.6.5", + "is-in-browser": "^1.1.3", + "tiny-warning": "^1.0.2" + } + }, + "jss-plugin-camel-case": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0.tgz", + "integrity": "sha512-yALDL00+pPR4FJh+k07A8FeDvfoPPuXU48HLy63enAubcVd3DnS+2rgqPXglHDGixIDVkCSXecl/l5GAMjzIbA==", + "requires": { + "@babel/runtime": "^7.3.1", + "hyphenate-style-name": "^1.0.3", + "jss": "10.0.0" + } + }, + "jss-plugin-default-unit": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0.tgz", + "integrity": "sha512-sURozIOdCtGg9ap18erQ+ijndAfEGtTaetxfU3H4qwC18Bi+fdvjlY/ahKbuu0ASs7R/+WKCP7UaRZOjUDMcdQ==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.0.0" + } + }, + "jss-plugin-global": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.0.0.tgz", + "integrity": "sha512-80ofWKSQUo62bxLtRoTNe0kFPtHgUbAJeOeR36WEGgWIBEsXLyXOnD5KNnjPqG4heuEkz9eSLccjYST50JnI7Q==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.0.0" + } + }, + "jss-plugin-nested": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.0.0.tgz", + "integrity": "sha512-waxxwl/po1hN3azTyixKnr8ReEqUv5WK7WsO+5AWB0bFndML5Yqnt8ARZ90HEg8/P6WlqE/AB2413TkCRZE8bA==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.0.0", + "tiny-warning": "^1.0.2" + } + }, + "jss-plugin-props-sort": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0.tgz", + "integrity": "sha512-41mf22CImjwNdtOG3r+cdC8+RhwNm616sjHx5YlqTwtSJLyLFinbQC/a4PIFk8xqf1qpFH1kEAIw+yx9HaqZ3g==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.0.0" + } + }, + "jss-plugin-rule-value-function": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0.tgz", + "integrity": "sha512-Jw+BZ8JIw1f12V0SERqGlBT1JEPWax3vuZpMym54NAXpPb7R1LYHiCTIlaJUyqvIfEy3kiHMtgI+r2whGgRIxQ==", + "requires": { + "@babel/runtime": "^7.3.1", + "jss": "10.0.0" + } + }, + "jss-plugin-vendor-prefixer": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0.tgz", + "integrity": "sha512-qslqvL0MUbWuzXJWdUxpj6mdNUX8jr4FFTo3aZnAT65nmzWL7g8oTr9ZxmTXXgdp7ANhS1QWE7036/Q2isFBpw==", + "requires": { + "@babel/runtime": "^7.3.1", + "css-vendor": "^2.0.6", + "jss": "10.0.0" + } + }, "just-curry-it": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/just-curry-it/-/just-curry-it-3.1.0.tgz", @@ -8016,6 +8210,11 @@ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", "dev": true }, + "normalize-scroll-left": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/normalize-scroll-left/-/normalize-scroll-left-0.2.0.tgz", + "integrity": "sha512-t5oCENZJl8TGusJKoCJm7+asaSsPuNmK6+iEjrZ5TyBj2f02brCRsd4c83hwtu+e5d4LCSBZ0uoDlMjBo+A8yA==" + }, "normalize-url": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", @@ -9443,6 +9642,17 @@ "prop-types": "^15.6.0" } }, + "react-transition-group": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz", + "integrity": "sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==", + "requires": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + } + }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", diff --git a/package.json b/package.json index 6a26cd0..ff95fa3 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "webpack-manifest-plugin": "^2.0.4" }, "dependencies": { + "@material-ui/core": "^4.6.1", "@storybook/addon-actions": "^5.2.6", "@storybook/addons": "^5.2.6", "react": "^16.11.0", diff --git a/public/index.html b/public/index.html index 8353fd9..96890b3 100644 --- a/public/index.html +++ b/public/index.html @@ -2,7 +2,9 @@ - React Boilerplate + + + VISQUIT PoS diff --git a/src/components/base/Header/Header.css b/src/components/base/Header/Header.css new file mode 100644 index 0000000..e69de29 diff --git a/src/components/base/Header/Header.js b/src/components/base/Header/Header.js new file mode 100644 index 0000000..3235130 --- /dev/null +++ b/src/components/base/Header/Header.js @@ -0,0 +1,28 @@ +import React, { Component } from 'react' +import AppBar from '@material-ui/core/AppBar' +import Toolbar from '@material-ui/core/Toolbar' +import TypoGraphy from '@material-ui/core/Typography' + +import { makeStyles } from '@material-ui/core/styles' +const useStyles = makeStyles({ + root: { + marginBottom: 10 + } +}) + +const Header = (props) => { + const classes = useStyles() + return ( + + + + VISQUIT PoS + + + + ) +} + +export default Header diff --git a/src/components/base/Header/Header.stories.js b/src/components/base/Header/Header.stories.js new file mode 100644 index 0000000..4cde41a --- /dev/null +++ b/src/components/base/Header/Header.stories.js @@ -0,0 +1,12 @@ +import React, { useState } from 'react' +import { storiesOf } from '@storybook/react' +import { action } from '@storybook/addon-actions' + +import Header from './Header' + +storiesOf('Header', module) + .add('default', () => { + return ( +
+ ) + }) diff --git a/src/components/base/Header/index.js b/src/components/base/Header/index.js new file mode 100644 index 0000000..75599b2 --- /dev/null +++ b/src/components/base/Header/index.js @@ -0,0 +1,2 @@ +import Header from './Header' +export default Header diff --git a/src/components/common/main/MainButton/MainButton.js b/src/components/common/main/MainButton/MainButton.js new file mode 100644 index 0000000..06bab5f --- /dev/null +++ b/src/components/common/main/MainButton/MainButton.js @@ -0,0 +1,37 @@ +import React from 'react' +import Grid from '@material-ui/core/Grid' +import Card from '@material-ui/core/Card' +import CardContent from '@material-ui/core/CardContent' +import Typography from '@material-ui/core/Typography' + +import { makeStyles } from '@material-ui/core/styles' +const useStyles = makeStyles(theme => ({ + contents: { + height: 250, + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + '&:hover': { + backgroundColor: '#e7e7e7' + } + }, + typo: { + fontWeight: 'lighter', + color: '#7a7a7a' + } +})) + +const MainButton = (props) => { + const classes = useStyles() + return ( + + + + {props.children} + + + + ) +} + +export default MainButton diff --git a/src/components/common/main/MainButton/MainButton.stories.js b/src/components/common/main/MainButton/MainButton.stories.js new file mode 100644 index 0000000..659cc70 --- /dev/null +++ b/src/components/common/main/MainButton/MainButton.stories.js @@ -0,0 +1,14 @@ +import React, { useState } from 'react' +import { storiesOf } from '@storybook/react' +import { action } from '@storybook/addon-actions' + +import MainButton from './MainButton' + +storiesOf('MainButton', module) + .add('default', () => { + return ( + + {'메인 버튼'} + + ) + }) diff --git a/src/components/common/main/MainButton/index.js b/src/components/common/main/MainButton/index.js new file mode 100644 index 0000000..db4d6c6 --- /dev/null +++ b/src/components/common/main/MainButton/index.js @@ -0,0 +1,2 @@ +import MainButton from './MainButton' +export default MainButton diff --git a/src/components/common/templates/Article/Article.css b/src/components/common/templates/Article/Article.css deleted file mode 100644 index 4de9d1c..0000000 --- a/src/components/common/templates/Article/Article.css +++ /dev/null @@ -1,8 +0,0 @@ -.template-article p { - color: green; - font-weight: lighter; -} - -.template-article h3 { - font-weight: lighter; -} diff --git a/src/components/common/templates/Article/Article.js b/src/components/common/templates/Article/Article.js index a9e631d..6a3385b 100644 --- a/src/components/common/templates/Article/Article.js +++ b/src/components/common/templates/Article/Article.js @@ -1,9 +1,22 @@ import React from 'react' -import './Article.css' +import { makeStyles } from '@material-ui/core/styles' + +const useStyles = makeStyles({ + root: { + '& p': { + color: 'green', + fontWeight: 'lighter' + }, + '& h3': { + fontWeight: 'lighter' + } + } +}) const Article = (props) => { + const classes = useStyles() return ( -
+
{props.children}
) diff --git a/src/components/common/templates/ContentWrapper/ContentWrapper.js b/src/components/common/templates/ContentWrapper/ContentWrapper.js new file mode 100644 index 0000000..11b5a3d --- /dev/null +++ b/src/components/common/templates/ContentWrapper/ContentWrapper.js @@ -0,0 +1,19 @@ +import React from 'react' +import { makeStyles } from '@material-ui/core/styles' + +import Container from '@material-ui/core/Container' +import Grid from '@material-ui/core/Grid' + +const ContentWrapper = (props) => { + return ( + + + { + props.items.map((item) => props.children(item)) + } + + + ) +} + +export default ContentWrapper diff --git a/src/components/common/templates/ContentWrapper/ContentWrapper.stories.js b/src/components/common/templates/ContentWrapper/ContentWrapper.stories.js new file mode 100644 index 0000000..e69de29 diff --git a/src/components/common/templates/ContentWrapper/index.js b/src/components/common/templates/ContentWrapper/index.js new file mode 100644 index 0000000..f59a9c4 --- /dev/null +++ b/src/components/common/templates/ContentWrapper/index.js @@ -0,0 +1,2 @@ +import ContentWrapper from './ContentWrapper' +export default ContentWrapper diff --git a/src/containers/AboutContainer.js b/src/containers/AboutContainer.js index 4e4ea42..491ba0c 100644 --- a/src/containers/AboutContainer.js +++ b/src/containers/AboutContainer.js @@ -3,15 +3,19 @@ import { connect } from 'react-redux' import { bindActionCreators } from 'redux' import { Link } from 'react-router-dom' +import Header from '../components/base/Header' import Article from '../components/common/templates/Article' const AboutContainer = (props) => { return ( -
-

About this page

-

This page is a bolierplate for React App. If you want to use it, feel free to try out!

- Go back to home -
+ <> +
+
+

About this page

+

This page is a bolierplate for React App. If you want to use it, feel free to try out!

+ Go back to home +
+ ) } diff --git a/src/containers/MainContainer.js b/src/containers/MainContainer.js index bfb9dcc..a17e0a5 100644 --- a/src/containers/MainContainer.js +++ b/src/containers/MainContainer.js @@ -4,22 +4,27 @@ import { bindActionCreators } from 'redux' import { Link } from 'react-router-dom' import SimpleCounter from '../components/SimpleCounter' -import Article from '../components/common/templates/Article' +import Header from '../components/base/Header' +import ContentWrapper from '../components/common/templates/ContentWrapper' +import MainButton from '../components/common/main/MainButton' import * as appActions from '../redux/modules/app' +const items = [ + '메뉴 관리', + '주문 확인' +] + const MainContainer = (props) => { return ( -
-

Hi, there!

-

- props.appActions.increment(1)} - decrement={() => props.appActions.decrement(1)} - value={props.value} /> -
- Want to know about this page? -
+ <> +
+ + { + (item) => {item} + } + + ) } diff --git a/src/index.css b/src/index.css new file mode 100644 index 0000000..06cc543 --- /dev/null +++ b/src/index.css @@ -0,0 +1,3 @@ +body { + margin: 0px; +} diff --git a/src/index.js b/src/index.js index 429431a..919afe8 100644 --- a/src/index.js +++ b/src/index.js @@ -1,14 +1,18 @@ import React from 'react' import ReactDOM from 'react-dom' +// import './index.css' import { BrowserRouter } from 'react-router-dom' import { Provider } from 'react-redux' +import CssBaseline from '@material-ui/core/CssBaseline' + import store from './redux' import App from './pages/App' ReactDOM.render( + ,