admin/homaroma
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

x

Browse Source
This commit is contained in:
Your Name committed 2026-06-18 21:59:16 -04:00
1 parent feeda6dc60
commit 927f03a8b7
12 files changed
+95 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/website/src/app/layout.tsx
+1 -1
View File
@@ -88,7 +88,7 @@ export default async function RootLayout({
<html lang="th" className="scroll-smooth">
<body className="min-h-screen bg-pop-bg text-pop-black font-sans antialiased">
<ClientProviders>
<Navbar categories={categories} initialMenu={initialMenu} />
<Navbar categories={categories} initialMenu={initialMenu} settings={settings} />
<main className="pt-[72px]">
{children}
</main>
apps/website/src/components/Footer.tsx
+4 -3
View File
@@ -52,6 +52,7 @@ export default function Footer({
// Social links — use settings if available, fallback to placeholder buttons
const hasSocialLinks = settings && (settings.facebookUrl || settings.instagramUrl || settings.tiktokUrl)
const brandName = settings?.brandName || 'HomAroma'
return (
<footer className="border-t border-gray-200 bg-white px-6 py-20 text-pop-black">
@@ -60,7 +61,7 @@ export default function Footer({
{/* Col 1 — Brand */}
<div className="space-y-6">
<div className="text-2xl font-bold tracking-widest">
HomAroma <span className="text-sm font-semibold italic text-pop-pink">Essential</span>
{brandName} <span className="text-sm font-semibold italic text-pop-pink">Essential</span>
</div>
<p className="text-sm leading-relaxed text-gray-600">
{resolveLocalized(settings?.footerDescription, effectiveLang) || t('footer.catchphrase')}
@@ -174,8 +175,8 @@ export default function Footer({
? settings.footerCopyrightText
: settings.footerCopyrightText[effectiveLang]
|| settings.footerCopyrightText.en
|| `© ${new Date().getFullYear()} HomAroma. ${t('footer.rights')}`)
: `© ${new Date().getFullYear()} HomAroma. ${t('footer.rights')}`}
|| `© ${new Date().getFullYear()} ${brandName}. ${t('footer.rights')}`)
: `© ${new Date().getFullYear()} ${brandName}. ${t('footer.rights')}`}
</p>
</div>
</div>
apps/website/src/components/Navbar.tsx
+5 -2
View File
@@ -14,10 +14,12 @@ import { useLang } from '../hooks/useLang'
import { DesktopMegaMenu } from './navigation/DesktopMegaMenu'
import { MobileDrawer } from './navigation/MobileDrawer'
import type { MegaMenuPayload } from './navigation/menuTypes'
import type { StoreSettings } from '@homaroma/types'
interface NavbarProps {
categories?: Category[]
initialMenu?: MegaMenuPayload[]
settings?: StoreSettings | null
}
const LANGUAGES = [
@@ -60,7 +62,7 @@ function createFallbackMenu(categories: Category[]): MegaMenuPayload[] {
]
}
export default function Navbar({ categories = [], initialMenu = [] }: NavbarProps) {
export default function Navbar({ categories = [], initialMenu = [], settings = null }: NavbarProps) {
const [searchOpen, setSearchOpen] = useState(false)
const [mobileOpen, setMobileOpen] = useState(false)
const [langSheetOpen, setLangSheetOpen] = useState(false)
@@ -143,6 +145,7 @@ export default function Navbar({ categories = [], initialMenu = [] }: NavbarProp
const iconButtonClass = 'rounded-full p-1.5 text-pop-black/65 transition-all hover:bg-pop-bg hover:text-pop-pink md:p-2'
const activeLanguage = LANGUAGES.find((language) => lang.startsWith(language.code) || language.code.startsWith(lang)) ?? LANGUAGES[0]
const brandName = settings?.brandName || 'HomAroma'
return (
<>
@@ -161,7 +164,7 @@ export default function Navbar({ categories = [], initialMenu = [] }: NavbarProp
onClick={() => setMobileOpen(false)}
className="shrink-0 text-xl font-bold uppercase italic tracking-widest text-pop-black md:text-2xl"
>
HomAroma <span className="hidden text-xs font-light not-italic text-pop-black/55 md:inline md:text-sm">Essential</span>
{brandName} <span className="hidden text-xs font-light not-italic text-pop-black/55 md:inline md:text-sm">Essential</span>
</Link>
</div>