Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Main working original #473

Open
syntheticmarketsfinal wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Main working original #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74327fe
Got it working - original
RoundRobinHood Aug 15, 2024
01645e1
Removed blockly translations from .gitignore
RoundRobinHood Aug 15, 2024
8d05064
Front end completed
RoundRobinHood Aug 15, 2024
4a23d4f
Fixed dependency issues
RoundRobinHood Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,30 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
[
"@babel/preset-react",
{
"runtime": "automatic",
"development": true
}
],
[
"@babel/preset-env",
{
"targets": {
"browsers": [
"last 2 versions",
"ios_saf >= 8",
"not IE <= 10",
"chrome >= 49",
"firefox >= 49",
"> 1%"
]
},
"loose": true,
"useBuiltIns": "usage",
"corejs": "2.6.5"
}
]
],
"plugins": [
[
Expand All @@ -16,7 +39,7 @@
{
"useBuiltIns": "usage",
"corejs": "2.6.5"
}
]
]
}
   }
    ]
  ]
}
444 changes: 444 additions & 0 deletions blockly-translations/en.js
View file
Open in desktop

Large diffs are not rendered by default.

451 changes: 451 additions & 0 deletions blockly-translations/es.js
View file
Open in desktop

Large diffs are not rendered by default.

455 changes: 455 additions & 0 deletions blockly-translations/fr.js
View file
Open in desktop

Large diffs are not rendered by default.

448 changes: 448 additions & 0 deletions blockly-translations/it.js
View file
Open in desktop

Large diffs are not rendered by default.

444 changes: 444 additions & 0 deletions blockly-translations/pl.js
View file
Open in desktop

Large diffs are not rendered by default.

450 changes: 450 additions & 0 deletions blockly-translations/pt.js
View file
Open in desktop

Large diffs are not rendered by default.

444 changes: 444 additions & 0 deletions blockly-translations/ru.js
View file
Open in desktop

Large diffs are not rendered by default.

449 changes: 449 additions & 0 deletions blockly-translations/vi.js
View file
Open in desktop

Large diffs are not rendered by default.

432 changes: 432 additions & 0 deletions blockly-translations/zh-hans.js
View file
Open in desktop

Large diffs are not rendered by default.

433 changes: 433 additions & 0 deletions blockly-translations/zh-hant.js
View file
Open in desktop

Large diffs are not rendered by default.

10,257 changes: 5,182 additions & 5,075 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,15 @@
"mobx": "^6.3.12",
"mobx-react": "^7.2.1",
"pako": "^1.0.11",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react": "^16.1.0",
"react-dom": "^16.1.0",
"react-draggable": "^4.4.4",
"react-helmet": "^6.1.0",
"react-i18next": "^13.0.1",
"react-redux": "^7.2.6",
"react-router-dom": "^6.14.2"
"react-render-html": "^0.6.0",
"react-router-dom": "^6.14.2",
"stream-browserify": "^3.0.0",
"util": "^0.12.5"
}
}
37 changes: 37 additions & 0 deletions public/xml/main before changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<xml xmlns="http://www.w3.org/1999/xhtml" collection="false">
<block type="trade" id="xgH69|xFn9=70w.*3Vo@" x="0" y="0">
<statement name="SUBMARKET">
<block type="tradeOptions" id="x=V33~4Lb|(sLv`J[:Eb">
<field name="DURATIONTYPE_LIST">t</field>
<field name="CURRENCY_LIST">USD</field>
<value name="DURATION"></value>
<value name="AMOUNT">
<shadow type="math_number" id="ml)25~7^q}3I9}vjf:%K">
<field name="NUM">1</field>
</shadow>
</value>
</block>
</statement>
</block>
<block type="before_purchase" id="i-CIx.(Onm4?ihxzA}Y]" x="0" y="301">
<statement name="BEFOREPURCHASE_STACK">
<block type="purchase" id="W6q#Z-I3q3d[d3-`S[dS">
<field name="PURCHASE_LIST"></field>
</block>
</statement>
</block>
<block type="during_purchase" id="(4;NieXd}j|Bn!c-YiC|" x="0" y="391">
<statement name="DURING_PURCHASE_STACK">
<block type="controls_if" id="8?eYKAW%VczmRXQ-ou3r">
<value name="IF0">
<block type="check_sell" id="M=:_KpEeRAJY_}XTU^8~"></block>
</value>
</block>
</statement>
</block>
<block type="after_purchase" id="D^Jz1^n=2vtZku1vBN@;" x="0" y="516">
<statement name="AFTERPURCHASE_STACK">
<block type="trade_again" id="c)S|KjoQdXc8l#J@5z3P"></block>
</statement>
</block>
</xml>
163 changes: 146 additions & 17 deletions public/xml/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,166 @@
<xml xmlns="http://www.w3.org/1999/xhtml" collection="false">
<xml xmlns="http://www.w3.org/1999/xhtml" collection="false">
<variables></variables>
<block type="trade" id="xgH69|xFn9=70w.*3Vo@" x="0" y="0">
<field name="MARKET_LIST">synthetic_index</field>
<field name="SUBMARKET_LIST">random_index</field>
<field name="SYMBOL_LIST">R_100</field>
<field name="TRADETYPECAT_LIST">callput</field>
<field name="TRADETYPE_LIST">risefall</field>
<field name="TYPE_LIST">both</field>
<field name="CANDLEINTERVAL_LIST">60</field>
<statement name="INITIALIZATION">
<block type="virtual_config" id="Q`K(wTA|y4Ku:xC0}:+A" collapsed="true">
<value name="STATUS">
<shadow type="logic_boolean">
<field name="BOOL">FALSE</field>
</shadow>
</value>
<value name="TOKEN">
<shadow type="text">
<field name="TEXT">Input your token here</field>
</shadow>
</value>
<value name="STEPSCOUNT">
<shadow type="logic_boolean">
<field name="BOOL">TRUE</field>
</shadow>
</value>
<value name="RESETTYPE">
<shadow type="logic_boolean">
<field name="BOOL">TRUE</field>
</shadow>
</value>
<value name="MAXSTEPS">
<shadow type="math_number">
<field name="NUM">3</field>
</shadow>
</value>
<value name="MINREAL">
<shadow type="math_number">
<field name="NUM">1</field>
</shadow>
</value>
<value name="MAXREAL">
<shadow type="math_number">
<field name="NUM">10</field>
</shadow>
</value>
<value name="BACKREAL">
<shadow type="logic_boolean">
<field name="BOOL">TRUE</field>
</shadow>
</value>
<next>
<block type="martingale_tradedefinitions" id="123124123123123">
<value name="INITIAL">
<shadow type="math_number">
<field name="NUM">0.35</field>
</shadow>
</value>
<value name="FACTOR">
<shadow type="math_number">
<field name="NUM">2.1</field>
</shadow>
</value>
<value name="MAXSTEPS">
<shadow type="math_number">
<field name="NUM">12</field>
</shadow>
</value>
<value name="STARTAFTER">
<shadow type="math_number">
<field name="NUM">0</field>
</shadow>
</value>
<value name="RESET">
<shadow type="logic_boolean">
<field name="BOOL">TRUE</field>
</shadow>
</value>
<next>
<block type="risk_tradedefinitions" id="Q`K(afdssh:xC0}:+A">
<value name="TAKEPROFIT">
<shadow type="math_number">
<field name="NUM">3</field>
</shadow>
</value>
<value name="STOPLOSS">
<shadow type="math_number">
<field name="NUM">50</field>
</shadow>
</value>
<value name="MAXSTEPS">
<shadow type="math_number">
<field name="NUM">12</field>
</shadow>
</value>
</block>
</next>
</block>
</next>
</block>
</statement>
<statement name="SUBMARKET">
<block type="tradeOptions" id="x=V33~4Lb|(sLv`J[:Eb">
<field name="DURATIONTYPE_LIST">t</field>
<field name="CURRENCY_LIST">USD</field>
<value name="DURATION"></value>
<value name="AMOUNT">
<shadow type="math_number" id="ml)25~7^q}3I9}vjf:%K">
<field name="BARRIEROFFSETTYPE_LIST">+</field>
<field name="SECONDBARRIEROFFSETTYPE_LIST">-</field>
<value name="DURATION">
<shadow type="math_number" id="shadow">
<field name="NUM">1</field>
</shadow>
</value>
<value name="AMOUNT">
<block type="martingale_stake"></block>
<!-- <shadow type="math_number" id="ml)25~7^q}3I9}vjf:%K">
<field name="NUM">1</field>
</shadow> -->
</value>
</block>
</statement>
</block>
<block type="before_purchase" id="i-CIx.(Onm4?ihxzA}Y]" x="0" y="301">
<block type="before_purchase" id="i-CIx.(Onm4?ihxzA}Y]" x="591.64" y="0">
<statement name="BEFOREPURCHASE_STACK">
<block type="purchase" id="W6q#Z-I3q3d[d3-`S[dS">
<field name="PURCHASE_LIST"></field>
<field name="PURCHASE_LIST">CALL</field>
</block>
</statement>
</block>
<block type="during_purchase" id="(4;NieXd}j|Bn!c-YiC|" x="0" y="391">
<statement name="DURING_PURCHASE_STACK">
<block type="controls_if" id="8?eYKAW%VczmRXQ-ou3r">
<value name="IF0">
<block type="check_sell" id="M=:_KpEeRAJY_}XTU^8~"></block>
<block type="after_purchase" id="D^Jz1^n=2vtZku1vBN@;" x="591.64" y="0">
<statement name="AFTERPURCHASE_STACK">
<block type="report" id="W6dfgsdgasdg">
<value name="PROFIT">
<shadow type="read_details">
<field name="DETAIL_INDEX">4</field>
</shadow>
</value>
<next>
<block type="martingale_afterpurchase">
<value name="RESULT">
<shadow type="read_details">
<field name="DETAIL_INDEX">11</field>
</shadow>
</value>
<next>
<block type="controls_if">
<value name="IF0">
<block type="risk_afterpurchase">
<value name="PROFIT">
<shadow type="read_details">
<field name="DETAIL_INDEX">4</field>
</shadow>
</value>
</block>
</value>
<statement name="DO0">
<block type="trade_again"></block>
</statement>
</block>
</next>
</block>
</next>
</block>
</statement>
</block>
<block type="after_purchase" id="D^Jz1^n=2vtZku1vBN@;" x="0" y="516">
<statement name="AFTERPURCHASE_STACK">
<block type="trade_again" id="c)S|KjoQdXc8l#J@5z3P"></block>
</statement>
</block>
</xml>
</xml>
Loading