Close #30 removed unnecessary code and comments. Also added my AI usa…

…ge form
ayanahye · Dec 5, 2023 · 5691210 · 5691210
1 parent 0d9ac4b
commit 5691210
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 31 deletions.
diff --git a/app/detail/[name]/__tests__/Detail.test.js b/app/detail/[name]/__tests__/Detail.test.js
@@ -1,7 +1,6 @@
 import {render, screen} from '@testing-library/react';
 import Page from "../page";
 
-
 global.fetch = jest.fn(() => {
         let tmp = {
             drought_tolerant: false,

diff --git a/app/display/page.jsx b/app/display/page.jsx
@@ -4,8 +4,6 @@ import Taxonomy_list from "../components/taxonomy_list";
 
 
 function Display() {
-
-
     return <Taxonomy_list family="Asteraceae"/>
 }
 

diff --git a/app/filtering/Filter.css b/app/filtering/Filter.css
@@ -30,12 +30,6 @@
 
 }
 
-/* .filterFullArea {
-    display: flex;
-    flex-direction: right;
-    align-items: left;
-    justify-content: right;
-} */
 .dropdown-item-custom {
     display: flex;
     justify-content: left;

diff --git a/app/filtering/__tests__/Filter.test.jsx b/app/filtering/__tests__/Filter.test.jsx
@@ -1,15 +1,11 @@
 import React from 'react';
-import {render, fireEvent, screen, queryByText, within} from '@testing-library/react';
+import {render, fireEvent, screen, within} from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect'; 
 import Filter from '../filter'; 
-
-import userEvent from '@testing-library/user-event';
-import Page from '../page';
 import {http, HttpResponse} from 'msw'
 import {setupServer} from "msw/node";
 import {perenual_detail_test_value} from "../../globalTypes";
 
-
 // integration test for filter page that it correctly integrates with netlify functions
 const server = setupServer(
     http.get('/.netlify/functions/filter', async ({request}) => {
@@ -24,12 +20,9 @@ afterAll(() => server.close())
 describe("filter page integrates with API", () => {
     test('Clicking dropdown option displays correct information', async () => {
       render(<Filter speciesList={perenual_detail_test_value} />);
-
-
-      const navigationFilterBox = screen.getByTestId('navigationfilterbox');
-
-      const checkBox = screen.getByTestId('checkbox-option1-common_name');
-      fireEvent.click(checkBox);
+
+        const checkBox = screen.getByTestId('checkbox-option1-common_name');
+        fireEvent.click(checkBox);
 
         const informationDiv = screen.getByTestId('scroll-object1');
 
@@ -211,7 +204,6 @@ describe("Options shows in display div", () => {
       // unit test
       it('will render "Current plant = No name yet" and filters are empty on render when speciesList is empty or null.', () => {
         render(<Filter />);
-
         const currentPlantName = screen.getByText(/Current plant = No name yet/i);
         expect(currentPlantName).toBeInTheDocument();
 

diff --git a/app/filtering/page.jsx b/app/filtering/page.jsx
@@ -1,10 +1,8 @@
 'use client'
 import { useEffect, useState } from "react";
-
 import React from 'react'
 import Filter from './filter';
 import "./Filter.css";
-import Data from '../SampleData.json'
 
 function Filtering(props) {
 

diff --git a/app/identify/connection.ts b/app/identify/connection.ts
@@ -1,6 +1,6 @@
 "use server"
 
-import {plantnet, plantnet_test_value} from "@/app/globalTypes";
+import {plantnet} from "@/app/globalTypes";
 
 export async function postData(form: FormData): Promise<plantnet> {
     //see .env file in root folder

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -8,10 +8,8 @@ import Image from "next/image";
 import Link from 'next/link';
 import {useRouter} from 'next/navigation';
 
-
 const inter = Inter({subsets: ['latin']})
 
-
 export default function RootLayout({children,}: {
     children: React.ReactNode
 }) {
@@ -25,7 +23,6 @@ export default function RootLayout({children,}: {
     //This is the layout, the master of the page, which appears as the outer border on each page.
     //bootstrap has been referenced globally, do not import it again.
 
-    //do not delete this bootstrap js plz!!!!!
     return (
         <html lang="en">
         <Script src='/bootstrap/bootstrap.bundle.min.js'></Script>

diff --git a/app/not-found.tsx b/app/not-found.tsx
@@ -13,7 +13,7 @@ export default function NotFound() {
                 <div className="text">
                     <h1 className="error">404 - Plant Not Found</h1>
 
-                    <p>This is most likely due to our API not returning any reults. This flower does not exist in our APIs database. Please try another search or another image. We apologize for the inconvenience this may have caused.</p>
+                    <p id="body-text">This is most likely due to our API not returning any reults. This flower does not exist in our APIs database. Please try another search or another image. We apologize for the inconvenience this may have caused.</p>
 
                 </div>
                 <button id="bigger" type="button" className="btn btn-success"><Link className="link" href="/">Return Home</Link></button>

diff --git a/app/notfound.css b/app/notfound.css
@@ -37,7 +37,7 @@
   }
 
   .error {
-    font-size: 5em; 
+    font-size: 50px; 
     color: green;
   }
 
@@ -47,8 +47,12 @@
   }
 
   #bigger {
-    font-size: 30px;
+    font-size: 20px;
     margin-top: 20px;
     margin-bottom: 20px;
   }
+
+  #body-text {
+    font-size: 20px;
+  }
 
diff --git a/app/search/connection.ts b/app/search/connection.ts
@@ -1,5 +1,4 @@
 "use server"
-
 import {perenual_search} from "@/app/globalTypes";
 
 // :something is used for define data type, ignore them if you don't understand

diff --git a/...I_Declaration_Ayana_Hussain_301543837.pdf → ...I_Declaration_Ayana_Hussain_301543837.pdf b/...I_Declaration_Ayana_Hussain_301543837.pdf → ...I_Declaration_Ayana_Hussain_301543837.pdf
diff --git a/public/AI_disclosures/P2_AI_Declaration_Ayana_Hussain_301543837.pdf b/public/AI_disclosures/P2_AI_Declaration_Ayana_Hussain_301543837.pdf
diff --git a/...tone_AI_Declaration_Du_Wang_301461825.pdf → ...tone_AI_Declaration_Du_Wang_301461825.pdf b/...tone_AI_Declaration_Du_Wang_301461825.pdf → ...tone_AI_Declaration_Du_Wang_301461825.pdf
diff --git a/..._AI_Declaration_Haoran_Miao_301542189.pdf → ..._AI_Declaration_Haoran_Miao_301542189.pdf b/..._AI_Declaration_Haoran_Miao_301542189.pdf → ..._AI_Declaration_Haoran_Miao_301542189.pdf
diff --git a/...eclaration_Layan_Barrieshee_301544289.pdf → ...eclaration_Layan_Barrieshee_301544289.pdf b/...eclaration_Layan_Barrieshee_301544289.pdf → ...eclaration_Layan_Barrieshee_301544289.pdf
diff --git a/public/images/bg1.jpg b/public/images/bg1.jpg
diff --git a/public/images/bg1.webp b/public/images/bg1.webp
diff --git a/public/images/bg2.png b/public/images/bg2.png
diff --git a/public/images/bg2.webp b/public/images/bg2.webp
diff --git a/public/images/bg3.png b/public/images/bg3.png
diff --git a/public/images/bg3.webp b/public/images/bg3.webp
diff --git a/public/images/bg4.png b/public/images/bg4.png
diff --git a/public/images/bg4.webp b/public/images/bg4.webp
diff --git a/public/images/bg5.png b/public/images/bg5.png
diff --git a/public/images/bg5.webp b/public/images/bg5.webp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,8 +4,6 @@ import Taxonomy_list from "../components/taxonomy_list";


		function Display() {


		return <Taxonomy_list family="Asteraceae"/>
		}

Expand Down