fix: move header nav to separate row

Reviewed-on: #15

apps/backend/src/modules/images/storage.service.ts

@@ -25,6 +25,20 @@ export async function saveUploadedImage(
   return { imageUrl: relative };
 }
 
+export async function saveUploadedAvatar(
+  userId: string,
+  mime: string,
+  buffer: Buffer,
+): Promise<{ imageUrl: string }> {
+  const ext = MIME_TO_EXT[mime];
+  if (!ext) throw new ValidationError('Unsupported image type');
+  const filename = `${userId}-${nanoid(8)}.${ext}`;
+  const relative = `/uploads/avatar/${filename}`;
+  const absPath = resolve(env.UPLOADS_DIR, 'avatar', filename);
+  await writeFile(absPath, buffer);
+  return { imageUrl: relative };
+}
+
 export async function deleteLocalImageIfAny(imageUrl: string | null): Promise<void> {
   if (!imageUrl) return;
   if (!imageUrl.startsWith('/uploads/')) return;

apps/backend/src/modules/profile/profile.routes.ts

@@ -1,7 +1,11 @@
 import type { FastifyInstance } from 'fastify';
 import { updateProfileSchema } from '@family-wishlist/shared';
-import { ConflictError, NotFoundError } from '../../utils/errors.js';
+import { ConflictError, NotFoundError, ValidationError } from '../../utils/errors.js';
 import { Prisma } from '@prisma/client';
+import { deleteLocalImageIfAny, saveUploadedAvatar } from '../images/storage.service.js';
+import { usersRegistry } from '../../auth/users.registry.js';
+
+const MAX_AVATAR_BYTES = 2 * 1024 * 1024;
 
 export default async function profileRoutes(app: FastifyInstance) {
   app.addHook('preHandler', app.authenticate);
@@ -12,6 +16,16 @@ export default async function profileRoutes(app: FastifyInstance) {
     return profile;
   });
 
+  app.get('/friend', async (request) => {
+    const friend = usersRegistry.all().find((u) => u.id !== request.user.id);
+    if (!friend) return null;
+
+    return app.prisma.user.findUnique({
+      where: { id: friend.id },
+      select: { slug: true, displayName: true, avatarUrl: true },
+    });
+  });
+
   app.patch('/', async (request) => {
     const body = updateProfileSchema.parse(request.body);
     try {
@@ -27,4 +41,25 @@ export default async function profileRoutes(app: FastifyInstance) {
       throw err;
     }
   });
+
+  app.post('/avatar', async (request) => {
+    const current = await app.prisma.user.findUnique({ where: { id: request.user.id } });
+    if (!current) throw new NotFoundError('Profile');
+
+    const data = await request.file();
+    if (!data) throw new ValidationError('No file uploaded');
+
+    const buffer = await data.toBuffer();
+    if (buffer.byteLength > MAX_AVATAR_BYTES) {
+      throw new ValidationError('Avatar must be 2 MB or less');
+    }
+
+    const { imageUrl } = await saveUploadedAvatar(request.user.id, data.mimetype, buffer);
+    await deleteLocalImageIfAny(current.avatarUrl);
+
+    return app.prisma.user.update({
+      where: { id: request.user.id },
+      data: { avatarUrl: imageUrl },
+    });
+  });
 }

apps/frontend/src/App.tsx

@@ -4,6 +4,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { Toaster } from 'sonner';
 import { router } from './routes';
 import { useAuthStore } from './features/auth/authStore';
+import { I18nProvider } from './i18n/i18n';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -24,11 +25,13 @@ function AuthBoot({ children }: { children: React.ReactNode }) {
 
 export function App() {
   return (
-    <QueryClientProvider client={queryClient}>
-      <AuthBoot>
-        <RouterProvider router={router} />
-      </AuthBoot>
-      <Toaster position="top-center" richColors closeButton />
-    </QueryClientProvider>
+    <I18nProvider>
+      <QueryClientProvider client={queryClient}>
+        <AuthBoot>
+          <RouterProvider router={router} />
+        </AuthBoot>
+        <Toaster position="top-center" richColors closeButton />
+      </QueryClientProvider>
+    </I18nProvider>
   );
 }

apps/frontend/src/components/LanguageSwitcher.tsx

@@ -0,0 +1,39 @@
+import { Languages } from 'lucide-react';
+import { useI18n, type Language } from '@/i18n/i18n';
+import { cn } from '@/lib/cn';
+
+const languages: Array<{ value: Language; label: string }> = [
+  { value: 'ru', label: 'RU' },
+  { value: 'en', label: 'EN' },
+];
+
+export function LanguageSwitcher({ className }: { className?: string }) {
+  const { language, setLanguage, t } = useI18n();
+
+  return (
+    <div
+      className={cn(
+        'language-switcher',
+        className,
+      )}
+      aria-label={t('language.switch')}
+    >
+      <Languages className="language-switcher__icon" aria-hidden />
+      {languages.map((item) => (
+        <button
+          key={item.value}
+          type="button"
+          onClick={() => setLanguage(item.value)}
+          className={cn(
+            'language-switcher__button',
+            language === item.value && 'language-switcher__button--active',
+          )}
+          aria-pressed={language === item.value}
+          title={item.value === 'ru' ? t('language.ru') : t('language.en')}
+        >
+          {item.label}
+        </button>
+      ))}
+    </div>
+  );
+}

apps/frontend/src/components/Layout/AppShell.tsx

@@ -4,9 +4,9 @@ import { Footer } from './Footer';
 
 export function AppShell() {
   return (
-    <div className="flex min-h-screen flex-col">
+    <div className="app-shell">
       <Header />
-      <main className="container-page flex-1 py-6 sm:py-10">
+      <main className="app-shell__main">
         <Outlet />
       </main>
       <Footer />

apps/frontend/src/components/Layout/Footer.tsx

@@ -2,12 +2,14 @@ import { useQuery } from '@tanstack/react-query';
 import { Gift } from 'lucide-react';
 import { api } from '@/lib/api';
 import { FRONTEND_VERSION } from '@/lib/version';
+import { useI18n } from '@/i18n/i18n';
 
 interface VersionInfo {
   backend: string;
 }
 
 export function Footer() {
+  const { t } = useI18n();
   const { data } = useQuery({
     queryKey: ['version'],
     queryFn: () => api.get<VersionInfo>('/api/version'),
@@ -15,16 +17,16 @@ export function Footer() {
   });
 
   return (
-    <footer className="container-page mt-10 py-6 text-xs text-muted">
-      <div className="flex flex-col items-center justify-between gap-2 sm:flex-row">
-        <div className="flex items-center gap-2">
+    <footer className="app-footer">
+      <div className="app-footer__inner">
+        <div className="app-footer__brand">
           <Gift className="h-4 w-4" aria-hidden />
-          <span className="font-display text-sm">Family Wishlist</span>
+          <span className="app-footer__brand-name">{t('app.name')}</span>
         </div>
-        <div className="flex items-center gap-3">
-          <span>frontend v{FRONTEND_VERSION}</span>
-          <span className="opacity-50">·</span>
-          <span>backend v{data?.backend ?? '...'}</span>
+        <div className="app-footer__meta">
+          <span>{t('footer.frontend', { version: FRONTEND_VERSION })}</span>
+          <span className="app-footer__separator">·</span>
+          <span>{t('footer.backend', { version: data?.backend ?? '...' })}</span>
         </div>
       </div>
     </footer>

apps/frontend/src/components/Layout/Header.tsx

@@ -1,79 +1,124 @@
 import { Link, NavLink, useNavigate } from 'react-router-dom';
-import { Archive, Gift, LogOut, Sparkles, Trash2, UserCog, CheckCircle2 } from 'lucide-react';
+import { Archive, CheckCircle2, Gift, LogOut, Sparkles, Trash2, UserCog, Users } from 'lucide-react';
+import type { ComponentType } from 'react';
+import { useQuery } from '@tanstack/react-query';
 import { Button } from '../ui/Button';
 import { useAuthStore } from '@/features/auth/authStore';
 import { cn } from '@/lib/cn';
+import { useI18n, type TranslationKey } from '@/i18n/i18n';
+import { LanguageSwitcher } from '../LanguageSwitcher';
+import { api } from '@/lib/api';
+
+type NavIcon = ComponentType<{ className?: string }>;
+
+interface FriendProfile {
+  slug: string;
+  displayName: string;
+  avatarUrl: string | null;
+}
 
 const links = [
-  { to: '/', label: 'Active', icon: Sparkles, end: true },
-  { to: '/completed', label: 'Fulfilled', icon: CheckCircle2 },
-  { to: '/archive', label: 'Archive', icon: Archive },
-  { to: '/trash', label: 'Trash', icon: Trash2 },
-];
+  { to: '/', label: 'header.active', icon: Sparkles, end: true },
+  { to: '/completed', label: 'header.fulfilled', icon: CheckCircle2 },
+  { to: '/archive', label: 'header.archive', icon: Archive },
+  { to: '/trash', label: 'header.trash', icon: Trash2 },
+] satisfies Array<{
+  to: string;
+  label: TranslationKey;
+  icon: NavIcon;
+  end?: boolean;
+}>;
 
 export function Header() {
   const user = useAuthStore((s) => s.user);
   const logout = useAuthStore((s) => s.logout);
   const navigate = useNavigate();
+  const { t } = useI18n();
+  const friend = useQuery({
+    queryKey: ['profile-friend'],
+    queryFn: () => api.get<FriendProfile | null>('/api/profile/friend'),
+    staleTime: 10 * 60 * 1000,
+    enabled: user != null,
+  });
 
   if (!user) return null;
 
   return (
-    <header className="container-page pt-6">
-      <div className="flex flex-wrap items-center justify-between gap-3 rounded-lg border border-border bg-surface/80 px-4 py-3 backdrop-blur">
-        <Link to="/" className="flex items-center gap-2">
-          <span className="inline-flex h-9 w-9 items-center justify-center rounded-md bg-primary text-primary-foreground shadow-card">
+    <header className="app-header">
+      <div className="app-header__inner">
+        <Link to="/" className="app-header__brand">
+          <span className="app-header__brand-mark">
             <Gift className="h-4 w-4" />
           </span>
-          <div>
-            <div className="font-display text-lg leading-tight">Family Wishlist</div>
-            <div className="text-xs text-muted">
-              signed in as <span className="font-medium text-ink">{user.displayName}</span>
+          <div className="min-w-0">
+            <div className="app-header__brand-title">{t('app.name')}</div>
+            <div className="app-header__brand-subtitle">
+              {t('header.signedInAs', { name: user.displayName })}
             </div>
           </div>
         </Link>
 
-        <nav className="flex flex-wrap items-center gap-1">
-          {links.map((l) => (
-            <NavLink
-              key={l.to}
-              to={l.to}
-              end={l.end}
-              className={({ isActive }) =>
-                cn(
-                  'inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-sm font-medium transition-colors',
-                  isActive ? 'bg-primary text-primary-foreground shadow-card' : 'text-ink hover:bg-ink/5',
-                )
-              }
-            >
-              <l.icon className="h-4 w-4" />
-              {l.label}
-            </NavLink>
-          ))}
-        </nav>
-
-        <div className="flex items-center gap-1">
+        <div className="app-header__actions">
+          <LanguageSwitcher />
           <Button
             variant="ghost"
             size="sm"
+            className="app-header__action"
             onClick={() => navigate('/settings')}
-            title="Profile settings"
+            title={t('header.profileSettings')}
+            aria-label={t('header.profileSettings')}
           >
             <UserCog className="h-4 w-4" />
-            Profile
+            <span className="app-header__action-text">{t('header.profile')}</span>
           </Button>
           <Button
             variant="ghost"
             size="sm"
+            className="app-header__action"
             onClick={() => {
               void logout().then(() => navigate('/login'));
             }}
+            title={t('header.logout')}
+            aria-label={t('header.logout')}
           >
             <LogOut className="h-4 w-4" />
-            Log out
+            <span className="app-header__action-text">{t('header.logout')}</span>
           </Button>
         </div>
       </div>
+
+      <nav className="app-header__nav">
+        {links.map((l) => (
+          <NavLink
+            key={l.to}
+            to={l.to}
+            end={l.end}
+            className={({ isActive }) =>
+              cn(
+                'app-header__nav-link',
+                isActive && 'app-header__nav-link--active',
+              )
+            }
+          >
+            <l.icon className="h-4 w-4" />
+            {t(l.label)}
+          </NavLink>
+        ))}
+        {friend.data && (
+          <NavLink
+            to={`/u/${friend.data.slug}`}
+            className={({ isActive }) =>
+              cn(
+                'app-header__nav-link',
+                isActive && 'app-header__nav-link--active',
+              )
+            }
+          >
+            <Users className="h-4 w-4" />
+            {t('header.friendWishes', { name: friend.data.displayName })}
+          </NavLink>
+        )}
+      </nav>
     </header>
   );
 }

apps/frontend/src/components/Layout/ProtectedRoute.tsx

@@ -1,13 +1,17 @@
 import { Navigate, useLocation } from 'react-router-dom';
 import type { ReactNode } from 'react';
 import { useAuthStore } from '@/features/auth/authStore';
+import { useI18n } from '@/i18n/i18n';
 
 export function ProtectedRoute({ children }: { children: ReactNode }) {
   const { user, status } = useAuthStore();
   const location = useLocation();
+  const { t } = useI18n();
   if (status !== 'ready') {
     return (
-      <div className="flex min-h-[50vh] items-center justify-center text-muted">Loading...</div>
+      <div className="flex min-h-[50vh] items-center justify-center text-muted">
+        {t('protected.loading')}
+      </div>
     );
   }
   if (!user) {

apps/frontend/src/components/WishBadges/WishBadges.tsx

@@ -1,6 +1,7 @@
 import { Check, Sparkles, Archive, Trash2 } from 'lucide-react';
 import type { Wish } from '@family-wishlist/shared';
 import { cn } from '@/lib/cn';
+import { useI18n } from '@/i18n/i18n';
 
 interface Props {
   wish: Wish & { isNewForOwner?: boolean };
@@ -9,6 +10,7 @@ interface Props {
 }
 
 export function WishBadges({ wish, view, className }: Props) {
+  const { t } = useI18n();
   const badges: JSX.Element[] = [];
 
   const isNew =
@@ -17,7 +19,7 @@ export function WishBadges({ wish, view, className }: Props) {
     badges.push(
       <span className="wish-badge wish-badge--new" key="new">
         <Sparkles className="h-3 w-3" aria-hidden />
-        new
+        {t('wish.badge.new')}
       </span>,
     );
   }
@@ -25,7 +27,7 @@ export function WishBadges({ wish, view, className }: Props) {
     badges.push(
       <span className="wish-badge wish-badge--completed" key="done">
         <Check className="h-3 w-3" aria-hidden />
-        fulfilled
+        {t('wish.badge.fulfilled')}
       </span>,
     );
   }
@@ -33,7 +35,7 @@ export function WishBadges({ wish, view, className }: Props) {
     badges.push(
       <span className="wish-badge wish-badge--archived" key="arch">
         <Archive className="h-3 w-3" aria-hidden />
-        archived
+        {t('wish.badge.archived')}
       </span>,
     );
   }
@@ -41,7 +43,7 @@ export function WishBadges({ wish, view, className }: Props) {
     badges.push(
       <span className="wish-badge wish-badge--deleted" key="del">
         <Trash2 className="h-3 w-3" aria-hidden />
-        trash
+        {t('wish.badge.trash')}
       </span>,
     );
   }

apps/frontend/src/components/WishCard/WishCard.tsx

@@ -14,6 +14,7 @@ import { WishBadges } from '../WishBadges/WishBadges';
 import { Button } from '../ui/Button';
 import { cn } from '@/lib/cn';
 import { formatPrice } from '@/lib/format';
+import { useI18n } from '@/i18n/i18n';
 
 export type WishCardView = 'owner' | 'guest';
 
@@ -49,39 +50,40 @@ function WishCardInner({
   footer,
 }: WishCardProps) {
   const [menuOpen, setMenuOpen] = useState(false);
+  const { locale, t } = useI18n();
   const completed = wish.status === 'COMPLETED';
-  const priceLabel = formatPrice(wish.price, wish.currency);
+  const priceLabel = formatPrice(wish.price, wish.currency, locale);
   const imageSrc = wish.imageUrl ?? '/default-gift.svg';
 
   const actions: WishCardAction[] = [];
   if (view === 'owner') {
     if (wish.status === 'ACTIVE') {
-      if (onEdit) actions.push({ key: 'edit', icon: Pencil, label: 'Edit', onClick: onEdit });
+      if (onEdit) actions.push({ key: 'edit', icon: Pencil, label: t('wish.action.edit'), onClick: onEdit });
       if (onComplete)
         actions.push({
           key: 'complete',
           icon: CheckCircle2,
-          label: 'Mark fulfilled',
+          label: t('wish.action.complete'),
           onClick: onComplete,
         });
       if (onArchive)
-        actions.push({ key: 'archive', icon: Archive, label: 'Archive', onClick: onArchive });
+        actions.push({ key: 'archive', icon: Archive, label: t('wish.action.archive'), onClick: onArchive });
       if (onDelete)
         actions.push({
           key: 'delete',
           icon: Trash2,
-          label: 'Delete',
+          label: t('wish.action.delete'),
           onClick: onDelete,
           danger: true,
         });
     } else if (wish.status === 'ARCHIVED') {
       if (onRestore)
-        actions.push({ key: 'restore', icon: RotateCcw, label: 'Restore', onClick: onRestore });
+        actions.push({ key: 'restore', icon: RotateCcw, label: t('wish.action.restore'), onClick: onRestore });
       if (onDelete)
         actions.push({
           key: 'delete',
           icon: Trash2,
-          label: 'Delete',
+          label: t('wish.action.delete'),
           onClick: onDelete,
           danger: true,
         });
@@ -90,20 +92,20 @@ function WishCardInner({
         actions.push({
           key: 'duplicate',
           icon: Copy,
-          label: 'Create copy as new',
+          label: t('wish.action.duplicate'),
           onClick: onDuplicate,
         });
       if (onDelete)
         actions.push({
           key: 'delete',
           icon: Trash2,
-          label: 'Delete',
+          label: t('wish.action.delete'),
           onClick: onDelete,
           danger: true,
         });
     } else if (wish.status === 'DELETED') {
       if (onRestore)
-        actions.push({ key: 'restore', icon: RotateCcw, label: 'Restore', onClick: onRestore });
+        actions.push({ key: 'restore', icon: RotateCcw, label: t('wish.action.restore'), onClick: onRestore });
     }
   }
 
@@ -128,7 +130,7 @@ function WishCardInner({
               <Button
                 variant="secondary"
                 size="icon"
-                aria-label="Actions"
+                aria-label={t('wish.actions')}
                 onClick={() => setMenuOpen((v) => !v)}
               >
                 <MoreHorizontal className="h-4 w-4" />
@@ -177,7 +179,7 @@ function WishCardInner({
               className="inline-flex items-center gap-1 text-xs font-medium text-primary hover:text-primary-600"
             >
               <ExternalLink className="h-3 w-3" />
-              open link
+              {t('wish.openLink')}
             </a>
           )}
         </div>

apps/frontend/src/components/WishForm/WishForm.tsx

@@ -15,6 +15,7 @@ import {
   useUpdateWish,
   useUploadWishImage,
 } from '@/features/wishes/wishes.hooks';
+import { translateValidation, useI18n } from '@/i18n/i18n';
 
 interface Props {
   open: boolean;
@@ -24,6 +25,7 @@ interface Props {
 }
 
 export function WishForm({ open, mode, initial, onClose }: Props) {
+  const { t } = useI18n();
   const create = useCreateWish();
   const update = useUpdateWish();
   const upload = useUploadWishImage();
@@ -78,59 +80,74 @@ export function WishForm({ open, mode, initial, onClose }: Props) {
     <Modal
       open={open}
       onClose={onClose}
-      title={mode === 'create' ? 'Add a wish' : 'Edit wish'}
+      title={mode === 'create' ? t('wishForm.addTitle') : t('wishForm.editTitle')}
       description={
         mode === 'create'
-          ? 'Tell us what you want. A link helps us grab a preview image automatically.'
-          : 'Update the details of your wish.'
+          ? t('wishForm.addDescription')
+          : t('wishForm.editDescription')
       }
       size="lg"
       footer={
         <>
           <Button variant="ghost" onClick={onClose}>
-            Cancel
+            {t('common.cancel')}
           </Button>
           <Button type="submit" form="wish-form" disabled={isSubmitting}>
             {isSubmitting && <Loader2 className="h-4 w-4 animate-spin" />}
-            {mode === 'create' ? 'Add wish' : 'Save'}
+            {mode === 'create' ? t('wishForm.addSubmit') : t('common.save')}
           </Button>
         </>
       }
     >
       <form id="wish-form" className="grid gap-4" onSubmit={submit}>
         <div className="field">
-          <Label htmlFor="title">Title</Label>
-          <Input id="title" placeholder="Moka pot, size 3" {...register('title')} />
-          {errors.title && <span className="field__error">{errors.title.message}</span>}
+          <Label htmlFor="title">{t('wishForm.title')}</Label>
+          <Input id="title" placeholder={t('wishForm.titlePlaceholder')} {...register('title')} />
+          {errors.title && (
+            <span className="field__error">{translateValidation(t, errors.title.message)}</span>
+          )}
         </div>
 
         <div className="grid gap-4 sm:grid-cols-[1fr_auto]">
           <div className="field">
-            <Label htmlFor="price">Price (optional)</Label>
-            <Input id="price" placeholder="e.g. 2490" inputMode="decimal" {...register('price')} />
-            {errors.price && <span className="field__error">{errors.price.message as string}</span>}
+            <Label htmlFor="price">{t('wishForm.price')}</Label>
+            <Input
+              id="price"
+              placeholder={t('wishForm.pricePlaceholder')}
+              inputMode="decimal"
+              {...register('price')}
+            />
+            {errors.price && (
+              <span className="field__error">
+                {translateValidation(t, errors.price.message as string)}
+              </span>
+            )}
           </div>
           <div className="field">
-            <Label htmlFor="currency">Currency</Label>
+            <Label htmlFor="currency">{t('wishForm.currency')}</Label>
             <Input id="currency" maxLength={3} className="uppercase w-24" {...register('currency')} />
           </div>
         </div>
 
         <div className="field">
-          <Label htmlFor="url">Link (optional)</Label>
+          <Label htmlFor="url">{t('wishForm.link')}</Label>
           <Input id="url" type="url" placeholder="https://..." {...register('url')} />
-          {errors.url && <span className="field__error">{errors.url.message as string}</span>}
+          {errors.url && (
+            <span className="field__error">
+              {translateValidation(t, errors.url.message as string)}
+            </span>
+          )}
           <p className="text-xs text-muted">
-            We will try to pull a preview image from the link after saving.
+            {t('wishForm.linkHint')}
           </p>
         </div>
 
         <div className="field">
-          <Label htmlFor="comment">Comment (optional)</Label>
+          <Label htmlFor="comment">{t('wishForm.comment')}</Label>
           <Textarea
             id="comment"
             rows={3}
-            placeholder="Size / color / notes..."
+            placeholder={t('wishForm.commentPlaceholder')}
             {...register('comment')}
           />
         </div>
@@ -140,7 +157,7 @@ export function WishForm({ open, mode, initial, onClose }: Props) {
         <section className="mt-6 rounded-md border border-border bg-surface-muted p-4">
           <div className="mb-3 flex items-center gap-2 text-sm font-medium text-ink">
             <ImageIcon className="h-4 w-4" />
-            Image
+            {t('wishForm.image')}
           </div>
           <div className="flex flex-wrap items-center gap-2">
             <input
@@ -165,7 +182,7 @@ export function WishForm({ open, mode, initial, onClose }: Props) {
               ) : (
                 <Upload className="h-4 w-4" />
               )}
-              Upload custom
+              {t('wishForm.uploadCustom')}
             </Button>
             <Button
               variant="outline"
@@ -178,7 +195,7 @@ export function WishForm({ open, mode, initial, onClose }: Props) {
               ) : (
                 <RefreshCcw className="h-4 w-4" />
               )}
-              Refresh from link
+              {t('wishForm.refreshFromLink')}
             </Button>
             <Button
               variant="ghost"
@@ -187,7 +204,7 @@ export function WishForm({ open, mode, initial, onClose }: Props) {
               disabled={resetImage.isPending}
             >
               <Trash2 className="h-4 w-4" />
-              Reset to default
+              {t('wishForm.resetImage')}
             </Button>
           </div>
         </section>

apps/frontend/src/components/ui/Modal.tsx

@@ -40,9 +40,9 @@ export function Modal({
   if (!open) return null;
 
   return createPortal(
-    <div className="fixed inset-0 z-50 flex items-end justify-center p-0 sm:items-center sm:p-6">
+    <div className="modal">
       <div
-        className="absolute inset-0 bg-ink/40 backdrop-blur-sm animate-fade-in-up"
+        className="modal__backdrop"
         onClick={onClose}
         aria-hidden
       />
@@ -50,27 +50,21 @@ export function Modal({
         role="dialog"
         aria-modal="true"
         className={cn(
-          'relative w-full bg-surface shadow-pop animate-fade-in-up',
-          'rounded-t-xl sm:rounded-xl',
-          size === 'md' ? 'sm:max-w-lg' : 'sm:max-w-2xl',
-          'max-h-[90vh] overflow-hidden flex flex-col',
+          'modal__panel',
+          size === 'md' ? 'modal__panel--md' : 'modal__panel--lg',
         )}
       >
-        <header className="flex items-start justify-between gap-4 border-b border-border px-5 py-4">
-          <div className="min-w-0">
-            <h2 className="text-lg font-semibold text-ink">{title}</h2>
-            {description && <p className="mt-1 text-sm text-muted">{description}</p>}
+        <header className="modal__header">
+          <div className="modal__title-wrap">
+            <h2 className="modal__title">{title}</h2>
+            {description && <p className="modal__description">{description}</p>}
           </div>
           <Button variant="ghost" size="icon" onClick={onClose} aria-label="Close">
             <X className="h-5 w-5" />
           </Button>
         </header>
-        <div className="overflow-y-auto px-5 py-5">{children}</div>
-        {footer && (
-          <footer className="flex items-center justify-end gap-2 border-t border-border px-5 py-4">
-            {footer}
-          </footer>
-        )}
+        <div className="modal__body">{children}</div>
+        {footer && <footer className="modal__footer">{footer}</footer>}
       </div>
     </div>,
     document.body,

apps/frontend/src/features/wishes/wishes.hooks.ts

@@ -3,6 +3,7 @@ import type { CreateWishInput, UpdateWishInput } from '@family-wishlist/shared';
 import { toast } from 'sonner';
 import { wishesApi, type OwnerStatus } from './wishes.api';
 import { ApiError } from '@/lib/api';
+import { useI18n } from '@/i18n/i18n';
 
 const LIST_KEY = (status: OwnerStatus) => ['wishes', status] as const;
 
@@ -10,7 +11,7 @@ function invalidateAll(client: ReturnType<typeof useQueryClient>): void {
   void client.invalidateQueries({ queryKey: ['wishes'] });
 }
 
-function toastError(err: unknown, fallback = 'Something went wrong'): void {
+function toastError(err: unknown, fallback: string): void {
   if (err instanceof ApiError) toast.error(err.message);
   else toast.error(fallback);
 }
@@ -25,121 +26,131 @@ export function useWishes(status: OwnerStatus) {
 
 export function useCreateWish() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (input: CreateWishInput) => wishesApi.create(input),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Wish added');
+      toast.success(t('toast.wishAdded'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useUpdateWish() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (vars: { id: string; input: UpdateWishInput }) =>
       wishesApi.update(vars.id, vars.input),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Saved');
+      toast.success(t('toast.saved'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useArchiveWish() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (id: string) => wishesApi.archive(id),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Moved to archive');
+      toast.success(t('toast.archived'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useCompleteWish() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (id: string) => wishesApi.complete(id),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Marked as fulfilled');
+      toast.success(t('toast.fulfilled'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useDeleteWish() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (id: string) => wishesApi.remove(id),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Moved to trash (30 days to restore)');
+      toast.success(t('toast.deleted'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useRestoreWish() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (id: string) => wishesApi.restore(id),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Restored');
+      toast.success(t('toast.restored'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useDuplicateWish() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (id: string) => wishesApi.duplicate(id),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('New wish created from the fulfilled one');
+      toast.success(t('toast.duplicated'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useUploadWishImage() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (vars: { id: string; file: File }) => wishesApi.uploadImage(vars.id, vars.file),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Image updated');
+      toast.success(t('toast.imageUpdated'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }
 
 export function useRefreshOg() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (id: string) => wishesApi.refreshOg(id),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Image refreshed from link');
+      toast.success(t('toast.imageRefreshed'));
     },
-    onError: (err) => toastError(err, 'Could not fetch image from link'),
+    onError: (err) => toastError(err, t('toast.imageFetchFailed')),
   });
 }
 
 export function useResetWishImage() {
   const client = useQueryClient();
+  const { t } = useI18n();
   return useMutation({
     mutationFn: (id: string) => wishesApi.deleteImage(id),
     onSuccess: () => {
       invalidateAll(client);
-      toast.success('Reset to default image');
+      toast.success(t('toast.imageReset'));
     },
-    onError: (err) => toastError(err),
+    onError: (err) => toastError(err, t('toast.genericError')),
   });
 }

apps/frontend/src/i18n/i18n.tsx

@@ -0,0 +1,339 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useState,
+  type ReactNode,
+} from 'react';
+
+export type Language = 'ru' | 'en';
+
+const STORAGE_KEY = 'family-wishlist-language';
+const FALLBACK_LANGUAGE: Language = 'ru';
+
+const translations = {
+  ru: {
+    'app.name': 'Family Wishlist',
+    'language.ru': 'Русский',
+    'language.en': 'English',
+    'language.switch': 'Язык',
+    'common.loading': 'Загрузка...',
+    'common.cancel': 'Отмена',
+    'common.save': 'Сохранить',
+    'common.saveChanges': 'Сохранить изменения',
+    'common.backHome': 'На главную',
+    'common.days.one': '{count} день',
+    'common.days.few': '{count} дня',
+    'common.days.many': '{count} дней',
+    'footer.frontend': 'frontend v{version}',
+    'footer.backend': 'backend v{version}',
+    'header.active': 'Активные',
+    'header.fulfilled': 'Исполненные',
+    'header.archive': 'Архив',
+    'header.trash': 'Корзина',
+    'header.signedInAs': 'вошли как {name}',
+    'header.profileSettings': 'Настройки профиля',
+    'header.profile': 'Профиль',
+    'header.friendWishes': 'Желания {name}',
+    'header.logout': 'Выйти',
+    'login.title': 'С возвращением',
+    'login.description': 'Войдите, чтобы управлять списком желаний. Доступы задаются на сервере.',
+    'login.username': 'Логин',
+    'login.password': 'Пароль',
+    'login.submit': 'Войти',
+    'login.failed': 'Не удалось войти',
+    'dashboard.title': 'Ваш список желаний',
+    'dashboard.description': 'Добавляйте вещи, о которых мечтаете. Публичная страница доступна по адресу ',
+    'dashboard.addWish': 'Добавить желание',
+    'dashboard.emptyTitle': 'Желаний пока нет',
+    'dashboard.emptyText': 'Начните с того, что вам действительно хочется получить.',
+    'dashboard.addFirstWish': 'Добавить первое желание',
+    'archive.title': 'Архив',
+    'archive.description': 'Отложенные желания. Их видите только вы, и их можно вернуть в активный список.',
+    'archive.emptyTitle': 'Архив пуст',
+    'archive.emptyText': 'Архивированные желания появятся здесь.',
+    'completed.title': 'Исполненные',
+    'completed.description': 'Желания, которые уже исполнились. Из любого можно создать новое.',
+    'completed.emptyTitle': 'Исполненных желаний пока нет',
+    'completed.emptyText': 'Когда желание исполнится, отметьте его, и оно появится здесь.',
+    'trash.title': 'Корзина',
+    'trash.description': 'Удалённые желания хранятся {days}, затем удаляются навсегда.',
+    'trash.emptyTitle': 'Корзина пуста',
+    'trash.emptyText': 'Удалённые желания будут появляться здесь на {days}.',
+    'trash.autoRemove': 'Автоудаление через {days}',
+    'profile.title': 'Профиль',
+    'profile.publicPage': 'Публичная страница доступна по адресу ',
+    'profile.slug': 'Slug (публичный URL)',
+    'profile.displayName': 'Отображаемое имя',
+    'profile.bio': 'О себе',
+    'profile.avatarUrl': 'Ссылка на аватар',
+    'profile.avatar': 'Аватар',
+    'profile.avatarHint': 'Можно вставить ссылку или загрузить фото до 2 MB.',
+    'profile.uploadAvatar': 'Загрузить фото',
+    'profile.avatarTooLarge': 'Фото должно быть не больше 2 MB',
+    'profile.avatarUnsupported': 'Поддерживаются JPEG, PNG, WebP и GIF',
+    'profile.saved': 'Профиль сохранён',
+    'profile.avatarUploaded': 'Аватар обновлён',
+    'profile.saveFailed': 'Не удалось сохранить',
+    'public.loadingWishes': 'Загрузка желаний...',
+    'public.notFoundTitle': 'Профиль не найден',
+    'public.notFoundText': 'Проверьте ссылку и попробуйте ещё раз. Slug чувствителен к регистру.',
+    'public.backToMine': 'Вернуться к моим желаниям',
+    'public.wishlistTitle': 'Список желаний {name}',
+    'public.emptyTitle': 'Желаний пока нет',
+    'public.emptyText': 'Загляните позже!',
+    'notFound.text': 'Не удалось найти эту страницу.',
+    'protected.loading': 'Загрузка...',
+    'wish.action.edit': 'Редактировать',
+    'wish.action.complete': 'Отметить исполненным',
+    'wish.action.archive': 'В архив',
+    'wish.action.delete': 'Удалить',
+    'wish.action.restore': 'Восстановить',
+    'wish.action.duplicate': 'Создать копию как новое',
+    'wish.actions': 'Действия',
+    'wish.openLink': 'открыть ссылку',
+    'wish.badge.new': 'новое',
+    'wish.badge.fulfilled': 'исполнено',
+    'wish.badge.archived': 'архив',
+    'wish.badge.trash': 'корзина',
+    'wishForm.addTitle': 'Добавить желание',
+    'wishForm.editTitle': 'Редактировать желание',
+    'wishForm.addDescription': 'Расскажите, чего хочется. По ссылке мы попробуем подтянуть картинку.',
+    'wishForm.editDescription': 'Обновите детали желания.',
+    'wishForm.title': 'Название',
+    'wishForm.titlePlaceholder': 'Гейзерная кофеварка, размер 3',
+    'wishForm.price': 'Цена (необязательно)',
+    'wishForm.pricePlaceholder': 'например, 2490',
+    'wishForm.currency': 'Валюта',
+    'wishForm.link': 'Ссылка (необязательно)',
+    'wishForm.linkHint': 'После сохранения попробуем подтянуть превью-картинку по ссылке.',
+    'wishForm.comment': 'Комментарий (необязательно)',
+    'wishForm.commentPlaceholder': 'Размер / цвет / заметки...',
+    'wishForm.image': 'Картинка',
+    'wishForm.uploadCustom': 'Загрузить свою',
+    'wishForm.refreshFromLink': 'Обновить по ссылке',
+    'wishForm.resetImage': 'Сбросить на стандартную',
+    'wishForm.addSubmit': 'Добавить желание',
+    'toast.genericError': 'Что-то пошло не так',
+    'toast.wishAdded': 'Желание добавлено',
+    'toast.saved': 'Сохранено',
+    'toast.archived': 'Перемещено в архив',
+    'toast.fulfilled': 'Отмечено исполненным',
+    'toast.deleted': 'Перемещено в корзину (30 дней на восстановление)',
+    'toast.restored': 'Восстановлено',
+    'toast.duplicated': 'Новое желание создано из исполненного',
+    'toast.imageUpdated': 'Картинка обновлена',
+    'toast.imageRefreshed': 'Картинка обновлена по ссылке',
+    'toast.imageFetchFailed': 'Не удалось получить картинку по ссылке',
+    'toast.imageReset': 'Картинка сброшена на стандартную',
+    'validation.invalid': 'Проверьте значение поля',
+    'validation.slug': 'Slug: 3-32 символа, строчные латинские буквы, цифры и дефисы',
+  },
+  en: {
+    'app.name': 'Family Wishlist',
+    'language.ru': 'Русский',
+    'language.en': 'English',
+    'language.switch': 'Language',
+    'common.loading': 'Loading...',
+    'common.cancel': 'Cancel',
+    'common.save': 'Save',
+    'common.saveChanges': 'Save changes',
+    'common.backHome': 'Back to home',
+    'common.days.one': '{count} day',
+    'common.days.few': '{count} days',
+    'common.days.many': '{count} days',
+    'footer.frontend': 'frontend v{version}',
+    'footer.backend': 'backend v{version}',
+    'header.active': 'Active',
+    'header.fulfilled': 'Fulfilled',
+    'header.archive': 'Archive',
+    'header.trash': 'Trash',
+    'header.signedInAs': 'signed in as {name}',
+    'header.profileSettings': 'Profile settings',
+    'header.profile': 'Profile',
+    'header.friendWishes': "{name}'s wishes",
+    'header.logout': 'Log out',
+    'login.title': 'Welcome back',
+    'login.description': 'Sign in to manage your wishlist. Credentials are set up via the server environment.',
+    'login.username': 'Username',
+    'login.password': 'Password',
+    'login.submit': 'Sign in',
+    'login.failed': 'Login failed',
+    'dashboard.title': 'Your wishlist',
+    'dashboard.description': 'Add things you dream of. Share your public page at ',
+    'dashboard.addWish': 'Add wish',
+    'dashboard.emptyTitle': 'No wishes yet',
+    'dashboard.emptyText': "Start by adding something you'd love to receive.",
+    'dashboard.addFirstWish': 'Add your first wish',
+    'archive.title': 'Archive',
+    'archive.description': 'Wishes you put aside. Only you see this. Restore them to your active list any time.',
+    'archive.emptyTitle': 'Archive is empty',
+    'archive.emptyText': 'Archived wishes will show up here.',
+    'completed.title': 'Fulfilled',
+    'completed.description': "Wishes you've received. You can create a new wish based on any of them.",
+    'completed.emptyTitle': 'Nothing fulfilled yet',
+    'completed.emptyText': 'When a wish comes true, mark it as fulfilled and it lands here.',
+    'trash.title': 'Trash',
+    'trash.description': 'Deleted wishes are kept for {days}, then permanently removed.',
+    'trash.emptyTitle': 'Trash is empty',
+    'trash.emptyText': 'Deleted wishes will appear here for {days}.',
+    'trash.autoRemove': 'Auto-removes in {days}',
+    'profile.title': 'Profile',
+    'profile.publicPage': 'Your public page lives at ',
+    'profile.slug': 'Slug (public URL)',
+    'profile.displayName': 'Display name',
+    'profile.bio': 'Bio',
+    'profile.avatarUrl': 'Avatar URL',
+    'profile.avatar': 'Avatar',
+    'profile.avatarHint': 'Paste a link or upload a photo up to 2 MB.',
+    'profile.uploadAvatar': 'Upload photo',
+    'profile.avatarTooLarge': 'Avatar must be 2 MB or less',
+    'profile.avatarUnsupported': 'JPEG, PNG, WebP and GIF are supported',
+    'profile.saved': 'Profile saved',
+    'profile.avatarUploaded': 'Avatar updated',
+    'profile.saveFailed': 'Save failed',
+    'public.loadingWishes': 'Loading wishes...',
+    'public.notFoundTitle': 'Profile not found',
+    'public.notFoundText': 'Check the link and try again. Slugs are case-sensitive.',
+    'public.backToMine': 'Back to my wishlist',
+    'public.wishlistTitle': "{name}'s wishlist",
+    'public.emptyTitle': 'No wishes yet',
+    'public.emptyText': 'Check back later!',
+    'notFound.text': "We couldn't find that page.",
+    'protected.loading': 'Loading...',
+    'wish.action.edit': 'Edit',
+    'wish.action.complete': 'Mark fulfilled',
+    'wish.action.archive': 'Archive',
+    'wish.action.delete': 'Delete',
+    'wish.action.restore': 'Restore',
+    'wish.action.duplicate': 'Create copy as new',
+    'wish.actions': 'Actions',
+    'wish.openLink': 'open link',
+    'wish.badge.new': 'new',
+    'wish.badge.fulfilled': 'fulfilled',
+    'wish.badge.archived': 'archived',
+    'wish.badge.trash': 'trash',
+    'wishForm.addTitle': 'Add a wish',
+    'wishForm.editTitle': 'Edit wish',
+    'wishForm.addDescription': 'Tell us what you want. A link helps us grab a preview image automatically.',
+    'wishForm.editDescription': 'Update the details of your wish.',
+    'wishForm.title': 'Title',
+    'wishForm.titlePlaceholder': 'Moka pot, size 3',
+    'wishForm.price': 'Price (optional)',
+    'wishForm.pricePlaceholder': 'e.g. 2490',
+    'wishForm.currency': 'Currency',
+    'wishForm.link': 'Link (optional)',
+    'wishForm.linkHint': 'We will try to pull a preview image from the link after saving.',
+    'wishForm.comment': 'Comment (optional)',
+    'wishForm.commentPlaceholder': 'Size / color / notes...',
+    'wishForm.image': 'Image',
+    'wishForm.uploadCustom': 'Upload custom',
+    'wishForm.refreshFromLink': 'Refresh from link',
+    'wishForm.resetImage': 'Reset to default',
+    'wishForm.addSubmit': 'Add wish',
+    'toast.genericError': 'Something went wrong',
+    'toast.wishAdded': 'Wish added',
+    'toast.saved': 'Saved',
+    'toast.archived': 'Moved to archive',
+    'toast.fulfilled': 'Marked as fulfilled',
+    'toast.deleted': 'Moved to trash (30 days to restore)',
+    'toast.restored': 'Restored',
+    'toast.duplicated': 'New wish created from the fulfilled one',
+    'toast.imageUpdated': 'Image updated',
+    'toast.imageRefreshed': 'Image refreshed from link',
+    'toast.imageFetchFailed': 'Could not fetch image from link',
+    'toast.imageReset': 'Reset to default image',
+    'validation.invalid': 'Check this field',
+    'validation.slug': 'Slug must be 3-32 chars, lowercase letters, digits, hyphens',
+  },
+} as const;
+
+export type TranslationKey = keyof typeof translations.ru;
+
+interface I18nContextValue {
+  language: Language;
+  locale: string;
+  setLanguage: (language: Language) => void;
+  t: (key: TranslationKey, vars?: Record<string, string | number>) => string;
+  dayCount: (count: number) => string;
+}
+
+const I18nContext = createContext<I18nContextValue | null>(null);
+
+function isLanguage(value: string | null): value is Language {
+  return value === 'ru' || value === 'en';
+}
+
+function detectLanguage(): Language {
+  if (typeof window === 'undefined') return FALLBACK_LANGUAGE;
+  const saved = window.localStorage.getItem(STORAGE_KEY);
+  if (isLanguage(saved)) return saved;
+  const languages = navigator.languages.length ? navigator.languages : [navigator.language];
+  for (const lang of languages) {
+    const normalized = lang.toLowerCase();
+    if (normalized.startsWith('ru')) return 'ru';
+    if (normalized.startsWith('en')) return 'en';
+  }
+  return FALLBACK_LANGUAGE;
+}
+
+function interpolate(template: string, vars?: Record<string, string | number>): string {
+  if (!vars) return template;
+  return template.replace(/\{(\w+)\}/g, (_, key: string) => String(vars[key] ?? `{${key}}`));
+}
+
+function dayKey(language: Language, count: number): TranslationKey {
+  if (language === 'en') return count === 1 ? 'common.days.one' : 'common.days.many';
+  const mod10 = count % 10;
+  const mod100 = count % 100;
+  if (mod10 === 1 && mod100 !== 11) return 'common.days.one';
+  if (mod10 >= 2 && mod10 <= 4 && (mod100 < 12 || mod100 > 14)) return 'common.days.few';
+  return 'common.days.many';
+}
+
+export function I18nProvider({ children }: { children: ReactNode }) {
+  const [language, setLanguageState] = useState<Language>(() => detectLanguage());
+
+  useEffect(() => {
+    document.documentElement.lang = language;
+    window.localStorage.setItem(STORAGE_KEY, language);
+  }, [language]);
+
+  const setLanguage = useCallback((next: Language) => setLanguageState(next), []);
+  const t = useCallback(
+    (key: TranslationKey, vars?: Record<string, string | number>) =>
+      interpolate(translations[language][key] ?? translations[FALLBACK_LANGUAGE][key], vars),
+    [language],
+  );
+  const dayCount = useCallback(
+    (count: number) => t(dayKey(language, count), { count }),
+    [language, t],
+  );
+
+  const value = useMemo<I18nContextValue>(
+    () => ({
+      language,
+      locale: language === 'ru' ? 'ru-RU' : 'en-US',
+      setLanguage,
+      t,
+      dayCount,
+    }),
+    [dayCount, language, setLanguage, t],
+  );
+
+  return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>;
+}
+
+export function useI18n(): I18nContextValue {
+  const value = useContext(I18nContext);
+  if (!value) throw new Error('useI18n must be used within I18nProvider');
+  return value;
+}
+
+export function translateValidation(t: I18nContextValue['t'], message: string | undefined): string {
+  if (!message) return t('validation.invalid');
+  if (message.includes('Slug must be')) return t('validation.slug');
+  return t('validation.invalid');
+}

apps/frontend/src/lib/format.ts

@@ -1,21 +1,25 @@
-export function formatPrice(price: string | null | undefined, currency: string): string | null {
+export function formatPrice(
+  price: string | null | undefined,
+  currency: string,
+  locale?: string,
+): string | null {
   if (!price) return null;
   const n = Number(price);
   if (Number.isNaN(n)) return `${price} ${currency}`;
   try {
-    return new Intl.NumberFormat(undefined, {
+    return new Intl.NumberFormat(locale, {
       style: 'currency',
       currency,
       maximumFractionDigits: 2,
     }).format(n);
   } catch {
-    return `${n.toLocaleString()} ${currency}`;
+    return `${n.toLocaleString(locale)} ${currency}`;
   }
 }
 
-export function formatDate(iso: string | Date): string {
+export function formatDate(iso: string | Date, locale?: string): string {
   const d = typeof iso === 'string' ? new Date(iso) : iso;
-  return d.toLocaleDateString(undefined, { day: 'numeric', month: 'short', year: 'numeric' });
+  return d.toLocaleDateString(locale, { day: 'numeric', month: 'short', year: 'numeric' });
 }
 
 export function daysLeftUntil(iso: string | Date, retentionDays: number): number {

apps/frontend/src/pages/ArchivePage.tsx

@@ -5,28 +5,30 @@ import {
   useWishes,
 } from '@/features/wishes/wishes.hooks';
 import { Archive } from 'lucide-react';
+import { useI18n } from '@/i18n/i18n';
 
 export function ArchivePage() {
+  const { t } = useI18n();
   const { data, isLoading } = useWishes('archived');
   const restore = useRestoreWish();
   const remove = useDeleteWish();
 
   return (
     <div className="grid gap-6">
-      <section>
-        <h1 className="font-display text-3xl">Archive</h1>
-        <p className="text-sm text-muted">
-          Wishes you put aside. Only you see this. Restore them to your active list any time.
+      <section className="page-section">
+        <h1 className="page-section__title">{t('archive.title')}</h1>
+        <p className="page-section__text">
+          {t('archive.description')}
         </p>
       </section>
 
-      {isLoading && <div className="text-muted">Loading...</div>}
+      {isLoading && <div className="text-muted">{t('common.loading')}</div>}
 
       {!isLoading && data && data.length === 0 && (
-        <div className="flex flex-col items-center gap-2 rounded-xl border border-border bg-surface/80 p-10 text-center shadow-card">
-          <Archive className="h-10 w-10 text-muted" />
-          <h2 className="text-xl font-semibold">Archive is empty</h2>
-          <p className="text-sm text-muted">Archived wishes will show up here.</p>
+        <div className="empty-state">
+          <Archive className="empty-state__icon" />
+          <h2 className="empty-state__title">{t('archive.emptyTitle')}</h2>
+          <p className="empty-state__text">{t('archive.emptyText')}</p>
         </div>
       )}
 

apps/frontend/src/pages/CompletedPage.tsx

@@ -5,29 +5,31 @@ import {
   useDuplicateWish,
   useWishes,
 } from '@/features/wishes/wishes.hooks';
+import { useI18n } from '@/i18n/i18n';
 
 export function CompletedPage() {
+  const { t } = useI18n();
   const { data, isLoading } = useWishes('completed');
   const duplicate = useDuplicateWish();
   const remove = useDeleteWish();
 
   return (
     <div className="grid gap-6">
-      <section>
-        <h1 className="font-display text-3xl">Fulfilled</h1>
-        <p className="text-sm text-muted">
-          Wishes you've received. You can create a new wish based on any of them.
+      <section className="page-section">
+        <h1 className="page-section__title">{t('completed.title')}</h1>
+        <p className="page-section__text">
+          {t('completed.description')}
         </p>
       </section>
 
-      {isLoading && <div className="text-muted">Loading...</div>}
+      {isLoading && <div className="text-muted">{t('common.loading')}</div>}
 
       {!isLoading && data && data.length === 0 && (
-        <div className="flex flex-col items-center gap-2 rounded-xl border border-border bg-surface/80 p-10 text-center shadow-card">
-          <CheckCircle2 className="h-10 w-10 text-muted" />
-          <h2 className="text-xl font-semibold">Nothing fulfilled yet</h2>
-          <p className="text-sm text-muted">
-            When a wish comes true, mark it as fulfilled and it lands here.
+        <div className="empty-state">
+          <CheckCircle2 className="empty-state__icon" />
+          <h2 className="empty-state__title">{t('completed.emptyTitle')}</h2>
+          <p className="empty-state__text">
+            {t('completed.emptyText')}
           </p>
         </div>
       )}

apps/frontend/src/pages/DashboardPage.tsx

@@ -12,8 +12,10 @@ import {
 } from '@/features/wishes/wishes.hooks';
 import { useAuthStore } from '@/features/auth/authStore';
 import { Link } from 'react-router-dom';
+import { useI18n } from '@/i18n/i18n';
 
 export function DashboardPage() {
+  const { t } = useI18n();
   const { data, isLoading } = useWishes('active');
   const [creating, setCreating] = useState(false);
   const [editing, setEditing] = useState<Wish | null>(null);
@@ -24,11 +26,11 @@ export function DashboardPage() {
 
   return (
     <div className="grid gap-6">
-      <section className="flex flex-wrap items-end justify-between gap-4">
+      <section className="page-section flex flex-wrap items-end justify-between gap-4">
         <div>
-          <h1 className="font-display text-3xl">Your wishlist</h1>
-          <p className="text-sm text-muted">
-            Add things you dream of. Share your public page at{' '}
+          <h1 className="page-section__title">{t('dashboard.title')}</h1>
+          <p className="page-section__text">
+            {t('dashboard.description')}
             {user && (
               <Link
                 to={`/u/${user.slug}`}
@@ -42,7 +44,7 @@ export function DashboardPage() {
         </div>
         <Button size="lg" onClick={() => setCreating(true)}>
           <Plus className="h-4 w-4" />
-          Add wish
+          {t('dashboard.addWish')}
         </Button>
       </section>
 
@@ -59,17 +61,17 @@ export function DashboardPage() {
       )}
 
       {!isLoading && data && data.length === 0 && (
-        <div className="flex flex-col items-center gap-4 rounded-xl border border-border bg-surface/80 p-10 text-center shadow-card">
-          <img src="/empty-state.svg" alt="" className="h-40 w-40 opacity-90" />
+        <div className="empty-state gap-4">
+          <img src="/empty-state.svg" alt="" className="empty-state__icon--image" />
           <div>
-            <h2 className="text-xl font-semibold">No wishes yet</h2>
-            <p className="mt-1 text-sm text-muted">
-              Start by adding something you'd love to receive.
+            <h2 className="empty-state__title">{t('dashboard.emptyTitle')}</h2>
+            <p className="empty-state__text mt-1">
+              {t('dashboard.emptyText')}
             </p>
           </div>
           <Button onClick={() => setCreating(true)}>
             <Sparkles className="h-4 w-4" />
-            Add your first wish
+            {t('dashboard.addFirstWish')}
           </Button>
         </div>
       )}

apps/frontend/src/pages/LoginPage.tsx

@@ -11,8 +11,11 @@ import { Label } from '@/components/ui/Label';
 import { useAuthStore } from '@/features/auth/authStore';
 import { ApiError } from '@/lib/api';
 import { Footer } from '@/components/Layout/Footer';
+import { LanguageSwitcher } from '@/components/LanguageSwitcher';
+import { translateValidation, useI18n } from '@/i18n/i18n';
 
 export function LoginPage() {
+  const { t } = useI18n();
   const { user, login } = useAuthStore();
   const navigate = useNavigate();
   const location = useLocation();
@@ -39,29 +42,32 @@ export function LoginPage() {
       navigate(from, { replace: true });
     } catch (err) {
       if (err instanceof ApiError) toast.error(err.message);
-      else toast.error('Login failed');
+      else toast.error(t('login.failed'));
     }
   });
 
   return (
-    <div className="flex min-h-screen flex-col">
-      <div className="container-page flex flex-1 items-center justify-center py-12">
+    <div className="app-shell">
+      <div className="public-profile__toolbar">
+        <LanguageSwitcher />
+      </div>
+      <div className="app-shell__main flex items-center justify-center py-12">
         <div className="w-full max-w-md animate-fade-in-up">
           <div className="mb-6 flex items-center justify-center gap-2">
             <span className="inline-flex h-11 w-11 items-center justify-center rounded-md bg-primary text-primary-foreground shadow-card">
               <Gift className="h-5 w-5" />
             </span>
-            <h1 className="font-display text-3xl">Family Wishlist</h1>
+            <h1 className="font-display text-3xl">{t('app.name')}</h1>
           </div>
 
-          <div className="rounded-xl border border-border bg-surface p-6 shadow-card sm:p-8">
-            <h2 className="mb-1 text-xl font-semibold">Welcome back</h2>
+          <div className="profile-form p-6 sm:p-8">
+            <h2 className="mb-1 text-xl font-semibold">{t('login.title')}</h2>
             <p className="mb-6 text-sm text-muted">
-              Sign in to manage your wishlist. Credentials are set up via the server environment.
+              {t('login.description')}
             </p>
             <form className="grid gap-4" onSubmit={submit}>
               <div className="field">
-                <Label htmlFor="username">Username</Label>
+                <Label htmlFor="username">{t('login.username')}</Label>
                 <Input
                   id="username"
                   autoComplete="username"
@@ -69,11 +75,13 @@ export function LoginPage() {
                   {...register('username')}
                 />
                 {errors.username && (
-                  <span className="field__error">{errors.username.message}</span>
+                  <span className="field__error">
+                    {translateValidation(t, errors.username.message)}
+                  </span>
                 )}
               </div>
               <div className="field">
-                <Label htmlFor="password">Password</Label>
+                <Label htmlFor="password">{t('login.password')}</Label>
                 <Input
                   id="password"
                   type="password"
@@ -81,12 +89,14 @@ export function LoginPage() {
                   {...register('password')}
                 />
                 {errors.password && (
-                  <span className="field__error">{errors.password.message}</span>
+                  <span className="field__error">
+                    {translateValidation(t, errors.password.message)}
+                  </span>
                 )}
               </div>
               <Button type="submit" size="lg" disabled={isSubmitting}>
                 {isSubmitting && <Loader2 className="h-4 w-4 animate-spin" />}
-                Sign in
+                {t('login.submit')}
               </Button>
             </form>
           </div>

apps/frontend/src/pages/NotFoundPage.tsx

@@ -1,14 +1,16 @@
 import { Link } from 'react-router-dom';
 import { Button } from '@/components/ui/Button';
+import { useI18n } from '@/i18n/i18n';
 
 export function NotFoundPage() {
+  const { t } = useI18n();
   return (
-    <div className="flex min-h-screen items-center justify-center p-6">
-      <div className="max-w-md rounded-xl border border-border bg-surface p-8 text-center shadow-card">
+    <div className="app-shell items-center justify-center p-6">
+      <div className="empty-state max-w-md bg-surface p-8">
         <h1 className="font-display text-4xl">404</h1>
-        <p className="mt-2 text-muted">We couldn't find that page.</p>
+        <p className="mt-2 text-muted">{t('notFound.text')}</p>
         <Link to="/" className="mt-4 inline-block">
-          <Button variant="secondary">Back to home</Button>
+          <Button variant="secondary">{t('common.backHome')}</Button>
         </Link>
       </div>
     </div>

apps/frontend/src/pages/ProfileSettingsPage.tsx

@@ -1,4 +1,4 @@
-import { useEffect } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
@@ -8,17 +8,24 @@ import {
   type Profile,
 } from '@family-wishlist/shared';
 import { toast } from 'sonner';
-import { Loader2 } from 'lucide-react';
+import { Gift, Loader2, Upload } from 'lucide-react';
 import { Button } from '@/components/ui/Button';
 import { Input } from '@/components/ui/Input';
 import { Label } from '@/components/ui/Label';
 import { Textarea } from '@/components/ui/Textarea';
 import { api, ApiError } from '@/lib/api';
 import { useAuthStore } from '@/features/auth/authStore';
+import { translateValidation, useI18n } from '@/i18n/i18n';
+
+const MAX_AVATAR_BYTES = 2 * 1024 * 1024;
+const AVATAR_MIME_TYPES = new Set(['image/jpeg', 'image/png', 'image/webp', 'image/gif']);
 
 export function ProfileSettingsPage() {
+  const { t } = useI18n();
   const refresh = useAuthStore((s) => s.refresh);
   const queryClient = useQueryClient();
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const [avatarFailed, setAvatarFailed] = useState(false);
 
   const { data, isLoading } = useQuery({
     queryKey: ['profile'],
@@ -29,6 +36,7 @@ export function ProfileSettingsPage() {
     register,
     handleSubmit,
     reset,
+    watch,
     formState: { errors, isSubmitting, isDirty },
   } = useForm<UpdateProfileInput>({
     resolver: zodResolver(updateProfileSchema),
@@ -50,7 +58,7 @@ export function ProfileSettingsPage() {
     mutationFn: (values: UpdateProfileInput) =>
       api.patch<Profile, UpdateProfileInput>('/api/profile', values),
     onSuccess: (p) => {
-      toast.success('Profile saved');
+      toast.success(t('profile.saved'));
       void queryClient.invalidateQueries({ queryKey: ['profile'] });
       void refresh();
       reset({
@@ -62,10 +70,46 @@ export function ProfileSettingsPage() {
     },
     onError: (err) => {
       if (err instanceof ApiError) toast.error(err.message);
-      else toast.error('Save failed');
+      else toast.error(t('profile.saveFailed'));
     },
   });
 
+  const uploadAvatar = useMutation({
+    mutationFn: (file: File) => {
+      const form = new FormData();
+      form.append('file', file);
+      return api.upload<Profile>('/api/profile/avatar', form);
+    },
+    onSuccess: (p) => {
+      toast.success(t('profile.avatarUploaded'));
+      void queryClient.invalidateQueries({ queryKey: ['profile'] });
+      void refresh();
+      reset({
+        slug: p.slug,
+        displayName: p.displayName,
+        bio: p.bio ?? '',
+        avatarUrl: p.avatarUrl ?? '',
+      });
+    },
+    onError: (err) => {
+      if (err instanceof ApiError) toast.error(err.message);
+      else toast.error(t('profile.saveFailed'));
+    },
+  });
+
+  function handleAvatarFile(file: File | undefined): void {
+    if (!file) return;
+    if (!AVATAR_MIME_TYPES.has(file.type)) {
+      toast.error(t('profile.avatarUnsupported'));
+      return;
+    }
+    if (file.size > MAX_AVATAR_BYTES) {
+      toast.error(t('profile.avatarTooLarge'));
+      return;
+    }
+    uploadAvatar.mutate(file);
+  }
+
   const submit = handleSubmit((values) => {
     const payload: UpdateProfileInput = {
       ...values,
@@ -75,43 +119,100 @@ export function ProfileSettingsPage() {
     update.mutate(payload);
   });
 
+  const avatarPreview = watch('avatarUrl') || data?.avatarUrl;
+
+  useEffect(() => {
+    setAvatarFailed(false);
+  }, [avatarPreview]);
+
   return (
     <div className="grid max-w-2xl gap-6">
-      <section>
-        <h1 className="font-display text-3xl">Profile</h1>
-        <p className="text-sm text-muted">
-          Your public page lives at <code className="rounded bg-ink/5 px-1.5 py-0.5">/u/{data?.slug ?? '...'}</code>.
+      <section className="page-section">
+        <h1 className="page-section__title">{t('profile.title')}</h1>
+        <p className="page-section__text">
+          {t('profile.publicPage')}
+          <code className="rounded bg-ink/5 px-1.5 py-0.5">/u/{data?.slug ?? '...'}</code>.
         </p>
       </section>
 
       {isLoading ? (
-        <div className="text-muted">Loading...</div>
+        <div className="text-muted">{t('common.loading')}</div>
       ) : (
-        <form className="grid gap-4 rounded-xl border border-border bg-surface p-6 shadow-card" onSubmit={submit}>
+        <form className="profile-form" onSubmit={submit}>
+          <section className="profile-form__avatar-panel">
+            <span className="profile-form__avatar-preview">
+              {avatarPreview && !avatarFailed ? (
+                <img
+                  src={avatarPreview}
+                  alt=""
+                  className="profile-form__avatar-image"
+                  onError={() => setAvatarFailed(true)}
+                />
+              ) : (
+                <Gift className="h-6 w-6" />
+              )}
+            </span>
+            <div className="profile-form__avatar-copy">
+              <h2 className="profile-form__avatar-title">{t('profile.avatar')}</h2>
+              <p className="profile-form__avatar-hint">{t('profile.avatarHint')}</p>
+            </div>
+            <input
+              ref={fileInputRef}
+              type="file"
+              accept="image/jpeg,image/png,image/webp,image/gif"
+              className="hidden"
+              onChange={(e) => {
+                handleAvatarFile(e.target.files?.[0]);
+                e.currentTarget.value = '';
+              }}
+            />
+            <Button
+              type="button"
+              variant="secondary"
+              onClick={() => fileInputRef.current?.click()}
+              disabled={uploadAvatar.isPending}
+            >
+              {uploadAvatar.isPending ? (
+                <Loader2 className="h-4 w-4 animate-spin" />
+              ) : (
+                <Upload className="h-4 w-4" />
+              )}
+              {t('profile.uploadAvatar')}
+            </Button>
+          </section>
           <div className="field">
-            <Label htmlFor="slug">Slug (public URL)</Label>
+            <Label htmlFor="slug">{t('profile.slug')}</Label>
             <Input id="slug" {...register('slug')} />
-            {errors.slug && <span className="field__error">{errors.slug.message}</span>}
-          </div>
-          <div className="field">
-            <Label htmlFor="displayName">Display name</Label>
-            <Input id="displayName" {...register('displayName')} />
-            {errors.displayName && (
-              <span className="field__error">{errors.displayName.message}</span>
+            {errors.slug && (
+              <span className="field__error">{translateValidation(t, errors.slug.message)}</span>
             )}
           </div>
           <div className="field">
-            <Label htmlFor="bio">Bio</Label>
+            <Label htmlFor="displayName">{t('profile.displayName')}</Label>
+            <Input id="displayName" {...register('displayName')} />
+            {errors.displayName && (
+              <span className="field__error">
+                {translateValidation(t, errors.displayName.message)}
+              </span>
+            )}
+          </div>
+          <div className="field">
+            <Label htmlFor="bio">{t('profile.bio')}</Label>
             <Textarea id="bio" rows={3} {...register('bio')} />
           </div>
           <div className="field">
-            <Label htmlFor="avatarUrl">Avatar URL</Label>
-            <Input id="avatarUrl" type="url" {...register('avatarUrl')} />
+            <Label htmlFor="avatarUrl">{t('profile.avatarUrl')}</Label>
+            <Input id="avatarUrl" inputMode="url" {...register('avatarUrl')} />
+            {errors.avatarUrl && (
+              <span className="field__error">
+                {translateValidation(t, errors.avatarUrl.message)}
+              </span>
+            )}
           </div>
-          <div className="flex items-center justify-end gap-2">
+          <div className="profile-form__actions">
             <Button type="submit" disabled={!isDirty || isSubmitting}>
               {isSubmitting && <Loader2 className="h-4 w-4 animate-spin" />}
-              Save changes
+              {t('common.saveChanges')}
             </Button>
           </div>
         </form>

apps/frontend/src/pages/PublicProfilePage.tsx

@@ -1,5 +1,5 @@
-import { useEffect, useRef } from 'react';
-import { useParams } from 'react-router-dom';
+import { useEffect, useRef, useState } from 'react';
+import { Link, useParams } from 'react-router-dom';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import type {
   PublicProfile,
@@ -9,10 +9,17 @@ import { api } from '@/lib/api';
 import { WishCard } from '@/components/WishCard/WishCard';
 import { Footer } from '@/components/Layout/Footer';
 import { Gift } from 'lucide-react';
+import { LanguageSwitcher } from '@/components/LanguageSwitcher';
+import { useI18n } from '@/i18n/i18n';
+import { useAuthStore } from '@/features/auth/authStore';
+import { Button } from '@/components/ui/Button';
 
 export function PublicProfilePage() {
+  const { t } = useI18n();
+  const user = useAuthStore((s) => s.user);
   const { slug = '' } = useParams<{ slug: string }>();
   const queryClient = useQueryClient();
+  const [avatarFailed, setAvatarFailed] = useState(false);
 
   const profile = useQuery({
     queryKey: ['public-profile', slug],
@@ -51,46 +58,65 @@ export function PublicProfilePage() {
     return () => window.clearTimeout(t);
   }, [wishes.data, markSeen, queryClient, slug]);
 
+  useEffect(() => {
+    setAvatarFailed(false);
+  }, [profile.data?.avatarUrl]);
+
   return (
-    <div className="flex min-h-screen flex-col">
-      <main className="container-page flex-1 py-10">
-        {profile.isLoading && <div className="text-muted">Loading...</div>}
+    <div className="public-profile">
+      <div className="public-profile__toolbar">
+        {user ? (
+          <Link to="/">
+            <Button variant="secondary" size="sm">
+              {t('public.backToMine')}
+            </Button>
+          </Link>
+        ) : (
+          <span />
+        )}
+        <LanguageSwitcher />
+      </div>
+      <main className="public-profile__main">
+        {profile.isLoading && <div className="text-muted">{t('common.loading')}</div>}
 
         {profile.isError && (
-          <div className="mx-auto max-w-lg rounded-xl border border-border bg-surface p-8 text-center shadow-card">
-            <h1 className="font-display text-2xl">Profile not found</h1>
-            <p className="mt-2 text-sm text-muted">
-              Check the link and try again. Slugs are case-sensitive.
+          <div className="empty-state mx-auto max-w-lg bg-surface p-8">
+            <h1 className="empty-state__title">{t('public.notFoundTitle')}</h1>
+            <p className="empty-state__text mt-2">
+              {t('public.notFoundText')}
             </p>
           </div>
         )}
 
         {profile.data && (
           <>
-            <section className="mb-10 flex flex-col items-center gap-3 text-center">
-              <span className="inline-flex h-14 w-14 items-center justify-center rounded-full bg-primary text-primary-foreground shadow-card">
-                {profile.data.avatarUrl ? (
+            <section className="public-profile__hero">
+              <span className="public-profile__avatar">
+                {profile.data.avatarUrl && !avatarFailed ? (
                   <img
                     src={profile.data.avatarUrl}
                     alt=""
-                    className="h-14 w-14 rounded-full object-cover"
+                    className="public-profile__avatar-image"
+                    onError={() => setAvatarFailed(true)}
                   />
                 ) : (
                   <Gift className="h-6 w-6" />
                 )}
               </span>
-              <h1 className="font-display text-4xl">{profile.data.displayName}'s wishlist</h1>
+              <h1 className="public-profile__title">
+                {t('public.wishlistTitle', { name: profile.data.displayName })}
+              </h1>
               {profile.data.bio && (
-                <p className="max-w-xl text-muted">{profile.data.bio}</p>
+                <p className="public-profile__bio">{profile.data.bio}</p>
               )}
             </section>
 
-            {wishes.isLoading && <div className="text-muted">Loading wishes...</div>}
+            {wishes.isLoading && <div className="text-muted">{t('public.loadingWishes')}</div>}
 
             {wishes.data && wishes.data.length === 0 && (
-              <div className="mx-auto max-w-lg rounded-xl border border-border bg-surface/80 p-10 text-center shadow-card">
-                <h2 className="text-xl font-semibold">No wishes yet</h2>
-                <p className="mt-1 text-sm text-muted">Check back later!</p>
+              <div className="empty-state mx-auto max-w-lg">
+                <h2 className="empty-state__title">{t('public.emptyTitle')}</h2>
+                <p className="empty-state__text mt-1">{t('public.emptyText')}</p>
               </div>
             )}
 

apps/frontend/src/pages/TrashPage.tsx

@@ -3,27 +3,31 @@ import { TRASH_RETENTION_DAYS } from '@family-wishlist/shared';
 import { WishCard } from '@/components/WishCard/WishCard';
 import { useRestoreWish, useWishes } from '@/features/wishes/wishes.hooks';
 import { daysLeftUntil } from '@/lib/format';
+import { useI18n } from '@/i18n/i18n';
 
 export function TrashPage() {
+  const { dayCount, t } = useI18n();
   const { data, isLoading } = useWishes('deleted');
   const restore = useRestoreWish();
 
   return (
     <div className="grid gap-6">
-      <section>
-        <h1 className="font-display text-3xl">Trash</h1>
-        <p className="text-sm text-muted">
-          Deleted wishes are kept for {TRASH_RETENTION_DAYS} days, then permanently removed.
+      <section className="page-section">
+        <h1 className="page-section__title">{t('trash.title')}</h1>
+        <p className="page-section__text">
+          {t('trash.description', { days: dayCount(TRASH_RETENTION_DAYS) })}
         </p>
       </section>
 
-      {isLoading && <div className="text-muted">Loading...</div>}
+      {isLoading && <div className="text-muted">{t('common.loading')}</div>}
 
       {!isLoading && data && data.length === 0 && (
-        <div className="flex flex-col items-center gap-2 rounded-xl border border-border bg-surface/80 p-10 text-center shadow-card">
-          <Trash2 className="h-10 w-10 text-muted" />
-          <h2 className="text-xl font-semibold">Trash is empty</h2>
-          <p className="text-sm text-muted">Deleted wishes will appear here for 30 days.</p>
+        <div className="empty-state">
+          <Trash2 className="empty-state__icon" />
+          <h2 className="empty-state__title">{t('trash.emptyTitle')}</h2>
+          <p className="empty-state__text">
+            {t('trash.emptyText', { days: dayCount(TRASH_RETENTION_DAYS) })}
+          </p>
         </div>
       )}
 
@@ -41,7 +45,7 @@ export function TrashPage() {
                 onRestore={() => restore.mutate(wish.id)}
                 footer={
                   <p className="mt-2 text-xs font-medium text-warning">
-                    Auto-removes in {left} day{left === 1 ? '' : 's'}
+                    {t('trash.autoRemove', { days: dayCount(left) })}
                   </p>
                 }
               />

apps/frontend/src/styles/global.css

@@ -29,6 +29,192 @@
 
 @layer components {
   /* BEM-friendly classes: kept parallel to Tailwind utilities where possible. */
+  .app-shell {
+    @apply flex min-h-screen flex-col;
+  }
+  .app-shell__main {
+    @apply mx-auto w-full max-w-6xl flex-1 px-4 py-6 sm:px-6 sm:py-10 lg:px-8;
+  }
+
+  .app-header {
+    @apply mx-auto w-full max-w-6xl px-4 pt-6 sm:px-6 lg:px-8;
+  }
+  .app-header__inner {
+    @apply flex flex-wrap items-center justify-between gap-3 rounded-lg border border-border bg-surface/80 px-4 py-3 backdrop-blur;
+  }
+  .app-header__brand {
+    @apply flex min-w-0 items-center gap-2;
+  }
+  .app-header__brand-mark {
+    @apply inline-flex h-9 w-9 items-center justify-center rounded-md bg-primary text-primary-foreground shadow-card;
+  }
+  .app-header__brand-title {
+    @apply font-display text-lg leading-tight;
+  }
+  .app-header__brand-subtitle {
+    @apply truncate text-xs text-muted;
+  }
+  .app-header__nav {
+    @apply mt-3 flex min-w-0 items-center gap-1 overflow-x-auto whitespace-nowrap rounded-lg border border-border bg-surface/80 px-4 py-2 backdrop-blur;
+  }
+  .app-header__nav-link {
+    @apply inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-sm font-medium text-ink transition-colors hover:bg-ink/5;
+  }
+  .app-header__nav-link--active {
+    @apply bg-primary text-primary-foreground shadow-card hover:bg-primary;
+  }
+  .app-header__actions {
+    @apply flex shrink-0 items-center gap-1 whitespace-nowrap;
+  }
+  .app-header__action {
+    @apply shrink-0;
+  }
+  .app-header__action-text {
+    @apply hidden xl:inline;
+  }
+
+  .app-footer {
+    @apply mx-auto mt-10 w-full max-w-6xl px-4 py-6 text-xs text-muted sm:px-6 lg:px-8;
+  }
+  .app-footer__inner {
+    @apply flex flex-col items-center justify-between gap-2 sm:flex-row;
+  }
+  .app-footer__brand {
+    @apply flex items-center gap-2;
+  }
+  .app-footer__brand-name {
+    @apply font-display text-sm;
+  }
+  .app-footer__meta {
+    @apply flex items-center gap-3;
+  }
+  .app-footer__separator {
+    @apply opacity-50;
+  }
+
+  .language-switcher {
+    @apply inline-flex items-center gap-1 rounded-md border border-border bg-surface/90 p-1 text-xs shadow-card;
+  }
+  .language-switcher__icon {
+    @apply ml-1 h-3.5 w-3.5 text-muted;
+  }
+  .language-switcher__button {
+    @apply rounded px-2 py-1 font-semibold text-muted transition-colors hover:bg-surface-muted hover:text-ink;
+  }
+  .language-switcher__button--active {
+    @apply bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground;
+  }
+
+  .empty-state {
+    @apply flex flex-col items-center gap-2 rounded-xl border border-border bg-surface/80 p-10 text-center shadow-card;
+  }
+  .empty-state__icon {
+    @apply h-10 w-10 text-muted;
+  }
+  .empty-state__icon--image {
+    @apply h-40 w-40 opacity-90;
+  }
+  .empty-state__title {
+    @apply text-xl font-semibold;
+  }
+  .empty-state__text {
+    @apply text-sm text-muted;
+  }
+
+  .page-section {
+    @apply grid gap-1;
+  }
+  .page-section__title {
+    @apply font-display text-3xl;
+  }
+  .page-section__text {
+    @apply text-sm text-muted;
+  }
+
+  .public-profile {
+    @apply flex min-h-screen flex-col;
+  }
+  .public-profile__toolbar {
+    @apply mx-auto flex w-full max-w-6xl items-center justify-between gap-3 px-4 pt-6 sm:px-6 lg:px-8;
+  }
+  .public-profile__main {
+    @apply mx-auto w-full max-w-6xl flex-1 px-4 py-10 sm:px-6 lg:px-8;
+  }
+  .public-profile__hero {
+    @apply mb-10 flex flex-col items-center gap-3 text-center;
+  }
+  .public-profile__avatar {
+    @apply inline-flex h-14 w-14 items-center justify-center overflow-hidden rounded-full bg-primary text-primary-foreground shadow-card;
+  }
+  .public-profile__avatar-image {
+    @apply h-14 w-14 rounded-full object-cover;
+  }
+  .public-profile__title {
+    @apply font-display text-4xl;
+  }
+  .public-profile__bio {
+    @apply max-w-xl text-muted;
+  }
+
+  .profile-form {
+    @apply grid gap-4 rounded-xl border border-border bg-surface p-6 shadow-card;
+  }
+  .profile-form__avatar-panel {
+    @apply flex flex-wrap items-center gap-4 rounded-md border border-border bg-surface-muted p-4;
+  }
+  .profile-form__avatar-preview {
+    @apply inline-flex h-16 w-16 items-center justify-center overflow-hidden rounded-full bg-primary text-primary-foreground;
+  }
+  .profile-form__avatar-image {
+    @apply h-16 w-16 object-cover;
+  }
+  .profile-form__avatar-copy {
+    @apply min-w-0 flex-1;
+  }
+  .profile-form__avatar-title {
+    @apply text-sm font-semibold;
+  }
+  .profile-form__avatar-hint {
+    @apply text-xs text-muted;
+  }
+  .profile-form__actions {
+    @apply flex items-center justify-end gap-2;
+  }
+
+  .modal {
+    @apply fixed inset-0 z-50 flex items-end justify-center p-0 sm:items-center sm:p-6;
+  }
+  .modal__backdrop {
+    @apply absolute inset-0 animate-fade-in-up bg-ink/40 backdrop-blur-sm;
+  }
+  .modal__panel {
+    @apply relative flex max-h-[90vh] w-full animate-fade-in-up flex-col overflow-hidden rounded-t-xl bg-surface shadow-pop sm:rounded-xl;
+  }
+  .modal__panel--md {
+    @apply sm:max-w-lg;
+  }
+  .modal__panel--lg {
+    @apply sm:max-w-2xl;
+  }
+  .modal__header {
+    @apply flex items-start justify-between gap-4 border-b border-border px-5 py-4;
+  }
+  .modal__title-wrap {
+    @apply min-w-0;
+  }
+  .modal__title {
+    @apply text-lg font-semibold text-ink;
+  }
+  .modal__description {
+    @apply mt-1 text-sm text-muted;
+  }
+  .modal__body {
+    @apply overflow-y-auto px-5 py-5;
+  }
+  .modal__footer {
+    @apply flex items-center justify-end gap-2 border-t border-border px-5 py-4;
+  }
+
   .wish-card {
     @apply relative flex flex-col overflow-hidden rounded-lg bg-surface shadow-card transition-transform duration-200;
   }

docker/nginx.conf

@@ -4,13 +4,6 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
-    # Static files with long cache
-    location ~* \.(?:js|css|woff2?|svg|png|jpg|jpeg|gif|webp|ico)$ {
-        expires 7d;
-        add_header Cache-Control "public";
-        try_files $uri =404;
-    }
-
     # API proxy
     location /api/ {
         proxy_pass http://family-wishlist-backend:3000/api/;
@@ -24,13 +17,20 @@ server {
     }
 
     # Uploaded files (images)
-    location /uploads/ {
+    location ^~ /uploads/ {
         proxy_pass http://family-wishlist-backend:3000/uploads/;
         proxy_http_version 1.1;
         proxy_set_header Host $host;
         proxy_cache_valid 200 1h;
     }
 
+    # Static files with long cache
+    location ~* \.(?:js|css|woff2?|svg|png|jpg|jpeg|gif|webp|ico)$ {
+        expires 7d;
+        add_header Cache-Control "public";
+        try_files $uri =404;
+    }
+
     # SPA fallback
     location / {
         try_files $uri /index.html;

packages/shared/src/profile.schema.ts

@@ -15,6 +15,14 @@ export const profileSchema = z.object({
 
 export type Profile = z.infer<typeof profileSchema>;
 
+export const friendProfileSchema = z.object({
+  slug: z.string(),
+  displayName: z.string(),
+  avatarUrl: z.string().nullable(),
+});
+
+export type FriendProfile = z.infer<typeof friendProfileSchema>;
+
 export const updateProfileSchema = z.object({
   slug: z
     .string()
@@ -24,7 +32,20 @@ export const updateProfileSchema = z.object({
     .optional(),
   displayName: z.string().trim().min(1).max(64).optional(),
   bio: z.string().trim().max(500).nullable().optional(),
-  avatarUrl: z.string().url().nullable().optional(),
+  avatarUrl: z
+    .preprocess(
+      (value) => (value === '' ? null : value),
+      z
+        .string()
+        .refine(
+          (value) => value.startsWith('/uploads/avatar/') || z.string().url().safeParse(value).success,
+          {
+            message: 'Avatar must be a URL or an uploaded avatar path',
+          },
+        )
+        .nullable(),
+    )
+    .optional(),
 });
 
 export type UpdateProfileInput = z.infer<typeof updateProfileSchema>;