diff --git a/index.html b/index.html index 8e2cd51..1edc375 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,15 @@ - + + + + + + thirukalyanam diff --git a/src/App.css b/src/App.css index ee2f7cd..7d9bd48 100644 --- a/src/App.css +++ b/src/App.css @@ -1,3 +1,10 @@ +body { + font-family: 'Outfit', sans-serif; +} + + + + button{ cursor: pointer; } diff --git a/src/components/common/ProfileHeader.jsx b/src/components/common/ProfileHeader.jsx index 4e95420..0e306e1 100644 --- a/src/components/common/ProfileHeader.jsx +++ b/src/components/common/ProfileHeader.jsx @@ -27,6 +27,7 @@ const NAV_LINKS = [ { label: "Home", path: "/" }, { label: "Matches", path: "/matches" }, { label: "Interest", path: "/interest" }, + { label: "Horoscope", path: "/horoscoper-generate" }, { label: "Messages", path: "/chat" }, { label: "Search", path: "/matches" }, { label: "Notifications", path: "/notifications" } diff --git a/src/components/common/ScrollToTop.jsx b/src/components/common/ScrollToTop.jsx new file mode 100644 index 0000000..cddd203 --- /dev/null +++ b/src/components/common/ScrollToTop.jsx @@ -0,0 +1,15 @@ +// ScrollToTop.js +import { useEffect } from "react"; +import { useLocation } from "react-router-dom"; + +const ScrollToTop = () => { + const { pathname } = useLocation(); + + useEffect(() => { + window.scrollTo({ top: 0, behavior: "smooth" }); + }, [pathname]); + + return null; +}; + +export default ScrollToTop; diff --git a/src/components/matches/MatchesProfilesTab.jsx b/src/components/matches/MatchesProfilesTab.jsx index 1d6e545..c7cfe00 100644 --- a/src/components/matches/MatchesProfilesTab.jsx +++ b/src/components/matches/MatchesProfilesTab.jsx @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { Crown, Bookmark } from "lucide-react"; +import { Crown, Bookmark, CurrencyIcon, Currency, Wallet, Receipt, Sparkles, MoonStar, IdCard } from "lucide-react"; import CakeIcon from "@mui/icons-material/Cake"; import GroupsIcon from "@mui/icons-material/Groups"; import SchoolIcon from "@mui/icons-material/School"; @@ -94,14 +94,43 @@ function ProfileCard({ profile }) {
- Age: {profile.age} + {profile.age} yr
- Height: {profile.height} + {profile.height} cm + +
+ +
+ + + 5 - 10 LPA + +
+ +
+
+ + + Aries + +
+ +
+ + + Scorpio + +
+ +
+ + + Bramin
@@ -118,8 +147,8 @@ function ProfileCard({ profile }) { onClick={(e) => { e.stopPropagation(); // your decline logic - }} className="gap-2 px-3 w-[fit-content] bg-[#A70710] hover:bg-red-600 text-white - font-semibold text-base py-2 rounded-[20px] shadow-md + }} className="gap-2 px-3 w-[fit-content] bg-red-50 border-1 border-red-200 + font-400 text-base py-1.5 rounded-[20px] shadow-md text-[14px] hover:shadow-lg transition-all duration-300 flex items-center justify-center transform hover:scale-95"> @@ -128,7 +157,7 @@ function ProfileCard({ profile }) {
- {/* */} + {/*
*/} +
+ {/* Left Sidebar - Fixed on desktop, scrollable on mobile */} + +
-
+ +
+

+ Filter Matches

+ +
+ +
{tabs.map((tab) => { const showCategory = tab.category !== currentCategory; if (showCategory) { @@ -344,7 +371,7 @@ export default function MatchesInterface() { } return ( - +
{showCategory && (

{tab.category} @@ -403,14 +430,14 @@ export default function MatchesInterface() {

- +
); })}
- +
{/* Right Content Area - Scrollable */} -
+

@@ -437,7 +464,7 @@ export default function MatchesInterface() { - + diff --git a/src/components/matches/SearchUI.jsx b/src/components/matches/SearchUI.jsx index 62faa30..230a34d 100644 --- a/src/components/matches/SearchUI.jsx +++ b/src/components/matches/SearchUI.jsx @@ -66,7 +66,9 @@ const allSuggestions = [
{/* Main Search Bar */} -
+
{/* Search Input */} {/* Search Button */} diff --git a/src/feature/FilterForm.jsx b/src/feature/FilterForm.jsx index c78aa28..9f3f69f 100644 --- a/src/feature/FilterForm.jsx +++ b/src/feature/FilterForm.jsx @@ -64,7 +64,7 @@ const FilterForm = () => { }; return ( -
+
{/* Header */}
@@ -73,7 +73,7 @@ const FilterForm = () => {
-
+
{/* Basic Details Section */} { open={open} onClose={handleClose} fullWidth - maxWidth="md" // adjust: "sm" | "md" | "lg" + maxWidth="lg" // adjust: "sm" | "md" | "lg" > diff --git a/src/layout/ProfileLayout.jsx b/src/layout/ProfileLayout.jsx index 74ee48e..a2ccb67 100644 --- a/src/layout/ProfileLayout.jsx +++ b/src/layout/ProfileLayout.jsx @@ -5,7 +5,11 @@ const ProfileLayout = () => { return ( <> -
+
diff --git a/src/pages/ChatPage.jsx b/src/pages/ChatPage.jsx index f10cdee..9bb8ec5 100644 --- a/src/pages/ChatPage.jsx +++ b/src/pages/ChatPage.jsx @@ -208,9 +208,9 @@ const ChatUI = () => { const [chatMessages, setChatMessages] = useState({ 1: [ { id: 1, sender: 'other', text: "Let's do it! I'm in a meeting until noon.", time: '10 Nov', isDate: false , read: false }, - { id: 2, sender: 'me', text: "That's perfect! There's a new place...", time: '07:21', isDate: false , read: false }, + { id: 2, sender: 'me', text: "That's perfect! There's a new place...", time: '07:21 am', isDate: false , read: false }, { id: 3, sender: 'date', text: 'Today', isDate: true, read: true | false }, - { id: 4, sender: 'me', text: "Can's get lunch. How about tomorrow?", time: '09:42', isDate: false , read: true }, + { id: 4, sender: 'me', text: "Can's get lunch. How about tomorrow?", time: '09:42 am', isDate: false , read: true }, { id: 5, sender: 'other', text: "Let's do it! I'm in a meeting until noon.", time: '', isDate: false, read: true }, { id: 6, sender: 'me', text: "That's perfect! There's a new place...", time: '', isDate: false, read: true }, ], @@ -486,7 +486,7 @@ const ChatUI = () => {
{/* Messages */} -
+
{chatMessages[selectedChat]?.map((msg) => (
{msg.isDate ? ( @@ -543,7 +543,7 @@ const ChatUI = () => {
{/* Message Input */} -
+
{
- Age: {profile.age} + {profile.age} yr
- Height: {profile.height} + {profile.height} cm
+ +
+ + + 5 - 10 LPA + +
+
+
+ + + Aries + +
+ +
+ + + Scorpio + +
+ +
+ + + Bramin + +
+
+
@@ -372,19 +402,19 @@ const renderMenu = () => { e.stopPropagation(); // your decline logic }} - className="gap-1 px-2 w-[fit-content] bg-[#A70710] hover:bg-red-600 text-white + className="gap-1 px-2 w-[fit-content] bg-red-50 border-1 border-red-200 font-600 text-[12px] py-2 rounded-[20px] shadow-md hover:shadow-lg transition-all duration-300 flex items-center justify-center transform hover:scale-95"> - Reject Request + Reject
@@ -427,7 +457,7 @@ const renderMenu = () => { diff --git a/src/routes/AppRoutes.jsx b/src/routes/AppRoutes.jsx index b153585..7fefe4c 100644 --- a/src/routes/AppRoutes.jsx +++ b/src/routes/AppRoutes.jsx @@ -1,11 +1,14 @@ import { Route, Routes } from 'react-router-dom'; import UserRoutes from './UserRoutes'; import PublicRoutes from './PublicRoutes'; +import ScrollToTop from '../components/common/ScrollToTop'; const AppRoutes = () => { return ( <> + + {/* Wrap UserRoutes inside AuthProvider separately */} {UserRoutes()}