+ Responsible for all human users of the Advanced Algos Platform.
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- Intro
-
-
- This module is responsible for managing users across the Advanced Algos system. Here you can browse the Users Directory, search for users and get to their profiles. You can create your own User profile if you sign up, or manage it if you already have one by logging in.
-
-
- Development Status
-
-
- This module is is currently under development. Implementation started 1st of September 2018 and this is the result of the 3rd sprint of 2 weeks of work each.
-
-
- What can you do?
-
-
- Currently you can use the Browse section to list all registered users. At the Search page you can searh for users by name. Clicking on View Profile you can see some more info about that user. You can signup with your Github account and manage your profile information while logged in. While loggedin, you can edit your profile info, define your referrer and view your descendants. You will find all features under develpment with a dialog indicating it is not ready.
-
-
-
-
-
+
)
diff --git a/client/src/components/LoggedInUser.js b/client/src/components/LoggedInUser.js
index 933394e43..156ba0d17 100644
--- a/client/src/components/LoggedInUser.js
+++ b/client/src/components/LoggedInUser.js
@@ -11,6 +11,16 @@ import IconButton from '@material-ui/core/IconButton'
import UserIcon from '@material-ui/icons/Person'
import { Link } from 'react-router-dom'
+import ProfileSheetIcon from '@material-ui/icons/Create'
+import ProfileImagesIcon from '@material-ui/icons/Wallpaper'
+import YourReferrerIcon from '@material-ui/icons/AccessibilityNew'
+import DescendentsIcon from '@material-ui/icons/DeviceHub'
+
+const ProfileSheetLink = props =>
+const ProfileImagesLink = props =>
+const YourReferrerLink = props =>
+const YourDescendentsLink = props =>
+
const UserLink = props =>
const styles = theme => ({
@@ -79,7 +89,7 @@ class LoggedInUser extends Component {
let identityProvider = authArray[0]
return (
-
+
diff --git a/client/src/components/UserSearch.js b/client/src/components/UserSearch.js
index 1cc71b62c..2520134b3 100644
--- a/client/src/components/UserSearch.js
+++ b/client/src/components/UserSearch.js
@@ -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/YourDescendents.js b/client/src/components/YourDescendents.js
index dd5f4aec4..db03f60b7 100644
--- a/client/src/components/YourDescendents.js
+++ b/client/src/components/YourDescendents.js
@@ -17,7 +17,8 @@ const styles = theme => ({
flexGrow: 1,
padding: 10,
marginLeft: '25%',
- marginTop: '2%'
+ marginTop: '5%',
+ marginBottom: '10%'
},
typography: {
width: '80%',
@@ -59,14 +60,48 @@ class YourDescendents extends Component {
}
}
- render () {
- const { classes } = this.props
+ componentDidMount () {
+ window.dispatchEvent(new Event('load')) // This is a workaround to solve the problem that the slider does not show up
+ }
+ addSlider () {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Your Descendents
+
+ Explore here generations of people that discovered Advanced Algos because of you.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+
+ addForm () {
+ const { classes } = this.props
return (
-
- Your Descendents
-
These are your decendents within the project. Your children referred you as the one who brought them to the project, while
@@ -79,6 +114,15 @@ class YourDescendents extends Component {
)
}
+
+ render () {
+ return (
+
+ {this.addSlider()}
+ {this.addForm()}
+
+ )
+ }
}
export default compose(
diff --git a/client/src/components/YourReferrer.js b/client/src/components/YourReferrer.js
index 6a658ea4d..57ae6a3d2 100644
--- a/client/src/components/YourReferrer.js
+++ b/client/src/components/YourReferrer.js
@@ -19,7 +19,8 @@ const styles = theme => ({
flexGrow: 1,
padding: 10,
marginLeft: '25%',
- marginTop: '2%'
+ marginTop: '5%',
+ marginBottom: '10%'
},
typography: {
width: '80%',
@@ -125,18 +126,61 @@ class YourReferrer extends Component {
}
}
- render () {
+ componentDidMount () {
+ window.dispatchEvent(new Event('load')) // This is a workaround to solve the problem that the slider does not show up
+ }
+
+ addSlider () {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Your Referrer
+
+ It is important to know who introduced you to Advanced Algos.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+ }
+
+ addForm () {
const { classes } = this.props
return (
-
- Your Referrer
-
-
{this.renderMode()}
)
}
+
+ render () {
+ return (
+
+ {this.addSlider()}
+ {this.addForm()}
+
+ )
+ }
}
export default compose(
diff --git a/client/src/index.js b/client/src/index.js
index 66f52879e..8594ffbef 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -6,12 +6,15 @@ import { hot } from 'react-hot-loader'
import { withStyles } from '@material-ui/core/styles'
// 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 ProfileSheet from './components/ProfileSheet'
+import ProfileImages from './components/ProfileImages'
+import YourReferrer from './components/YourReferrer'
+import YourDescendents from './components/YourDescendents'
+import UsersMenu from './components/Menu'
import { getItem } from './utils/local-storage'
import {
@@ -36,12 +39,10 @@ class App extends Component {
}
render () {
- const { match } = this.props
-
+ const match = {path: '/users'}
return (
+ ++++++++++