Commit Graph

Select branches

Hide Pull Requests

build/docker-deployment

chore/clean-visprog-code

demo

dev

feat/add-belief-and-plan-nodes-for-trigger-nodes

feat/editor-user-feedback

feat/face-detection

feat/gesture-ui-cb

feat/monitoringpage

feat/monitoringpage-bjorn

feat/monitoringpage-buttons

feat/monitoringpage-darkmode

feat/monitoringpage-nonfunctional

feat/monitoringpage-pim

feat/save-load-nodes-direct

feat/simple-program-page

feat/step-ordering-plans

fix/text-field-parent-updates

main

refactor/monitoringpage

#1

#10

#11

#13

#15

#2

#20

#21

#22

#24

#27

#28

#29

#3

#32

#37

#38

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#8

#9

Mono Color

• 476c538464 build: fixed small merge conflict JobvAlewijk 2025-11-14 13:15:11 +01:00
• fe8e04d305 Merge branch 'refactor/improve-orderPhases' into 'dev' 2584433 2025-11-14 11:46:44 +00:00
• 2f7a48415b refactor: removed unnecessary else blocks in orderPhases Gerla, J. (Justin) 2025-11-14 11:46:44 +00:00
• a3aec5928c fix: allow parent updates to the TextField component fix/text-field-parent-updates Twirre Meulenbelt 2025-11-13 12:23:44 +01:00
• e5fee333fb Merge branch 'feat/editable-norms-and-goals' into 'dev' Gerla, J. (Justin) 2025-11-13 10:50:12 +00:00
• aeaf526797 Make nodes editable: norms, goals and keyword triggers Twirre 2025-11-13 10:50:12 +00:00
• f534f0cefa Merge branch 'feat/logging' into 'dev' Gerla, J. (Justin) 2025-11-12 14:35:38 +00:00
• 231d7a5ba1 Add logging with filters Twirre 2025-11-12 14:35:38 +00:00
• 221fbe42c2 chore: added tests Pim Hutting 2025-11-12 14:29:59 +01:00
• 22da2ca664 feat: added functionality of saving and loadiing Pim Hutting 2025-11-12 11:17:15 +01:00
• be4fb0e7cd Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots Björn Otgaar 2025-11-12 11:05:59 +01:00
• bb7d24b7be chore: merge current dev into this branche Pim Hutting 2025-11-12 09:36:22 +01:00
• 3cbf983b41 fix: save and load are now buttons Pim Hutting 2025-11-11 16:32:37 +01:00
• 45e133e255 feat: added temporary dummy button menu Tuurminator69 2025-11-11 16:05:25 +01:00
• b7eb0cb5ec Merge branch 'feat/add-naming-component-to-editor-nodes' into 'dev' Gerla, J. (Justin) 2025-11-11 13:50:45 +00:00
• d4d1aecb8c feat: added basic functionality for editable name bar Gerla, J. (Justin) 2025-11-11 13:50:45 +00:00
• 87cf723c95 chore: fixed merge request suggestion for adding depency array Björn Otgaar 2025-11-11 11:42:28 +01:00
• df4346150e chore: remove old code pt 2 Björn Otgaar 2025-11-11 11:11:46 +01:00
• 8733bb3c04 chore: remove old remnants from project Björn Otgaar 2025-11-11 10:25:27 +01:00
• 1b8095376b fix: fixed npx eslint (also accounting for justins part) Björn Otgaar 2025-11-05 17:21:36 +01:00
• 571908cd70 Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots Björn Otgaar 2025-11-05 16:22:46 +01:00
• 04818f48d4 Merge branch 'feat/behavior-program-reduction-algorithm' into 'dev' Gerla, J. (Justin) 2025-11-05 15:21:59 +00:00
• c4845c6738 feat: added a behavior program reduction algorithm Gerla, J. (Justin) 2025-11-05 15:21:59 +00:00
• 333bd6e6fd chore: single typing change Björn Otgaar 2025-11-05 16:11:36 +01:00
• 5e707224cf feat: Show connected robots finished with unit test 94% coverage Björn Otgaar 2025-10-30 15:47:09 +01:00
• 6a88aa3d75 merge branch dev into show-connected-robots pt2 Björn Otgaar 2025-10-30 14:57:50 +01:00
• 32938edca8 Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots Björn Otgaar 2025-10-30 14:57:18 +01:00
• 4181454a73 feat: show robots page easier - quick connected sign. Quick reload - no need for manual reloads or anything. Björn Otgaar 2025-10-30 13:05:56 +01:00
• 52b839ae51 Merge branch 'feat/visual-programming-interface' into 'dev' Twirre 2025-10-28 11:59:01 +00:00
• 7b12ae1f5e test: added test for addNode error JGerla 2025-10-25 21:09:25 +02:00
• 416025bf3f test: added test for nodeId generation JGerla 2025-10-25 20:59:41 +02:00
• 9bfc39afa1 test: added test JGerla 2025-10-25 20:53:09 +02:00
• e1d6b08a1c refactor: removed start and end nodes from the addNode functionality as they are not supported for manual adding JGerla 2025-10-25 18:58:41 +02:00
• a0324479e6 refactor: removed start and end nodes from the addNode functionality as they are not supported for manual adding JGerla 2025-10-25 18:41:57 +02:00
• b7cd925c2c refactor: moved addNode function outside the handleNode definition JGerla 2025-10-25 18:29:53 +02:00
• e1d131e642 feat: updated the phase node creation to better assign ids to new phase and norm nodes. JGerla 2025-10-25 18:12:57 +02:00
• 8038674167 test: added tests for deleteNode function JGerla 2025-10-25 17:13:42 +02:00
• 8c698d1f8e refactor: moved delete logic out of the toolbar declaration and into the FlowStore. JGerla 2025-10-25 16:58:23 +02:00
• c8484d28e5 test: added tests for onReconnectEnd JGerla 2025-10-25 16:03:57 +02:00
• 48dabb86e0 test: updated the onReconnectStart test to reflect updated setupFlowTest.ts JGerla 2025-10-25 15:37:24 +02:00
• 1f2b57fbcd chore: updated setupFlowTests.ts to properly handle resetting of the flowState for each test JGerla 2025-10-25 15:34:49 +02:00
• 2e2bd587d0 test: Added test for onReconnectStart JGerla 2025-10-25 15:27:50 +02:00
• 42357217e5 test: Added test for onReconnect JGerla 2025-10-25 15:17:14 +02:00
• 023e1d2b8b test: Added tests for setNodes and setEdges. JGerla 2025-10-25 14:59:34 +02:00
• ea79de5ee5 style: restructured and renamed VisProg.test.tsx to VisProgStores.test.tsx JGerla 2025-10-25 13:57:37 +02:00
• b64d4fbd01 chore: added test coverage collection JGerla 2025-10-25 13:54:18 +02:00
• 8513be5a56 test: added test for onConnect event JGerla 2025-10-22 16:30:24 +02:00
• 3bd1aa99e3 chore: added setupFlowTests.ts for ReactFlow specific testing JGerla 2025-10-22 15:43:47 +02:00
• 6a655f62f8 style: moved all logic from VisProgUI.tsx to VisProg.tsx and the css from VisProgUI.module.css to VisProg.module.css. JGerla 2025-10-22 15:12:29 +02:00
• 34dd48ecb6 fix: updated jest.config.js to allow for folders in the test directory JGerla 2025-10-22 12:39:35 +02:00
• b365a8754e style: moved inline styles to VisProgUI.module.css and used some existing classes to replace simple css JGerla 2025-10-22 12:31:04 +02:00
• e880e00b6d style: changed VisProgUI.css to VisProgUI.module.css and updated relevant references JGerla 2025-10-22 12:12:16 +02:00
• ea17b95a53 Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots Björn Otgaar 2025-10-22 12:00:00 +02:00
• 1f56eff9a8 Merge remote-tracking branch 'origin/feat/visual-programming-interface' into feat/visual-programming-interface JGerla 2025-10-22 11:53:50 +02:00
• d3c327c100 fixup! build: moved dependencies for merge with dev JGerla 2025-10-22 11:53:30 +02:00
• 5a6bcb9298 build: moved dependencies for merge with dev JGerla 2025-10-22 11:50:29 +02:00
• af7eb5ee73 build: added moved depencies for merge with dev JGerla 2025-10-22 11:50:29 +02:00
• f8c152ecfb Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface JGerla 2025-10-22 11:44:10 +02:00
• 6c5ccbdd07 Merge branch 'chore/set-up-testing' into 'dev' Twirre 2025-10-22 07:37:54 +00:00
• cbacf924f9 chore: added basic jest testing support JGerla 2025-10-21 22:18:10 +02:00
• 7e739ef106 refactor: changes from feedback on merge request JGerla 2025-10-21 20:31:24 +02:00
• 9235b82fa9 Apply 1 suggestion(s) to 1 file(s) Gerla, J. (Justin) 2025-10-21 11:59:43 +00:00
• b9ea7737b7 Merge branch 'fix/mac-notification-bug' into 'dev' 2584433 2025-10-17 14:13:15 +00:00
• dbb38f3e48 fix: macBug 2584433 2025-10-17 14:13:15 +00:00
• 5cbcf30f68 feat: added VisProgPage to linked pages in Home.tsx and App.tsx JGerla 2025-10-12 13:56:06 +02:00
• cf77267e95 Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface JGerla 2025-10-12 13:49:36 +02:00
• a9effb7c23 style: added comments to code and changed name of Sidebar to DndToolbar JGerla 2025-10-12 13:48:42 +02:00
• bd5887ed9f style: reformated NodeDefinitions.tsx to be compliant with code standards JGerla 2025-10-09 17:00:16 +02:00
• ece94b0b02 style: reformated DragDropSidebar.tsx to be compliant with code standards JGerla 2025-10-09 16:55:08 +02:00
• ff8a617c5e style: reformated VisProgStores.tsx to be compliant with code standards JGerla 2025-10-09 16:41:32 +02:00
• 40af530fd5 style: reformated VisProg.tsx and VisProgTypes.tsx to be compliant with code standards JGerla 2025-10-09 16:38:52 +02:00
• f6fcd20462 refactor: reformated VisProgUI.tsx to be compliant with code standards JGerla 2025-10-09 16:35:38 +02:00
• fa046e6b2a feat: dummy reload from CB added. Björn Otgaar 2025-10-08 17:41:29 +02:00
• 1a0fd92e0f chore: complete merging with functionality Björn Otgaar 2025-10-08 16:49:44 +02:00
• d0451f1795 style: updated comments and changed order of lines and fixed general inconsistencies in code-style JGerla 2025-10-08 16:37:59 +02:00
• 60b925e4e7 chore: merged dev into show-connected-robots Björn Otgaar 2025-10-08 16:37:57 +02:00
• 5b8213d5ef refactor: moved visualProgrammingUI into page folder JGerla 2025-10-08 16:31:11 +02:00
• ae91046a52 Merge branch 'feat/ui2cb-communication' into 'dev' Björn Otgaar 2025-10-08 14:01:02 +00:00
• d8ed8df982 feat: update robot interaction page Twirre Meulenbelt 2025-10-08 15:56:34 +02:00
• 47266c4ef0 refactor: improved code style and naming JGerla 2025-10-08 15:47:59 +02:00
• 23cef5206d chore: merge remote-tracking branch 'origin/dev' into feat/ui2cb-communication Twirre Meulenbelt 2025-10-08 15:40:25 +02:00
• 1a5b1e7617 feat: moved the state handling logic for VisProgUI to a Zustand store JGerla 2025-10-08 15:19:49 +02:00
• 3ccfe0bed4 Merge branch 'feat/redo-home-page' into 'dev' Björn Otgaar 2025-10-08 13:17:48 +00:00
• 46cc5a087d feat: basic home page Twirre Meulenbelt 2025-10-08 15:03:44 +02:00
• 72d61e3985 chore: fixed wrong imports and deleted some unnecessary prints. Björn Otgaar 2025-10-08 14:35:20 +02:00
• 06096ce7d3 Merge branch 'chore/correct-branch-name' into 'dev' Twirre 2025-10-08 11:10:46 +00:00
• c515f32023 chore: fix branch naming regex pattern Twirre Meulenbelt 2025-10-08 13:07:47 +02:00
• ec4f45b984 fix: Keep the conencted robots in a global list Björn Otgaar 2025-10-08 12:40:01 +02:00
• 59a38a3a12 feat: Updated editor layout to make use of ReactFlow Panel Components JGerla 2025-10-08 12:10:22 +02:00
• 987b5efc3e Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface JGerla 2025-10-08 11:37:42 +02:00
• d5c7b4636d feat: added zustand package to dependencies JGerla 2025-10-08 11:35:41 +02:00
• 2182e1cdb3 feat: removed option to add a start or end node to the editor JGerla 2025-10-08 11:23:50 +02:00
• d6e78fc978 feat: repositioned Node sidebar to make use of the panel component provided by ReactFlow. JGerla 2025-10-08 11:14:04 +02:00
• 07e1d84a62 feat: Added allowDelete param to nodeToolbar JGerla 2025-10-08 10:27:34 +02:00
• 705ff3ff2b fix: changed edgetype to default JGerla 2025-10-08 09:34:44 +02:00
• f889fad732 Merge branch 'fix/readme-update-correct' into 'dev' 2584433 2025-10-07 14:38:32 +00:00
• a9f0a8dabd readme change 2584433 2025-10-07 14:38:31 +00:00
• b78cd53baa feat: Show connected robots in the UI when connection event is received from CB. Björn Otgaar 2025-10-07 15:05:05 +02:00
• 2678d35c82 Merge branch 'style/git-automatic-hooks' into 'dev' Kasper Marinus 2025-10-06 08:00:59 +00:00
• 42e4d10c80 style: added automatic hooks 2584433 2025-10-06 08:00:59 +00:00