From f8b2a11bcee51755950fe820a9e112810843dc6f Mon Sep 17 00:00:00 2001 From: atharva-kashyap Date: Wed, 5 Jul 2023 12:31:43 -0700 Subject: [PATCH 1/4] added new icons --- .../DummyRealSense.py | 0 .../FaceDetection.py | 0 .../feeding_web_app_ros2_test/publisher.py | 0 .../reverse_string_service.py | 0 .../feeding_web_app_ros2_test/subscriber.py | 0 .../public/other_emoji_imgs/cheers.svg | 1 + .../public/other_emoji_imgs/done.svg | 1 + .../public/other_emoji_imgs/doneEating.svg | 1 + .../public/other_emoji_imgs/downArrow.svg | 1 + .../public/other_emoji_imgs/leftArrow.svg | 1 + .../public/other_emoji_imgs/notPluggedIn.svg | 1 + .../public/other_emoji_imgs/plateLocator.svg | 1 + .../public/other_emoji_imgs/pluggedIn.svg | 1 + .../public/other_emoji_imgs/rightArrow.svg | 1 + .../public/other_emoji_imgs/upArrow.svg | 1 + .../public/other_emoji_imgs/wave.svg | 1 + .../public/other_emoji_imgs/yummy.svg | 1 + feedingwebapp/src/Pages/Header/Header.jsx | 48 ++++++++++++++++--- .../Pages/Home/MealStates/BiteSelection.jsx | 4 +- .../Pages/Home/MealStates/PlateLocator.jsx | 32 ++++++++++--- .../src/Pages/Home/MealStates/PostMeal.jsx | 2 +- .../src/Pages/Home/MealStates/PreMeal.jsx | 6 ++- 22 files changed, 87 insertions(+), 17 deletions(-) mode change 100755 => 100644 feeding_web_app_ros2_test/feeding_web_app_ros2_test/DummyRealSense.py mode change 100755 => 100644 feeding_web_app_ros2_test/feeding_web_app_ros2_test/FaceDetection.py mode change 100755 => 100644 feeding_web_app_ros2_test/feeding_web_app_ros2_test/publisher.py mode change 100755 => 100644 feeding_web_app_ros2_test/feeding_web_app_ros2_test/reverse_string_service.py mode change 100755 => 100644 feeding_web_app_ros2_test/feeding_web_app_ros2_test/subscriber.py create mode 100644 feedingwebapp/public/other_emoji_imgs/cheers.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/done.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/doneEating.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/downArrow.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/leftArrow.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/notPluggedIn.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/plateLocator.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/pluggedIn.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/rightArrow.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/upArrow.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/wave.svg create mode 100644 feedingwebapp/public/other_emoji_imgs/yummy.svg diff --git a/feeding_web_app_ros2_test/feeding_web_app_ros2_test/DummyRealSense.py b/feeding_web_app_ros2_test/feeding_web_app_ros2_test/DummyRealSense.py old mode 100755 new mode 100644 diff --git a/feeding_web_app_ros2_test/feeding_web_app_ros2_test/FaceDetection.py b/feeding_web_app_ros2_test/feeding_web_app_ros2_test/FaceDetection.py old mode 100755 new mode 100644 diff --git a/feeding_web_app_ros2_test/feeding_web_app_ros2_test/publisher.py b/feeding_web_app_ros2_test/feeding_web_app_ros2_test/publisher.py old mode 100755 new mode 100644 diff --git a/feeding_web_app_ros2_test/feeding_web_app_ros2_test/reverse_string_service.py b/feeding_web_app_ros2_test/feeding_web_app_ros2_test/reverse_string_service.py old mode 100755 new mode 100644 diff --git a/feeding_web_app_ros2_test/feeding_web_app_ros2_test/subscriber.py b/feeding_web_app_ros2_test/feeding_web_app_ros2_test/subscriber.py old mode 100755 new mode 100644 diff --git a/feedingwebapp/public/other_emoji_imgs/cheers.svg b/feedingwebapp/public/other_emoji_imgs/cheers.svg new file mode 100644 index 00000000..453d6bc6 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/cheers.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/done.svg b/feedingwebapp/public/other_emoji_imgs/done.svg new file mode 100644 index 00000000..32725aca --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/done.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/doneEating.svg b/feedingwebapp/public/other_emoji_imgs/doneEating.svg new file mode 100644 index 00000000..8217d0a1 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/doneEating.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/downArrow.svg b/feedingwebapp/public/other_emoji_imgs/downArrow.svg new file mode 100644 index 00000000..450395bb --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/downArrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/leftArrow.svg b/feedingwebapp/public/other_emoji_imgs/leftArrow.svg new file mode 100644 index 00000000..6976ce1e --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/leftArrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/notPluggedIn.svg b/feedingwebapp/public/other_emoji_imgs/notPluggedIn.svg new file mode 100644 index 00000000..05d1442e --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/notPluggedIn.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/plateLocator.svg b/feedingwebapp/public/other_emoji_imgs/plateLocator.svg new file mode 100644 index 00000000..ad54e4f2 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/plateLocator.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/pluggedIn.svg b/feedingwebapp/public/other_emoji_imgs/pluggedIn.svg new file mode 100644 index 00000000..6b1d0b98 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/pluggedIn.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/rightArrow.svg b/feedingwebapp/public/other_emoji_imgs/rightArrow.svg new file mode 100644 index 00000000..051ccdb1 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/rightArrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/upArrow.svg b/feedingwebapp/public/other_emoji_imgs/upArrow.svg new file mode 100644 index 00000000..f1c11620 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/upArrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/wave.svg b/feedingwebapp/public/other_emoji_imgs/wave.svg new file mode 100644 index 00000000..7267fc47 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/wave.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/public/other_emoji_imgs/yummy.svg b/feedingwebapp/public/other_emoji_imgs/yummy.svg new file mode 100644 index 00000000..9c373643 --- /dev/null +++ b/feedingwebapp/public/other_emoji_imgs/yummy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/feedingwebapp/src/Pages/Header/Header.jsx b/feedingwebapp/src/Pages/Header/Header.jsx index 813aee71..12dd34ec 100644 --- a/feedingwebapp/src/Pages/Header/Header.jsx +++ b/feedingwebapp/src/Pages/Header/Header.jsx @@ -127,15 +127,49 @@ const Header = (props) => { )} {isConnected ? (
-

- πŸ”Œ -

-
+ + ) : (
-

- β›” -

+
)}