JGerla
f8c152ecfb
Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface
...
# Conflicts:
# package-lock.json
2025-10-22 11:44:10 +02:00
Twirre
6c5ccbdd07
Merge branch 'chore/set-up-testing' into 'dev'
...
chore: set up jest for testing the UI
See merge request ics/sp/2025/n25b/pepperplus-ui!13
2025-10-22 07:37:54 +00:00
JGerla
cbacf924f9
chore: added basic jest testing support
...
also added an example test for the counter in the components.tsx file to demonstrate functionality of testing configuration. installed all dependencies for testing using --save-dev to make sure they are stored as dev dependencies
ref: N25B-212
2025-10-21 22:18:10 +02:00
JGerla
7e739ef106
refactor: changes from feedback on merge request
...
ref: N25B-114
2025-10-21 20:31:24 +02:00
Gerla, J. (Justin)
9235b82fa9
Apply 1 suggestion(s) to 1 file(s)
...
Co-authored-by: Twirre <s.a.meulenbelt@students.uu.nl >
2025-10-21 11:59:43 +00:00
2584433
b9ea7737b7
Merge branch 'fix/mac-notification-bug' into 'dev'
...
fix: macBug
See merge request ics/sp/2025/n25b/pepperplus-ui!12
2025-10-17 14:13:15 +00:00
2584433
dbb38f3e48
fix: macBug
2025-10-17 14:13:15 +00:00
JGerla
5cbcf30f68
feat: added VisProgPage to linked pages in Home.tsx and App.tsx
...
BREAKING: renamed Sidebar to DndToolbar.
ref: N25B-114
2025-10-12 13:56:06 +02:00
JGerla
cf77267e95
Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface
...
# Conflicts:
# src/App.tsx
# src/pages/Home/Home.tsx
# src/pages/TemplatePage/Template.tsx
2025-10-12 13:49:36 +02:00
JGerla
a9effb7c23
style: added comments to code and changed name of Sidebar to DndToolbar
...
BREAKING: renamed Sidebar to DndToolbar.
ref: N25B-114
2025-10-12 13:48:42 +02:00
JGerla
bd5887ed9f
style: reformated NodeDefinitions.tsx to be compliant with code standards
...
ref: N25B-114
2025-10-09 17:00:16 +02:00
JGerla
ece94b0b02
style: reformated DragDropSidebar.tsx to be compliant with code standards
...
ref: N25B-114
2025-10-09 16:55:08 +02:00
JGerla
ff8a617c5e
style: reformated VisProgStores.tsx to be compliant with code standards
...
ref: N25B-114
2025-10-09 16:41:32 +02:00
JGerla
40af530fd5
style: reformated VisProg.tsx and VisProgTypes.tsx to be compliant with code standards
...
ref: N25B-114
2025-10-09 16:38:52 +02:00
JGerla
f6fcd20462
refactor: reformated VisProgUI.tsx to be compliant with code standards
...
some inline css was moved to VisProgUI.css
ref: N25B-114
2025-10-09 16:35:38 +02:00
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