Skip to content

Occupant Safety UI Messages #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 42 commits into
base: main
Choose a base branch
from
Open

Occupant Safety UI Messages #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2d30312
DestinationMenu added
munizsaj Mar 24, 2022
b0609e2
Listening Box 'wake word'
munizsaj Mar 24, 2022
a46129b
Changed Destination Event
munizsaj Mar 24, 2022
876c924
Map fix
munizsaj Mar 25, 2022
11c26a6
Added 'resume' event
munizsaj Mar 25, 2022
a461115
newImage functional
munizsaj Apr 3, 2022
fd9c2e4
Changing Destination Buttons and GPS
munizsaj Apr 3, 2022
2d94fb4
Changed newMap to smaller size
munizsaj Apr 3, 2022
b3325b2
Setting up GPSUtils
munizsaj Apr 7, 2022
15c3ede
Added new satellite map
munizsaj Apr 7, 2022
edb1015
Fixed location of destinations
munizsaj Apr 7, 2022
1fd9e17
Secret
munizsaj Apr 7, 2022
80e5c4d
Fixed Cart Icon to follow GPS
JMUJacart Apr 9, 2022
021adca
Removed App.css import
munizsaj Apr 9, 2022
e0c9d72
Added zoom buttons and moved Destinations button
munizsaj Apr 9, 2022
93631f4
Changed the display of destination buttons to use the Name property i…
munizsaj Apr 14, 2022
6bdab85
Changed UI to display name property of destinations. Fixed socket err…
JMUJacart Apr 17, 2022
bef1dcd
Destination confirmation and 'driving to ...' now displays full desti…
munizsaj Apr 19, 2022
fc976a7
Merge branch 'alejandro' of https://github.com/JACart/cart-ui-offline…
munizsaj Apr 19, 2022
de24d13
Path is now displayed, still incorrect position
JMUJacart Apr 21, 2022
08957bf
Merge branch 'alejandro' of github.com:JACart/cart-ui-offline into al…
JMUJacart Apr 21, 2022
f870fb6
Adding s22 changes -nrs
JMUJacart Jun 27, 2022
5c4a74f
added osm map
JMUJacart Jul 28, 2022
fbac556
updated gps utils
JMUJacart Jul 28, 2022
db1c7e8
Fixed GPSUtils for SmallLaptop. Destinations now fit on large map.
spragunr Sep 23, 2022
bee06f0
Grabs fullMap socket. Destinations displayed depending on fullMap.
munizsaj Sep 27, 2022
f43ae78
Map now changes with fullMap argument
munizsaj Sep 27, 2022
728cbd1
Added fullMap functionality to DesinationsMenuItem
munizsaj Sep 28, 2022
b56b223
Grabs fullMap socket. Destinations displayed depending on fullMap.
munizsaj Sep 27, 2022
bea0f10
Map now changes with fullMap argument
munizsaj Sep 27, 2022
07bf477
Added fullMap functionality to DesinationsMenuItem
munizsaj Sep 28, 2022
fd0c606
GPSUtils has fullMap functionality
spragunr Sep 28, 2022
51d0964
Merge branch 'devSize' of github.com:JACart/cart-ui-offline into devSize
spragunr Sep 28, 2022
6eb9b1a
Setting up preferences by tag
munizsaj Oct 9, 2022
04b1f61
Fixed bug. Preferences now changes when mapinteraction is made.
munizsaj Oct 9, 2022
c3083e8
Connected passenger.py with ui message
Feb 25, 2023
795a1cb
Started code to prohibit destination selection with 0 occupants. Curr…
Mar 21, 2023
7a4c20c
Added pop up message if destination is selected with no occupants in …
Mar 27, 2023
017463a
Cart now stops if passenger exits vehicle. Message box only shows up …
Mar 28, 2023
8234900
Removed old code. Added new emergency pull over system.
Apr 4, 2023
9ca6ada
updated App.jsx
Apr 17, 2023
96e8290
Changed name pose-oob to unsafe-pose. Commented out speed buttons.
Apr 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
src/images/newsat.jpg
33,780 changes: 16,443 additions & 17,337 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-icons": "^4.2.0",
"react-offline-map": "^0.3.0",
"react-scripts": "4.0.3",
"react-inlinesvg": "^3.0.0",
"react-map-interaction": "^2.1.0",
"react-offline-map": "^0.1.5",
"react-scripts": "^5.0.0",
"react-svg-pathline": "^0.5.0",
"socket.io-client": "^2.3.0",
"web-vitals": "^1.0.1"
"web-vitals": "^1.0.1",
"webpack": "^5.72.0"
},
"scripts": {
"start": "react-scripts start",
Expand Down
Binary file added public/favicon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand All @@ -25,6 +25,7 @@
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>

</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
0 public/favicon.ico → public/reactfavicon.ico
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.btnStyle {
width: 70px;
padding: 10px;
margin-bottom: 10px;
background-color: rgb(25, 25, 44);
font-size: xx-large;
}
Loading