Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

feat: remove useless block and add some label in all category #42

Merged
merged 5 commits into from
Oct 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 13 additions & 24 deletions components/editor/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,6 @@ onMounted(() => {
},
],
},
{
kind: "category",
name: "Result",
colour: "#21a346",
contents: [
{
kind: "label",
text: "Result Blocks",
},
{
kind: "block",
type: "text_print",
},
],
},
{
kind: "category",
name: "Function",
Expand Down Expand Up @@ -325,15 +310,7 @@ onMounted(() => {
},
{
kind: "label",
text: "Result Blocks",
},
{
kind: "block",
type: "text_print",
},
{
kind: "label",
text: "Strategy Blocks",
text: "Momentum Indicator",
},
{
kind: "block",
Expand All @@ -343,6 +320,10 @@ onMounted(() => {
kind: "block",
type: "custom_rsi",
},
{
kind: "label",
text: "Trend Indicator",
},
{
kind: "block",
type: "ema",
Expand Down Expand Up @@ -439,10 +420,18 @@ onMounted(() => {
kind: "block",
type: "vwma",
},
{
kind: "label",
text: "Volume Indicator",
},
{
kind: "block",
type: "mfi",
},
{
kind: "label",
text: "Function",
},
{
kind: "block",
type: "strategy",
Expand Down
18 changes: 9 additions & 9 deletions plugins/blockly/theme/custom-theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ const defaultBlockStyles = {
* orange blocks which represent math operator blocks
*/
math_blocks: {
colourPrimary: "#f78b2d",
colourSecondary: "#f3ec8e",
colourTertiary: "#f79b3d",
colourPrimary: "#F78B2D",
colourSecondary: "#F3EC8E",
colourTertiary: "#F79B3D",
},
procedure_blocks: {
colourPrimary: "#590721",
Expand All @@ -56,9 +56,9 @@ const defaultBlockStyles = {
colourTertiary: "#83759e",
},
function_blocks: {
colourPrimary: "#1a1a1a",
colourSecondary: "#816ea7",
colourTertiary: "#83759e",
colourPrimary: "#1A1A1A",
colourSecondary: "#816EA7",
colourTertiary: "#83759E",
},
strategy: {
colourPrimary: "#00BCD4",
Expand All @@ -76,9 +76,9 @@ const defaultBlockStyles = {
colourTertiary: "#AB62F4",
},
volume: {
colourPrimary: "#4b5aff",
colourSecondary: "#4b5aff",
colourTertiary: "#5b6aFf",
colourPrimary: "#4B5AFF",
colourSecondary: "#4B5AFF",
colourTertiary: "#5B6AFF",
},
};

Expand Down