diff --git a/app/(auth)/login/page.tsx b/app/(auth)/login/page.tsx index a707ec9..17117c2 100644 --- a/app/(auth)/login/page.tsx +++ b/app/(auth)/login/page.tsx @@ -76,7 +76,7 @@ const page = () => { {error && } router.push("/home")} + onClick={loginUser} disabled={isLoading} className="w-full h-14 flex justify-center items-center border border-[#113768] rounded-full bg-transparent hover:bg-[#113768] hover:text-white transition-colors duration-200 disabled:opacity-50 disabled:cursor-not-allowed" > diff --git a/app/(auth)/register/page.tsx b/app/(auth)/register/page.tsx index d30554f..df343c5 100644 --- a/app/(auth)/register/page.tsx +++ b/app/(auth)/register/page.tsx @@ -89,57 +89,52 @@ export default function RegisterPage() { - setForm({ ...form, name: e.target.value }) - } + handleChangeText={(value) => setForm({ ...form, name: value })} /> + - setForm({ ...form, institution: e.target.value }) + handleChangeText={(value) => + setForm({ ...form, institution: value }) } /> + - setForm({ ...form, sscRoll: e.target.value }) + handleChangeText={(value) => + setForm({ ...form, sscRoll: value }) } /> + - setForm({ ...form, hscRoll: e.target.value }) + handleChangeText={(value) => + setForm({ ...form, hscRoll: value }) } /> + - setForm({ ...form, email: e.target.value }) - } + handleChangeText={(value) => setForm({ ...form, email: value })} /> + - setForm({ ...form, phone: e.target.value }) - } + handleChangeText={(value) => setForm({ ...form, phone: value })} /> + - setForm({ ...form, password: e.target.value }) + handleChangeText={(value) => + setForm({ ...form, password: value }) } + placeholder={undefined} /> diff --git a/app/(tabs)/home/page.tsx b/app/(tabs)/home/page.tsx index f2c8c89..dd07ed6 100644 --- a/app/(tabs)/home/page.tsx +++ b/app/(tabs)/home/page.tsx @@ -92,8 +92,8 @@ const page = () => { Topic Test @@ -106,8 +106,8 @@ const page = () => { Mock Test @@ -122,8 +122,8 @@ const page = () => { Past Papers @@ -136,8 +136,8 @@ const page = () => { Subject Test diff --git a/app/(tabs)/layout.tsx b/app/(tabs)/layout.tsx index c0d172d..386fdd8 100644 --- a/app/(tabs)/layout.tsx +++ b/app/(tabs)/layout.tsx @@ -5,11 +5,13 @@ import Link from "next/link"; import { ReactNode } from "react"; import { usePathname } from "next/navigation"; import clsx from "clsx"; +import { House, LayoutGrid, Bookmark, CircleUser } from "lucide-react"; const tabs = [ - { name: "Home", href: "/tabs/home" }, - { name: "Profile", href: "/tabs/profile" }, - { name: "Leaderboard", href: "/tabs/leaderboard" }, + { name: "Home", href: "/home", component: }, + { name: "Unit", href: "/unit", component: }, + { name: "Bookmark", href: "/bookmark", component: }, + { name: "Profile", href: "/profile", component: }, ]; export default function TabsLayout({ children }: { children: ReactNode }) { @@ -19,7 +21,7 @@ export default function TabsLayout({ children }: { children: ReactNode }) { {children} - + {tabs.map((tab) => ( - {tab.name} + {tab.component} ))} diff --git a/app/page.tsx b/app/page.tsx index e5ca0a4..fd7f826 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -28,10 +28,6 @@ export default function Home() { return () => window.removeEventListener("resize", handleResize); }, []); - const handleLogin = () => { - router.push("/login"); - }; - return ( @@ -62,7 +58,7 @@ export default function Home() { {/* Action Buttons */} router.push("/login")} className="w-full h-[60px] flex justify-center items-center border border-[#113768] rounded-full bg-transparent hover:bg-[#113768] hover:text-white transition-colors duration-200" > ), }, + { + id: "2", + content: ( + + + + Meet, Share, and Learn! + Join Facebook Community + + + + + + + ), + }, + { + id: "3", + content: ( + + + + Meet, Share, and Learn! + Join Facebook Community + + + + + + + ), + }, ]; const SlidingGallery = () => { diff --git a/css/Header.module.css b/css/Header.module.css index 3281996..3c1aada 100644 --- a/css/Header.module.css +++ b/css/Header.module.css @@ -29,7 +29,7 @@ } .text { - font-size: 24px; + font-size: 20px ; font-family: 'Montserrat', sans-serif; font-weight: 700; color: #fff; @@ -133,14 +133,14 @@ @media (max-width: 480px) { .header { - height: 80px; + height: 100px; padding-top: 15px; padding-left: 15px; padding-right: 15px; } .text { - font-size: 14px; + font-size: 17px; } .profile { @@ -148,8 +148,8 @@ } .profileImg { - width: 30px; - height: 30px; + width: 40px; + height: 40px; } .timer { diff --git a/css/Home.module.css b/css/Home.module.css index 243e9d5..17545c6 100644 --- a/css/Home.module.css +++ b/css/Home.module.css @@ -70,6 +70,7 @@ .categoriesContainer { display: flex; flex-direction: column; + justify-content: space-evenly; gap: 16px; padding-top: 25px; } @@ -228,7 +229,7 @@ } .categoryButtonText { - font-size: 12px; + font-size: 14px; } .categoryRow { @@ -246,11 +247,11 @@ } .sectionTitle { - font-size: 18px; + font-size: 22px; } .categoryButton { - height: 100px; + height: 200px; } .mainContent { @@ -258,7 +259,7 @@ } .categoryRow { - flex-direction: column; + flex-direction: row; } .categoryButton { diff --git a/css/SlidingGallery.module.css b/css/SlidingGallery.module.css index 43c22ed..43f024f 100644 --- a/css/SlidingGallery.module.css +++ b/css/SlidingGallery.module.css @@ -22,14 +22,16 @@ } .slide { - min-width: calc(100% - 72px); + min-width: 100%; + flex-shrink: 0; display: flex; justify-content: center; align-items: center; scroll-snap-align: start; - padding: 0 36px; + box-sizing: border-box; } + .link { text-decoration: none; color: inherit; @@ -37,14 +39,13 @@ } .facebook { - flex: 1; display: flex; - justify-content: space-between; + justify-content: space-evenly; flex-direction: row; height: 100%; background-color: #fff; border-radius: 25px; - padding: 20px; + padding: 40px 40px; box-sizing: border-box; } diff --git a/package.json b/package.json index 1e17e13..4efd5db 100644 --- a/package.json +++ b/package.json @@ -1,36 +1,3 @@ -{ - "name": "nextjs-template-shadcn", - "version": "0.1.0", - "private": true, - "scripts": { - "dev": "next dev --turbopack", - "build": "next build", - "start": "next start", - "lint": "next lint" - }, - "dependencies": { - "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", - "lucide-react": "^0.525.0", - "next": "15.3.4", - "postcss": "^8.5.6", - "react": "^19.0.0", - "react-dom": "^19.0.0", - "tailwind-merge": "^3.3.1" - }, - "devDependencies": { - "@eslint/eslintrc": "^3", - "@tailwindcss/postcss": "^4.1.11", - "@types/node": "^20", - "@types/react": "^19", - "@types/react-dom": "^19", - "eslint": "^9", - "eslint-config-next": "15.3.4", - "tailwindcss": "^4.1.11", - "tw-animate-css": "^1.3.4", - "typescript": "^5" - } -} { "name": "examjam-frontend", "version": "0.1.0", diff --git a/public/images/icons/past-paper.png b/public/images/icons/past-paper.png index 05f3bd0..9192d12 100644 Binary files a/public/images/icons/past-paper.png and b/public/images/icons/past-paper.png differ
Join Facebook Community