diff --git a/Found-It b/Found-It new file mode 160000 index 0000000..e5106d9 --- /dev/null +++ b/Found-It @@ -0,0 +1 @@ +Subproject commit e5106d9a92fed0b3eee29384abaef70d89dc809e diff --git a/components/Card.tsx b/components/Card.tsx index 11611ed..425b28b 100644 --- a/components/Card.tsx +++ b/components/Card.tsx @@ -4,20 +4,24 @@ interface CardProps { title: string; location: string; time: string; + image: string; + locationLabel?: string; // New optional prop for location label } -const Card: React.FC = ({ title, location, time }) => { +const Card: React.FC = ({ title, location, time, image, locationLabel = "Found at" }) => { return ( -
- {title} +
+ {title}
{title}
-

Found at: {location}

+

{locationLabel}: {location}

{/* Customizable label */}

Time: {time}

); diff --git a/components/LoginForm.tsx b/components/LoginForm.tsx new file mode 100644 index 0000000..2f8810b --- /dev/null +++ b/components/LoginForm.tsx @@ -0,0 +1,63 @@ +import React from 'react'; + +const LoginForm: React.FC<{ onClose: () => void }> = ({ onClose }) => { + return ( +
+ +
+ +
+
+

Login

+ +
+ +
+ + + + + + +
+ + + Forgot password? + +
+
+
+
+ ); +}; + +export default LoginForm; diff --git a/components/found.tsx b/components/found.tsx index 97ede22..87826a7 100644 --- a/components/found.tsx +++ b/components/found.tsx @@ -7,7 +7,7 @@ import AddItemButton from './Addbutton'; import AddItemForm from './AddItemForm'; const Found: React.FC = () => { - const [isModalOpen, setIsModalOpen] = useState(false); // Initialize the modal state + const [isModalOpen, setIsModalOpen] = useState(false); // Scroll handler function to scroll horizontally with mouse wheel const handleScroll = (event: React.WheelEvent) => { @@ -46,16 +46,42 @@ const Found: React.FC = () => {

Items

-
- {[...Array(10)].map((_, index) => ( -
- -
- ))} +
+ + + + +
diff --git a/components/landing.tsx b/components/landing.tsx index bea2ef1..02306ba 100644 --- a/components/landing.tsx +++ b/components/landing.tsx @@ -1,19 +1,31 @@ 'use client'; -import React from 'react'; +import React, { useState } from 'react'; import { useRouter } from 'next/navigation'; const LandingPage: React.FC = () => { const router = useRouter(); + const [isLoginModalOpen, setLoginModalOpen] = useState(false); const handleLoginClick = () => { - router.push('/home'); + setLoginModalOpen(true); + }; + + const closeLoginModal = () => { + setLoginModalOpen(false); + }; + + const handleLoginSubmit = () => { + router.push('/home'); + }; + + const handleGoogleLogin = () => { + window.location.href = '/api/auth/google'; }; return (
- {/* Top Image */}
{ />
- {/* Hero Section */}

Welcome to FoundIt

@@ -35,18 +46,94 @@ const LandingPage: React.FC = () => { Login - Plane Image -

- + Plane Image +
- {/* Footer */}

© {new Date().getFullYear()} FoundIt. All rights reserved.

+ + {isLoginModalOpen && ( +
+
+ + {/* Modal container */} +
+
+

Login

+ +
+ +
{ + e.preventDefault(); + handleLoginSubmit(); + }} + > + + + + + + + +
+ + +
+
+

OR

+
+
+ + {/* Google Login */} + +
+
+ )}
); }; diff --git a/components/lost.tsx b/components/lost.tsx index 0c99de1..df07cd1 100644 --- a/components/lost.tsx +++ b/components/lost.tsx @@ -46,16 +46,42 @@ const Lost: React.FC = () => {

Items

-
- {[...Array(10)].map((_, index) => ( -
- -
- ))} +
+ + + + +
diff --git a/components/main.tsx b/components/main.tsx index 6dd60c7..980b52b 100644 --- a/components/main.tsx +++ b/components/main.tsx @@ -22,50 +22,82 @@ const Main: React.FC = () => {
-
-

Welcome
+
+

+ Welcome
User_name

- +
+ {/* Recently Found Section */}

Recently found

- {[...Array(5)].map((_, index) => ( -
- -
- ))} + + + +
+ {/* Recently Lost Section */}

Recently lost

- {[...Array(5)].map((_, index) => ( -
- -
- ))} + {/* Individual Cards */} + + +

diff --git a/next-env.d.ts b/next-env.d.ts index 40c3d68..725dd6f 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -1,5 +1,6 @@ /// /// +/// // NOTE: This file should not be edited // see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information. diff --git a/page.tsx b/page.tsx new file mode 100644 index 0000000..96e7011 --- /dev/null +++ b/page.tsx @@ -0,0 +1,11 @@ +import Main from "@/components/main"; +import Profile from "@/components/profile"; +import Lost from "@/components/lost"; +import Found from "@/components/found"; +import Landing from "@/components/landing"; + +export default function Home() { + return ( +
+ ); +} \ No newline at end of file diff --git a/public/assets/bottle.jpg b/public/assets/bottle.jpg new file mode 100644 index 0000000..3391d3c Binary files /dev/null and b/public/assets/bottle.jpg differ diff --git a/public/assets/earbuds.jpg b/public/assets/earbuds.jpg new file mode 100644 index 0000000..4e09a97 Binary files /dev/null and b/public/assets/earbuds.jpg differ diff --git a/public/assets/glasses.jpg b/public/assets/glasses.jpg new file mode 100644 index 0000000..b5f9a98 Binary files /dev/null and b/public/assets/glasses.jpg differ diff --git a/public/assets/umbrella.jpg b/public/assets/umbrella.jpg new file mode 100644 index 0000000..3e1377a Binary files /dev/null and b/public/assets/umbrella.jpg differ diff --git a/public/assets/wallet.jpg b/public/assets/wallet.jpg new file mode 100644 index 0000000..f739e55 Binary files /dev/null and b/public/assets/wallet.jpg differ