Merge pull request #271 from COS301-SE-2024/feature/fix-ui-on-page-seo

Feature/fix UI on page seo
COS301-SE-2024 · Jul 31, 2024 · d9172a1 · d9172a1
2 parents 4a4d52a + df2c371
commit d9172a1
Show file tree

Hide file tree

Showing 15 changed files with 399 additions and 208 deletions.
diff --git a/wee/frontend/public/android-chrome-192x192.png b/wee/frontend/public/android-chrome-192x192.png
diff --git a/wee/frontend/public/android-chrome-512x512.png b/wee/frontend/public/android-chrome-512x512.png
diff --git a/wee/frontend/public/apple-touch-icon.png b/wee/frontend/public/apple-touch-icon.png
diff --git a/wee/frontend/public/favicon-16x16.png b/wee/frontend/public/favicon-16x16.png
diff --git a/wee/frontend/public/favicon-32x32.png b/wee/frontend/public/favicon-32x32.png
diff --git a/wee/frontend/public/favicon.ico b/wee/frontend/public/favicon.ico
diff --git a/wee/frontend/public/site.webmanifest b/wee/frontend/public/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
diff --git a/wee/frontend/src/app/(landing)/layout.tsx b/wee/frontend/src/app/(landing)/layout.tsx
@@ -7,9 +7,14 @@ import type { Metadata } from 'next'
 export const metadata: Metadata = {
   title: "Web Exploration Engine",
   icons: {
-    icon: "favicon.ico",
-  },
-}
+    icon: [
+      { rel: "apple-touch-icon", sizes: "180x180", url: "/apple-touch-icon.png" },
+      { rel: "icon", type: "image/png", sizes: "32x32", url: "/favicon-32x32.png" },
+      { rel: "icon", type: "image/png", sizes: "16x16", url: "/favicon-16x16.png" },
+      { rel: "manifest", url: "/site.webmanifest" }
+    ]
+  }
+};
 
 export default function RootLayout({
     children,

diff --git a/wee/frontend/src/app/(pages)/layout.tsx b/wee/frontend/src/app/(pages)/layout.tsx
@@ -8,9 +8,14 @@ import type { Metadata } from 'next'
 export const metadata: Metadata = {
   title: "Web Exploration Engine",
   icons: {
-    icon: "favicon.ico",
-  },
-}
+    icon: [
+      { rel: "apple-touch-icon", sizes: "180x180", url: "/apple-touch-icon.png" },
+      { rel: "icon", type: "image/png", sizes: "32x32", url: "/favicon-32x32.png" },
+      { rel: "icon", type: "image/png", sizes: "16x16", url: "/favicon-16x16.png" },
+      { rel: "manifest", url: "/site.webmanifest" }
+    ]
+  }
+};
 
 export default function RootLayout({
     children,

diff --git a/wee/frontend/src/app/(pages)/page.tsx b/wee/frontend/src/app/(pages)/page.tsx
@@ -112,7 +112,7 @@ export default function Home() {
           <p className="mt-4 p-2 min-h-[3.5rem]"></p>
         )}
 
-        <div className="bg-zinc-200 dark:bg-zinc-700 w-full md:w-5/6 p-4 rounded-xl">
+        {/* <div className="bg-zinc-200 dark:bg-zinc-700 w-full md:w-5/6 p-4 rounded-xl">
           <h3 className="font-poppins-semibold text-lg text-jungleGreen-700 dark:text-jungleGreen-100 mb-4">
             Scraping criteria
           </h3>
@@ -146,7 +146,7 @@ export default function Home() {
               Website status
             </Checkbox>
           </div>
-        </div>
+        </div> */}
       </div>
     );
 }
diff --git a/wee/frontend/src/app/(pages)/results/page.tsx b/wee/frontend/src/app/(pages)/results/page.tsx
diff --git a/wee/frontend/src/app/(pages)/savedreports/page.tsx b/wee/frontend/src/app/(pages)/savedreports/page.tsx
@@ -14,6 +14,7 @@ import WEETable from '../../components/Util/Table';
 import { getReports } from '../../services/SaveReportService';
 import { useUserContext } from '../../context/UserContext';
 import { deleteReport } from "../../services/SaveReportService";
+import WEETabs from "../../components/Util/Tabs";
 
 
 function ResultsComponent() {
@@ -121,7 +122,7 @@ function ResultsComponent() {
           </h1>
         </div>
         <div className="flex flex-col">
-          <Tabs aria-label="Options" size="lg">
+          <WEETabs aria-label="Options" size="lg">
             <Tab key="individual" title="Reports">
               <Card>
                 <CardBody>
@@ -331,7 +332,7 @@ function ResultsComponent() {
                 </CardBody>
               </Card>  
             </Tab>
-          </Tabs>
+          </WEETabs>
         </div>  
       </div>
 

diff --git a/wee/frontend/src/app/components/Util/Tabs.tsx b/wee/frontend/src/app/components/Util/Tabs.tsx
@@ -9,11 +9,26 @@ const WEETabs = extendVariants(Tabs, {
 							// dark
 							"dark:bg-jungleGreen-400",
 						],
+						tabContent: [
+              "group-data-[selected=true]:text-dark-primaryTextColor",
+              "group-data-[selected=true]:font-medium",
+              // dark
+              "dark:group-data-[selected=true]:dark:text-primaryTextColor",
+              "dark:group-data-[selected=true]:font-medium"
+						],
+            base: [
+              "flex"
+            ],
+            tabList: [
+              "flex-wrap",
+              "sm:flex-nowrap"
+            ]
 				}
 			}
     },
 		defaultVariants: {
-			color: "stone"
+			color: "stone",
+      size: 'lg'
 		}
 })
 

diff --git a/wee/package-lock.json b/wee/package-lock.json
diff --git a/wee/package.json b/wee/package.json
@@ -26,6 +26,7 @@
     "@nextui-org/navbar": "^2.0.31",
     "@nextui-org/pagination": "^2.0.32",
     "@nextui-org/react": "^2.4.0",
+    "@nextui-org/scroll-shadow": "^2.1.19",
     "@nextui-org/system": "^2.2.0",
     "@nextui-org/table": "^2.0.34",
     "@nextui-org/theme": "^2.2.4",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}