Merge pull request #233 from sensebox/dev/update-blockly-v9

Dev/update blockly v9
This commit is contained in:
Mario Pesch 2023-02-06 17:59:49 +01:00 committed by GitHub
commit ace2237529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 8 deletions

View File

@ -3,13 +3,13 @@
"version": "1.0.0", "version": "1.0.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@blockly/block-plus-minus": "^3.0.5", "@blockly/block-plus-minus": "^4.0.4",
"@blockly/field-grid-dropdown": "^1.0.31", "@blockly/field-grid-dropdown": "^2.0.4",
"@blockly/field-slider": "^3.0.5", "@blockly/field-slider": "4.0.4",
"@blockly/plugin-scroll-options": "^2.0.5", "@blockly/plugin-scroll-options": "^3.0.5",
"@blockly/plugin-typed-variable-modal": "^4.0.5", "@blockly/plugin-typed-variable-modal": "^5.0.6",
"@blockly/workspace-backpack": "^2.0.12", "@blockly/workspace-backpack": "^3.0.4",
"@blockly/zoom-to-fit": "^2.0.14", "@blockly/zoom-to-fit": "^3.0.4",
"@emotion/react": "^11.10.5", "@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5", "@emotion/styled": "^11.10.5",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/fontawesome-svg-core": "^6.2.1",
@ -23,7 +23,7 @@
"@testing-library/react": "^12.1.2", "@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^7.2.1", "@testing-library/user-event": "^7.2.1",
"axios": "^0.22.0", "axios": "^0.22.0",
"blockly": "^8.0.3", "blockly": "^9.2.0",
"file-saver": "^2.0.5", "file-saver": "^2.0.5",
"markdown-it": "^12.3.2", "markdown-it": "^12.3.2",
"mnemonic-id": "^3.2.7", "mnemonic-id": "^3.2.7",

View File

@ -364,6 +364,11 @@ class Navbar extends Component {
</p> </p>
</div> </div>
<hr style={{ borderTop: "3px solid #bbb", marginLeft: "5px", marginRight: "5px" }} /> <hr style={{ borderTop: "3px solid #bbb", marginLeft: "5px", marginRight: "5px" }} />
<MenuItem>
<Link to={"/user"} style={{ textDecoration: 'none', color: "black" }}>
{Blockly.Msg.navbar_account}
</Link>
</MenuItem>
<MenuItem> <MenuItem>
<Link to={"/settings"} style={{ textDecoration: 'none', color: "black" }}> <Link to={"/settings"} style={{ textDecoration: 'none', color: "black" }}>
{Blockly.Msg.navbar_settings} {Blockly.Msg.navbar_settings}