Commit Graph

Select branches

Hide Pull Requests

FocusCam

camera-websocket-demo

emergency-stop-and-CSS-fixes

flight-indicators

initial-commit

leaflet-map-component

main

minjijeongbranch

navbar

routers

tauri-conf-fix

vehicle-status

vue-documentation

websocket

websocket-test-component

#11

#13

#14

#3

#4

#7

#8

#9

Mono Color

• b9aef7ff1c added flight components to CamFocus to temporary position emergency-stop-and-CSS-fixes chillwafflez 2024-04-14 06:07:06 -0700
• 215671271b Merge branch 'flight-indicators' into emergency-stop-and-CSS-fixes Merging to get flight-indicator components chillwafflez 2024-04-14 05:38:14 -0700
• 03babd3db4 Merge branch 'main' of https://github.com/Northrop-Grumman-Collaboration-Project/gcs-user-interface into flight-indicators flight-indicators chillwafflez 2024-04-14 05:28:57 -0700
• b199c227da added method in Stop Modal when user clicks yes chillwafflez 2024-04-14 05:25:14 -0700
• 95e667a3cc added way for VehicleTitle component to display vehicle icon based on vehicle name prop chillwafflez 2024-04-14 04:06:55 -0700
• d0020a7ce6 ERU widget updates with data from mockWebsock. added option to have MEA widget display data from test-websocket-server to show faster component rendering if needed camera-websocket-demo chillwafflez 2024-04-13 05:29:07 -0700
• e41c1c6fad changed other local WS server to match Steven's way. this server sends data only to ERU status in StaticScreen chillwafflez 2024-04-13 04:37:01 -0700
• 6eb1c61197 merge DEMO WS Steven C 2024-04-13 02:18:45 -0700
• 7d3eddaa69 merged demo WS Steven C 2024-04-13 02:12:57 -0700
• c3f17823cb merge demo WS Steven C 2024-04-12 23:59:44 -0700
• 84d0dd35d9 mockWS websocket Steven C 2024-04-12 23:53:19 -0700
• 75c029f6ac initial commit: added local express websocket server to send dummy battery values to UI every second for battery component to display chillwafflez 2024-04-12 22:39:45 -0700
• cc9c0db9bc added preliminary emergency stop modal that pops up if user clicks on emergency stop button chillwafflez 2024-04-12 04:26:20 -0700
• 9d47cf4a06
  Merge pull request #14 from Northrop-Grumman-Collaboration-Project/vehicle-status main Justin Nguyen 2024-04-04 01:05:10 -0700
• 4bb10cecc4 put VehicleStatus component onto Static/Map screen. Readjusted CSS of components within the VehicleStatusComponent vehicle-status chillwafflez 2024-04-02 23:08:42 -0700
• e010b32e90 Merge branch 'vehicle-status' chillwafflez 2024-04-02 20:45:35 -0700
• 4bef4e69cd added labels for each flight indicator component chillwafflez 2024-03-31 22:39:53 -0700
• ddf806ec35 changed main.ts back to normal chillwafflez 2024-03-31 00:46:29 -0700
• d8146584d6 added text for Connection section of vehicle status. changed viewpoint height of testMapScreen chillwafflez 2024-03-31 00:40:23 -0700
• 164f1cb5ad
  Merge pull request #13 from Northrop-Grumman-Collaboration-Project/FocusCam Steven C 2024-03-31 00:15:29 -0700
• 3f64b430d1 Merge branch 'main' into FocusCam FocusCam Steven C 2024-03-30 23:24:01 -0700
• a05e663836 merge conflict Steven C 2024-03-30 23:21:44 -0700
• bbdf19bcb0 static screen setup Steven C 2024-03-30 23:13:00 -0700
• 014b5be490
  Merge pull request #11 from Northrop-Grumman-Collaboration-Project/routers Justin Nguyen 2024-03-30 22:43:32 -0700
• 4298176dab readjust sizes of components in vehicle status component chillwafflez 2024-03-30 22:36:31 -0700
• 3ba58ef165 Generalize components for reusablilty: FocusCam, FourCam Steven C 2024-03-30 22:24:23 -0700
• 0b3d94c853 Merge branch 'routers' of https://github.com/Northrop-Grumman-Collaboration-Project/gcs-user-interface into routers chillwafflez 2024-03-23 01:26:14 -0700
• 0dfac9a2e6 added flight components from vue-flight-indicators library to test chillwafflez 2024-03-23 01:22:41 -0700
• 1cf724e933 added Coordinate component to display coordinate in Vehicle Status component chillwafflez 2024-03-23 00:38:44 -0700
• 294ffead44 added Open button for Vehicle Status widget. Adjusted sizing of other components in Status widget Justin Nguyen 2024-03-19 01:43:54 -0700
• 1256b7a9c6 Adding emergency stop button component minjijeongbranch Minji 2024-03-18 02:03:51 -0700
• 2d8f27cf7a created initial layout for vehicle status component. contains name, status, battery, and connection. created a test basic map layout to display vehicle status components chillwafflez 2024-03-15 23:01:50 -0700
• b644c718f0 created initial vehicle status component chillwafflez 2024-03-15 18:42:11 -0700
• 6ce48a6923 Added test camServer.py routers Steven C 2024-03-15 12:46:14 -0700
• 97664a1790 localhost cam ip Steven C 2024-03-08 13:19:02 -0800
• ce0bcf2117
  Merge pull request #7 from Northrop-Grumman-Collaboration-Project/vue-documentation Priyatham Sai Chand 2024-03-08 12:50:14 -0800
• f72f64bab8
  Merge branch 'main' into vue-documentation vue-documentation Priyatham Sai Chand 2024-03-08 12:49:59 -0800
• e16e44af2f Removed Icon Steven C 2024-03-08 12:46:18 -0800
• 89f0b729c7 Removed Icon Steven C 2024-03-08 12:41:45 -0800
• 850623e02d Merge branch 'routers' of https://github.com/Northrop-Grumman-Collaboration-Project/gcs-user-interface into routers chillwafflez 2024-03-08 01:04:57 -0800
• cc9e8a1e96 put battery and connection component in same div as camera component chillwafflez 2024-03-08 01:02:53 -0800
• 31af224028 fixed issue #10 Steven C 2024-03-06 21:59:18 -0800
• 138119ed0a put Battery and Connection components onto 4Cam screen. May need to adjust Battery and Connection sizing if interfering with elements in Camera div chillwafflez 2024-03-06 00:16:47 -0800
• 3b8e866e74 fixed latency ranges for connection component chillwafflez 2024-03-05 12:53:41 -0800
• 9ed4c32061 Merge branch 'routers' of https://github.com/Northrop-Grumman-Collaboration-Project/gcs-user-interface into routers chillwafflez 2024-03-05 01:32:44 -0800
• 5c7e9d23bd Added Connection component, moved Battery and Connection to VehicleStatus folder chillwafflez 2024-03-05 01:32:15 -0800
• a61b1d7536
  Merge pull request #9 from Northrop-Grumman-Collaboration-Project/routers Priyatham Sai Chand 2024-03-04 11:34:35 -0800
• 8dd23ed0d6 package change Priyatham-sai-chand 2024-03-01 12:25:02 -0800
• 85dd727ce4 main package change Priyatham-sai-chand 2024-03-01 12:24:38 -0800
• 14f35907e2 Added Battery icon component for vehicles chillwafflez 2024-03-03 19:33:37 -0800
• 7875f44982
  Merge pull request #8 from Northrop-Grumman-Collaboration-Project/navbar Steven C 2024-03-03 00:52:20 -0800
• 3034820bce polish camera views Steven C 2024-03-03 00:43:12 -0800
• fb19c5b218 Selective Camera Setup Steven C 2024-03-03 00:12:50 -0800
• 4db224bc11 router setup Steven C 2024-03-01 03:27:33 -0800
• 261f682b78 wip navbar Steven C 2024-03-01 02:32:29 -0800
• 213bad05e9 add map component leaflet-map-component Leaversa 2024-02-27 23:38:48 -0800
• 26d1a74cc0 add vue-leaflet and leaflet Leaversa 2024-02-27 23:07:30 -0800
• 293e8f1735 change styling so page fills screen Leaversa 2024-02-27 23:02:20 -0800
• 6d7c5434d4 4cam layout WIP Steven C 2024-02-23 03:42:11 -0800
• 6a1b092e8b
  add new folders in assets Priyatham-sai-chand 2024-02-16 12:18:08 -0800
• 0622d77e69 change port for styleguide remove appbutton Priyatham-sai-chand 2024-02-14 14:53:27 -0800
• 81f6ccc990 change package for vue Priyatham-sai-chand 2024-02-09 15:49:22 -0800
• ef46fa914b change package for vue Priyatham-sai-chand 2024-02-09 15:49:01 -0800
• bf90c647c2 wip Steven C 2024-02-09 13:37:57 -0800
• ba94f0a568 init navbar layout Steven C 2024-02-09 13:32:06 -0800
• 7942fbe4bf tauri conf changes Priyatham-sai-chand 2024-02-09 12:29:26 -0800
• a1290bd5e5 fix gitignore and env websocket-test-component Leaversa 2023-11-03 16:11:49 -0700
• 1374141cd9 websocket send and receive component with env Leaversa 2023-11-03 16:08:28 -0700
• 3d94a02a8b
  Merge pull request #4 from Northrop-Grumman-Collaboration-Project/tauri-conf-fix Khoi 2023-09-15 13:19:33 -0700
• 10df5f0817
  tauri port number fix tauri-conf-fix Leaversa 2023-09-15 13:14:39 -0700
• d41477b181
  Merge pull request #3 from Northrop-Grumman-Collaboration-Project/initial-commit Khoi 2023-07-11 09:32:05 -0700
• 8da06ff562 Merge remote-tracking branch 'origin/main' into initial-commit initial-commit marked01one 2023-07-11 09:30:45 -0700
• 6fbd5a88a3 Initial commit marked01one 2023-07-11 09:15:53 -0700
• 11ef74aaf4
  Initial commit Khoi 2023-07-06 17:32:07 -0700