Merge remote-tracking branch 'origin/main'

ayanahye · Nov 24, 2023 · d1383d3 · d1383d3
2 parents 28b7a07 + ed1c44d
commit d1383d3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/app/filtering/Filter.css b/app/filtering/Filter.css
@@ -5,6 +5,7 @@
     flex-grow: 1;
     max-height: 100vh;
     background-color: white;
+    margin-top: 20px;
 }
 
 .filterPart {

diff --git a/app/filtering/filter.jsx b/app/filtering/filter.jsx
@@ -129,7 +129,7 @@ export default function Filter(props) {
 
     return (
         <main className="main-filter">
-            <h3 style={{paddingBottom: '10px'}}>{props.speciesList.common_name || "No name yet"}</h3>
+            <h3 style={{paddingBottom: '10px'}}>{props.speciesList.common_name || "No Plant Selected"}</h3>
 
             <div class="container">
 

diff --git a/app/filtering/page.jsx b/app/filtering/page.jsx
@@ -56,7 +56,7 @@ import Data from '../SampleData.json'
 function Filtering(props) {
 
   const plantId = props.id;
-  const [speciesData, setSpeciesData] = useState(Data);
+  const [speciesData, setSpeciesData] = useState(null);
 
 
   useEffect(() => {

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -52,10 +52,6 @@ export default function RootLayout({children,}: {
                         <li className="nav-item mx-xl-2 mb-2 mb-xl-0">
                             <Link className="nav-link text-center" aria-current="page" href="/identify">Identify</Link>
                         </li>
-                        <li className="nav-item mx-xl-2 mb-2 mb-xl-0">
-                            <Link className="nav-link text-center" aria-current="page" href="/filtering">Filter
-                                temp</Link>
-                        </li>
                     </ul>
                     <form className="d-flex" role="search" action={searchSubmit}>
                         <input className="form-control me-2" type="search" placeholder="Search"