BannerTopBar replaces TopBar

This commit is contained in:
Luis Fernando Molina committed 2018-11-09 17:37:03 +01:00
1 parent eac9f25c67
commit 82ec847636
8 files changed
+47 -90

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@advancedalgos/users-client",
"description": "Advanced Algos Users client-side web app",
"version": "0.0.18",
"version": "0.0.19",
"main": "src/index.js",
"dependencies": {
"@material-ui/core": "^3.2.0",
@@ -0,0 +1,18 @@
import React from 'react'
import Typography from '@material-ui/core/Typography'
const BannerTopBar = ({
size,
backgroundUrl,
title,
text
}) => (
<div className={`bannerTopBar ${size}`} style={backgroundUrl ? { backgroundImage: `url(${backgroundUrl})` } : {}}>
<div className='caption'>
<Typography className='title' variant='h1' align='center'>{title}</Typography>
<Typography className='text' variant='h2' align='center'>{text}</Typography>
</div>
</div>
)
export default BannerTopBar
+7 -2
View File
@@ -1,13 +1,18 @@
import React, { Component } from 'react'
import UserList from './UserList'
import TopBar from './TopBar'
import BannerTopBar from './BannerTopBar'
class Browse extends Component {
render () {
return (
<React.Fragment>
<TopBar size='medium' title='Users Directory' text='Everyone involved in Advanced Algos is here.' />
<BannerTopBar
size='medium'
title='Users Directory'
text='Everyone involved in Advanced Algos is here.'
backgroundUrl='https://advancedalgos.net/img/photos/connect.jpg'
/>
<UserList />
</React.Fragment>
)
+7 -2
View File
@@ -1,12 +1,17 @@
import React, { Component } from 'react'
import TopBar from './TopBar'
import BannerTopBar from './BannerTopBar'
class Home extends Component {
render () {
return (
<React.Fragment>
<TopBar size='big' title='Users Module' text='Responsible for all human users of the Advanced Algos Platform.' />
<BannerTopBar
size='big'
title='Users Module'
text='Responsible for all human users of the Advanced Algos Platform.'
backgroundUrl='https://advancedalgos.net/img/photos/connect.jpg'
/>
</React.Fragment>
)
}
+7 -2
View File
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
import UserSearch from './UserSearch'
import {compose} from 'react-apollo'
import Paper from '@material-ui/core/Paper'
import TopBar from './TopBar'
import BannerTopBar from './BannerTopBar'
// Materia UI
@@ -25,7 +25,12 @@ class Search extends Component {
const { classes } = this.props
return (
<React.Fragment>
<TopBar size='medium' title='Users Search' text='Find anyone involved in Advanced Algos here.' />
<BannerTopBar
size='medium'
title='Users Search'
text='Find anyone involved in Advanced Algos here.'
backgroundUrl='https://advancedalgos.net/img/photos/connect.jpg'
/>
<Paper className={classes.root}>
<UserSearch />
</Paper>
-42
View File
@@ -1,42 +0,0 @@
import React from 'react';
import { Typography } from '@material-ui/core';
import { withStyles } from '@material-ui/core/styles';
import styles from './styles';
class TopBar extends React.Component {
render() {
const {
classes,
size,
title,
text,
} = this.props;
if (size === 'big') {
return (
<div className={classes.rootBig}>
<div className={classes.captions}>
<Typography className={classes.title} variant='headline' align='center'>{title}</Typography>
<Typography className={classes.text} variant='subheading' align='center'>{text}</Typography>
</div>
</div>
);
}
if (size === 'medium') {
return (
<div className={classes.rootMedium}>
<div className={classes.captions}>
<Typography className={classes.title} variant='headline' align='center'>{title}</Typography>
<Typography className={classes.text} variant='subheading' align='center'>{text}</Typography>
</div>
</div>
);
}
return (
<div className={classes.rootSmall} />
);
}
}
export default withStyles(styles)(TopBar);
-39
View File
@@ -1,39 +0,0 @@
const styles = () => ({
rootBig: {
backgroundImage: 'url(https://aacorporatesitedevelop.azurewebsites.net/img/photos/connect.jpg)',
width: '100%',
height: '100vh',
},
rootMedium: {
backgroundImage: 'url(https://aacorporatesitedevelop.azurewebsites.net/img/photos/connect.jpg)',
width: '100%',
height: '50vh',
},
rootSmall: {
backgroundImage: 'url(https://aacorporatesitedevelop.azurewebsites.net/img/photos/connect.jpg)',
width: '100%',
height: '220px',
},
captions: {
position: 'relative',
top: '50%',
transform: 'translateY(-50%)',
},
title: {
fontFamily: 'Saira',
color: 'white',
fontSize: '64px',
lineHeight: '78px',
fontWeight: 100,
},
text: {
fontFamily: 'Saira',
color: 'white',
fontSize: '20px',
lineHeight: '30px',
fontWeight: 600,
padding: '20px 0 0.5em 0',
},
});
export default styles;
+7 -2
View File
@@ -1,11 +1,16 @@
import React from 'react'
import UserTabs from './UserTabs'
import TopBar from './TopBar'
import BannerTopBar from './BannerTopBar'
const User = () => {
return (
<React.Fragment>
<TopBar size='medium' title='Your Profile' text='Manage your profile info, pictures and more.' />
<BannerTopBar
size='medium'
title='Your Profile'
text='Manage your profile info, pictures and more.'
backgroundUrl='https://advancedalgos.net/img/photos/connect.jpg'
/>
<UserTabs />
</React.Fragment>
)