From 078bbe0477dd54d8121033d5767b6f97af582b0b Mon Sep 17 00:00:00 2001 From: Mario Pesch Date: Wed, 3 Aug 2022 11:19:59 +0200 Subject: [PATCH] update toolbox and change colour --- package-lock.json | 34 ++++++++++-- .../Blockly/blocks/sensebox-motors.js | 14 ++--- src/components/Blockly/helpers/colour.js | 1 + src/components/Blockly/msg/de/ui.js | 1 + src/components/Blockly/msg/en/ui.js | 1 + src/components/Blockly/toolbox/Toolbox.js | 55 ++++++++++--------- 6 files changed, 66 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 83aa447..fa707a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5077,6 +5077,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ansi-html": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", @@ -22556,9 +22567,11 @@ } }, "node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "optional": true, + "peer": true, "engines": { "node": ">=10" }, @@ -28548,6 +28561,13 @@ "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "requires": { "type-fest": "^0.21.3" + }, + "dependencies": { + "type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" + } } }, "ansi-html": { @@ -42256,9 +42276,11 @@ "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==" }, "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "optional": true, + "peer": true }, "type-is": { "version": "1.6.18", diff --git a/src/components/Blockly/blocks/sensebox-motors.js b/src/components/Blockly/blocks/sensebox-motors.js index 3df4a76..5fdad13 100644 --- a/src/components/Blockly/blocks/sensebox-motors.js +++ b/src/components/Blockly/blocks/sensebox-motors.js @@ -17,7 +17,7 @@ Blockly.Blocks["sensebox_motors_beginServoMotor"] = { .setAlign(Blockly.ALIGN_RIGHT); this.setPreviousStatement(true, null); this.setNextStatement(true, null); - this.setColour(getColour().sensebox); + this.setColour(getColour().motors); this.setTooltip(Blockly.Msg.sensebox_motors_beginServoMotor_tooltip); this.setHelpUrl(Blockly.Msg.sensebox_motors_beginServoMotor_helpurl); }, @@ -36,7 +36,7 @@ Blockly.Blocks["sensebox_motors_moveServoMotor"] = { .setAlign(Blockly.ALIGN_RIGHT); this.setPreviousStatement(true, null); this.setNextStatement(true, null); - this.setColour(getColour().sensebox); + this.setColour(getColour().motors); this.setTooltip(Blockly.Msg.sensebox_motors_moveServoMotor_tooltip); this.setHelpUrl(Blockly.Msg.sensebox_motors_moveServoMotor_helpurl); }, @@ -53,7 +53,7 @@ Blockly.Blocks["sensebox_motors_I2CMotorBoard_begin"] = { .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin); this.setPreviousStatement(true, null); this.setNextStatement(true, null); - this.setColour(getColour().sensebox); + this.setColour(getColour().motors); this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin_tooltip); this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_begin_helpurl); }, @@ -73,7 +73,7 @@ Blockly.Blocks["sensebox_motors_I2CMotorBoard_moveDCMotor"] = { .setAlign(Blockly.ALIGN_RIGHT); this.setPreviousStatement(true, null); this.setNextStatement(true, null); - this.setColour(getColour().sensebox); + this.setColour(getColour().motors); this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_tooltip); this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_moveDCMotor_helpurl); }, @@ -90,7 +90,7 @@ Blockly.Blocks["sensebox_motors_I2CMotorBoard_stopDCMotor"] = { .appendField(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_motor) this.setPreviousStatement(true, null); this.setNextStatement(true, null); - this.setColour(getColour().sensebox); + this.setColour(getColour().motors); this.setTooltip(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_tooltip); this.setHelpUrl(Blockly.Msg.sensebox_motors_I2CMotorBoard_stopDCMotor_helpurl); }, @@ -122,7 +122,7 @@ Blockly.Blocks["sensebox_motors_beginStepperMotor"] = { .appendField(new FieldSlider(3, 1, 3), "rpm"); this.setPreviousStatement(true, null); this.setNextStatement(true, null); - this.setColour(getColour().sensebox); + this.setColour(getColour().motors); this.setTooltip(Blockly.Msg.sensebox_motors_beginStepperMotor_tooltip); this.setHelpUrl(Blockly.Msg.sensebox_motors_beginStepperMotor_helpurl); }, @@ -137,7 +137,7 @@ Blockly.Blocks["sensebox_motors_moveStepperMotor"] = { .appendField(Blockly.Msg.sensebox_motors_moveStepperMotor_step); this.setPreviousStatement(true, null); this.setNextStatement(true, null); - this.setColour(getColour().sensebox); + this.setColour(getColour().motors); this.setTooltip(Blockly.Msg.sensebox_motors_moveStepperMotor_tooltip); this.setHelpUrl(Blockly.Msg.sensebox_motors_moveStepperMotor_helpurl); }, diff --git a/src/components/Blockly/helpers/colour.js b/src/components/Blockly/helpers/colour.js index 2cf7f78..e4f4cca 100644 --- a/src/components/Blockly/helpers/colour.js +++ b/src/components/Blockly/helpers/colour.js @@ -14,6 +14,7 @@ const colours = { serial: 230, webserver: 40, phyphox: 25, + motors: 190, }; export const getColour = () => { diff --git a/src/components/Blockly/msg/de/ui.js b/src/components/Blockly/msg/de/ui.js index c705d57..f73db9f 100644 --- a/src/components/Blockly/msg/de/ui.js +++ b/src/components/Blockly/msg/de/ui.js @@ -12,6 +12,7 @@ export const UI = { toolbox_variables: "Variablen", toolbox_serial: "Seriell", toolbox_advanced: "Erweitert", + toolbox_motors: "Motoren", variable_NUMBER: "Zahl (int)", variable_SHORT_NUMBER: "char", variable_LONG: "große Zahl (long)", diff --git a/src/components/Blockly/msg/en/ui.js b/src/components/Blockly/msg/en/ui.js index 1b5323a..530fd90 100644 --- a/src/components/Blockly/msg/en/ui.js +++ b/src/components/Blockly/msg/en/ui.js @@ -12,6 +12,7 @@ export const UI = { toolbox_variables: "Variables", toolbox_serial: "Serial", toolbox_advanced: "Erweitert", + toolbox_motors: "Motors", variable_NUMBER: "Number (int)", variable_SHORT_NUMBER: "char", variable_LONG: " Zahl (long)", diff --git a/src/components/Blockly/toolbox/Toolbox.js b/src/components/Blockly/toolbox/Toolbox.js index c83d112..00cc54d 100644 --- a/src/components/Blockly/toolbox/Toolbox.js +++ b/src/components/Blockly/toolbox/Toolbox.js @@ -298,33 +298,7 @@ class Toolbox extends React.Component { - - - - - - 90 - - - - {/* - - - - 100 - - - - - - - - - 2048 - - - */} - + {/* @@ -672,6 +646,33 @@ class Toolbox extends React.Component { + + + + + + 90 + + + + {/* + + + + 100 + + + + + + + + + 2048 + + + */} +