bender/4c20e162-e1ed-4f78-bb8f-e2a414c7e930
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_2 bender:version_1

4 Commits
version_1 ... main

Author SHA1 Message Date
bender
78cdf07643 Merge version_2 into main 
Merge version_2 into main
 2026-03-05 20:43:42 +00:00
bender
fc5bfa686c Update src/app/page.tsx 2026-03-05 20:43:37 +00:00
bender
ee43e1ddca Update src/app/layout.tsx 2026-03-05 20:43:36 +00:00
bender
1537795a7f Merge version_1 into main 
Merge version_1 into main
 2026-03-05 20:38:53 +00:00
2 changed files with 15 additions and 27 deletions
Expand all files Collapse all files

17
src/app/layout.tsx
View File

@@ -1,24 +1,13 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google"; import { Inter } from "next/font/google";
import { Montserrat } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({ const inter = Inter({
variable: "--font-inter", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
const montserrat = Montserrat({
variable: "--font-montserrat", subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: "VR Hair Salon | Peluquería Profesional en Bogotá", description: "VR Hair Salon - Peluquería profesional en Bogotá. Servicios de corte, color y tratamientos capilares. Ubicado en Cra. 53a #122-25 3. Abierto de lunes a sábado.", keywords: "peluquería bogotá, salon de belleza, cortes de cabello, color cabello, tratamientos capilares", metadataBase: new URL("https://vrhairsalon.com"), title: "VR Hair Salon | Peluquería Profesional en Bogotá", description: "VR Hair Salon - Peluquería profesional en Bogotá. Servicios de corte, color y tratamientos capilares. Ubicado en Cra. 53a #122-25 3. Abierto de lunes a sábado.", keywords: "peluquería bogotá, salon de belleza, cortes de cabello, color cabello, tratamientos capilares", metadataBase: new URL("https://vrhairsalon.com"),
alternates: { alternates: {
@@ -44,11 +33,9 @@ export default function RootLayout({
children: React.ReactNode; children: React.ReactNode;
}>) { }>) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="es" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body className={`${inter.variable} antialiased`}>
className={`${halant.variable} ${inter.variable} ${montserrat.variable} antialiased`}
>
<Tag /> <Tag />
{children} {children}

21
src/app/page.tsx
View File

@@ -8,7 +8,7 @@ import TestimonialCardFifteen from '@/components/sections/testimonial/Testimonia
import ContactText from '@/components/sections/contact/ContactText'; import ContactText from '@/components/sections/contact/ContactText';
import FooterCard from '@/components/sections/footer/FooterCard'; import FooterCard from '@/components/sections/footer/FooterCard';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { Clock, Instagram, MapPin, Phone, Scissors } from 'lucide-react'; import { Clock, Instagram, MapPin, Phone, Scissors, Wifi, CreditCard, LinkIcon, Star } from 'lucide-react';
export default function LandingPage() { export default function LandingPage() {
return ( return (
@@ -30,8 +30,7 @@ export default function LandingPage() {
{ name: "Servicios", id: "services" }, { name: "Servicios", id: "services" },
{ name: "Ubicación", id: "location" }, { name: "Ubicación", id: "location" },
{ name: "Reseñas", id: "reviews" }, { name: "Reseñas", id: "reviews" },
{ name: "Contacto", id: "contact" }, { name: "Contacto", id: "contact" }
{ name: "Instagram", id: "https://instagram.com/vrhairsalon" }
]} ]}
brandName="VR Hair Salon" brandName="VR Hair Salon"
bottomLeftText="Bogotá, Colombia" bottomLeftText="Bogotá, Colombia"
@@ -63,8 +62,8 @@ export default function LandingPage() {
tagIcon={MapPin} tagIcon={MapPin}
tagAnimation="slide-up" tagAnimation="slide-up"
title="Visítanos en Bogotá" title="Visítanos en Bogotá"
description="Cra. 53a #122 - 25 3, Bogotá" description="Cra. 53a #122 - 25 3, Bogotá, Colombia"
subdescription="¡Abierto ahora!" subdescription="Jueves a Miércoles: 7:30 a.m. - 7:00 p.m. | Sábado: 8:00 a.m. - 7:00 p.m. | Domingo: Cerrado"
icon={Clock} icon={Clock}
imageSrc="http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg?_wi=2" imageSrc="http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg?_wi=2"
imageAlt="Ubicación de VR Hair Salon" imageAlt="Ubicación de VR Hair Salon"
@@ -94,7 +93,7 @@ export default function LandingPage() {
}, },
{ {
id: 4, id: 4,
title: "Peinados Especiales", description: "Diseño de peinados para eventos especiales y ocasiones importantes", imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg?_wi=6", imageAlt: "Peinados especiales" title: "Sanitario y Wi-Fi Gratis", description: "Instalaciones limpias y modernas con conexión a internet gratis para tu comodidad", imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-cut-hair-her-client-hair-salon_1157-27201.jpg?_wi=6", imageAlt: "Comodidades"
} }
]} ]}
textboxLayout="default" textboxLayout="default"
@@ -122,11 +121,11 @@ export default function LandingPage() {
<div id="info-section" data-section="info-section"> <div id="info-section" data-section="info-section">
<ContactText <ContactText
text="¿Listo para transformar tu estilo? Contáctanos hoy y agenda tu cita con nuestros expertos en peluquería." text="¿Listo para transformar tu estilo? Contáctanos hoy y agenda tu cita con nuestros expertos en peluquería. Aceptamos tarjetas de crédito y débito."
animationType="entrance-slide" animationType="entrance-slide"
buttons={[ buttons={[
{ text: "Llamar: 316 6250743", href: "tel:+573166250743" }, { text: "Llamar: 316 6250743", href: "tel:+573166250743" },
{ text: "Seguir en Instagram", href: "https://instagram.com/vrhairsalon" } { text: "Seguir en Instagram", href: "https://www.instagram.com/vrhairsalon/" }
]} ]}
background={{ variant: "plain" }} background={{ variant: "plain" }}
useInvertedBackground={false} useInvertedBackground={false}
@@ -138,8 +137,10 @@ export default function LandingPage() {
logoText="VR Hair Salon" logoText="VR Hair Salon"
copyrightText="© 2025 VR Hair Salon | Cra. 53a #122-25 3, Bogotá | Todos los derechos reservados" copyrightText="© 2025 VR Hair Salon | Cra. 53a #122-25 3, Bogotá | Todos los derechos reservados"
socialLinks={[ socialLinks={[
{ icon: Instagram, href: "https://instagram.com/vrhairsalon", ariaLabel: "Instagram de VR Hair Salon" }, { icon: Instagram, href: "https://www.instagram.com/vrhairsalon/", ariaLabel: "Instagram de VR Hair Salon" },
{ icon: Phone, href: "tel:+573166250743", ariaLabel: "Llamar a VR Hair Salon" } { icon: Phone, href: "tel:+573166250743", ariaLabel: "Llamar a VR Hair Salon" },
{ icon: LinkIcon, href: "https://linktr.ee/johanhair76", ariaLabel: "Enlaces en linktree" },
{ icon: MapPin, href: "https://maps.app.goo.gl/NaQxHBkNnxZ9dSCX8", ariaLabel: "Ver ubicación en Google Maps" }
]} ]}
/> />
</div> </div>