Merge pull request binary-com#10 from aaron-binary/import-scratch-to-…

…derivbot Import scratch to derivbot
Mahboobeh-binary · Jun 20, 2019 · bff12ad · bff12ad
1 parent 0efcfa5
commit bff12ad
Show file tree

Hide file tree

Showing 144 changed files with 8,337 additions and 520 deletions.
diff --git a/packages/deriv-bot/index.html b/packages/deriv-bot/index.html
@@ -9,8 +9,7 @@
   </head>
 <body>
     <div id="root" role="main"></div>
-    <script src="./dist/scratch-compressed.js"></script>
-    <script src="./dist/scratch-messages.js"></script>
+    <script src="./dist/scratch.js"></script>
     <script src="./dist/bot.js"></script>
 </body>
 

diff --git a/packages/deriv-bot/package-lock.json b/packages/deriv-bot/package-lock.json
diff --git a/packages/deriv-bot/package.json b/packages/deriv-bot/package.json
@@ -109,7 +109,8 @@
     "vinyl-paths": "^2.1.0",
     "webpack": "^4.32.2",
     "webpack-cli": "^3.3.2",
-    "webpack-dev-server": "^3.4.1"
+    "webpack-dev-server": "^3.4.1",
+    "webpack-merge-and-include-globally": "^2.1.16"
   },
   "dependencies": {
     "@binary-com/smartcharts": "^0.3.9",

diff --git a/packages/deriv-bot/src/assets/sass/scratch/_blockly-toolbox.scss b/packages/deriv-bot/src/assets/sass/scratch/_blockly-toolbox.scss
@@ -52,7 +52,6 @@
 }
 
 .blocklyToolboxDiv {
-    background-color: $brand-gray !important;
     border-width: thin;
     color: $brand-dark-gray;
     border-right: 0.06em solid;
@@ -84,6 +83,7 @@
 }
 
 .blocklySvg {
+    background-color: $white !important;
     position: absolute;
 }
 

diff --git a/packages/deriv-bot/src/scratch/blocks/Advanced/Functions/index.js b/packages/deriv-bot/src/scratch/blocks/Advanced/Functions/index.js
@@ -0,0 +1,5 @@
+import './procedures_defnoreturn';
+import './procedures_defreturn';
+import './procedures_callnoreturn';
+import './procedures_callreturn';
+import './procedures_ifreturn';