ai cooking
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #193 from paulgmiller/pmiller/locationspage

Have recipes, instructions and favorite button on locations page.

authored by

Paul Miller and committed by
GitHub
4ca0caa4 f30296de

+419 -182
+3 -2
cmd/careme/mail.go
··· 10 10 "careme/internal/locations" 11 11 "careme/internal/recipes" 12 12 "careme/internal/users" 13 + utypes "careme/internal/users/types" 13 14 "context" 14 15 "errors" 15 16 "fmt" ··· 52 53 return nil, fmt.Errorf("failed to create recipe generator: %w", err) 53 54 } 54 55 55 - locationserver, err := locations.New(context.TODO(), cfg) 56 + locationserver, err := locations.New(cfg) 56 57 if err != nil { 57 58 return nil, fmt.Errorf("failed to create location server: %w", err) 58 59 } ··· 103 104 } 104 105 } 105 106 106 - func (m *mailer) sendEmail(ctx context.Context, user users.User) { 107 + func (m *mailer) sendEmail(ctx context.Context, user utypes.User) { 107 108 if user.FavoriteStore == "" { 108 109 slog.InfoContext(ctx, "no favorite store", "user", user.ID) 109 110 return
+8 -4
cmd/careme/ready.go
··· 8 8 9 9 type readyOnce struct { 10 10 done bool 11 - checks []func(context.Context) error 11 + checks []Readyable 12 12 } 13 13 14 14 func (r *readyOnce) Ready(ctx context.Context) error { ··· 16 16 return nil 17 17 } 18 18 for _, check := range r.checks { 19 - if err := check(ctx); err != nil { 19 + if err := check.Ready(ctx); err != nil { 20 20 return err 21 21 } 22 22 } ··· 25 25 return nil 26 26 } 27 27 28 - func (r *readyOnce) Add(f func(context.Context) error) { 29 - r.checks = append(r.checks, f) 28 + type Readyable interface { 29 + Ready(context.Context) error 30 + } 31 + 32 + func (r *readyOnce) Add(f ...Readyable) { 33 + r.checks = append(r.checks, f...) 30 34 } 31 35 32 36 func (r *readyOnce) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+1 -1
cmd/careme/static/tailwind.css
··· 1 1 /*! tailwindcss v4.1.18 | MIT License | https://tailwindcss.com */ 2 - @layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-space-y-reverse:0;--tw-divide-y-reverse:0;--tw-border-style:solid;--tw-gradient-position:initial;--tw-gradient-from:#0000;--tw-gradient-via:#0000;--tw-gradient-to:#0000;--tw-gradient-stops:initial;--tw-gradient-via-stops:initial;--tw-gradient-from-position:0%;--tw-gradient-via-position:50%;--tw-gradient-to-position:100%;--tw-font-weight:initial;--tw-tracking:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000}}}@layer theme{:root,:host{--font-sans:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-red-50:oklch(97.1% .013 17.38);--color-red-100:oklch(93.6% .032 17.717);--color-red-500:oklch(63.7% .237 25.331);--color-red-600:oklch(57.7% .245 27.325);--color-red-700:oklch(50.5% .213 27.518);--color-emerald-50:oklch(97.9% .021 166.113);--color-emerald-100:oklch(95% .052 163.051);--color-emerald-200:oklch(90.5% .093 164.15);--color-emerald-300:oklch(84.5% .143 164.978);--color-emerald-500:oklch(69.6% .17 162.48);--color-emerald-600:oklch(59.6% .145 163.225);--color-emerald-700:oklch(50.8% .118 165.612);--color-slate-100:oklch(96.8% .007 247.896);--color-slate-700:oklch(37.2% .044 257.287);--color-slate-900:oklch(20.8% .042 265.755);--color-slate-950:oklch(12.9% .042 264.695);--color-gray-50:oklch(98.5% .002 247.839);--color-gray-200:oklch(92.8% .006 264.531);--color-gray-300:oklch(87.2% .01 258.338);--color-gray-400:oklch(70.7% .022 261.325);--color-gray-500:oklch(55.1% .027 264.364);--color-gray-600:oklch(44.6% .03 256.802);--color-gray-700:oklch(37.3% .034 259.733);--color-gray-900:oklch(21% .034 264.665);--color-white:#fff;--spacing:.25rem;--container-xs:20rem;--container-md:28rem;--container-3xl:48rem;--container-4xl:56rem;--container-5xl:64rem;--text-xs:.75rem;--text-xs--line-height:calc(1/.75);--text-sm:.875rem;--text-sm--line-height:calc(1.25/.875);--text-lg:1.125rem;--text-lg--line-height:calc(1.75/1.125);--text-2xl:1.5rem;--text-2xl--line-height:calc(2/1.5);--text-3xl:1.875rem;--text-3xl--line-height:calc(2.25/1.875);--text-4xl:2.25rem;--text-4xl--line-height:calc(2.5/2.25);--font-weight-medium:500;--font-weight-semibold:600;--font-weight-extrabold:800;--tracking-tight:-.025em;--tracking-wide:.025em;--radius-lg:.5rem;--radius-xl:.75rem;--radius-2xl:1rem;--animate-spin:spin 1s linear infinite;--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-mono-font-family:var(--font-mono);--color-brand-50:var(--brand-50);--color-brand-100:var(--brand-100);--color-brand-200:var(--brand-200);--color-brand-300:var(--brand-300);--color-brand-400:var(--brand-400);--color-brand-500:var(--brand-500);--color-brand-600:var(--brand-600);--color-brand-700:var(--brand-700)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1}@supports (not ((-webkit-appearance:-apple-pay-button))) or (contain-intrinsic-size:1px){::placeholder{color:currentColor}@supports (color:color-mix(in lab, red, red)){::placeholder{color:color-mix(in oklab,currentcolor 50%,transparent)}}}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}::-webkit-calendar-picker-indicator{line-height:1}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}}@layer components;@layer utilities{.sr-only{clip-path:inset(50%);white-space:nowrap;border-width:0;width:1px;height:1px;margin:-1px;padding:0;position:absolute;overflow:hidden}.absolute{position:absolute}.relative{position:relative}.right-0{right:calc(var(--spacing)*0)}.z-10{z-index:10}.mx-auto{margin-inline:auto}.mt-1{margin-top:calc(var(--spacing)*1)}.mt-2{margin-top:calc(var(--spacing)*2)}.mt-3{margin-top:calc(var(--spacing)*3)}.mt-4{margin-top:calc(var(--spacing)*4)}.mt-6{margin-top:calc(var(--spacing)*6)}.mt-8{margin-top:calc(var(--spacing)*8)}.mt-10{margin-top:calc(var(--spacing)*10)}.mb-3{margin-bottom:calc(var(--spacing)*3)}.block{display:block}.flex{display:flex}.grid{display:grid}.hidden{display:none}.inline-flex{display:inline-flex}.h-4{height:calc(var(--spacing)*4)}.h-14{height:calc(var(--spacing)*14)}.min-h-screen{min-height:100vh}.w-4{width:calc(var(--spacing)*4)}.w-14{width:calc(var(--spacing)*14)}.w-48{width:calc(var(--spacing)*48)}.w-full{width:100%}.max-w-3xl{max-width:var(--container-3xl)}.max-w-4xl{max-width:var(--container-4xl)}.max-w-5xl{max-width:var(--container-5xl)}.max-w-md{max-width:var(--container-md)}.max-w-xs{max-width:var(--container-xs)}.flex-1{flex:1}.animate-spin{animation:var(--animate-spin)}.cursor-pointer{cursor:pointer}.list-inside{list-style-position:inside}.list-decimal{list-style-type:decimal}.list-none{list-style-type:none}.flex-col{flex-direction:column}.flex-wrap{flex-wrap:wrap}.items-center{align-items:center}.items-start{align-items:flex-start}.justify-between{justify-content:space-between}.justify-center{justify-content:center}.gap-1{gap:calc(var(--spacing)*1)}.gap-2{gap:calc(var(--spacing)*2)}.gap-3{gap:calc(var(--spacing)*3)}.gap-4{gap:calc(var(--spacing)*4)}.gap-6{gap:calc(var(--spacing)*6)}:where(.space-y-1>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*1)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*1)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-2>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*2)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*2)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-4>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*4)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*4)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*5)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*5)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-6>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*6)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*6)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-8>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*8)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*8)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-12>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*12)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*12)*calc(1 - var(--tw-space-y-reverse)))}:where(.divide-y>:not(:last-child)){--tw-divide-y-reverse:0;border-bottom-style:var(--tw-border-style);border-top-style:var(--tw-border-style);border-top-width:calc(1px*var(--tw-divide-y-reverse));border-bottom-width:calc(1px*calc(1 - var(--tw-divide-y-reverse)))}:where(.divide-brand-100>:not(:last-child)){border-color:var(--color-brand-100)}.rounded-2xl{border-radius:var(--radius-2xl)}.rounded-full{border-radius:3.40282e38px}.rounded-lg{border-radius:var(--radius-lg)}.rounded-xl{border-radius:var(--radius-xl)}.border{border-style:var(--tw-border-style);border-width:1px}.border-2{border-style:var(--tw-border-style);border-width:2px}.border-4{border-style:var(--tw-border-style);border-width:4px}.border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.border-brand-100{border-color:var(--color-brand-100)}.border-brand-200{border-color:var(--color-brand-200)}.border-brand-300{border-color:var(--color-brand-300)}.border-brand-400{border-color:var(--color-brand-400)}.border-emerald-200{border-color:var(--color-emerald-200)}.border-emerald-500{border-color:var(--color-emerald-500)}.border-gray-200{border-color:var(--color-gray-200)}.border-gray-300{border-color:var(--color-gray-300)}.border-red-500{border-color:var(--color-red-500)}.border-t-brand-600{border-top-color:var(--color-brand-600)}.bg-brand-50,.bg-brand-50\/60{background-color:var(--color-brand-50)}@supports (color:color-mix(in lab, red, red)){.bg-brand-50\/60{background-color:color-mix(in oklab,var(--color-brand-50)60%,transparent)}}.bg-brand-500{background-color:var(--color-brand-500)}.bg-brand-600{background-color:var(--color-brand-600)}.bg-emerald-50{background-color:var(--color-emerald-50)}.bg-emerald-500{background-color:var(--color-emerald-500)}.bg-gray-50{background-color:var(--color-gray-50)}.bg-red-50{background-color:var(--color-red-50)}.bg-white{background-color:var(--color-white)}.bg-white\/60{background-color:#fff9}@supports (color:color-mix(in lab, red, red)){.bg-white\/60{background-color:color-mix(in oklab,var(--color-white)60%,transparent)}}.bg-white\/90{background-color:#ffffffe6}@supports (color:color-mix(in lab, red, red)){.bg-white\/90{background-color:color-mix(in oklab,var(--color-white)90%,transparent)}}.bg-white\/95{background-color:#fffffff2}@supports (color:color-mix(in lab, red, red)){.bg-white\/95{background-color:color-mix(in oklab,var(--color-white)95%,transparent)}}.bg-gradient-to-b{--tw-gradient-position:to bottom in oklab;background-image:linear-gradient(var(--tw-gradient-stops))}.from-brand-50{--tw-gradient-from:var(--color-brand-50);--tw-gradient-stops:var(--tw-gradient-via-stops,var(--tw-gradient-position),var(--tw-gradient-from)var(--tw-gradient-from-position),var(--tw-gradient-to)var(--tw-gradient-to-position))}.to-white{--tw-gradient-to:var(--color-white);--tw-gradient-stops:var(--tw-gradient-via-stops,var(--tw-gradient-position),var(--tw-gradient-from)var(--tw-gradient-from-position),var(--tw-gradient-to)var(--tw-gradient-to-position))}.p-2{padding:calc(var(--spacing)*2)}.p-4{padding:calc(var(--spacing)*4)}.p-5{padding:calc(var(--spacing)*5)}.p-6{padding:calc(var(--spacing)*6)}.p-8{padding:calc(var(--spacing)*8)}.p-10{padding:calc(var(--spacing)*10)}.px-3{padding-inline:calc(var(--spacing)*3)}.px-4{padding-inline:calc(var(--spacing)*4)}.px-5{padding-inline:calc(var(--spacing)*5)}.px-8{padding-inline:calc(var(--spacing)*8)}.py-1\.5{padding-block:calc(var(--spacing)*1.5)}.py-2{padding-block:calc(var(--spacing)*2)}.py-2\.5{padding-block:calc(var(--spacing)*2.5)}.py-3{padding-block:calc(var(--spacing)*3)}.py-4{padding-block:calc(var(--spacing)*4)}.py-6{padding-block:calc(var(--spacing)*6)}.py-8{padding-block:calc(var(--spacing)*8)}.py-10{padding-block:calc(var(--spacing)*10)}.py-16{padding-block:calc(var(--spacing)*16)}.pt-8{padding-top:calc(var(--spacing)*8)}.pb-6{padding-bottom:calc(var(--spacing)*6)}.pl-5{padding-left:calc(var(--spacing)*5)}.text-center{text-align:center}.text-left{text-align:left}.text-2xl{font-size:var(--text-2xl);line-height:var(--tw-leading,var(--text-2xl--line-height))}.text-3xl{font-size:var(--text-3xl);line-height:var(--tw-leading,var(--text-3xl--line-height))}.text-4xl{font-size:var(--text-4xl);line-height:var(--tw-leading,var(--text-4xl--line-height))}.text-lg{font-size:var(--text-lg);line-height:var(--tw-leading,var(--text-lg--line-height))}.text-sm{font-size:var(--text-sm);line-height:var(--tw-leading,var(--text-sm--line-height))}.text-xs{font-size:var(--text-xs);line-height:var(--tw-leading,var(--text-xs--line-height))}.font-extrabold{--tw-font-weight:var(--font-weight-extrabold);font-weight:var(--font-weight-extrabold)}.font-medium{--tw-font-weight:var(--font-weight-medium);font-weight:var(--font-weight-medium)}.font-semibold{--tw-font-weight:var(--font-weight-semibold);font-weight:var(--font-weight-semibold)}.tracking-tight{--tw-tracking:var(--tracking-tight);letter-spacing:var(--tracking-tight)}.tracking-wide{--tw-tracking:var(--tracking-wide);letter-spacing:var(--tracking-wide)}.text-brand-600{color:var(--color-brand-600)}.text-brand-700{color:var(--color-brand-700)}.text-emerald-600{color:var(--color-emerald-600)}.text-emerald-700{color:var(--color-emerald-700)}.text-gray-400{color:var(--color-gray-400)}.text-gray-500{color:var(--color-gray-500)}.text-gray-600{color:var(--color-gray-600)}.text-gray-700{color:var(--color-gray-700)}.text-gray-900{color:var(--color-gray-900)}.text-red-600{color:var(--color-red-600)}.text-red-700{color:var(--color-red-700)}.text-white{color:var(--color-white)}.uppercase{text-transform:uppercase}.underline-offset-4{text-underline-offset:4px}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.placeholder-gray-400::placeholder{color:var(--color-gray-400)}.shadow-lg{--tw-shadow:0 10px 15px -3px var(--tw-shadow-color,#0000001a),0 4px 6px -4px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-md{--tw-shadow:0 4px 6px -1px var(--tw-shadow-color,#0000001a),0 2px 4px -2px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-sm{--tw-shadow:0 1px 3px 0 var(--tw-shadow-color,#0000001a),0 1px 2px -1px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-xl{--tw-shadow:0 20px 25px -5px var(--tw-shadow-color,#0000001a),0 8px 10px -6px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.transition{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to,opacity,box-shadow,transform,translate,scale,rotate,filter,-webkit-backdrop-filter,backdrop-filter,display,content-visibility,overlay,pointer-events;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}.peer-checked\/dismiss\:border-red-700:is(:where(.peer\/dismiss):checked~*){border-color:var(--color-red-700)}.peer-checked\/dismiss\:bg-red-600:is(:where(.peer\/dismiss):checked~*){background-color:var(--color-red-600)}.peer-checked\/dismiss\:text-white:is(:where(.peer\/dismiss):checked~*){color:var(--color-white)}.peer-checked\/save\:border-emerald-700:is(:where(.peer\/save):checked~*){border-color:var(--color-emerald-700)}.peer-checked\/save\:bg-emerald-600:is(:where(.peer\/save):checked~*){background-color:var(--color-emerald-600)}.peer-checked\/save\:text-white:is(:where(.peer\/save):checked~*){color:var(--color-white)}@media (hover:hover){.hover\:bg-brand-50:hover{background-color:var(--color-brand-50)}.hover\:bg-brand-100:hover{background-color:var(--color-brand-100)}.hover\:bg-brand-600:hover{background-color:var(--color-brand-600)}.hover\:bg-brand-700:hover{background-color:var(--color-brand-700)}.hover\:bg-emerald-100:hover{background-color:var(--color-emerald-100)}.hover\:bg-emerald-600:hover{background-color:var(--color-emerald-600)}.hover\:bg-red-50:hover{background-color:var(--color-red-50)}.hover\:bg-red-100:hover{background-color:var(--color-red-100)}.hover\:text-brand-600:hover{color:var(--color-brand-600)}.hover\:text-brand-700:hover{color:var(--color-brand-700)}.hover\:underline:hover{text-decoration-line:underline}}.focus\:border-brand-500:focus{border-color:var(--color-brand-500)}.focus\:bg-brand-50:focus{background-color:var(--color-brand-50)}.focus\:ring-2:focus{--tw-ring-shadow:var(--tw-ring-inset,)0 0 0 calc(2px + var(--tw-ring-offset-width))var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.focus\:ring-brand-400:focus{--tw-ring-color:var(--color-brand-400)}.focus\:ring-emerald-300:focus{--tw-ring-color:var(--color-emerald-300)}.focus\:ring-offset-2:focus{--tw-ring-offset-width:2px;--tw-ring-offset-shadow:var(--tw-ring-inset,)0 0 0 var(--tw-ring-offset-width)var(--tw-ring-offset-color)}.focus\:outline-none:focus{--tw-outline-style:none;outline-style:none}@media (min-width:40rem){.sm\:w-48{width:calc(var(--spacing)*48)}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-center{align-items:center}.sm\:justify-between{justify-content:space-between}}@media (min-width:48rem){.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}}}@property --tw-space-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-divide-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-gradient-position{syntax:"*";inherits:false}@property --tw-gradient-from{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-via{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-to{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-stops{syntax:"*";inherits:false}@property --tw-gradient-via-stops{syntax:"*";inherits:false}@property --tw-gradient-from-position{syntax:"<length-percentage>";inherits:false;initial-value:0%}@property --tw-gradient-via-position{syntax:"<length-percentage>";inherits:false;initial-value:50%}@property --tw-gradient-to-position{syntax:"<length-percentage>";inherits:false;initial-value:100%}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-tracking{syntax:"*";inherits:false}@property --tw-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-shadow-color{syntax:"*";inherits:false}@property --tw-shadow-alpha{syntax:"<percentage>";inherits:false;initial-value:100%}@property --tw-inset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-shadow-color{syntax:"*";inherits:false}@property --tw-inset-shadow-alpha{syntax:"<percentage>";inherits:false;initial-value:100%}@property --tw-ring-color{syntax:"*";inherits:false}@property --tw-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-ring-color{syntax:"*";inherits:false}@property --tw-inset-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-ring-inset{syntax:"*";inherits:false}@property --tw-ring-offset-width{syntax:"<length>";inherits:false;initial-value:0}@property --tw-ring-offset-color{syntax:"*";inherits:false;initial-value:#fff}@property --tw-ring-offset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@keyframes spin{to{transform:rotate(360deg)}} 2 + @layer properties{@supports (((-webkit-hyphens:none)) and (not (margin-trim:inline))) or ((-moz-orient:inline) and (not (color:rgb(from red r g b)))){*,:before,:after,::backdrop{--tw-space-y-reverse:0;--tw-divide-y-reverse:0;--tw-border-style:solid;--tw-gradient-position:initial;--tw-gradient-from:#0000;--tw-gradient-via:#0000;--tw-gradient-to:#0000;--tw-gradient-stops:initial;--tw-gradient-via-stops:initial;--tw-gradient-from-position:0%;--tw-gradient-via-position:50%;--tw-gradient-to-position:100%;--tw-leading:initial;--tw-font-weight:initial;--tw-tracking:initial;--tw-shadow:0 0 #0000;--tw-shadow-color:initial;--tw-shadow-alpha:100%;--tw-inset-shadow:0 0 #0000;--tw-inset-shadow-color:initial;--tw-inset-shadow-alpha:100%;--tw-ring-color:initial;--tw-ring-shadow:0 0 #0000;--tw-inset-ring-color:initial;--tw-inset-ring-shadow:0 0 #0000;--tw-ring-inset:initial;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-offset-shadow:0 0 #0000}}}@layer theme{:root,:host{--font-sans:ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";--font-mono:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;--color-red-50:oklch(97.1% .013 17.38);--color-red-100:oklch(93.6% .032 17.717);--color-red-500:oklch(63.7% .237 25.331);--color-red-600:oklch(57.7% .245 27.325);--color-red-700:oklch(50.5% .213 27.518);--color-amber-500:oklch(76.9% .188 70.08);--color-emerald-50:oklch(97.9% .021 166.113);--color-emerald-100:oklch(95% .052 163.051);--color-emerald-200:oklch(90.5% .093 164.15);--color-emerald-300:oklch(84.5% .143 164.978);--color-emerald-500:oklch(69.6% .17 162.48);--color-emerald-600:oklch(59.6% .145 163.225);--color-emerald-700:oklch(50.8% .118 165.612);--color-slate-100:oklch(96.8% .007 247.896);--color-slate-700:oklch(37.2% .044 257.287);--color-slate-900:oklch(20.8% .042 265.755);--color-slate-950:oklch(12.9% .042 264.695);--color-gray-50:oklch(98.5% .002 247.839);--color-gray-200:oklch(92.8% .006 264.531);--color-gray-300:oklch(87.2% .01 258.338);--color-gray-400:oklch(70.7% .022 261.325);--color-gray-500:oklch(55.1% .027 264.364);--color-gray-600:oklch(44.6% .03 256.802);--color-gray-700:oklch(37.3% .034 259.733);--color-gray-900:oklch(21% .034 264.665);--color-white:#fff;--spacing:.25rem;--container-xs:20rem;--container-md:28rem;--container-3xl:48rem;--container-4xl:56rem;--container-5xl:64rem;--text-xs:.75rem;--text-xs--line-height:calc(1/.75);--text-sm:.875rem;--text-sm--line-height:calc(1.25/.875);--text-lg:1.125rem;--text-lg--line-height:calc(1.75/1.125);--text-2xl:1.5rem;--text-2xl--line-height:calc(2/1.5);--text-3xl:1.875rem;--text-3xl--line-height:calc(2.25/1.875);--text-4xl:2.25rem;--text-4xl--line-height:calc(2.5/2.25);--font-weight-medium:500;--font-weight-semibold:600;--font-weight-extrabold:800;--tracking-tight:-.025em;--tracking-wide:.025em;--radius-lg:.5rem;--radius-xl:.75rem;--radius-2xl:1rem;--animate-spin:spin 1s linear infinite;--default-transition-duration:.15s;--default-transition-timing-function:cubic-bezier(.4,0,.2,1);--default-font-family:var(--font-sans);--default-mono-font-family:var(--font-mono);--color-brand-50:var(--brand-50);--color-brand-100:var(--brand-100);--color-brand-200:var(--brand-200);--color-brand-300:var(--brand-300);--color-brand-400:var(--brand-400);--color-brand-500:var(--brand-500);--color-brand-600:var(--brand-600);--color-brand-700:var(--brand-700)}}@layer base{*,:after,:before,::backdrop{box-sizing:border-box;border:0 solid;margin:0;padding:0}::file-selector-button{box-sizing:border-box;border:0 solid;margin:0;padding:0}html,:host{-webkit-text-size-adjust:100%;tab-size:4;line-height:1.5;font-family:var(--default-font-family,ui-sans-serif,system-ui,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji");font-feature-settings:var(--default-font-feature-settings,normal);font-variation-settings:var(--default-font-variation-settings,normal);-webkit-tap-highlight-color:transparent}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;-webkit-text-decoration:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:var(--default-mono-font-family,ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace);font-feature-settings:var(--default-mono-font-feature-settings,normal);font-variation-settings:var(--default-mono-font-variation-settings,normal);font-size:1em}small{font-size:80%}sub,sup{vertical-align:baseline;font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}:-moz-focusring{outline:auto}progress{vertical-align:baseline}summary{display:list-item}ol,ul,menu{list-style:none}img,svg,video,canvas,audio,iframe,embed,object{vertical-align:middle;display:block}img,video{max-width:100%;height:auto}button,input,select,optgroup,textarea{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}::file-selector-button{font:inherit;font-feature-settings:inherit;font-variation-settings:inherit;letter-spacing:inherit;color:inherit;opacity:1;background-color:#0000;border-radius:0}:where(select:is([multiple],[size])) optgroup{font-weight:bolder}:where(select:is([multiple],[size])) optgroup option{padding-inline-start:20px}::file-selector-button{margin-inline-end:4px}::placeholder{opacity:1}@supports (not ((-webkit-appearance:-apple-pay-button))) or (contain-intrinsic-size:1px){::placeholder{color:currentColor}@supports (color:color-mix(in lab, red, red)){::placeholder{color:color-mix(in oklab,currentcolor 50%,transparent)}}}textarea{resize:vertical}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-date-and-time-value{min-height:1lh;text-align:inherit}::-webkit-datetime-edit{display:inline-flex}::-webkit-datetime-edit-fields-wrapper{padding:0}::-webkit-datetime-edit{padding-block:0}::-webkit-datetime-edit-year-field{padding-block:0}::-webkit-datetime-edit-month-field{padding-block:0}::-webkit-datetime-edit-day-field{padding-block:0}::-webkit-datetime-edit-hour-field{padding-block:0}::-webkit-datetime-edit-minute-field{padding-block:0}::-webkit-datetime-edit-second-field{padding-block:0}::-webkit-datetime-edit-millisecond-field{padding-block:0}::-webkit-datetime-edit-meridiem-field{padding-block:0}::-webkit-calendar-picker-indicator{line-height:1}:-moz-ui-invalid{box-shadow:none}button,input:where([type=button],[type=reset],[type=submit]){appearance:button}::file-selector-button{appearance:button}::-webkit-inner-spin-button{height:auto}::-webkit-outer-spin-button{height:auto}[hidden]:where(:not([hidden=until-found])){display:none!important}}@layer components;@layer utilities{.sr-only{clip-path:inset(50%);white-space:nowrap;border-width:0;width:1px;height:1px;margin:-1px;padding:0;position:absolute;overflow:hidden}.absolute{position:absolute}.relative{position:relative}.right-0{right:calc(var(--spacing)*0)}.z-10{z-index:10}.container{width:100%}@media (min-width:40rem){.container{max-width:40rem}}@media (min-width:48rem){.container{max-width:48rem}}@media (min-width:64rem){.container{max-width:64rem}}@media (min-width:80rem){.container{max-width:80rem}}@media (min-width:96rem){.container{max-width:96rem}}.mx-auto{margin-inline:auto}.mt-1{margin-top:calc(var(--spacing)*1)}.mt-2{margin-top:calc(var(--spacing)*2)}.mt-3{margin-top:calc(var(--spacing)*3)}.mt-4{margin-top:calc(var(--spacing)*4)}.mt-6{margin-top:calc(var(--spacing)*6)}.mt-8{margin-top:calc(var(--spacing)*8)}.mt-10{margin-top:calc(var(--spacing)*10)}.mb-3{margin-bottom:calc(var(--spacing)*3)}.block{display:block}.flex{display:flex}.grid{display:grid}.hidden{display:none}.inline-flex{display:inline-flex}.h-4{height:calc(var(--spacing)*4)}.h-14{height:calc(var(--spacing)*14)}.min-h-screen{min-height:100vh}.w-4{width:calc(var(--spacing)*4)}.w-14{width:calc(var(--spacing)*14)}.w-48{width:calc(var(--spacing)*48)}.w-full{width:100%}.max-w-3xl{max-width:var(--container-3xl)}.max-w-4xl{max-width:var(--container-4xl)}.max-w-5xl{max-width:var(--container-5xl)}.max-w-md{max-width:var(--container-md)}.max-w-xs{max-width:var(--container-xs)}.flex-1{flex:1}.animate-spin{animation:var(--animate-spin)}.cursor-pointer{cursor:pointer}.list-inside{list-style-position:inside}.list-decimal{list-style-type:decimal}.list-none{list-style-type:none}.flex-col{flex-direction:column}.flex-wrap{flex-wrap:wrap}.items-center{align-items:center}.justify-between{justify-content:space-between}.justify-center{justify-content:center}.gap-1{gap:calc(var(--spacing)*1)}.gap-2{gap:calc(var(--spacing)*2)}.gap-3{gap:calc(var(--spacing)*3)}.gap-4{gap:calc(var(--spacing)*4)}.gap-6{gap:calc(var(--spacing)*6)}:where(.space-y-1>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*1)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*1)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-2>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*2)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*2)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-4>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*4)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*4)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-5>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*5)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*5)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-6>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*6)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*6)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-8>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*8)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*8)*calc(1 - var(--tw-space-y-reverse)))}:where(.space-y-12>:not(:last-child)){--tw-space-y-reverse:0;margin-block-start:calc(calc(var(--spacing)*12)*var(--tw-space-y-reverse));margin-block-end:calc(calc(var(--spacing)*12)*calc(1 - var(--tw-space-y-reverse)))}:where(.divide-y>:not(:last-child)){--tw-divide-y-reverse:0;border-bottom-style:var(--tw-border-style);border-top-style:var(--tw-border-style);border-top-width:calc(1px*var(--tw-divide-y-reverse));border-bottom-width:calc(1px*calc(1 - var(--tw-divide-y-reverse)))}:where(.divide-brand-100>:not(:last-child)){border-color:var(--color-brand-100)}.rounded-2xl{border-radius:var(--radius-2xl)}.rounded-full{border-radius:3.40282e38px}.rounded-lg{border-radius:var(--radius-lg)}.rounded-xl{border-radius:var(--radius-xl)}.border{border-style:var(--tw-border-style);border-width:1px}.border-2{border-style:var(--tw-border-style);border-width:2px}.border-4{border-style:var(--tw-border-style);border-width:4px}.border-b{border-bottom-style:var(--tw-border-style);border-bottom-width:1px}.border-brand-100{border-color:var(--color-brand-100)}.border-brand-200{border-color:var(--color-brand-200)}.border-brand-300{border-color:var(--color-brand-300)}.border-brand-400{border-color:var(--color-brand-400)}.border-emerald-200{border-color:var(--color-emerald-200)}.border-emerald-500{border-color:var(--color-emerald-500)}.border-gray-200{border-color:var(--color-gray-200)}.border-gray-300{border-color:var(--color-gray-300)}.border-red-500{border-color:var(--color-red-500)}.border-t-brand-600{border-top-color:var(--color-brand-600)}.bg-brand-50,.bg-brand-50\/40{background-color:var(--color-brand-50)}@supports (color:color-mix(in lab, red, red)){.bg-brand-50\/40{background-color:color-mix(in oklab,var(--color-brand-50)40%,transparent)}}.bg-brand-50\/60{background-color:var(--color-brand-50)}@supports (color:color-mix(in lab, red, red)){.bg-brand-50\/60{background-color:color-mix(in oklab,var(--color-brand-50)60%,transparent)}}.bg-brand-500{background-color:var(--color-brand-500)}.bg-brand-600{background-color:var(--color-brand-600)}.bg-emerald-50{background-color:var(--color-emerald-50)}.bg-emerald-500{background-color:var(--color-emerald-500)}.bg-gray-50{background-color:var(--color-gray-50)}.bg-red-50{background-color:var(--color-red-50)}.bg-white{background-color:var(--color-white)}.bg-white\/60{background-color:#fff9}@supports (color:color-mix(in lab, red, red)){.bg-white\/60{background-color:color-mix(in oklab,var(--color-white)60%,transparent)}}.bg-white\/90{background-color:#ffffffe6}@supports (color:color-mix(in lab, red, red)){.bg-white\/90{background-color:color-mix(in oklab,var(--color-white)90%,transparent)}}.bg-white\/95{background-color:#fffffff2}@supports (color:color-mix(in lab, red, red)){.bg-white\/95{background-color:color-mix(in oklab,var(--color-white)95%,transparent)}}.bg-gradient-to-b{--tw-gradient-position:to bottom in oklab;background-image:linear-gradient(var(--tw-gradient-stops))}.from-brand-50{--tw-gradient-from:var(--color-brand-50);--tw-gradient-stops:var(--tw-gradient-via-stops,var(--tw-gradient-position),var(--tw-gradient-from)var(--tw-gradient-from-position),var(--tw-gradient-to)var(--tw-gradient-to-position))}.to-white{--tw-gradient-to:var(--color-white);--tw-gradient-stops:var(--tw-gradient-via-stops,var(--tw-gradient-position),var(--tw-gradient-from)var(--tw-gradient-from-position),var(--tw-gradient-to)var(--tw-gradient-to-position))}.p-2{padding:calc(var(--spacing)*2)}.p-4{padding:calc(var(--spacing)*4)}.p-5{padding:calc(var(--spacing)*5)}.p-6{padding:calc(var(--spacing)*6)}.p-8{padding:calc(var(--spacing)*8)}.p-10{padding:calc(var(--spacing)*10)}.px-3{padding-inline:calc(var(--spacing)*3)}.px-4{padding-inline:calc(var(--spacing)*4)}.px-5{padding-inline:calc(var(--spacing)*5)}.px-8{padding-inline:calc(var(--spacing)*8)}.py-1\.5{padding-block:calc(var(--spacing)*1.5)}.py-2{padding-block:calc(var(--spacing)*2)}.py-2\.5{padding-block:calc(var(--spacing)*2.5)}.py-3{padding-block:calc(var(--spacing)*3)}.py-4{padding-block:calc(var(--spacing)*4)}.py-6{padding-block:calc(var(--spacing)*6)}.py-8{padding-block:calc(var(--spacing)*8)}.py-10{padding-block:calc(var(--spacing)*10)}.py-16{padding-block:calc(var(--spacing)*16)}.pt-8{padding-top:calc(var(--spacing)*8)}.pb-6{padding-bottom:calc(var(--spacing)*6)}.pl-5{padding-left:calc(var(--spacing)*5)}.text-center{text-align:center}.text-left{text-align:left}.text-2xl{font-size:var(--text-2xl);line-height:var(--tw-leading,var(--text-2xl--line-height))}.text-3xl{font-size:var(--text-3xl);line-height:var(--tw-leading,var(--text-3xl--line-height))}.text-4xl{font-size:var(--text-4xl);line-height:var(--tw-leading,var(--text-4xl--line-height))}.text-lg{font-size:var(--text-lg);line-height:var(--tw-leading,var(--text-lg--line-height))}.text-sm{font-size:var(--text-sm);line-height:var(--tw-leading,var(--text-sm--line-height))}.text-xs{font-size:var(--text-xs);line-height:var(--tw-leading,var(--text-xs--line-height))}.leading-none{--tw-leading:1;line-height:1}.font-extrabold{--tw-font-weight:var(--font-weight-extrabold);font-weight:var(--font-weight-extrabold)}.font-medium{--tw-font-weight:var(--font-weight-medium);font-weight:var(--font-weight-medium)}.font-semibold{--tw-font-weight:var(--font-weight-semibold);font-weight:var(--font-weight-semibold)}.tracking-tight{--tw-tracking:var(--tracking-tight);letter-spacing:var(--tracking-tight)}.tracking-wide{--tw-tracking:var(--tracking-wide);letter-spacing:var(--tracking-wide)}.text-amber-500{color:var(--color-amber-500)}.text-brand-600{color:var(--color-brand-600)}.text-brand-700{color:var(--color-brand-700)}.text-emerald-600{color:var(--color-emerald-600)}.text-emerald-700{color:var(--color-emerald-700)}.text-gray-400{color:var(--color-gray-400)}.text-gray-500{color:var(--color-gray-500)}.text-gray-600{color:var(--color-gray-600)}.text-gray-700{color:var(--color-gray-700)}.text-gray-900{color:var(--color-gray-900)}.text-red-600{color:var(--color-red-600)}.text-red-700{color:var(--color-red-700)}.text-white{color:var(--color-white)}.uppercase{text-transform:uppercase}.underline-offset-4{text-underline-offset:4px}.antialiased{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.placeholder-gray-400::placeholder{color:var(--color-gray-400)}.shadow-lg{--tw-shadow:0 10px 15px -3px var(--tw-shadow-color,#0000001a),0 4px 6px -4px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-md{--tw-shadow:0 4px 6px -1px var(--tw-shadow-color,#0000001a),0 2px 4px -2px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-sm{--tw-shadow:0 1px 3px 0 var(--tw-shadow-color,#0000001a),0 1px 2px -1px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.shadow-xl{--tw-shadow:0 20px 25px -5px var(--tw-shadow-color,#0000001a),0 8px 10px -6px var(--tw-shadow-color,#0000001a);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.transition{transition-property:color,background-color,border-color,outline-color,text-decoration-color,fill,stroke,--tw-gradient-from,--tw-gradient-via,--tw-gradient-to,opacity,box-shadow,transform,translate,scale,rotate,filter,-webkit-backdrop-filter,backdrop-filter,display,content-visibility,overlay,pointer-events;transition-timing-function:var(--tw-ease,var(--default-transition-timing-function));transition-duration:var(--tw-duration,var(--default-transition-duration))}.peer-checked\/dismiss\:border-red-700:is(:where(.peer\/dismiss):checked~*){border-color:var(--color-red-700)}.peer-checked\/dismiss\:bg-red-600:is(:where(.peer\/dismiss):checked~*){background-color:var(--color-red-600)}.peer-checked\/dismiss\:text-white:is(:where(.peer\/dismiss):checked~*){color:var(--color-white)}.peer-checked\/save\:border-emerald-700:is(:where(.peer\/save):checked~*){border-color:var(--color-emerald-700)}.peer-checked\/save\:bg-emerald-600:is(:where(.peer\/save):checked~*){background-color:var(--color-emerald-600)}.peer-checked\/save\:text-white:is(:where(.peer\/save):checked~*){color:var(--color-white)}@media (hover:hover){.hover\:bg-brand-50:hover{background-color:var(--color-brand-50)}.hover\:bg-brand-100:hover{background-color:var(--color-brand-100)}.hover\:bg-brand-600:hover{background-color:var(--color-brand-600)}.hover\:bg-brand-700:hover{background-color:var(--color-brand-700)}.hover\:bg-emerald-100:hover{background-color:var(--color-emerald-100)}.hover\:bg-emerald-600:hover{background-color:var(--color-emerald-600)}.hover\:bg-red-50:hover{background-color:var(--color-red-50)}.hover\:bg-red-100:hover{background-color:var(--color-red-100)}.hover\:text-brand-600:hover{color:var(--color-brand-600)}.hover\:text-brand-700:hover{color:var(--color-brand-700)}.hover\:underline:hover{text-decoration-line:underline}}.focus\:border-brand-400:focus{border-color:var(--color-brand-400)}.focus\:border-brand-500:focus{border-color:var(--color-brand-500)}.focus\:bg-brand-50:focus{background-color:var(--color-brand-50)}.focus\:ring-2:focus{--tw-ring-shadow:var(--tw-ring-inset,)0 0 0 calc(2px + var(--tw-ring-offset-width))var(--tw-ring-color,currentcolor);box-shadow:var(--tw-inset-shadow),var(--tw-inset-ring-shadow),var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow)}.focus\:ring-brand-300:focus{--tw-ring-color:var(--color-brand-300)}.focus\:ring-brand-400:focus{--tw-ring-color:var(--color-brand-400)}.focus\:ring-emerald-300:focus{--tw-ring-color:var(--color-emerald-300)}.focus\:ring-offset-2:focus{--tw-ring-offset-width:2px;--tw-ring-offset-shadow:var(--tw-ring-inset,)0 0 0 var(--tw-ring-offset-width)var(--tw-ring-offset-color)}.focus\:outline-none:focus{--tw-outline-style:none;outline-style:none}@media (min-width:40rem){.sm\:w-48{width:calc(var(--spacing)*48)}.sm\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}.sm\:flex-row{flex-direction:row}.sm\:items-center{align-items:center}.sm\:justify-between{justify-content:space-between}}@media (min-width:48rem){.md\:grid-cols-2{grid-template-columns:repeat(2,minmax(0,1fr))}}}@property --tw-space-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-divide-y-reverse{syntax:"*";inherits:false;initial-value:0}@property --tw-border-style{syntax:"*";inherits:false;initial-value:solid}@property --tw-gradient-position{syntax:"*";inherits:false}@property --tw-gradient-from{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-via{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-to{syntax:"<color>";inherits:false;initial-value:#0000}@property --tw-gradient-stops{syntax:"*";inherits:false}@property --tw-gradient-via-stops{syntax:"*";inherits:false}@property --tw-gradient-from-position{syntax:"<length-percentage>";inherits:false;initial-value:0%}@property --tw-gradient-via-position{syntax:"<length-percentage>";inherits:false;initial-value:50%}@property --tw-gradient-to-position{syntax:"<length-percentage>";inherits:false;initial-value:100%}@property --tw-leading{syntax:"*";inherits:false}@property --tw-font-weight{syntax:"*";inherits:false}@property --tw-tracking{syntax:"*";inherits:false}@property --tw-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-shadow-color{syntax:"*";inherits:false}@property --tw-shadow-alpha{syntax:"<percentage>";inherits:false;initial-value:100%}@property --tw-inset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-shadow-color{syntax:"*";inherits:false}@property --tw-inset-shadow-alpha{syntax:"<percentage>";inherits:false;initial-value:100%}@property --tw-ring-color{syntax:"*";inherits:false}@property --tw-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-inset-ring-color{syntax:"*";inherits:false}@property --tw-inset-ring-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@property --tw-ring-inset{syntax:"*";inherits:false}@property --tw-ring-offset-width{syntax:"<length>";inherits:false;initial-value:0}@property --tw-ring-offset-color{syntax:"*";inherits:false;initial-value:#fff}@property --tw-ring-offset-shadow{syntax:"*";inherits:false;initial-value:0 0 #0000}@keyframes spin{to{transform:rotate(360deg)}}
+12 -19
cmd/careme/web.go
··· 11 11 "careme/internal/seasons" 12 12 "careme/internal/templates" 13 13 "careme/internal/users" 14 + utypes "careme/internal/users/types" 14 15 "context" 15 16 "crypto/sha256" 16 17 _ "embed" ··· 66 67 } 67 68 }) 68 69 69 - locationserver, err := locations.New(context.TODO(), cfg) 70 + locationStorage, err := locations.New(cfg) 70 71 if err != nil { 71 72 return fmt.Errorf("failed to create location server: %w", err) 72 73 } 73 - locations.Register(locationserver, mux) 74 74 75 - userHandler := users.NewHandler(userStorage, locationserver, authClient) 75 + userHandler := users.NewHandler(userStorage, locationStorage, authClient) 76 76 userHandler.Register(mux) 77 77 78 - recipeHandler := recipes.NewHandler(cfg, userStorage, generator, locationserver, cache, authClient) 78 + locationServer := locations.NewServer(locationStorage, userStorage) 79 + locationServer.Register(mux, authClient) 80 + 81 + recipeHandler := recipes.NewHandler(cfg, userStorage, generator, locationStorage, cache, authClient) 79 82 recipeHandler.Register(mux) 80 83 81 84 if logsinkCfg.Enabled() { ··· 88 91 89 92 mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { 90 93 ctx := r.Context() 91 - var currentUser *users.User 92 - clerkUserID, err := authClient.GetUserIDFromRequest(r) 94 + var currentUser *utypes.User 95 + currentUser, err := userStorage.FromRequest(ctx, r, authClient) 93 96 if err != nil { 94 97 if !errors.Is(err, auth.ErrNoSession) { 95 - slog.ErrorContext(ctx, "failed to get clerk user ID", "error", err) 98 + slog.ErrorContext(ctx, "failed to get user from request", "error", err) 96 99 http.Error(w, "unable to load account", http.StatusInternalServerError) 97 100 return 98 101 } 99 102 //no user is fine we'll just pass nil currentUser to template 100 103 // just have two different templates? 101 104 102 - } else { 103 - currentUser, err = userStorage.FindOrCreateFromClerk(ctx, clerkUserID, authClient) 104 - if err != nil { 105 - slog.ErrorContext(ctx, "failed to get user by clerk ID", "clerk_user_id", clerkUserID, "error", err) 106 - http.Error(w, "unable to load account", http.StatusInternalServerError) 107 - return 108 - } 109 105 } 110 106 data := struct { 111 107 ClarityScript template.HTML 112 - User *users.User 108 + User *utypes.User 113 109 Style seasons.Style 114 110 ServerSignedIn bool 115 111 }{ ··· 125 121 }) 126 122 127 123 ro := &readyOnce{} 128 - ro.Add(generator.Ready) 129 - ro.Add(func(ctx context.Context) error { 130 - return locations.Ready(ctx, locationserver) 131 - }) 124 + ro.Add(generator, locationServer) 132 125 133 126 mux.Handle("/ready", ro) 134 127
+6 -10
cmd/careme/web_e2e_test.go
··· 1 1 package main 2 2 3 3 import ( 4 - "context" 5 4 "io" 6 5 "net/http" 7 6 "net/http/httptest" ··· 78 77 79 78 func newTestServer(t *testing.T) *httptest.Server { 80 79 t.Helper() 81 - ctx := t.Context() 82 80 83 81 cfg := &config.Config{Mocks: config.MockConfig{Enable: true}} 84 82 cacheDir := filepath.Join(t.TempDir(), "cache") ··· 89 87 if err != nil { 90 88 t.Fatalf("failed to create generator: %v", err) 91 89 } 92 - locationServer, err := locations.New(ctx, cfg) 90 + locationStorage, err := locations.New(cfg) 93 91 if err != nil { 94 92 t.Fatalf("failed to create location server: %v", err) 95 93 } ··· 97 95 mockAuth := auth.Mock(cfg) 98 96 99 97 mux := http.NewServeMux() 100 - locations.Register(locationServer, mux) 101 - users.NewHandler(userStorage, locationServer, mockAuth).Register(mux) 102 - recipes.NewHandler(cfg, userStorage, generator, locationServer, cacheStore, mockAuth).Register(mux) 98 + locationServer := locations.NewServer(locationStorage, userStorage) 99 + locationServer.Register(mux, mockAuth) 100 + users.NewHandler(userStorage, locationStorage, mockAuth).Register(mux) 101 + recipes.NewHandler(cfg, userStorage, generator, locationStorage, cacheStore, mockAuth).Register(mux) 103 102 104 103 ro := &readyOnce{} 105 - ro.Add(generator.Ready) 106 - ro.Add(func(ctx context.Context) error { 107 - return locations.Ready(ctx, locationServer) 108 - }) 104 + ro.Add(generator, locationServer) 109 105 110 106 mux.Handle("/ready", ro) 111 107
+3 -2
cmd/users/main.go
··· 3 3 import ( 4 4 "careme/internal/cache" 5 5 "careme/internal/users" 6 + utypes "careme/internal/users/types" 6 7 "context" 7 8 "flag" 8 9 "log" ··· 28 29 } 29 30 log.Printf("found %d users", len(userList)) 30 31 log.Printf("looking for user with email containing \"%s\"", userEmail) 31 - var old users.User 32 - var new []users.User 32 + var old utypes.User 33 + var new []utypes.User 33 34 for _, u := range userList { 34 35 //if !slices.Contains(u.Email, userEmail) { 35 36 // continue
+51 -25
internal/locations/locations.go
··· 1 1 package locations 2 2 3 3 import ( 4 + "careme/internal/auth" 4 5 "careme/internal/config" 5 6 "careme/internal/kroger" 6 7 "careme/internal/seasons" 7 8 "careme/internal/templates" 9 + utypes "careme/internal/users/types" 8 10 "context" 11 + "errors" 9 12 "fmt" 10 13 "html/template" 11 14 "log/slog" ··· 19 22 LocationDetailsWithResponse(ctx context.Context, locationId string, reqEditors ...kroger.RequestEditorFn) (*kroger.LocationDetailsResponse, error) 20 23 } 21 24 22 - type locationServer struct { 25 + type userLookup interface { 26 + FromRequest(ctx context.Context, r *http.Request, authClient auth.AuthClient) (*utypes.User, error) 27 + } 28 + 29 + type locationStorage struct { 23 30 locationCache map[string]Location 24 31 cacheLock sync.Mutex // to protect locationMap 25 32 client krogerClient 26 33 } 27 34 35 + type locationServer struct { 36 + storage locationGetter 37 + userStorage userLookup 38 + } 39 + 28 40 type locationGetter interface { 29 41 GetLocationByID(ctx context.Context, locationID string) (*Location, error) 30 42 GetLocationsByZip(ctx context.Context, zipcode string) ([]Location, error) 31 43 } 32 44 33 - func New(ctx context.Context, cfg *config.Config) (locationGetter, error) { 45 + func New(cfg *config.Config) (locationGetter, error) { 34 46 if cfg.Mocks.Enable { 35 47 return mock{}, nil 36 48 } ··· 39 51 if err != nil { 40 52 return nil, fmt.Errorf("failed to create Kroger client: %w", err) 41 53 } 42 - return &locationServer{ 54 + return &locationStorage{ 43 55 locationCache: make(map[string]Location), 44 56 cacheLock: sync.Mutex{}, 45 57 client: client, 46 58 }, nil 59 + 47 60 } 48 61 49 - func (l *locationServer) GetLocationByID(ctx context.Context, locationID string) (*Location, error) { 62 + func NewServer(storage locationGetter, userStorage userLookup) *locationServer { 63 + return &locationServer{ 64 + storage: storage, 65 + userStorage: userStorage, 66 + } 67 + } 68 + 69 + func (l *locationStorage) GetLocationByID(ctx context.Context, locationID string) (*Location, error) { 50 70 l.cacheLock.Lock() 51 71 52 72 if loc, exists := l.locationCache[locationID]; exists { ··· 82 102 State string `json:"state"` 83 103 } 84 104 85 - func (l *locationServer) GetLocationsByZip(ctx context.Context, zipcode string) ([]Location, error) { 105 + func (l *locationStorage) GetLocationsByZip(ctx context.Context, zipcode string) ([]Location, error) { 86 106 locparams := &kroger.LocationListParams{ 87 107 FilterZipCodeNear: &zipcode, 88 108 } ··· 111 131 return locations, nil 112 132 } 113 133 114 - func Ready(ctx context.Context, l locationGetter) error { 115 - _, err := l.GetLocationsByZip(ctx, "98005") //magic number is my zip code :) 134 + func (l *locationServer) Ready(ctx context.Context) error { 135 + _, err := l.storage.GetLocationsByZip(ctx, "98005") //magic number is my zip code :) 116 136 return err 117 137 } 118 138 119 - func Register(l locationGetter, mux *http.ServeMux) { 139 + func (l *locationServer) Register(mux *http.ServeMux, authClient auth.AuthClient) { 120 140 mux.HandleFunc("/locations", func(w http.ResponseWriter, r *http.Request) { 121 141 ctx := r.Context() 122 - /*_, err := users.FromRequest(r, userStorage) 142 + currentUser, err := l.userStorage.FromRequest(ctx, r, authClient) 123 143 if err != nil { 124 - if errors.Is(err, users.ErrNotFound) { 125 - users.ClearCookie(w) 126 - http.Redirect(w, r, "/", http.StatusSeeOther) 144 + if !errors.Is(err, auth.ErrNoSession) { 145 + http.Error(w, "unable to load account", http.StatusInternalServerError) 146 + slog.ErrorContext(ctx, "failed to get user from request", "error", err) 127 147 return 128 148 } 129 - slog.ErrorContext(ctx, "failed to load user for locations", "error", err) 130 - http.Error(w, "unable to load account", http.StatusInternalServerError) 131 - return 132 - }*/ 149 + } 150 + 133 151 zip := r.URL.Query().Get("zip") 134 152 if zip == "" { 135 153 slog.InfoContext(ctx, "no zip code provided to /locations") 136 154 http.Error(w, "provide a zip code with ?zip=12345", http.StatusBadRequest) 137 155 return 138 156 } 139 - locs, err := l.GetLocationsByZip(ctx, zip) 157 + locs, err := l.storage.GetLocationsByZip(ctx, zip) 140 158 if err != nil { 141 159 slog.ErrorContext(ctx, "failed to get locations for zip", "zip", zip, "error", err) 142 160 http.Error(w, "could not get locations", http.StatusInternalServerError) 143 161 return 144 162 } 163 + var favoriteStore string 164 + if currentUser != nil { 165 + favoriteStore = currentUser.FavoriteStore 166 + } 145 167 data := struct { 146 - Locations []Location 147 - Zip string 148 - ClarityScript template.HTML 149 - Style seasons.Style 168 + Locations []Location 169 + Zip string 170 + FavoriteStore string 171 + ClarityScript template.HTML 172 + Style seasons.Style 173 + ServerSignedIn bool 150 174 }{ 151 - Locations: locs, 152 - Zip: zip, 153 - ClarityScript: templates.ClarityScript(), 154 - Style: seasons.GetCurrentStyle(), 175 + Locations: locs, 176 + Zip: zip, 177 + FavoriteStore: favoriteStore, 178 + ClarityScript: templates.ClarityScript(), 179 + Style: seasons.GetCurrentStyle(), 180 + ServerSignedIn: currentUser != nil, 155 181 } 156 182 if err := templates.Location.Execute(w, data); err != nil { 157 183 http.Error(w, "template error", http.StatusInternalServerError)
+2 -2
internal/locations/locations_test.go
··· 165 165 } 166 166 } 167 167 168 - func newTestLocationServer(client krogerClient) *locationServer { 169 - return &locationServer{ 168 + func newTestLocationServer(client krogerClient) *locationStorage { 169 + return &locationStorage{ 170 170 locationCache: make(map[string]Location), 171 171 client: client, 172 172 }
+26
internal/locations/mock.go
··· 1 1 package locations 2 2 3 3 import ( 4 + "careme/internal/auth" 5 + "careme/internal/seasons" 6 + "careme/internal/templates" 4 7 "context" 5 8 "fmt" 9 + "html/template" 10 + "net/http" 6 11 7 12 "github.com/samber/lo" 8 13 ) ··· 35 40 func (m mock) GetLocationsByZip(ctx context.Context, zipcode string) ([]Location, error) { 36 41 return lo.Values(fakes), nil 37 42 } 43 + 44 + func (m mock) Register(mux *http.ServeMux, _ auth.AuthClient) { 45 + mux.HandleFunc("/locations", func(w http.ResponseWriter, r *http.Request) { 46 + data := struct { 47 + Locations []Location 48 + Zip string 49 + FavoriteStore string 50 + ClarityScript template.HTML 51 + Style seasons.Style 52 + }{ 53 + Locations: lo.Values(fakes), 54 + Zip: r.URL.Query().Get("zip"), 55 + FavoriteStore: "", 56 + ClarityScript: templates.ClarityScript(), 57 + Style: seasons.GetCurrentStyle(), 58 + } 59 + if err := templates.Location.Execute(w, data); err != nil { 60 + http.Error(w, "template error", http.StatusInternalServerError) 61 + } 62 + }) 63 + }
+7 -18
internal/recipes/server.go
··· 10 10 "careme/internal/seasons" 11 11 "careme/internal/templates" 12 12 "careme/internal/users" 13 + utypes "careme/internal/users/types" 13 14 "context" 14 15 "encoding/json" 15 16 "errors" ··· 127 128 http.Error(w, "recipe not found or expired", http.StatusNotFound) 128 129 return 129 130 } 130 - clerkUserID, err := s.clerk.GetUserIDFromRequest(r) 131 + 132 + currentUser, err := s.storage.FromRequest(ctx, r, s.clerk) // just for logging purposes in kickgeneration. We could do this in the generateion function instead to avoid the extra call on every not found. 131 133 if err != nil { 132 134 if !errors.Is(err, auth.ErrNoSession) { 133 135 slog.ErrorContext(ctx, "failed to get clerk user ID", "error", err) ··· 135 137 return 136 138 } 137 139 http.Redirect(w, r, "/", http.StatusSeeOther) 138 - return 139 - } 140 - currentUser, err := s.storage.FindOrCreateFromClerk(ctx, clerkUserID, s.clerk) 141 - if err != nil { 142 - slog.ErrorContext(ctx, "failed to get user by clerk ID", "clerk_user_id", clerkUserID, "error", err) 143 - http.Error(w, "unable to load account", http.StatusInternalServerError) 144 140 return 145 141 } 146 142 s.kickgeneration(ctx, p, currentUser) ··· 211 207 212 208 hash := p.Hash() 213 209 214 - clerkUserID, err := s.clerk.GetUserIDFromRequest(r) 210 + currentUser, err := s.storage.FromRequest(ctx, r, s.clerk) // just for logging purposes in kickgeneration. We could do this in the generateion function instead to avoid the extra call on every not found. 215 211 if err != nil { 216 212 if !errors.Is(err, auth.ErrNoSession) { 217 213 slog.ErrorContext(ctx, "failed to get clerk user ID", "error", err) ··· 223 219 return 224 220 } 225 221 226 - currentUser, err := s.storage.FindOrCreateFromClerk(ctx, clerkUserID, s.clerk) 227 - if err != nil { 228 - slog.ErrorContext(ctx, "failed to get user by clerk ID", "clerk_user_id", clerkUserID, "error", err) 229 - http.Error(w, "unable to load account", http.StatusInternalServerError) 230 - return 231 - } 232 - 233 222 // Handle finalize - save recipes to user profile and display filtered list 234 223 if r.URL.Query().Get("finalize") == "true" { 235 224 // Check if user is authenticated ··· 274 263 redirectToHash(w, r, hash, true /*useStart*/) 275 264 } 276 265 277 - func (s *server) kickgeneration(ctx context.Context, p *generatorParams, currentUser *users.User) { 266 + func (s *server) kickgeneration(ctx context.Context, p *generatorParams, currentUser *utypes.User) { 278 267 for _, last := range currentUser.LastRecipes { 279 268 if last.CreatedAt.Before(time.Now().AddDate(0, 0, -14)) { 280 269 break ··· 370 359 // Check if recipe already exists in user's last recipes 371 360 hash := recipe.ComputeHash() 372 361 373 - _, exists := lo.Find(currentUser.LastRecipes, func(r users.Recipe) bool { 362 + _, exists := lo.Find(currentUser.LastRecipes, func(r utypes.Recipe) bool { 374 363 return r.Hash == hash 375 364 }) 376 365 if exists { 377 366 continue 378 367 } 379 - newRecipe := users.Recipe{ 368 + newRecipe := utypes.Recipe{ 380 369 Title: recipe.Title, 381 370 Hash: hash, 382 371 CreatedAt: addTime,
+6 -5
internal/recipes/user_profile_test.go
··· 4 4 "careme/internal/ai" 5 5 "careme/internal/cache" 6 6 "careme/internal/users" 7 + utypes "careme/internal/users/types" 7 8 "context" 8 9 "os" 9 10 "strings" ··· 27 28 storage := users.NewStorage(tmpCache) 28 29 29 30 // Create a test user 30 - testUser := &users.User{ 31 + testUser := &utypes.User{ 31 32 ID: "test-user-id", 32 33 Email: []string{"test@example.com"}, 33 34 CreatedAt: time.Now(), 34 35 ShoppingDay: "Saturday", 35 - LastRecipes: []users.Recipe{}, 36 + LastRecipes: []utypes.Recipe{}, 36 37 } 37 38 if err := storage.Update(testUser); err != nil { 38 39 t.Fatalf("failed to create test user: %v", err) ··· 110 111 } 111 112 112 113 // Create a test user with an existing recipe 113 - existingRecipe := users.Recipe{ 114 + existingRecipe := utypes.Recipe{ 114 115 Title: savedRecipes[0].Title, 115 116 Hash: savedRecipes[0].ComputeHash(), 116 117 CreatedAt: time.Now().Add(-24 * time.Hour), 117 118 } 118 - testUser := &users.User{ 119 + testUser := &utypes.User{ 119 120 ID: "test-user-id", 120 121 Email: []string{"test@example.com"}, 121 122 CreatedAt: time.Now(), 122 123 ShoppingDay: "Saturday", 123 - LastRecipes: []users.Recipe{existingRecipe}, 124 + LastRecipes: []utypes.Recipe{existingRecipe}, 124 125 } 125 126 if err := storage.Update(testUser); err != nil { 126 127 t.Fatalf("failed to create test user: %v", err)
+138 -6
internal/templates/locations.html
··· 21 21 <ul class="divide-y divide-brand-100"> 22 22 {{range .Locations}} 23 23 <li class="px-8 py-6"> 24 - <div class="flex items-start justify-between gap-4"> 24 + <div class="flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between"> 25 25 <a href="/recipes?location={{.ID}}" 26 26 class="flex flex-1 flex-col gap-1 rounded-xl py-2 transition hover:bg-brand-50 focus:bg-brand-50 focus:outline-none focus:ring-2 focus:ring-brand-400 focus:ring-offset-2"> 27 27 <span class="text-lg font-semibold text-brand-700">{{.Name}}</span> 28 28 <span class="text-sm text-gray-600">{{.Address}}</span> 29 29 </a> 30 - <form method="POST" action="/user"> 31 - <input type="hidden" name="favorite_store" value="{{.ID}}" /> 32 - <button type="submit" 33 - class="rounded-lg border border-brand-300 bg-white px-3 py-2 text-sm font-medium text-brand-600 shadow-sm transition hover:bg-brand-50 focus:outline-none focus:ring-2 focus:ring-brand-400 focus:ring-offset-2"> 34 - Set as Favorite 30 + <div class="flex flex-wrap items-center gap-2"> 31 + <a href="/recipes?location={{.ID}}" 32 + class="rounded-lg border border-brand-300 bg-white px-3 py-2 text-sm font-semibold text-brand-700 shadow-sm transition hover:bg-brand-50 focus:outline-none focus:ring-2 focus:ring-brand-400 focus:ring-offset-2"> 33 + Recipes! 34 + </a> 35 + <button type="button" data-instructions-button 36 + class="rounded-lg border border-brand-300 bg-white px-3 py-2 text-sm font-semibold text-brand-700 shadow-sm transition hover:bg-brand-50 focus:outline-none focus:ring-2 focus:ring-brand-400 focus:ring-offset-2"> 37 + Instructions 35 38 </button> 39 + <form method="POST" action="/user/favorite" data-favorite-form> 40 + <input type="hidden" name="favorite_store" value="{{.ID}}" /> 41 + <button type="submit" data-favorite-button title="Set as favorite" aria-label="Set as favorite" 42 + aria-pressed="{{if eq $.FavoriteStore .ID}}true{{else}}false{{end}}" 43 + class="rounded-lg border border-brand-300 bg-white p-2 text-brand-600 shadow-sm transition hover:bg-brand-50 focus:outline-none focus:ring-2 focus:ring-brand-400 focus:ring-offset-2"> 44 + <span class="sr-only">Set as favorite</span> 45 + <span data-favorite-icon class="text-lg leading-none {{if eq $.FavoriteStore .ID}}text-amber-500{{else}}text-brand-600{{end}}" aria-hidden="true"> 46 + {{if eq $.FavoriteStore .ID}}★{{else}}☆{{end}} 47 + </span> 48 + </button> 49 + </form> 50 + </div> 51 + </div> 52 + <div data-instructions-panel class="mt-4 hidden rounded-xl border border-brand-100 bg-brand-50/40 p-4"> 53 + <form method="GET" action="/recipes" class="flex flex-col gap-3"> 54 + <input type="hidden" name="location" value="{{.ID}}" /> 55 + <label class="text-sm font-semibold text-brand-700">Recipe instructions</label> 56 + <textarea name="instructions" rows="3" placeholder="Example: No seafood, focus on quick weeknight meals." 57 + class="w-full rounded-lg border border-brand-200 bg-white px-3 py-2 text-sm text-gray-700 shadow-sm focus:border-brand-400 focus:outline-none focus:ring-2 focus:ring-brand-300"></textarea> 58 + <div class="flex flex-wrap items-center gap-2"> 59 + <button type="submit" 60 + class="rounded-lg bg-brand-600 px-4 py-2 text-sm font-semibold text-white shadow-sm transition hover:bg-brand-700 focus:outline-none focus:ring-2 focus:ring-brand-400 focus:ring-offset-2"> 61 + Generate 62 + </button> 63 + <button type="button" data-instructions-cancel 64 + class="rounded-lg border border-brand-300 bg-white px-3 py-2 text-sm font-medium text-brand-700 shadow-sm transition hover:bg-brand-50 focus:outline-none focus:ring-2 focus:ring-brand-400 focus:ring-offset-2"> 65 + Cancel 66 + </button> 67 + </div> 36 68 </form> 37 69 </div> 38 70 </li> ··· 43 75 <p class="mt-6 text-center text-sm text-gray-500">Can’t find the right store? Try a different ZIP code from the home page.</p> 44 76 </section> 45 77 </main> 78 + {{template "clerk_refresh.html" .}} 79 + <script> 80 + (() => { 81 + document.querySelectorAll("[data-instructions-button]").forEach((button) => { 82 + button.addEventListener("click", () => { 83 + const container = button.closest("li"); 84 + if (!container) { 85 + return; 86 + } 87 + const panel = container.querySelector("[data-instructions-panel]"); 88 + if (!panel) { 89 + return; 90 + } 91 + panel.classList.toggle("hidden"); 92 + if (!panel.classList.contains("hidden")) { 93 + const input = panel.querySelector("textarea[name='instructions']"); 94 + if (input) { 95 + input.focus(); 96 + } 97 + } 98 + }); 99 + }); 100 + 101 + const updateFavoriteUI = (favoriteID) => { 102 + const forms = Array.from(document.querySelectorAll("[data-favorite-form]")); 103 + forms.forEach((form) => { 104 + const input = form.querySelector("input[name='favorite_store']"); 105 + if (!input) { 106 + return; 107 + } 108 + const isFavorite = input.value === favoriteID; 109 + const icon = form.querySelector("[data-favorite-icon]"); 110 + const button = form.querySelector("[data-favorite-button]"); 111 + if (icon) { 112 + icon.classList.toggle("text-amber-500", isFavorite); 113 + icon.classList.toggle("text-brand-600", !isFavorite); 114 + icon.textContent = isFavorite ? "★" : "☆"; 115 + } 116 + if (button) { 117 + button.setAttribute("aria-pressed", isFavorite ? "true" : "false"); 118 + } 119 + }); 120 + }; 121 + 122 + document.querySelectorAll("[data-favorite-form]").forEach((form) => { 123 + form.addEventListener("submit", async (event) => { 124 + event.preventDefault(); 125 + const favoriteStore = form.querySelector("input[name='favorite_store']")?.value; 126 + const button = form.querySelector("[data-favorite-button]"); 127 + if (button) { 128 + button.disabled = true; 129 + button.setAttribute("aria-busy", "true"); 130 + } 131 + try { 132 + const body = new URLSearchParams(new FormData(form)); 133 + const response = await fetch(form.action, { 134 + method: "POST", 135 + headers: { 136 + "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", 137 + }, 138 + body, 139 + credentials: "same-origin", 140 + }); 141 + if (response.status === 401) { 142 + window.location.assign("/"); 143 + return; 144 + } 145 + if (!response.ok) { 146 + throw new Error("favorite update failed"); 147 + } 148 + let payload = null; 149 + try { 150 + payload = await response.json(); 151 + } catch (error) { 152 + payload = null; 153 + } 154 + const updatedFavorite = payload?.favorite_store ?? favoriteStore ?? ""; 155 + updateFavoriteUI(updatedFavorite); 156 + } catch (error) { 157 + console.error(error); 158 + } finally { 159 + if (button) { 160 + button.disabled = false; 161 + button.removeAttribute("aria-busy"); 162 + } 163 + } 164 + }); 165 + }); 166 + 167 + document.querySelectorAll("[data-instructions-panel]").forEach((panel) => { 168 + const cancelButton = panel.querySelector("[data-instructions-cancel]"); 169 + if (!cancelButton) { 170 + return; 171 + } 172 + cancelButton.addEventListener("click", () => { 173 + panel.classList.add("hidden"); 174 + }); 175 + }); 176 + })(); 177 + </script> 46 178 </body> 47 179 </html>
+58 -10
internal/users/server.go
··· 5 5 "careme/internal/locations" 6 6 "careme/internal/seasons" 7 7 "careme/internal/templates" 8 + utypes "careme/internal/users/types" 8 9 "context" 10 + "encoding/json" 9 11 "errors" 10 12 "html/template" 11 13 "log/slog" ··· 38 40 func (s *server) Register(mux *http.ServeMux) { 39 41 mux.HandleFunc("/user", s.handleUser) 40 42 mux.HandleFunc("POST /user/recipes", s.handleUserRecipes) 43 + mux.HandleFunc("POST /user/favorite", s.handleFavorite) 41 44 } 42 45 43 46 // used on user page to manaully save recipes 44 47 func (s *server) handleUserRecipes(w http.ResponseWriter, r *http.Request) { 45 48 ctx := r.Context() 46 49 47 - clerkUserID, err := s.clerk.GetUserIDFromRequest(r) 50 + currentUser, err := s.storage.FromRequest(ctx, r, s.clerk) // just for logging purposes in kickgeneration. We could do this in the generateion function instead to avoid the extra call on every not found. 48 51 if err != nil { 49 52 if !errors.Is(err, auth.ErrNoSession) { 50 53 slog.ErrorContext(ctx, "failed to get clerk user ID", "error", err) ··· 54 57 http.Redirect(w, r, "/", http.StatusSeeOther) 55 58 return 56 59 } 57 - slog.InfoContext(ctx, "found clerk user ID", "clerk_user_id", clerkUserID) 58 - currentUser, err := s.storage.FindOrCreateFromClerk(ctx, clerkUserID, s.clerk) 59 - if err != nil { 60 - slog.ErrorContext(ctx, "failed to get user by clerk ID", "clerk_user_id", clerkUserID, "error", err) 61 - http.Error(w, "unable to load account", http.StatusInternalServerError) 62 - return 63 - } 64 60 65 61 recipeTitle := strings.TrimSpace(r.FormValue("recipe")) 66 62 if recipeTitle == "" { ··· 79 75 } 80 76 } 81 77 82 - newRecipe := Recipe{ 78 + newRecipe := utypes.Recipe{ 83 79 Title: recipeTitle, 84 80 Hash: hash, 85 81 CreatedAt: time.Now(), ··· 162 158 } 163 159 data := struct { 164 160 ClarityScript template.HTML 165 - User *User 161 + User *utypes.User 166 162 Success bool 167 163 FavoriteStoreName string 168 164 Style seasons.Style ··· 180 176 http.Error(w, "template error", http.StatusInternalServerError) 181 177 } 182 178 } 179 + 180 + func (s *server) handleFavorite(w http.ResponseWriter, r *http.Request) { 181 + ctx := r.Context() 182 + if r.Method != http.MethodPost { 183 + w.WriteHeader(http.StatusMethodNotAllowed) 184 + return 185 + } 186 + clerkUserID, err := s.clerk.GetUserIDFromRequest(r) 187 + if err != nil { 188 + if !errors.Is(err, auth.ErrNoSession) { 189 + slog.ErrorContext(ctx, "failed to get clerk user ID", "error", err) 190 + http.Error(w, "unable to load account", http.StatusInternalServerError) 191 + return 192 + } 193 + w.WriteHeader(http.StatusUnauthorized) 194 + return 195 + } 196 + 197 + currentUser, err := s.storage.FindOrCreateFromClerk(ctx, clerkUserID, s.clerk) 198 + if err != nil { 199 + slog.ErrorContext(ctx, "failed to get user by clerk ID", "clerk_user_id", clerkUserID, "error", err) 200 + http.Error(w, "unable to load account", http.StatusInternalServerError) 201 + return 202 + } 203 + 204 + if err := r.ParseForm(); err != nil { 205 + http.Error(w, "invalid form submission", http.StatusBadRequest) 206 + return 207 + } 208 + 209 + favoriteStore := strings.TrimSpace(r.FormValue("favorite_store")) 210 + if favoriteStore == "" && !r.Form.Has("favorite_store") { 211 + http.Error(w, "missing favorite_store", http.StatusBadRequest) 212 + return 213 + } 214 + currentUser.FavoriteStore = favoriteStore 215 + if err := s.storage.Update(currentUser); err != nil { 216 + slog.ErrorContext(ctx, "failed to update user", "error", err) 217 + http.Error(w, "unable to save preferences", http.StatusInternalServerError) 218 + return 219 + } 220 + 221 + w.Header().Set("Content-Type", "application/json; charset=utf-8") 222 + w.WriteHeader(http.StatusOK) 223 + if err := json.NewEncoder(w).Encode(struct { 224 + FavoriteStore string `json:"favorite_store"` 225 + }{ 226 + FavoriteStore: currentUser.FavoriteStore, 227 + }); err != nil { 228 + slog.ErrorContext(ctx, "failed to write favorite response", "error", err) 229 + } 230 + }
+19 -72
internal/users/storage.go
··· 1 1 package users 2 2 3 3 import ( 4 + "careme/internal/auth" 4 5 "careme/internal/cache" 6 + utypes "careme/internal/users/types" 5 7 "context" 6 8 "encoding/json" 7 9 "errors" 8 10 "fmt" 9 11 "io" 10 12 "log/slog" 11 - "net/mail" 12 - "slices" 13 - "strconv" 13 + "net/http" 14 14 "strings" 15 15 "time" 16 16 ) 17 17 18 - var daysOfWeek = [...]string{ 19 - time.Sunday.String(), 20 - time.Monday.String(), 21 - time.Tuesday.String(), 22 - time.Wednesday.String(), 23 - time.Thursday.String(), 24 - time.Friday.String(), 25 - time.Saturday.String(), 26 - } 27 - 28 - func parseWeekday(v string) (time.Weekday, error) { 29 - for i := range daysOfWeek { 30 - if strings.EqualFold(daysOfWeek[i], v) { 31 - return time.Weekday(i), nil 32 - } 33 - } 34 - 35 - return time.Sunday, fmt.Errorf("invalid weekday '%s'", v) 36 - } 37 - 38 - type Recipe struct { 39 - Title string `json:"id"` 40 - Hash string `json:"hash"` 41 - CreatedAt time.Time `json:"created_at"` 42 - } 43 - 44 - type User struct { 45 - ID string `json:"id"` 46 - Email []string `json:"email"` 47 - CreatedAt time.Time `json:"created_at"` 48 - LastRecipes []Recipe `json:"last_recipes,omitempty"` 49 - FavoriteStore string `json:"favorite_store,omitempty"` 50 - ShoppingDay string `json:"shopping_day,omitempty"` 51 - } 52 - 53 - // need to take a look up to location cache? 54 - func (u *User) Validate() error { 55 - if _, err := parseWeekday(u.ShoppingDay); err != nil { 56 - return err 57 - } 58 - if len(u.Email) == 0 { 59 - return errors.New("at least one email is required") 60 - } 61 - for _, e := range u.Email { 62 - if _, err := mail.ParseAddress(e); err != nil { 63 - return errors.New("invalid email address: " + e) 64 - } 65 - } 66 - if u.FavoriteStore != "" { 67 - if _, err := strconv.Atoi(u.FavoriteStore); err != nil { 68 - return fmt.Errorf("invalid favorite store id %s: %w", u.FavoriteStore, err) 69 - } 70 - } 71 - // trim out recipes older than 2 months? store them in seperate file? 72 - slices.SortFunc(u.LastRecipes, func(a, b Recipe) int { 73 - return b.CreatedAt.Compare(a.CreatedAt) 74 - }) 75 - 76 - return nil 77 - } 78 - 79 18 type Storage struct { 80 19 cache cache.ListCache 81 20 } ··· 93 32 } 94 33 95 34 // obviously needs to be better 96 - func (s *Storage) List(ctx context.Context) ([]User, error) { 35 + func (s *Storage) List(ctx context.Context) ([]utypes.User, error) { 97 36 userids, err := s.cache.List(ctx, userPrefix, "") 98 37 if err != nil { 99 38 return nil, err 100 39 } 101 - var users []User 40 + var users []utypes.User 102 41 for _, id := range userids { 103 42 user, err := s.GetByID(id) 104 43 if err != nil { ··· 109 48 return users, nil 110 49 } 111 50 112 - func (s *Storage) GetByID(id string) (*User, error) { 51 + func (s *Storage) GetByID(id string) (*utypes.User, error) { 113 52 userBytes, err := s.cache.Get(context.TODO(), userPrefix+id) 114 53 if err != nil { 115 54 if errors.Is(err, cache.ErrNotFound) { ··· 124 63 }() 125 64 decoder := json.NewDecoder(userBytes) 126 65 127 - var user User 66 + var user utypes.User 128 67 if err := decoder.Decode(&user); err != nil { 129 68 return nil, fmt.Errorf("failed to unmarshal user: %w", err) 130 69 } 131 70 return &user, nil 132 71 } 133 72 134 - func (s *Storage) GetByEmail(email string) (*User, error) { 73 + func (s *Storage) GetByEmail(email string) (*utypes.User, error) { 135 74 normalized := normalizeEmail(email) 136 75 id, err := s.cache.Get(context.TODO(), emailPrefix+normalized) 137 76 if err != nil { ··· 156 95 GetUserEmail(ctx context.Context, userID string) (string, error) 157 96 } 158 97 98 + func (s *Storage) FromRequest(ctx context.Context, r *http.Request, authClient auth.AuthClient) (*utypes.User, error) { 99 + clerkUserID, err := authClient.GetUserIDFromRequest(r) 100 + if err != nil { 101 + return nil, err 102 + } 103 + return s.FindOrCreateFromClerk(ctx, clerkUserID, authClient) 104 + } 105 + 159 106 // interface for clerk client 160 - func (s *Storage) FindOrCreateFromClerk(ctx context.Context, clerkUserID string, emailFetcher emailFetcher) (*User, error) { 107 + func (s *Storage) FindOrCreateFromClerk(ctx context.Context, clerkUserID string, emailFetcher emailFetcher) (*utypes.User, error) { 161 108 user, err := s.GetByID(clerkUserID) 162 109 if err == nil { 163 110 return user, nil ··· 172 119 return nil, fmt.Errorf("failed to fetch user email from clerk: %w", err) 173 120 } 174 121 175 - newUser := User{ 122 + newUser := utypes.User{ 176 123 ID: clerkUserID, //do we need this o be independent for housholds? 177 124 Email: []string{normalizeEmail(primaryEmail)}, 178 125 CreatedAt: time.Now(), ··· 188 135 return &newUser, nil 189 136 } 190 137 191 - func (s *Storage) Update(user *User) error { 138 + func (s *Storage) Update(user *utypes.User) error { 192 139 if err := user.Validate(); err != nil { 193 140 return fmt.Errorf("invalid user: %w", err) 194 141 }
+7 -6
internal/users/storage_test.go
··· 1 1 package users 2 2 3 3 import ( 4 + utypes "careme/internal/users/types" 4 5 "strings" 5 6 "testing" 6 7 "time" ··· 11 12 newer := time.Date(2024, time.December, 1, 0, 0, 0, 0, time.UTC) 12 13 older := newer.Add(-24 * time.Hour) 13 14 oldest := newer.Add(-48 * time.Hour) 14 - user := &User{ 15 + user := &utypes.User{ 15 16 ID: "user-1", 16 17 ShoppingDay: time.Monday.String(), 17 18 Email: []string{"alice@example.com"}, 18 19 FavoriteStore: "1234", 19 - LastRecipes: []Recipe{ 20 + LastRecipes: []utypes.Recipe{ 20 21 {Title: "newer", CreatedAt: newer}, 21 22 {Title: "oldest", CreatedAt: oldest}, 22 23 {Title: "older", CreatedAt: older}, ··· 35 36 }) 36 37 37 38 t.Run("invalid shopping day", func(t *testing.T) { 38 - user := &User{ 39 + user := &utypes.User{ 39 40 ShoppingDay: "Caturday", 40 41 Email: []string{"bob@example.com"}, 41 42 } ··· 47 48 }) 48 49 49 50 t.Run("missing email", func(t *testing.T) { 50 - user := &User{ShoppingDay: time.Friday.String()} 51 + user := &utypes.User{ShoppingDay: time.Friday.String()} 51 52 52 53 err := user.Validate() 53 54 if err == nil || err.Error() != "at least one email is required" { ··· 56 57 }) 57 58 58 59 t.Run("invalid email address", func(t *testing.T) { 59 - user := &User{ 60 + user := &utypes.User{ 60 61 ShoppingDay: time.Saturday.String(), 61 62 Email: []string{"not-an-email"}, 62 63 } ··· 68 69 }) 69 70 70 71 t.Run("invalid favorite store", func(t *testing.T) { 71 - user := &User{ 72 + user := &utypes.User{ 72 73 ShoppingDay: time.Sunday.String(), 73 74 Email: []string{"charlie@example.com"}, 74 75 FavoriteStore: "store-99",
+72
internal/users/types/types.go
··· 1 + package types 2 + 3 + import ( 4 + "errors" 5 + "fmt" 6 + "net/mail" 7 + "slices" 8 + "strconv" 9 + "strings" 10 + "time" 11 + ) 12 + 13 + type Recipe struct { 14 + Title string `json:"id"` 15 + Hash string `json:"hash"` 16 + CreatedAt time.Time `json:"created_at"` 17 + } 18 + 19 + type User struct { 20 + ID string `json:"id"` 21 + Email []string `json:"email"` 22 + CreatedAt time.Time `json:"created_at"` 23 + LastRecipes []Recipe `json:"last_recipes,omitempty"` 24 + FavoriteStore string `json:"favorite_store,omitempty"` 25 + ShoppingDay string `json:"shopping_day,omitempty"` 26 + } 27 + 28 + // need to take a look up to location cache? 29 + func (u User) Validate() error { 30 + if _, err := parseWeekday(u.ShoppingDay); err != nil { 31 + return err 32 + } 33 + if len(u.Email) == 0 { 34 + return errors.New("at least one email is required") 35 + } 36 + for _, e := range u.Email { 37 + if _, err := mail.ParseAddress(e); err != nil { 38 + return errors.New("invalid email address: " + e) 39 + } 40 + } 41 + if u.FavoriteStore != "" { 42 + if _, err := strconv.Atoi(u.FavoriteStore); err != nil { 43 + return fmt.Errorf("invalid favorite store id %s: %w", u.FavoriteStore, err) 44 + } 45 + } 46 + // trim out recipes older than 2 months? store them in seperate file? 47 + slices.SortFunc(u.LastRecipes, func(a, b Recipe) int { 48 + return b.CreatedAt.Compare(a.CreatedAt) 49 + }) 50 + 51 + return nil 52 + } 53 + 54 + var daysOfWeek = [...]string{ 55 + time.Sunday.String(), 56 + time.Monday.String(), 57 + time.Tuesday.String(), 58 + time.Wednesday.String(), 59 + time.Thursday.String(), 60 + time.Friday.String(), 61 + time.Saturday.String(), 62 + } 63 + 64 + func parseWeekday(v string) (time.Weekday, error) { 65 + for i := range daysOfWeek { 66 + if strings.EqualFold(daysOfWeek[i], v) { 67 + return time.Weekday(i), nil 68 + } 69 + } 70 + 71 + return time.Sunday, fmt.Errorf("invalid weekday '%s'", v) 72 + }