fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #212 from Algoteers/develop

Browse Source 
Develop
This commit is contained in:
Barry Low authored and GitHub committed 2019-04-12 01:39:21 +02:00
2 parents 9af976c150 ac89d469b5
commit aa22f9b807
4 files changed
+233 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/package-lock.json
Generated
+174 -21
View File
@@ -1370,9 +1370,9 @@
}
},
"@superalgos/strategizer-client": {
"version": "0.0.11",
"resolved": "https://registry.npmjs.org/@superalgos/strategizer-client/-/strategizer-client-0.0.11.tgz",
"integrity": "sha512-XcG4Fs21JJgx1dZWkaaEcPv0/ZpHDd1p03M9N3E7kL691caqx9jX0EI32RL07ziu80eh+7KzdudLLkk5A73ZJg==",
"version": "0.0.12",
"resolved": "https://registry.npmjs.org/@superalgos/strategizer-client/-/strategizer-client-0.0.12.tgz",
"integrity": "sha512-7IN9JY66IBLtureVsGpyrpy4FGxr6gPRquJcSza/B7DLwWisyLlg9cgu21TZ8zXirm/1jzIZRRG039Rsc7UOEQ==",
"dev": true,
"requires": {
"@material-ui/core": "^3.6.2",
@@ -1508,28 +1508,145 @@
}
},
"@superalgos/web-components": {
"version": "0.0.19",
"resolved": "https://registry.npmjs.org/@superalgos/web-components/-/web-components-0.0.19.tgz",
"integrity": "sha512-mXb7eb8/hjE09xV67q3UbbdqOU/7XiS/tMB6uWcL8fBvBfNGQqsNp35DYbt7gUvRrN3buVrlhq145Br+9vsdIQ==",
"version": "0.0.20",
"resolved": "https://registry.npmjs.org/@superalgos/web-components/-/web-components-0.0.20.tgz",
"integrity": "sha512-yH+oubFFLuWw1p62KDO8P5NS3Uh1pmSDNFxrz9cloCOTXBWRf6zmaLapum/146qCYE9OXtwJ6D49dNA6xr6Hng==",
"dev": true,
"requires": {
"@azure/storage-blob": "^10.3.0",
"@bearcanrun/react-image-cropper": "^1.3.6",
"@material-ui/core": "^3.6.2",
"@material-ui/icons": "^3.0.1",
"apollo-client": "^2.4.7",
"apollo-client": "^2.5.1",
"blob-util": "^2.0.2",
"browser-image-resizer": "^1.2.0",
"deepmerge": "^3.1.0",
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"prop-types": "^15.6.2",
"react": "^16.8.4",
"react-apollo": "^2.3.2",
"react-dom": "^16.8.4",
"react-dropzone": "^5.1.0",
"browser-image-resizer": "^2.0.1",
"graphql": "^14.2.1",
"graphql-tag": "^2.10.1",
"prop-types": "^15.7.2",
"react": "^16.8.6",
"react-apollo": "^2.5.4",
"react-dom": "^16.8.6",
"react-dropzone": "^10.1.3",
"react-helmet": "^5.2.0",
"react-router-dom": "^4.3.1"
"react-router-dom": "^5.0.0"
},
"dependencies": {
"browser-image-resizer": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/browser-image-resizer/-/browser-image-resizer-2.0.1.tgz",
"integrity": "sha512-0fVKk7duXkvqZXdK96LpRii2v1rQfvPXSt7Ow5z1neoAmYZPnO66y1XAy8dRExjWPtSGk34Ehtk+w814iDAOWg==",
"dev": true
},
"graphql": {
"version": "14.2.1",
"resolved": "https://registry.npmjs.org/graphql/-/graphql-14.2.1.tgz",
"integrity": "sha512-2PL1UbvKeSjy/lUeJqHk+eR9CvuErXoCNwJI4jm3oNFEeY+9ELqHNKO1ZuSxAkasPkpWbmT/iMRMFxd3cEL3tQ==",
"dev": true,
"requires": {
"iterall": "^1.2.2"
}
},
"react": {
"version": "16.8.6",
"resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
"integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
"dev": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
"scheduler": "^0.13.6"
}
},
"react-apollo": {
"version": "2.5.4",
"resolved": "https://registry.npmjs.org/react-apollo/-/react-apollo-2.5.4.tgz",
"integrity": "sha512-olH9zYijOXVfj14hD7bQlZ0POBJchxg2e+mfnxEiEdqZra4+58SfIY0KPhmM9jqbeeusc6J/P4zzWIHt5DdNDg==",
"dev": true,
"requires": {
"apollo-utilities": "^1.2.1",
"hoist-non-react-statics": "^3.3.0",
"lodash.isequal": "^4.5.0",
"prop-types": "^15.7.2",
"ts-invariant": "^0.3.2",
"tslib": "^1.9.3"
}
},
"react-dom": {
"version": "16.8.6",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz",
"integrity": "sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==",
"dev": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
"scheduler": "^0.13.6"
}
},
"react-dropzone": {
"version": "10.1.3",
"resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.1.3.tgz",
"integrity": "sha512-ry17scg+B/itdBJn0Qd2UxYQIeQyuTgLDyb1o+BM1jQ6CAgtuaYo4W/UA+UK9VnzwvFuwMcmZJjjju2rMFPMLg==",
"dev": true,
"requires": {
"attr-accept": "^1.1.3",
"file-selector": "^0.1.11",
"prop-types": "^15.7.2"
}
},
"react-router": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz",
"integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==",
"dev": true,
"requires": {
"@babel/runtime": "^7.1.2",
"create-react-context": "^0.2.2",
"history": "^4.9.0",
"hoist-non-react-statics": "^3.1.0",
"loose-envify": "^1.3.1",
"path-to-regexp": "^1.7.0",
"prop-types": "^15.6.2",
"react-is": "^16.6.0",
"tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0"
}
},
"react-router-dom": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz",
"integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==",
"dev": true,
"requires": {
"@babel/runtime": "^7.1.2",
"history": "^4.9.0",
"loose-envify": "^1.3.1",
"prop-types": "^15.6.2",
"react-router": "5.0.0",
"tiny-invariant": "^1.0.2",
"tiny-warning": "^1.0.0"
}
},
"scheduler": {
"version": "0.13.6",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
"integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
"dev": true,
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
},
"ts-invariant": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.3.3.tgz",
"integrity": "sha512-UReOKsrJFGC9tUblgSRWo+BsVNbEd77Cl6WiV/XpMlkifXwNIJbknViCucHvVZkXSC/mcWeRnIGdY7uprcwvdQ==",
"dev": true,
"requires": {
"tslib": "^1.9.3"
}
}
}
},
"@svgr/babel-plugin-add-jsx-attribute": {
@@ -5488,6 +5605,16 @@
"object-assign": "^4.1.1"
}
},
"create-react-context": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz",
"integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==",
"dev": true,
"requires": {
"fbjs": "^0.8.0",
"gud": "^1.0.0"
}
},
"cross-fetch": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-2.2.3.tgz",
@@ -7877,6 +8004,15 @@
"schema-utils": "^1.0.0"
}
},
"file-selector": {
"version": "0.1.11",
"resolved": "https://registry.npmjs.org/file-selector/-/file-selector-0.1.11.tgz",
"integrity": "sha512-NopCegJ7QuoqVzUdSLcZb0M9IFO69CSFZzuZhZBasfQxepNwa1ehL6L9UKe3EyBof3EUeraccfJocLCRAvtxdg==",
"dev": true,
"requires": {
"tslib": "^1.9.0"
}
},
"filename-regex": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -9565,6 +9701,12 @@
"integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
"dev": true
},
"gud": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
"integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==",
"dev": true
},
"gzip-size": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
@@ -18853,14 +18995,25 @@
}
},
"react": {
"version": "16.8.5",
"resolved": "https://registry.npmjs.org/react/-/react-16.8.5.tgz",
"integrity": "sha512-daCb9TD6FZGvJ3sg8da1tRAtIuw29PbKZW++NN4wqkbEvxL+bZpaaYb4xuftW/SpXmgacf1skXl/ddX6CdOlDw==",
"version": "16.8.6",
"resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz",
"integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1",
"prop-types": "^15.6.2",
"scheduler": "^0.13.5"
"scheduler": "^0.13.6"
},
"dependencies": {
"scheduler": {
"version": "0.13.6",
"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",
"integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==",
"requires": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
}
}
}
},
"react-apollo": {
client/package.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"name": "master-app-client",
"version": "0.1.4",
"version": "0.1.5",
"description": "Responsible for loading all web modules and running them.",
"main": "src/index.js",
"scripts": {
@@ -35,11 +35,11 @@
"@superalgos/events-client": "0.0.2",
"@superalgos/key-vault-client": "0.0.32",
"@superalgos/logs-client": "0.0.1",
"@superalgos/strategizer-client": "0.0.12",
"@superalgos/operations-client": "0.0.31",
"@superalgos/strategizer-client": "0.0.11",
"@superalgos/teams-client": "0.0.35",
"@superalgos/users-client": "0.0.25",
"@superalgos/web-components": "0.0.19",
"@superalgos/web-components": "0.0.20",
"@superalgos/cockpit-client": "0.0.5",
"autoprefixer": "^9.2.0",
"babel-loader": "^8.0.4",
@@ -103,7 +103,7 @@
"optimize-css-assets-webpack-plugin": "^5.0.1",
"prop-types": "^15.6.2",
"query-string": "^6.2.0",
"react": "^16.8.4",
"react": "^16.8.6",
"react-apollo": "^2.5.2",
"react-dom": "^16.8.4",
"react-redux": "^5.1.0",
client/src/styles/styles.scss
+17
View File
@@ -374,6 +374,23 @@ header.menu{
padding: 20px 0 0.5em 0;
@include fluid-type($break-xs, $break-lg, 18px, 20px);
}
.instructions{
h5{
color: white;
margin-top:25px;
}
h6{
color: white;
font-weight: 600;
a {
color: white;
text-decoration: none;
&:hover {
color: #f55858;
}
}
}
}
}
}
client/src/views/home/index.js
+38 -7
View File
@@ -1,17 +1,48 @@
import React, { Component } from 'react'
import { Link } from 'react-router-dom'
import { BannerTopBar } from '../common'
import { Typography } from '@material-ui/core'
class Home extends Component {
constructor (props) {
super(props)
this.state = {
user: null
}
}
componentDidMount () {
const user = window.localStorage.getItem('user')
this.setState({ user })
}
render () {
let user = JSON.parse(this.state.user)
if(this.state.user !== undefined && this.state.user !== null){}
return (
<React.Fragment>
<BannerTopBar
size='big'
title='Superalgos Platform'
text='People and machines working together to create Superalgos'
backgroundUrl='https://superalgos.org/img/photos/superalgos-platform.jpg'
/>
{this.state.user !== undefined && this.state.user !== null && (
<BannerTopBar
size='big'
title='Superalgos Platform Demo'
text='Get Started Using the Demo'
backgroundUrl='https://superalgos.org/img/photos/superalgos-platform.jpg'
>
<div className='instructions'>
<Typography align='center' variant='subtitle1' >1. <Link to='/teams/manage-teams'>Create a Team and Financial Being →</Link></Typography>
<Typography align='center' variant='subtitle1' >2. <Link to='/strategizer'>Visit the Strategizer and learn how to build a strategy →</Link></Typography>
<Typography align='center' variant='subtitle1' >3. <Link to='/clones/add'>Run a clone instance of your simulator algobot to test the strategy →</Link></Typography>
<Typography align='center' variant='subtitle1' >4. <Link to='/charts'>View the results of your strategy in the charts →</Link></Typography>
</div>
</BannerTopBar>
)}
{(this.state.user === undefined || this.state.user === null) && (
<BannerTopBar
size='big'
title='Superalgos Platform Demo'
text='People and machines working together to create Superalgos'
backgroundUrl='https://superalgos.org/img/photos/superalgos-platform.jpg'
/>
)}
<div className='homePage container'>
<Typography variant='h1' align='center' className='title'>Welcome to the Superalgos Platform!</Typography>
<Typography variant='h2' align='center' className='subtitle'>Enabling the evolutionary race towards the emergence of superalgos</Typography>
@@ -28,7 +59,7 @@ class Home extends Component {
</div>
<div className='column'>
<Typography align='justify'>
Feel free to explore the menu in the top-right corner or visit the <a href='https://www.superalgos.org/documentation-quick-start.shtml' target='_blank'>Quick Start Guide</a>.
Feel free to explore the menu in the top-right corner or visit the <a href='https://superalgos.org/documentation-quick-start.shtml' target='_blank'>Quick Start Guide</a>.
Reporting of bugs at the corresponding <a href='https://github.com/Superalgos' target='_blank' rel='nofollow'>Superalgos Github repository</a> is highly appreciated.
</Typography>
<Typography align='justify'>