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

Resolving merge conflicts

Browse Source
This commit is contained in:
Matias committed 2019-05-14 10:39:29 -03:00
2 parents 54e9afcdfa 561d317d64
commit e333b8cac9
6 files changed
+929 -823
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

client/html/index.html
+31 -21
View File
@@ -1,15 +1,20 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Superalgos Platform</title>
<meta name="description" content="The system enabling a collective of humans and machines to collaborate and compete while co-building trading algorithms.">
<meta name="description"
content="The system enabling a collective of humans and machines to collaborate and compete while co-building trading algorithms.">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<link href="https://fonts.googleapis.com/css?family=Saira+Condensed:300,600|Saira:300,600&amp;subset=latin-ext,vietnamese" rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
<link
href="https://fonts.googleapis.com/css?family=Saira+Condensed:300,600|Saira:300,600&amp;subset=latin-ext,vietnamese"
rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css"
integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
<link rel="shortcut icon" type="image/png/ico" href="/favicon.ico" />
<script src="https://unpkg.com/apollo-client-browser@1.7.0"></script>
@@ -17,41 +22,46 @@
<script type="text/javascript" src="<%= process.env.CANVAS_URL %>Scripts/AppPreLoader.js"></script>
<script type="text/javascript">
function loadCanvas(){
function loadCanvas() {
if (window.canvasApp.visible === undefined) {
window.canvasApp = {
version: '1.0.0', // This is used to avoid catching problems at the browser level.
sessionToken: '',
executingAt: 'Master App',
visible: false,
topMargin: 130,
urlPrefix: '<%= process.env.CANVAS_URL %>',
graphQL: {
masterAppApiUrl: '<%= process.env.PLATFORM_API_URL %>',
},
context: {}
version: '1.0.0', // This is used to avoid catching problems at the browser level.
sessionToken: '',
executingAt: 'Master App',
visible: false,
topMargin: 130,
urlPrefix: '<%= process.env.CANVAS_URL %>',
graphQL: {
masterAppApiUrl: '<%= process.env.PLATFORM_API_URL %>',
},
context: {}
};
try {
loadAdvancedAlgosPlatform();
}
catch(err) {
catch (err) {
console.log("[ERROR] MasterApp -> Index -> CanvasApp can not be started. Please check that AAWeb is running.");
console.log("[ERROR] MasterApp -> Index -> err = " + err);
}
}
}
function onResize(){
if (window.canvasApp === undefined) {return}
if (window.canvasApp.eventHandler === undefined) {return}
function onResize() {
if (window.canvasApp === undefined) { return }
if (window.canvasApp.eventHandler === undefined) { return }
window.canvasApp.eventHandler.raiseEvent('Browser Resized')
}
</script>
</head>
<body id="body" onload="" onresize="onResize()">
<div id="masterApp"></div>
<div id="canvasApp"></div>
<body id="body" onload="loadCanvas() style=" margin: 0; height: 100%; overflow: hidden" onresize="onResize()">
<div id="masterApp"></div>
<div id="canvasApp"></div>
<div id="textAreaDiv"></div>
<div id="inputDiv"></div>
</body>
</html>
client/package-lock.json
Generated
+852 -791
View File
File diff suppressed because it is too large. Load diff
client/package.json
+3 -3
View File
@@ -36,10 +36,10 @@
"@superalgos/key-vault-client": "0.0.32",
"@superalgos/logs-client": "0.0.1",
"@superalgos/operations-client": "0.0.34",
"@superalgos/strategizer-client": "0.0.13",
"@superalgos/teams-client": "0.0.35",
"@superalgos/strategizer-client": "0.0.15",
"@superalgos/teams-client": "0.0.38",
"@superalgos/users-client": "0.0.26",
"@superalgos/web-components": "0.0.20",
"@superalgos/web-components": "0.0.22",
"autoprefixer": "^9.2.0",
"babel-loader": "^8.0.4",
"babel-preset-flow": "6.23.0",
client/src/styles/styles.scss
+31 -3
View File
@@ -63,6 +63,10 @@ body{
background-color: #737272;
border: 1px solid #000;
}
pre {
white-space: pre-wrap;
margin: 0;
}
}
.container{
@@ -271,8 +275,8 @@ header.menu{
position: relative;
padding-top: ( $height-nav-bar - $text-height ) / 2;
padding-bottom: ( $height-nav-bar - $text-height ) / 2;
padding-right: 14px;
padding-left: 14px;
padding-left: 10px;
padding-right: 10px;
&.hasChildren{
&:after{
content: '';
@@ -299,6 +303,10 @@ header.menu{
}
svg{
padding-top: 10px;
margin-bottom: -2px;
&.tutorialIcon {
padding-top: 0px;
}
}
}
ul.subMenu{
@@ -347,6 +355,12 @@ header.menu{
display: block;
top: 42%;
}
&.landing {
.caption{
display: block;
top: 25%;
}
}
}
&.medium{
height: 50vh;
@@ -371,10 +385,24 @@ header.menu{
color: white;
line-height: 30px;
font-weight: 600;
padding: 20px 0 0.5em 0;
padding: 2em 20% 0.5em;
@include fluid-type($break-xs, $break-lg, 18px, 20px);
}
.instructions{
h4{
color: white;
margin-top: 25px;
margin-bottom: 10px;
font-size: 1.6em;
a {
color: white;
text-decoration: none;
font-size: 0.9em;
&:hover {
color: #f55858;
}
}
}
h5{
color: white;
margin-top:25px;
client/src/views/home/index.js
+7 -4
View File
@@ -22,16 +22,19 @@ class Home extends Component {
<React.Fragment>
{this.state.user !== undefined && this.state.user !== null && (
<BannerTopBar
size='big'
size='big landing'
title='Superalgos Platform Demo'
text='Get Started Using the Demo'
text='The platform demo is a functional prototype built for exposing and evaluating the multitude of Superalgos platform services. The user experience has not been optimized and will be refined in future use case implementations.'
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='h4' >DEMO OVERVIEW</Typography>
<Typography align='center' variant='subtitle1' >1. <Link to='/teams/manage-teams'>Create a Team and Fork the Template Bots →</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' >3. <Link to='/clones/add'>Run a clone instance of your Simulator bot 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>
<Typography align='center' variant='subtitle1' >5. <Link to='/clones/add'>Now use your strategy with your trading bot by running a backtest clone instance →</Link></Typography>
<Typography align='center' variant='subtitle1' gutterBottom>5. <Link to='/keys/addKey'>(Optional) Add an exchange API key to run your trading bot live →</Link></Typography>
</div>
</BannerTopBar>
)}
client/src/views/layout/header/index.js
+5 -1
View File
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types'
import { Link } from 'react-router-dom'
import jwtDecode from 'jwt-decode'
import withWidth from '@material-ui/core/withWidth'
import { NotListedLocation as TutorialIcon } from '@material-ui/icons'
// components
import { LoggedIn } from './LoggedIn'
@@ -112,6 +113,9 @@ class Header extends Component {
</div>
<nav className={mobileOpen ? 'links openedMobile' : 'links'}>
<ul className='primaryMenu'>
<li className='primaryLink'>
<Link to='/'><TutorialIcon className='tutorialIcon' /></Link>
</li>
<li className='primaryLink'>
<Link to='/charts'> Charts </Link>
</li>
@@ -145,7 +149,7 @@ class Header extends Component {
)
}
renderSubMenu(Icon, to, title, submenus, authenticated, index, bigScreen) {
renderSubMenu (Icon, to, title, submenus, authenticated, index, bigScreen) {
return submenus.length === 0 ? null : (
<ul className='subMenu'>
{ bigScreen