Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fecac320d9 | ||
|
|
aee6515890 | ||
|
|
2e47f7b55d | ||
|
|
54be99fa2c | ||
|
|
bc530c98e6 | ||
|
|
3b748cc014 | ||
|
|
73f9424331 | ||
|
|
0917c966cb | ||
|
|
61024b8f31 | ||
|
|
7dc54a1d20 | ||
|
|
d05112ae65 |
No files matched your search
@@ -157,6 +157,30 @@ module.exports = defineConfig({
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
resolve: "@medusajs/medusa/auth",
|
||||||
|
options: {
|
||||||
|
providers: [
|
||||||
|
// emailpass se declara explicito junto con google -- una vez
|
||||||
|
// que el modulo auth se customiza, la doc no deja claro si el
|
||||||
|
// provider default (emailpass) se sigue registrando solo.
|
||||||
|
{
|
||||||
|
resolve: "@medusajs/medusa/auth-emailpass",
|
||||||
|
id: "emailpass",
|
||||||
|
options: {},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
resolve: "@medusajs/medusa/auth-google",
|
||||||
|
id: "google",
|
||||||
|
options: {
|
||||||
|
clientId: required("GOOGLE_CLIENT_ID"),
|
||||||
|
clientSecret: required("GOOGLE_CLIENT_SECRET"),
|
||||||
|
callbackUrl: required("GOOGLE_CALLBACK_URL"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
],
|
],
|
||||||
|
|
||||||
// ADR 0006 Etapa 2. Sin required(): a diferencia de S3/DB, Meilisearch
|
// ADR 0006 Etapa 2. Sin required(): a diferencia de S3/DB, Meilisearch
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { loginCustomer } from "@/lib/headless/providers/medusa-customer";
|
||||||
|
|
||||||
|
export async function POST(request: Request) {
|
||||||
|
const { email, password } = await request.json();
|
||||||
|
if (!email || !password) {
|
||||||
|
return Response.json({ error: "Correo y contraseña son obligatorios" }, { status: 400 });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const customer = await loginCustomer(email, password);
|
||||||
|
return Response.json(customer);
|
||||||
|
} catch (error) {
|
||||||
|
return Response.json({ error: (error as Error).message }, { status: 400 });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { getCurrentCustomer } from "@/lib/headless/providers/medusa-customer";
|
||||||
|
|
||||||
|
export async function GET(request: Request) {
|
||||||
|
const token = new URL(request.url).searchParams.get("token");
|
||||||
|
if (!token) {
|
||||||
|
return Response.json({ error: "token es obligatorio" }, { status: 400 });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const customer = await getCurrentCustomer(token);
|
||||||
|
return Response.json(customer);
|
||||||
|
} catch (error) {
|
||||||
|
return Response.json({ error: (error as Error).message }, { status: 401 });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
import { registerCustomer } from "@/lib/headless/providers/medusa-customer";
|
||||||
|
|
||||||
|
export async function POST(request: Request) {
|
||||||
|
const { email, password, firstName, lastName } = await request.json();
|
||||||
|
if (!email || !password || !firstName || !lastName) {
|
||||||
|
return Response.json({ error: "Faltan campos obligatorios" }, { status: 400 });
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const customer = await registerCustomer(email, password, firstName, lastName);
|
||||||
|
return Response.json(customer);
|
||||||
|
} catch (error) {
|
||||||
|
return Response.json({ error: (error as Error).message }, { status: 400 });
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import Link from "next/link";
|
||||||
|
import { LogOut, MessageCircle, PackageCheck } from "lucide-react";
|
||||||
|
import { type FormEvent, useState } from "react";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Dialog, DialogContent } from "@/components/ui/dialog";
|
||||||
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { useCustomerStore } from "@/store/customer-store";
|
||||||
|
|
||||||
|
type Mode = "login" | "register";
|
||||||
|
|
||||||
|
export function AccountDialog({ open, onOpenChange }: { open: boolean; onOpenChange: (open: boolean) => void }) {
|
||||||
|
const { customer, hasHydrated, loading, error, login, register, logout } = useCustomerStore();
|
||||||
|
const [mode, setMode] = useState<Mode>("login");
|
||||||
|
const [form, setForm] = useState({ email: "", password: "", firstName: "", lastName: "" });
|
||||||
|
|
||||||
|
async function submit(event: FormEvent) {
|
||||||
|
event.preventDefault();
|
||||||
|
const ok = mode === "login"
|
||||||
|
? await login(form.email, form.password)
|
||||||
|
: await register(form.email, form.password, form.firstName, form.lastName);
|
||||||
|
if (ok) setForm({ email: "", password: "", firstName: "", lastName: "" });
|
||||||
|
}
|
||||||
|
|
||||||
|
const isLoggedIn = hasHydrated && customer !== null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||||
|
<DialogContent className="max-w-lg p-7">
|
||||||
|
<div className="pr-10">
|
||||||
|
{isLoggedIn ? (
|
||||||
|
<>
|
||||||
|
<span className="text-xs font-black uppercase tracking-[.16em] text-ari-coral">Tu cuenta</span>
|
||||||
|
<h2 className="mt-3 text-3xl font-black">Hola, {customer.firstName ?? customer.email}</h2>
|
||||||
|
<p className="mt-3 text-sm leading-6 text-slate-600">{customer.email}</p>
|
||||||
|
<div className="mt-6 grid gap-3">
|
||||||
|
<Button asChild variant="outline"><Link href="/catalog" onClick={() => onOpenChange(false)}><PackageCheck />Ver mis opciones de compra</Link></Button>
|
||||||
|
<Button variant="ghost" onClick={logout}><LogOut className="size-4" />Cerrar sesión</Button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<span className="text-xs font-black uppercase tracking-[.16em] text-ari-coral">Atención personalizada</span>
|
||||||
|
<h2 className="mt-3 text-3xl font-black">{mode === "login" ? "Inicia sesión" : "Crea tu cuenta"}</h2>
|
||||||
|
<form onSubmit={submit} className="mt-5 space-y-3">
|
||||||
|
{mode === "register" && (
|
||||||
|
<div className="grid gap-3 sm:grid-cols-2">
|
||||||
|
<Input placeholder="Nombre" required value={form.firstName} onChange={(event) => setForm({ ...form, firstName: event.target.value })} />
|
||||||
|
<Input placeholder="Apellido" required value={form.lastName} onChange={(event) => setForm({ ...form, lastName: event.target.value })} />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<Input type="email" placeholder="Correo" required value={form.email} onChange={(event) => setForm({ ...form, email: event.target.value })} />
|
||||||
|
<Input type="password" placeholder="Contraseña" required minLength={8} value={form.password} onChange={(event) => setForm({ ...form, password: event.target.value })} />
|
||||||
|
{error && <p className="text-sm font-bold text-rose-600">{error}</p>}
|
||||||
|
<Button type="submit" variant="primary" size="lg" className="w-full" disabled={loading}>
|
||||||
|
{loading ? "Un momento…" : mode === "login" ? "Iniciar sesión" : "Crear cuenta"}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="mt-3 text-sm font-bold text-ari-marino hover:underline"
|
||||||
|
onClick={() => setMode(mode === "login" ? "register" : "login")}
|
||||||
|
>
|
||||||
|
{mode === "login" ? "¿No tienes cuenta? Regístrate" : "¿Ya tienes cuenta? Inicia sesión"}
|
||||||
|
</button>
|
||||||
|
<div className="mt-6 border-t border-slate-100 pt-5">
|
||||||
|
<Button asChild variant="outline" className="w-full">
|
||||||
|
<a href={process.env.NEXT_PUBLIC_WHATSAPP_URL ?? "https://wa.link/rvcqqc"} target="_blank" rel="noopener noreferrer">
|
||||||
|
<MessageCircle />Hablar con ARI
|
||||||
|
</a>
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -6,9 +6,13 @@ import { ArrowLeft, MapPin, MessageCircle, Truck } from "lucide-react";
|
|||||||
import { type FormEvent, useState } from "react";
|
import { type FormEvent, useState } from "react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { ciudadesPorDepartamento, departamentos } from "@/lib/data/colombia";
|
||||||
import { formatMoney } from "@/lib/utils";
|
import { formatMoney } from "@/lib/utils";
|
||||||
import { useCartStore } from "@/store/cart-store";
|
import { useCartStore } from "@/store/cart-store";
|
||||||
|
|
||||||
|
const SELECT_CLASS =
|
||||||
|
"h-12 w-full rounded-full border border-slate-200 bg-white px-5 text-sm text-slate-950 outline-none transition focus:border-cyan-500 focus:ring-4 focus:ring-cyan-300/30 disabled:opacity-50";
|
||||||
|
|
||||||
// ADR 0009, siguiente corte tras el carrito real: direccion + seleccion de
|
// ADR 0009, siguiente corte tras el carrito real: direccion + seleccion de
|
||||||
// envio contra el Store API real (mismos endpoints ya verificados en vivo
|
// envio contra el Store API real (mismos endpoints ya verificados en vivo
|
||||||
// para las shipping options). El pago (PayU custom) todavia no existe --
|
// para las shipping options). El pago (PayU custom) todavia no existe --
|
||||||
@@ -35,7 +39,21 @@ async function postJson(url: string, body: unknown) {
|
|||||||
export function CheckoutClient() {
|
export function CheckoutClient() {
|
||||||
const { cartId, items, hasHydrated } = useCartStore();
|
const { cartId, items, hasHydrated } = useCartStore();
|
||||||
const [step, setStep] = useState<Step>("address");
|
const [step, setStep] = useState<Step>("address");
|
||||||
const [form, setForm] = useState({ firstName: "", lastName: "", address1: "", city: "", province: "", phone: "", email: "" });
|
const [form, setForm] = useState({
|
||||||
|
firstName: "",
|
||||||
|
lastName: "",
|
||||||
|
address1: "",
|
||||||
|
// Se guarda el id DIVIPOLA seleccionado, no el texto libre -- ver
|
||||||
|
// lib/data/colombia.ts. El nombre real se deriva de este id para
|
||||||
|
// mandarlo a Medusa (que solo espera texto en shipping_address).
|
||||||
|
departmentId: null as number | null,
|
||||||
|
cityId: null as number | null,
|
||||||
|
phone: "",
|
||||||
|
email: "",
|
||||||
|
});
|
||||||
|
const availableCities = form.departmentId ? ciudadesPorDepartamento(form.departmentId) : [];
|
||||||
|
const selectedDepartamento = departamentos.find((departamento) => departamento.id === form.departmentId);
|
||||||
|
const selectedCiudad = availableCities.find((ciudad) => ciudad.id === form.cityId);
|
||||||
const [shippingOptions, setShippingOptions] = useState<ShippingOption[]>([]);
|
const [shippingOptions, setShippingOptions] = useState<ShippingOption[]>([]);
|
||||||
const [selectedOptionId, setSelectedOptionId] = useState<string | null>(null);
|
const [selectedOptionId, setSelectedOptionId] = useState<string | null>(null);
|
||||||
const [shippingTotal, setShippingTotal] = useState(0);
|
const [shippingTotal, setShippingTotal] = useState(0);
|
||||||
@@ -48,11 +66,20 @@ export function CheckoutClient() {
|
|||||||
|
|
||||||
async function submitAddress(event: FormEvent) {
|
async function submitAddress(event: FormEvent) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if (!cartId) return;
|
if (!cartId || !selectedCiudad || !selectedDepartamento) return;
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
setError(null);
|
setError(null);
|
||||||
try {
|
try {
|
||||||
const cart = await postJson("/api/cart/address", { cartId, ...form });
|
const cart = await postJson("/api/cart/address", {
|
||||||
|
cartId,
|
||||||
|
firstName: form.firstName,
|
||||||
|
lastName: form.lastName,
|
||||||
|
address1: form.address1,
|
||||||
|
city: selectedCiudad.name,
|
||||||
|
province: selectedDepartamento.name,
|
||||||
|
phone: form.phone,
|
||||||
|
email: form.email,
|
||||||
|
});
|
||||||
if (cart.error) throw new Error(cart.error);
|
if (cart.error) throw new Error(cart.error);
|
||||||
const response = await fetch(`/api/cart/shipping-options?cartId=${cartId}`);
|
const response = await fetch(`/api/cart/shipping-options?cartId=${cartId}`);
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
@@ -86,7 +113,7 @@ export function CheckoutClient() {
|
|||||||
|
|
||||||
function continueOnWhatsApp() {
|
function continueOnWhatsApp() {
|
||||||
const lines = items.map((item) => `• ${item.quantity} x ${item.product.name}`).join("\n");
|
const lines = items.map((item) => `• ${item.quantity} x ${item.product.name}`).join("\n");
|
||||||
const message = `Hola Ari Shopping 👋\nQuiero confirmar mi pedido:\n\n${lines}\n\nSubtotal: ${formatMoney(itemsSubtotal, currency)}\nEnvío: ${formatMoney(shippingTotal, currency)}\nTotal: ${formatMoney(total, currency)}\n\nNombre: ${form.firstName} ${form.lastName}\nDirección: ${form.address1}, ${form.city}${form.province ? `, ${form.province}` : ""}\nTeléfono: ${form.phone}`;
|
const message = `Hola Ari Shopping 👋\nQuiero confirmar mi pedido:\n\n${lines}\n\nSubtotal: ${formatMoney(itemsSubtotal, currency)}\nEnvío: ${formatMoney(shippingTotal, currency)}\nTotal: ${formatMoney(total, currency)}\n\nNombre: ${form.firstName} ${form.lastName}\nDirección: ${form.address1}, ${selectedCiudad?.name ?? ""}${selectedDepartamento ? `, ${selectedDepartamento.name}` : ""}\nTeléfono: ${form.phone}`;
|
||||||
void navigator.clipboard?.writeText(message);
|
void navigator.clipboard?.writeText(message);
|
||||||
window.open(process.env.NEXT_PUBLIC_WHATSAPP_URL ?? "https://wa.link/rvcqqc", "_blank", "noopener,noreferrer");
|
window.open(process.env.NEXT_PUBLIC_WHATSAPP_URL ?? "https://wa.link/rvcqqc", "_blank", "noopener,noreferrer");
|
||||||
}
|
}
|
||||||
@@ -116,8 +143,25 @@ export function CheckoutClient() {
|
|||||||
</div>
|
</div>
|
||||||
<Input placeholder="Dirección" required value={form.address1} onChange={(event) => setForm({ ...form, address1: event.target.value })} />
|
<Input placeholder="Dirección" required value={form.address1} onChange={(event) => setForm({ ...form, address1: event.target.value })} />
|
||||||
<div className="grid gap-4 sm:grid-cols-2">
|
<div className="grid gap-4 sm:grid-cols-2">
|
||||||
<Input placeholder="Ciudad" required value={form.city} onChange={(event) => setForm({ ...form, city: event.target.value })} />
|
<select
|
||||||
<Input placeholder="Departamento" value={form.province} onChange={(event) => setForm({ ...form, province: event.target.value })} />
|
required
|
||||||
|
value={form.departmentId ?? ""}
|
||||||
|
onChange={(event) => setForm({ ...form, departmentId: Number(event.target.value) || null, cityId: null })}
|
||||||
|
className={SELECT_CLASS}
|
||||||
|
>
|
||||||
|
<option value="" disabled>Departamento</option>
|
||||||
|
{departamentos.map((departamento) => <option key={departamento.id} value={departamento.id}>{departamento.name}</option>)}
|
||||||
|
</select>
|
||||||
|
<select
|
||||||
|
required
|
||||||
|
disabled={!form.departmentId}
|
||||||
|
value={form.cityId ?? ""}
|
||||||
|
onChange={(event) => setForm({ ...form, cityId: Number(event.target.value) || null })}
|
||||||
|
className={SELECT_CLASS}
|
||||||
|
>
|
||||||
|
<option value="" disabled>Ciudad</option>
|
||||||
|
{availableCities.map((ciudad) => <option key={ciudad.id} value={ciudad.id}>{ciudad.name}</option>)}
|
||||||
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div className="grid gap-4 sm:grid-cols-2">
|
<div className="grid gap-4 sm:grid-cols-2">
|
||||||
<Input placeholder="Teléfono" required value={form.phone} onChange={(event) => setForm({ ...form, phone: event.target.value })} />
|
<Input placeholder="Teléfono" required value={form.phone} onChange={(event) => setForm({ ...form, phone: event.target.value })} />
|
||||||
@@ -130,7 +174,7 @@ export function CheckoutClient() {
|
|||||||
|
|
||||||
{step === "shipping" && (
|
{step === "shipping" && (
|
||||||
<div className="mt-8 space-y-4">
|
<div className="mt-8 space-y-4">
|
||||||
<p className="flex items-center gap-2 text-sm font-bold text-slate-500"><MapPin className="size-4" />{form.address1}, {form.city}{form.province ? `, ${form.province}` : ""}</p>
|
<p className="flex items-center gap-2 text-sm font-bold text-slate-500"><MapPin className="size-4" />{form.address1}, {selectedCiudad?.name}{selectedDepartamento ? `, ${selectedDepartamento.name}` : ""}</p>
|
||||||
<div className="space-y-3">
|
<div className="space-y-3">
|
||||||
{shippingOptions.map((option) => (
|
{shippingOptions.map((option) => (
|
||||||
<label key={option.id} className={`flex cursor-pointer items-center justify-between rounded-2xl border-2 p-4 transition ${selectedOptionId === option.id ? "border-ari-marino bg-ari-marino/5" : "border-slate-200"}`}>
|
<label key={option.id} className={`flex cursor-pointer items-center justify-between rounded-2xl border-2 p-4 transition ${selectedOptionId === option.id ? "border-ari-marino bg-ari-marino/5" : "border-slate-200"}`}>
|
||||||
@@ -153,7 +197,7 @@ export function CheckoutClient() {
|
|||||||
<div className="rounded-2xl border border-slate-200 p-5">
|
<div className="rounded-2xl border border-slate-200 p-5">
|
||||||
<p className="text-xs font-black uppercase tracking-wide text-slate-400">Entrega</p>
|
<p className="text-xs font-black uppercase tracking-wide text-slate-400">Entrega</p>
|
||||||
<p className="mt-1 font-bold">{form.firstName} {form.lastName}</p>
|
<p className="mt-1 font-bold">{form.firstName} {form.lastName}</p>
|
||||||
<p className="text-sm text-slate-500">{form.address1}, {form.city}{form.province ? `, ${form.province}` : ""}</p>
|
<p className="text-sm text-slate-500">{form.address1}, {selectedCiudad?.name}{selectedDepartamento ? `, ${selectedDepartamento.name}` : ""}</p>
|
||||||
<p className="text-sm text-slate-500">{form.phone}</p>
|
<p className="text-sm text-slate-500">{form.phone}</p>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-sm text-slate-500">El pago en línea todavía no está disponible — confirmamos tu pedido por WhatsApp con estos datos.</p>
|
<p className="text-sm text-slate-500">El pago en línea todavía no está disponible — confirmamos tu pedido por WhatsApp con estos datos.</p>
|
||||||
|
|||||||
@@ -2,14 +2,15 @@
|
|||||||
|
|
||||||
import Link from "next/link";
|
import Link from "next/link";
|
||||||
import { usePathname, useSearchParams } from "next/navigation";
|
import { usePathname, useSearchParams } from "next/navigation";
|
||||||
import { ChevronDown, Heart, LayoutGrid, Menu, MessageCircle, PackageCheck, ShoppingCart, UserRound } from "lucide-react";
|
import { ChevronDown, Heart, LayoutGrid, Menu, ShoppingCart, UserRound } from "lucide-react";
|
||||||
import { Suspense, useEffect, useMemo, useRef, useState } from "react";
|
import { Suspense, useEffect, useMemo, useRef, useState } from "react";
|
||||||
|
import { AccountDialog } from "@/components/account/account-dialog";
|
||||||
import { PredictiveSearch } from "@/components/search/predictive-search";
|
import { PredictiveSearch } from "@/components/search/predictive-search";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Dialog, DialogContent } from "@/components/ui/dialog";
|
|
||||||
import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from "@/components/ui/sheet";
|
import { Sheet, SheetContent, SheetDescription, SheetHeader, SheetTitle } from "@/components/ui/sheet";
|
||||||
import type { Category, Product } from "@/lib/headless/types";
|
import type { Category, Product } from "@/lib/headless/types";
|
||||||
import { useCartStore } from "@/store/cart-store";
|
import { useCartStore } from "@/store/cart-store";
|
||||||
|
import { useCustomerStore } from "@/store/customer-store";
|
||||||
import { useWishlistStore } from "@/store/wishlist-store";
|
import { useWishlistStore } from "@/store/wishlist-store";
|
||||||
|
|
||||||
type CategoryNode = Category & { children: Category[] };
|
type CategoryNode = Category & { children: Category[] };
|
||||||
@@ -34,6 +35,9 @@ export function Navbar({ products, categories }: { products: Product[]; categori
|
|||||||
const openWishlist = useWishlistStore((state) => state.openWishlist);
|
const openWishlist = useWishlistStore((state) => state.openWishlist);
|
||||||
const count = cartHydrated ? items.reduce((sum, item) => sum + item.quantity, 0) : 0;
|
const count = cartHydrated ? items.reduce((sum, item) => sum + item.quantity, 0) : 0;
|
||||||
const wishlistCount = wishlistHydrated ? wishlistProducts.length : 0;
|
const wishlistCount = wishlistHydrated ? wishlistProducts.length : 0;
|
||||||
|
const customer = useCustomerStore((state) => state.customer);
|
||||||
|
const customerHydrated = useCustomerStore((state) => state.hasHydrated);
|
||||||
|
const isLoggedIn = customerHydrated && customer !== null;
|
||||||
|
|
||||||
const tree = useMemo(() => buildCategoryTree(categories), [categories]);
|
const tree = useMemo(() => buildCategoryTree(categories), [categories]);
|
||||||
// Derivado de los productos reales (no de un endpoint de colecciones):
|
// Derivado de los productos reales (no de un endpoint de colecciones):
|
||||||
@@ -62,7 +66,15 @@ export function Navbar({ products, categories }: { products: Product[]; categori
|
|||||||
</Link>
|
</Link>
|
||||||
<PredictiveSearch />
|
<PredictiveSearch />
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<Button variant="outline" size="icon" aria-label="Mi cuenta" className="hidden border-slate-300 bg-white text-slate-900 hover:border-ari-coral hover:bg-ari-coral/10 sm:inline-flex" onClick={() => setAccountOpen(true)}><UserRound /></Button>
|
{/* Antes escondido en mobile (solo alcanzable desde el menu
|
||||||
|
hamburguesa) -- pedido explicito del usuario: visible
|
||||||
|
siempre en el header, con un punto verde cuando hay sesion
|
||||||
|
iniciada (mismo patron que el badge de cantidad del
|
||||||
|
carrito/favoritos, pero de presencia, no de conteo). */}
|
||||||
|
<Button variant="outline" size="icon" aria-label={isLoggedIn ? "Mi cuenta (sesión iniciada)" : "Mi cuenta"} className="relative inline-flex border-slate-300 bg-white text-slate-900 hover:border-ari-coral hover:bg-ari-coral/10" onClick={() => setAccountOpen(true)}>
|
||||||
|
<UserRound />
|
||||||
|
{isLoggedIn && <span className="absolute -right-1 -top-1 size-3 rounded-full border-2 border-white bg-emerald-500" />}
|
||||||
|
</Button>
|
||||||
<Button variant="outline" size="icon" aria-label={`Favoritos: ${wishlistCount}`} className="relative hidden border-slate-300 bg-white text-slate-900 hover:border-ari-coral hover:bg-ari-coral/10 sm:inline-flex" onClick={openWishlist}>
|
<Button variant="outline" size="icon" aria-label={`Favoritos: ${wishlistCount}`} className="relative hidden border-slate-300 bg-white text-slate-900 hover:border-ari-coral hover:bg-ari-coral/10 sm:inline-flex" onClick={openWishlist}>
|
||||||
<Heart />
|
<Heart />
|
||||||
{wishlistCount > 0 && <span className="absolute -right-1.5 -top-1.5 grid size-5 place-items-center rounded-full bg-ari-marino text-[10px] font-black text-white">{wishlistCount}</span>}
|
{wishlistCount > 0 && <span className="absolute -right-1.5 -top-1.5 grid size-5 place-items-center rounded-full bg-ari-marino text-[10px] font-black text-white">{wishlistCount}</span>}
|
||||||
@@ -108,19 +120,7 @@ export function Navbar({ products, categories }: { products: Product[]; categori
|
|||||||
</SheetContent>
|
</SheetContent>
|
||||||
</Sheet>
|
</Sheet>
|
||||||
|
|
||||||
<Dialog open={accountOpen} onOpenChange={setAccountOpen}>
|
<AccountDialog open={accountOpen} onOpenChange={setAccountOpen} />
|
||||||
<DialogContent className="max-w-lg p-7">
|
|
||||||
<div className="pr-10">
|
|
||||||
<span className="text-xs font-black uppercase tracking-[.16em] text-ari-coral">Atención personalizada</span>
|
|
||||||
<h2 className="mt-3 text-3xl font-black">Tu cuenta ARI</h2>
|
|
||||||
<p className="mt-3 text-sm leading-6 text-slate-600">El inicio de sesión quedará conectado al backend headless. Mientras tanto, puedes gestionar pedidos y disponibilidad directamente por WhatsApp.</p>
|
|
||||||
<div className="mt-6 grid gap-3">
|
|
||||||
<Button asChild variant="primary" size="lg"><a href={process.env.NEXT_PUBLIC_WHATSAPP_URL ?? "https://wa.link/rvcqqc"} target="_blank" rel="noopener noreferrer"><MessageCircle />Hablar con ARI</a></Button>
|
|
||||||
<Button asChild variant="outline"><Link href="/catalog" onClick={() => setAccountOpen(false)}><PackageCheck />Ver mis opciones de compra</Link></Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
</header>
|
</header>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ spec:
|
|||||||
runAsUser: 1001
|
runAsUser: 1001
|
||||||
containers:
|
containers:
|
||||||
- name: app
|
- name: app
|
||||||
image: gitea.cruzcloud.net/devops/ecommerce-frontend:v1.0.209
|
image: gitea.cruzcloud.net/devops/ecommerce-frontend:v1.0.212
|
||||||
env:
|
env:
|
||||||
- name: HEADLESS_PROVIDER
|
- name: HEADLESS_PROVIDER
|
||||||
value: medusa
|
value: medusa
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
"data": [
|
||||||
|
{ "id": 5, "name": "Antioquia" },
|
||||||
|
{ "id": 8, "name": "Atlántico" },
|
||||||
|
{ "id": 11, "name": "Bogotá D.C." },
|
||||||
|
{ "id": 13, "name": "Bolívar" },
|
||||||
|
{ "id": 15, "name": "Boyacá" },
|
||||||
|
{ "id": 17, "name": "Caldas" },
|
||||||
|
{ "id": 18, "name": "Caquetá" },
|
||||||
|
{ "id": 19, "name": "Cauca" },
|
||||||
|
{ "id": 20, "name": "Cesar" },
|
||||||
|
{ "id": 23, "name": "Córdoba" },
|
||||||
|
{ "id": 25, "name": "Cundinamarca" },
|
||||||
|
{ "id": 27, "name": "Chocó" },
|
||||||
|
{ "id": 41, "name": "Huila" },
|
||||||
|
{ "id": 44, "name": "La Guajira" },
|
||||||
|
{ "id": 47, "name": "Magdalena" },
|
||||||
|
{ "id": 50, "name": "Meta" },
|
||||||
|
{ "id": 52, "name": "Nariño" },
|
||||||
|
{ "id": 54, "name": "Norte de Santander" },
|
||||||
|
{ "id": 63, "name": "Quindío" },
|
||||||
|
{ "id": 66, "name": "Risaralda" },
|
||||||
|
{ "id": 68, "name": "Santander" },
|
||||||
|
{ "id": 70, "name": "Sucre" },
|
||||||
|
{ "id": 73, "name": "Tolima" },
|
||||||
|
{ "id": 76, "name": "Valle del Cauca" },
|
||||||
|
{ "id": 81, "name": "Arauca" },
|
||||||
|
{ "id": 85, "name": "Casanare" },
|
||||||
|
{ "id": 86, "name": "Putumayo" },
|
||||||
|
{
|
||||||
|
"id": 88,
|
||||||
|
"name": "Archipiélago de San Andrés, Providencia y Santa Catalina"
|
||||||
|
},
|
||||||
|
{ "id": 91, "name": "Amazonas" },
|
||||||
|
{ "id": 94, "name": "Guainía" },
|
||||||
|
{ "id": 95, "name": "Guaviare" },
|
||||||
|
{ "id": 97, "name": "Vaupés" },
|
||||||
|
{ "id": 99, "name": "Vichada" }
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import departamentosData from "./co-departamentos.json";
|
||||||
|
import ciudadesData from "./co-ciudades.json";
|
||||||
|
|
||||||
|
// Dataset real de DIVIPOLA (Division Politico-Administrativa de Colombia,
|
||||||
|
// codigos oficiales del DANE) -- 33 departamentos + 1123 municipios,
|
||||||
|
// fuente: proyecto26/colombia (github.com/proyecto26/colombia), verificado
|
||||||
|
// contra la codificacion oficial antes de incorporarlo (ej. id 5001 =
|
||||||
|
// Medellin, departmentId 5 = Antioquia).
|
||||||
|
//
|
||||||
|
// Se usan los codigos (no solo los nombres) porque EnvioClick -- la
|
||||||
|
// integracion de envios real que reemplazara la tarifa fija de ADR 0009 --
|
||||||
|
// va a necesitar identificar la ciudad de forma inequivoca, y las
|
||||||
|
// transportadoras colombianas en general referencian ciudades por su
|
||||||
|
// codigo DIVIPOLA, no por texto libre.
|
||||||
|
|
||||||
|
export interface Departamento {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface Ciudad {
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
departmentId: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const departamentos: Departamento[] = departamentosData.data;
|
||||||
|
export const ciudades: Ciudad[] = ciudadesData.data;
|
||||||
|
|
||||||
|
export function ciudadesPorDepartamento(departmentId: number): Ciudad[] {
|
||||||
|
return ciudades.filter((ciudad) => ciudad.departmentId === departmentId);
|
||||||
|
}
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
// Cuentas de cliente reales conectadas a Medusa (Store API), mismo patron
|
||||||
|
// que medusa-cart.ts -- server-side, nunca cacheado (auth es estado
|
||||||
|
// mutable por sesion, no catalogo).
|
||||||
|
//
|
||||||
|
// Flujo verificado en vivo (2026-08-29) antes de escribir este archivo,
|
||||||
|
// no asumido contra documentacion: registro (auth/customer/emailpass/
|
||||||
|
// register) da un token de registro; ese token crea el customer real
|
||||||
|
// (POST /store/customers); pero ese token de registro NO sirve como
|
||||||
|
// sesion del customer -- hay que loguear de nuevo para obtener el token
|
||||||
|
// de sesion real. Mensajes de error exactos confirmados: registro con
|
||||||
|
// correo repetido -> 401 "Identity with email already exists"; login con
|
||||||
|
// credenciales invalidas -> 401 "Invalid email or password".
|
||||||
|
|
||||||
|
export interface CustomerSummary {
|
||||||
|
token: string;
|
||||||
|
id: string;
|
||||||
|
email: string;
|
||||||
|
firstName: string | null;
|
||||||
|
lastName: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function backendUrl(): string {
|
||||||
|
const value = process.env.MEDUSA_BACKEND_URL;
|
||||||
|
if (!value) {
|
||||||
|
throw new Error("MEDUSA_BACKEND_URL no está configurado.");
|
||||||
|
}
|
||||||
|
return value.replace(/\/$/, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
async function medusaAuthFetch(
|
||||||
|
path: string,
|
||||||
|
init?: { method?: string; body?: unknown; token?: string },
|
||||||
|
): Promise<Record<string, unknown>> {
|
||||||
|
const publishableKey = process.env.MEDUSA_PUBLISHABLE_KEY;
|
||||||
|
|
||||||
|
const response = await fetch(`${backendUrl()}${path}`, {
|
||||||
|
method: init?.method ?? "GET",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
...(publishableKey ? { "x-publishable-api-key": publishableKey } : {}),
|
||||||
|
...(init?.token ? { Authorization: `Bearer ${init.token}` } : {}),
|
||||||
|
},
|
||||||
|
body: init?.body ? JSON.stringify(init.body) : undefined,
|
||||||
|
cache: "no-store",
|
||||||
|
});
|
||||||
|
|
||||||
|
const data = await response.json().catch(() => ({}));
|
||||||
|
if (!response.ok) {
|
||||||
|
const message = typeof data.message === "string" ? data.message : `Error ${response.status}`;
|
||||||
|
throw new Error(message);
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
type MedusaCustomer = {
|
||||||
|
id: string;
|
||||||
|
email: string;
|
||||||
|
first_name?: string | null;
|
||||||
|
last_name?: string | null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function getCurrentCustomer(token: string): Promise<CustomerSummary> {
|
||||||
|
const data = await medusaAuthFetch("/store/customers/me", { token });
|
||||||
|
const customer = data.customer as MedusaCustomer;
|
||||||
|
return {
|
||||||
|
token,
|
||||||
|
id: customer.id,
|
||||||
|
email: customer.email,
|
||||||
|
firstName: customer.first_name ?? null,
|
||||||
|
lastName: customer.last_name ?? null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function loginCustomer(email: string, password: string): Promise<CustomerSummary> {
|
||||||
|
let data: Record<string, unknown>;
|
||||||
|
try {
|
||||||
|
data = await medusaAuthFetch("/auth/customer/emailpass", {
|
||||||
|
method: "POST",
|
||||||
|
body: { email, password },
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
if ((error as Error).message === "Invalid email or password") {
|
||||||
|
throw new Error("Correo o contraseña incorrectos.");
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
return getCurrentCustomer(data.token as string);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function registerCustomer(
|
||||||
|
email: string,
|
||||||
|
password: string,
|
||||||
|
firstName: string,
|
||||||
|
lastName: string,
|
||||||
|
): Promise<CustomerSummary> {
|
||||||
|
let data: Record<string, unknown>;
|
||||||
|
try {
|
||||||
|
data = await medusaAuthFetch("/auth/customer/emailpass/register", {
|
||||||
|
method: "POST",
|
||||||
|
body: { email, password },
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
if ((error as Error).message === "Identity with email already exists") {
|
||||||
|
throw new Error("Ese correo ya está registrado — inicia sesión en vez de crear una cuenta nueva.");
|
||||||
|
}
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
await medusaAuthFetch("/store/customers", {
|
||||||
|
method: "POST",
|
||||||
|
token: data.token as string,
|
||||||
|
body: { email, first_name: firstName, last_name: lastName },
|
||||||
|
});
|
||||||
|
// El token de registro crea el customer pero no queda como sesion real
|
||||||
|
// -- se loguea de nuevo para obtener el token de sesion (confirmado en
|
||||||
|
// vivo, no documentado explicitamente).
|
||||||
|
return loginCustomer(email, password);
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { create } from "zustand";
|
||||||
|
import { createJSONStorage, persist } from "zustand/middleware";
|
||||||
|
|
||||||
|
// Cuenta de cliente real conectada a Medusa (Store API, via
|
||||||
|
// /api/customer/*), mismo patron que cart-store.ts: token + datos basicos
|
||||||
|
// persistidos en localStorage, resincronizados contra el servidor al
|
||||||
|
// rehidratar (el token puede llevar dias, o haber sido revocado).
|
||||||
|
export interface Customer {
|
||||||
|
id: string;
|
||||||
|
email: string;
|
||||||
|
firstName: string | null;
|
||||||
|
lastName: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface CustomerState {
|
||||||
|
token: string | null;
|
||||||
|
customer: Customer | null;
|
||||||
|
hasHydrated: boolean;
|
||||||
|
loading: boolean;
|
||||||
|
error: string | null;
|
||||||
|
setHasHydrated: (value: boolean) => void;
|
||||||
|
register: (email: string, password: string, firstName: string, lastName: string) => Promise<boolean>;
|
||||||
|
login: (email: string, password: string) => Promise<boolean>;
|
||||||
|
logout: () => void;
|
||||||
|
syncCustomer: () => Promise<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function postJson(url: string, body: unknown) {
|
||||||
|
const response = await fetch(url, {
|
||||||
|
method: "POST",
|
||||||
|
headers: { "Content-Type": "application/json" },
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
});
|
||||||
|
return response.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
function toCustomer(data: Record<string, unknown>): Customer {
|
||||||
|
return {
|
||||||
|
id: data.id as string,
|
||||||
|
email: data.email as string,
|
||||||
|
firstName: (data.firstName as string | null) ?? null,
|
||||||
|
lastName: (data.lastName as string | null) ?? null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useCustomerStore = create<CustomerState>()(
|
||||||
|
persist(
|
||||||
|
(set, get) => ({
|
||||||
|
token: null,
|
||||||
|
customer: null,
|
||||||
|
hasHydrated: false,
|
||||||
|
loading: false,
|
||||||
|
error: null,
|
||||||
|
setHasHydrated: (value) => set({ hasHydrated: value }),
|
||||||
|
|
||||||
|
register: async (email, password, firstName, lastName) => {
|
||||||
|
set({ loading: true, error: null });
|
||||||
|
const result = await postJson("/api/customer/register", { email, password, firstName, lastName });
|
||||||
|
if (result.error) {
|
||||||
|
set({ loading: false, error: result.error });
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
set({ loading: false, token: result.token, customer: toCustomer(result) });
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
login: async (email, password) => {
|
||||||
|
set({ loading: true, error: null });
|
||||||
|
const result = await postJson("/api/customer/login", { email, password });
|
||||||
|
if (result.error) {
|
||||||
|
set({ loading: false, error: result.error });
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
set({ loading: false, token: result.token, customer: toCustomer(result) });
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
|
||||||
|
logout: () => set({ token: null, customer: null, error: null }),
|
||||||
|
|
||||||
|
// El token guardado en localStorage puede llevar dias o haber sido
|
||||||
|
// revocado -- se refresca contra el servidor en vez de confiar en el
|
||||||
|
// ultimo snapshot local.
|
||||||
|
syncCustomer: async () => {
|
||||||
|
const token = get().token;
|
||||||
|
if (!token) return;
|
||||||
|
try {
|
||||||
|
const response = await fetch(`/api/customer/me?token=${encodeURIComponent(token)}`);
|
||||||
|
if (!response.ok) {
|
||||||
|
set({ token: null, customer: null });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const result = await response.json();
|
||||||
|
if (result.id) set({ customer: toCustomer(result) });
|
||||||
|
} catch {
|
||||||
|
// Sin red: se queda con el ultimo estado local conocido.
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
name: "ari-shopping-customer-v1",
|
||||||
|
storage: createJSONStorage(() => localStorage),
|
||||||
|
partialize: (state) => ({ token: state.token, customer: state.customer }),
|
||||||
|
onRehydrateStorage: () => (state) => {
|
||||||
|
state?.setHasHydrated(true);
|
||||||
|
void state?.syncCustomer();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
Reference in new issue
Block a user