aboutsummaryrefslogtreecommitdiff
path: root/src/index.tsx
diff options
context:
space:
mode:
authorilyayudovin <46264063+ilyayudovin@users.noreply.github.com>2020-06-08 15:12:12 +0300
committerGitHub <noreply@github.com>2020-06-08 15:12:12 +0300
commit9473f8836bc65d1e0ea87607def54b86d719bbc8 (patch)
tree81b0531732eeaa0d9f8884bbd6576f31ae56860c /src/index.tsx
parent67def5d792ca5efdf7bf43c3c32e7020f7d8f5cf (diff)
parent755b44e76307e04387ddacfdee7124ee00197de4 (diff)
downloadwhich-ui-9473f8836bc65d1e0ea87607def54b86d719bbc8.tar.gz
Merge pull request #15 from ilyayudovin/profile
Add profile
Diffstat (limited to 'src/index.tsx')
-rw-r--r--src/index.tsx10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/index.tsx b/src/index.tsx
index 8340b79..0d9751c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -11,6 +11,7 @@ import 'typeface-roboto';
import Header from './Header/Header';
import Feed from './Feed/Feed';
+import ProfileInfo from './ProfileInfo/ProfileInfo';
const theme = createMuiTheme({
palette: {
@@ -58,11 +59,12 @@ const polls = [{
const useStyles = makeStyles({
root: {
- marginTop: theme.spacing(15)
+ width: theme.spacing(75),
+ marginTop: theme.spacing(15),
+ margin: '0 auto'
}
});
-
const App: React.FC = () => {
const [page, setPage] = useState('feed');
const classes = useStyles();
@@ -72,8 +74,10 @@ const App: React.FC = () => {
<CssBaseline />
<Header setPage={setPage} />
<div className={classes.root}>
+ {
+ page === 'profile' && <ProfileInfo profile={polls[0]} />
+ }
<Feed polls={polls} />
- <h1> We are on page {page}! </h1>
</div>
</ThemeProvider>
);