Skip to content

Fixed book schedule and my schedule frontend logic #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Necro-Rohan merged 1 commit into from
Feb 13, 2026
Merged

Fixed book schedule and my schedule frontend logic #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions frontend/src/context/BookingContext.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const BookingContext = createContext();

export const useBooking = () => useContext(BookingContext);

Check failure on line 6 in frontend/src/context/BookingContext.jsx

View workflow job for this annotation

GitHub Actions / Frontend CI 

Fast refresh only works when a file only exports components. Use a new file to share constants or functions between components

export const BookingProvider = ({ children }) => {
const [user, setUser] = useState(null);
Expand All @@ -19,7 +19,10 @@
}, []);

const fetchActiveBooking = async () => {
if (!user?._id || !user?.token) {
// console.log("Fetching active booking for user:", user);
// console.log("User ID:", user._id), console.log("User Token:", user.token);
if (!user._id) {
// console.log("No user logged in, cannot fetch bookings.");
setActiveBooking(null);
return;
}
Expand Down Expand Up @@ -65,13 +68,16 @@
};

const addToCart = (item, type = "service") => {
setCart((prev) => ({
...prev,
[type === "service" ? "services" : "products"]: [
...prev[type === "service" ? "services" : "products"],
item,
],
}));
setCart((prev) => {
// Prevent duplicates based on ID
const list = type === "service" ? prev.services : prev.products;
if (list.find(i => (i._id || i.id) === (item._id || item.id))) return prev;

return {
...prev,
[type === "service" ? "services" : "products"]: [...list, item],
};
});
};

const removeFromCart = (itemId, type = "service") => {
Expand Down
99 changes: 20 additions & 79 deletions frontend/src/pages/Services.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ const ServicesFull = () => {

<div className="flex items-center gap-4 w-full md:w-auto">
<div className="md:hidden flex-1">
<span className="text-sm font-bold text-brown-900 block">
<span className="text-sm w-30 font-bold text-brown-900 block">
{cart.services.length + cart.products.length} Services Selected
</span>
</div>
Expand Down Expand Up @@ -336,10 +336,13 @@ const ServicesFull = () => {
</div>
<div className="flex items-center gap-6 w-full sm:w-auto justify-between sm:justify-end">
<span className="text-xl font-serif text-brown-600">
{item.price ? `₹ ${item.price}` : ""}
{/* {console.log("Item Price:", item.prices)} */}
{(typeof item.prices === "object" && item.prices.male !== item.prices.female)|| (item.price)
? `₹ ${item.prices?.male} / ₹ ${item.prices.female}`
: `₹ ${item.prices.male}`}
</span>

{item.price && item.price.includes("/") ? (
{(item.prices && item.prices.male && item.prices.female) || (typeof item.price === "string" && item.price.includes("/")) ? (
<div
className={`relative overflow-hidden rounded-full border border-brown-900 group/split w-27.5 h-8.5 cursor-pointer shadow-sm hover:shadow-md transition-all duration-300 ${
isSelected(item, "M") || isSelected(item, "F")
Expand All @@ -349,37 +352,22 @@ const ServicesFull = () => {
>
{/* Default Content: 'Add' */}
<div
className={`absolute inset-0 flex items-center justify-center transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)] font-bold text-xs uppercase tracking-wider
${isSelected(item, "M") || isSelected(item, "F") ? "-translate-y-full opacity-0" : "group-hover/split:-translate-y-full group-hover/split:opacity-0 text-brown-900"}
`}
className={`absolute inset-0 flex items-center justify-center transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)] font-bold text-xs uppercase tracking-wider ${isSelected(item, "M") || isSelected(item, "F") ? "-translate-y-full opacity-0" : "group-hover/split:-translate-y-full group-hover/split:opacity-0 text-brown-900"}`}
>
Add <Plus size={14} className="ml-1" />
</div>

{/* Hover/Selected Content: M | F selection */}
<div
className={`absolute inset-0 flex items-center justify-between text-xs font-bold transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)]
${isSelected(item, "M") || isSelected(item, "F") ? "translate-y-0" : "translate-y-full group-hover/split:translate-y-0"}
`}
className={`absolute inset-0 flex items-center justify-between text-xs font-bold transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)] ${isSelected(item, "M") || isSelected(item, "F") ? "translate-y-0" : "translate-y-full group-hover/split:translate-y-0"}`}
>
<button
onClick={(e) => {
e.stopPropagation();
toggleService(
item,
"M",
item.price.split("/")[0].trim(),
);
const price = item.prices ? item.prices.male : item.price.split("/")[0].trim();
toggleService(item, "M", price);
}}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100
${
isSelected(
item,
"M",
)
? "bg-brown-900 text-white hover:bg-brown-800"
: "bg-white text-brown-900"
}`}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100 ${isSelected(item, "M") ? "bg-brown-900 text-white hover:bg-brown-800" : "bg-white text-brown-900"}`}
>
M{" "}
{isSelected(item, "M") && (
Expand All @@ -390,21 +378,10 @@ const ServicesFull = () => {
<button
onClick={(e) => {
e.stopPropagation();
toggleService(
item,
"F",
item.price.split("/")[1]?.trim(),
);
const price = item.prices ? item.prices.female : item.price.split("/")[1]?.trim();
toggleService(item, "F", price);
}}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100
${
isSelected(
item,
"F",
)
? "bg-brown-900 text-white hover:bg-brown-800"
: "bg-white text-brown-900"
}`}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100 ${isSelected(item, "F") ? "bg-brown-900 text-white hover:bg-brown-800" : "bg-white text-brown-900"}`}
>
F{" "}
{isSelected(item, "F") && (
Expand All @@ -416,15 +393,7 @@ const ServicesFull = () => {
) : (
<button
onClick={() => toggleService(item)}
className={`px-6 py-2 border text-xs tracking-wider uppercase font-bold rounded-full transition-all duration-300 flex items-center gap-2
${
isSelected(
item,
)
? "bg-brown-900 text-white border-brown-900"
: "bg-transparent border-brown-900 text-brown-900 hover:bg-brown-900 hover:text-white"
}
`}
className={`px-6 py-2 border text-xs tracking-wider uppercase font-bold rounded-full transition-all duration-300 flex items-center gap-2 ${isSelected(item) ? "bg-brown-900 text-white border-brown-900" : "bg-transparent border-brown-900 text-brown-900 hover:bg-brown-900 hover:text-white"}`}
>
{isSelected(item) ? (
<>
Expand Down Expand Up @@ -483,18 +452,14 @@ const ServicesFull = () => {
>
{/* Default Content: 'Add' */}
<div
className={`absolute inset-0 flex items-center justify-center transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)] font-bold text-xs uppercase tracking-wider
${isSelected(item, "M") || isSelected(item, "F") ? "-translate-y-full opacity-0" : "group-hover/split:-translate-y-full group-hover/split:opacity-0 text-brown-900"}
`}
className={`absolute inset-0 flex items-center justify-center transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)] font-bold text-xs uppercase tracking-wider ${isSelected(item, "M") || isSelected(item, "F") ? "-translate-y-full opacity-0" : "group-hover split:-translate-y-full group-hover/split:opacity-0 text-brown-900"}`}
>
Add <Plus size={14} className="ml-1" />
</div>

{/* Hover/Selected Content: M | F selection */}
<div
className={`absolute inset-0 flex items-center justify-between text-xs font-bold transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)]
${isSelected(item, "M") || isSelected(item, "F") ? "translate-y-0" : "translate-y-full group-hover/split:translate-y-0"}
`}
className={`absolute inset-0 flex items-center justify-between text-xs font-bold transition-transform duration-300 ease-[cubic-bezier(0.23,1,0.32,1)] ${isSelected(item, "M") || isSelected(item, "F") ? "translate-y-0" : "translate-y-full group-hover/split:translate-y-0"}`}
>
<button
onClick={(e) => {
Expand All @@ -505,15 +470,7 @@ const ServicesFull = () => {
item.price.split("/")[0].trim(),
);
}}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100
${
isSelected(
item,
"M",
)
? "bg-brown-900 text-white hover:bg-brown-800"
: "bg-white text-brown-900"
}`}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100 ${isSelected(item, "M") ? "bg-brown-900 text-white hover:bg-brown-800" : "bg-white text-brown-900"}`}
>
M{" "}
{isSelected(item, "M") && (
Expand All @@ -530,15 +487,7 @@ const ServicesFull = () => {
item.price.split("/")[1]?.trim(),
);
}}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100
${
isSelected(
item,
"F",
)
? "bg-brown-900 text-white hover:bg-brown-800"
: "bg-white text-brown-900"
}`}
className={`flex-1 h-full flex items-center justify-center transition-colors hover:bg-brown-100 ${isSelected(item, "F") ? "bg-brown-900 text-white hover:bg-brown-800" : "bg-white text-brown-900"}`}
>
F{" "}
{isSelected(item, "F") && (
Expand All @@ -550,15 +499,7 @@ const ServicesFull = () => {
) : (
<button
onClick={() => toggleService(item)}
className={`px-6 py-2 border text-xs tracking-wider uppercase font-bold rounded-full transition-all duration-300 flex items-center gap-2
${
isSelected(
item,
)
? "bg-brown-900 text-white border-brown-900"
: "bg-transparent border-brown-900 text-brown-900 hover:bg-brown-900 hover:text-white"
}
`}
className={`px-6 py-2 border text-xs tracking-wider uppercase font-bold rounded-full transition-all duration-300 flex items-center gap-2 ${isSelected(item) ? "bg-brown-900 text-white border-brown-900" : "bg-transparent border-brown-900 text-brown-900 hover:bg-brown-900 hover:text-white"} `}
>
{isSelected(item) ? (
<>
Expand Down
Loading