Commit Graph

263 Commits

Author SHA1 Message Date
Björn Otgaar
fa046e6b2a feat: dummy reload from CB added.
ref: N25B-153
2025-10-08 17:41:29 +02:00
Björn Otgaar
1a0fd92e0f chore: complete merging with functionality
ref: N25B-142

additional comments: The reload from CB doesn't work yet.
2025-10-08 16:49:44 +02:00
JGerla
d0451f1795 style: updated comments and changed order of lines and fixed general inconsistencies in code-style
ref: N25B-114
2025-10-08 16:39:56 +02:00
Björn Otgaar
60b925e4e7 chore: merged dev into show-connected-robots
ref: N25B-142
2025-10-08 16:37:57 +02:00
JGerla
5b8213d5ef refactor: moved visualProgrammingUI into page folder
BREAKING: moved directory visualProgrammingUI and contents into VisProgPage

ref: N25B-114
2025-10-08 16:31:11 +02:00
Björn Otgaar
ae91046a52 Merge branch 'feat/ui2cb-communication' into 'dev'
A robot interaction page to send and receive messages from the robot

See merge request ics/sp/2025/n25b/pepperplus-ui!10
2025-10-08 14:01:02 +00:00
Twirre Meulenbelt
d8ed8df982 feat: update robot interaction page
This page is now fancier, shows messages streaming from the Control Backend.

ref: N25B-164
2025-10-08 15:56:34 +02:00
JGerla
47266c4ef0 refactor: improved code style and naming
BREAKING: renamed useStore to useFlowStore

ref: N25B-114
2025-10-08 15:47:59 +02:00
Twirre Meulenbelt
23cef5206d chore: merge remote-tracking branch 'origin/dev' into feat/ui2cb-communication
ref: N25B-164
2025-10-08 15:40:25 +02:00
JGerla
1a5b1e7617 feat: moved the state handling logic for VisProgUI to a Zustand store
all functional logic and state is now contained within a single Zustand store, and removed from the editor component definition

ref: N25B-162
2025-10-08 15:19:49 +02:00
Björn Otgaar
3ccfe0bed4 Merge branch 'feat/redo-home-page' into 'dev'
Home page improvements & basic CSS

See merge request ics/sp/2025/n25b/pepperplus-ui!9
2025-10-08 13:17:48 +00:00
Twirre Meulenbelt
46cc5a087d feat: basic home page
Created a basic home page with links, a header with a link to home, some basic reusable CSS classes.

ref: N25B-38
2025-10-08 15:03:44 +02:00
Björn Otgaar
72d61e3985 chore: fixed wrong imports and deleted some
unnecessary prints.

ref: N25B-142
2025-10-08 14:35:20 +02:00
Twirre
06096ce7d3 Merge branch 'chore/correct-branch-name' into 'dev'
Fix branch naming regex pattern

See merge request ics/sp/2025/n25b/pepperplus-ui!8
2025-10-08 11:10:46 +00:00
Twirre Meulenbelt
c515f32023 chore: fix branch naming regex pattern
The previous pre-commit script allowed only branch names with three words. Should allow one to 6 words.

ref: N25B-89
2025-10-08 13:07:47 +02:00
Björn Otgaar
ec4f45b984 fix: Keep the conencted robots in a global list
ref: N25B-142
2025-10-08 12:40:01 +02:00
JGerla
59a38a3a12 feat: Updated editor layout to make use of ReactFlow Panel Components
moved the draggable node collection inside the editor and attached it to a panel component inside the editor.

also modified the css by creating seperate classes for the draggable nodes inside the ui element

ref: N25B-114
2025-10-08 12:10:22 +02:00
JGerla
987b5efc3e Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface 2025-10-08 11:37:42 +02:00
JGerla
d5c7b4636d feat: added zustand package to dependencies
ref: N25B-114
2025-10-08 11:35:41 +02:00
JGerla
2182e1cdb3 feat: removed option to add a start or end node to the editor
Start and End nodes indicate the start and endpoint for program evaluation, for now adding more start points and end points would overcomplicate the initial implementation. Supporting multiple end nodes could be an interesting option to look into later in development.

ref: N25B-114
2025-10-08 11:23:50 +02:00
JGerla
d6e78fc978 feat: repositioned Node sidebar to make use of the panel component provided by ReactFlow.
ref: N25B-114
2025-10-08 11:14:04 +02:00
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