giles
7fda7a8027
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m38s
Layout components now self-resolve context (cart-mini, auth-menu, nav-tree, rights, URLs) via new IO primitives (root-header-ctx, select-colours, account-nav-ctx, app-rights) and defmacro wrappers (~root-header-auto, ~auth-header-row-auto, ~root-mobile-auto). This eliminates _ctx_to_env(), HELPER_CSS_CLASSES, and verbose :key threading across all 10 services. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
94 lines
4.1 KiB
Plaintext
94 lines
4.1 KiB
Plaintext
;; Shared auth components — login flow, check email, header rows
|
|
;; Used by account, orders, cart, and federation services.
|
|
|
|
;; ---------------------------------------------------------------------------
|
|
;; Auth / orders header rows — DRY extraction from per-service Python
|
|
;; ---------------------------------------------------------------------------
|
|
|
|
;; Auth section nav items (newsletters link + account_nav slot)
|
|
(defcomp ~auth-nav-items (&key account-url select-colours account-nav)
|
|
(<>
|
|
(~nav-link :href (str (or account-url "") "/newsletters/")
|
|
:label "newsletters"
|
|
:select-colours (or select-colours ""))
|
|
(when account-nav account-nav)))
|
|
|
|
;; Auth header row — wraps ~menu-row-sx for account section
|
|
(defcomp ~auth-header-row (&key account-url select-colours account-nav oob)
|
|
(~menu-row-sx :id "auth-row" :level 1 :colour "sky"
|
|
:link-href (str (or account-url "") "/")
|
|
:link-label "account" :icon "fa-solid fa-user"
|
|
:nav (~auth-nav-items :account-url account-url
|
|
:select-colours select-colours
|
|
:account-nav account-nav)
|
|
:child-id "auth-header-child" :oob oob))
|
|
|
|
;; Auth header row without nav (for cart service)
|
|
(defcomp ~auth-header-row-simple (&key account-url oob)
|
|
(~menu-row-sx :id "auth-row" :level 1 :colour "sky"
|
|
:link-href (str (or account-url "") "/")
|
|
:link-label "account" :icon "fa-solid fa-user"
|
|
:child-id "auth-header-child" :oob oob))
|
|
|
|
;; Auto-fetching auth header — uses IO primitives, no free variables needed.
|
|
;; Expands inline (defmacro) so IO calls resolve in _aser mode.
|
|
(defmacro ~auth-header-row-auto (oob)
|
|
(quasiquote
|
|
(~auth-header-row :account-url (app-url "account" "")
|
|
:select-colours (select-colours)
|
|
:account-nav (account-nav-ctx)
|
|
:oob (unquote oob))))
|
|
|
|
(defmacro ~auth-header-row-simple-auto (oob)
|
|
(quasiquote
|
|
(~auth-header-row-simple :account-url (app-url "account" "")
|
|
:oob (unquote oob))))
|
|
|
|
;; Auto-fetching auth nav items — for mobile menus
|
|
(defmacro ~auth-nav-items-auto ()
|
|
(quasiquote
|
|
(~auth-nav-items :account-url (app-url "account" "")
|
|
:select-colours (select-colours)
|
|
:account-nav (account-nav-ctx))))
|
|
|
|
;; Orders header row
|
|
(defcomp ~orders-header-row (&key list-url)
|
|
(~menu-row-sx :id "orders-row" :level 2 :colour "sky"
|
|
:link-href list-url :link-label "Orders" :icon "fa fa-gbp"
|
|
:child-id "orders-header-child"))
|
|
|
|
;; ---------------------------------------------------------------------------
|
|
;; Auth forms — login flow, check email
|
|
;; ---------------------------------------------------------------------------
|
|
|
|
(defcomp ~auth-error-banner (&key error)
|
|
(when error
|
|
(div :class "bg-red-50 border border-red-200 text-red-700 p-3 rounded mb-4"
|
|
error)))
|
|
|
|
(defcomp ~auth-login-form (&key error action csrf-token email)
|
|
(div :class "py-8 max-w-md mx-auto"
|
|
(h1 :class "text-2xl font-bold mb-6" "Sign in")
|
|
error
|
|
(form :method "post" :action action :class "space-y-4"
|
|
(input :type "hidden" :name "csrf_token" :value csrf-token)
|
|
(div
|
|
(label :for "email" :class "block text-sm font-medium mb-1" "Email address")
|
|
(input :type "email" :name "email" :id "email" :value email :required true :autofocus true
|
|
:class "w-full border border-stone-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-stone-500"))
|
|
(button :type "submit"
|
|
:class "w-full bg-stone-800 text-white py-2 px-4 rounded hover:bg-stone-700 transition"
|
|
"Send magic link"))))
|
|
|
|
(defcomp ~auth-check-email-error (&key error)
|
|
(when error
|
|
(div :class "bg-yellow-50 border border-yellow-200 text-yellow-700 p-3 rounded mt-4"
|
|
error)))
|
|
|
|
(defcomp ~auth-check-email (&key email error)
|
|
(div :class "py-8 max-w-md mx-auto text-center"
|
|
(h1 :class "text-2xl font-bold mb-4" "Check your email")
|
|
(p :class "text-stone-600 mb-2" "We sent a sign-in link to " (strong email) ".")
|
|
(p :class "text-stone-500 text-sm" "Click the link in the email to sign in. The link expires in 15 minutes.")
|
|
error))
|