@@ -196,13 +196,18 @@ class UserSearch extends Component {
}
}
+ componentDidMount () {
+ window.dispatchEvent(new Event('load')) // This is a workaround to solve the problem that the slider does not show up
+ }
+
render () {
const { classes } = this.props
return (
+
+
)
}
}
diff --git a/client/src/components/UserTabs.js b/client/src/components/UserTabs.js
index 592bc8da9..7821ed19e 100644
--- a/client/src/components/UserTabs.js
+++ b/client/src/components/UserTabs.js
@@ -65,7 +65,7 @@ class UserTabs extends React.Component {
fullWidth
>
} />
- } />
+ } />
} />
} />
diff --git a/client/src/components/YourDescendents.js b/client/src/components/YourDescendents.js
index dd5f4aec4..8427fb313 100644
--- a/client/src/components/YourDescendents.js
+++ b/client/src/components/YourDescendents.js
@@ -13,11 +13,11 @@ import DescendentsTree from './DescendentsTree'
const styles = theme => ({
root: {
- width: '50%',
+ width: '100%',
flexGrow: 1,
padding: 10,
- marginLeft: '25%',
- marginTop: '2%'
+ marginTop: '5%',
+ marginBottom: '10%'
},
typography: {
width: '80%',
@@ -59,14 +59,14 @@ class YourDescendents extends Component {
}
}
- render () {
+ addForm () {
const { classes } = this.props
-
return (
-
- Your Descendents
-
+
+
+ Your Decendents
+
These are your decendents within the project. Your children referred you as the one who brought them to the project, while
@@ -79,6 +79,16 @@ class YourDescendents extends Component {
)
}
+
+ render () {
+ return (
+
+
+ {this.addForm()}
+
+
+ )
+ }
}
export default compose(
diff --git a/client/src/components/YourReferrer.js b/client/src/components/YourReferrer.js
index 6a658ea4d..5b9865a89 100644
--- a/client/src/components/YourReferrer.js
+++ b/client/src/components/YourReferrer.js
@@ -15,11 +15,11 @@ import Typography from '@material-ui/core/Typography'
const styles = theme => ({
root: {
- width: '50%',
+ width: '100%',
flexGrow: 1,
padding: 10,
- marginLeft: '25%',
- marginTop: '2%'
+ marginTop: '5%',
+ marginBottom: '10%'
},
typography: {
width: '80%',
@@ -125,18 +125,27 @@ class YourReferrer extends Component {
}
}
- render () {
+ addForm () {
const { classes } = this.props
return (
-
- Your Referrer
-
-
+
+ Your Referrer
+
{this.renderMode()}
)
}
+
+ render () {
+ return (
+
+
+ {this.addForm()}
+
+
+ )
+ }
}
export default compose(
diff --git a/client/src/img/portrait.jpg b/client/src/img/portrait.jpg
deleted file mode 100644
index 2108ceee8..000000000
Binary files a/client/src/img/portrait.jpg and /dev/null differ
diff --git a/client/src/img/user-default-pic.jpg b/client/src/img/user-default-pic.jpg
new file mode 100644
index 000000000..4709ae9b1
Binary files /dev/null and b/client/src/img/user-default-pic.jpg differ
diff --git a/client/src/index.js b/client/src/index.js
index 66f52879e..c2f66af6d 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -1,80 +1,24 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import { Route, BrowserRouter, Switch } from 'react-router-dom'
-import { hot } from 'react-hot-loader'
+import React from 'react'
+import { Route, Switch } from 'react-router-dom'
-import { withStyles } from '@material-ui/core/styles'
+import { MuiPickersUtilsProvider } from 'material-ui-pickers'
+import LuxonUtils from 'material-ui-pickers/utils/luxon-utils'
-// Components
-import NavBar from './components/NavBar'
import Home from './components/Home'
import User from './components/User'
import Browse from './components/Browse'
import Search from './components/Search'
-import Contact from './components/Contact'
-import { getItem } from './utils/local-storage'
-import {
- globalStyles
-} from './theme'
+const App = () => (
+
+
+
+
+
+
+
+
+)
-class App extends Component {
- constructor (props) {
- super(props)
- this.state = {
- user: null
- }
- }
+export default App
- async componentDidMount () {
- let user = await getItem('user')
-
- if (user !== null && user !== undefined && user !== 'undefined') {
- user = JSON.parse(user)
- this.setState({ user: user })
- }
- }
-
- render () {
- const { match } = this.props
-
- return (
-
-
-
-
-
- }
- />
- }
- />
- }
- />
- }
- />
-
-
-
-
- )
- }
-}
-
-App.propTypes = {
- auth: PropTypes.object
-}
-
-const StyledApp = withStyles(globalStyles)(App)
-export default hot(module)(StyledApp)