Commit Graph

242 Commits

Author SHA1 Message Date
JGerla
07e1d84a62 feat: Added allowDelete param to nodeToolbar
allowDelete lets developers decide if  a nodetype should be deletable and if not it disables the delete button in the nodeToolbar

ref: N25B-114
2025-10-08 10:27:34 +02:00
JGerla
705ff3ff2b fix: changed edgetype to default
floating was used as edgetype whilst floating wasn't available, ReactFlow automatically fell back to default. now it is changed to default in the code preventing potential unexpected behavior

ref: N25B-114
2025-10-08 09:34:44 +02:00
2584433
f889fad732 Merge branch 'fix/readme-update-correct' into 'dev'
readme change

See merge request ics/sp/2025/n25b/pepperplus-ui!7
2025-10-07 14:38:32 +00:00
2584433
a9f0a8dabd readme change 2025-10-07 14:38:31 +00:00
Björn Otgaar
b78cd53baa feat: Show connected robots in the UI when
connection event is received from CB.

Added two test buttons to mimic events from CB.

UI will listen to port localhost:8000 for data.
use the data.event = "robot_connected" and
data.event = "robot_disconnected".

(robot) ID is required, name and port are optional
but incentivized.
2025-10-07 15:05:05 +02:00
2678d35c82 Merge branch 'style/git-automatic-hooks' into 'dev'
style: added automatic hooks

See merge request ics/sp/2025/n25b/pepperplus-ui!6
2025-10-06 08:00:59 +00:00
2584433
42e4d10c80 style: added automatic hooks 2025-10-06 08:00:59 +00:00
JGerla
4648e77289 fix: removed minimap as not yet intended to be added
ref: N25B-114
2025-10-02 13:14:55 +02:00
JGerla
0a4a3fb46c feat: fixed dark mode compliancy for nodes and background
ref: N25B-114
2025-10-02 13:12:01 +02:00
JGerla
70ebb16359 feat: modified css styling for nodes to have different colors per type
updated the nodes to have a different colour per NodeType, so it is easier to see what nodes are of what type in the graph.

ref: N25B-114
2025-10-02 12:43:44 +02:00
Twirre Meulenbelt
10522b71c3 chore: combined some branches, improved style
This demo branch contains code from multiple different branches. DO NOT MERGE this branch because it looks like I'm the author of all these changes.
2025-10-01 22:56:03 +02:00
JGerla
7780878447 feat: added Norm nodes and an extra handle on phase nodes
ref: N25B-114
2025-10-01 17:13:55 +02:00
JGerla
1175ba3acc Merge remote-tracking branch 'origin/feat/visual-programming-interface' into feat/visual-programming-interface
# Conflicts:
#	src/visualProgrammingUI/components/NodeDefinitions.tsx
2025-10-01 15:56:34 +02:00
JGerla
6c22286b28 feat: added delete option to Nodes
added a delete option to nodes, nodes now have strongly typed nodeProps to conform to typescript type safety norms.

ref: N25B-114
2025-10-01 15:56:07 +02:00
JGerla
f9f5a71c47 feat: added delete option to Nodes
added a delete option to nodes, nodes now have strongly typed nodeProps to conform to typescript type safety norms.

ref: N25B-114
2025-10-01 15:51:24 +02:00
JGerla
b1b1c83d73 feat: added VisProgUI to a page
ref: N25B-114
2025-10-01 14:22:31 +02:00
JGerla
af44d4cdab Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface
# Conflicts:
#	src/main.tsx
2025-10-01 14:08:23 +02:00
JobvAlewijk
96053e798a fix: moved ui2cb communication into server 2025-10-01 14:06:30 +02:00
JobvAlewijk
f25e69718b fix: merge dev into ui2cb 2025-10-01 13:54:56 +02:00
2584433
83e9f28573 Merge branch 'task/pages-to-navigate' into 'dev'
feat: link and directory improvements

See merge request ics/sp/2025/n25b/pepperplus-ui!5
2025-10-01 11:49:25 +00:00
JGerla
affdc0c3cd feat: modified DnD sidebar to provide different node types
Modified the drag and drop sidebar to create a node of the correct type instead of creating only default nodes, regardless of specified node types for a respective option.

ref: N25B-114
2025-10-01 13:45:20 +02:00
JGerla
9df46c90a3 feat: added drag and drop menu for adding new nodes to flow
added a sidebar that supports drag and dropping new nodes from the sidebar into the flow editor.
also added a new package (neodrag) for easy draggable behavior outside the reactFlow editor.

ref: N25B-114
2025-10-01 13:30:06 +02:00
Björn Otgaar
1d22ea3878 fix: fixed naming for pepper logo 2025-10-01 13:22:58 +02:00
JGerla
85eff77e28 Merge remote-tracking branch 'origin/feat/visual-programming-interface' into feat/visual-programming-interface
# Conflicts:
#	src/visualProgrammingUI/components/NodeDefinitions.tsx
2025-10-01 10:59:33 +02:00
JGerla
79f0827b39 feat: created new nodes and a default nodeType
added a type for defaultNodeData, this can house common data that all nodes should have. the other types can build on this defaultData. Also added an endNode and phaseNode to NodeDefinitions.tsx, together with a nodeData type for each new node type.

ref: N25B-114
2025-10-01 10:58:43 +02:00
JGerla
54b5935829 feat: created new nodes and a default nodeType
added a type for defaultNodeData, this can house common data that all nodes should have. the other types can build on this defaultData. Also added an endNode and phaseNode to NodeDefinitions.tsx, together with a nodeData type for each new node type.

ref: N25B-114
2025-10-01 10:55:24 +02:00
JGerla
b991e92c37 feat: changed startNode to use custom type for data
changed to startNode file to be a general file for custom node types, and created a custom type for the data property of StartNode.

BREAKING: renamed StartNode.tsx to NodeDefinitions.tsx

ref: N25B-114
2025-10-01 10:38:35 +02:00
Twirre Meulenbelt
c512739a25 feat: differentiate between SSE messages
For spoken text, we have JSON data that can be differentiated from other data. We show this spoken text in a different UI field.

ref: N25B-110
2025-10-01 10:17:16 +02:00
Björn Otgaar
427137eae1 feat: added pepper logo and link.
ref: N25B-79
2025-09-30 17:48:32 +02:00
JGerla
e098ffebd6 feat: added a custom start node
Defined a basic start node; it does not contain any further functionality but does provide a basis for implementing future custom nodes.

ref: N25B-114
2025-09-30 16:13:48 +02:00
JobvAlewijk
63f97de164 feat: link and directory improvements
Changing pages now happens via Link, directory has gotten a layout change with app becoming a starting point and every page requireing their own .tsx and .css file.
Components have also been added where reocurring componennts can be made and reapplied in the project.

ref: N25B-96
2025-09-30 16:03:02 +02:00
JGerla
10e5db057b feat: updated styles of visProgUI
Added a rounded outline to the editor and changed the edge to be an arrow so program-flow can be interpreted more easily from the UI.

ref: N25B-114
2025-09-30 15:20:16 +02:00
JGerla
0eb5b65f67 feat: Added reconnectable edges
Modified edges to support being disconnected and reconnected upon dragging their connection away from the currently connected node.

ref: N25B-114
2025-09-30 14:53:53 +02:00
79316b34e5 Merge branch 'docs/readme-installation-instructions' into 'dev'
Add installation and run instructions to the README

See merge request ics/sp/2025/n25b/pepperplus-ui!3
2025-09-30 11:48:54 +00:00
Twirre Meulenbelt
ee8c6137a2 docs: clarify required Node version
ref: N25B-115
2025-09-30 13:47:39 +02:00
JGerla
e076331cfc feat: added ReactFlow-based node graph
Added ReactFlow to dependencies (@xyflow/react).
Added a basic reactflow template to test functionality of reactFlow and to build the visual programming UI on top of.

ref: N25B-114
2025-09-30 13:43:48 +02:00
Twirre Meulenbelt
b059117f42 docs: add installation and run instructions
ref: N25B-115
2025-09-30 13:40:38 +02:00
Kasper
c577daa9e6 feat: add basic UI2CB and CB2UI communication
By pressing the button, the text in the input field is sent to the CB.

Every second, UI receives the current time from CB.

ref: N25B-107
ref: N25B-110
2025-09-26 21:39:11 +02:00
c7ac2e9e05 Merge branch 'dev' into 'main'
Merge `dev` into `main`

See merge request ics/sp/2025/n25b/pepperplus-ui!2
2025-09-25 12:23:10 +00:00
70e2bdb610 Merge branch 'chore/init-react-app' into 'dev'
Initialize a React app in the repository

See merge request ics/sp/2025/n25b/pepperplus-ui!1
2025-09-25 12:19:58 +00:00
Twirre Meulenbelt
f70330f546 chore: create a React app with Vite tool
Used the Vite build tool to create a React app, with TypeScript.

close: N25B-81
2025-09-25 14:09:22 +02:00
f42f791862 Initial commit 2025-09-25 11:01:54 +00:00