Merge pull request #5 from ktkimura/testing

UI touchups
ktkimura · Aug 16, 2024 · 770f3fa · 770f3fa
2 parents 35d3698 + 4ee68ad
commit 770f3fa
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/lets-get-cooking/backend/microD/commPipeD.json b/lets-get-cooking/backend/microD/commPipeD.json
@@ -1,5 +1,17 @@
 {
-  "expiredIngredients": [
+  "ingredients": [
+    {
+      "id": "24fa6dab-cc55-4e4f-b3b4-be662d0727e9",
+      "name": "miso",
+      "quantity": "1",
+      "expirationDate": "2024-08-28"
+    },
+    {
+      "id": "92529cbd-23d4-4aa1-90e9-ad22e1a5931f",
+      "name": "sesame oil",
+      "quantity": "12 oz",
+      "expirationDate": "2024-08-20"
+    },
     {
       "id": "d4cbe501-4a80-47e7-96fc-78013173e349",
       "name": "mirin",

diff --git a/lets-get-cooking/frontend/src/App.css b/lets-get-cooking/frontend/src/App.css
@@ -1,3 +1,8 @@
+:root{
+  --gray:#bdbdbd;
+  --lightGray: #dfdfdf;
+}
+
 textArea {
   width: 300px;
   height: 50px;
@@ -13,27 +18,32 @@ article {
 }
 
 table, th, td {
+  text-align: left;
   border: 1px solid;
   border-collapse: collapse;
   margin-top: 30px; 
   margin-bottom: 30px;
+  padding: 5px;
 }
 
 th {
   padding: 5px;
-  background-color: lightgray;
+  background-color: var(--gray);
 }
 
 td {
   padding: 5px;
 }
 
-
 /* make Link elements appear as buttons */
 a.btn, button {
     text-decoration: none;
+    color:black;
+    font-size: 15px;
+    background-color:var(--lightGray);
+    position: relative;
     margin: 5px;
-    padding: 3px;
+    padding: 5px;
     border: 1px solid #333333;
     border-radius: 8px;
   }

diff --git a/lets-get-cooking/frontend/src/App.js b/lets-get-cooking/frontend/src/App.js
@@ -25,8 +25,8 @@ function App() {
       <BrowserRouter>
         <header>
             <h1>Let's Get Cooking!</h1>
+            <Navigation />
         </header>
-        <Navigation />
         <main>
           <section>
             <Routes>