@prenta/admin 1.9.0 → 1.9.2

package/src/__tests__/lib/pages-service.test.ts

@@ -25,8 +25,8 @@ function page(partial: Partial<Page> & Pick<Page, 'id' | 'title'>): Page {
     scheduledDate: null,
     lastModified: partial.lastModified ?? '2026-05-01',
     seoScore: partial.seoScore ?? null,
-    seoTitle: null,
-    seoDescription: null,
+    seoTitle: partial.seoTitle ?? null,
+    seoDescription: partial.seoDescription ?? null,
     templateId: null,
     isHomepage: partial.isHomepage ?? false,
     isSystemPage: false,
@@ -106,13 +106,27 @@ describe('applyPagesQuery', () => {
     expect(out.map((p) => p.id).sort()).toEqual(['1', '2', '3'])
   })
 
-  it('searches title, path, and tags', () => {
+  it('searches the page title only', () => {
     expect(applyPagesQuery(PAGES, { search: 'seo' }).map((p) => p.id)).toEqual(['3'])
-    expect(
-      applyPagesQuery(PAGES, { search: 'core' })
-        .map((p) => p.id)
-        .sort(),
-    ).toEqual(['1', '2'])
+    expect(applyPagesQuery(PAGES, { search: 'about' }).map((p) => p.id)).toEqual(['1'])
+    // Tag slug "core" is on About + Services, but it is not a title match.
+    expect(applyPagesQuery(PAGES, { search: 'core' })).toEqual([])
+  })
+
+  it('does not match path, slug, author, tags, or SEO metadata', () => {
+    const marketing = page({
+      id: '5',
+      title: 'Digital Marketing',
+      path: '/services/seo-audit',
+      slug: 'seo-audit',
+      authorName: 'SEO Specialist',
+      tags: ['seo'],
+      seoTitle: 'Digital Marketing & SEO Services | Acme',
+      seoDescription: 'Full-service SEO, PPC, and content marketing.',
+    })
+    expect(applyPagesQuery([...PAGES, marketing], { search: 'seo' }).map((p) => p.id)).toEqual([
+      '3',
+    ])
   })
 
   it('sorts by seo descending', () => {

package/src/__tests__/views/login-branding.render.test.tsx

@@ -32,8 +32,9 @@ describe('Login — logo resolution', () => {
     render(<Login onLogin={onLogin} />)
     // Bundled SVG exposes role="img" + aria-label="Prenta".
     expect(screen.getByRole('img', { name: 'Prenta' })).toBeTruthy()
-    // No <img> logo element.
+    // No <img> logo element, and the wordmark already says Prenta — no extra headline.
     expect(screen.queryByRole('img', { name: 'Prenta CMS' })).toBeNull()
+    expect(screen.queryByRole('heading', { name: 'Prenta CMS' })).toBeNull()
     await waitFor(() => expect(cmsApiMock).toHaveBeenCalledWith('/public/brand'))
   })
 

package/src/__tests__/views/login-root.render.test.tsx

@@ -44,6 +44,13 @@ describe('LoginRoot', () => {
     expect(screen.getByText('Sign in to your account')).toBeTruthy()
   })
 
+  it('shows a logged-out confirmation when arriving with ?loggedOut=1', () => {
+    window.history.replaceState({}, '', '/securelogin?loggedOut=1')
+    render(<LoginRoot config={{}} session={null} onLogin={noopLogin} />)
+    expect(screen.getByRole('status').textContent).toMatch(/logged out successfully/i)
+    expect(screen.getByText('Sign in to your account')).toBeTruthy()
+  })
+
   it('renders the setup wizard while setup is required (first-time install)', () => {
     window.history.replaceState({}, '', '/securelogin/setup')
     render(

package/src/assets/prenta-logo.tsx

@@ -1,8 +1,11 @@
 /**
- * Default Prenta wordmark for the admin sidebar (top-left) and the login
- * screen: a rounded-square mark with a stencil "P" cutout plus the product
- * name. Everything renders in `currentColor`, so the logo follows the
- * surrounding theme in both light and dark mode with no baked-in palette.
+ * Default Prenta brand lockup for the admin sidebar (top-left) and the login
+ * screen: the word "Prenta" plus a three-dot ellipsis (last dot is the brand
+ * red). The collapsed sidebar uses the matching "P…" mark.
+ *
+ * Letterforms and the first two dots render in `currentColor` so the lockup
+ * follows the surrounding theme in light and dark mode. The accent dot is the
+ * one baked-in brand color.
  *
  * Integrators override this default via:
  *   defineConfig({
@@ -20,42 +23,65 @@ export interface BrandLogoProps {
   className?: string
 }
 
+/** Brand-red accent used for the final ellipsis dot. */
+export const PRENTA_ACCENT = '#E30613'
+
+const FONT = "system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif"
+
 /**
- * Inline SVG renderer for the Prenta wordmark. Ships as JSX (no bundler asset
- * pipeline required — works under Next.js, Vite, Webpack, esbuild, etc.).
- * The wordmark text inherits the admin font stack; `textLength` pins the
- * rendered width so the lockup stays proportioned across font fallbacks.
+ * Compact "P…" mark for the collapsed sidebar rail and other square slots.
  */
-export function PrentaBrandLogo({ className }: BrandLogoProps): ReactElement {
+export function PrentaMark({ className }: BrandLogoProps): ReactElement {
   return (
     <svg
-      viewBox="0 0 128 28"
+      viewBox="0 0 48 48"
       xmlns="http://www.w3.org/2000/svg"
       className={className}
       role="img"
       aria-label="Prenta"
-      style={{ shapeRendering: 'geometricPrecision' }}
     >
-      {/* Mark: rounded square with a stencil "P" cutout (even-odd fill). */}
       <path
         fill="currentColor"
         fillRule="evenodd"
-        d="M6 3 H16 A6 6 0 0 1 22 9 V19 A6 6 0 0 1 16 25 H6 A6 6 0 0 1 0 19 V9 A6 6 0 0 1 6 3 Z M7.5 8.5 H13 A4.5 4.5 0 0 1 13 17.5 H10 V20.5 H7.5 Z M10 11 H12.8 A2 2 0 0 1 12.8 15 H10 Z"
+        d="M8 4h10.5c8.2 0 13.5 4.4 13.5 12.2 0 7.7-5.3 12.1-13.5 12.1H16v15.7H8V4zm8 6.4v11.4h2.2c4.7 0 7.4-2.3 7.4-5.7 0-3.5-2.7-5.7-7.4-5.7H16z"
       />
-      {/* Wordmark */}
+      <circle cx="26" cy="43.2" r="2.7" fill="currentColor" />
+      <circle cx="34.2" cy="43.2" r="2.7" fill="currentColor" />
+      <circle cx="42.4" cy="43.2" r="2.7" fill={PRENTA_ACCENT} />
+    </svg>
+  )
+}
+
+/**
+ * Horizontal "Prenta…" wordmark. Ships as JSX (no bundler asset pipeline —
+ * works under Next.js, Vite, Webpack, esbuild). `textLength` pins the
+ * rendered width so the lockup stays proportioned across font fallbacks.
+ */
+export function PrentaBrandLogo({ className }: BrandLogoProps): ReactElement {
+  return (
+    <svg
+      viewBox="0 0 168 32"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+      role="img"
+      aria-label="Prenta"
+    >
       <text
-        x="30"
-        y="20.5"
-        fontFamily="inherit"
-        fontSize="19"
-        fontWeight="600"
-        letterSpacing="-0.3"
+        x="0"
+        y="24"
+        fontFamily={FONT}
+        fontSize="22"
+        fontWeight="700"
+        letterSpacing="-0.6"
         fill="currentColor"
-        textLength="72"
+        textLength="104"
         lengthAdjust="spacingAndGlyphs"
       >
         Prenta
       </text>
+      <circle cx="118" cy="20" r="3.1" fill="currentColor" />
+      <circle cx="130.5" cy="20" r="3.1" fill="currentColor" />
+      <circle cx="143" cy="20" r="3.1" fill={PRENTA_ACCENT} />
     </svg>
   )
 }

package/src/layout/Sidebar.tsx

@@ -34,34 +34,9 @@ import {
   Trash2,
 } from 'lucide-react'
 import type { LucideIcon } from 'lucide-react'
-import { PrentaBrandLogo } from '../assets/prenta-logo.js'
+import { PrentaBrandLogo, PrentaMark } from '../assets/prenta-logo.js'
 import { LogoPlaceholder } from '../components/LogoPlaceholder.js'
 
-/**
- * Compact mark used in the collapsed sidebar — just the "C" symbol from the
- * full lockup, drawn as its own simple SVG so it stays crisp at 32×32.
- */
-function PrentaMark({ className }: { className?: string }) {
-  return (
-    <svg
-      viewBox="0 0 40 44"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      className={className}
-      aria-hidden="true"
-    >
-      <polygon points="20,2 6,18 12,18 20,8 28,18 34,18" fill="#F05E65" />
-      <rect x="11" y="20" width="4" height="22" rx="1" fill="#F05E65" />
-      <rect x="18" y="20" width="4" height="22" rx="1" fill="#F05E65" />
-      <rect x="25" y="20" width="4" height="22" rx="1" fill="#F05E65" />
-    </svg>
-  )
-}
-
-function PrentaWordmark({ className }: { className?: string }) {
-  return <PrentaBrandLogo className={className} />
-}
-
 const ICON_MAP: Record<string, LucideIcon> = {
   file: File,
   'file-text': FileText,
@@ -180,7 +155,7 @@ function BrandLogo({ config, collapsed }: { config?: any; collapsed: boolean })
     )
   }
 
-  return <PrentaWordmark className="h-9" />
+  return <PrentaBrandLogo className="h-8 w-auto" />
 }
 
 /**

package/src/lib/logout-redirect.ts

@@ -0,0 +1,33 @@
+/**
+ * Post-logout destination. Split-login installs must leave the admin mount
+ * (it renders a 404 lookalike for signed-out visitors) and land on the
+ * hidden login path. Inline-login installs stay on the admin mount and just
+ * show the login form. `?loggedOut=1` lets the login screen confirm the
+ * sign-out instead of dead-ending.
+ */
+
+export const LOGGED_OUT_QUERY = 'loggedOut'
+
+export interface LogoutRedirect {
+  /** Full-page navigation to a different mount (split login). */
+  kind: 'external' | 'internal'
+  href: string
+}
+
+export function resolveLogoutRedirect(opts: {
+  loginPath?: string
+  basePath?: string
+}): LogoutRedirect {
+  const basePath = opts.basePath ?? '/admin'
+  const loginPath = opts.loginPath
+  if (loginPath && loginPath !== basePath) {
+    return { kind: 'external', href: `${loginPath}?${LOGGED_OUT_QUERY}=1` }
+  }
+  return { kind: 'internal', href: `/?${LOGGED_OUT_QUERY}=1` }
+}
+
+export function hasLoggedOutQuery(
+  search: string = typeof window !== 'undefined' ? window.location.search : '',
+): boolean {
+  return new URLSearchParams(search).get(LOGGED_OUT_QUERY) === '1'
+}

package/src/lib/pages-service.ts

@@ -307,21 +307,7 @@ export function applyPagesQuery(all: Page[], query: PagesQuery): Page[] {
     if (query.authorId && query.authorId !== 'all' && p.authorId !== query.authorId) return false
     // Tag chips use OR semantics: keep a page if it has any selected tag.
     if (tagFilter && !p.tags.some((t) => tagFilter.has(t))) return false
-    if (search) {
-      const haystack = [
-        p.title,
-        p.path,
-        p.slug,
-        p.authorName,
-        p.status,
-        p.seoTitle ?? '',
-        p.seoDescription ?? '',
-        p.tags.join(' '),
-      ]
-        .join(' ')
-        .toLowerCase()
-      if (!haystack.includes(search)) return false
-    }
+    if (search && !p.title.toLowerCase().includes(search)) return false
     return true
   })
 

package/src/views/Login.tsx

@@ -1,11 +1,12 @@
 'use client'
 
 import { useState, useEffect, useRef, type FormEvent } from 'react'
-import { Eye, EyeOff, AlertTriangle, Loader2 } from 'lucide-react'
+import { Eye, EyeOff, AlertTriangle, CheckCircle2, Loader2 } from 'lucide-react'
 import { PrentaBrandLogo } from '../assets/prenta-logo.js'
 import { LogoPlaceholder } from '../components/LogoPlaceholder.js'
 import { useTheme } from '../components/ThemeProvider.js'
 import { cmsApi } from '../lib/api.js'
+import { hasLoggedOutQuery } from '../lib/logout-redirect.js'
 
 export interface CaptchaConfig {
   provider: 'recaptcha' | 'turnstile' | 'none'
@@ -52,7 +53,7 @@ export interface LoginProps {
   captchaConfig?: CaptchaConfig
   /**
    * Custom branding for the login screen. Falls back to the bundled Prenta
-   * Media wordmark + "Prenta CMS" headline when omitted.
+   * wordmark when omitted.
    */
   branding?: LoginBrandingConfig
 }
@@ -269,6 +270,7 @@ export function Login({
     }
   }, [adminBrand.primaryUrl, branding?.logo])
 
+  const loggedOut = hasLoggedOutQuery()
   const canSubmit = email.trim() && password && !submitting
 
   const handleSubmit = async (e: FormEvent) => {
@@ -375,9 +377,10 @@ export function Login({
   const hasInitials = (value: string | null | undefined) => Boolean(value) && value !== 'A'
   const isBranded =
     Boolean(branding?.name) || hasInitials(adminBrand.initials) || hasInitials(publicInitials)
-  // When a logo image is shown it already carries the brand mark — a separate
-  // headline duplicates it (see Settings → Appearance uploads).
-  const showBrandName = !effectiveLogo
+  // A logo image or the bundled wordmark already carries the brand — a
+  // separate headline would duplicate it. Keep the name only for the
+  // branded-but-logo-less placeholder.
+  const showBrandName = !effectiveLogo && isBranded
 
   return (
     <div className="bg-muted flex min-h-screen items-center justify-center px-4">
@@ -489,6 +492,18 @@ export function Login({
             onSubmit={handleSubmit}
             className="border-border bg-card space-y-5 rounded-xl border p-6 shadow-sm"
           >
+            {loggedOut && !error && (
+              <div
+                className="border-success/30 bg-success/10 flex items-start gap-3 rounded-lg border p-3"
+                role="status"
+              >
+                <CheckCircle2 className="text-success mt-0.5 h-5 w-5 shrink-0" aria-hidden="true" />
+                <p className="text-success text-sm">
+                  Logged out successfully. Sign in to continue.
+                </p>
+              </div>
+            )}
+
             {error && (
               <div className="border-destructive/30 bg-destructive/10 flex items-start gap-3 rounded-lg border p-3">
                 <AlertTriangle className="text-destructive mt-0.5 h-5 w-5 shrink-0" />