+1 -1

features/about/pages/about.templ

Reviewed

··· 7 7 // to understand what "your data goes to your repo, not ours" means before 8 8 // they sign in. 9 9 templ AboutATProto() { 10 10 - @layouts.Base("What's ATProto? — atmo.quest", "ATProto is an open social protocol — your records live in your repo, not ours.") { 10 10 + @layouts.Base("What's ATProto?", "ATProto is an open social protocol — your records live in your repo, not ours.") { 11 11 <div class="window"> 12 12 <div class="window-bar"> 13 13 <div class="dot dot-r"></div>

+1 -1

features/about/pages/about_templ.go

Reviewed

··· 66 66 } 67 67 return nil 68 68 }) 69 69 - templ_7745c5c3_Err = layouts.Base("What's ATProto? — atmo.quest", "ATProto is an open social protocol — your records live in your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 69 69 + templ_7745c5c3_Err = layouts.Base("What's ATProto?", "ATProto is an open social protocol — your records live in your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 70 70 if templ_7745c5c3_Err != nil { 71 71 return templ_7745c5c3_Err 72 72 }

+403 -16

features/admin/handlers.go

Reviewed

··· 5 5 package admin 6 6 7 7 import ( 8 8 + "context" 8 9 "database/sql" 9 10 "encoding/json" 10 11 "errors" ··· 23 24 "atmoquest/features/auth" 24 25 "atmoquest/internal/admincrypto" 25 26 "atmoquest/internal/badge" 27 27 + "atmoquest/internal/checkin" 28 28 + "atmoquest/internal/connection" 26 29 "atmoquest/internal/event" 27 30 "atmoquest/internal/users" 28 31 ) ··· 266 269 QRPublicURL: strings.TrimRight(config.Global.PublicURL, "/") + "/e/" + token, 267 270 } 268 271 272 272 + // Which badge type are we editing? 273 273 + badgeType := r.URL.Query().Get("type") 274 274 + if badgeType == "" { 275 275 + badgeType = "event-attendee" 276 276 + } 277 277 + view.SelectedBadgeType = badgeType 278 278 + 269 279 if h.Signer != nil { 270 270 - if d, err := badge.Get(r.Context(), h.DB, h.Signer, ev.URI); err == nil { 280 280 + if d, err := badge.Get(r.Context(), h.DB, h.Signer, ev.URI, badgeType); err == nil { 271 281 view.Design = pages.AdminBadgeDesign{ 272 272 - Shape: d.Shape, 273 273 - PrimaryColor: d.PrimaryColor, 274 274 - AccentColor: d.AccentColor, 275 275 - RibbonColor: d.RibbonColor, 276 276 - Label: d.Label, 277 277 - Signature: d.Signature, 278 278 - SigningKeyID: d.SigningKeyID, 282 282 + Shape: d.Shape, 283 283 + PrimaryColor: d.PrimaryColor, 284 284 + AccentColor: d.AccentColor, 285 285 + RibbonColor: d.RibbonColor, 286 286 + Label: d.Label, 287 287 + MessageTemplate: d.MessageTemplate, 288 288 + Signature: d.Signature, 289 289 + SigningKeyID: d.SigningKeyID, 279 290 } 280 291 view.SVGPreview = badge.RenderSVG(d, 200) 281 292 } else if !errors.Is(err, badge.ErrNotFound) { 282 282 - slog.Warn("admin badge: get", "event_uri", ev.URI, "err", err) 293 293 + slog.Warn("admin badge: get", "event_uri", ev.URI, "type", badgeType, "err", err) 283 294 } 284 295 } 285 296 ··· 295 306 }, 200) 296 307 } 297 308 309 309 + // Build event badge overview — show which badge types have designs. 310 310 + eventBadgeTypes := []struct { 311 311 + slug, name, desc string 312 312 + }{ 313 313 + {"event-attendee", "Event check-in", "Awarded when someone checks into this event"}, 314 314 + {"event-leaderboard-1st", "Leaderboard 1st place", "Awarded to the top connector at event end"}, 315 315 + {"event-leaderboard-2nd", "Leaderboard 2nd place", "Awarded to the runner-up at event end"}, 316 316 + {"event-leaderboard-3rd", "Leaderboard 3rd place", "Awarded to third place at event end"}, 317 317 + {"event-exceeded", "Beyond expectations", "Awarded when check-ins exceed expected attendees"}, 318 318 + } 319 319 + designMap, _ := badge.ListForEvent(r.Context(), h.DB, ev.URI) 320 320 + for _, bt := range eventBadgeTypes { 321 321 + eb := pages.EventBadgeOverview{ 322 322 + Slug: bt.slug, 323 323 + Name: bt.name, 324 324 + Description: bt.desc, 325 325 + } 326 326 + if d, ok := designMap[bt.slug]; ok { 327 327 + eb.Designed = true 328 328 + eb.Label = d.Label 329 329 + } 330 330 + view.EventBadges = append(view.EventBadges, eb) 331 331 + } 332 332 + 298 333 w.Header().Set("Content-Type", "text/html; charset=utf-8") 299 334 if err := pages.AdminEventBadge(view).Render(r.Context(), w); err != nil { 300 335 slog.Error("render admin badge", "err", err) 301 336 } 302 337 } 303 338 339 339 + // BadgePreviewSVG renders a badge SVG from query parameters for the live 340 340 + // designer preview. No signing or persistence — purely visual. 341 341 + func (h *Handlers) BadgePreviewSVG(w http.ResponseWriter, r *http.Request) { 342 342 + d := badge.Design{ 343 343 + Shape: r.URL.Query().Get("shape"), 344 344 + PrimaryColor: r.URL.Query().Get("primary_color"), 345 345 + AccentColor: r.URL.Query().Get("accent_color"), 346 346 + RibbonColor: r.URL.Query().Get("ribbon_color"), 347 347 + Label: r.URL.Query().Get("label"), 348 348 + } 349 349 + if d.Shape == "" { 350 350 + d.Shape = "shield" 351 351 + } 352 352 + if d.PrimaryColor == "" { 353 353 + d.PrimaryColor = "#fab387" 354 354 + } 355 355 + if d.AccentColor == "" { 356 356 + d.AccentColor = "#1e1e2e" 357 357 + } 358 358 + if d.RibbonColor == "" { 359 359 + d.RibbonColor = "#f38ba8" 360 360 + } 361 361 + if d.Label == "" { 362 362 + d.Label = "preview" 363 363 + } 364 364 + svg := badge.RenderSVG(d, 200) 365 365 + w.Header().Set("Content-Type", "image/svg+xml") 366 366 + w.Header().Set("Cache-Control", "no-cache") 367 367 + _, _ = w.Write([]byte(svg)) 368 368 + } 369 369 + 304 370 // AdminEventBadgeSave handles POST /admin/events/{token}/badge. 305 371 func (h *Handlers) AdminEventBadgeSave(w http.ResponseWriter, r *http.Request) { 306 372 if h.Signer == nil { ··· 314 380 return 315 381 } 316 382 383 383 + badgeType := r.FormValue("badge_type") 384 384 + if badgeType == "" { 385 385 + badgeType = "event-attendee" 386 386 + } 387 387 + 317 388 d := badge.Design{ 318 318 - EventURI: ev.URI, 319 319 - Shape: r.FormValue("shape"), 320 320 - PrimaryColor: r.FormValue("primary_color"), 321 321 - AccentColor: r.FormValue("accent_color"), 322 322 - RibbonColor: r.FormValue("ribbon_color"), 323 323 - Label: strings.TrimSpace(r.FormValue("label")), 389 389 + EventURI: ev.URI, 390 390 + BadgeType: badgeType, 391 391 + Shape: r.FormValue("shape"), 392 392 + PrimaryColor: r.FormValue("primary_color"), 393 393 + AccentColor: r.FormValue("accent_color"), 394 394 + RibbonColor: r.FormValue("ribbon_color"), 395 395 + Label: strings.TrimSpace(r.FormValue("label")), 396 396 + MessageTemplate: strings.TrimSpace(r.FormValue("message_template")), 324 397 } 325 398 if _, err := badge.Save(r.Context(), h.DB, h.Signer, d); err != nil { 326 399 slog.Warn("admin badge save", "err", err) 327 400 http.Error(w, err.Error(), http.StatusBadRequest) 328 401 return 329 402 } 330 330 - http.Redirect(w, r, "/admin/events/"+token+"/badge?saved=1", http.StatusSeeOther) 403 403 + http.Redirect(w, r, "/admin/events/"+token+"/badge?type="+badgeType+"&saved=1", http.StatusSeeOther) 331 404 } 332 405 333 406 // parseEventForm pulls form values into a CreateInput, returning a ··· 369 442 in.StartTime = startT 370 443 in.EndTime = endT 371 444 return in, view, "" 445 445 + } 446 446 + 447 447 + // AdminEventDelete handles POST /admin/events/{token}/delete — removes the 448 448 + // event, its PDS record, and all associated local data (checkins, badges, etc.). 449 449 + func (h *Handlers) AdminEventDelete(w http.ResponseWriter, r *http.Request) { 450 450 + _, sess, ok := h.Auth.RequireSession(w, r) 451 451 + if !ok { 452 452 + return 453 453 + } 454 454 + 455 455 + token := chi.URLParam(r, "token") 456 456 + ev, err := event.LookupByQRToken(r.Context(), h.DB, token) 457 457 + if err != nil { 458 458 + http.NotFound(w, r) 459 459 + return 460 460 + } 461 461 + 462 462 + if err := event.Delete(r.Context(), sess, h.DB, ev.URI); err != nil { 463 463 + slog.Error("admin event delete", "uri", ev.URI, "err", err) 464 464 + http.Error(w, "failed to delete event", http.StatusInternalServerError) 465 465 + return 466 466 + } 467 467 + 468 468 + slog.Info("admin event deleted", "uri", ev.URI, "name", ev.Name) 469 469 + http.Redirect(w, r, "/admin/events", http.StatusSeeOther) 470 470 + } 471 471 + 472 472 + // AdminEventFinalize awards end-of-event badges: leaderboard top 3 and 473 473 + // "exceeded expectations" if check-ins surpassed expected attendees. 474 474 + // This is a manual admin action triggered after the event ends. 475 475 + func (h *Handlers) AdminEventFinalize(w http.ResponseWriter, r *http.Request) { 476 476 + _, _, ok := h.Auth.RequireSession(w, r) 477 477 + if !ok { 478 478 + return 479 479 + } 480 480 + 481 481 + token := chi.URLParam(r, "token") 482 482 + ev, err := event.LookupByQRToken(r.Context(), h.DB, token) 483 483 + if err != nil { 484 484 + http.NotFound(w, r) 485 485 + return 486 486 + } 487 487 + 488 488 + ctx := r.Context() 489 489 + 490 490 + // Get all checked-in attendees. 491 491 + attendeeDIDs, _ := checkin.ListAttendeesForEvent(ctx, h.DB, ev.URI) 492 492 + 493 493 + // Build leaderboard (connection counts per attendee at this event). 494 494 + type connCount struct { 495 495 + did string 496 496 + count int 497 497 + } 498 498 + var leaderboard []connCount 499 499 + for _, didStr := range attendeeDIDs { 500 500 + did, err := syntax.ParseDID(didStr) 501 501 + if err != nil { 502 502 + continue 503 503 + } 504 504 + // Skip users who opted out of leaderboard. 505 505 + if users.IsHiddenFromLeaderboard(ctx, h.DB, didStr) { 506 506 + continue 507 507 + } 508 508 + pds := lookupPDSForDIDAdmin(ctx, h.DB, did) 509 509 + conns, _ := connection.List(ctx, pds, did) 510 510 + eventConns := 0 511 511 + for _, c := range conns { 512 512 + if c.EventURI == ev.URI { 513 513 + eventConns++ 514 514 + } 515 515 + } 516 516 + if eventConns > 0 { 517 517 + leaderboard = append(leaderboard, connCount{did: didStr, count: eventConns}) 518 518 + } 519 519 + } 520 520 + 521 521 + // Sort by count desc. 522 522 + for i := 0; i < len(leaderboard); i++ { 523 523 + for j := i + 1; j < len(leaderboard); j++ { 524 524 + if leaderboard[j].count > leaderboard[i].count { 525 525 + leaderboard[i], leaderboard[j] = leaderboard[j], leaderboard[i] 526 526 + } 527 527 + } 528 528 + } 529 529 + 530 530 + // Load custom message templates for this event's badges. 531 531 + msgTemplates := make(map[string]string) 532 532 + if designs, err := badge.ListForEvent(ctx, h.DB, ev.URI); err == nil { 533 533 + for badgeType, d := range designs { 534 534 + msgTemplates[badgeType] = d.MessageTemplate 535 535 + } 536 536 + } 537 537 + 538 538 + // Award leaderboard badges (1st, 2nd, 3rd) using competition ranking. 539 539 + placeSlugs := []string{"event-leaderboard-1st", "event-leaderboard-2nd", "event-leaderboard-3rd"} 540 540 + placeIdx := 0 541 541 + prevCount := -1 542 542 + for i, entry := range leaderboard { 543 543 + if placeIdx >= len(placeSlugs) { 544 544 + break 545 545 + } 546 546 + if entry.count != prevCount { 547 547 + placeIdx = i 548 548 + prevCount = entry.count 549 549 + } 550 550 + if placeIdx < len(placeSlugs) { 551 551 + def, err := badge.GetDefinitionBySlug(ctx, h.DB, placeSlugs[placeIdx]) 552 552 + if err == nil && !badge.HasEarned(ctx, h.DB, entry.did, def.ID) { 553 553 + msg := badgeMessage(msgTemplates, placeSlugs[placeIdx], ev.Name) 554 554 + _ = badge.RecordEarned(ctx, h.DB, entry.did, def.ID, "", msg) 555 555 + slog.Info("finalize: awarded leaderboard badge", 556 556 + "did", entry.did, "place", placeIdx+1, "connections", entry.count) 557 557 + } 558 558 + } 559 559 + } 560 560 + 561 561 + // Award "exceeded expectations" badge if check-ins > expected attendees. 562 562 + if ev.ExpectedAttendees > 0 && len(attendeeDIDs) > ev.ExpectedAttendees { 563 563 + def, err := badge.GetDefinitionBySlug(ctx, h.DB, "event-exceeded") 564 564 + if err == nil { 565 565 + msg := badgeMessage(msgTemplates, "event-exceeded", ev.Name) 566 566 + for _, didStr := range attendeeDIDs { 567 567 + if !badge.HasEarned(ctx, h.DB, didStr, def.ID) { 568 568 + _ = badge.RecordEarned(ctx, h.DB, didStr, def.ID, "", msg) 569 569 + } 570 570 + } 571 571 + slog.Info("finalize: awarded exceeded badge", 572 572 + "event", ev.Name, "checkins", len(attendeeDIDs), "expected", ev.ExpectedAttendees) 573 573 + } 574 574 + } 575 575 + 576 576 + // Award "event-host" badge if the event was successful (>1 check-in + >=1 connection). 577 577 + totalConns := 0 578 578 + for _, cc := range leaderboard { 579 579 + totalConns += cc.count 580 580 + } 581 581 + if len(attendeeDIDs) > 1 && totalConns > 0 && ev.OrganizerDID.String() != "" { 582 582 + def, err := badge.GetDefinitionBySlug(ctx, h.DB, "event-host") 583 583 + if err == nil && !badge.HasEarned(ctx, h.DB, ev.OrganizerDID.String(), def.ID) { 584 584 + msg := badgeMessage(msgTemplates, "event-host", ev.Name) 585 585 + if msg == "" { 586 586 + msg = "Successfully hosted " + ev.Name 587 587 + } 588 588 + _ = badge.RecordEarned(ctx, h.DB, ev.OrganizerDID.String(), def.ID, "", msg) 589 589 + slog.Info("finalize: awarded event-host badge", 590 590 + "did", ev.OrganizerDID.String(), "event", ev.Name) 591 591 + } 592 592 + } 593 593 + 594 594 + slog.Info("admin event finalized", "uri", ev.URI, "name", ev.Name, 595 595 + "attendees", len(attendeeDIDs), "leaderboard_entries", len(leaderboard)) 596 596 + http.Redirect(w, r, "/admin/events", http.StatusSeeOther) 597 597 + } 598 598 + 599 599 + // badgeMessage looks up a custom message template for a badge type, 600 600 + // falling back to a default message with the event name. 601 601 + func badgeMessage(templates map[string]string, badgeType, eventName string) string { 602 602 + if msg, ok := templates[badgeType]; ok && msg != "" { 603 603 + return msg 604 604 + } 605 605 + return "Earned at " + eventName 606 606 + } 607 607 + 608 608 + // AdminBadges lists all app-wide badge definitions. 609 609 + func (h *Handlers) AdminBadges(w http.ResponseWriter, r *http.Request) { 610 610 + defs, err := badge.ListDefinitions(r.Context(), h.DB) 611 611 + if err != nil { 612 612 + slog.Error("admin badges: list", "err", err) 613 613 + http.Error(w, "internal error", http.StatusInternalServerError) 614 614 + return 615 615 + } 616 616 + 617 617 + var view pages.AdminBadgesView 618 618 + for _, d := range defs { 619 619 + svg := badge.RenderSVG(badge.Design{ 620 620 + Shape: d.Shape, 621 621 + PrimaryColor: d.PrimaryColor, 622 622 + AccentColor: d.AccentColor, 623 623 + RibbonColor: d.RibbonColor, 624 624 + Label: d.Label, 625 625 + }, 80) 626 626 + view.Badges = append(view.Badges, pages.AdminBadgeRow{ 627 627 + ID: d.ID, 628 628 + Slug: d.Slug, 629 629 + Name: d.Name, 630 630 + Description: d.Description, 631 631 + Shape: d.Shape, 632 632 + PrimaryColor: d.PrimaryColor, 633 633 + AccentColor: d.AccentColor, 634 634 + RibbonColor: d.RibbonColor, 635 635 + Label: d.Label, 636 636 + Trigger: d.Trigger, 637 637 + SVGPreview: svg, 638 638 + }) 639 639 + } 640 640 + 641 641 + w.Header().Set("Content-Type", "text/html; charset=utf-8") 642 642 + if err := pages.AdminBadges(view).Render(r.Context(), w); err != nil { 643 643 + slog.Error("render admin badges", "err", err) 644 644 + } 645 645 + } 646 646 + 647 647 + // AdminBadgeEditPage renders the badge edit form for a specific definition. 648 648 + func (h *Handlers) AdminBadgeEditPage(w http.ResponseWriter, r *http.Request) { 649 649 + idStr := chi.URLParam(r, "id") 650 650 + id, err := strconv.Atoi(idStr) 651 651 + if err != nil { 652 652 + http.NotFound(w, r) 653 653 + return 654 654 + } 655 655 + 656 656 + defs, _ := badge.ListDefinitions(r.Context(), h.DB) 657 657 + var def *badge.Definition 658 658 + for i := range defs { 659 659 + if defs[i].ID == id { 660 660 + def = &defs[i] 661 661 + break 662 662 + } 663 663 + } 664 664 + if def == nil { 665 665 + http.NotFound(w, r) 666 666 + return 667 667 + } 668 668 + 669 669 + svg := badge.RenderSVG(badge.Design{ 670 670 + Shape: def.Shape, 671 671 + PrimaryColor: def.PrimaryColor, 672 672 + AccentColor: def.AccentColor, 673 673 + RibbonColor: def.RibbonColor, 674 674 + Label: def.Label, 675 675 + }, 200) 676 676 + 677 677 + view := pages.AdminBadgeEditView{ 678 678 + Badge: pages.AdminBadgeRow{ 679 679 + ID: def.ID, 680 680 + Slug: def.Slug, 681 681 + Name: def.Name, 682 682 + Description: def.Description, 683 683 + Shape: def.Shape, 684 684 + PrimaryColor: def.PrimaryColor, 685 685 + AccentColor: def.AccentColor, 686 686 + RibbonColor: def.RibbonColor, 687 687 + Label: def.Label, 688 688 + Trigger: def.Trigger, 689 689 + SVGPreview: svg, 690 690 + }, 691 691 + Shapes: badge.DefaultShapes, 692 692 + Primary: badge.DefaultPrimaryColors, 693 693 + Accent: badge.DefaultAccentColors, 694 694 + Ribbon: badge.DefaultRibbonColors, 695 695 + Saved: r.URL.Query().Get("saved") == "1", 696 696 + } 697 697 + 698 698 + w.Header().Set("Content-Type", "text/html; charset=utf-8") 699 699 + if err := pages.AdminBadgeEdit(view).Render(r.Context(), w); err != nil { 700 700 + slog.Error("render admin badge edit", "err", err) 701 701 + } 702 702 + } 703 703 + 704 704 + // AdminBadgeEditSave handles POST /admin/badges/{id}/edit — updates the 705 705 + // badge definition's visual design. 706 706 + func (h *Handlers) AdminBadgeEditSave(w http.ResponseWriter, r *http.Request) { 707 707 + idStr := chi.URLParam(r, "id") 708 708 + id, err := strconv.Atoi(idStr) 709 709 + if err != nil { 710 710 + http.NotFound(w, r) 711 711 + return 712 712 + } 713 713 + 714 714 + if err := r.ParseForm(); err != nil { 715 715 + http.Error(w, "bad request", http.StatusBadRequest) 716 716 + return 717 717 + } 718 718 + 719 719 + _, err = h.DB.ExecContext(r.Context(), ` 720 720 + UPDATE badge_definitions SET 721 721 + name = ?, 722 722 + description = ?, 723 723 + shape = ?, 724 724 + primary_color = ?, 725 725 + accent_color = ?, 726 726 + ribbon_color = ?, 727 727 + label = ? 728 728 + WHERE id = ? 729 729 + `, 730 730 + strings.TrimSpace(r.FormValue("name")), 731 731 + strings.TrimSpace(r.FormValue("description")), 732 732 + r.FormValue("shape"), 733 733 + r.FormValue("primary_color"), 734 734 + r.FormValue("accent_color"), 735 735 + r.FormValue("ribbon_color"), 736 736 + strings.TrimSpace(r.FormValue("label")), 737 737 + id, 738 738 + ) 739 739 + if err != nil { 740 740 + slog.Warn("admin badge edit save", "id", id, "err", err) 741 741 + http.Error(w, "failed to save", http.StatusInternalServerError) 742 742 + return 743 743 + } 744 744 + 745 745 + http.Redirect(w, r, fmt.Sprintf("/admin/badges/%d/edit?saved=1", id), http.StatusSeeOther) 746 746 + } 747 747 + 748 748 + // lookupPDSForDIDAdmin is a helper that looks up PDS host from oauth_sessions. 749 749 + func lookupPDSForDIDAdmin(ctx context.Context, db *sql.DB, did syntax.DID) string { 750 750 + var host string 751 751 + err := db.QueryRowContext(ctx, ` 752 752 + SELECT data ->> 'host_url' FROM oauth_sessions 753 753 + WHERE did = ? ORDER BY updated_at DESC LIMIT 1 754 754 + `, did.String()).Scan(&host) 755 755 + if err == nil && host != "" { 756 756 + return host 757 757 + } 758 758 + return "https://bsky.social" 372 759 } 373 760 374 761 // toAdminEventRows projects []event.AdminEvent into the view type. We

+138

features/admin/pages/badges.templ

Reviewed

··· 1 1 + package pages 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + 6 6 + "atmoquest/features/common/layouts" 7 7 + ) 8 8 + 9 9 + // AdminBadgesView is the data for /admin/badges. 10 10 + type AdminBadgesView struct { 11 11 + Badges []AdminBadgeRow 12 12 + } 13 13 + 14 14 + // AdminBadgeRow is one badge definition in the admin list. 15 15 + type AdminBadgeRow struct { 16 16 + ID int 17 17 + Slug string 18 18 + Name string 19 19 + Description string 20 20 + Shape string 21 21 + PrimaryColor string 22 22 + AccentColor string 23 23 + RibbonColor string 24 24 + Label string 25 25 + Trigger string 26 26 + SVGPreview string 27 27 + } 28 28 + 29 29 + // AdminBadgeEditView is the data for /admin/badges/{id}/edit. 30 30 + type AdminBadgeEditView struct { 31 31 + Badge AdminBadgeRow 32 32 + Shapes []string 33 33 + Primary []string 34 34 + Accent []string 35 35 + Ribbon []string 36 36 + Saved bool 37 37 + Error string 38 38 + } 39 39 + 40 40 + templ AdminBadges(v AdminBadgesView) { 41 41 + @layouts.Base("admin · badges", "Manage app-wide badge definitions.") { 42 42 + @adminShell("badges", "") { 43 43 + <h2 class="admin-section-title">App badges</h2> 44 44 + <p class="settings-sub" style="margin-bottom:16px"> 45 45 + These are the app-wide badge definitions. Click a badge to edit its design. 46 46 + </p> 47 47 + 48 48 + if len(v.Badges) == 0 { 49 49 + <p class="admin-empty">no badge definitions found.</p> 50 50 + } else { 51 51 + <div class="admin-badges-grid"> 52 52 + for _, b := range v.Badges { 53 53 + <a href={ templ.SafeURL("/admin/badges/" + badgeIDStr(b.ID) + "/edit") } class="admin-badge-card"> 54 54 + <div class="admin-badge-card-svg"> 55 55 + @templ.Raw(b.SVGPreview) 56 56 + </div> 57 57 + <div class="admin-badge-card-info"> 58 58 + <div class="admin-badge-card-name">{ b.Name }</div> 59 59 + <div class="admin-badge-card-desc muted">{ b.Description }</div> 60 60 + if b.Trigger != "" { 61 61 + <div class="admin-badge-card-trigger"><code>{ b.Trigger }</code></div> 62 62 + } 63 63 + </div> 64 64 + </a> 65 65 + } 66 66 + </div> 67 67 + } 68 68 + } 69 69 + } 70 70 + } 71 71 + 72 72 + templ AdminBadgeEdit(v AdminBadgeEditView) { 73 73 + @layouts.Base("admin · edit badge", "Edit a badge definition.") { 74 74 + @adminShell("badges", "") { 75 75 + <h2 class="admin-section-title">edit badge — { v.Badge.Name }</h2> 76 76 + 77 77 + if v.Saved { 78 78 + <div class="settings-success" role="status" style="margin-bottom:16px"> 79 79 + <span class="settings-success-icon">✓</span> badge design saved. 80 80 + </div> 81 81 + } 82 82 + if v.Error != "" { 83 83 + <div class="auth-error" role="alert" style="margin-bottom:16px"> 84 84 + <span class="auth-error-prefix">error:</span> { v.Error } 85 85 + </div> 86 86 + } 87 87 + 88 88 + <div class="admin-badge-layout"> 89 89 + <div class="admin-badge-preview" id="badge-preview"> 90 90 + @templ.Raw(v.Badge.SVGPreview) 91 91 + <p class="muted" style="margin-top:8px"><code>{ v.Badge.Slug }</code></p> 92 92 + if v.Badge.Trigger != "" { 93 93 + <p class="muted"><small>trigger: <code>{ v.Badge.Trigger }</code></small></p> 94 94 + } 95 95 + </div> 96 96 + 97 97 + <form class="admin-form admin-badge-form" method="post" action={ templ.SafeURL("/admin/badges/" + badgeIDStr(v.Badge.ID) + "/edit") }> 98 98 + <div class="admin-form-row"> 99 99 + <label for="badge-name">name</label> 100 100 + <input id="badge-name" name="name" type="text" required maxlength="80" value={ v.Badge.Name }/> 101 101 + </div> 102 102 + <div class="admin-form-row"> 103 103 + <label for="badge-desc">description</label> 104 104 + <input id="badge-desc" name="description" type="text" maxlength="200" value={ v.Badge.Description }/> 105 105 + </div> 106 106 + <div class="admin-form-row"> 107 107 + <label for="badge-shape">shape</label> 108 108 + <select id="badge-shape" name="shape" required> 109 109 + for _, s := range v.Shapes { 110 110 + if s == v.Badge.Shape { 111 111 + <option value={ s } selected>{ s }</option> 112 112 + } else { 113 113 + <option value={ s }>{ s }</option> 114 114 + } 115 115 + } 116 116 + </select> 117 117 + </div> 118 118 + @colorSwatchField("primary_color", "primary color", v.Primary, v.Badge.PrimaryColor) 119 119 + @colorSwatchField("accent_color", "accent color", v.Accent, v.Badge.AccentColor) 120 120 + @colorSwatchField("ribbon_color", "ribbon color", v.Ribbon, v.Badge.RibbonColor) 121 121 + <div class="admin-form-row"> 122 122 + <label for="badge-label">label</label> 123 123 + <input id="badge-label" name="label" type="text" required maxlength="40" value={ v.Badge.Label }/> 124 124 + </div> 125 125 + <div class="ctas"> 126 126 + <button type="submit" class="btn btn-primary">▸ save badge</button> 127 127 + <a href="/admin/badges" class="btn btn-ghost">← all badges</a> 128 128 + </div> 129 129 + </form> 130 130 + </div> 131 131 + <script src="/static/js/badge-designer.js" defer></script> 132 132 + } 133 133 + } 134 134 + } 135 135 + 136 136 + func badgeIDStr(id int) string { 137 137 + return fmt.Sprintf("%d", id) 138 138 + }

+500

features/admin/pages/badges_templ.go

Reviewed

··· 1 1 + // Code generated by templ - DO NOT EDIT. 2 2 + 3 3 + // templ: version: v0.3.1020 4 4 + package pages 5 5 + 6 6 + //lint:file-ignore SA4006 This context is only used if a nested component is present. 7 7 + 8 8 + import "github.com/a-h/templ" 9 9 + import templruntime "github.com/a-h/templ/runtime" 10 10 + 11 11 + import ( 12 12 + "fmt" 13 13 + 14 14 + "atmoquest/features/common/layouts" 15 15 + ) 16 16 + 17 17 + // AdminBadgesView is the data for /admin/badges. 18 18 + type AdminBadgesView struct { 19 19 + Badges []AdminBadgeRow 20 20 + } 21 21 + 22 22 + // AdminBadgeRow is one badge definition in the admin list. 23 23 + type AdminBadgeRow struct { 24 24 + ID int 25 25 + Slug string 26 26 + Name string 27 27 + Description string 28 28 + Shape string 29 29 + PrimaryColor string 30 30 + AccentColor string 31 31 + RibbonColor string 32 32 + Label string 33 33 + Trigger string 34 34 + SVGPreview string 35 35 + } 36 36 + 37 37 + // AdminBadgeEditView is the data for /admin/badges/{id}/edit. 38 38 + type AdminBadgeEditView struct { 39 39 + Badge AdminBadgeRow 40 40 + Shapes []string 41 41 + Primary []string 42 42 + Accent []string 43 43 + Ribbon []string 44 44 + Saved bool 45 45 + Error string 46 46 + } 47 47 + 48 48 + func AdminBadges(v AdminBadgesView) templ.Component { 49 49 + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 50 50 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 51 51 + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { 52 52 + return templ_7745c5c3_CtxErr 53 53 + } 54 54 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 55 55 + if !templ_7745c5c3_IsBuffer { 56 56 + defer func() { 57 57 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 58 58 + if templ_7745c5c3_Err == nil { 59 59 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 60 60 + } 61 61 + }() 62 62 + } 63 63 + ctx = templ.InitializeContext(ctx) 64 64 + templ_7745c5c3_Var1 := templ.GetChildren(ctx) 65 65 + if templ_7745c5c3_Var1 == nil { 66 66 + templ_7745c5c3_Var1 = templ.NopComponent 67 67 + } 68 68 + ctx = templ.ClearChildren(ctx) 69 69 + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 70 70 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 71 71 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 72 72 + if !templ_7745c5c3_IsBuffer { 73 73 + defer func() { 74 74 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 75 75 + if templ_7745c5c3_Err == nil { 76 76 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 77 77 + } 78 78 + }() 79 79 + } 80 80 + ctx = templ.InitializeContext(ctx) 81 81 + templ_7745c5c3_Var3 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 82 82 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 83 83 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 84 84 + if !templ_7745c5c3_IsBuffer { 85 85 + defer func() { 86 86 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 87 87 + if templ_7745c5c3_Err == nil { 88 88 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 89 89 + } 90 90 + }() 91 91 + } 92 92 + ctx = templ.InitializeContext(ctx) 93 93 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<h2 class=\"admin-section-title\">App badges</h2><p class=\"settings-sub\" style=\"margin-bottom:16px\">These are the app-wide badge definitions. Click a badge to edit its design.</p>") 94 94 + if templ_7745c5c3_Err != nil { 95 95 + return templ_7745c5c3_Err 96 96 + } 97 97 + if len(v.Badges) == 0 { 98 98 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "<p class=\"admin-empty\">no badge definitions found.</p>") 99 99 + if templ_7745c5c3_Err != nil { 100 100 + return templ_7745c5c3_Err 101 101 + } 102 102 + } else { 103 103 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<div class=\"admin-badges-grid\">") 104 104 + if templ_7745c5c3_Err != nil { 105 105 + return templ_7745c5c3_Err 106 106 + } 107 107 + for _, b := range v.Badges { 108 108 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<a href=\"") 109 109 + if templ_7745c5c3_Err != nil { 110 110 + return templ_7745c5c3_Err 111 111 + } 112 112 + var templ_7745c5c3_Var4 templ.SafeURL 113 113 + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/badges/" + badgeIDStr(b.ID) + "/edit")) 114 114 + if templ_7745c5c3_Err != nil { 115 115 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 53, Col: 76} 116 116 + } 117 117 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) 118 118 + if templ_7745c5c3_Err != nil { 119 119 + return templ_7745c5c3_Err 120 120 + } 121 121 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\" class=\"admin-badge-card\"><div class=\"admin-badge-card-svg\">") 122 122 + if templ_7745c5c3_Err != nil { 123 123 + return templ_7745c5c3_Err 124 124 + } 125 125 + templ_7745c5c3_Err = templ.Raw(b.SVGPreview).Render(ctx, templ_7745c5c3_Buffer) 126 126 + if templ_7745c5c3_Err != nil { 127 127 + return templ_7745c5c3_Err 128 128 + } 129 129 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</div><div class=\"admin-badge-card-info\"><div class=\"admin-badge-card-name\">") 130 130 + if templ_7745c5c3_Err != nil { 131 131 + return templ_7745c5c3_Err 132 132 + } 133 133 + var templ_7745c5c3_Var5 string 134 134 + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(b.Name) 135 135 + if templ_7745c5c3_Err != nil { 136 136 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 58, Col: 51} 137 137 + } 138 138 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) 139 139 + if templ_7745c5c3_Err != nil { 140 140 + return templ_7745c5c3_Err 141 141 + } 142 142 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</div><div class=\"admin-badge-card-desc muted\">") 143 143 + if templ_7745c5c3_Err != nil { 144 144 + return templ_7745c5c3_Err 145 145 + } 146 146 + var templ_7745c5c3_Var6 string 147 147 + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(b.Description) 148 148 + if templ_7745c5c3_Err != nil { 149 149 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 59, Col: 64} 150 150 + } 151 151 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) 152 152 + if templ_7745c5c3_Err != nil { 153 153 + return templ_7745c5c3_Err 154 154 + } 155 155 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</div>") 156 156 + if templ_7745c5c3_Err != nil { 157 157 + return templ_7745c5c3_Err 158 158 + } 159 159 + if b.Trigger != "" { 160 160 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<div class=\"admin-badge-card-trigger\"><code>") 161 161 + if templ_7745c5c3_Err != nil { 162 162 + return templ_7745c5c3_Err 163 163 + } 164 164 + var templ_7745c5c3_Var7 string 165 165 + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(b.Trigger) 166 166 + if templ_7745c5c3_Err != nil { 167 167 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 61, Col: 64} 168 168 + } 169 169 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) 170 170 + if templ_7745c5c3_Err != nil { 171 171 + return templ_7745c5c3_Err 172 172 + } 173 173 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</code></div>") 174 174 + if templ_7745c5c3_Err != nil { 175 175 + return templ_7745c5c3_Err 176 176 + } 177 177 + } 178 178 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div></a>") 179 179 + if templ_7745c5c3_Err != nil { 180 180 + return templ_7745c5c3_Err 181 181 + } 182 182 + } 183 183 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</div>") 184 184 + if templ_7745c5c3_Err != nil { 185 185 + return templ_7745c5c3_Err 186 186 + } 187 187 + } 188 188 + return nil 189 189 + }) 190 190 + templ_7745c5c3_Err = adminShell("badges", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer) 191 191 + if templ_7745c5c3_Err != nil { 192 192 + return templ_7745c5c3_Err 193 193 + } 194 194 + return nil 195 195 + }) 196 196 + templ_7745c5c3_Err = layouts.Base("admin · badges", "Manage app-wide badge definitions.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 197 197 + if templ_7745c5c3_Err != nil { 198 198 + return templ_7745c5c3_Err 199 199 + } 200 200 + return nil 201 201 + }) 202 202 + } 203 203 + 204 204 + func AdminBadgeEdit(v AdminBadgeEditView) templ.Component { 205 205 + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 206 206 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 207 207 + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { 208 208 + return templ_7745c5c3_CtxErr 209 209 + } 210 210 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 211 211 + if !templ_7745c5c3_IsBuffer { 212 212 + defer func() { 213 213 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 214 214 + if templ_7745c5c3_Err == nil { 215 215 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 216 216 + } 217 217 + }() 218 218 + } 219 219 + ctx = templ.InitializeContext(ctx) 220 220 + templ_7745c5c3_Var8 := templ.GetChildren(ctx) 221 221 + if templ_7745c5c3_Var8 == nil { 222 222 + templ_7745c5c3_Var8 = templ.NopComponent 223 223 + } 224 224 + ctx = templ.ClearChildren(ctx) 225 225 + templ_7745c5c3_Var9 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 226 226 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 227 227 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 228 228 + if !templ_7745c5c3_IsBuffer { 229 229 + defer func() { 230 230 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 231 231 + if templ_7745c5c3_Err == nil { 232 232 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 233 233 + } 234 234 + }() 235 235 + } 236 236 + ctx = templ.InitializeContext(ctx) 237 237 + templ_7745c5c3_Var10 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 238 238 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 239 239 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 240 240 + if !templ_7745c5c3_IsBuffer { 241 241 + defer func() { 242 242 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 243 243 + if templ_7745c5c3_Err == nil { 244 244 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 245 245 + } 246 246 + }() 247 247 + } 248 248 + ctx = templ.InitializeContext(ctx) 249 249 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<h2 class=\"admin-section-title\">edit badge — ") 250 250 + if templ_7745c5c3_Err != nil { 251 251 + return templ_7745c5c3_Err 252 252 + } 253 253 + var templ_7745c5c3_Var11 string 254 254 + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.Badge.Name) 255 255 + if templ_7745c5c3_Err != nil { 256 256 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 75, Col: 64} 257 257 + } 258 258 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) 259 259 + if templ_7745c5c3_Err != nil { 260 260 + return templ_7745c5c3_Err 261 261 + } 262 262 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</h2>") 263 263 + if templ_7745c5c3_Err != nil { 264 264 + return templ_7745c5c3_Err 265 265 + } 266 266 + if v.Saved { 267 267 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"settings-success\" role=\"status\" style=\"margin-bottom:16px\"><span class=\"settings-success-icon\">✓</span> badge design saved.</div>") 268 268 + if templ_7745c5c3_Err != nil { 269 269 + return templ_7745c5c3_Err 270 270 + } 271 271 + } 272 272 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, " ") 273 273 + if templ_7745c5c3_Err != nil { 274 274 + return templ_7745c5c3_Err 275 275 + } 276 276 + if v.Error != "" { 277 277 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"auth-error\" role=\"alert\" style=\"margin-bottom:16px\"><span class=\"auth-error-prefix\">error:</span> ") 278 278 + if templ_7745c5c3_Err != nil { 279 279 + return templ_7745c5c3_Err 280 280 + } 281 281 + var templ_7745c5c3_Var12 string 282 282 + templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(v.Error) 283 283 + if templ_7745c5c3_Err != nil { 284 284 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 84, Col: 60} 285 285 + } 286 286 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) 287 287 + if templ_7745c5c3_Err != nil { 288 288 + return templ_7745c5c3_Err 289 289 + } 290 290 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div>") 291 291 + if templ_7745c5c3_Err != nil { 292 292 + return templ_7745c5c3_Err 293 293 + } 294 294 + } 295 295 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, " <div class=\"admin-badge-layout\"><div class=\"admin-badge-preview\" id=\"badge-preview\">") 296 296 + if templ_7745c5c3_Err != nil { 297 297 + return templ_7745c5c3_Err 298 298 + } 299 299 + templ_7745c5c3_Err = templ.Raw(v.Badge.SVGPreview).Render(ctx, templ_7745c5c3_Buffer) 300 300 + if templ_7745c5c3_Err != nil { 301 301 + return templ_7745c5c3_Err 302 302 + } 303 303 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<p class=\"muted\" style=\"margin-top:8px\"><code>") 304 304 + if templ_7745c5c3_Err != nil { 305 305 + return templ_7745c5c3_Err 306 306 + } 307 307 + var templ_7745c5c3_Var13 string 308 308 + templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(v.Badge.Slug) 309 309 + if templ_7745c5c3_Err != nil { 310 310 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 91, Col: 65} 311 311 + } 312 312 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) 313 313 + if templ_7745c5c3_Err != nil { 314 314 + return templ_7745c5c3_Err 315 315 + } 316 316 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</code></p>") 317 317 + if templ_7745c5c3_Err != nil { 318 318 + return templ_7745c5c3_Err 319 319 + } 320 320 + if v.Badge.Trigger != "" { 321 321 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "<p class=\"muted\"><small>trigger: <code>") 322 322 + if templ_7745c5c3_Err != nil { 323 323 + return templ_7745c5c3_Err 324 324 + } 325 325 + var templ_7745c5c3_Var14 string 326 326 + templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(v.Badge.Trigger) 327 327 + if templ_7745c5c3_Err != nil { 328 328 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 93, Col: 62} 329 329 + } 330 330 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 331 331 + if templ_7745c5c3_Err != nil { 332 332 + return templ_7745c5c3_Err 333 333 + } 334 334 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</code></small></p>") 335 335 + if templ_7745c5c3_Err != nil { 336 336 + return templ_7745c5c3_Err 337 337 + } 338 338 + } 339 339 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</div><form class=\"admin-form admin-badge-form\" method=\"post\" action=\"") 340 340 + if templ_7745c5c3_Err != nil { 341 341 + return templ_7745c5c3_Err 342 342 + } 343 343 + var templ_7745c5c3_Var15 templ.SafeURL 344 344 + templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/badges/" + badgeIDStr(v.Badge.ID) + "/edit")) 345 345 + if templ_7745c5c3_Err != nil { 346 346 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 97, Col: 135} 347 347 + } 348 348 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) 349 349 + if templ_7745c5c3_Err != nil { 350 350 + return templ_7745c5c3_Err 351 351 + } 352 352 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "\"><div class=\"admin-form-row\"><label for=\"badge-name\">name</label> <input id=\"badge-name\" name=\"name\" type=\"text\" required maxlength=\"80\" value=\"") 353 353 + if templ_7745c5c3_Err != nil { 354 354 + return templ_7745c5c3_Err 355 355 + } 356 356 + var templ_7745c5c3_Var16 string 357 357 + templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Badge.Name) 358 358 + if templ_7745c5c3_Err != nil { 359 359 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 100, Col: 97} 360 360 + } 361 361 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16) 362 362 + if templ_7745c5c3_Err != nil { 363 363 + return templ_7745c5c3_Err 364 364 + } 365 365 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\"></div><div class=\"admin-form-row\"><label for=\"badge-desc\">description</label> <input id=\"badge-desc\" name=\"description\" type=\"text\" maxlength=\"200\" value=\"") 366 366 + if templ_7745c5c3_Err != nil { 367 367 + return templ_7745c5c3_Err 368 368 + } 369 369 + var templ_7745c5c3_Var17 string 370 370 + templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Badge.Description) 371 371 + if templ_7745c5c3_Err != nil { 372 372 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 104, Col: 103} 373 373 + } 374 374 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17) 375 375 + if templ_7745c5c3_Err != nil { 376 376 + return templ_7745c5c3_Err 377 377 + } 378 378 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "\"></div><div class=\"admin-form-row\"><label for=\"badge-shape\">shape</label> <select id=\"badge-shape\" name=\"shape\" required>") 379 379 + if templ_7745c5c3_Err != nil { 380 380 + return templ_7745c5c3_Err 381 381 + } 382 382 + for _, s := range v.Shapes { 383 383 + if s == v.Badge.Shape { 384 384 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<option value=\"") 385 385 + if templ_7745c5c3_Err != nil { 386 386 + return templ_7745c5c3_Err 387 387 + } 388 388 + var templ_7745c5c3_Var18 string 389 389 + templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.ResolveAttributeValue(s) 390 390 + if templ_7745c5c3_Err != nil { 391 391 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 111, Col: 26} 392 392 + } 393 393 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var18) 394 394 + if templ_7745c5c3_Err != nil { 395 395 + return templ_7745c5c3_Err 396 396 + } 397 397 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "\" selected>") 398 398 + if templ_7745c5c3_Err != nil { 399 399 + return templ_7745c5c3_Err 400 400 + } 401 401 + var templ_7745c5c3_Var19 string 402 402 + templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(s) 403 403 + if templ_7745c5c3_Err != nil { 404 404 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 111, Col: 41} 405 405 + } 406 406 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) 407 407 + if templ_7745c5c3_Err != nil { 408 408 + return templ_7745c5c3_Err 409 409 + } 410 410 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</option>") 411 411 + if templ_7745c5c3_Err != nil { 412 412 + return templ_7745c5c3_Err 413 413 + } 414 414 + } else { 415 415 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<option value=\"") 416 416 + if templ_7745c5c3_Err != nil { 417 417 + return templ_7745c5c3_Err 418 418 + } 419 419 + var templ_7745c5c3_Var20 string 420 420 + templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue(s) 421 421 + if templ_7745c5c3_Err != nil { 422 422 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 113, Col: 26} 423 423 + } 424 424 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20) 425 425 + if templ_7745c5c3_Err != nil { 426 426 + return templ_7745c5c3_Err 427 427 + } 428 428 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "\">") 429 429 + if templ_7745c5c3_Err != nil { 430 430 + return templ_7745c5c3_Err 431 431 + } 432 432 + var templ_7745c5c3_Var21 string 433 433 + templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(s) 434 434 + if templ_7745c5c3_Err != nil { 435 435 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 113, Col: 32} 436 436 + } 437 437 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21)) 438 438 + if templ_7745c5c3_Err != nil { 439 439 + return templ_7745c5c3_Err 440 440 + } 441 441 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "</option>") 442 442 + if templ_7745c5c3_Err != nil { 443 443 + return templ_7745c5c3_Err 444 444 + } 445 445 + } 446 446 + } 447 447 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "</select></div>") 448 448 + if templ_7745c5c3_Err != nil { 449 449 + return templ_7745c5c3_Err 450 450 + } 451 451 + templ_7745c5c3_Err = colorSwatchField("primary_color", "primary color", v.Primary, v.Badge.PrimaryColor).Render(ctx, templ_7745c5c3_Buffer) 452 452 + if templ_7745c5c3_Err != nil { 453 453 + return templ_7745c5c3_Err 454 454 + } 455 455 + templ_7745c5c3_Err = colorSwatchField("accent_color", "accent color", v.Accent, v.Badge.AccentColor).Render(ctx, templ_7745c5c3_Buffer) 456 456 + if templ_7745c5c3_Err != nil { 457 457 + return templ_7745c5c3_Err 458 458 + } 459 459 + templ_7745c5c3_Err = colorSwatchField("ribbon_color", "ribbon color", v.Ribbon, v.Badge.RibbonColor).Render(ctx, templ_7745c5c3_Buffer) 460 460 + if templ_7745c5c3_Err != nil { 461 461 + return templ_7745c5c3_Err 462 462 + } 463 463 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<div class=\"admin-form-row\"><label for=\"badge-label\">label</label> <input id=\"badge-label\" name=\"label\" type=\"text\" required maxlength=\"40\" value=\"") 464 464 + if templ_7745c5c3_Err != nil { 465 465 + return templ_7745c5c3_Err 466 466 + } 467 467 + var templ_7745c5c3_Var22 string 468 468 + templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Badge.Label) 469 469 + if templ_7745c5c3_Err != nil { 470 470 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/badges.templ`, Line: 123, Col: 100} 471 471 + } 472 472 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22) 473 473 + if templ_7745c5c3_Err != nil { 474 474 + return templ_7745c5c3_Err 475 475 + } 476 476 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "\"></div><div class=\"ctas\"><button type=\"submit\" class=\"btn btn-primary\">▸ save badge</button> <a href=\"/admin/badges\" class=\"btn btn-ghost\">← all badges</a></div></form></div><script src=\"/static/js/badge-designer.js\" defer></script>") 477 477 + if templ_7745c5c3_Err != nil { 478 478 + return templ_7745c5c3_Err 479 479 + } 480 480 + return nil 481 481 + }) 482 482 + templ_7745c5c3_Err = adminShell("badges", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var10), templ_7745c5c3_Buffer) 483 483 + if templ_7745c5c3_Err != nil { 484 484 + return templ_7745c5c3_Err 485 485 + } 486 486 + return nil 487 487 + }) 488 488 + templ_7745c5c3_Err = layouts.Base("admin · edit badge", "Edit a badge definition.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var9), templ_7745c5c3_Buffer) 489 489 + if templ_7745c5c3_Err != nil { 490 490 + return templ_7745c5c3_Err 491 491 + } 492 492 + return nil 493 493 + }) 494 494 + } 495 495 + 496 496 + func badgeIDStr(id int) string { 497 497 + return fmt.Sprintf("%d", id) 498 498 + } 499 499 + 500 500 + var _ = templruntime.GeneratedTemplate

+2 -1

features/admin/pages/dashboard.templ

Reviewed

··· 19 19 } 20 20 21 21 templ AdminDashboard(v AdminDashboardView) { 22 22 - @layouts.Base("admin — atmo.quest", "atmo.quest admin console.") { 22 22 + @layouts.Base("admin", "atmo.quest admin console.") { 23 23 @adminShell("dashboard", v.CurrentHandle) { 24 24 <div class="admin-stats-grid"> 25 25 @statTile("users", intStr(v.TotalUsers), "total signed in") ··· 73 73 @adminNavLink("/admin", "dashboard", active == "dashboard") 74 74 @adminNavLink("/admin/users", "users", active == "users") 75 75 @adminNavLink("/admin/events", "events", active == "events") 76 76 + @adminNavLink("/admin/badges", "badges", active == "badges") 76 77 <a class="admin-nav-tail" href="/">← back to app</a> 77 78 </nav> 78 79

+9 -5

features/admin/pages/dashboard_templ.go

Reviewed

··· 143 143 } 144 144 return nil 145 145 }) 146 146 - templ_7745c5c3_Err = layouts.Base("admin — atmo.quest", "atmo.quest admin console.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 146 146 + templ_7745c5c3_Err = layouts.Base("admin", "atmo.quest admin console.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 147 147 if templ_7745c5c3_Err != nil { 148 148 return templ_7745c5c3_Err 149 149 } ··· 285 285 if templ_7745c5c3_Err != nil { 286 286 return templ_7745c5c3_Err 287 287 } 288 288 + templ_7745c5c3_Err = adminNavLink("/admin/badges", "badges", active == "badges").Render(ctx, templ_7745c5c3_Buffer) 289 289 + if templ_7745c5c3_Err != nil { 290 290 + return templ_7745c5c3_Err 291 291 + } 288 292 templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<a class=\"admin-nav-tail\" href=\"/\">← back to app</a></nav>") 289 293 if templ_7745c5c3_Err != nil { 290 294 return templ_7745c5c3_Err ··· 330 334 var templ_7745c5c3_Var14 templ.SafeURL 331 335 templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(href)) 332 336 if templ_7745c5c3_Err != nil { 333 333 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 92, Col: 64} 337 337 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 93, Col: 64} 334 338 } 335 339 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 336 340 if templ_7745c5c3_Err != nil { ··· 343 347 var templ_7745c5c3_Var15 string 344 348 templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(label) 345 349 if templ_7745c5c3_Err != nil { 346 346 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 92, Col: 78} 350 350 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 93, Col: 78} 347 351 } 348 352 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) 349 353 if templ_7745c5c3_Err != nil { ··· 361 365 var templ_7745c5c3_Var16 templ.SafeURL 362 366 templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(href)) 363 367 if templ_7745c5c3_Err != nil { 364 364 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 94, Col: 54} 368 368 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 95, Col: 54} 365 369 } 366 370 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) 367 371 if templ_7745c5c3_Err != nil { ··· 374 378 var templ_7745c5c3_Var17 string 375 379 templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(label) 376 380 if templ_7745c5c3_Err != nil { 377 377 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 94, Col: 64} 381 381 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/dashboard.templ`, Line: 95, Col: 64} 378 382 } 379 383 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) 380 384 if templ_7745c5c3_Err != nil {

+69 -15

features/admin/pages/events.templ

Reviewed

··· 21 21 } 22 22 23 23 templ AdminEvents(v AdminEventsView) { 24 24 - @layouts.Base("admin · events — atmo.quest", "Manage atmo.quest events.") { 24 24 + @layouts.Base("admin · events", "Manage atmo.quest events.") { 25 25 @adminShell("events", "") { 26 26 <div class="admin-events-toolbar"> 27 27 <a href="/admin/events/new" class="btn btn-primary btn-sm">▸ new event</a> ··· 57 57 <td class="num">{ intStr(ev.ExpectedAttendees) }</td> 58 58 <td><a class="break" href={ templ.SafeURL(ev.QRPublicURL) }>{ ev.QRPublicURL }</a></td> 59 59 <td class="nowrap"> 60 60 + <a class="btn btn-ghost btn-sm" href={ templ.SafeURL("/e/" + ev.QRToken + "/qr.svg") }>QR ↓</a> 60 61 <a class="btn btn-ghost btn-sm" href={ templ.SafeURL("/admin/events/" + ev.QRToken + "/badge") }>badge →</a> 62 62 + <form method="POST" action={ templ.SafeURL("/admin/events/" + ev.QRToken + "/finalize") } style="display:inline" onsubmit="return confirm('Award end-of-event badges? This should only be done after the event ends.')"> 63 63 + <button type="submit" class="btn btn-ghost btn-sm">finalize</button> 64 64 + </form> 65 65 + <form method="POST" action={ templ.SafeURL("/admin/events/" + ev.QRToken + "/delete") } style="display:inline" onsubmit="return confirm('Delete this event and all associated data?')"> 66 66 + <button type="submit" class="btn btn-danger btn-sm">delete</button> 67 67 + </form> 61 68 </td> 62 69 </tr> 63 70 } ··· 81 88 } 82 89 83 90 templ AdminEventNew(v AdminEventFormView) { 84 84 - @layouts.Base("admin · new event — atmo.quest", "Create a new atmo.quest event.") { 91 91 + @layouts.Base("admin · new event", "Create a new atmo.quest event.") { 85 92 @adminShell("events", "") { 86 93 <h2 class="admin-section-title">create event</h2> 87 94 ··· 136 143 Primary []string 137 144 Accent []string 138 145 Ribbon []string 139 139 - Design AdminBadgeDesign 140 140 - SVGPreview string 141 141 - QRPublicURL string 146 146 + Design AdminBadgeDesign 147 147 + SVGPreview string 148 148 + QRPublicURL string 149 149 + EventBadges []EventBadgeOverview // all badge types for this event 150 150 + SelectedBadgeType string // which badge type is being edited 151 151 + } 152 152 + 153 153 + // EventBadgeOverview shows the status of a badge type for an event. 154 154 + type EventBadgeOverview struct { 155 155 + Slug string 156 156 + Name string 157 157 + Description string 158 158 + Designed bool // true if a design has been saved 159 159 + Label string // the label on the badge (if designed) 142 160 } 143 161 144 162 // AdminBadgeDesign is the current state of the badge being designed. 145 163 type AdminBadgeDesign struct { 146 146 - Shape string 147 147 - PrimaryColor string 148 148 - AccentColor string 149 149 - RibbonColor string 150 150 - Label string 151 151 - Signature string 152 152 - SigningKeyID string 164 164 + Shape string 165 165 + PrimaryColor string 166 166 + AccentColor string 167 167 + RibbonColor string 168 168 + Label string 169 169 + MessageTemplate string 170 170 + Signature string 171 171 + SigningKeyID string 153 172 } 154 173 155 174 templ AdminEventBadge(v AdminEventBadgeView) { 156 156 - @layouts.Base("admin · badge designer — atmo.quest", "Design an event badge.") { 175 175 + @layouts.Base("admin · badge designer", "Design an event badge.") { 157 176 @adminShell("events", "") { 158 177 <h2 class="admin-section-title">badge designer — { v.EventName }</h2> 159 178 179 179 + if len(v.EventBadges) > 0 { 180 180 + <div class="settings-group" style="margin-bottom:20px;"> 181 181 + <div class="settings-group-label">Event badges — click to design</div> 182 182 + <div class="settings-list"> 183 183 + for _, eb := range v.EventBadges { 184 184 + <a href={ templ.SafeURL("/admin/events/" + v.Token + "/badge?type=" + eb.Slug) } class={ "settings-row", templ.KV("active-badge-type", eb.Slug == v.SelectedBadgeType) }> 185 185 + <div class="settings-row-icon"> 186 186 + if eb.Designed { 187 187 + <span style="color:var(--green)">◆</span> 188 188 + } else { 189 189 + <span style="color:var(--subtext0)">◇</span> 190 190 + } 191 191 + </div> 192 192 + <div class="settings-row-body"> 193 193 + <div class="settings-row-title">{ eb.Name }</div> 194 194 + <div class="settings-row-desc">{ eb.Description }</div> 195 195 + </div> 196 196 + if eb.Designed { 197 197 + <div class="settings-row-value muted">{ eb.Label }</div> 198 198 + } else { 199 199 + <div class="settings-row-value muted">not designed</div> 200 200 + } 201 201 + </a> 202 202 + } 203 203 + </div> 204 204 + </div> 205 205 + } 206 206 + 160 207 <div class="admin-badge-layout"> 161 161 - <div class="admin-badge-preview"> 208 208 + <div class="admin-badge-preview" id="badge-preview"> 162 209 @templ.Raw(v.SVGPreview) 163 210 <p class="admin-badge-uri muted break"> 164 211 <small>{ v.EventURI }</small> ··· 171 218 </div> 172 219 173 220 <form class="admin-form admin-badge-form" method="post" action={ templ.SafeURL("/admin/events/" + v.Token + "/badge") }> 221 221 + <input type="hidden" name="badge_type" value={ v.SelectedBadgeType }/> 174 222 <div class="admin-form-row"> 175 223 <label for="badge-shape">shape</label> 176 224 <select id="badge-shape" name="shape" required> ··· 190 238 <label for="badge-label">label</label> 191 239 <input id="badge-label" name="label" type="text" required maxlength="40" value={ v.Design.Label }/> 192 240 </div> 241 241 + <div class="admin-form-row"> 242 242 + <label for="badge-message">award message</label> 243 243 + <input id="badge-message" name="message_template" type="text" maxlength="200" value={ v.Design.MessageTemplate } placeholder="e.g. Welcome to CascadiaJS! This badge was awarded for checking in."/> 244 244 + <span class="admin-form-hint muted">shown when someone views their badge</span> 245 245 + </div> 193 246 <div class="ctas"> 194 247 <button type="submit" class="btn btn-primary">▸ save badge</button> 195 195 - <a href={ templ.SafeURL("/e/" + v.Token + "/qr.svg") } class="btn btn-ghost">download QR</a> 248 248 + 196 249 <a href="/admin/events" class="btn btn-ghost">← all events</a> 197 250 </div> 198 251 <p class="profile-edit-note"> ··· 203 256 </p> 204 257 </form> 205 258 </div> 259 259 + <script src="/static/js/badge-designer.js" defer></script> 206 260 } 207 261 } 208 262 }

+365 -181

features/admin/pages/events_templ.go

Reviewed

··· 191 191 return templ_7745c5c3_Err 192 192 } 193 193 var templ_7745c5c3_Var11 templ.SafeURL 194 194 - templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + ev.QRToken + "/badge")) 194 194 + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/e/" + ev.QRToken + "/qr.svg")) 195 195 if templ_7745c5c3_Err != nil { 196 196 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 60, Col: 104} 196 196 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 60, Col: 94} 197 197 } 198 198 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) 199 199 if templ_7745c5c3_Err != nil { 200 200 return templ_7745c5c3_Err 201 201 } 202 202 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\">badge →</a></td></tr>") 202 202 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\">QR ↓</a> <a class=\"btn btn-ghost btn-sm\" href=\"") 203 203 + if templ_7745c5c3_Err != nil { 204 204 + return templ_7745c5c3_Err 205 205 + } 206 206 + var templ_7745c5c3_Var12 templ.SafeURL 207 207 + templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + ev.QRToken + "/badge")) 208 208 + if templ_7745c5c3_Err != nil { 209 209 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 61, Col: 104} 210 210 + } 211 211 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) 212 212 + if templ_7745c5c3_Err != nil { 213 213 + return templ_7745c5c3_Err 214 214 + } 215 215 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\">badge →</a><form method=\"POST\" action=\"") 216 216 + if templ_7745c5c3_Err != nil { 217 217 + return templ_7745c5c3_Err 218 218 + } 219 219 + var templ_7745c5c3_Var13 templ.SafeURL 220 220 + templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + ev.QRToken + "/finalize")) 221 221 + if templ_7745c5c3_Err != nil { 222 222 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 62, Col: 97} 223 223 + } 224 224 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) 225 225 + if templ_7745c5c3_Err != nil { 226 226 + return templ_7745c5c3_Err 227 227 + } 228 228 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "\" style=\"display:inline\" onsubmit=\"return confirm('Award end-of-event badges? This should only be done after the event ends.')\"><button type=\"submit\" class=\"btn btn-ghost btn-sm\">finalize</button></form><form method=\"POST\" action=\"") 229 229 + if templ_7745c5c3_Err != nil { 230 230 + return templ_7745c5c3_Err 231 231 + } 232 232 + var templ_7745c5c3_Var14 templ.SafeURL 233 233 + templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + ev.QRToken + "/delete")) 234 234 + if templ_7745c5c3_Err != nil { 235 235 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 65, Col: 95} 236 236 + } 237 237 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 238 238 + if templ_7745c5c3_Err != nil { 239 239 + return templ_7745c5c3_Err 240 240 + } 241 241 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "\" style=\"display:inline\" onsubmit=\"return confirm('Delete this event and all associated data?')\"><button type=\"submit\" class=\"btn btn-danger btn-sm\">delete</button></form></td></tr>") 203 242 if templ_7745c5c3_Err != nil { 204 243 return templ_7745c5c3_Err 205 244 } 206 245 } 207 207 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</tbody></table></div>") 246 246 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</tbody></table></div>") 208 247 if templ_7745c5c3_Err != nil { 209 248 return templ_7745c5c3_Err 210 249 } ··· 217 256 } 218 257 return nil 219 258 }) 220 220 - templ_7745c5c3_Err = layouts.Base("admin · events — atmo.quest", "Manage atmo.quest events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 259 259 + templ_7745c5c3_Err = layouts.Base("admin · events", "Manage atmo.quest events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 221 260 if templ_7745c5c3_Err != nil { 222 261 return templ_7745c5c3_Err 223 262 } ··· 252 291 }() 253 292 } 254 293 ctx = templ.InitializeContext(ctx) 255 255 - templ_7745c5c3_Var12 := templ.GetChildren(ctx) 256 256 - if templ_7745c5c3_Var12 == nil { 257 257 - templ_7745c5c3_Var12 = templ.NopComponent 294 294 + templ_7745c5c3_Var15 := templ.GetChildren(ctx) 295 295 + if templ_7745c5c3_Var15 == nil { 296 296 + templ_7745c5c3_Var15 = templ.NopComponent 258 297 } 259 298 ctx = templ.ClearChildren(ctx) 260 260 - templ_7745c5c3_Var13 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 299 299 + templ_7745c5c3_Var16 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 261 300 templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 262 301 templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 263 302 if !templ_7745c5c3_IsBuffer { ··· 269 308 }() 270 309 } 271 310 ctx = templ.InitializeContext(ctx) 272 272 - templ_7745c5c3_Var14 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 311 311 + templ_7745c5c3_Var17 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 273 312 templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 274 313 templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 275 314 if !templ_7745c5c3_IsBuffer { ··· 281 320 }() 282 321 } 283 322 ctx = templ.InitializeContext(ctx) 284 284 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<h2 class=\"admin-section-title\">create event</h2>") 323 323 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<h2 class=\"admin-section-title\">create event</h2>") 285 324 if templ_7745c5c3_Err != nil { 286 325 return templ_7745c5c3_Err 287 326 } 288 327 if v.Error != "" { 289 289 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<div class=\"auth-error\" role=\"alert\"><span class=\"auth-error-prefix\">heads up:</span> ") 328 328 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<div class=\"auth-error\" role=\"alert\"><span class=\"auth-error-prefix\">heads up:</span> ") 290 329 if templ_7745c5c3_Err != nil { 291 330 return templ_7745c5c3_Err 292 331 } 293 293 - var templ_7745c5c3_Var15 string 294 294 - templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(v.Error) 332 332 + var templ_7745c5c3_Var18 string 333 333 + templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(v.Error) 295 334 if templ_7745c5c3_Err != nil { 296 296 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 90, Col: 63} 335 335 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 97, Col: 63} 297 336 } 298 298 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) 337 337 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18)) 299 338 if templ_7745c5c3_Err != nil { 300 339 return templ_7745c5c3_Err 301 340 } 302 302 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</div>") 341 341 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "</div>") 303 342 if templ_7745c5c3_Err != nil { 304 343 return templ_7745c5c3_Err 305 344 } 306 345 } 307 307 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, " <form class=\"admin-form\" method=\"post\" action=\"/admin/events\"><div class=\"admin-form-row\"><label for=\"event-name\">name</label> <input id=\"event-name\" name=\"name\" type=\"text\" required maxlength=\"120\" value=\"") 346 346 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, " <form class=\"admin-form\" method=\"post\" action=\"/admin/events\"><div class=\"admin-form-row\"><label for=\"event-name\">name</label> <input id=\"event-name\" name=\"name\" type=\"text\" required maxlength=\"120\" value=\"") 308 347 if templ_7745c5c3_Err != nil { 309 348 return templ_7745c5c3_Err 310 349 } 311 311 - var templ_7745c5c3_Var16 string 312 312 - templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Name) 350 350 + var templ_7745c5c3_Var19 string 351 351 + templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Name) 313 352 if templ_7745c5c3_Err != nil { 314 314 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 97, Col: 91} 353 353 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 104, Col: 91} 315 354 } 316 316 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16) 355 355 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var19) 317 356 if templ_7745c5c3_Err != nil { 318 357 return templ_7745c5c3_Err 319 358 } 320 320 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "\" placeholder=\"e.g. CascadiaJS 2026\"></div><div class=\"admin-form-row\"><label for=\"event-location\">location</label> <input id=\"event-location\" name=\"location\" type=\"text\" maxlength=\"160\" value=\"") 359 359 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\" placeholder=\"e.g. CascadiaJS 2026\"></div><div class=\"admin-form-row\"><label for=\"event-location\">location</label> <input id=\"event-location\" name=\"location\" type=\"text\" maxlength=\"160\" value=\"") 321 360 if templ_7745c5c3_Err != nil { 322 361 return templ_7745c5c3_Err 323 362 } 324 324 - var templ_7745c5c3_Var17 string 325 325 - templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Location) 363 363 + var templ_7745c5c3_Var20 string 364 364 + templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Location) 326 365 if templ_7745c5c3_Err != nil { 327 327 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 101, Col: 94} 366 366 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 108, Col: 94} 328 367 } 329 329 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17) 368 368 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20) 330 369 if templ_7745c5c3_Err != nil { 331 370 return templ_7745c5c3_Err 332 371 } 333 333 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\" placeholder=\"e.g. Portland Convention Center\"></div><div class=\"admin-form-row-pair\"><div class=\"admin-form-row\"><label for=\"event-start\">start</label> <input id=\"event-start\" name=\"start_time\" type=\"datetime-local\" required value=\"") 372 372 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\" placeholder=\"e.g. Portland Convention Center\"></div><div class=\"admin-form-row-pair\"><div class=\"admin-form-row\"><label for=\"event-start\">start</label> <input id=\"event-start\" name=\"start_time\" type=\"datetime-local\" required value=\"") 334 373 if templ_7745c5c3_Err != nil { 335 374 return templ_7745c5c3_Err 336 375 } 337 337 - var templ_7745c5c3_Var18 string 338 338 - templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.StartTime) 376 376 + var templ_7745c5c3_Var21 string 377 377 + templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.StartTime) 339 378 if templ_7745c5c3_Err != nil { 340 340 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 106, Col: 98} 379 379 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 113, Col: 98} 341 380 } 342 342 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var18) 381 381 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21) 343 382 if templ_7745c5c3_Err != nil { 344 383 return templ_7745c5c3_Err 345 384 } 346 346 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "\"></div><div class=\"admin-form-row\"><label for=\"event-end\">end</label> <input id=\"event-end\" name=\"end_time\" type=\"datetime-local\" required value=\"") 385 385 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\"></div><div class=\"admin-form-row\"><label for=\"event-end\">end</label> <input id=\"event-end\" name=\"end_time\" type=\"datetime-local\" required value=\"") 347 386 if templ_7745c5c3_Err != nil { 348 387 return templ_7745c5c3_Err 349 388 } 350 350 - var templ_7745c5c3_Var19 string 351 351 - templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.EndTime) 389 389 + var templ_7745c5c3_Var22 string 390 390 + templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.EndTime) 352 391 if templ_7745c5c3_Err != nil { 353 353 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 110, Col: 92} 392 392 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 117, Col: 92} 354 393 } 355 355 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var19) 394 394 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22) 356 395 if templ_7745c5c3_Err != nil { 357 396 return templ_7745c5c3_Err 358 397 } 359 359 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "\"></div></div><div class=\"admin-form-row\"><label for=\"event-expected\">expected attendees</label> <input id=\"event-expected\" name=\"expected_attendees\" type=\"number\" min=\"0\" value=\"") 398 398 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "\"></div></div><div class=\"admin-form-row\"><label for=\"event-expected\">expected attendees</label> <input id=\"event-expected\" name=\"expected_attendees\" type=\"number\" min=\"0\" value=\"") 360 399 if templ_7745c5c3_Err != nil { 361 400 return templ_7745c5c3_Err 362 401 } 363 363 - var templ_7745c5c3_Var20 string 364 364 - templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue(intStr(v.ExpectedAttendees)) 402 402 + var templ_7745c5c3_Var23 string 403 403 + templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.ResolveAttributeValue(intStr(v.ExpectedAttendees)) 365 404 if templ_7745c5c3_Err != nil { 366 366 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 115, Col: 115} 405 405 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 122, Col: 115} 367 406 } 368 368 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20) 407 407 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var23) 369 408 if templ_7745c5c3_Err != nil { 370 409 return templ_7745c5c3_Err 371 410 } 372 372 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "\"></div><div class=\"ctas\"><button type=\"submit\" class=\"btn btn-primary\">▸ create event</button> <a href=\"/admin/events\" class=\"btn btn-ghost\">cancel</a></div><p class=\"profile-edit-note\">creating an event writes a <span class=\"kw2\">quest.atmo.event</span> record to your PDS. you'll be taken to the badge designer next.</p></form>") 411 411 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "\"></div><div class=\"ctas\"><button type=\"submit\" class=\"btn btn-primary\">▸ create event</button> <a href=\"/admin/events\" class=\"btn btn-ghost\">cancel</a></div><p class=\"profile-edit-note\">creating an event writes a <span class=\"kw2\">quest.atmo.event</span> record to your PDS. you'll be taken to the badge designer next.</p></form>") 373 412 if templ_7745c5c3_Err != nil { 374 413 return templ_7745c5c3_Err 375 414 } 376 415 return nil 377 416 }) 378 378 - templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var14), templ_7745c5c3_Buffer) 417 417 + templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var17), templ_7745c5c3_Buffer) 379 418 if templ_7745c5c3_Err != nil { 380 419 return templ_7745c5c3_Err 381 420 } 382 421 return nil 383 422 }) 384 384 - templ_7745c5c3_Err = layouts.Base("admin · new event — atmo.quest", "Create a new atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var13), templ_7745c5c3_Buffer) 423 423 + templ_7745c5c3_Err = layouts.Base("admin · new event", "Create a new atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var16), templ_7745c5c3_Buffer) 385 424 if templ_7745c5c3_Err != nil { 386 425 return templ_7745c5c3_Err 387 426 } ··· 391 430 392 431 // AdminEventBadgeView feeds the badge designer page. 393 432 type AdminEventBadgeView struct { 394 394 - EventURI string 395 395 - EventName string 396 396 - Token string 397 397 - Shapes []string 398 398 - Primary []string 399 399 - Accent []string 400 400 - Ribbon []string 401 401 - Design AdminBadgeDesign 402 402 - SVGPreview string 403 403 - QRPublicURL string 433 433 + EventURI string 434 434 + EventName string 435 435 + Token string 436 436 + Shapes []string 437 437 + Primary []string 438 438 + Accent []string 439 439 + Ribbon []string 440 440 + Design AdminBadgeDesign 441 441 + SVGPreview string 442 442 + QRPublicURL string 443 443 + EventBadges []EventBadgeOverview // all badge types for this event 444 444 + SelectedBadgeType string // which badge type is being edited 445 445 + } 446 446 + 447 447 + // EventBadgeOverview shows the status of a badge type for an event. 448 448 + type EventBadgeOverview struct { 449 449 + Slug string 450 450 + Name string 451 451 + Description string 452 452 + Designed bool // true if a design has been saved 453 453 + Label string // the label on the badge (if designed) 404 454 } 405 455 406 456 // AdminBadgeDesign is the current state of the badge being designed. 407 457 type AdminBadgeDesign struct { 408 408 - Shape string 409 409 - PrimaryColor string 410 410 - AccentColor string 411 411 - RibbonColor string 412 412 - Label string 413 413 - Signature string 414 414 - SigningKeyID string 458 458 + Shape string 459 459 + PrimaryColor string 460 460 + AccentColor string 461 461 + RibbonColor string 462 462 + Label string 463 463 + MessageTemplate string 464 464 + Signature string 465 465 + SigningKeyID string 415 466 } 416 467 417 468 func AdminEventBadge(v AdminEventBadgeView) templ.Component { ··· 430 481 }() 431 482 } 432 483 ctx = templ.InitializeContext(ctx) 433 433 - templ_7745c5c3_Var21 := templ.GetChildren(ctx) 434 434 - if templ_7745c5c3_Var21 == nil { 435 435 - templ_7745c5c3_Var21 = templ.NopComponent 484 484 + templ_7745c5c3_Var24 := templ.GetChildren(ctx) 485 485 + if templ_7745c5c3_Var24 == nil { 486 486 + templ_7745c5c3_Var24 = templ.NopComponent 436 487 } 437 488 ctx = templ.ClearChildren(ctx) 438 438 - templ_7745c5c3_Var22 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 489 489 + templ_7745c5c3_Var25 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 439 490 templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 440 491 templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 441 492 if !templ_7745c5c3_IsBuffer { ··· 447 498 }() 448 499 } 449 500 ctx = templ.InitializeContext(ctx) 450 450 - templ_7745c5c3_Var23 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 501 501 + templ_7745c5c3_Var26 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 451 502 templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 452 503 templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 453 504 if !templ_7745c5c3_IsBuffer { ··· 459 510 }() 460 511 } 461 512 ctx = templ.InitializeContext(ctx) 462 462 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<h2 class=\"admin-section-title\">badge designer — ") 513 513 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<h2 class=\"admin-section-title\">badge designer — ") 463 514 if templ_7745c5c3_Err != nil { 464 515 return templ_7745c5c3_Err 465 516 } 466 466 - var templ_7745c5c3_Var24 string 467 467 - templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventName) 517 517 + var templ_7745c5c3_Var27 string 518 518 + templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventName) 468 519 if templ_7745c5c3_Err != nil { 469 469 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 158, Col: 67} 520 520 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 177, Col: 67} 470 521 } 471 471 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24)) 522 522 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) 472 523 if templ_7745c5c3_Err != nil { 473 524 return templ_7745c5c3_Err 474 525 } 475 475 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</h2><div class=\"admin-badge-layout\"><div class=\"admin-badge-preview\">") 526 526 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</h2>") 527 527 + if templ_7745c5c3_Err != nil { 528 528 + return templ_7745c5c3_Err 529 529 + } 530 530 + if len(v.EventBadges) > 0 { 531 531 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<div class=\"settings-group\" style=\"margin-bottom:20px;\"><div class=\"settings-group-label\">Event badges — click to design</div><div class=\"settings-list\">") 532 532 + if templ_7745c5c3_Err != nil { 533 533 + return templ_7745c5c3_Err 534 534 + } 535 535 + for _, eb := range v.EventBadges { 536 536 + var templ_7745c5c3_Var28 = []any{"settings-row", templ.KV("active-badge-type", eb.Slug == v.SelectedBadgeType)} 537 537 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var28...) 538 538 + if templ_7745c5c3_Err != nil { 539 539 + return templ_7745c5c3_Err 540 540 + } 541 541 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<a href=\"") 542 542 + if templ_7745c5c3_Err != nil { 543 543 + return templ_7745c5c3_Err 544 544 + } 545 545 + var templ_7745c5c3_Var29 templ.SafeURL 546 546 + templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + v.Token + "/badge?type=" + eb.Slug)) 547 547 + if templ_7745c5c3_Err != nil { 548 548 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 184, Col: 85} 549 549 + } 550 550 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) 551 551 + if templ_7745c5c3_Err != nil { 552 552 + return templ_7745c5c3_Err 553 553 + } 554 554 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\" class=\"") 555 555 + if templ_7745c5c3_Err != nil { 556 556 + return templ_7745c5c3_Err 557 557 + } 558 558 + var templ_7745c5c3_Var30 string 559 559 + templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var28).String()) 560 560 + if templ_7745c5c3_Err != nil { 561 561 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 1, Col: 0} 562 562 + } 563 563 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var30) 564 564 + if templ_7745c5c3_Err != nil { 565 565 + return templ_7745c5c3_Err 566 566 + } 567 567 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "\"><div class=\"settings-row-icon\">") 568 568 + if templ_7745c5c3_Err != nil { 569 569 + return templ_7745c5c3_Err 570 570 + } 571 571 + if eb.Designed { 572 572 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<span style=\"color:var(--green)\">◆</span>") 573 573 + if templ_7745c5c3_Err != nil { 574 574 + return templ_7745c5c3_Err 575 575 + } 576 576 + } else { 577 577 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<span style=\"color:var(--subtext0)\">◇</span>") 578 578 + if templ_7745c5c3_Err != nil { 579 579 + return templ_7745c5c3_Err 580 580 + } 581 581 + } 582 582 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">") 583 583 + if templ_7745c5c3_Err != nil { 584 584 + return templ_7745c5c3_Err 585 585 + } 586 586 + var templ_7745c5c3_Var31 string 587 587 + templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(eb.Name) 588 588 + if templ_7745c5c3_Err != nil { 589 589 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 193, Col: 50} 590 590 + } 591 591 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31)) 592 592 + if templ_7745c5c3_Err != nil { 593 593 + return templ_7745c5c3_Err 594 594 + } 595 595 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "</div><div class=\"settings-row-desc\">") 596 596 + if templ_7745c5c3_Err != nil { 597 597 + return templ_7745c5c3_Err 598 598 + } 599 599 + var templ_7745c5c3_Var32 string 600 600 + templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(eb.Description) 601 601 + if templ_7745c5c3_Err != nil { 602 602 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 194, Col: 56} 603 603 + } 604 604 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32)) 605 605 + if templ_7745c5c3_Err != nil { 606 606 + return templ_7745c5c3_Err 607 607 + } 608 608 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "</div></div>") 609 609 + if templ_7745c5c3_Err != nil { 610 610 + return templ_7745c5c3_Err 611 611 + } 612 612 + if eb.Designed { 613 613 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "<div class=\"settings-row-value muted\">") 614 614 + if templ_7745c5c3_Err != nil { 615 615 + return templ_7745c5c3_Err 616 616 + } 617 617 + var templ_7745c5c3_Var33 string 618 618 + templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(eb.Label) 619 619 + if templ_7745c5c3_Err != nil { 620 620 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 197, Col: 57} 621 621 + } 622 622 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33)) 623 623 + if templ_7745c5c3_Err != nil { 624 624 + return templ_7745c5c3_Err 625 625 + } 626 626 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "</div>") 627 627 + if templ_7745c5c3_Err != nil { 628 628 + return templ_7745c5c3_Err 629 629 + } 630 630 + } else { 631 631 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "<div class=\"settings-row-value muted\">not designed</div>") 632 632 + if templ_7745c5c3_Err != nil { 633 633 + return templ_7745c5c3_Err 634 634 + } 635 635 + } 636 636 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</a>") 637 637 + if templ_7745c5c3_Err != nil { 638 638 + return templ_7745c5c3_Err 639 639 + } 640 640 + } 641 641 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "</div></div>") 642 642 + if templ_7745c5c3_Err != nil { 643 643 + return templ_7745c5c3_Err 644 644 + } 645 645 + } 646 646 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, " <div class=\"admin-badge-layout\"><div class=\"admin-badge-preview\" id=\"badge-preview\">") 476 647 if templ_7745c5c3_Err != nil { 477 648 return templ_7745c5c3_Err 478 649 } ··· 480 651 if templ_7745c5c3_Err != nil { 481 652 return templ_7745c5c3_Err 482 653 } 483 483 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<p class=\"admin-badge-uri muted break\"><small>") 654 654 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<p class=\"admin-badge-uri muted break\"><small>") 484 655 if templ_7745c5c3_Err != nil { 485 656 return templ_7745c5c3_Err 486 657 } 487 487 - var templ_7745c5c3_Var25 string 488 488 - templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventURI) 658 658 + var templ_7745c5c3_Var34 string 659 659 + templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(v.EventURI) 489 660 if templ_7745c5c3_Err != nil { 490 490 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 164, Col: 25} 661 661 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 211, Col: 25} 491 662 } 492 492 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25)) 663 663 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34)) 493 664 if templ_7745c5c3_Err != nil { 494 665 return templ_7745c5c3_Err 495 666 } 496 496 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "</small></p>") 667 667 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "</small></p>") 497 668 if templ_7745c5c3_Err != nil { 498 669 return templ_7745c5c3_Err 499 670 } 500 671 if v.Design.Signature != "" { 501 501 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "<p class=\"admin-badge-signature\"><span class=\"ok\">●</span> signed (key ") 672 672 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "<p class=\"admin-badge-signature\"><span class=\"ok\">●</span> signed (key ") 502 673 if templ_7745c5c3_Err != nil { 503 674 return templ_7745c5c3_Err 504 675 } 505 505 - var templ_7745c5c3_Var26 string 506 506 - templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(v.Design.SigningKeyID) 676 676 + var templ_7745c5c3_Var35 string 677 677 + templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(v.Design.SigningKeyID) 507 678 if templ_7745c5c3_Err != nil { 508 508 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 168, Col: 70} 679 679 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 215, Col: 70} 509 680 } 510 510 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26)) 681 681 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35)) 511 682 if templ_7745c5c3_Err != nil { 512 683 return templ_7745c5c3_Err 513 684 } 514 514 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, ")</p>") 685 685 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, ")</p>") 515 686 if templ_7745c5c3_Err != nil { 516 687 return templ_7745c5c3_Err 517 688 } 518 689 } 519 519 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</div><form class=\"admin-form admin-badge-form\" method=\"post\" action=\"") 690 690 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "</div><form class=\"admin-form admin-badge-form\" method=\"post\" action=\"") 520 691 if templ_7745c5c3_Err != nil { 521 692 return templ_7745c5c3_Err 522 693 } 523 523 - var templ_7745c5c3_Var27 templ.SafeURL 524 524 - templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + v.Token + "/badge")) 694 694 + var templ_7745c5c3_Var36 templ.SafeURL 695 695 + templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/admin/events/" + v.Token + "/badge")) 525 696 if templ_7745c5c3_Err != nil { 526 526 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 173, Col: 121} 697 697 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 220, Col: 121} 527 698 } 528 528 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) 699 699 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36)) 529 700 if templ_7745c5c3_Err != nil { 530 701 return templ_7745c5c3_Err 531 702 } 532 532 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "\"><div class=\"admin-form-row\"><label for=\"badge-shape\">shape</label> <select id=\"badge-shape\" name=\"shape\" required>") 703 703 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "\"><input type=\"hidden\" name=\"badge_type\" value=\"") 704 704 + if templ_7745c5c3_Err != nil { 705 705 + return templ_7745c5c3_Err 706 706 + } 707 707 + var templ_7745c5c3_Var37 string 708 708 + templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.SelectedBadgeType) 709 709 + if templ_7745c5c3_Err != nil { 710 710 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 221, Col: 71} 711 711 + } 712 712 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var37) 713 713 + if templ_7745c5c3_Err != nil { 714 714 + return templ_7745c5c3_Err 715 715 + } 716 716 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "\"><div class=\"admin-form-row\"><label for=\"badge-shape\">shape</label> <select id=\"badge-shape\" name=\"shape\" required>") 533 717 if templ_7745c5c3_Err != nil { 534 718 return templ_7745c5c3_Err 535 719 } 536 720 for _, s := range v.Shapes { 537 721 if s == v.Design.Shape { 538 538 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<option value=\"") 722 722 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "<option value=\"") 539 723 if templ_7745c5c3_Err != nil { 540 724 return templ_7745c5c3_Err 541 725 } 542 542 - var templ_7745c5c3_Var28 string 543 543 - templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.ResolveAttributeValue(s) 726 726 + var templ_7745c5c3_Var38 string 727 727 + templ_7745c5c3_Var38, templ_7745c5c3_Err = templ.ResolveAttributeValue(s) 544 728 if templ_7745c5c3_Err != nil { 545 545 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 179, Col: 26} 729 729 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 227, Col: 26} 546 730 } 547 547 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var28) 731 731 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var38) 548 732 if templ_7745c5c3_Err != nil { 549 733 return templ_7745c5c3_Err 550 734 } 551 551 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "\" selected>") 735 735 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "\" selected>") 552 736 if templ_7745c5c3_Err != nil { 553 737 return templ_7745c5c3_Err 554 738 } 555 555 - var templ_7745c5c3_Var29 string 556 556 - templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(s) 739 739 + var templ_7745c5c3_Var39 string 740 740 + templ_7745c5c3_Var39, templ_7745c5c3_Err = templ.JoinStringErrs(s) 557 741 if templ_7745c5c3_Err != nil { 558 558 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 179, Col: 41} 742 742 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 227, Col: 41} 559 743 } 560 560 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) 744 744 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var39)) 561 745 if templ_7745c5c3_Err != nil { 562 746 return templ_7745c5c3_Err 563 747 } 564 564 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "</option>") 748 748 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "</option>") 565 749 if templ_7745c5c3_Err != nil { 566 750 return templ_7745c5c3_Err 567 751 } 568 752 } else { 569 569 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<option value=\"") 753 753 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "<option value=\"") 570 754 if templ_7745c5c3_Err != nil { 571 755 return templ_7745c5c3_Err 572 756 } 573 573 - var templ_7745c5c3_Var30 string 574 574 - templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.ResolveAttributeValue(s) 757 757 + var templ_7745c5c3_Var40 string 758 758 + templ_7745c5c3_Var40, templ_7745c5c3_Err = templ.ResolveAttributeValue(s) 575 759 if templ_7745c5c3_Err != nil { 576 576 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 181, Col: 26} 760 760 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 229, Col: 26} 577 761 } 578 578 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var30) 762 762 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var40) 579 763 if templ_7745c5c3_Err != nil { 580 764 return templ_7745c5c3_Err 581 765 } 582 582 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "\">") 766 766 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "\">") 583 767 if templ_7745c5c3_Err != nil { 584 768 return templ_7745c5c3_Err 585 769 } 586 586 - var templ_7745c5c3_Var31 string 587 587 - templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(s) 770 770 + var templ_7745c5c3_Var41 string 771 771 + templ_7745c5c3_Var41, templ_7745c5c3_Err = templ.JoinStringErrs(s) 588 772 if templ_7745c5c3_Err != nil { 589 589 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 181, Col: 32} 773 773 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 229, Col: 32} 590 774 } 591 591 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31)) 775 775 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var41)) 592 776 if templ_7745c5c3_Err != nil { 593 777 return templ_7745c5c3_Err 594 778 } 595 595 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "</option>") 779 779 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "</option>") 596 780 if templ_7745c5c3_Err != nil { 597 781 return templ_7745c5c3_Err 598 782 } 599 783 } 600 784 } 601 601 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "</select></div>") 785 785 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "</select></div>") 602 786 if templ_7745c5c3_Err != nil { 603 787 return templ_7745c5c3_Err 604 788 } ··· 614 798 if templ_7745c5c3_Err != nil { 615 799 return templ_7745c5c3_Err 616 800 } 617 617 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "<div class=\"admin-form-row\"><label for=\"badge-label\">label</label> <input id=\"badge-label\" name=\"label\" type=\"text\" required maxlength=\"40\" value=\"") 801 801 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 58, "<div class=\"admin-form-row\"><label for=\"badge-label\">label</label> <input id=\"badge-label\" name=\"label\" type=\"text\" required maxlength=\"40\" value=\"") 618 802 if templ_7745c5c3_Err != nil { 619 803 return templ_7745c5c3_Err 620 804 } 621 621 - var templ_7745c5c3_Var32 string 622 622 - templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Design.Label) 805 805 + var templ_7745c5c3_Var42 string 806 806 + templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Design.Label) 623 807 if templ_7745c5c3_Err != nil { 624 624 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 191, Col: 101} 808 808 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 239, Col: 101} 625 809 } 626 626 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var32) 810 810 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var42) 627 811 if templ_7745c5c3_Err != nil { 628 812 return templ_7745c5c3_Err 629 813 } 630 630 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\"></div><div class=\"ctas\"><button type=\"submit\" class=\"btn btn-primary\">▸ save badge</button> <a href=\"") 814 814 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, "\"></div><div class=\"admin-form-row\"><label for=\"badge-message\">award message</label> <input id=\"badge-message\" name=\"message_template\" type=\"text\" maxlength=\"200\" value=\"") 631 815 if templ_7745c5c3_Err != nil { 632 816 return templ_7745c5c3_Err 633 817 } 634 634 - var templ_7745c5c3_Var33 templ.SafeURL 635 635 - templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/e/" + v.Token + "/qr.svg")) 818 818 + var templ_7745c5c3_Var43 string 819 819 + templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.Design.MessageTemplate) 636 820 if templ_7745c5c3_Err != nil { 637 637 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 195, Col: 58} 821 821 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 243, Col: 116} 638 822 } 639 639 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33)) 823 823 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var43) 640 824 if templ_7745c5c3_Err != nil { 641 825 return templ_7745c5c3_Err 642 826 } 643 643 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "\" class=\"btn btn-ghost\">download QR</a> <a href=\"/admin/events\" class=\"btn btn-ghost\">← all events</a></div><p class=\"profile-edit-note\">public scan URL: <a class=\"break\" href=\"") 827 827 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 60, "\" placeholder=\"e.g. Welcome to CascadiaJS! This badge was awarded for checking in.\"> <span class=\"admin-form-hint muted\">shown when someone views their badge</span></div><div class=\"ctas\"><button type=\"submit\" class=\"btn btn-primary\">▸ save badge</button> <a href=\"/admin/events\" class=\"btn btn-ghost\">← all events</a></div><p class=\"profile-edit-note\">public scan URL: <a class=\"break\" href=\"") 644 828 if templ_7745c5c3_Err != nil { 645 829 return templ_7745c5c3_Err 646 830 } 647 647 - var templ_7745c5c3_Var34 templ.SafeURL 648 648 - templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.QRPublicURL)) 831 831 + var templ_7745c5c3_Var44 templ.SafeURL 832 832 + templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(v.QRPublicURL)) 649 833 if templ_7745c5c3_Err != nil { 650 650 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 199, Col: 75} 834 834 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 252, Col: 75} 651 835 } 652 652 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34)) 836 836 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44)) 653 837 if templ_7745c5c3_Err != nil { 654 838 return templ_7745c5c3_Err 655 839 } 656 656 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "\">") 840 840 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 61, "\">") 657 841 if templ_7745c5c3_Err != nil { 658 842 return templ_7745c5c3_Err 659 843 } 660 660 - var templ_7745c5c3_Var35 string 661 661 - templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(v.QRPublicURL) 844 844 + var templ_7745c5c3_Var45 string 845 845 + templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(v.QRPublicURL) 662 846 if templ_7745c5c3_Err != nil { 663 663 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 199, Col: 93} 847 847 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 252, Col: 93} 664 848 } 665 665 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35)) 849 849 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45)) 666 850 if templ_7745c5c3_Err != nil { 667 851 return templ_7745c5c3_Err 668 852 } 669 669 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</a><br>saving signs this design with the server's admin key (ed25519). tampering with the row in the database will fail signature verification on next read.</p></form></div>") 853 853 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 62, "</a><br>saving signs this design with the server's admin key (ed25519). tampering with the row in the database will fail signature verification on next read.</p></form></div><script src=\"/static/js/badge-designer.js\" defer></script>") 670 854 if templ_7745c5c3_Err != nil { 671 855 return templ_7745c5c3_Err 672 856 } 673 857 return nil 674 858 }) 675 675 - templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var23), templ_7745c5c3_Buffer) 859 859 + templ_7745c5c3_Err = adminShell("events", "").Render(templ.WithChildren(ctx, templ_7745c5c3_Var26), templ_7745c5c3_Buffer) 676 860 if templ_7745c5c3_Err != nil { 677 861 return templ_7745c5c3_Err 678 862 } 679 863 return nil 680 864 }) 681 681 - templ_7745c5c3_Err = layouts.Base("admin · badge designer — atmo.quest", "Design an event badge.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var22), templ_7745c5c3_Buffer) 865 865 + templ_7745c5c3_Err = layouts.Base("admin · badge designer", "Design an event badge.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var25), templ_7745c5c3_Buffer) 682 866 if templ_7745c5c3_Err != nil { 683 867 return templ_7745c5c3_Err 684 868 } ··· 703 887 }() 704 888 } 705 889 ctx = templ.InitializeContext(ctx) 706 706 - templ_7745c5c3_Var36 := templ.GetChildren(ctx) 707 707 - if templ_7745c5c3_Var36 == nil { 708 708 - templ_7745c5c3_Var36 = templ.NopComponent 890 890 + templ_7745c5c3_Var46 := templ.GetChildren(ctx) 891 891 + if templ_7745c5c3_Var46 == nil { 892 892 + templ_7745c5c3_Var46 = templ.NopComponent 709 893 } 710 894 ctx = templ.ClearChildren(ctx) 711 711 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<div class=\"admin-form-row\"><label>") 895 895 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, "<div class=\"admin-form-row\"><label>") 712 896 if templ_7745c5c3_Err != nil { 713 897 return templ_7745c5c3_Err 714 898 } 715 715 - var templ_7745c5c3_Var37 string 716 716 - templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(label) 899 899 + var templ_7745c5c3_Var47 string 900 900 + templ_7745c5c3_Var47, templ_7745c5c3_Err = templ.JoinStringErrs(label) 717 901 if templ_7745c5c3_Err != nil { 718 718 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 213, Col: 16} 902 902 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 267, Col: 16} 719 903 } 720 720 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37)) 904 904 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var47)) 721 905 if templ_7745c5c3_Err != nil { 722 906 return templ_7745c5c3_Err 723 907 } 724 724 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "</label><div class=\"badge-swatches\">") 908 908 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 64, "</label><div class=\"badge-swatches\">") 725 909 if templ_7745c5c3_Err != nil { 726 910 return templ_7745c5c3_Err 727 911 } 728 912 for _, c := range options { 729 729 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "<label class=\"badge-swatch\">") 913 913 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, "<label class=\"badge-swatch\">") 730 914 if templ_7745c5c3_Err != nil { 731 915 return templ_7745c5c3_Err 732 916 } 733 917 if c == selected { 734 734 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "<input type=\"radio\" name=\"") 918 918 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, "<input type=\"radio\" name=\"") 735 919 if templ_7745c5c3_Err != nil { 736 920 return templ_7745c5c3_Err 737 921 } 738 738 - var templ_7745c5c3_Var38 string 739 739 - templ_7745c5c3_Var38, templ_7745c5c3_Err = templ.ResolveAttributeValue(name) 922 922 + var templ_7745c5c3_Var48 string 923 923 + templ_7745c5c3_Var48, templ_7745c5c3_Err = templ.ResolveAttributeValue(name) 740 924 if templ_7745c5c3_Err != nil { 741 741 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 218, Col: 37} 925 925 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 272, Col: 37} 742 926 } 743 743 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var38) 927 927 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var48) 744 928 if templ_7745c5c3_Err != nil { 745 929 return templ_7745c5c3_Err 746 930 } 747 747 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "\" value=\"") 931 931 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, "\" value=\"") 748 932 if templ_7745c5c3_Err != nil { 749 933 return templ_7745c5c3_Err 750 934 } 751 751 - var templ_7745c5c3_Var39 string 752 752 - templ_7745c5c3_Var39, templ_7745c5c3_Err = templ.ResolveAttributeValue(c) 935 935 + var templ_7745c5c3_Var49 string 936 936 + templ_7745c5c3_Var49, templ_7745c5c3_Err = templ.ResolveAttributeValue(c) 753 937 if templ_7745c5c3_Err != nil { 754 754 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 218, Col: 49} 938 938 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 272, Col: 49} 755 939 } 756 756 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var39) 940 940 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var49) 757 941 if templ_7745c5c3_Err != nil { 758 942 return templ_7745c5c3_Err 759 943 } 760 760 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "\" checked> ") 944 944 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, "\" checked> ") 761 945 if templ_7745c5c3_Err != nil { 762 946 return templ_7745c5c3_Err 763 947 } 764 948 } else { 765 765 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "<input type=\"radio\" name=\"") 949 949 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "<input type=\"radio\" name=\"") 766 950 if templ_7745c5c3_Err != nil { 767 951 return templ_7745c5c3_Err 768 952 } 769 769 - var templ_7745c5c3_Var40 string 770 770 - templ_7745c5c3_Var40, templ_7745c5c3_Err = templ.ResolveAttributeValue(name) 953 953 + var templ_7745c5c3_Var50 string 954 954 + templ_7745c5c3_Var50, templ_7745c5c3_Err = templ.ResolveAttributeValue(name) 771 955 if templ_7745c5c3_Err != nil { 772 772 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 220, Col: 37} 956 956 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 274, Col: 37} 773 957 } 774 774 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var40) 958 958 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var50) 775 959 if templ_7745c5c3_Err != nil { 776 960 return templ_7745c5c3_Err 777 961 } 778 778 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "\" value=\"") 962 962 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, "\" value=\"") 779 963 if templ_7745c5c3_Err != nil { 780 964 return templ_7745c5c3_Err 781 965 } 782 782 - var templ_7745c5c3_Var41 string 783 783 - templ_7745c5c3_Var41, templ_7745c5c3_Err = templ.ResolveAttributeValue(c) 966 966 + var templ_7745c5c3_Var51 string 967 967 + templ_7745c5c3_Var51, templ_7745c5c3_Err = templ.ResolveAttributeValue(c) 784 968 if templ_7745c5c3_Err != nil { 785 785 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 220, Col: 49} 969 969 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 274, Col: 49} 786 970 } 787 787 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var41) 971 971 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var51) 788 972 if templ_7745c5c3_Err != nil { 789 973 return templ_7745c5c3_Err 790 974 } 791 791 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "\"> ") 975 975 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "\"> ") 792 976 if templ_7745c5c3_Err != nil { 793 977 return templ_7745c5c3_Err 794 978 } 795 979 } 796 796 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "<span class=\"badge-swatch-chip\" style=\"") 980 980 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 72, "<span class=\"badge-swatch-chip\" style=\"") 797 981 if templ_7745c5c3_Err != nil { 798 982 return templ_7745c5c3_Err 799 983 } 800 800 - var templ_7745c5c3_Var42 string 801 801 - templ_7745c5c3_Var42, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues("background:" + c) 984 984 + var templ_7745c5c3_Var52 string 985 985 + templ_7745c5c3_Var52, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues("background:" + c) 802 986 if templ_7745c5c3_Err != nil { 803 803 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 222, Col: 62} 987 987 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 276, Col: 62} 804 988 } 805 805 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) 989 989 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var52)) 806 990 if templ_7745c5c3_Err != nil { 807 991 return templ_7745c5c3_Err 808 992 } 809 809 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "\"></span> <span class=\"badge-swatch-hex\">") 993 993 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 73, "\"></span> <span class=\"badge-swatch-hex\">") 810 994 if templ_7745c5c3_Err != nil { 811 995 return templ_7745c5c3_Err 812 996 } 813 813 - var templ_7745c5c3_Var43 string 814 814 - templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs(c) 997 997 + var templ_7745c5c3_Var53 string 998 998 + templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.JoinStringErrs(c) 815 999 if templ_7745c5c3_Err != nil { 816 816 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 223, Col: 39} 1000 1000 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/admin/pages/events.templ`, Line: 277, Col: 39} 817 1001 } 818 818 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43)) 1002 1002 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var53)) 819 1003 if templ_7745c5c3_Err != nil { 820 1004 return templ_7745c5c3_Err 821 1005 } 822 822 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "</span></label>") 1006 1006 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 74, "</span></label>") 823 1007 if templ_7745c5c3_Err != nil { 824 1008 return templ_7745c5c3_Err 825 1009 } 826 1010 } 827 827 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "</div></div>") 1011 1011 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 75, "</div></div>") 828 1012 if templ_7745c5c3_Err != nil { 829 1013 return templ_7745c5c3_Err 830 1014 }

+1 -1

features/admin/pages/users.templ

Reviewed

··· 25 25 } 26 26 27 27 templ AdminUsers(v AdminUsersView) { 28 28 - @layouts.Base("admin · users — atmo.quest", "Manage atmo.quest users.") { 28 28 + @layouts.Base("admin · users", "Manage atmo.quest users.") { 29 29 @adminShell("users", "") { 30 30 <form class="admin-search" method="get" action="/admin/users"> 31 31 <input

+1 -1

features/admin/pages/users_templ.go

Reviewed

··· 192 192 } 193 193 return nil 194 194 }) 195 195 - templ_7745c5c3_Err = layouts.Base("admin · users — atmo.quest", "Manage atmo.quest users.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 195 195 + templ_7745c5c3_Err = layouts.Base("admin · users", "Manage atmo.quest users.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 196 196 if templ_7745c5c3_Err != nil { 197 197 return templ_7745c5c3_Err 198 198 }

+7

features/admin/routes.go

Reviewed

··· 19 19 // - POST /admin/events — create event + redirect to badge designer 20 20 // - GET /admin/events/{token}/badge — badge designer 21 21 // - POST /admin/events/{token}/badge — save badge design (signed) 22 22 + // - POST /admin/events/{token}/delete — delete event + associated data 22 23 func SetupRoutes(router chi.Router, conn *sql.DB, authH *auth.Handlers, signer *admincrypto.Signer) { 23 24 h := NewHandlers(conn, authH, signer) 24 25 ··· 32 33 r.Post("/events", h.AdminEventCreate) 33 34 r.Get("/events/{token}/badge", h.AdminEventBadge) 34 35 r.Post("/events/{token}/badge", h.AdminEventBadgeSave) 36 36 + r.Get("/badge-preview.svg", h.BadgePreviewSVG) 37 37 + r.Post("/events/{token}/finalize", h.AdminEventFinalize) 38 38 + r.Post("/events/{token}/delete", h.AdminEventDelete) 39 39 + r.Get("/badges", h.AdminBadges) 40 40 + r.Get("/badges/{id}/edit", h.AdminBadgeEditPage) 41 41 + r.Post("/badges/{id}/edit", h.AdminBadgeEditSave) 35 42 }) 36 43 }

+25 -1

features/auth/drain_middleware.go

Reviewed

··· 127 127 } 128 128 } 129 129 130 130 - res, err := connection.Drain(ctx, queue, sess, slog.Default(), onDrain) 130 130 + // Look up the user's PDS for dedup checks. 131 131 + pdsHost := "https://bsky.social" 132 132 + if db != nil { 133 133 + var host string 134 134 + err := db.QueryRowContext(ctx, ` 135 135 + SELECT data ->> 'host_url' FROM oauth_sessions 136 136 + WHERE did = ? ORDER BY updated_at DESC LIMIT 1 137 137 + `, did.String()).Scan(&host) 138 138 + if err == nil && host != "" { 139 139 + pdsHost = host 140 140 + } 141 141 + } 142 142 + 143 143 + res, err := connection.Drain(ctx, queue, sess, pdsHost, slog.Default(), onDrain) 131 144 if err != nil { 132 145 slog.Warn("drain middleware: drain failed", "did", did.String(), "err", err) 133 146 dm.reset(did) // allow retry on next request ··· 138 151 "did", did.String(), 139 152 "written", res.Written, 140 153 "skipped", res.Skipped, 154 154 + ) 155 155 + } 156 156 + 157 157 + // Badge drain: write locally-earned badges to PDS. 158 158 + badgeRes := badge.DrainPending(ctx, sess, db) 159 159 + if badgeRes.Written > 0 { 160 160 + slog.Info("drain middleware: flushed badges", 161 161 + "did", did.String(), 162 162 + "written", badgeRes.Written, 163 163 + "skipped", badgeRes.Skipped, 164 164 + "names", badgeRes.Names, 141 165 ) 142 166 } 143 167 }

+1 -1

features/auth/handlers.go

Reviewed

··· 127 127 if h.ConnQueue != nil { 128 128 sess, err := h.OAuth.ResumeSession(r.Context(), sessData.AccountDID, sessData.SessionID) 129 129 if err == nil { 130 130 - res, err := connection.Drain(r.Context(), h.ConnQueue, sess, slog.Default(), nil) 130 130 + res, err := connection.Drain(r.Context(), h.ConnQueue, sess, sess.Data.HostURL, slog.Default(), nil) 131 131 if err != nil { 132 132 slog.Warn("connect drain", "did", sessData.AccountDID.String(), "err", err) 133 133 } else if res.Written > 0 || res.Skipped > 0 {

+1 -1

features/auth/pages/signin.templ

Reviewed

··· 5 5 // Signin renders the chooser: existing Atmosphere account vs create a new one. 6 6 // The create path is a stub for now — we'll wire it later. 7 7 templ Signin() { 8 8 - @layouts.Base("sign in — atmo.quest", "Sign in with your ATProto account.") { 8 8 + @layouts.Base("sign in", "Sign in with your ATProto account.") { 9 9 <div class="window"> 10 10 <div class="window-bar"> 11 11 <div class="dot dot-r"></div>

+1 -1

features/auth/pages/signin_atproto.templ

Reviewed

··· 5 5 // SigninATProto renders the handle entry form. errorMsg is empty unless we're 6 6 // re-rendering after a validation or OAuth failure. 7 7 templ SigninATProto(errorMsg string) { 8 8 - @layouts.Base("sign in with ATProto — atmo.quest", "Enter your handle, DID, or PDS URL to start the OAuth flow.") { 8 8 + @layouts.Base("sign in with ATProto", "Enter your handle, DID, or PDS URL to start the OAuth flow.") { 9 9 <div class="window"> 10 10 <div class="window-bar"> 11 11 <div class="dot dot-r"></div>

+1 -1

features/auth/pages/signin_atproto_templ.go

Reviewed

··· 100 100 } 101 101 return nil 102 102 }) 103 103 - templ_7745c5c3_Err = layouts.Base("sign in with ATProto — atmo.quest", "Enter your handle, DID, or PDS URL to start the OAuth flow.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 103 103 + templ_7745c5c3_Err = layouts.Base("sign in with ATProto", "Enter your handle, DID, or PDS URL to start the OAuth flow.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 104 104 if templ_7745c5c3_Err != nil { 105 105 return templ_7745c5c3_Err 106 106 }

+1 -1

features/auth/pages/signin_templ.go

Reviewed

··· 64 64 } 65 65 return nil 66 66 }) 67 67 - templ_7745c5c3_Err = layouts.Base("sign in — atmo.quest", "Sign in with your ATProto account.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 67 67 + templ_7745c5c3_Err = layouts.Base("sign in", "Sign in with your ATProto account.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 68 68 if templ_7745c5c3_Err != nil { 69 69 return templ_7745c5c3_Err 70 70 }

+5

features/common/layouts/base.templ

Reviewed

··· 20 20 <link href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@300..700&family=Instrument+Serif:ital@0;1&family=Fira+Code:wght@300..700&family=Inter:wght@100..900&family=Gideon+Roman:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap" rel="stylesheet"/> 21 21 <script src="https://code.iconify.design/iconify-icon/2.1.0/iconify-icon.min.js"></script> 22 22 <link rel="icon" type="image/x-icon" href={ resources.StaticPath("assets/favicon.ico") }/> 23 23 + <link rel="icon" type="image/png" sizes="32x32" href={ resources.StaticPath("assets/favicon-32x32.png") }/> 24 24 + <link rel="icon" type="image/png" sizes="16x16" href={ resources.StaticPath("assets/favicon-16x16.png") }/> 25 25 + <link rel="apple-touch-icon" sizes="180x180" href={ resources.StaticPath("assets/apple-touch-icon.png") }/> 26 26 + <link rel="manifest" href={ resources.StaticPath("assets/site.webmanifest") }/> 23 27 <script defer type="module" src={ resources.StaticPath("datastar/datastar.js") }></script> 24 28 <link href={ resources.StaticPath("css/terminal.css") } rel="stylesheet" type="text/css"/> 25 29 </head> ··· 30 34 <div class="container"> 31 35 { children... } 32 36 </div> 37 37 + <script src={ resources.StaticPath("js/badge-toast.js") } defer></script> 33 38 </body> 34 39 </html> 35 40 }

+77 -12

features/common/layouts/base_templ.go

Reviewed

··· 73 73 if templ_7745c5c3_Err != nil { 74 74 return templ_7745c5c3_Err 75 75 } 76 76 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\"><script defer type=\"module\" src=\"") 76 76 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "\"><link rel=\"icon\" type=\"image/png\" sizes=\"32x32\" href=\"") 77 77 if templ_7745c5c3_Err != nil { 78 78 return templ_7745c5c3_Err 79 79 } 80 80 - var templ_7745c5c3_Var5 string 81 81 - templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue(resources.StaticPath("datastar/datastar.js")) 80 80 + var templ_7745c5c3_Var5 templ.SafeURL 81 81 + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinURLErrs(resources.StaticPath("assets/favicon-32x32.png")) 82 82 if templ_7745c5c3_Err != nil { 83 83 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 23, Col: 81} 83 83 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 23, Col: 106} 84 84 } 85 85 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5) 85 85 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) 86 86 if templ_7745c5c3_Err != nil { 87 87 return templ_7745c5c3_Err 88 88 } 89 89 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\"></script><link href=\"") 89 89 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "\"><link rel=\"icon\" type=\"image/png\" sizes=\"16x16\" href=\"") 90 90 if templ_7745c5c3_Err != nil { 91 91 return templ_7745c5c3_Err 92 92 } 93 93 var templ_7745c5c3_Var6 templ.SafeURL 94 94 - templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinURLErrs(resources.StaticPath("css/terminal.css")) 94 94 + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinURLErrs(resources.StaticPath("assets/favicon-16x16.png")) 95 95 if templ_7745c5c3_Err != nil { 96 96 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 24, Col: 56} 96 96 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 24, Col: 106} 97 97 } 98 98 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) 99 99 if templ_7745c5c3_Err != nil { 100 100 return templ_7745c5c3_Err 101 101 } 102 102 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\" rel=\"stylesheet\" type=\"text/css\"></head><body>") 102 102 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\"><link rel=\"apple-touch-icon\" sizes=\"180x180\" href=\"") 103 103 + if templ_7745c5c3_Err != nil { 104 104 + return templ_7745c5c3_Err 105 105 + } 106 106 + var templ_7745c5c3_Var7 templ.SafeURL 107 107 + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinURLErrs(resources.StaticPath("assets/apple-touch-icon.png")) 108 108 + if templ_7745c5c3_Err != nil { 109 109 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 25, Col: 106} 110 110 + } 111 111 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) 112 112 + if templ_7745c5c3_Err != nil { 113 113 + return templ_7745c5c3_Err 114 114 + } 115 115 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "\"><link rel=\"manifest\" href=\"") 116 116 + if templ_7745c5c3_Err != nil { 117 117 + return templ_7745c5c3_Err 118 118 + } 119 119 + var templ_7745c5c3_Var8 templ.SafeURL 120 120 + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinURLErrs(resources.StaticPath("assets/site.webmanifest")) 121 121 + if templ_7745c5c3_Err != nil { 122 122 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 26, Col: 78} 123 123 + } 124 124 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) 125 125 + if templ_7745c5c3_Err != nil { 126 126 + return templ_7745c5c3_Err 127 127 + } 128 128 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "\"><script defer type=\"module\" src=\"") 129 129 + if templ_7745c5c3_Err != nil { 130 130 + return templ_7745c5c3_Err 131 131 + } 132 132 + var templ_7745c5c3_Var9 string 133 133 + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.ResolveAttributeValue(resources.StaticPath("datastar/datastar.js")) 134 134 + if templ_7745c5c3_Err != nil { 135 135 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 27, Col: 81} 136 136 + } 137 137 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var9) 138 138 + if templ_7745c5c3_Err != nil { 139 139 + return templ_7745c5c3_Err 140 140 + } 141 141 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "\"></script><link href=\"") 142 142 + if templ_7745c5c3_Err != nil { 143 143 + return templ_7745c5c3_Err 144 144 + } 145 145 + var templ_7745c5c3_Var10 templ.SafeURL 146 146 + templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinURLErrs(resources.StaticPath("css/terminal.css")) 147 147 + if templ_7745c5c3_Err != nil { 148 148 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 28, Col: 56} 149 149 + } 150 150 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) 151 151 + if templ_7745c5c3_Err != nil { 152 152 + return templ_7745c5c3_Err 153 153 + } 154 154 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "\" rel=\"stylesheet\" type=\"text/css\"></head><body>") 103 155 if templ_7745c5c3_Err != nil { 104 156 return templ_7745c5c3_Err 105 157 } 106 158 if config.Global.Environment == config.Dev { 107 107 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<div data-init=\"@get('/reload', {retryMaxCount: 1000, retryInterval:20, retryMaxWaitMs:200})\"></div>") 159 159 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<div data-init=\"@get('/reload', {retryMaxCount: 1000, retryInterval:20, retryMaxWaitMs:200})\"></div>") 108 160 if templ_7745c5c3_Err != nil { 109 161 return templ_7745c5c3_Err 110 162 } 111 163 } 112 112 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"container\">") 164 164 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<div class=\"container\">") 113 165 if templ_7745c5c3_Err != nil { 114 166 return templ_7745c5c3_Err 115 167 } ··· 117 169 if templ_7745c5c3_Err != nil { 118 170 return templ_7745c5c3_Err 119 171 } 120 120 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</div></body></html>") 172 172 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div><script src=\"") 173 173 + if templ_7745c5c3_Err != nil { 174 174 + return templ_7745c5c3_Err 175 175 + } 176 176 + var templ_7745c5c3_Var11 string 177 177 + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.ResolveAttributeValue(resources.StaticPath("js/badge-toast.js")) 178 178 + if templ_7745c5c3_Err != nil { 179 179 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/common/layouts/base.templ`, Line: 37, Col: 58} 180 180 + } 181 181 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11) 182 182 + if templ_7745c5c3_Err != nil { 183 183 + return templ_7745c5c3_Err 184 184 + } 185 185 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "\" defer></script></body></html>") 121 186 if templ_7745c5c3_Err != nil { 122 187 return templ_7745c5c3_Err 123 188 }

+25 -2

features/connect/handlers.go

Reviewed

··· 108 108 slog.Debug("connect: duplicate skipped", "viewer", viewerDID.String(), "target", target.String(), "event", eventURI) 109 109 } else if _, _, err := connection.Put(r.Context(), viewerSess, connRec); err != nil { 110 110 slog.Warn("connect: viewer record", "viewer", viewerDID.String(), "target", target.String(), "err", err) 111 111 - // Fall through — still redirect so the user isn't stuck on an error page. 112 112 - // The reciprocal enqueue below will also attempt, and the user can retry. 111 111 + } 112 112 + 113 113 + // "Besties" badge: awarded when connecting with someone at a new event 114 114 + // if you already have a connection with them from a different event. 115 115 + if eventURI != "" { 116 116 + conns, _ := connection.List(r.Context(), viewerPDS, viewerDID) 117 117 + eventCount := 0 118 118 + for _, c := range conns { 119 119 + if c.With == target && c.EventURI != "" { 120 120 + eventCount++ 121 121 + } 122 122 + } 123 123 + if eventCount >= 2 { 124 124 + if _, err := badge.Award(r.Context(), viewerSess, h.DB, badge.AwardBesties, ""); err != nil { 125 125 + slog.Info("connect: besties badge", "err", err) 126 126 + } 127 127 + } 113 128 } 114 129 115 130 // Enqueue the target's reciprocal record for next-login drain. ··· 137 152 if _, err := badge.Award(r.Context(), viewerSess, h.DB, badge.AwardFirstConnect, eventURI); err != nil { 138 153 slog.Info("connect: first-connect badge", "err", err) 139 154 } 155 155 + 156 156 + // Check connection milestone badges (10, 50, 100, ...). 157 157 + badge.AwardConnectionMilestones(r.Context(), viewerSess, h.DB) 140 158 141 159 http.Redirect(w, r, "/connections/"+target.String(), http.StatusSeeOther) 142 160 } ··· 182 200 } 183 201 if target == viewerDID { 184 202 // silently skip self 203 203 + continue 204 204 + } 205 205 + viewerPDS := h.lookupPDSForDID(r, viewerDID) 206 206 + if connection.HasConnection(r.Context(), viewerPDS, viewerDID, target, "") { 207 207 + skipped++ 185 208 continue 186 209 } 187 210 if _, _, err := connection.Put(r.Context(), viewerSess, connection.Record{With: target}); err != nil {

+1 -1

features/connect/pages/connect.templ

Reviewed

··· 30 30 } 31 31 32 32 templ Connect(v ConnectView) { 33 33 - @layouts.Base("connect — atmo.quest", "Connect with another atmo.quest profile.") { 33 33 + @layouts.Base("connect", "Connect with another atmo.quest profile.") { 34 34 <div class="window"> 35 35 <div class="window-bar"> 36 36 <div class="dot dot-r"></div>

+1 -1

features/connect/pages/connect_templ.go

Reviewed

··· 330 330 } 331 331 return nil 332 332 }) 333 333 - templ_7745c5c3_Err = layouts.Base("connect — atmo.quest", "Connect with another atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 333 333 + templ_7745c5c3_Err = layouts.Base("connect", "Connect with another atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 334 334 if templ_7745c5c3_Err != nil { 335 335 return templ_7745c5c3_Err 336 336 }

+1 -1

features/connections/pages/connections.templ

Reviewed

··· 39 39 } 40 40 41 41 templ Connections(v ConnectionsView) { 42 42 - @layouts.Base("connections — atmo.quest", "Your connections across events.") { 42 42 + @layouts.Base("connections", "Your connections across events.") { 43 43 <div class="window"> 44 44 <div class="window-bar"> 45 45 <div class="dot dot-r"></div>

+1 -1

features/connections/pages/connections_templ.go

Reviewed

··· 281 281 } 282 282 return nil 283 283 }) 284 284 - templ_7745c5c3_Err = layouts.Base("connections — atmo.quest", "Your connections across events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 284 284 + templ_7745c5c3_Err = layouts.Base("connections", "Your connections across events.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 285 285 if templ_7745c5c3_Err != nil { 286 286 return templ_7745c5c3_Err 287 287 }

+2 -2

features/connections/pages/profile.templ

Reviewed

··· 178 178 179 179 func profileTitle(v ProfileView) string { 180 180 if v.DisplayName != "" { 181 181 - return v.DisplayName + " — atmo.quest" 181 181 + return v.DisplayName 182 182 } 183 183 - return "profile — atmo.quest" 183 183 + return "profile" 184 184 }

+2 -2

features/connections/pages/profile_templ.go

Reviewed

··· 469 469 470 470 func profileTitle(v ProfileView) string { 471 471 if v.DisplayName != "" { 472 472 - return v.DisplayName + " — atmo.quest" 472 472 + return v.DisplayName 473 473 } 474 474 - return "profile — atmo.quest" 474 474 + return "profile" 475 475 } 476 476 477 477 var _ = templruntime.GeneratedTemplate

+1 -1

features/event/pages/event.templ

Reviewed

··· 24 24 } 25 25 26 26 templ EventScan(v EventScanView) { 27 27 - @layouts.Base("event — atmo.quest", "Check in to an atmo.quest event.") { 27 27 + @layouts.Base("event", "Check in to an atmo.quest event.") { 28 28 <div class="window"> 29 29 <div class="window-bar"> 30 30 <div class="dot dot-r"></div>

+1 -1

features/event/pages/event_templ.go

Reviewed

··· 272 272 } 273 273 return nil 274 274 }) 275 275 - templ_7745c5c3_Err = layouts.Base("event — atmo.quest", "Check in to an atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 275 275 + templ_7745c5c3_Err = layouts.Base("event", "Check in to an atmo.quest event.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 276 276 if templ_7745c5c3_Err != nil { 277 277 return templ_7745c5c3_Err 278 278 }

+99 -19

features/events/handlers.go

Reviewed

··· 5 5 "fmt" 6 6 "log/slog" 7 7 "net/http" 8 8 + "sort" 9 9 + "strconv" 8 10 "time" 9 11 10 12 "github.com/bluesky-social/indigo/atproto/identity" ··· 19 21 "atmoquest/internal/event" 20 22 "atmoquest/internal/interest" 21 23 "atmoquest/internal/profile" 24 24 + "atmoquest/internal/users" 22 25 ) 23 26 24 27 // Handlers holds dependencies for the events feature. ··· 137 140 now := time.Now() 138 141 stats, _ := event.GetStats(r.Context(), h.DB, ev.URI) 139 142 filter := r.URL.Query().Get("filter") 143 143 + page := 1 144 144 + if p := r.URL.Query().Get("page"); p != "" { 145 145 + if n, err := strconv.Atoi(p); err == nil && n > 0 { 146 146 + page = n 147 147 + } 148 148 + } 140 149 141 150 // Get all DIDs who checked into this event. 142 151 attendeeDIDs, err := checkin.ListAttendeesForEvent(r.Context(), h.DB, ev.URI) ··· 152 161 connSet[c.With.String()] = true 153 162 } 154 163 155 155 - // Build attendee list with enrichment. 156 156 - var attendees []pages.Attendee 164 164 + // Build full attendee list (unfiltered) for leaderboard + enrichment. 165 165 + type enrichedAttendee struct { 166 166 + attendee pages.Attendee 167 167 + pds string 168 168 + } 169 169 + var allAttendees []enrichedAttendee 157 170 // Connection counts for leaderboard. 158 171 type connCount struct { 159 172 did string ··· 172 185 173 186 isConnected := connSet[didStr] || didStr == viewerDID.String() 174 187 175 175 - // Filter: "mine" only shows connected attendees. 176 176 - if filter == "mine" && !isConnected { 177 177 - continue 178 178 - } 179 179 - 180 188 a := pages.Attendee{ 181 189 DID: didStr, 182 190 Connected: isConnected, ··· 192 200 a.AvatarURL = profile.AvatarURL(pds, did, bsky.Avatar.CID()) 193 201 } 194 202 } 195 195 - attendees = append(attendees, a) 203 203 + allAttendees = append(allAttendees, enrichedAttendee{attendee: a, pds: pds}) 196 204 197 205 // Count this attendee's connections within the event. 198 198 - theirPDS := pds 199 199 - theirConns, _ := connection.List(r.Context(), theirPDS, did) 206 206 + theirConns, _ := connection.List(r.Context(), pds, did) 200 207 eventConns := 0 201 208 for _, c := range theirConns { 202 209 if c.EventURI == ev.URI { ··· 214 221 } 215 222 } 216 223 224 224 + // Apply filter to attendee grid (leaderboard uses unfiltered data above). 225 225 + var attendees []pages.Attendee 226 226 + for _, ea := range allAttendees { 227 227 + // Respect privacy: hide users who opted out of attendee lists 228 228 + // (but always show the viewer themselves). 229 229 + if ea.attendee.DID != viewerDID.String() && users.IsHiddenFromAttendees(r.Context(), h.DB, ea.attendee.DID) { 230 230 + continue 231 231 + } 232 232 + switch filter { 233 233 + case "mine": 234 234 + if !ea.attendee.Connected { 235 235 + continue 236 236 + } 237 237 + case "unmet": 238 238 + if ea.attendee.Connected { 239 239 + continue 240 240 + } 241 241 + } 242 242 + attendees = append(attendees, ea.attendee) 243 243 + } 244 244 + 245 245 + // Paginate attendees (20 per page). 246 246 + const perPage = 20 247 247 + totalFiltered := len(attendees) 248 248 + totalPages := (totalFiltered + perPage - 1) / perPage 249 249 + if totalPages < 1 { 250 250 + totalPages = 1 251 251 + } 252 252 + if page > totalPages { 253 253 + page = totalPages 254 254 + } 255 255 + start := (page - 1) * perPage 256 256 + end := start + perPage 257 257 + if end > totalFiltered { 258 258 + end = totalFiltered 259 259 + } 260 260 + attendees = attendees[start:end] 261 261 + 217 262 // Build leaderboard (top 10). 218 263 var leaderboard []pages.LeaderboardRow 219 264 type ranked struct { ··· 223 268 // Simple sort: collect, sort by count desc, take top 10. 224 269 var sorted []*connCount 225 270 for _, cc := range connCounts { 271 271 + // Respect privacy: skip users who opted out of leaderboard. 272 272 + if cc.did != viewerDID.String() && users.IsHiddenFromLeaderboard(r.Context(), h.DB, cc.did) { 273 273 + continue 274 274 + } 226 275 sorted = append(sorted, cc) 227 276 } 228 277 // Sort manually without importing sort. ··· 238 287 limit = len(sorted) 239 288 } 240 289 for i, cc := range sorted[:limit] { 290 290 + // Dense ranking: tied connection counts share the same rank. 291 291 + rank := i + 1 292 292 + if i > 0 && cc.count == sorted[i-1].count { 293 293 + rank = leaderboard[i-1].Rank 294 294 + } 241 295 leaderboard = append(leaderboard, pages.LeaderboardRow{ 242 242 - Rank: i + 1, 296 296 + Rank: rank, 243 297 DID: cc.did, 244 298 DisplayName: cc.displayName, 245 299 Handle: cc.handle, 246 300 AvatarURL: cc.avatarURL, 247 301 ConnectionCount: cc.count, 302 302 + Connected: connSet[cc.did] || cc.did == viewerDID.String(), 248 303 }) 249 304 } 250 305 ··· 299 354 viewerDID, connSet, pdsLookup, avatarFn, 300 355 ) 301 356 for _, m := range rawMatches { 357 357 + // Respect privacy: skip users who opted out of attendee lists. 358 358 + if m.DID != viewerDID && users.IsHiddenFromAttendees(r.Context(), h.DB, m.DID.String()) { 359 359 + continue 360 360 + } 302 361 // Look up handle from already-enriched attendees. 303 362 var handle string 304 363 for _, a := range attendees { ··· 318 377 } 319 378 } 320 379 } 380 380 + 381 381 + // Sort interest matches: unconnected first, then connected. 382 382 + sort.SliceStable(interestMatches, func(i, j int) bool { 383 383 + if interestMatches[i].Connected != interestMatches[j].Connected { 384 384 + return !interestMatches[i].Connected // unconnected (false) sorts before connected (true) 385 385 + } 386 386 + return false 387 387 + }) 321 388 322 389 // Compute event status text. 323 390 var status string ··· 360 427 TotalDays: totalDays, 361 428 UniqueConnectors: stats.UniqueConnectors, 362 429 TotalCheckins: stats.TotalCheckins, 430 430 + ActualCheckins: len(attendeeDIDs), 363 431 TotalAttendees: milestoneBase, 364 432 Attendees: attendees, 365 433 Filter: filter, 434 434 + Page: page, 435 435 + TotalPages: totalPages, 366 436 Leaderboard: leaderboard, 367 437 LeaderboardUnlocked: leaderboardUnlocked, 368 438 InterestMatches: interestMatches, ··· 429 499 stats, _ := event.GetStats(r.Context(), h.DB, ev.URI) 430 500 attendeeDIDs, _ := checkin.ListAttendeesForEvent(r.Context(), h.DB, ev.URI) 431 501 totalAttendees := len(attendeeDIDs) 502 502 + milestoneBase := totalAttendees 503 503 + if ev.ExpectedAttendees > 0 { 504 504 + milestoneBase = ev.ExpectedAttendees 505 505 + } 506 506 + 507 507 + // Progress count label: hide "of N" if check-ins exceed expected. 508 508 + countLabel := fmt.Sprintf("%d/%d attendees", totalAttendees, milestoneBase) 509 509 + if totalAttendees > milestoneBase && milestoneBase > 0 { 510 510 + countLabel = fmt.Sprintf("%d attendees", totalAttendees) 511 511 + } 432 512 433 513 statsHTML := fmt.Sprintf( 434 514 `<div id="event-live-stats" class="event-card-stats" style="margin-top:8px">`+ ··· 440 520 ) 441 521 442 522 pct := float64(0) 443 443 - if totalAttendees > 0 { 444 444 - pct = float64(stats.UniqueConnectors) / float64(totalAttendees) * 100.0 523 523 + if milestoneBase > 0 { 524 524 + pct = float64(totalAttendees) / float64(milestoneBase) * 100.0 445 525 if pct > 100 { 446 526 pct = 100 447 527 } 448 528 } 449 449 - m20 := totalAttendees * 20 / 100 450 450 - m40 := totalAttendees * 40 / 100 451 451 - if m20 < 1 && totalAttendees > 0 { 529 529 + m20 := milestoneBase * 20 / 100 530 530 + m40 := milestoneBase * 40 / 100 531 531 + if m20 < 1 && milestoneBase > 0 { 452 532 m20 = 1 453 533 } 454 454 - if m40 < 1 && totalAttendees > 0 { 534 534 + if m40 < 1 && milestoneBase > 0 { 455 535 m40 = 1 456 536 } 457 537 r20 := "" ··· 463 543 r40 = " reached" 464 544 } 465 545 progressHTML := fmt.Sprintf( 466 466 - `<div id="event-live-progress" class="event-progress" aria-label="Progress: %d of %d attendees connecting">`+ 546 546 + `<div id="event-live-progress" class="event-progress" aria-label="Progress: %s">`+ 467 547 `<div class="event-progress-bar">`+ 468 548 `<div class="event-progress-fill" style="width:%.1f%%"></div>`+ 469 549 `<div class="event-progress-tick" style="left:20%%" title="%d — leaderboard">`+ ··· 478 558 `<span class="event-progress-label%s" style="margin-left:12%%">40%% ✨</span>`+ 479 559 `</div>`+ 480 560 `</div>`, 481 481 - stats.UniqueConnectors, totalAttendees, pct, m20, r20, m40, r40, r20, r40, 561 561 + countLabel, pct, m20, r20, m40, r40, r20, r40, 482 562 ) 483 563 484 564 if err := sse.PatchElements(statsHTML); err != nil {

+50 -17

features/events/pages/detail.templ

Reviewed

··· 19 19 TotalDays int // total days the event spans, 0 if not multi-day 20 20 UniqueConnectors int 21 21 TotalCheckins int 22 22 - TotalAttendees int // total checked-in attendees (for milestone %) 22 22 + ActualCheckins int // unique users who checked in (from checkins table) 23 23 + TotalAttendees int // expected attendees (for milestone %) 23 24 Attendees []Attendee 24 24 - Filter string // "all" or "mine" 25 25 + Filter string // "all", "mine", or "unmet" 26 26 + Page int // current page (1-based) 27 27 + TotalPages int // total number of pages 25 28 Leaderboard []LeaderboardRow 26 29 LeaderboardUnlocked bool // true when UniqueConnectors >= 20% of TotalAttendees 27 30 InterestMatches []InterestMatch ··· 46 49 Handle string 47 50 AvatarURL string 48 51 ConnectionCount int 52 52 + Connected bool // whether the viewer has connected with this person 49 53 } 50 54 51 55 // InterestMatch is an attendee matched by shared interests with the viewer. ··· 59 63 } 60 64 61 65 templ EventDetail(v EventDetailView) { 62 62 - @layouts.Base("event — atmo.quest", v.Name + " on atmo.quest") { 66 66 + @layouts.Base("event", v.Name + " on atmo.quest") { 63 67 <div class="window"> 64 68 <div class="window-bar"> 65 69 <div class="dot dot-r"></div> ··· 97 101 </div> 98 102 </div> 99 103 100 100 - @eventDetailProgress(v.UniqueConnectors, v.TotalAttendees) 104 104 + @eventDetailProgress(v.ActualCheckins, v.TotalAttendees) 101 105 102 106 <div class="rewards-section"> 103 107 if v.LeaderboardUnlocked { ··· 172 176 173 177 if v.InterestUnlocked && len(v.InterestMatches) > 0 { 174 178 <div class="summary-section"> 175 175 - <div class="summary-section-label">✨ people who share your interests</div> 179 179 + <div class="summary-section-label">✨ people to meet who share your interests</div> 176 180 <div class="interest-matches-list"> 177 181 for _, m := range v.InterestMatches { 178 182 @interestMatchCard(m) ··· 187 191 <div class="attendees-filter"> 188 192 <a href={ templ.SafeURL("/events/" + v.Token) } class={ "filter-tab", templ.KV("active", v.Filter == "all" || v.Filter == "") }>all</a> 189 193 <a href={ templ.SafeURL("/events/" + v.Token + "?filter=mine") } class={ "filter-tab", templ.KV("active", v.Filter == "mine") }>mine</a> 194 194 + <a href={ templ.SafeURL("/events/" + v.Token + "?filter=unmet") } class={ "filter-tab", templ.KV("active", v.Filter == "unmet") }>unmet</a> 190 195 </div> 191 196 </div> 192 197 if len(v.Attendees) > 0 { ··· 195 200 @attendeeCard(a, v.Token) 196 201 } 197 202 </div> 203 203 + if v.TotalPages > 1 { 204 204 + <div class="pagination"> 205 205 + if v.Page > 1 { 206 206 + <a href={ templ.SafeURL(attendeesPageURL(v.Token, v.Filter, v.Page-1)) } class="btn btn-ghost btn-sm">← prev</a> 207 207 + } 208 208 + <span class="pagination-info muted">page { itoa(v.Page) } of { itoa(v.TotalPages) }</span> 209 209 + if v.Page < v.TotalPages { 210 210 + <a href={ templ.SafeURL(attendeesPageURL(v.Token, v.Filter, v.Page+1)) } class="btn btn-ghost btn-sm">next →</a> 211 211 + } 212 212 + </div> 213 213 + } 198 214 } else { 199 215 <p class="muted" style="text-align:center;padding:16px 0">no attendees to show.</p> 200 216 } ··· 241 257 <div class="leaderboard-row"> 242 258 <span class={ "leaderboard-rank", templ.KV("top-3", row.Rank <= 3) }>{ itoa(row.Rank) }</span> 243 259 if row.AvatarURL != "" { 244 244 - <img class="leaderboard-avatar" src={ row.AvatarURL } alt={ row.DisplayName } loading="lazy"/> 260 260 + <img class={ "leaderboard-avatar", templ.KV("not-connected", !row.Connected) } src={ row.AvatarURL } alt={ row.DisplayName } loading="lazy"/> 245 261 } else { 246 246 - <div class="leaderboard-avatar-empty">?</div> 262 262 + <div class={ "leaderboard-avatar-empty", templ.KV("not-connected", !row.Connected) }>?</div> 247 263 } 248 264 <span class="leaderboard-name"> 249 265 if row.DisplayName != "" { ··· 259 275 } 260 276 261 277 templ interestMatchCard(m InterestMatch) { 262 262 - <div class={ "interest-match-card", templ.KV("connected", m.Connected) }> 278 278 + <div class="interest-match-card"> 263 279 <div class="interest-match-header"> 264 280 if m.AvatarURL != "" { 265 265 - <img class="interest-match-avatar" src={ m.AvatarURL } alt={ m.DisplayName } loading="lazy"/> 281 281 + <img class={ "interest-match-avatar", templ.KV("not-connected", !m.Connected) } src={ m.AvatarURL } alt={ m.DisplayName } loading="lazy"/> 266 282 } else { 267 267 - <div class="interest-match-avatar leaderboard-avatar-empty">?</div> 283 283 + <div class={ "interest-match-avatar leaderboard-avatar-empty", templ.KV("not-connected", !m.Connected) }>?</div> 268 284 } 269 285 <span class="interest-match-name"> 270 286 if m.DisplayName != "" { ··· 287 303 </div> 288 304 } 289 305 290 290 - templ eventDetailProgress(connectors int, totalAttendees int) { 291 291 - <div id="event-live-progress" class="progress-card" aria-label={ "Progress: " + itoa(connectors) + " of " + itoa(totalAttendees) + " attendees connecting" }> 306 306 + templ eventDetailProgress(checkins int, totalAttendees int) { 307 307 + <div id="event-live-progress" class="progress-card" aria-label={ "Progress: " + itoa(checkins) + " attendees checked in" }> 292 308 <div class="progress-header"> 293 309 <div class="progress-label">collective progress</div> 294 294 - <div class="progress-count">{ itoa(connectors) }<span class="of">/{ itoa(totalAttendees) } attendees</span></div> 310 310 + if checkins > totalAttendees && totalAttendees > 0 { 311 311 + <div class="progress-count">{ itoa(checkins) } <span class="of">attendees</span></div> 312 312 + } else { 313 313 + <div class="progress-count">{ itoa(checkins) }<span class="of">/{ itoa(totalAttendees) } attendees</span></div> 314 314 + } 295 315 </div> 296 316 <div class="progress-bar-track"> 297 297 - <div class="progress-bar-fill" style={ "width:" + connectPct(connectors, totalAttendees) + "%" }></div> 317 317 + <div class="progress-bar-fill" style={ "width:" + connectPct(checkins, totalAttendees) + "%" }></div> 298 318 </div> 299 319 <div class="progress-ticks"> 300 320 <div class={ "progress-tick", templ.KV("unlocked", true) }>0</div> 301 301 - <div class={ "progress-tick", templ.KV("unlocked", connectors >= milestone20(totalAttendees)), templ.KV("next", connectors < milestone20(totalAttendees)) }> 321 321 + <div class={ "progress-tick", templ.KV("unlocked", checkins >= milestone20(totalAttendees)), templ.KV("next", checkins < milestone20(totalAttendees)) }> 302 322 { itoa(milestone20(totalAttendees)) }<br/><span style="font-size:8px;opacity:0.7">leaderboard</span> 303 323 </div> 304 304 - <div class={ "progress-tick", templ.KV("unlocked", connectors >= milestone40(totalAttendees)), templ.KV("next", connectors >= milestone20(totalAttendees) && connectors < milestone40(totalAttendees)) }> 324 324 + <div class={ "progress-tick", templ.KV("unlocked", checkins >= milestone40(totalAttendees)), templ.KV("next", checkins >= milestone20(totalAttendees) && checkins < milestone40(totalAttendees)) }> 305 325 { itoa(milestone40(totalAttendees)) }<br/><span style="font-size:8px;opacity:0.7">matching</span> 306 326 </div> 307 307 - <div class={ "progress-tick", templ.KV("unlocked", connectors >= milestone80(totalAttendees)), templ.KV("next", connectors >= milestone40(totalAttendees) && connectors < milestone80(totalAttendees)) }> 327 327 + <div class={ "progress-tick", templ.KV("unlocked", checkins >= milestone80(totalAttendees)), templ.KV("next", checkins >= milestone40(totalAttendees) && checkins < milestone80(totalAttendees)) }> 308 328 { itoa(milestone80(totalAttendees)) }<br/><span style="font-size:8px;opacity:0.7">stats</span> 309 329 </div> 310 330 <div class="progress-tick">{ itoa(totalAttendees) }</div> ··· 321 341 322 342 func itoa(n int) string { 323 343 return fmt.Sprintf("%d", n) 344 344 + } 345 345 + 346 346 + func attendeesPageURL(token, filter string, page int) string { 347 347 + url := "/events/" + token 348 348 + sep := "?" 349 349 + if filter != "" && filter != "all" { 350 350 + url += sep + "filter=" + filter 351 351 + sep = "&" 352 352 + } 353 353 + if page > 1 { 354 354 + url += sep + "page=" + fmt.Sprintf("%d", page) 355 355 + } 356 356 + return url 324 357 } 325 358 326 359 // connectPct returns the fill percentage: connectors / totalAttendees * 100.

+480 -268

features/events/pages/detail_templ.go

Reviewed

··· 27 27 TotalDays int // total days the event spans, 0 if not multi-day 28 28 UniqueConnectors int 29 29 TotalCheckins int 30 30 - TotalAttendees int // total checked-in attendees (for milestone %) 30 30 + ActualCheckins int // unique users who checked in (from checkins table) 31 31 + TotalAttendees int // expected attendees (for milestone %) 31 32 Attendees []Attendee 32 32 - Filter string // "all" or "mine" 33 33 + Filter string // "all", "mine", or "unmet" 34 34 + Page int // current page (1-based) 35 35 + TotalPages int // total number of pages 33 36 Leaderboard []LeaderboardRow 34 37 LeaderboardUnlocked bool // true when UniqueConnectors >= 20% of TotalAttendees 35 38 InterestMatches []InterestMatch ··· 54 57 Handle string 55 58 AvatarURL string 56 59 ConnectionCount int 60 60 + Connected bool // whether the viewer has connected with this person 57 61 } 58 62 59 63 // InterestMatch is an attendee matched by shared interests with the viewer. ··· 114 118 var templ_7745c5c3_Var3 string 115 119 templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("@") 116 120 if templ_7745c5c3_Err != nil { 117 117 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 73, Col: 56} 121 121 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 77, Col: 56} 118 122 } 119 123 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) 120 124 if templ_7745c5c3_Err != nil { ··· 127 131 var templ_7745c5c3_Var4 string 128 132 templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.Name) 129 133 if templ_7745c5c3_Err != nil { 130 130 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 74, Col: 46} 134 134 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 78, Col: 46} 131 135 } 132 136 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) 133 137 if templ_7745c5c3_Err != nil { ··· 140 144 var templ_7745c5c3_Var5 string 141 145 templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue(sseAttr(v.Token)) 142 146 if templ_7745c5c3_Err != nil { 143 143 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 77, Col: 61} 147 147 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 81, Col: 61} 144 148 } 145 149 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5) 146 150 if templ_7745c5c3_Err != nil { ··· 158 162 var templ_7745c5c3_Var6 string 159 163 templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.Status) 160 164 if templ_7745c5c3_Err != nil { 161 161 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 81, Col: 37} 165 165 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 85, Col: 37} 162 166 } 163 167 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) 164 168 if templ_7745c5c3_Err != nil { ··· 176 180 var templ_7745c5c3_Var7 string 177 181 templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.Status) 178 182 if templ_7745c5c3_Err != nil { 179 179 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 83, Col: 48} 183 183 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 87, Col: 48} 180 184 } 181 185 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) 182 186 if templ_7745c5c3_Err != nil { ··· 194 198 var templ_7745c5c3_Var8 string 195 199 templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.Status) 196 200 if templ_7745c5c3_Err != nil { 197 197 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 85, Col: 48} 201 201 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 89, Col: 48} 198 202 } 199 203 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) 200 204 if templ_7745c5c3_Err != nil { ··· 213 217 var templ_7745c5c3_Var9 string 214 218 templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.DayNumber)) 215 219 if templ_7745c5c3_Err != nil { 216 216 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 88, Col: 34} 220 220 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 92, Col: 34} 217 221 } 218 222 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) 219 223 if templ_7745c5c3_Err != nil { ··· 226 230 var templ_7745c5c3_Var10 string 227 231 templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.TotalDays)) 228 232 if templ_7745c5c3_Err != nil { 229 229 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 88, Col: 59} 233 233 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 92, Col: 59} 230 234 } 231 235 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) 232 236 if templ_7745c5c3_Err != nil { ··· 240 244 var templ_7745c5c3_Var11 string 241 245 templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.Name) 242 246 if templ_7745c5c3_Err != nil { 243 243 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 91, Col: 46} 247 247 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 95, Col: 46} 244 248 } 245 249 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) 246 250 if templ_7745c5c3_Err != nil { ··· 254 258 var templ_7745c5c3_Var12 string 255 259 templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(v.Location) 256 260 if templ_7745c5c3_Err != nil { 257 257 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 94, Col: 20} 261 261 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 98, Col: 20} 258 262 } 259 263 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) 260 264 if templ_7745c5c3_Err != nil { ··· 268 272 var templ_7745c5c3_Var13 string 269 273 templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(v.StartTime) 270 274 if templ_7745c5c3_Err != nil { 271 271 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 96, Col: 20} 275 275 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 100, Col: 20} 272 276 } 273 277 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) 274 278 if templ_7745c5c3_Err != nil { ··· 281 285 var templ_7745c5c3_Var14 string 282 286 templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(v.EndTime) 283 287 if templ_7745c5c3_Err != nil { 284 284 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 96, Col: 38} 288 288 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 100, Col: 38} 285 289 } 286 290 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 287 291 if templ_7745c5c3_Err != nil { ··· 291 295 if templ_7745c5c3_Err != nil { 292 296 return templ_7745c5c3_Err 293 297 } 294 294 - templ_7745c5c3_Err = eventDetailProgress(v.UniqueConnectors, v.TotalAttendees).Render(ctx, templ_7745c5c3_Buffer) 298 298 + templ_7745c5c3_Err = eventDetailProgress(v.ActualCheckins, v.TotalAttendees).Render(ctx, templ_7745c5c3_Buffer) 295 299 if templ_7745c5c3_Err != nil { 296 300 return templ_7745c5c3_Err 297 301 } ··· 312 316 var templ_7745c5c3_Var15 string 313 317 templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(remaining(milestone20(v.TotalAttendees), v.UniqueConnectors)) 314 318 if templ_7745c5c3_Err != nil { 315 315 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 117, Col: 96} 319 319 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 121, Col: 96} 316 320 } 317 321 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) 318 322 if templ_7745c5c3_Err != nil { ··· 336 340 var templ_7745c5c3_Var16 string 337 341 templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(remaining(milestone40(v.TotalAttendees), v.UniqueConnectors)) 338 342 if templ_7745c5c3_Err != nil { 339 339 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 136, Col: 96} 343 343 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 140, Col: 96} 340 344 } 341 345 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) 342 346 if templ_7745c5c3_Err != nil { ··· 360 364 var templ_7745c5c3_Var17 string 361 365 templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(remaining(milestone80(v.TotalAttendees), v.UniqueConnectors)) 362 366 if templ_7745c5c3_Err != nil { 363 363 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 155, Col: 96} 367 367 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 159, Col: 96} 364 368 } 365 369 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) 366 370 if templ_7745c5c3_Err != nil { ··· 392 396 } 393 397 } 394 398 if v.InterestUnlocked && len(v.InterestMatches) > 0 { 395 395 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<div class=\"summary-section\"><div class=\"summary-section-label\">✨ people who share your interests</div><div class=\"interest-matches-list\">") 399 399 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<div class=\"summary-section\"><div class=\"summary-section-label\">✨ people to meet who share your interests</div><div class=\"interest-matches-list\">") 396 400 if templ_7745c5c3_Err != nil { 397 401 return templ_7745c5c3_Err 398 402 } ··· 423 427 var templ_7745c5c3_Var19 templ.SafeURL 424 428 templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/events/" + v.Token)) 425 429 if templ_7745c5c3_Err != nil { 426 426 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 188, Col: 53} 430 430 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 192, Col: 53} 427 431 } 428 432 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) 429 433 if templ_7745c5c3_Err != nil { ··· 458 462 var templ_7745c5c3_Var22 templ.SafeURL 459 463 templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/events/" + v.Token + "?filter=mine")) 460 464 if templ_7745c5c3_Err != nil { 461 461 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 189, Col: 70} 465 465 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 193, Col: 70} 462 466 } 463 467 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22)) 464 468 if templ_7745c5c3_Err != nil { ··· 477 481 if templ_7745c5c3_Err != nil { 478 482 return templ_7745c5c3_Err 479 483 } 480 480 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\">mine</a></div></div>") 484 484 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\">mine</a> ") 485 485 + if templ_7745c5c3_Err != nil { 486 486 + return templ_7745c5c3_Err 487 487 + } 488 488 + var templ_7745c5c3_Var24 = []any{"filter-tab", templ.KV("active", v.Filter == "unmet")} 489 489 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var24...) 490 490 + if templ_7745c5c3_Err != nil { 491 491 + return templ_7745c5c3_Err 492 492 + } 493 493 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "<a href=\"") 494 494 + if templ_7745c5c3_Err != nil { 495 495 + return templ_7745c5c3_Err 496 496 + } 497 497 + var templ_7745c5c3_Var25 templ.SafeURL 498 498 + templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/events/" + v.Token + "?filter=unmet")) 499 499 + if templ_7745c5c3_Err != nil { 500 500 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 194, Col: 71} 501 501 + } 502 502 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25)) 503 503 + if templ_7745c5c3_Err != nil { 504 504 + return templ_7745c5c3_Err 505 505 + } 506 506 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "\" class=\"") 507 507 + if templ_7745c5c3_Err != nil { 508 508 + return templ_7745c5c3_Err 509 509 + } 510 510 + var templ_7745c5c3_Var26 string 511 511 + templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var24).String()) 512 512 + if templ_7745c5c3_Err != nil { 513 513 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 514 514 + } 515 515 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var26) 516 516 + if templ_7745c5c3_Err != nil { 517 517 + return templ_7745c5c3_Err 518 518 + } 519 519 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "\">unmet</a></div></div>") 481 520 if templ_7745c5c3_Err != nil { 482 521 return templ_7745c5c3_Err 483 522 } 484 523 if len(v.Attendees) > 0 { 485 485 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "<div class=\"attendees-grid\">") 524 524 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<div class=\"attendees-grid\">") 486 525 if templ_7745c5c3_Err != nil { 487 526 return templ_7745c5c3_Err 488 527 } ··· 492 531 return templ_7745c5c3_Err 493 532 } 494 533 } 495 495 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "</div>") 534 534 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "</div>") 496 535 if templ_7745c5c3_Err != nil { 497 536 return templ_7745c5c3_Err 498 537 } 538 538 + if v.TotalPages > 1 { 539 539 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "<div class=\"pagination\">") 540 540 + if templ_7745c5c3_Err != nil { 541 541 + return templ_7745c5c3_Err 542 542 + } 543 543 + if v.Page > 1 { 544 544 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "<a href=\"") 545 545 + if templ_7745c5c3_Err != nil { 546 546 + return templ_7745c5c3_Err 547 547 + } 548 548 + var templ_7745c5c3_Var27 templ.SafeURL 549 549 + templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(attendeesPageURL(v.Token, v.Filter, v.Page-1))) 550 550 + if templ_7745c5c3_Err != nil { 551 551 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 206, Col: 80} 552 552 + } 553 553 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) 554 554 + if templ_7745c5c3_Err != nil { 555 555 + return templ_7745c5c3_Err 556 556 + } 557 557 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "\" class=\"btn btn-ghost btn-sm\">← prev</a> ") 558 558 + if templ_7745c5c3_Err != nil { 559 559 + return templ_7745c5c3_Err 560 560 + } 561 561 + } 562 562 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "<span class=\"pagination-info muted\">page ") 563 563 + if templ_7745c5c3_Err != nil { 564 564 + return templ_7745c5c3_Err 565 565 + } 566 566 + var templ_7745c5c3_Var28 string 567 567 + templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.Page)) 568 568 + if templ_7745c5c3_Err != nil { 569 569 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 208, Col: 64} 570 570 + } 571 571 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) 572 572 + if templ_7745c5c3_Err != nil { 573 573 + return templ_7745c5c3_Err 574 574 + } 575 575 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, " of ") 576 576 + if templ_7745c5c3_Err != nil { 577 577 + return templ_7745c5c3_Err 578 578 + } 579 579 + var templ_7745c5c3_Var29 string 580 580 + templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(v.TotalPages)) 581 581 + if templ_7745c5c3_Err != nil { 582 582 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 208, Col: 90} 583 583 + } 584 584 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) 585 585 + if templ_7745c5c3_Err != nil { 586 586 + return templ_7745c5c3_Err 587 587 + } 588 588 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "</span> ") 589 589 + if templ_7745c5c3_Err != nil { 590 590 + return templ_7745c5c3_Err 591 591 + } 592 592 + if v.Page < v.TotalPages { 593 593 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "<a href=\"") 594 594 + if templ_7745c5c3_Err != nil { 595 595 + return templ_7745c5c3_Err 596 596 + } 597 597 + var templ_7745c5c3_Var30 templ.SafeURL 598 598 + templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL(attendeesPageURL(v.Token, v.Filter, v.Page+1))) 599 599 + if templ_7745c5c3_Err != nil { 600 600 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 210, Col: 80} 601 601 + } 602 602 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30)) 603 603 + if templ_7745c5c3_Err != nil { 604 604 + return templ_7745c5c3_Err 605 605 + } 606 606 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "\" class=\"btn btn-ghost btn-sm\">next →</a>") 607 607 + if templ_7745c5c3_Err != nil { 608 608 + return templ_7745c5c3_Err 609 609 + } 610 610 + } 611 611 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "</div>") 612 612 + if templ_7745c5c3_Err != nil { 613 613 + return templ_7745c5c3_Err 614 614 + } 615 615 + } 499 616 } else { 500 500 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "<p class=\"muted\" style=\"text-align:center;padding:16px 0\">no attendees to show.</p>") 617 617 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "<p class=\"muted\" style=\"text-align:center;padding:16px 0\">no attendees to show.</p>") 501 618 if templ_7745c5c3_Err != nil { 502 619 return templ_7745c5c3_Err 503 620 } 504 621 } 505 505 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "</div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 622 622 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "</div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 506 623 if templ_7745c5c3_Err != nil { 507 624 return templ_7745c5c3_Err 508 625 } ··· 512 629 } 513 630 return nil 514 631 }) 515 515 - templ_7745c5c3_Err = layouts.Base("event — atmo.quest", v.Name+" on atmo.quest").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 632 632 + templ_7745c5c3_Err = layouts.Base("event", v.Name+" on atmo.quest").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 516 633 if templ_7745c5c3_Err != nil { 517 634 return templ_7745c5c3_Err 518 635 } ··· 536 653 }() 537 654 } 538 655 ctx = templ.InitializeContext(ctx) 539 539 - templ_7745c5c3_Var24 := templ.GetChildren(ctx) 540 540 - if templ_7745c5c3_Var24 == nil { 541 541 - templ_7745c5c3_Var24 = templ.NopComponent 656 656 + templ_7745c5c3_Var31 := templ.GetChildren(ctx) 657 657 + if templ_7745c5c3_Var31 == nil { 658 658 + templ_7745c5c3_Var31 = templ.NopComponent 542 659 } 543 660 ctx = templ.ClearChildren(ctx) 544 544 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "<a href=\"") 661 661 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "<a href=\"") 545 662 if templ_7745c5c3_Err != nil { 546 663 return templ_7745c5c3_Err 547 664 } 548 548 - var templ_7745c5c3_Var25 templ.SafeURL 549 549 - templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/connections/" + a.DID)) 665 665 + var templ_7745c5c3_Var32 templ.SafeURL 666 666 + templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/connections/" + a.DID)) 550 667 if templ_7745c5c3_Err != nil { 551 551 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 217, Col: 49} 668 668 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 233, Col: 49} 552 669 } 553 553 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25)) 670 670 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32)) 554 671 if templ_7745c5c3_Err != nil { 555 672 return templ_7745c5c3_Err 556 673 } 557 557 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "\" class=\"attendee-card\" title=\"") 674 674 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 58, "\" class=\"attendee-card\" title=\"") 558 675 if templ_7745c5c3_Err != nil { 559 676 return templ_7745c5c3_Err 560 677 } 561 561 - var templ_7745c5c3_Var26 string 562 562 - templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.ResolveAttributeValue(a.DisplayName) 678 678 + var templ_7745c5c3_Var33 string 679 679 + templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.ResolveAttributeValue(a.DisplayName) 563 680 if templ_7745c5c3_Err != nil { 564 564 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 217, Col: 95} 681 681 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 233, Col: 95} 565 682 } 566 566 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var26) 683 683 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var33) 567 684 if templ_7745c5c3_Err != nil { 568 685 return templ_7745c5c3_Err 569 686 } 570 570 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "\">") 687 687 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, "\">") 571 688 if templ_7745c5c3_Err != nil { 572 689 return templ_7745c5c3_Err 573 690 } 574 691 if a.AvatarURL != "" { 575 575 - var templ_7745c5c3_Var27 = []any{"attendee-avatar", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} 576 576 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var27...) 692 692 + var templ_7745c5c3_Var34 = []any{"attendee-avatar", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} 693 693 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var34...) 577 694 if templ_7745c5c3_Err != nil { 578 695 return templ_7745c5c3_Err 579 696 } 580 580 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "<img class=\"") 697 697 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 60, "<img class=\"") 581 698 if templ_7745c5c3_Err != nil { 582 699 return templ_7745c5c3_Err 583 700 } 584 584 - var templ_7745c5c3_Var28 string 585 585 - templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var27).String()) 701 701 + var templ_7745c5c3_Var35 string 702 702 + templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var34).String()) 586 703 if templ_7745c5c3_Err != nil { 587 704 return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 588 705 } 589 589 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var28) 706 706 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var35) 590 707 if templ_7745c5c3_Err != nil { 591 708 return templ_7745c5c3_Err 592 709 } 593 593 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "\" src=\"") 710 710 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 61, "\" src=\"") 594 711 if templ_7745c5c3_Err != nil { 595 712 return templ_7745c5c3_Err 596 713 } 597 597 - var templ_7745c5c3_Var29 string 598 598 - templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.ResolveAttributeValue(a.AvatarURL) 714 714 + var templ_7745c5c3_Var36 string 715 715 + templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.ResolveAttributeValue(a.AvatarURL) 599 716 if templ_7745c5c3_Err != nil { 600 600 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 221, Col: 21} 717 717 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 237, Col: 21} 601 718 } 602 602 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var29) 719 719 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var36) 603 720 if templ_7745c5c3_Err != nil { 604 721 return templ_7745c5c3_Err 605 722 } 606 606 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "\" alt=\"") 723 723 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 62, "\" alt=\"") 607 724 if templ_7745c5c3_Err != nil { 608 725 return templ_7745c5c3_Err 609 726 } 610 610 - var templ_7745c5c3_Var30 string 611 611 - templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.ResolveAttributeValue(a.DisplayName) 727 727 + var templ_7745c5c3_Var37 string 728 728 + templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.ResolveAttributeValue(a.DisplayName) 612 729 if templ_7745c5c3_Err != nil { 613 613 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 222, Col: 23} 730 730 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 238, Col: 23} 614 731 } 615 615 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var30) 732 732 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var37) 616 733 if templ_7745c5c3_Err != nil { 617 734 return templ_7745c5c3_Err 618 735 } 619 619 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "\" loading=\"lazy\"> ") 736 736 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, "\" loading=\"lazy\"> ") 620 737 if templ_7745c5c3_Err != nil { 621 738 return templ_7745c5c3_Err 622 739 } 623 740 } else { 624 624 - var templ_7745c5c3_Var31 = []any{"attendee-avatar leaderboard-avatar-empty", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} 625 625 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var31...) 741 741 + var templ_7745c5c3_Var38 = []any{"attendee-avatar leaderboard-avatar-empty", templ.KV("connected", a.Connected), templ.KV("not-connected", !a.Connected)} 742 742 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var38...) 626 743 if templ_7745c5c3_Err != nil { 627 744 return templ_7745c5c3_Err 628 745 } 629 629 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "<div class=\"") 746 746 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 64, "<div class=\"") 630 747 if templ_7745c5c3_Err != nil { 631 748 return templ_7745c5c3_Err 632 749 } 633 633 - var templ_7745c5c3_Var32 string 634 634 - templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var31).String()) 750 750 + var templ_7745c5c3_Var39 string 751 751 + templ_7745c5c3_Var39, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var38).String()) 635 752 if templ_7745c5c3_Err != nil { 636 753 return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 637 754 } 638 638 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var32) 755 755 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var39) 639 756 if templ_7745c5c3_Err != nil { 640 757 return templ_7745c5c3_Err 641 758 } 642 642 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "\">?</div>") 759 759 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, "\">?</div>") 643 760 if templ_7745c5c3_Err != nil { 644 761 return templ_7745c5c3_Err 645 762 } 646 763 } 647 647 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "<span class=\"attendee-name\">") 764 764 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, "<span class=\"attendee-name\">") 648 765 if templ_7745c5c3_Err != nil { 649 766 return templ_7745c5c3_Err 650 767 } 651 768 if a.DisplayName != "" { 652 652 - var templ_7745c5c3_Var33 string 653 653 - templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(a.DisplayName) 769 769 + var templ_7745c5c3_Var40 string 770 770 + templ_7745c5c3_Var40, templ_7745c5c3_Err = templ.JoinStringErrs(a.DisplayName) 654 771 if templ_7745c5c3_Err != nil { 655 655 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 230, Col: 19} 772 772 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 246, Col: 19} 656 773 } 657 657 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33)) 774 774 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var40)) 658 775 if templ_7745c5c3_Err != nil { 659 776 return templ_7745c5c3_Err 660 777 } 661 778 } else if a.Handle != "" { 662 662 - var templ_7745c5c3_Var34 string 663 663 - templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs("@" + a.Handle) 779 779 + var templ_7745c5c3_Var41 string 780 780 + templ_7745c5c3_Var41, templ_7745c5c3_Err = templ.JoinStringErrs("@" + a.Handle) 664 781 if templ_7745c5c3_Err != nil { 665 665 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 232, Col: 20} 782 782 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 248, Col: 20} 666 783 } 667 667 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34)) 784 784 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var41)) 668 785 if templ_7745c5c3_Err != nil { 669 786 return templ_7745c5c3_Err 670 787 } 671 788 } else { 672 672 - var templ_7745c5c3_Var35 string 673 673 - templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(a.DID)) 789 789 + var templ_7745c5c3_Var42 string 790 790 + templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(a.DID)) 674 791 if templ_7745c5c3_Err != nil { 675 675 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 234, Col: 21} 792 792 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 250, Col: 21} 676 793 } 677 677 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35)) 794 794 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) 678 795 if templ_7745c5c3_Err != nil { 679 796 return templ_7745c5c3_Err 680 797 } 681 798 } 682 682 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 55, "</span></a>") 799 799 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, "</span></a>") 683 800 if templ_7745c5c3_Err != nil { 684 801 return templ_7745c5c3_Err 685 802 } ··· 703 820 }() 704 821 } 705 822 ctx = templ.InitializeContext(ctx) 706 706 - templ_7745c5c3_Var36 := templ.GetChildren(ctx) 707 707 - if templ_7745c5c3_Var36 == nil { 708 708 - templ_7745c5c3_Var36 = templ.NopComponent 823 823 + templ_7745c5c3_Var43 := templ.GetChildren(ctx) 824 824 + if templ_7745c5c3_Var43 == nil { 825 825 + templ_7745c5c3_Var43 = templ.NopComponent 709 826 } 710 827 ctx = templ.ClearChildren(ctx) 711 711 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 56, "<div class=\"leaderboard-row\">") 828 828 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, "<div class=\"leaderboard-row\">") 712 829 if templ_7745c5c3_Err != nil { 713 830 return templ_7745c5c3_Err 714 831 } 715 715 - var templ_7745c5c3_Var37 = []any{"leaderboard-rank", templ.KV("top-3", row.Rank <= 3)} 716 716 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var37...) 832 832 + var templ_7745c5c3_Var44 = []any{"leaderboard-rank", templ.KV("top-3", row.Rank <= 3)} 833 833 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var44...) 717 834 if templ_7745c5c3_Err != nil { 718 835 return templ_7745c5c3_Err 719 836 } 720 720 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 57, "<span class=\"") 837 837 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "<span class=\"") 721 838 if templ_7745c5c3_Err != nil { 722 839 return templ_7745c5c3_Err 723 840 } 724 724 - var templ_7745c5c3_Var38 string 725 725 - templ_7745c5c3_Var38, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var37).String()) 841 841 + var templ_7745c5c3_Var45 string 842 842 + templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var44).String()) 726 843 if templ_7745c5c3_Err != nil { 727 844 return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 728 845 } 729 729 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var38) 846 846 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var45) 730 847 if templ_7745c5c3_Err != nil { 731 848 return templ_7745c5c3_Err 732 849 } 733 733 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 58, "\">") 850 850 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, "\">") 734 851 if templ_7745c5c3_Err != nil { 735 852 return templ_7745c5c3_Err 736 853 } 737 737 - var templ_7745c5c3_Var39 string 738 738 - templ_7745c5c3_Var39, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.Rank)) 854 854 + var templ_7745c5c3_Var46 string 855 855 + templ_7745c5c3_Var46, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.Rank)) 739 856 if templ_7745c5c3_Err != nil { 740 740 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 242, Col: 87} 857 857 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 258, Col: 87} 741 858 } 742 742 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var39)) 859 859 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46)) 743 860 if templ_7745c5c3_Err != nil { 744 861 return templ_7745c5c3_Err 745 862 } 746 746 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 59, "</span> ") 863 863 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "</span> ") 747 864 if templ_7745c5c3_Err != nil { 748 865 return templ_7745c5c3_Err 749 866 } 750 867 if row.AvatarURL != "" { 751 751 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 60, "<img class=\"leaderboard-avatar\" src=\"") 868 868 + var templ_7745c5c3_Var47 = []any{"leaderboard-avatar", templ.KV("not-connected", !row.Connected)} 869 869 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var47...) 870 870 + if templ_7745c5c3_Err != nil { 871 871 + return templ_7745c5c3_Err 872 872 + } 873 873 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 72, "<img class=\"") 874 874 + if templ_7745c5c3_Err != nil { 875 875 + return templ_7745c5c3_Err 876 876 + } 877 877 + var templ_7745c5c3_Var48 string 878 878 + templ_7745c5c3_Var48, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var47).String()) 879 879 + if templ_7745c5c3_Err != nil { 880 880 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 881 881 + } 882 882 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var48) 883 883 + if templ_7745c5c3_Err != nil { 884 884 + return templ_7745c5c3_Err 885 885 + } 886 886 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 73, "\" src=\"") 752 887 if templ_7745c5c3_Err != nil { 753 888 return templ_7745c5c3_Err 754 889 } 755 755 - var templ_7745c5c3_Var40 string 756 756 - templ_7745c5c3_Var40, templ_7745c5c3_Err = templ.ResolveAttributeValue(row.AvatarURL) 890 890 + var templ_7745c5c3_Var49 string 891 891 + templ_7745c5c3_Var49, templ_7745c5c3_Err = templ.ResolveAttributeValue(row.AvatarURL) 757 892 if templ_7745c5c3_Err != nil { 758 758 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 244, Col: 54} 893 893 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 260, Col: 101} 759 894 } 760 760 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var40) 895 895 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var49) 761 896 if templ_7745c5c3_Err != nil { 762 897 return templ_7745c5c3_Err 763 898 } 764 764 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 61, "\" alt=\"") 899 899 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 74, "\" alt=\"") 765 900 if templ_7745c5c3_Err != nil { 766 901 return templ_7745c5c3_Err 767 902 } 768 768 - var templ_7745c5c3_Var41 string 769 769 - templ_7745c5c3_Var41, templ_7745c5c3_Err = templ.ResolveAttributeValue(row.DisplayName) 903 903 + var templ_7745c5c3_Var50 string 904 904 + templ_7745c5c3_Var50, templ_7745c5c3_Err = templ.ResolveAttributeValue(row.DisplayName) 770 905 if templ_7745c5c3_Err != nil { 771 771 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 244, Col: 78} 906 906 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 260, Col: 125} 772 907 } 773 773 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var41) 908 908 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var50) 774 909 if templ_7745c5c3_Err != nil { 775 910 return templ_7745c5c3_Err 776 911 } 777 777 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 62, "\" loading=\"lazy\"> ") 912 912 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 75, "\" loading=\"lazy\"> ") 778 913 if templ_7745c5c3_Err != nil { 779 914 return templ_7745c5c3_Err 780 915 } 781 916 } else { 782 782 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 63, "<div class=\"leaderboard-avatar-empty\">?</div>") 917 917 + var templ_7745c5c3_Var51 = []any{"leaderboard-avatar-empty", templ.KV("not-connected", !row.Connected)} 918 918 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var51...) 919 919 + if templ_7745c5c3_Err != nil { 920 920 + return templ_7745c5c3_Err 921 921 + } 922 922 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 76, "<div class=\"") 923 923 + if templ_7745c5c3_Err != nil { 924 924 + return templ_7745c5c3_Err 925 925 + } 926 926 + var templ_7745c5c3_Var52 string 927 927 + templ_7745c5c3_Var52, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var51).String()) 928 928 + if templ_7745c5c3_Err != nil { 929 929 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 930 930 + } 931 931 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var52) 932 932 + if templ_7745c5c3_Err != nil { 933 933 + return templ_7745c5c3_Err 934 934 + } 935 935 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 77, "\">?</div>") 783 936 if templ_7745c5c3_Err != nil { 784 937 return templ_7745c5c3_Err 785 938 } 786 939 } 787 787 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 64, "<span class=\"leaderboard-name\">") 940 940 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 78, "<span class=\"leaderboard-name\">") 788 941 if templ_7745c5c3_Err != nil { 789 942 return templ_7745c5c3_Err 790 943 } 791 944 if row.DisplayName != "" { 792 792 - var templ_7745c5c3_Var42 string 793 793 - templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(row.DisplayName) 945 945 + var templ_7745c5c3_Var53 string 946 946 + templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.JoinStringErrs(row.DisplayName) 794 947 if templ_7745c5c3_Err != nil { 795 795 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 250, Col: 21} 948 948 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 266, Col: 21} 796 949 } 797 797 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42)) 950 950 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var53)) 798 951 if templ_7745c5c3_Err != nil { 799 952 return templ_7745c5c3_Err 800 953 } 801 954 } else if row.Handle != "" { 802 802 - var templ_7745c5c3_Var43 string 803 803 - templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs("@" + row.Handle) 955 955 + var templ_7745c5c3_Var54 string 956 956 + templ_7745c5c3_Var54, templ_7745c5c3_Err = templ.JoinStringErrs("@" + row.Handle) 804 957 if templ_7745c5c3_Err != nil { 805 805 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 252, Col: 22} 958 958 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 268, Col: 22} 806 959 } 807 807 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43)) 960 960 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var54)) 808 961 if templ_7745c5c3_Err != nil { 809 962 return templ_7745c5c3_Err 810 963 } 811 964 } else { 812 812 - var templ_7745c5c3_Var44 string 813 813 - templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(row.DID)) 965 965 + var templ_7745c5c3_Var55 string 966 966 + templ_7745c5c3_Var55, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(row.DID)) 814 967 if templ_7745c5c3_Err != nil { 815 815 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 254, Col: 23} 968 968 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 270, Col: 23} 816 969 } 817 817 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44)) 970 970 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var55)) 818 971 if templ_7745c5c3_Err != nil { 819 972 return templ_7745c5c3_Err 820 973 } 821 974 } 822 822 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 65, "</span> <span class=\"leaderboard-count\">") 975 975 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 79, "</span> <span class=\"leaderboard-count\">") 823 976 if templ_7745c5c3_Err != nil { 824 977 return templ_7745c5c3_Err 825 978 } 826 826 - var templ_7745c5c3_Var45 string 827 827 - templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.ConnectionCount)) 979 979 + var templ_7745c5c3_Var56 string 980 980 + templ_7745c5c3_Var56, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(row.ConnectionCount)) 828 981 if templ_7745c5c3_Err != nil { 829 829 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 257, Col: 61} 982 982 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 273, Col: 61} 830 983 } 831 831 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45)) 984 984 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var56)) 832 985 if templ_7745c5c3_Err != nil { 833 986 return templ_7745c5c3_Err 834 987 } 835 835 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 66, " connections</span></div>") 988 988 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 80, " connections</span></div>") 836 989 if templ_7745c5c3_Err != nil { 837 990 return templ_7745c5c3_Err 838 991 } ··· 856 1009 }() 857 1010 } 858 1011 ctx = templ.InitializeContext(ctx) 859 859 - templ_7745c5c3_Var46 := templ.GetChildren(ctx) 860 860 - if templ_7745c5c3_Var46 == nil { 861 861 - templ_7745c5c3_Var46 = templ.NopComponent 1012 1012 + templ_7745c5c3_Var57 := templ.GetChildren(ctx) 1013 1013 + if templ_7745c5c3_Var57 == nil { 1014 1014 + templ_7745c5c3_Var57 = templ.NopComponent 862 1015 } 863 1016 ctx = templ.ClearChildren(ctx) 864 864 - var templ_7745c5c3_Var47 = []any{"interest-match-card", templ.KV("connected", m.Connected)} 865 865 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var47...) 866 866 - if templ_7745c5c3_Err != nil { 867 867 - return templ_7745c5c3_Err 868 868 - } 869 869 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 67, "<div class=\"") 870 870 - if templ_7745c5c3_Err != nil { 871 871 - return templ_7745c5c3_Err 872 872 - } 873 873 - var templ_7745c5c3_Var48 string 874 874 - templ_7745c5c3_Var48, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var47).String()) 875 875 - if templ_7745c5c3_Err != nil { 876 876 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 877 877 - } 878 878 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var48) 879 879 - if templ_7745c5c3_Err != nil { 880 880 - return templ_7745c5c3_Err 881 881 - } 882 882 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 68, "\"><div class=\"interest-match-header\">") 1017 1017 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 81, "<div class=\"interest-match-card\"><div class=\"interest-match-header\">") 883 1018 if templ_7745c5c3_Err != nil { 884 1019 return templ_7745c5c3_Err 885 1020 } 886 1021 if m.AvatarURL != "" { 887 887 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 69, "<img class=\"interest-match-avatar\" src=\"") 1022 1022 + var templ_7745c5c3_Var58 = []any{"interest-match-avatar", templ.KV("not-connected", !m.Connected)} 1023 1023 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var58...) 1024 1024 + if templ_7745c5c3_Err != nil { 1025 1025 + return templ_7745c5c3_Err 1026 1026 + } 1027 1027 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 82, "<img class=\"") 1028 1028 + if templ_7745c5c3_Err != nil { 1029 1029 + return templ_7745c5c3_Err 1030 1030 + } 1031 1031 + var templ_7745c5c3_Var59 string 1032 1032 + templ_7745c5c3_Var59, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var58).String()) 1033 1033 + if templ_7745c5c3_Err != nil { 1034 1034 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 1035 1035 + } 1036 1036 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var59) 888 1037 if templ_7745c5c3_Err != nil { 889 1038 return templ_7745c5c3_Err 890 1039 } 891 891 - var templ_7745c5c3_Var49 string 892 892 - templ_7745c5c3_Var49, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.AvatarURL) 1040 1040 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 83, "\" src=\"") 893 1041 if templ_7745c5c3_Err != nil { 894 894 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 265, Col: 56} 1042 1042 + return templ_7745c5c3_Err 1043 1043 + } 1044 1044 + var templ_7745c5c3_Var60 string 1045 1045 + templ_7745c5c3_Var60, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.AvatarURL) 1046 1046 + if templ_7745c5c3_Err != nil { 1047 1047 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 281, Col: 101} 895 1048 } 896 896 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var49) 1049 1049 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var60) 897 1050 if templ_7745c5c3_Err != nil { 898 1051 return templ_7745c5c3_Err 899 1052 } 900 900 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 70, "\" alt=\"") 1053 1053 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 84, "\" alt=\"") 901 1054 if templ_7745c5c3_Err != nil { 902 1055 return templ_7745c5c3_Err 903 1056 } 904 904 - var templ_7745c5c3_Var50 string 905 905 - templ_7745c5c3_Var50, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.DisplayName) 1057 1057 + var templ_7745c5c3_Var61 string 1058 1058 + templ_7745c5c3_Var61, templ_7745c5c3_Err = templ.ResolveAttributeValue(m.DisplayName) 906 1059 if templ_7745c5c3_Err != nil { 907 907 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 265, Col: 78} 1060 1060 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 281, Col: 123} 908 1061 } 909 909 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var50) 1062 1062 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var61) 910 1063 if templ_7745c5c3_Err != nil { 911 1064 return templ_7745c5c3_Err 912 1065 } 913 913 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 71, "\" loading=\"lazy\"> ") 1066 1066 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 85, "\" loading=\"lazy\"> ") 914 1067 if templ_7745c5c3_Err != nil { 915 1068 return templ_7745c5c3_Err 916 1069 } 917 1070 } else { 918 918 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 72, "<div class=\"interest-match-avatar leaderboard-avatar-empty\">?</div>") 1071 1071 + var templ_7745c5c3_Var62 = []any{"interest-match-avatar leaderboard-avatar-empty", templ.KV("not-connected", !m.Connected)} 1072 1072 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var62...) 1073 1073 + if templ_7745c5c3_Err != nil { 1074 1074 + return templ_7745c5c3_Err 1075 1075 + } 1076 1076 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 86, "<div class=\"") 1077 1077 + if templ_7745c5c3_Err != nil { 1078 1078 + return templ_7745c5c3_Err 1079 1079 + } 1080 1080 + var templ_7745c5c3_Var63 string 1081 1081 + templ_7745c5c3_Var63, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var62).String()) 1082 1082 + if templ_7745c5c3_Err != nil { 1083 1083 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 1084 1084 + } 1085 1085 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var63) 1086 1086 + if templ_7745c5c3_Err != nil { 1087 1087 + return templ_7745c5c3_Err 1088 1088 + } 1089 1089 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 87, "\">?</div>") 919 1090 if templ_7745c5c3_Err != nil { 920 1091 return templ_7745c5c3_Err 921 1092 } 922 1093 } 923 923 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 73, "<span class=\"interest-match-name\">") 1094 1094 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 88, "<span class=\"interest-match-name\">") 924 1095 if templ_7745c5c3_Err != nil { 925 1096 return templ_7745c5c3_Err 926 1097 } 927 1098 if m.DisplayName != "" { 928 928 - var templ_7745c5c3_Var51 string 929 929 - templ_7745c5c3_Var51, templ_7745c5c3_Err = templ.JoinStringErrs(m.DisplayName) 1099 1099 + var templ_7745c5c3_Var64 string 1100 1100 + templ_7745c5c3_Var64, templ_7745c5c3_Err = templ.JoinStringErrs(m.DisplayName) 930 1101 if templ_7745c5c3_Err != nil { 931 931 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 271, Col: 20} 1102 1102 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 287, Col: 20} 932 1103 } 933 933 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var51)) 1104 1104 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var64)) 934 1105 if templ_7745c5c3_Err != nil { 935 1106 return templ_7745c5c3_Err 936 1107 } 937 1108 } else if m.Handle != "" { 938 938 - var templ_7745c5c3_Var52 string 939 939 - templ_7745c5c3_Var52, templ_7745c5c3_Err = templ.JoinStringErrs("@" + m.Handle) 1109 1109 + var templ_7745c5c3_Var65 string 1110 1110 + templ_7745c5c3_Var65, templ_7745c5c3_Err = templ.JoinStringErrs("@" + m.Handle) 940 1111 if templ_7745c5c3_Err != nil { 941 941 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 273, Col: 21} 1112 1112 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 289, Col: 21} 942 1113 } 943 943 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var52)) 1114 1114 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var65)) 944 1115 if templ_7745c5c3_Err != nil { 945 1116 return templ_7745c5c3_Err 946 1117 } 947 1118 } else { 948 948 - var templ_7745c5c3_Var53 string 949 949 - templ_7745c5c3_Var53, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(m.DID)) 1119 1119 + var templ_7745c5c3_Var66 string 1120 1120 + templ_7745c5c3_Var66, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(m.DID)) 950 1121 if templ_7745c5c3_Err != nil { 951 951 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 275, Col: 22} 1122 1122 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 291, Col: 22} 952 1123 } 953 953 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var53)) 1124 1124 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var66)) 954 1125 if templ_7745c5c3_Err != nil { 955 1126 return templ_7745c5c3_Err 956 1127 } 957 1128 } 958 958 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 74, "</span> ") 1129 1129 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 89, "</span> ") 959 1130 if templ_7745c5c3_Err != nil { 960 1131 return templ_7745c5c3_Err 961 1132 } 962 1133 if m.Connected { 963 963 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 75, "<span class=\"interest-match-badge\">✓ connected</span>") 1134 1134 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 90, "<span class=\"interest-match-badge\">✓ connected</span>") 964 1135 if templ_7745c5c3_Err != nil { 965 1136 return templ_7745c5c3_Err 966 1137 } 967 1138 } 968 968 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 76, "</div><div class=\"interest-match-pills\">") 1139 1139 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 91, "</div><div class=\"interest-match-pills\">") 969 1140 if templ_7745c5c3_Err != nil { 970 1141 return templ_7745c5c3_Err 971 1142 } 972 1143 for _, interest := range m.SharedInterests { 973 973 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 77, "<span class=\"pill pill-interest pill-sm\">") 1144 1144 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 92, "<span class=\"pill pill-interest pill-sm\">") 974 1145 if templ_7745c5c3_Err != nil { 975 1146 return templ_7745c5c3_Err 976 1147 } 977 977 - var templ_7745c5c3_Var54 string 978 978 - templ_7745c5c3_Var54, templ_7745c5c3_Err = templ.JoinStringErrs(interest) 1148 1148 + var templ_7745c5c3_Var67 string 1149 1149 + templ_7745c5c3_Var67, templ_7745c5c3_Err = templ.JoinStringErrs(interest) 979 1150 if templ_7745c5c3_Err != nil { 980 980 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 284, Col: 55} 1151 1151 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 300, Col: 55} 981 1152 } 982 982 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var54)) 1153 1153 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var67)) 983 1154 if templ_7745c5c3_Err != nil { 984 1155 return templ_7745c5c3_Err 985 1156 } 986 986 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 78, "</span>") 1157 1157 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 93, "</span>") 987 1158 if templ_7745c5c3_Err != nil { 988 1159 return templ_7745c5c3_Err 989 1160 } 990 1161 } 991 991 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 79, "</div></div>") 1162 1162 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 94, "</div></div>") 992 1163 if templ_7745c5c3_Err != nil { 993 1164 return templ_7745c5c3_Err 994 1165 } ··· 996 1167 }) 997 1168 } 998 1169 999 999 - func eventDetailProgress(connectors int, totalAttendees int) templ.Component { 1170 1170 + func eventDetailProgress(checkins int, totalAttendees int) templ.Component { 1000 1171 return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 1001 1172 templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 1002 1173 if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { ··· 1012 1183 }() 1013 1184 } 1014 1185 ctx = templ.InitializeContext(ctx) 1015 1015 - templ_7745c5c3_Var55 := templ.GetChildren(ctx) 1016 1016 - if templ_7745c5c3_Var55 == nil { 1017 1017 - templ_7745c5c3_Var55 = templ.NopComponent 1186 1186 + templ_7745c5c3_Var68 := templ.GetChildren(ctx) 1187 1187 + if templ_7745c5c3_Var68 == nil { 1188 1188 + templ_7745c5c3_Var68 = templ.NopComponent 1018 1189 } 1019 1190 ctx = templ.ClearChildren(ctx) 1020 1020 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 80, "<div id=\"event-live-progress\" class=\"progress-card\" aria-label=\"") 1191 1191 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 95, "<div id=\"event-live-progress\" class=\"progress-card\" aria-label=\"") 1021 1192 if templ_7745c5c3_Err != nil { 1022 1193 return templ_7745c5c3_Err 1023 1194 } 1024 1024 - var templ_7745c5c3_Var56 string 1025 1025 - templ_7745c5c3_Var56, templ_7745c5c3_Err = templ.ResolveAttributeValue("Progress: " + itoa(connectors) + " of " + itoa(totalAttendees) + " attendees connecting") 1026 1026 - if templ_7745c5c3_Err != nil { 1027 1027 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 291, Col: 155} 1028 1028 - } 1029 1029 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var56) 1030 1030 - if templ_7745c5c3_Err != nil { 1031 1031 - return templ_7745c5c3_Err 1032 1032 - } 1033 1033 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 81, "\"><div class=\"progress-header\"><div class=\"progress-label\">collective progress</div><div class=\"progress-count\">") 1034 1034 - if templ_7745c5c3_Err != nil { 1035 1035 - return templ_7745c5c3_Err 1036 1036 - } 1037 1037 - var templ_7745c5c3_Var57 string 1038 1038 - templ_7745c5c3_Var57, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(connectors)) 1195 1195 + var templ_7745c5c3_Var69 string 1196 1196 + templ_7745c5c3_Var69, templ_7745c5c3_Err = templ.ResolveAttributeValue("Progress: " + itoa(checkins) + " attendees checked in") 1039 1197 if templ_7745c5c3_Err != nil { 1040 1040 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 294, Col: 49} 1198 1198 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 307, Col: 121} 1041 1199 } 1042 1042 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var57)) 1200 1200 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var69) 1043 1201 if templ_7745c5c3_Err != nil { 1044 1202 return templ_7745c5c3_Err 1045 1203 } 1046 1046 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 82, "<span class=\"of\">/") 1204 1204 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 96, "\"><div class=\"progress-header\"><div class=\"progress-label\">collective progress</div>") 1047 1205 if templ_7745c5c3_Err != nil { 1048 1206 return templ_7745c5c3_Err 1049 1207 } 1050 1050 - var templ_7745c5c3_Var58 string 1051 1051 - templ_7745c5c3_Var58, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) 1052 1052 - if templ_7745c5c3_Err != nil { 1053 1053 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 294, Col: 91} 1054 1054 - } 1055 1055 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var58)) 1056 1056 - if templ_7745c5c3_Err != nil { 1057 1057 - return templ_7745c5c3_Err 1208 1208 + if checkins > totalAttendees && totalAttendees > 0 { 1209 1209 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 97, "<div class=\"progress-count\">") 1210 1210 + if templ_7745c5c3_Err != nil { 1211 1211 + return templ_7745c5c3_Err 1212 1212 + } 1213 1213 + var templ_7745c5c3_Var70 string 1214 1214 + templ_7745c5c3_Var70, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(checkins)) 1215 1215 + if templ_7745c5c3_Err != nil { 1216 1216 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 311, Col: 48} 1217 1217 + } 1218 1218 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var70)) 1219 1219 + if templ_7745c5c3_Err != nil { 1220 1220 + return templ_7745c5c3_Err 1221 1221 + } 1222 1222 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 98, " <span class=\"of\">attendees</span></div>") 1223 1223 + if templ_7745c5c3_Err != nil { 1224 1224 + return templ_7745c5c3_Err 1225 1225 + } 1226 1226 + } else { 1227 1227 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 99, "<div class=\"progress-count\">") 1228 1228 + if templ_7745c5c3_Err != nil { 1229 1229 + return templ_7745c5c3_Err 1230 1230 + } 1231 1231 + var templ_7745c5c3_Var71 string 1232 1232 + templ_7745c5c3_Var71, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(checkins)) 1233 1233 + if templ_7745c5c3_Err != nil { 1234 1234 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 313, Col: 48} 1235 1235 + } 1236 1236 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var71)) 1237 1237 + if templ_7745c5c3_Err != nil { 1238 1238 + return templ_7745c5c3_Err 1239 1239 + } 1240 1240 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 100, "<span class=\"of\">/") 1241 1241 + if templ_7745c5c3_Err != nil { 1242 1242 + return templ_7745c5c3_Err 1243 1243 + } 1244 1244 + var templ_7745c5c3_Var72 string 1245 1245 + templ_7745c5c3_Var72, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) 1246 1246 + if templ_7745c5c3_Err != nil { 1247 1247 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 313, Col: 90} 1248 1248 + } 1249 1249 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var72)) 1250 1250 + if templ_7745c5c3_Err != nil { 1251 1251 + return templ_7745c5c3_Err 1252 1252 + } 1253 1253 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 101, " attendees</span></div>") 1254 1254 + if templ_7745c5c3_Err != nil { 1255 1255 + return templ_7745c5c3_Err 1256 1256 + } 1058 1257 } 1059 1059 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 83, " attendees</span></div></div><div class=\"progress-bar-track\"><div class=\"progress-bar-fill\" style=\"") 1258 1258 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 102, "</div><div class=\"progress-bar-track\"><div class=\"progress-bar-fill\" style=\"") 1060 1259 if templ_7745c5c3_Err != nil { 1061 1260 return templ_7745c5c3_Err 1062 1261 } 1063 1063 - var templ_7745c5c3_Var59 string 1064 1064 - templ_7745c5c3_Var59, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues("width:" + connectPct(connectors, totalAttendees) + "%") 1262 1262 + var templ_7745c5c3_Var73 string 1263 1263 + templ_7745c5c3_Var73, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues("width:" + connectPct(checkins, totalAttendees) + "%") 1065 1264 if templ_7745c5c3_Err != nil { 1066 1066 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 297, Col: 97} 1265 1265 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 317, Col: 95} 1067 1266 } 1068 1068 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var59)) 1267 1267 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var73)) 1069 1268 if templ_7745c5c3_Err != nil { 1070 1269 return templ_7745c5c3_Err 1071 1270 } 1072 1072 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 84, "\"></div></div><div class=\"progress-ticks\">") 1271 1271 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 103, "\"></div></div><div class=\"progress-ticks\">") 1073 1272 if templ_7745c5c3_Err != nil { 1074 1273 return templ_7745c5c3_Err 1075 1274 } 1076 1076 - var templ_7745c5c3_Var60 = []any{"progress-tick", templ.KV("unlocked", true)} 1077 1077 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var60...) 1275 1275 + var templ_7745c5c3_Var74 = []any{"progress-tick", templ.KV("unlocked", true)} 1276 1276 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var74...) 1078 1277 if templ_7745c5c3_Err != nil { 1079 1278 return templ_7745c5c3_Err 1080 1279 } 1081 1081 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 85, "<div class=\"") 1280 1280 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 104, "<div class=\"") 1082 1281 if templ_7745c5c3_Err != nil { 1083 1282 return templ_7745c5c3_Err 1084 1283 } 1085 1085 - var templ_7745c5c3_Var61 string 1086 1086 - templ_7745c5c3_Var61, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var60).String()) 1284 1284 + var templ_7745c5c3_Var75 string 1285 1285 + templ_7745c5c3_Var75, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var74).String()) 1087 1286 if templ_7745c5c3_Err != nil { 1088 1287 return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 1089 1288 } 1090 1090 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var61) 1289 1289 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var75) 1091 1290 if templ_7745c5c3_Err != nil { 1092 1291 return templ_7745c5c3_Err 1093 1292 } 1094 1094 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 86, "\">0</div>") 1293 1293 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 105, "\">0</div>") 1095 1294 if templ_7745c5c3_Err != nil { 1096 1295 return templ_7745c5c3_Err 1097 1296 } 1098 1098 - var templ_7745c5c3_Var62 = []any{"progress-tick", templ.KV("unlocked", connectors >= milestone20(totalAttendees)), templ.KV("next", connectors < milestone20(totalAttendees))} 1099 1099 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var62...) 1297 1297 + var templ_7745c5c3_Var76 = []any{"progress-tick", templ.KV("unlocked", checkins >= milestone20(totalAttendees)), templ.KV("next", checkins < milestone20(totalAttendees))} 1298 1298 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var76...) 1100 1299 if templ_7745c5c3_Err != nil { 1101 1300 return templ_7745c5c3_Err 1102 1301 } 1103 1103 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 87, "<div class=\"") 1302 1302 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 106, "<div class=\"") 1104 1303 if templ_7745c5c3_Err != nil { 1105 1304 return templ_7745c5c3_Err 1106 1305 } 1107 1107 - var templ_7745c5c3_Var63 string 1108 1108 - templ_7745c5c3_Var63, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var62).String()) 1306 1306 + var templ_7745c5c3_Var77 string 1307 1307 + templ_7745c5c3_Var77, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var76).String()) 1109 1308 if templ_7745c5c3_Err != nil { 1110 1309 return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 1111 1310 } 1112 1112 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var63) 1311 1311 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var77) 1113 1312 if templ_7745c5c3_Err != nil { 1114 1313 return templ_7745c5c3_Err 1115 1314 } 1116 1116 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 88, "\">") 1315 1315 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 107, "\">") 1117 1316 if templ_7745c5c3_Err != nil { 1118 1317 return templ_7745c5c3_Err 1119 1318 } 1120 1120 - var templ_7745c5c3_Var64 string 1121 1121 - templ_7745c5c3_Var64, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone20(totalAttendees))) 1319 1319 + var templ_7745c5c3_Var78 string 1320 1320 + templ_7745c5c3_Var78, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone20(totalAttendees))) 1122 1321 if templ_7745c5c3_Err != nil { 1123 1123 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 302, Col: 39} 1322 1322 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 322, Col: 39} 1124 1323 } 1125 1125 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var64)) 1324 1324 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var78)) 1126 1325 if templ_7745c5c3_Err != nil { 1127 1326 return templ_7745c5c3_Err 1128 1327 } 1129 1129 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 89, "<br><span style=\"font-size:8px;opacity:0.7\">leaderboard</span></div>") 1328 1328 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 108, "<br><span style=\"font-size:8px;opacity:0.7\">leaderboard</span></div>") 1130 1329 if templ_7745c5c3_Err != nil { 1131 1330 return templ_7745c5c3_Err 1132 1331 } 1133 1133 - var templ_7745c5c3_Var65 = []any{"progress-tick", templ.KV("unlocked", connectors >= milestone40(totalAttendees)), templ.KV("next", connectors >= milestone20(totalAttendees) && connectors < milestone40(totalAttendees))} 1134 1134 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var65...) 1332 1332 + var templ_7745c5c3_Var79 = []any{"progress-tick", templ.KV("unlocked", checkins >= milestone40(totalAttendees)), templ.KV("next", checkins >= milestone20(totalAttendees) && checkins < milestone40(totalAttendees))} 1333 1333 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var79...) 1135 1334 if templ_7745c5c3_Err != nil { 1136 1335 return templ_7745c5c3_Err 1137 1336 } 1138 1138 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 90, "<div class=\"") 1337 1337 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 109, "<div class=\"") 1139 1338 if templ_7745c5c3_Err != nil { 1140 1339 return templ_7745c5c3_Err 1141 1340 } 1142 1142 - var templ_7745c5c3_Var66 string 1143 1143 - templ_7745c5c3_Var66, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var65).String()) 1341 1341 + var templ_7745c5c3_Var80 string 1342 1342 + templ_7745c5c3_Var80, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var79).String()) 1144 1343 if templ_7745c5c3_Err != nil { 1145 1344 return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 1146 1345 } 1147 1147 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var66) 1346 1346 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var80) 1148 1347 if templ_7745c5c3_Err != nil { 1149 1348 return templ_7745c5c3_Err 1150 1349 } 1151 1151 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 91, "\">") 1350 1350 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 110, "\">") 1152 1351 if templ_7745c5c3_Err != nil { 1153 1352 return templ_7745c5c3_Err 1154 1353 } 1155 1155 - var templ_7745c5c3_Var67 string 1156 1156 - templ_7745c5c3_Var67, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone40(totalAttendees))) 1354 1354 + var templ_7745c5c3_Var81 string 1355 1355 + templ_7745c5c3_Var81, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone40(totalAttendees))) 1157 1356 if templ_7745c5c3_Err != nil { 1158 1158 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 305, Col: 39} 1357 1357 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 325, Col: 39} 1159 1358 } 1160 1160 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var67)) 1359 1359 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var81)) 1161 1360 if templ_7745c5c3_Err != nil { 1162 1361 return templ_7745c5c3_Err 1163 1362 } 1164 1164 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 92, "<br><span style=\"font-size:8px;opacity:0.7\">matching</span></div>") 1363 1363 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 111, "<br><span style=\"font-size:8px;opacity:0.7\">matching</span></div>") 1165 1364 if templ_7745c5c3_Err != nil { 1166 1365 return templ_7745c5c3_Err 1167 1366 } 1168 1168 - var templ_7745c5c3_Var68 = []any{"progress-tick", templ.KV("unlocked", connectors >= milestone80(totalAttendees)), templ.KV("next", connectors >= milestone40(totalAttendees) && connectors < milestone80(totalAttendees))} 1169 1169 - templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var68...) 1367 1367 + var templ_7745c5c3_Var82 = []any{"progress-tick", templ.KV("unlocked", checkins >= milestone80(totalAttendees)), templ.KV("next", checkins >= milestone40(totalAttendees) && checkins < milestone80(totalAttendees))} 1368 1368 + templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var82...) 1170 1369 if templ_7745c5c3_Err != nil { 1171 1370 return templ_7745c5c3_Err 1172 1371 } 1173 1173 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 93, "<div class=\"") 1372 1372 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 112, "<div class=\"") 1174 1373 if templ_7745c5c3_Err != nil { 1175 1374 return templ_7745c5c3_Err 1176 1375 } 1177 1177 - var templ_7745c5c3_Var69 string 1178 1178 - templ_7745c5c3_Var69, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var68).String()) 1376 1376 + var templ_7745c5c3_Var83 string 1377 1377 + templ_7745c5c3_Var83, templ_7745c5c3_Err = templ.ResolveAttributeValue(templ.CSSClasses(templ_7745c5c3_Var82).String()) 1179 1378 if templ_7745c5c3_Err != nil { 1180 1379 return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 1, Col: 0} 1181 1380 } 1182 1182 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var69) 1381 1381 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var83) 1183 1382 if templ_7745c5c3_Err != nil { 1184 1383 return templ_7745c5c3_Err 1185 1384 } 1186 1186 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 94, "\">") 1385 1385 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 113, "\">") 1187 1386 if templ_7745c5c3_Err != nil { 1188 1387 return templ_7745c5c3_Err 1189 1388 } 1190 1190 - var templ_7745c5c3_Var70 string 1191 1191 - templ_7745c5c3_Var70, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone80(totalAttendees))) 1389 1389 + var templ_7745c5c3_Var84 string 1390 1390 + templ_7745c5c3_Var84, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(milestone80(totalAttendees))) 1192 1391 if templ_7745c5c3_Err != nil { 1193 1193 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 308, Col: 39} 1392 1392 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 328, Col: 39} 1194 1393 } 1195 1195 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var70)) 1394 1394 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var84)) 1196 1395 if templ_7745c5c3_Err != nil { 1197 1396 return templ_7745c5c3_Err 1198 1397 } 1199 1199 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 95, "<br><span style=\"font-size:8px;opacity:0.7\">stats</span></div><div class=\"progress-tick\">") 1398 1398 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 114, "<br><span style=\"font-size:8px;opacity:0.7\">stats</span></div><div class=\"progress-tick\">") 1200 1399 if templ_7745c5c3_Err != nil { 1201 1400 return templ_7745c5c3_Err 1202 1401 } 1203 1203 - var templ_7745c5c3_Var71 string 1204 1204 - templ_7745c5c3_Var71, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) 1402 1402 + var templ_7745c5c3_Var85 string 1403 1403 + templ_7745c5c3_Var85, templ_7745c5c3_Err = templ.JoinStringErrs(itoa(totalAttendees)) 1205 1404 if templ_7745c5c3_Err != nil { 1206 1206 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 310, Col: 52} 1405 1405 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/events/pages/detail.templ`, Line: 330, Col: 52} 1207 1406 } 1208 1208 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var71)) 1407 1407 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var85)) 1209 1408 if templ_7745c5c3_Err != nil { 1210 1409 return templ_7745c5c3_Err 1211 1410 } 1212 1212 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 96, "</div></div></div>") 1411 1411 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 115, "</div></div></div>") 1213 1412 if templ_7745c5c3_Err != nil { 1214 1413 return templ_7745c5c3_Err 1215 1414 } ··· 1226 1425 1227 1426 func itoa(n int) string { 1228 1427 return fmt.Sprintf("%d", n) 1428 1428 + } 1429 1429 + 1430 1430 + func attendeesPageURL(token, filter string, page int) string { 1431 1431 + url := "/events/" + token 1432 1432 + sep := "?" 1433 1433 + if filter != "" && filter != "all" { 1434 1434 + url += sep + "filter=" + filter 1435 1435 + sep = "&" 1436 1436 + } 1437 1437 + if page > 1 { 1438 1438 + url += sep + "page=" + fmt.Sprintf("%d", page) 1439 1439 + } 1440 1440 + return url 1229 1441 } 1230 1442 1231 1443 // connectPct returns the fill percentage: connectors / totalAttendees * 100.

+1 -1

features/events/pages/events.templ

Reviewed

··· 33 33 } 34 34 35 35 templ Events(v EventsView) { 36 36 - @layouts.Base("events — atmo.quest", "Your events on atmo.quest.") { 36 36 + @layouts.Base("events", "Your events on atmo.quest.") { 37 37 <div class="window"> 38 38 <div class="window-bar"> 39 39 <div class="dot dot-r"></div>

+1 -1

features/events/pages/events_templ.go

Reviewed

··· 214 214 } 215 215 return nil 216 216 }) 217 217 - templ_7745c5c3_Err = layouts.Base("events — atmo.quest", "Your events on atmo.quest.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 217 217 + templ_7745c5c3_Err = layouts.Base("events", "Your events on atmo.quest.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 218 218 if templ_7745c5c3_Err != nil { 219 219 return templ_7745c5c3_Err 220 220 }

+5 -1

features/index/handlers.go

Reviewed

··· 117 117 118 118 // Debug: expose the connect URL so developers can copy-paste it into 119 119 // an incognito window to test connections without physically scanning. 120 120 - view.ConnectURL = strings.TrimRight(config.Global.PublicURL, "/") + "/c/" + did.String() 120 120 + connectURL := strings.TrimRight(config.Global.PublicURL, "/") + "/c/" + did.String() 121 121 + view.QRConnectURL = connectURL 122 122 + if config.Global.Environment == config.Dev { 123 123 + view.ConnectURL = connectURL 124 124 + } 121 125 122 126 // Current event: most recent ongoing check-in for this user. If the 123 127 // user has no check-ins, no events, or no rows match, the card

+35 -19

features/index/pages/index.templ

Reviewed

··· 23 23 QRURL string 24 24 // ConnectURL is the full /c/<did> URL for testing/debugging — users 25 25 // can copy-paste it into another browser to simulate a QR scan. 26 26 + // Only set in dev mode. 26 27 ConnectURL string 28 28 + // QRConnectURL is the connect URL shown via delayed copy button on the 29 29 + // QR flip card. Always set for logged-in users. 30 30 + QRConnectURL string 27 31 28 32 // CurrentEvent is the user's currently-ongoing check-in target, if any. 29 33 // Nil pointer means "no active event right now" — the home page renders ··· 72 76 // marketing landing so it feels like an "app home", not a re-hit of the 73 77 // pitch. 74 78 templ indexAuthed(v IndexView) { 75 75 - @layouts.Base("atmo.quest — your quest", "Your atmo.quest home.") { 79 79 + @layouts.Base("home", "Your atmo.quest home.") { 76 80 <div class="window"> 77 81 <div class="window-bar"> 78 82 <div class="dot dot-r"></div> ··· 89 93 90 94 <div class="home-dashboard"> 91 95 <div class="home-identity"> 92 92 - <div class="profile-flip" data-flip="0"> 93 93 - <button type="button" class="profile-flip-inner" aria-label="show your QR code" aria-pressed="false" data-flip-toggle> 94 94 - <div class="profile-flip-face profile-flip-front"> 95 95 - if v.AvatarURL != "" { 96 96 - <img class="profile-avatar" src={ v.AvatarURL } alt={ indexAvatarAlt(v.DisplayName) } loading="lazy"/> 97 97 - } else { 98 98 - <div class="profile-avatar profile-avatar-empty" aria-hidden="true"><span>?</span></div> 99 99 - } 100 100 - </div> 101 101 - <div class="profile-flip-face profile-flip-back"> 102 102 - if v.QRURL != "" { 103 103 - <img class="profile-qr" src={ v.QRURL } alt="QR code that links to your atmo.quest connect page" loading="lazy"/> 104 104 - } 105 105 - </div> 106 106 - </button> 96 96 + <div class="profile-flip-wrap"> 97 97 + <div class="profile-flip" data-flip="0"> 98 98 + <button type="button" class="profile-flip-inner" aria-label="show your QR code" aria-pressed="false" data-flip-toggle> 99 99 + <div class="profile-flip-face profile-flip-front"> 100 100 + if v.AvatarURL != "" { 101 101 + <img class="profile-avatar" src={ v.AvatarURL } alt={ indexAvatarAlt(v.DisplayName) } loading="lazy"/> 102 102 + } else { 103 103 + <div class="profile-avatar profile-avatar-empty" aria-hidden="true"><span>?</span></div> 104 104 + } 105 105 + </div> 106 106 + <div class="profile-flip-face profile-flip-back"> 107 107 + if v.QRURL != "" { 108 108 + <img class="profile-qr" src={ v.QRURL } alt="QR code that links to your atmo.quest connect page" loading="lazy"/> 109 109 + } 110 110 + </div> 111 111 + </button> 112 112 + </div> 107 113 <p class="profile-flip-hint">▸ tap to flip</p> 114 114 + if v.QRConnectURL != "" { 115 115 + <button 116 116 + type="button" 117 117 + class="btn btn-ghost btn-sm qr-copy-link" 118 118 + id="qr-copy-btn" 119 119 + style="display:none" 120 120 + data-url={ v.QRConnectURL } 121 121 + onclick="navigator.clipboard.writeText(this.dataset.url).then(()=>{this.textContent='copied!'});setTimeout(()=>{this.textContent='copy link'},1500)" 122 122 + >copy link</button> 123 123 + } 108 124 </div> 109 125 <div class="home-identity-text"> 110 126 if v.DisplayName != "" { ··· 204 220 <a href="/connections" class="btn btn-ghost btn-sm" style="margin-top:0.5rem">view all →</a> 205 221 } else { 206 222 <p class="home-event-empty"> 207 207 - no connections yet — scan a QR at an event! 223 223 + no connections yet, go meet someone! 208 224 </p> 209 225 } 210 226 </aside> ··· 219 235 220 236 // indexGuest is the original marketing landing page. 221 237 templ indexGuest() { 222 222 - @layouts.Base("atmo.quest — conference companion on ATProto", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.") { 238 238 + @layouts.Base("atmo.quest", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.") { 223 239 <div class="window"> 224 240 <div class="window-bar"> 225 241 <div class="dot dot-r"></div> ··· 237 253 </div> 238 254 239 255 <div class="hero-block"> 240 240 - <span class="hero-tag">init: v0.1 · CascadiaJS 2026</span> 256 256 + <span class="hero-tag">Find your people in the Atmosphere.</span> 241 257 <h1>atmo<span class="quest">.quest</span><span class="cursor">&nbsp;</span></h1> 242 258 <p class="lede"> 243 259 An <span class="kw">event companion</span> { "for" } the open social web. Scan a QR, write a note, leave with a real follow-up list. Your data goes to <span class="kw2">your repo</span>, not ours.

+149 -122

features/index/pages/index_templ.go

Reviewed

··· 31 31 QRURL string 32 32 // ConnectURL is the full /c/<did> URL for testing/debugging — users 33 33 // can copy-paste it into another browser to simulate a QR scan. 34 34 + // Only set in dev mode. 34 35 ConnectURL string 36 36 + // QRConnectURL is the connect URL shown via delayed copy button on the 37 37 + // QR flip card. Always set for logged-in users. 38 38 + QRConnectURL string 35 39 36 40 // CurrentEvent is the user's currently-ongoing check-in target, if any. 37 41 // Nil pointer means "no active event right now" — the home page renders ··· 155 159 var templ_7745c5c3_Var4 string 156 160 templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("@") 157 161 if templ_7745c5c3_Err != nil { 158 158 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 86, Col: 56} 162 162 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 90, Col: 56} 159 163 } 160 164 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) 161 165 if templ_7745c5c3_Err != nil { 162 166 return templ_7745c5c3_Err 163 167 } 164 164 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><span class=\"path\">atmo.quest</span><span class=\"sep\">:~$</span> <span class=\"cmd\">whoami --short</span></div><div class=\"home-dashboard\"><div class=\"home-identity\"><div class=\"profile-flip\" data-flip=\"0\"><button type=\"button\" class=\"profile-flip-inner\" aria-label=\"show your QR code\" aria-pressed=\"false\" data-flip-toggle><div class=\"profile-flip-face profile-flip-front\">") 168 168 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "</span><span class=\"path\">atmo.quest</span><span class=\"sep\">:~$</span> <span class=\"cmd\">whoami --short</span></div><div class=\"home-dashboard\"><div class=\"home-identity\"><div class=\"profile-flip-wrap\"><div class=\"profile-flip\" data-flip=\"0\"><button type=\"button\" class=\"profile-flip-inner\" aria-label=\"show your QR code\" aria-pressed=\"false\" data-flip-toggle><div class=\"profile-flip-face profile-flip-front\">") 165 169 if templ_7745c5c3_Err != nil { 166 170 return templ_7745c5c3_Err 167 171 } ··· 173 177 var templ_7745c5c3_Var5 string 174 178 templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.AvatarURL) 175 179 if templ_7745c5c3_Err != nil { 176 176 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 96, Col: 55} 180 180 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 101, Col: 56} 177 181 } 178 182 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5) 179 183 if templ_7745c5c3_Err != nil { ··· 186 190 var templ_7745c5c3_Var6 string 187 191 templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.ResolveAttributeValue(indexAvatarAlt(v.DisplayName)) 188 192 if templ_7745c5c3_Err != nil { 189 189 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 96, Col: 93} 193 193 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 101, Col: 94} 190 194 } 191 195 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var6) 192 196 if templ_7745c5c3_Err != nil { ··· 214 218 var templ_7745c5c3_Var7 string 215 219 templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.QRURL) 216 220 if templ_7745c5c3_Err != nil { 217 217 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 103, Col: 47} 221 221 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 108, Col: 48} 218 222 } 219 223 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7) 220 224 if templ_7745c5c3_Err != nil { ··· 225 229 return templ_7745c5c3_Err 226 230 } 227 231 } 228 228 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div></button><p class=\"profile-flip-hint\">▸ tap to flip</p></div><div class=\"home-identity-text\">") 232 232 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div></button></div><p class=\"profile-flip-hint\">▸ tap to flip</p>") 229 233 if templ_7745c5c3_Err != nil { 230 234 return templ_7745c5c3_Err 231 235 } 232 232 - if v.DisplayName != "" { 233 233 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<h1 class=\"home-name\">") 236 236 + if v.QRConnectURL != "" { 237 237 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "<button type=\"button\" class=\"btn btn-ghost btn-sm qr-copy-link\" id=\"qr-copy-btn\" style=\"display:none\" data-url=\"") 234 238 if templ_7745c5c3_Err != nil { 235 239 return templ_7745c5c3_Err 236 240 } 237 241 var templ_7745c5c3_Var8 string 238 238 - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.DisplayName) 242 242 + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.QRConnectURL) 239 243 if templ_7745c5c3_Err != nil { 240 240 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 111, Col: 45} 244 244 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 120, Col: 34} 241 245 } 242 242 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) 246 246 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8) 243 247 if templ_7745c5c3_Err != nil { 244 248 return templ_7745c5c3_Err 245 249 } 246 246 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</h1>") 250 250 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "\" onclick=\"navigator.clipboard.writeText(this.dataset.url).then(()=>{this.textContent='copied!'});setTimeout(()=>{this.textContent='copy link'},1500)\">copy link</button>") 251 251 + if templ_7745c5c3_Err != nil { 252 252 + return templ_7745c5c3_Err 253 253 + } 254 254 + } 255 255 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div><div class=\"home-identity-text\">") 256 256 + if templ_7745c5c3_Err != nil { 257 257 + return templ_7745c5c3_Err 258 258 + } 259 259 + if v.DisplayName != "" { 260 260 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<h1 class=\"home-name\">") 261 261 + if templ_7745c5c3_Err != nil { 262 262 + return templ_7745c5c3_Err 263 263 + } 264 264 + var templ_7745c5c3_Var9 string 265 265 + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.DisplayName) 266 266 + if templ_7745c5c3_Err != nil { 267 267 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 127, Col: 45} 268 268 + } 269 269 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) 270 270 + if templ_7745c5c3_Err != nil { 271 271 + return templ_7745c5c3_Err 272 272 + } 273 273 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</h1>") 247 274 if templ_7745c5c3_Err != nil { 248 275 return templ_7745c5c3_Err 249 276 } 250 277 } else { 251 251 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<h1 class=\"home-name home-name-muted\">(no display name)</h1>") 278 278 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<h1 class=\"home-name home-name-muted\">(no display name)</h1>") 252 279 if templ_7745c5c3_Err != nil { 253 280 return templ_7745c5c3_Err 254 281 } 255 282 } 256 283 if v.Handle != "" { 257 257 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<p class=\"home-handle\">") 284 284 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<p class=\"home-handle\">") 258 285 if templ_7745c5c3_Err != nil { 259 286 return templ_7745c5c3_Err 260 287 } 261 261 - var templ_7745c5c3_Var9 string 262 262 - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("@" + v.Handle) 288 288 + var templ_7745c5c3_Var10 string 289 289 + templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("@" + v.Handle) 263 290 if templ_7745c5c3_Err != nil { 264 264 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 116, Col: 47} 291 291 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 132, Col: 47} 265 292 } 266 266 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) 293 293 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) 267 294 if templ_7745c5c3_Err != nil { 268 295 return templ_7745c5c3_Err 269 296 } 270 270 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</p>") 297 297 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</p>") 271 298 if templ_7745c5c3_Err != nil { 272 299 return templ_7745c5c3_Err 273 300 } 274 301 } 275 275 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"home-identity-ctas\"><a href=\"/profile\" class=\"btn btn-ghost btn-sm\">view profile →</a> <a href=\"/settings\" class=\"btn btn-ghost btn-sm\">settings →</a></div>") 302 302 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<div class=\"home-identity-ctas\"><a href=\"/profile\" class=\"btn btn-ghost btn-sm\">view profile →</a> <a href=\"/settings\" class=\"btn btn-ghost btn-sm\">settings →</a></div>") 276 303 if templ_7745c5c3_Err != nil { 277 304 return templ_7745c5c3_Err 278 305 } 279 306 if v.ConnectURL != "" { 280 280 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<div class=\"connect-url-debug\"><span class=\"connect-url-label\">connect link (for testing):</span> <code class=\"connect-url-value break\" id=\"connect-url\">") 307 307 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<div class=\"connect-url-debug\"><span class=\"connect-url-label\">connect link (for testing):</span> <code class=\"connect-url-value break\" id=\"connect-url\">") 281 308 if templ_7745c5c3_Err != nil { 282 309 return templ_7745c5c3_Err 283 310 } 284 284 - var templ_7745c5c3_Var10 string 285 285 - templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(v.ConnectURL) 311 311 + var templ_7745c5c3_Var11 string 312 312 + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.ConnectURL) 286 313 if templ_7745c5c3_Err != nil { 287 287 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 124, Col: 77} 314 314 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 140, Col: 77} 288 315 } 289 289 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) 316 316 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) 290 317 if templ_7745c5c3_Err != nil { 291 318 return templ_7745c5c3_Err 292 319 } 293 293 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "</code> <button type=\"button\" class=\"btn btn-ghost btn-sm\" onclick=\"navigator.clipboard.writeText(document.getElementById('connect-url').textContent).then(()=>{this.textContent='copied!'});setTimeout(()=>{this.textContent='copy'},1500)\">copy</button></div>") 320 320 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</code> <button type=\"button\" class=\"btn btn-ghost btn-sm\" onclick=\"navigator.clipboard.writeText(document.getElementById('connect-url').textContent).then(()=>{this.textContent='copied!'});setTimeout(()=>{this.textContent='copy'},1500)\">copy</button></div>") 294 321 if templ_7745c5c3_Err != nil { 295 322 return templ_7745c5c3_Err 296 323 } 297 324 } 298 298 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "</div></div>") 325 325 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "</div></div>") 299 326 if templ_7745c5c3_Err != nil { 300 327 return templ_7745c5c3_Err 301 328 } ··· 307 334 if templ_7745c5c3_Err != nil { 308 335 return templ_7745c5c3_Err 309 336 } 310 310 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "</div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 337 337 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "</div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 311 338 if templ_7745c5c3_Err != nil { 312 339 return templ_7745c5c3_Err 313 340 } ··· 315 342 if templ_7745c5c3_Err != nil { 316 343 return templ_7745c5c3_Err 317 344 } 318 318 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, " <script src=\"/static/js/profile.js\" defer></script>") 345 345 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, " <script src=\"/static/js/profile.js\" defer></script>") 319 346 if templ_7745c5c3_Err != nil { 320 347 return templ_7745c5c3_Err 321 348 } 322 349 return nil 323 350 }) 324 324 - templ_7745c5c3_Err = layouts.Base("atmo.quest — your quest", "Your atmo.quest home.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer) 351 351 + templ_7745c5c3_Err = layouts.Base("home", "Your atmo.quest home.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var3), templ_7745c5c3_Buffer) 325 352 if templ_7745c5c3_Err != nil { 326 353 return templ_7745c5c3_Err 327 354 } ··· 348 375 }() 349 376 } 350 377 ctx = templ.InitializeContext(ctx) 351 351 - templ_7745c5c3_Var11 := templ.GetChildren(ctx) 352 352 - if templ_7745c5c3_Var11 == nil { 353 353 - templ_7745c5c3_Var11 = templ.NopComponent 378 378 + templ_7745c5c3_Var12 := templ.GetChildren(ctx) 379 379 + if templ_7745c5c3_Var12 == nil { 380 380 + templ_7745c5c3_Var12 = templ.NopComponent 354 381 } 355 382 ctx = templ.ClearChildren(ctx) 356 383 if ev != nil { 357 357 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<a href=\"") 384 384 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<a href=\"") 358 385 if templ_7745c5c3_Err != nil { 359 386 return templ_7745c5c3_Err 360 387 } 361 361 - var templ_7745c5c3_Var12 templ.SafeURL 362 362 - templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/events/" + ev.QRToken)) 388 388 + var templ_7745c5c3_Var13 templ.SafeURL 389 389 + templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/events/" + ev.QRToken)) 363 390 if templ_7745c5c3_Err != nil { 364 364 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 152, Col: 50} 391 391 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 168, Col: 50} 365 392 } 366 366 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) 393 393 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) 367 394 if templ_7745c5c3_Err != nil { 368 395 return templ_7745c5c3_Err 369 396 } 370 370 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "\" class=\"home-event-card\" aria-label=\"current event\" style=\"text-decoration:none;color:inherit\"><div class=\"home-event-banner-row\"><div class=\"home-event-banner-body\"><div class=\"home-event-label\">checked in · live now</div><h2 class=\"home-event-name\">") 397 397 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "\" class=\"home-event-card\" aria-label=\"current event\" style=\"text-decoration:none;color:inherit\"><div class=\"home-event-banner-row\"><div class=\"home-event-banner-body\"><div class=\"home-event-label\">checked in · live now</div><h2 class=\"home-event-name\">") 371 398 if templ_7745c5c3_Err != nil { 372 399 return templ_7745c5c3_Err 373 400 } 374 374 - var templ_7745c5c3_Var13 string 375 375 - templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Name) 401 401 + var templ_7745c5c3_Var14 string 402 402 + templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Name) 376 403 if templ_7745c5c3_Err != nil { 377 377 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 156, Col: 42} 404 404 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 172, Col: 42} 378 405 } 379 379 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) 406 406 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 380 407 if templ_7745c5c3_Err != nil { 381 408 return templ_7745c5c3_Err 382 409 } 383 383 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "</h2><p class=\"home-event-meta\">") 410 410 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</h2><p class=\"home-event-meta\">") 384 411 if templ_7745c5c3_Err != nil { 385 412 return templ_7745c5c3_Err 386 413 } 387 414 if ev.Location != "" { 388 388 - var templ_7745c5c3_Var14 string 389 389 - templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Location) 415 415 + var templ_7745c5c3_Var15 string 416 416 + templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(ev.Location) 390 417 if templ_7745c5c3_Err != nil { 391 391 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 159, Col: 20} 418 418 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 175, Col: 20} 392 419 } 393 393 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 420 420 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) 394 421 if templ_7745c5c3_Err != nil { 395 422 return templ_7745c5c3_Err 396 423 } 397 397 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, " ·&nbsp; ") 424 424 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, " ·&nbsp; ") 398 425 if templ_7745c5c3_Err != nil { 399 426 return templ_7745c5c3_Err 400 427 } 401 428 } 402 402 - var templ_7745c5c3_Var15 string 403 403 - templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(ev.StartTime) 429 429 + var templ_7745c5c3_Var16 string 430 430 + templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(ev.StartTime) 404 431 if templ_7745c5c3_Err != nil { 405 405 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 161, Col: 20} 432 432 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 177, Col: 20} 406 433 } 407 407 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) 434 434 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) 408 435 if templ_7745c5c3_Err != nil { 409 436 return templ_7745c5c3_Err 410 437 } 411 411 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, " → ") 438 438 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, " → ") 412 439 if templ_7745c5c3_Err != nil { 413 440 return templ_7745c5c3_Err 414 441 } 415 415 - var templ_7745c5c3_Var16 string 416 416 - templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(ev.EndTime) 442 442 + var templ_7745c5c3_Var17 string 443 443 + templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(ev.EndTime) 417 444 if templ_7745c5c3_Err != nil { 418 418 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 161, Col: 39} 445 445 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 177, Col: 39} 419 446 } 420 420 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) 447 447 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) 421 448 if templ_7745c5c3_Err != nil { 422 449 return templ_7745c5c3_Err 423 450 } 424 424 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</p></div><span class=\"home-event-arrow\">→</span></div></a>") 451 451 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "</p></div><span class=\"home-event-arrow\">→</span></div></a>") 425 452 if templ_7745c5c3_Err != nil { 426 453 return templ_7745c5c3_Err 427 454 } 428 455 } else { 429 429 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, "<aside class=\"home-event-card is-empty\" aria-label=\"current event\"><div class=\"home-event-label\">current event</div><p class=\"home-event-empty\">you're not checked into an event right now.</p><p class=\"home-event-empty-hint\">scan someone's QR at an event to join, or wait for an organizer to create one nearby.</p></aside>") 456 456 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<aside class=\"home-event-card is-empty\" aria-label=\"current event\"><div class=\"home-event-label\">current event</div><p class=\"home-event-empty\">you're not checked into an event right now.</p><p class=\"home-event-empty-hint\">scan someone's QR at an event to join, or wait for an organizer to create one nearby.</p></aside>") 430 457 if templ_7745c5c3_Err != nil { 431 458 return templ_7745c5c3_Err 432 459 } ··· 452 479 }() 453 480 } 454 481 ctx = templ.InitializeContext(ctx) 455 455 - templ_7745c5c3_Var17 := templ.GetChildren(ctx) 456 456 - if templ_7745c5c3_Var17 == nil { 457 457 - templ_7745c5c3_Var17 = templ.NopComponent 482 482 + templ_7745c5c3_Var18 := templ.GetChildren(ctx) 483 483 + if templ_7745c5c3_Var18 == nil { 484 484 + templ_7745c5c3_Var18 = templ.NopComponent 458 485 } 459 486 ctx = templ.ClearChildren(ctx) 460 460 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "<aside class=\"home-recent-connections\" aria-label=\"recent connections\"><div class=\"home-event-label\">recent connections</div>") 487 487 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<aside class=\"home-recent-connections\" aria-label=\"recent connections\"><div class=\"home-event-label\">recent connections</div>") 461 488 if templ_7745c5c3_Err != nil { 462 489 return templ_7745c5c3_Err 463 490 } 464 491 if len(conns) > 0 { 465 465 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<div class=\"recent-connections-grid\">") 492 492 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"recent-connections-grid\">") 466 493 if templ_7745c5c3_Err != nil { 467 494 return templ_7745c5c3_Err 468 495 } 469 496 for _, c := range conns { 470 470 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<a href=\"") 497 497 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<a href=\"") 471 498 if templ_7745c5c3_Err != nil { 472 499 return templ_7745c5c3_Err 473 500 } 474 474 - var templ_7745c5c3_Var18 templ.SafeURL 475 475 - templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/connections/" + c.DID)) 501 501 + var templ_7745c5c3_Var19 templ.SafeURL 502 502 + templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/connections/" + c.DID)) 476 503 if templ_7745c5c3_Err != nil { 477 477 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 188, Col: 53} 504 504 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 204, Col: 53} 478 505 } 479 479 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18)) 506 506 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) 480 507 if templ_7745c5c3_Err != nil { 481 508 return templ_7745c5c3_Err 482 509 } 483 483 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "\" class=\"recent-conn-card\" title=\"") 510 510 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "\" class=\"recent-conn-card\" title=\"") 484 511 if templ_7745c5c3_Err != nil { 485 512 return templ_7745c5c3_Err 486 513 } 487 487 - var templ_7745c5c3_Var19 string 488 488 - templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.DisplayName) 514 514 + var templ_7745c5c3_Var20 string 515 515 + templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.DisplayName) 489 516 if templ_7745c5c3_Err != nil { 490 490 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 188, Col: 102} 517 517 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 204, Col: 102} 491 518 } 492 492 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var19) 519 519 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20) 493 520 if templ_7745c5c3_Err != nil { 494 521 return templ_7745c5c3_Err 495 522 } 496 496 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "\">") 523 523 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "\">") 497 524 if templ_7745c5c3_Err != nil { 498 525 return templ_7745c5c3_Err 499 526 } 500 527 if c.AvatarURL != "" { 501 501 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "<img class=\"recent-conn-avatar\" src=\"") 528 528 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "<img class=\"recent-conn-avatar\" src=\"") 502 529 if templ_7745c5c3_Err != nil { 503 530 return templ_7745c5c3_Err 504 531 } 505 505 - var templ_7745c5c3_Var20 string 506 506 - templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.AvatarURL) 532 532 + var templ_7745c5c3_Var21 string 533 533 + templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.AvatarURL) 507 534 if templ_7745c5c3_Err != nil { 508 508 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 190, Col: 56} 535 535 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 206, Col: 56} 509 536 } 510 510 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20) 537 537 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21) 511 538 if templ_7745c5c3_Err != nil { 512 539 return templ_7745c5c3_Err 513 540 } 514 514 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "\" alt=\"") 541 541 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "\" alt=\"") 515 542 if templ_7745c5c3_Err != nil { 516 543 return templ_7745c5c3_Err 517 544 } 518 518 - var templ_7745c5c3_Var21 string 519 519 - templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.DisplayName) 545 545 + var templ_7745c5c3_Var22 string 546 546 + templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.ResolveAttributeValue(c.DisplayName) 520 547 if templ_7745c5c3_Err != nil { 521 521 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 190, Col: 78} 548 548 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 206, Col: 78} 522 549 } 523 523 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21) 550 550 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22) 524 551 if templ_7745c5c3_Err != nil { 525 552 return templ_7745c5c3_Err 526 553 } 527 527 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "\" loading=\"lazy\"> ") 554 554 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "\" loading=\"lazy\"> ") 528 555 if templ_7745c5c3_Err != nil { 529 556 return templ_7745c5c3_Err 530 557 } 531 558 } else { 532 532 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "<div class=\"recent-conn-avatar recent-conn-avatar-empty\" aria-hidden=\"true\">?</div>") 559 559 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "<div class=\"recent-conn-avatar recent-conn-avatar-empty\" aria-hidden=\"true\">?</div>") 533 560 if templ_7745c5c3_Err != nil { 534 561 return templ_7745c5c3_Err 535 562 } 536 563 } 537 537 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 39, "<span class=\"recent-conn-name\">") 564 564 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "<span class=\"recent-conn-name\">") 538 565 if templ_7745c5c3_Err != nil { 539 566 return templ_7745c5c3_Err 540 567 } 541 568 if c.DisplayName != "" { 542 542 - var templ_7745c5c3_Var22 string 543 543 - templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(c.DisplayName) 569 569 + var templ_7745c5c3_Var23 string 570 570 + templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(c.DisplayName) 544 571 if templ_7745c5c3_Err != nil { 545 545 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 196, Col: 23} 572 572 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 212, Col: 23} 546 573 } 547 547 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22)) 574 574 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23)) 548 575 if templ_7745c5c3_Err != nil { 549 576 return templ_7745c5c3_Err 550 577 } 551 578 } else { 552 552 - var templ_7745c5c3_Var23 string 553 553 - templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(c.DID)) 579 579 + var templ_7745c5c3_Var24 string 580 580 + templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(shortDID(c.DID)) 554 581 if templ_7745c5c3_Err != nil { 555 555 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 198, Col: 25} 582 582 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 214, Col: 25} 556 583 } 557 557 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23)) 584 584 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24)) 558 585 if templ_7745c5c3_Err != nil { 559 586 return templ_7745c5c3_Err 560 587 } 561 588 } 562 562 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 40, "</span></a>") 589 589 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</span></a>") 563 590 if templ_7745c5c3_Err != nil { 564 591 return templ_7745c5c3_Err 565 592 } 566 593 } 567 567 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 41, "</div><a href=\"/connections\" class=\"btn btn-ghost btn-sm\" style=\"margin-top:0.5rem\">view all →</a>") 594 594 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "</div><a href=\"/connections\" class=\"btn btn-ghost btn-sm\" style=\"margin-top:0.5rem\">view all →</a>") 568 595 if templ_7745c5c3_Err != nil { 569 596 return templ_7745c5c3_Err 570 597 } 571 598 } else { 572 572 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 42, "<p class=\"home-event-empty\">no connections yet — scan a QR at an event!</p>") 599 599 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "<p class=\"home-event-empty\">no connections yet, go meet someone!</p>") 573 600 if templ_7745c5c3_Err != nil { 574 601 return templ_7745c5c3_Err 575 602 } 576 603 } 577 577 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 43, "</aside>") 604 604 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, "</aside>") 578 605 if templ_7745c5c3_Err != nil { 579 606 return templ_7745c5c3_Err 580 607 } ··· 606 633 }() 607 634 } 608 635 ctx = templ.InitializeContext(ctx) 609 609 - templ_7745c5c3_Var24 := templ.GetChildren(ctx) 610 610 - if templ_7745c5c3_Var24 == nil { 611 611 - templ_7745c5c3_Var24 = templ.NopComponent 636 636 + templ_7745c5c3_Var25 := templ.GetChildren(ctx) 637 637 + if templ_7745c5c3_Var25 == nil { 638 638 + templ_7745c5c3_Var25 = templ.NopComponent 612 639 } 613 640 ctx = templ.ClearChildren(ctx) 614 614 - templ_7745c5c3_Var25 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 641 641 + templ_7745c5c3_Var26 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 615 642 templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 616 643 templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 617 644 if !templ_7745c5c3_IsBuffer { ··· 623 650 }() 624 651 } 625 652 ctx = templ.InitializeContext(ctx) 626 626 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 44, "<div class=\"window\"><div class=\"window-bar\"><div class=\"dot dot-r\"></div><div class=\"dot dot-y\"></div><div class=\"dot dot-g\"></div><div class=\"window-title\">~/atmo.quest — zsh</div></div><div class=\"window-body\"><div class=\"prompt-line\"><span class=\"user\">you</span><span class=\"at\">") 653 653 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "<div class=\"window\"><div class=\"window-bar\"><div class=\"dot dot-r\"></div><div class=\"dot dot-y\"></div><div class=\"dot dot-g\"></div><div class=\"window-title\">~/atmo.quest — zsh</div></div><div class=\"window-body\"><div class=\"prompt-line\"><span class=\"user\">you</span><span class=\"at\">") 627 654 if templ_7745c5c3_Err != nil { 628 655 return templ_7745c5c3_Err 629 656 } 630 630 - var templ_7745c5c3_Var26 string 631 631 - templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs("@") 657 657 + var templ_7745c5c3_Var27 string 658 658 + templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs("@") 632 659 if templ_7745c5c3_Err != nil { 633 633 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 232, Col: 56} 660 660 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 248, Col: 56} 634 661 } 635 635 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26)) 662 662 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) 636 663 if templ_7745c5c3_Err != nil { 637 664 return templ_7745c5c3_Err 638 665 } 639 639 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 45, "</span><span class=\"path\">cascadiajs</span><span class=\"sep\">:~$</span> <span class=\"cmd\">whoami</span></div><div class=\"output indent\">a person at a conference. you just met someone interesting and now their handle is gone.</div><div class=\"hero-block\"><span class=\"hero-tag\">init: v0.1 · CascadiaJS 2026</span><h1>atmo<span class=\"quest\">.quest</span><span class=\"cursor\">&nbsp;</span></h1><p class=\"lede\">An <span class=\"kw\">event companion</span> ") 666 666 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "</span><span class=\"path\">cascadiajs</span><span class=\"sep\">:~$</span> <span class=\"cmd\">whoami</span></div><div class=\"output indent\">a person at a conference. you just met someone interesting and now their handle is gone.</div><div class=\"hero-block\"><span class=\"hero-tag\">Find your people in the Atmosphere.</span><h1>atmo<span class=\"quest\">.quest</span><span class=\"cursor\">&nbsp;</span></h1><p class=\"lede\">An <span class=\"kw\">event companion</span> ") 640 667 if templ_7745c5c3_Err != nil { 641 668 return templ_7745c5c3_Err 642 669 } 643 643 - var templ_7745c5c3_Var27 string 644 644 - templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs("for") 670 670 + var templ_7745c5c3_Var28 string 671 671 + templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs("for") 645 672 if templ_7745c5c3_Err != nil { 646 646 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 243, Col: 56} 673 673 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 259, Col: 56} 647 674 } 648 648 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27)) 675 675 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) 649 676 if templ_7745c5c3_Err != nil { 650 677 return templ_7745c5c3_Err 651 678 } 652 652 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 46, " the open social web. Scan a QR, write a note, leave with a real follow-up list. Your data goes to <span class=\"kw2\">your repo</span>, not ours.</p><div class=\"ctas\"><a href=\"/signin\" class=\"btn btn-primary\">▸ start quest <span class=\"shortcut\">↵</span></a> <a href=\"/about-atproto\" class=\"btn btn-ghost\">? what's ATProto <span class=\"shortcut\">?</span></a></div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><div class=\"window\"><div class=\"window-bar\"><div class=\"dot dot-r\"></div><div class=\"dot dot-y\"></div><div class=\"dot dot-g\"></div><div class=\"window-title\">quest_log.md</div></div><div class=\"window-body\"><div class=\"quest-log\"><h2>Side Quests <span class=\"count\">") 679 679 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, " the open social web. Scan a QR, write a note, leave with a real follow-up list. Your data goes to <span class=\"kw2\">your repo</span>, not ours.</p><div class=\"ctas\"><a href=\"/signin\" class=\"btn btn-primary\">▸ start quest <span class=\"shortcut\">↵</span></a> <a href=\"/about-atproto\" class=\"btn btn-ghost\">? what's ATProto <span class=\"shortcut\">?</span></a></div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><div class=\"window\"><div class=\"window-bar\"><div class=\"dot dot-r\"></div><div class=\"dot dot-y\"></div><div class=\"dot dot-g\"></div><div class=\"window-title\">quest_log.md</div></div><div class=\"window-body\"><div class=\"quest-log\"><h2>Side Quests <span class=\"count\">") 653 680 if templ_7745c5c3_Err != nil { 654 681 return templ_7745c5c3_Err 655 682 } 656 656 - var templ_7745c5c3_Var28 string 657 657 - templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs("// available") 683 683 + var templ_7745c5c3_Var29 string 684 684 + templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs("// available") 658 685 if templ_7745c5c3_Err != nil { 659 659 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 265, Col: 57} 686 686 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/index/pages/index.templ`, Line: 281, Col: 57} 660 687 } 661 661 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28)) 688 688 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29)) 662 689 if templ_7745c5c3_Err != nil { 663 690 return templ_7745c5c3_Err 664 691 } 665 665 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 47, "</span></h2><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Make your first connection</div><div class=\"quest-desc\">Scan someone's QR code. A <code>quest.atmo.connection</code> record gets written to your PDS. They get one too. That's the protocol bit.</div><div class=\"quest-meta\"><span class=\"badge\">+1 badge</span> first connect</div></div></div><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Check in to CascadiaJS</div><div class=\"quest-desc\">Drops a checkin record dated June 1–2, 2026. You'll find it in your repo forever.</div><div class=\"quest-meta\"><span class=\"badge\">+1 badge</span> attendee</div></div></div><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Take a note while it's fresh</div><div class=\"quest-desc\">Private notes, attached to each connection. Read them Monday morning when you forget who Sarah was.</div><div class=\"quest-meta\"><span class=\"badge locked\">unlocks</span> with first connection</div></div></div><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Help unlock the conference rewards</div><div class=\"quest-desc\">As more people join, new things appear — leaderboard, interest matching, end-of-conf stats. Earned together.</div><div class=\"quest-meta\"><span class=\"badge locked\">group quest</span> see /unlocks</div></div></div></div></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 692 692 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "</span></h2><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Make your first connection</div><div class=\"quest-desc\">Scan someone's QR code. A <code>quest.atmo.connection</code> record gets written to your PDS. They get one too. That's the protocol bit.</div><div class=\"quest-meta\"><span class=\"badge\">+1 badge</span> first connect</div></div></div><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Check in to CascadiaJS</div><div class=\"quest-desc\">Drops a checkin record dated June 1–2, 2026. You'll find it in your repo forever.</div><div class=\"quest-meta\"><span class=\"badge\">+1 badge</span> attendee</div></div></div><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Take a note while it's fresh</div><div class=\"quest-desc\">Private notes, attached to each connection. Read them Monday morning when you forget who Sarah was.</div><div class=\"quest-meta\"><span class=\"badge locked\">unlocks</span> with first connection</div></div></div><div class=\"quest\"><div class=\"quest-icon\">◆</div><div><div class=\"quest-title\">Help unlock the conference rewards</div><div class=\"quest-desc\">As more people join, new things appear — leaderboard, interest matching, end-of-conf stats. Earned together.</div><div class=\"quest-meta\"><span class=\"badge locked\">group quest</span> see /unlocks</div></div></div></div></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 666 693 if templ_7745c5c3_Err != nil { 667 694 return templ_7745c5c3_Err 668 695 } 669 696 return nil 670 697 }) 671 671 - templ_7745c5c3_Err = layouts.Base("atmo.quest — conference companion on ATProto", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var25), templ_7745c5c3_Buffer) 698 698 + templ_7745c5c3_Err = layouts.Base("atmo.quest", "Scan a QR, write a note, leave with a real follow-up list. Your data goes to your repo, not ours.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var26), templ_7745c5c3_Buffer) 672 699 if templ_7745c5c3_Err != nil { 673 700 return templ_7745c5c3_Err 674 701 }

+9

features/profile/handlers.go

Reviewed

··· 59 59 // Load earned badges from local cache. 60 60 if earned, err := badge.ListEarned(r.Context(), h.DB, did.String()); err == nil { 61 61 for _, eb := range earned { 62 62 + svg := badge.RenderSVG(badge.Design{ 63 63 + Shape: eb.Shape, 64 64 + PrimaryColor: eb.PrimaryColor, 65 65 + AccentColor: eb.AccentColor, 66 66 + RibbonColor: eb.RibbonColor, 67 67 + Label: eb.Label, 68 68 + }, 160) 62 69 view.Badges = append(view.Badges, pages.ProfileBadge{ 63 70 Name: eb.Name, 64 71 Description: eb.Description, ··· 68 75 RibbonColor: eb.RibbonColor, 69 76 Label: eb.Label, 70 77 EarnedAt: eb.EarnedAt.Format("Jan 2, 2006"), 78 78 + Message: eb.Message, 79 79 + SVGPreview: svg, 71 80 }) 72 81 } 73 82 }

+29 -3

features/profile/pages/profile.templ

Reviewed

··· 53 53 RibbonColor string 54 54 Label string 55 55 EarnedAt string // pre-formatted 56 56 + Message string // custom message from the badge award 57 57 + SVGPreview string // rendered SVG for the modal 56 58 } 57 59 58 60 templ Profile(v ProfileView) { 59 59 - @layouts.Base("profile — atmo.quest", "Your atmo.quest profile — display name, bio, interests, links.") { 61 61 + @layouts.Base("profile", "Your atmo.quest profile — display name, bio, interests, links.") { 60 62 <div class="window"> 61 63 <div class="window-bar"> 62 64 <div class="dot dot-r"></div> ··· 207 209 <a href="/" class="statusbar-brand">atmo.quest</a> 208 210 </div> 209 211 </div> 212 212 + 213 213 + // Badge detail modal 214 214 + <div id="badge-modal-overlay" class="badge-modal-overlay" style="display:none" onclick="if(event.target===this)this.style.display='none'"> 215 215 + <div class="badge-modal"> 216 216 + <button type="button" class="badge-modal-close" onclick="document.getElementById('badge-modal-overlay').style.display='none'" aria-label="Close">✕</button> 217 217 + <div class="badge-modal-svg" id="badge-modal-svg"></div> 218 218 + <div class="badge-modal-name" id="badge-modal-name"></div> 219 219 + <div class="badge-modal-desc" id="badge-modal-desc"></div> 220 220 + <div class="badge-modal-date muted" id="badge-modal-date"></div> 221 221 + <div class="badge-modal-message" id="badge-modal-message"></div> 222 222 + </div> 223 223 + </div> 224 224 + 210 225 <script src="/static/js/profile.js" defer></script> 211 226 @layouts.BottomNav("home") 212 227 } ··· 221 236 } 222 237 223 238 templ profileBadge(b ProfileBadge) { 224 224 - <div class="profile-badge" title={ b.Name + ": " + b.Description }> 239 239 + <button type="button" class="profile-badge" title={ b.Name } onclick={ showBadgeModal(b) }> 225 240 <div class="profile-badge-icon" style={ "background:" + b.PrimaryColor + ";border-color:" + b.RibbonColor }> 226 241 <span class="profile-badge-label">{ b.Label }</span> 227 242 </div> 228 243 <span class="profile-badge-name">{ b.Name }</span> 229 229 - </div> 244 244 + </button> 245 245 + } 246 246 + 247 247 + script showBadgeModal(b ProfileBadge) { 248 248 + var overlay = document.getElementById("badge-modal-overlay"); 249 249 + if (!overlay) return; 250 250 + document.getElementById("badge-modal-svg").innerHTML = b.SVGPreview; 251 251 + document.getElementById("badge-modal-name").textContent = b.Name; 252 252 + document.getElementById("badge-modal-desc").textContent = b.Description; 253 253 + document.getElementById("badge-modal-date").textContent = b.EarnedAt ? "Earned: " + b.EarnedAt : ""; 254 254 + document.getElementById("badge-modal-message").textContent = b.Message || ""; 255 255 + overlay.style.display = "flex"; 230 256 }

+1 -1

features/profile/pages/profile_edit.templ

Reviewed

··· 53 53 } 54 54 55 55 templ ProfileEdit(v ProfileEditView) { 56 56 - @layouts.Base("edit profile — atmo.quest", "Edit your atmo.quest profile.") { 56 56 + @layouts.Base("edit profile", "Edit your atmo.quest profile.") { 57 57 <div class="window"> 58 58 <div class="window-bar"> 59 59 <div class="dot dot-r"></div>

+1 -1

features/profile/pages/profile_edit_templ.go

Reviewed

··· 424 424 } 425 425 return nil 426 426 }) 427 427 - templ_7745c5c3_Err = layouts.Base("edit profile — atmo.quest", "Edit your atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 427 427 + templ_7745c5c3_Err = layouts.Base("edit profile", "Edit your atmo.quest profile.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 428 428 if templ_7745c5c3_Err != nil { 429 429 return templ_7745c5c3_Err 430 430 }

+64 -32

features/profile/pages/profile_templ.go

Reviewed

··· 61 61 RibbonColor string 62 62 Label string 63 63 EarnedAt string // pre-formatted 64 64 + Message string // custom message from the badge award 65 65 + SVGPreview string // rendered SVG for the modal 64 66 } 65 67 66 68 func Profile(v ProfileView) templ.Component { ··· 111 113 var templ_7745c5c3_Var3 string 112 114 templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("@") 113 115 if templ_7745c5c3_Err != nil { 114 114 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 70, Col: 56} 116 116 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 72, Col: 56} 115 117 } 116 118 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) 117 119 if templ_7745c5c3_Err != nil { ··· 139 141 var templ_7745c5c3_Var4 string 140 142 templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.ConnectedDID) 141 143 if templ_7745c5c3_Err != nil { 142 142 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 81, Col: 63} 144 144 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 83, Col: 63} 143 145 } 144 146 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) 145 147 if templ_7745c5c3_Err != nil { ··· 167 169 var templ_7745c5c3_Var5 string 168 170 templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.AvatarURL) 169 171 if templ_7745c5c3_Err != nil { 170 170 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 89, Col: 54} 172 172 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 91, Col: 54} 171 173 } 172 174 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5) 173 175 if templ_7745c5c3_Err != nil { ··· 180 182 var templ_7745c5c3_Var6 string 181 183 templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.ResolveAttributeValue(avatarAlt(v.DisplayName)) 182 184 if templ_7745c5c3_Err != nil { 183 183 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 89, Col: 87} 185 185 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 91, Col: 87} 184 186 } 185 187 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var6) 186 188 if templ_7745c5c3_Err != nil { ··· 208 210 var templ_7745c5c3_Var7 string 209 211 templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.QRURL) 210 212 if templ_7745c5c3_Err != nil { 211 211 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 98, Col: 46} 213 213 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 100, Col: 46} 212 214 } 213 215 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7) 214 216 if templ_7745c5c3_Err != nil { ··· 231 233 var templ_7745c5c3_Var8 string 232 234 templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.DisplayName) 233 235 if templ_7745c5c3_Err != nil { 234 234 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 106, Col: 46} 236 236 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 108, Col: 46} 235 237 } 236 238 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) 237 239 if templ_7745c5c3_Err != nil { ··· 282 284 var templ_7745c5c3_Var9 string 283 285 templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.Bio) 284 286 if templ_7745c5c3_Err != nil { 285 285 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 133, Col: 51} 287 287 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 135, Col: 51} 286 288 } 287 289 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) 288 290 if templ_7745c5c3_Err != nil { ··· 301 303 var templ_7745c5c3_Var10 string 302 304 templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(v.WorksAt) 303 305 if templ_7745c5c3_Err != nil { 304 304 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 139, Col: 42} 306 306 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 141, Col: 42} 305 307 } 306 308 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) 307 309 if templ_7745c5c3_Err != nil { ··· 320 322 var templ_7745c5c3_Var11 string 321 323 templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.Location) 322 324 if templ_7745c5c3_Err != nil { 323 323 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 145, Col: 43} 325 325 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 147, Col: 43} 324 326 } 325 327 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) 326 328 if templ_7745c5c3_Err != nil { ··· 339 341 var templ_7745c5c3_Var12 string 340 342 templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(v.ContactMethod) 341 343 if templ_7745c5c3_Err != nil { 342 342 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 151, Col: 48} 344 344 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 153, Col: 48} 343 345 } 344 346 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) 345 347 if templ_7745c5c3_Err != nil { ··· 379 381 var templ_7745c5c3_Var13 string 380 382 templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(t) 381 383 if templ_7745c5c3_Err != nil { 382 382 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 169, Col: 45} 384 384 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 171, Col: 45} 383 385 } 384 386 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) 385 387 if templ_7745c5c3_Err != nil { ··· 408 410 var templ_7745c5c3_Var14 templ.SafeURL 409 411 templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinURLErrs(templ.URL(l.URL)) 410 412 if templ_7745c5c3_Err != nil { 411 411 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 180, Col: 58} 413 413 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 182, Col: 58} 412 414 } 413 415 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 414 416 if templ_7745c5c3_Err != nil { ··· 421 423 var templ_7745c5c3_Var15 string 422 424 templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(l.Label) 423 425 if templ_7745c5c3_Err != nil { 424 424 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 181, Col: 49} 426 426 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 183, Col: 49} 425 427 } 426 428 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) 427 429 if templ_7745c5c3_Err != nil { ··· 453 455 return templ_7745c5c3_Err 454 456 } 455 457 } 456 456 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "<div class=\"ctas\"><a href=\"/profile/edit\" class=\"btn btn-primary\">▸ edit profile</a> <a href=\"/\" class=\"btn btn-ghost\">← home</a></div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><script src=\"/static/js/profile.js\" defer></script> ") 458 458 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 48, "<div class=\"ctas\"><a href=\"/profile/edit\" class=\"btn btn-primary\">▸ edit profile</a> <a href=\"/\" class=\"btn btn-ghost\">← home</a></div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div> <div id=\"badge-modal-overlay\" class=\"badge-modal-overlay\" style=\"display:none\" onclick=\"if(event.target===this)this.style.display='none'\"><div class=\"badge-modal\"><button type=\"button\" class=\"badge-modal-close\" onclick=\"document.getElementById('badge-modal-overlay').style.display='none'\" aria-label=\"Close\">✕</button><div class=\"badge-modal-svg\" id=\"badge-modal-svg\"></div><div class=\"badge-modal-name\" id=\"badge-modal-name\"></div><div class=\"badge-modal-desc\" id=\"badge-modal-desc\"></div><div class=\"badge-modal-date muted\" id=\"badge-modal-date\"></div><div class=\"badge-modal-message\" id=\"badge-modal-message\"></div></div></div><script src=\"/static/js/profile.js\" defer></script> ") 457 459 if templ_7745c5c3_Err != nil { 458 460 return templ_7745c5c3_Err 459 461 } ··· 463 465 } 464 466 return nil 465 467 }) 466 466 - templ_7745c5c3_Err = layouts.Base("profile — atmo.quest", "Your atmo.quest profile — display name, bio, interests, links.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 468 468 + templ_7745c5c3_Err = layouts.Base("profile", "Your atmo.quest profile — display name, bio, interests, links.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 467 469 if templ_7745c5c3_Err != nil { 468 470 return templ_7745c5c3_Err 469 471 } ··· 500 502 templ_7745c5c3_Var16 = templ.NopComponent 501 503 } 502 504 ctx = templ.ClearChildren(ctx) 503 503 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "<div class=\"profile-badge\" title=\"") 505 505 + templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, showBadgeModal(b)) 506 506 + if templ_7745c5c3_Err != nil { 507 507 + return templ_7745c5c3_Err 508 508 + } 509 509 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 49, "<button type=\"button\" class=\"profile-badge\" title=\"") 504 510 if templ_7745c5c3_Err != nil { 505 511 return templ_7745c5c3_Err 506 512 } 507 513 var templ_7745c5c3_Var17 string 508 508 - templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.ResolveAttributeValue(b.Name + ": " + b.Description) 514 514 + templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.ResolveAttributeValue(b.Name) 509 515 if templ_7745c5c3_Err != nil { 510 510 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 224, Col: 65} 516 516 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 239, Col: 59} 511 517 } 512 518 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17) 513 519 if templ_7745c5c3_Err != nil { 514 520 return templ_7745c5c3_Err 515 521 } 516 516 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "\"><div class=\"profile-badge-icon\" style=\"") 522 522 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 50, "\" onclick=\"") 517 523 if templ_7745c5c3_Err != nil { 518 524 return templ_7745c5c3_Err 519 525 } 520 520 - var templ_7745c5c3_Var18 string 521 521 - templ_7745c5c3_Var18, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues("background:" + b.PrimaryColor + ";border-color:" + b.RibbonColor) 522 522 - if templ_7745c5c3_Err != nil { 523 523 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 225, Col: 107} 524 524 - } 525 525 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18)) 526 526 + var templ_7745c5c3_Var18 templ.ComponentScript = showBadgeModal(b) 527 527 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var18.Call) 526 528 if templ_7745c5c3_Err != nil { 527 529 return templ_7745c5c3_Err 528 530 } 529 529 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "\"><span class=\"profile-badge-label\">") 531 531 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 51, "\"><div class=\"profile-badge-icon\" style=\"") 530 532 if templ_7745c5c3_Err != nil { 531 533 return templ_7745c5c3_Err 532 534 } 533 535 var templ_7745c5c3_Var19 string 534 534 - templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(b.Label) 536 536 + templ_7745c5c3_Var19, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues("background:" + b.PrimaryColor + ";border-color:" + b.RibbonColor) 535 537 if templ_7745c5c3_Err != nil { 536 536 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 226, Col: 46} 538 538 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 240, Col: 107} 537 539 } 538 540 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) 539 541 if templ_7745c5c3_Err != nil { 540 542 return templ_7745c5c3_Err 541 543 } 542 542 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "</span></div><span class=\"profile-badge-name\">") 544 544 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 52, "\"><span class=\"profile-badge-label\">") 543 545 if templ_7745c5c3_Err != nil { 544 546 return templ_7745c5c3_Err 545 547 } 546 548 var templ_7745c5c3_Var20 string 547 547 - templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(b.Name) 549 549 + templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(b.Label) 548 550 if templ_7745c5c3_Err != nil { 549 549 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 228, Col: 43} 551 551 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 241, Col: 46} 550 552 } 551 553 _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20)) 552 554 if templ_7745c5c3_Err != nil { 553 555 return templ_7745c5c3_Err 554 556 } 555 555 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "</span></div>") 557 557 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 53, "</span></div><span class=\"profile-badge-name\">") 558 558 + if templ_7745c5c3_Err != nil { 559 559 + return templ_7745c5c3_Err 560 560 + } 561 561 + var templ_7745c5c3_Var21 string 562 562 + templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(b.Name) 563 563 + if templ_7745c5c3_Err != nil { 564 564 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/profile/pages/profile.templ`, Line: 243, Col: 43} 565 565 + } 566 566 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21)) 567 567 + if templ_7745c5c3_Err != nil { 568 568 + return templ_7745c5c3_Err 569 569 + } 570 570 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 54, "</span></button>") 556 571 if templ_7745c5c3_Err != nil { 557 572 return templ_7745c5c3_Err 558 573 } 559 574 return nil 560 575 }) 576 576 + } 577 577 + 578 578 + func showBadgeModal(b ProfileBadge) templ.ComponentScript { 579 579 + return templ.ComponentScript{ 580 580 + Name: `__templ_showBadgeModal_1d85`, 581 581 + Function: `function __templ_showBadgeModal_1d85(b){var overlay = document.getElementById("badge-modal-overlay"); 582 582 + if (!overlay) return; 583 583 + document.getElementById("badge-modal-svg").innerHTML = b.SVGPreview; 584 584 + document.getElementById("badge-modal-name").textContent = b.Name; 585 585 + document.getElementById("badge-modal-desc").textContent = b.Description; 586 586 + document.getElementById("badge-modal-date").textContent = b.EarnedAt ? "Earned: " + b.EarnedAt : ""; 587 587 + document.getElementById("badge-modal-message").textContent = b.Message || ""; 588 588 + overlay.style.display = "flex"; 589 589 + }`, 590 590 + Call: templ.SafeScript(`__templ_showBadgeModal_1d85`, b), 591 591 + CallInline: templ.SafeScriptInline(`__templ_showBadgeModal_1d85`, b), 592 592 + } 561 593 } 562 594 563 595 var _ = templruntime.GeneratedTemplate

+246 -17

features/settings/handlers.go

Reviewed

··· 5 5 import ( 6 6 "database/sql" 7 7 "encoding/csv" 8 8 + "encoding/json" 8 9 "fmt" 9 10 "log/slog" 10 11 "net/http" ··· 16 17 17 18 "atmoquest/features/auth" 18 19 "atmoquest/features/settings/pages" 20 20 + "atmoquest/internal/badge" 21 21 + "atmoquest/internal/connection" 19 22 "atmoquest/internal/notes" 23 23 + "atmoquest/internal/profile" 20 24 "atmoquest/internal/users" 21 25 ) 22 26 ··· 55 59 // Display name initial for avatar. 56 60 avatarInitial := "?" 57 61 displayName := "" 62 62 + avatarURL := "" 58 63 if handle != "" && handle != "handle.invalid" { 59 64 avatarInitial = string([]rune(handle)[0]) 60 65 } 61 66 62 67 // Extract PDS host from session. 63 68 pds := "" 69 69 + pdsHost := "" 64 70 if h.DB != nil { 65 71 var host string 66 72 err := h.DB.QueryRowContext(r.Context(), ` ··· 68 74 WHERE did = ? ORDER BY updated_at DESC LIMIT 1 69 75 `, did.String()).Scan(&host) 70 76 if err == nil && host != "" { 77 77 + pdsHost = host 71 78 // Extract hostname from URL. 72 79 pds = strings.TrimPrefix(strings.TrimPrefix(host, "https://"), "http://") 73 80 } 74 81 } 75 82 83 83 + // Fetch Bluesky profile for display name and avatar. 84 84 + if pdsHost != "" { 85 85 + bsky, err := profile.FetchBluesky(r.Context(), pdsHost, did) 86 86 + if err == nil && bsky != nil { 87 87 + if bsky.DisplayName != "" { 88 88 + displayName = bsky.DisplayName 89 89 + avatarInitial = string([]rune(displayName)[0]) 90 90 + } 91 91 + if bsky.Avatar != nil { 92 92 + avatarURL = profile.AvatarURL(pdsHost, did, bsky.Avatar.CID()) 93 93 + } 94 94 + } 95 95 + } 96 96 + 76 97 view := pages.SettingsView{ 77 77 - Handle: handle, 78 78 - DisplayName: displayName, 79 79 - AvatarInitial: avatarInitial, 80 80 - PDS: pds, 81 81 - NoteCount: noteCount, 82 82 - Deleted: deleted, 83 83 - IsAdmin: isAdmin, 98 98 + Handle: handle, 99 99 + DisplayName: displayName, 100 100 + AvatarInitial: avatarInitial, 101 101 + AvatarURL: avatarURL, 102 102 + PDS: pds, 103 103 + NoteCount: noteCount, 104 104 + Deleted: deleted, 105 105 + IsAdmin: isAdmin, 106 106 + ShowAttendees: true, 107 107 + ShowLeaderboard: true, 84 108 } 85 109 110 110 + // Load privacy settings. 111 111 + privacy, _ := users.GetPrivacy(r.Context(), h.DB, did) 112 112 + view.ShowAttendees = !privacy.HideFromAttendees 113 113 + view.ShowLeaderboard = !privacy.HideFromLeaderboard 114 114 + 86 115 w.Header().Set("Content-Type", "text/html; charset=utf-8") 87 116 if err := pages.Settings(view).Render(r.Context(), w); err != nil { 88 117 slog.Error("render settings", "err", err) 89 118 } 90 119 } 91 120 92 92 - // ExportCSV streams the viewer's notes as a CSV download. 121 121 + // ExportCSV streams the viewer's connections and notes as a CSV download. 122 122 + // Includes all connections from the user's PDS, merged with any local notes. 93 123 func (h *Handlers) ExportCSV(w http.ResponseWriter, r *http.Request) { 94 124 did, _, ok := h.Auth.RequireSession(w, r) 95 125 if !ok { 96 126 return 97 127 } 98 128 99 99 - rows, err := notes.ListAll(r.Context(), h.DB, did.String()) 129 129 + // Load all notes into a map keyed by target DID. 130 130 + noteRows, err := notes.ListAll(r.Context(), h.DB, did.String()) 100 131 if err != nil { 101 132 slog.Warn("settings: export notes", "did", did.String(), "err", err) 102 102 - http.Error(w, "failed to export", http.StatusInternalServerError) 103 103 - return 133 133 + } 134 134 + noteMap := make(map[string]notes.ExportRow, len(noteRows)) 135 135 + for _, nr := range noteRows { 136 136 + noteMap[nr.TargetDID] = nr 137 137 + } 138 138 + 139 139 + // Load all connections from the user's PDS. 140 140 + pdsHost := h.lookupPDS(r, did) 141 141 + conns, err := connection.List(r.Context(), pdsHost, did) 142 142 + if err != nil { 143 143 + slog.Warn("settings: export connections", "did", did.String(), "err", err) 104 144 } 105 145 106 146 w.Header().Set("Content-Type", "text/csv; charset=utf-8") 107 107 - w.Header().Set("Content-Disposition", "attachment; filename=atmoquest-notes.csv") 147 147 + w.Header().Set("Content-Disposition", "attachment; filename=atmoquest-connections.csv") 108 148 109 149 cw := csv.NewWriter(w) 110 110 - _ = cw.Write([]string{"target_did", "handle", "notes", "follow_up", "updated_at"}) 111 111 - for _, row := range rows { 150 150 + _ = cw.Write([]string{"target_did", "handle", "connected_at", "event", "notes", "follow_up"}) 151 151 + 152 152 + // Track which DIDs we've already written (connections may have dupes across events). 153 153 + written := make(map[string]bool) 154 154 + 155 155 + for _, c := range conns { 156 156 + targetDID := c.With.String() 157 157 + handle := h.resolveHandle(r, targetDID) 158 158 + connectedAt := "" 159 159 + if !c.ConnectedAt.IsZero() { 160 160 + connectedAt = c.ConnectedAt.Format("2006-01-02T15:04:05Z") 161 161 + } 162 162 + noteText := "" 112 163 followUp := "no" 113 113 - if row.FollowUp { 164 164 + if nr, ok := noteMap[targetDID]; ok { 165 165 + noteText = nr.Notes 166 166 + if nr.FollowUp { 167 167 + followUp = "yes" 168 168 + } 169 169 + written[targetDID] = true 170 170 + } 171 171 + _ = cw.Write([]string{targetDID, handle, connectedAt, c.EventURI, noteText, followUp}) 172 172 + } 173 173 + 174 174 + // Write any notes for DIDs that didn't appear in the connection list 175 175 + // (e.g., notes left over after a connection was deleted). 176 176 + for _, nr := range noteRows { 177 177 + if written[nr.TargetDID] { 178 178 + continue 179 179 + } 180 180 + handle := h.resolveHandle(r, nr.TargetDID) 181 181 + followUp := "no" 182 182 + if nr.FollowUp { 114 183 followUp = "yes" 115 184 } 116 116 - handle := h.resolveHandle(r, row.TargetDID) 117 117 - _ = cw.Write([]string{row.TargetDID, handle, row.Notes, followUp, row.UpdatedAt}) 185 185 + _ = cw.Write([]string{nr.TargetDID, handle, "", "", nr.Notes, followUp}) 118 186 } 187 187 + 119 188 cw.Flush() 120 189 } 121 190 191 191 + // lookupPDS returns the PDS host for the given DID from oauth_sessions. 192 192 + func (h *Handlers) lookupPDS(r *http.Request, did syntax.DID) string { 193 193 + if h.DB != nil { 194 194 + var host string 195 195 + err := h.DB.QueryRowContext(r.Context(), ` 196 196 + SELECT data ->> 'host_url' FROM oauth_sessions 197 197 + WHERE did = ? ORDER BY updated_at DESC LIMIT 1 198 198 + `, did.String()).Scan(&host) 199 199 + if err == nil && host != "" { 200 200 + return host 201 201 + } 202 202 + } 203 203 + return "https://bsky.social" 204 204 + } 205 205 + 206 206 + // TogglePrivacy handles POST /settings/privacy — toggles a privacy setting. 207 207 + func (h *Handlers) TogglePrivacy(w http.ResponseWriter, r *http.Request) { 208 208 + did, _, ok := h.Auth.RequireSession(w, r) 209 209 + if !ok { 210 210 + return 211 211 + } 212 212 + 213 213 + if err := r.ParseForm(); err != nil { 214 214 + http.Error(w, "bad request", http.StatusBadRequest) 215 215 + return 216 216 + } 217 217 + 218 218 + field := r.FormValue("field") 219 219 + // value="1" means "toggle ON (hide)", value="0" means "toggle OFF (show)" 220 220 + value := r.FormValue("value") == "1" 221 221 + 222 222 + var column string 223 223 + switch field { 224 224 + case "hide_from_attendees": 225 225 + column = "hide_from_attendees" 226 226 + case "hide_from_leaderboard": 227 227 + column = "hide_from_leaderboard" 228 228 + default: 229 229 + http.Error(w, "unknown field", http.StatusBadRequest) 230 230 + return 231 231 + } 232 232 + 233 233 + if err := users.SetPrivacy(r.Context(), h.DB, did, column, value); err != nil { 234 234 + slog.Warn("settings: toggle privacy", "did", did.String(), "field", field, "err", err) 235 235 + http.Error(w, "failed to update", http.StatusInternalServerError) 236 236 + return 237 237 + } 238 238 + 239 239 + http.Redirect(w, r, "/settings", http.StatusSeeOther) 240 240 + } 241 241 + 122 242 // DeleteData handles POST /settings/delete — deletes all the viewer's notes 123 243 // after verifying the handle confirmation field matches. If the "purge_pds" 124 244 // checkbox is checked, also deletes all quest.atmo.* records from the user's ··· 239 359 _, _ = h.DB.ExecContext(r.Context(), `DELETE FROM users WHERE did = ? AND is_admin = 0`, did.String()) 240 360 241 361 slog.Info("settings purge: local cache cleared", "did", did.String()) 362 362 + } 363 363 + 364 364 + // NotesList renders /settings/notes — a table of all local notes and follow-up flags. 365 365 + func (h *Handlers) NotesList(w http.ResponseWriter, r *http.Request) { 366 366 + did, sess, ok := h.Auth.RequireSession(w, r) 367 367 + if !ok { 368 368 + return 369 369 + } 370 370 + 371 371 + // Award "Extra Curious" badge for exploring data pages. 372 372 + if sess != nil { 373 373 + _, _ = badge.Award(r.Context(), sess, h.DB, badge.AwardExtraCurious, "") 374 374 + } 375 375 + 376 376 + rows, err := notes.ListAll(r.Context(), h.DB, did.String()) 377 377 + if err != nil { 378 378 + slog.Warn("settings: list notes", "err", err) 379 379 + } 380 380 + 381 381 + var view pages.NotesListView 382 382 + for _, nr := range rows { 383 383 + handle := h.resolveHandle(r, nr.TargetDID) 384 384 + view.Notes = append(view.Notes, pages.NoteRow{ 385 385 + TargetDID: nr.TargetDID, 386 386 + Handle: handle, 387 387 + Notes: nr.Notes, 388 388 + FollowUp: nr.FollowUp, 389 389 + UpdatedAt: nr.UpdatedAt, 390 390 + }) 391 391 + } 392 392 + 393 393 + w.Header().Set("Content-Type", "text/html; charset=utf-8") 394 394 + if err := pages.NotesList(view).Render(r.Context(), w); err != nil { 395 395 + slog.Error("render notes list", "err", err) 396 396 + } 397 397 + } 398 398 + 399 399 + // PDSData renders /settings/pds — all quest.atmo.* records from the user's PDS. 400 400 + func (h *Handlers) PDSData(w http.ResponseWriter, r *http.Request) { 401 401 + did, sess, ok := h.Auth.RequireSession(w, r) 402 402 + if !ok { 403 403 + return 404 404 + } 405 405 + 406 406 + // Award "Extra Curious" badge for exploring data pages. 407 407 + _, _ = badge.Award(r.Context(), sess, h.DB, badge.AwardExtraCurious, "") 408 408 + 409 409 + pds := sess.Data.HostURL 410 410 + pdsDisplay := strings.TrimPrefix(strings.TrimPrefix(pds, "https://"), "http://") 411 411 + 412 412 + collections := []string{ 413 413 + "quest.atmo.profile", 414 414 + "quest.atmo.connection", 415 415 + "quest.atmo.checkin", 416 416 + "quest.atmo.badge", 417 417 + "quest.atmo.event", 418 418 + } 419 419 + 420 420 + apiClient := sess.APIClient() 421 421 + var colls []pages.PDSCollection 422 422 + 423 423 + for _, coll := range collections { 424 424 + pc := pages.PDSCollection{Name: coll} 425 425 + cursor := "" 426 426 + for { 427 427 + params := map[string]any{ 428 428 + "repo": did.String(), 429 429 + "collection": coll, 430 430 + "limit": 100, 431 431 + } 432 432 + if cursor != "" { 433 433 + params["cursor"] = cursor 434 434 + } 435 435 + var resp struct { 436 436 + Records []struct { 437 437 + URI string `json:"uri"` 438 438 + Value map[string]any `json:"value"` 439 439 + } `json:"records"` 440 440 + Cursor string `json:"cursor,omitempty"` 441 441 + } 442 442 + if err := apiClient.Get(r.Context(), syntax.NSID("com.atproto.repo.listRecords"), params, &resp); err != nil { 443 443 + slog.Warn("settings pds: list", "collection", coll, "err", err) 444 444 + break 445 445 + } 446 446 + for _, rec := range resp.Records { 447 447 + pretty, _ := json.MarshalIndent(rec.Value, "", " ") 448 448 + pc.Records = append(pc.Records, pages.PDSRecord{ 449 449 + URI: rec.URI, 450 450 + RKey: rkeyFromURI(rec.URI), 451 451 + Value: string(pretty), 452 452 + }) 453 453 + } 454 454 + if resp.Cursor == "" || len(resp.Records) == 0 { 455 455 + break 456 456 + } 457 457 + cursor = resp.Cursor 458 458 + } 459 459 + colls = append(colls, pc) 460 460 + } 461 461 + 462 462 + view := pages.PDSDataView{ 463 463 + PDS: pdsDisplay, 464 464 + Collections: colls, 465 465 + } 466 466 + 467 467 + w.Header().Set("Content-Type", "text/html; charset=utf-8") 468 468 + if err := pages.PDSData(view).Render(r.Context(), w); err != nil { 469 469 + slog.Error("render pds data", "err", err) 470 470 + } 242 471 } 243 472 244 473 // rkeyFromURI extracts the record key (last path segment) from an at:// URI.

+94

features/settings/pages/notes_list.templ

Reviewed

··· 1 1 + package pages 2 2 + 3 3 + import "atmoquest/features/common/layouts" 4 4 + 5 5 + // NotesListView is the data for the /settings/notes page. 6 6 + type NotesListView struct { 7 7 + Notes []NoteRow 8 8 + } 9 9 + 10 10 + // NoteRow is one row in the local notes table. 11 11 + type NoteRow struct { 12 12 + TargetDID string 13 13 + Handle string 14 14 + DisplayName string 15 15 + Notes string 16 16 + FollowUp bool 17 17 + UpdatedAt string 18 18 + } 19 19 + 20 20 + templ NotesList(v NotesListView) { 21 21 + @layouts.Base("local notes", "Your private notes stored in the app.") { 22 22 + <div class="window"> 23 23 + <div class="window-bar"> 24 24 + <div class="dot dot-r"></div> 25 25 + <div class="dot dot-y"></div> 26 26 + <div class="dot dot-g"></div> 27 27 + <div class="window-title">~/atmo.quest — local notes</div> 28 28 + @layouts.TopNav("settings") 29 29 + </div> 30 30 + <div class="window-body"> 31 31 + <div class="settings-content"> 32 32 + <div class="settings-title">Local notes</div> 33 33 + <div class="settings-sub"> 34 34 + This data is stored in the application's database since it's private data. 35 35 + The rest of your data is stored in <a href="/settings/pds">your PDS</a>. 36 36 + Once private data can be safely stored in your ATProto PDS, we will move this data there. 37 37 + </div> 38 38 + 39 39 + <a href="/settings" class="btn btn-ghost btn-sm" style="margin-bottom:16px">← back to settings</a> 40 40 + 41 41 + if len(v.Notes) == 0 { 42 42 + <p class="muted" style="text-align:center;padding:24px 0">no notes yet. visit a connection's profile to add one.</p> 43 43 + } else { 44 44 + <div class="admin-table-wrap"> 45 45 + <table class="admin-table"> 46 46 + <thead> 47 47 + <tr> 48 48 + <th>person</th> 49 49 + <th>notes</th> 50 50 + <th>follow up</th> 51 51 + <th>updated</th> 52 52 + </tr> 53 53 + </thead> 54 54 + <tbody> 55 55 + for _, n := range v.Notes { 56 56 + <tr> 57 57 + <td> 58 58 + <a href={ templ.SafeURL("/connections/" + n.TargetDID) }> 59 59 + if n.DisplayName != "" { 60 60 + <strong>{ n.DisplayName }</strong> 61 61 + } else if n.Handle != "" { 62 62 + { "@" + n.Handle } 63 63 + } else { 64 64 + <code class="break">{ n.TargetDID }</code> 65 65 + } 66 66 + </a> 67 67 + </td> 68 68 + <td style="max-width:300px;white-space:pre-wrap;word-break:break-word">{ n.Notes }</td> 69 69 + <td> 70 70 + if n.FollowUp { 71 71 + <span class="followup-flag">⚑ yes</span> 72 72 + } else { 73 73 + <span class="muted">—</span> 74 74 + } 75 75 + </td> 76 76 + <td class="nowrap muted">{ n.UpdatedAt }</td> 77 77 + </tr> 78 78 + } 79 79 + </tbody> 80 80 + </table> 81 81 + </div> 82 82 + } 83 83 + </div> 84 84 + </div> 85 85 + <div class="statusbar"> 86 86 + <a href="/" class="statusbar-brand">atmo.quest</a> 87 87 + </div> 88 88 + </div> 89 89 + <footer> 90 90 + <a href="https://tangled.org/vvill.dev/atmoquest" rel="noopener noreferrer" target="_blank">source on tangled</a> 91 91 + </footer> 92 92 + @layouts.BottomNav("settings") 93 93 + } 94 94 + }

+217

features/settings/pages/notes_list_templ.go

Reviewed

··· 1 1 + // Code generated by templ - DO NOT EDIT. 2 2 + 3 3 + // templ: version: v0.3.1020 4 4 + package pages 5 5 + 6 6 + //lint:file-ignore SA4006 This context is only used if a nested component is present. 7 7 + 8 8 + import "github.com/a-h/templ" 9 9 + import templruntime "github.com/a-h/templ/runtime" 10 10 + 11 11 + import "atmoquest/features/common/layouts" 12 12 + 13 13 + // NotesListView is the data for the /settings/notes page. 14 14 + type NotesListView struct { 15 15 + Notes []NoteRow 16 16 + } 17 17 + 18 18 + // NoteRow is one row in the local notes table. 19 19 + type NoteRow struct { 20 20 + TargetDID string 21 21 + Handle string 22 22 + DisplayName string 23 23 + Notes string 24 24 + FollowUp bool 25 25 + UpdatedAt string 26 26 + } 27 27 + 28 28 + func NotesList(v NotesListView) templ.Component { 29 29 + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 30 30 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 31 31 + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { 32 32 + return templ_7745c5c3_CtxErr 33 33 + } 34 34 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 35 35 + if !templ_7745c5c3_IsBuffer { 36 36 + defer func() { 37 37 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 38 38 + if templ_7745c5c3_Err == nil { 39 39 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 40 40 + } 41 41 + }() 42 42 + } 43 43 + ctx = templ.InitializeContext(ctx) 44 44 + templ_7745c5c3_Var1 := templ.GetChildren(ctx) 45 45 + if templ_7745c5c3_Var1 == nil { 46 46 + templ_7745c5c3_Var1 = templ.NopComponent 47 47 + } 48 48 + ctx = templ.ClearChildren(ctx) 49 49 + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 50 50 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 51 51 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 52 52 + if !templ_7745c5c3_IsBuffer { 53 53 + defer func() { 54 54 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 55 55 + if templ_7745c5c3_Err == nil { 56 56 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 57 57 + } 58 58 + }() 59 59 + } 60 60 + ctx = templ.InitializeContext(ctx) 61 61 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"window\"><div class=\"window-bar\"><div class=\"dot dot-r\"></div><div class=\"dot dot-y\"></div><div class=\"dot dot-g\"></div><div class=\"window-title\">~/atmo.quest — local notes</div>") 62 62 + if templ_7745c5c3_Err != nil { 63 63 + return templ_7745c5c3_Err 64 64 + } 65 65 + templ_7745c5c3_Err = layouts.TopNav("settings").Render(ctx, templ_7745c5c3_Buffer) 66 66 + if templ_7745c5c3_Err != nil { 67 67 + return templ_7745c5c3_Err 68 68 + } 69 69 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div><div class=\"window-body\"><div class=\"settings-content\"><div class=\"settings-title\">Local notes</div><div class=\"settings-sub\">This data is stored in the application's database since it's private data. The rest of your data is stored in <a href=\"/settings/pds\">your PDS</a>. Once private data can be safely stored in your ATProto PDS, we will move this data there.</div><a href=\"/settings\" class=\"btn btn-ghost btn-sm\" style=\"margin-bottom:16px\">← back to settings</a> ") 70 70 + if templ_7745c5c3_Err != nil { 71 71 + return templ_7745c5c3_Err 72 72 + } 73 73 + if len(v.Notes) == 0 { 74 74 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "<p class=\"muted\" style=\"text-align:center;padding:24px 0\">no notes yet. visit a connection's profile to add one.</p>") 75 75 + if templ_7745c5c3_Err != nil { 76 76 + return templ_7745c5c3_Err 77 77 + } 78 78 + } else { 79 79 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"admin-table-wrap\"><table class=\"admin-table\"><thead><tr><th>person</th><th>notes</th><th>follow up</th><th>updated</th></tr></thead> <tbody>") 80 80 + if templ_7745c5c3_Err != nil { 81 81 + return templ_7745c5c3_Err 82 82 + } 83 83 + for _, n := range v.Notes { 84 84 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<tr><td><a href=\"") 85 85 + if templ_7745c5c3_Err != nil { 86 86 + return templ_7745c5c3_Err 87 87 + } 88 88 + var templ_7745c5c3_Var3 templ.SafeURL 89 89 + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinURLErrs(templ.SafeURL("/connections/" + n.TargetDID)) 90 90 + if templ_7745c5c3_Err != nil { 91 91 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 58, Col: 66} 92 92 + } 93 93 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) 94 94 + if templ_7745c5c3_Err != nil { 95 95 + return templ_7745c5c3_Err 96 96 + } 97 97 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\">") 98 98 + if templ_7745c5c3_Err != nil { 99 99 + return templ_7745c5c3_Err 100 100 + } 101 101 + if n.DisplayName != "" { 102 102 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "<strong>") 103 103 + if templ_7745c5c3_Err != nil { 104 104 + return templ_7745c5c3_Err 105 105 + } 106 106 + var templ_7745c5c3_Var4 string 107 107 + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(n.DisplayName) 108 108 + if templ_7745c5c3_Err != nil { 109 109 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 60, Col: 37} 110 110 + } 111 111 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) 112 112 + if templ_7745c5c3_Err != nil { 113 113 + return templ_7745c5c3_Err 114 114 + } 115 115 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</strong>") 116 116 + if templ_7745c5c3_Err != nil { 117 117 + return templ_7745c5c3_Err 118 118 + } 119 119 + } else if n.Handle != "" { 120 120 + var templ_7745c5c3_Var5 string 121 121 + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs("@" + n.Handle) 122 122 + if templ_7745c5c3_Err != nil { 123 123 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 62, Col: 30} 124 124 + } 125 125 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) 126 126 + if templ_7745c5c3_Err != nil { 127 127 + return templ_7745c5c3_Err 128 128 + } 129 129 + } else { 130 130 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<code class=\"break\">") 131 131 + if templ_7745c5c3_Err != nil { 132 132 + return templ_7745c5c3_Err 133 133 + } 134 134 + var templ_7745c5c3_Var6 string 135 135 + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(n.TargetDID) 136 136 + if templ_7745c5c3_Err != nil { 137 137 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 64, Col: 47} 138 138 + } 139 139 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) 140 140 + if templ_7745c5c3_Err != nil { 141 141 + return templ_7745c5c3_Err 142 142 + } 143 143 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</code>") 144 144 + if templ_7745c5c3_Err != nil { 145 145 + return templ_7745c5c3_Err 146 146 + } 147 147 + } 148 148 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</a></td><td style=\"max-width:300px;white-space:pre-wrap;word-break:break-word\">") 149 149 + if templ_7745c5c3_Err != nil { 150 150 + return templ_7745c5c3_Err 151 151 + } 152 152 + var templ_7745c5c3_Var7 string 153 153 + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(n.Notes) 154 154 + if templ_7745c5c3_Err != nil { 155 155 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 68, Col: 91} 156 156 + } 157 157 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) 158 158 + if templ_7745c5c3_Err != nil { 159 159 + return templ_7745c5c3_Err 160 160 + } 161 161 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</td><td>") 162 162 + if templ_7745c5c3_Err != nil { 163 163 + return templ_7745c5c3_Err 164 164 + } 165 165 + if n.FollowUp { 166 166 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "<span class=\"followup-flag\">⚑ yes</span>") 167 167 + if templ_7745c5c3_Err != nil { 168 168 + return templ_7745c5c3_Err 169 169 + } 170 170 + } else { 171 171 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<span class=\"muted\">—</span>") 172 172 + if templ_7745c5c3_Err != nil { 173 173 + return templ_7745c5c3_Err 174 174 + } 175 175 + } 176 176 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</td><td class=\"nowrap muted\">") 177 177 + if templ_7745c5c3_Err != nil { 178 178 + return templ_7745c5c3_Err 179 179 + } 180 180 + var templ_7745c5c3_Var8 string 181 181 + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(n.UpdatedAt) 182 182 + if templ_7745c5c3_Err != nil { 183 183 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/notes_list.templ`, Line: 76, Col: 49} 184 184 + } 185 185 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) 186 186 + if templ_7745c5c3_Err != nil { 187 187 + return templ_7745c5c3_Err 188 188 + } 189 189 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</td></tr>") 190 190 + if templ_7745c5c3_Err != nil { 191 191 + return templ_7745c5c3_Err 192 192 + } 193 193 + } 194 194 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "</tbody></table></div>") 195 195 + if templ_7745c5c3_Err != nil { 196 196 + return templ_7745c5c3_Err 197 197 + } 198 198 + } 199 199 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 200 200 + if templ_7745c5c3_Err != nil { 201 201 + return templ_7745c5c3_Err 202 202 + } 203 203 + templ_7745c5c3_Err = layouts.BottomNav("settings").Render(ctx, templ_7745c5c3_Buffer) 204 204 + if templ_7745c5c3_Err != nil { 205 205 + return templ_7745c5c3_Err 206 206 + } 207 207 + return nil 208 208 + }) 209 209 + templ_7745c5c3_Err = layouts.Base("local notes", "Your private notes stored in the app.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 210 210 + if templ_7745c5c3_Err != nil { 211 211 + return templ_7745c5c3_Err 212 212 + } 213 213 + return nil 214 214 + }) 215 215 + } 216 216 + 217 217 + var _ = templruntime.GeneratedTemplate

+93

features/settings/pages/pds_data.templ

Reviewed

··· 1 1 + package pages 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + 6 6 + "atmoquest/features/common/layouts" 7 7 + ) 8 8 + 9 9 + // PDSDataView is the data for the /settings/pds page. 10 10 + type PDSDataView struct { 11 11 + PDS string // PDS hostname 12 12 + Collections []PDSCollection 13 13 + } 14 14 + 15 15 + // PDSCollection is one quest.atmo.* collection with its records. 16 16 + type PDSCollection struct { 17 17 + Name string // e.g. "quest.atmo.connection" 18 18 + Records []PDSRecord 19 19 + } 20 20 + 21 21 + // PDSRecord is a single record from the user's PDS. 22 22 + type PDSRecord struct { 23 23 + URI string 24 24 + RKey string 25 25 + Value string // pretty-printed JSON 26 26 + } 27 27 + 28 28 + templ PDSData(v PDSDataView) { 29 29 + @layouts.Base("PDS data", "Your atmo.quest records stored in your ATProto PDS.") { 30 30 + <div class="window"> 31 31 + <div class="window-bar"> 32 32 + <div class="dot dot-r"></div> 33 33 + <div class="dot dot-y"></div> 34 34 + <div class="dot dot-g"></div> 35 35 + <div class="window-title">~/atmo.quest — PDS data</div> 36 36 + @layouts.TopNav("settings") 37 37 + </div> 38 38 + <div class="window-body"> 39 39 + <div class="settings-content"> 40 40 + <div class="settings-title">PDS data</div> 41 41 + <div class="settings-sub"> 42 42 + These records are stored in your ATProto Personal Data Server 43 43 + if v.PDS != "" { 44 44 + (<span class="pds-name">{ v.PDS }</span>) 45 45 + } 46 46 + — they're yours and travel with your account. This is the core idea behind ATProto: 47 47 + your data lives in your repo, not in our database. 48 48 + </div> 49 49 + 50 50 + <a href="/settings" class="btn btn-ghost btn-sm" style="margin-bottom:16px">← back to settings</a> 51 51 + 52 52 + for _, coll := range v.Collections { 53 53 + <div class="settings-group"> 54 54 + <div class="settings-group-label">{ coll.Name } <span class="muted" style="font-weight:normal">({ pdsRecordCount(len(coll.Records)) })</span></div> 55 55 + if len(coll.Records) == 0 { 56 56 + <p class="muted" style="padding:8px 0">no records</p> 57 57 + } else { 58 58 + <div class="pds-records-list"> 59 59 + for _, rec := range coll.Records { 60 60 + <details class="pds-record"> 61 61 + <summary class="pds-record-summary"> 62 62 + <code class="pds-record-rkey">{ rec.RKey }</code> 63 63 + </summary> 64 64 + <pre class="pds-record-json">{ rec.Value }</pre> 65 65 + </details> 66 66 + } 67 67 + </div> 68 68 + } 69 69 + </div> 70 70 + } 71 71 + </div> 72 72 + </div> 73 73 + <div class="statusbar"> 74 74 + <a href="/" class="statusbar-brand">atmo.quest</a> 75 75 + </div> 76 76 + </div> 77 77 + <footer> 78 78 + <a href="https://tangled.org/vvill.dev/atmoquest" rel="noopener noreferrer" target="_blank">source on tangled</a> 79 79 + </footer> 80 80 + @layouts.BottomNav("settings") 81 81 + } 82 82 + } 83 83 + 84 84 + func pdsRecordCount(n int) string { 85 85 + if n == 1 { 86 86 + return "1 record" 87 87 + } 88 88 + return pdsItoa(n) + " records" 89 89 + } 90 90 + 91 91 + func pdsItoa(n int) string { 92 92 + return fmt.Sprintf("%d", n) 93 93 + }

+216

features/settings/pages/pds_data_templ.go

Reviewed

··· 1 1 + // Code generated by templ - DO NOT EDIT. 2 2 + 3 3 + // templ: version: v0.3.1020 4 4 + package pages 5 5 + 6 6 + //lint:file-ignore SA4006 This context is only used if a nested component is present. 7 7 + 8 8 + import "github.com/a-h/templ" 9 9 + import templruntime "github.com/a-h/templ/runtime" 10 10 + 11 11 + import ( 12 12 + "fmt" 13 13 + 14 14 + "atmoquest/features/common/layouts" 15 15 + ) 16 16 + 17 17 + // PDSDataView is the data for the /settings/pds page. 18 18 + type PDSDataView struct { 19 19 + PDS string // PDS hostname 20 20 + Collections []PDSCollection 21 21 + } 22 22 + 23 23 + // PDSCollection is one quest.atmo.* collection with its records. 24 24 + type PDSCollection struct { 25 25 + Name string // e.g. "quest.atmo.connection" 26 26 + Records []PDSRecord 27 27 + } 28 28 + 29 29 + // PDSRecord is a single record from the user's PDS. 30 30 + type PDSRecord struct { 31 31 + URI string 32 32 + RKey string 33 33 + Value string // pretty-printed JSON 34 34 + } 35 35 + 36 36 + func PDSData(v PDSDataView) templ.Component { 37 37 + return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 38 38 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 39 39 + if templ_7745c5c3_CtxErr := ctx.Err(); templ_7745c5c3_CtxErr != nil { 40 40 + return templ_7745c5c3_CtxErr 41 41 + } 42 42 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 43 43 + if !templ_7745c5c3_IsBuffer { 44 44 + defer func() { 45 45 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 46 46 + if templ_7745c5c3_Err == nil { 47 47 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 48 48 + } 49 49 + }() 50 50 + } 51 51 + ctx = templ.InitializeContext(ctx) 52 52 + templ_7745c5c3_Var1 := templ.GetChildren(ctx) 53 53 + if templ_7745c5c3_Var1 == nil { 54 54 + templ_7745c5c3_Var1 = templ.NopComponent 55 55 + } 56 56 + ctx = templ.ClearChildren(ctx) 57 57 + templ_7745c5c3_Var2 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { 58 58 + templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context 59 59 + templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) 60 60 + if !templ_7745c5c3_IsBuffer { 61 61 + defer func() { 62 62 + templ_7745c5c3_BufErr := templruntime.ReleaseBuffer(templ_7745c5c3_Buffer) 63 63 + if templ_7745c5c3_Err == nil { 64 64 + templ_7745c5c3_Err = templ_7745c5c3_BufErr 65 65 + } 66 66 + }() 67 67 + } 68 68 + ctx = templ.InitializeContext(ctx) 69 69 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<div class=\"window\"><div class=\"window-bar\"><div class=\"dot dot-r\"></div><div class=\"dot dot-y\"></div><div class=\"dot dot-g\"></div><div class=\"window-title\">~/atmo.quest — PDS data</div>") 70 70 + if templ_7745c5c3_Err != nil { 71 71 + return templ_7745c5c3_Err 72 72 + } 73 73 + templ_7745c5c3_Err = layouts.TopNav("settings").Render(ctx, templ_7745c5c3_Buffer) 74 74 + if templ_7745c5c3_Err != nil { 75 75 + return templ_7745c5c3_Err 76 76 + } 77 77 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div><div class=\"window-body\"><div class=\"settings-content\"><div class=\"settings-title\">PDS data</div><div class=\"settings-sub\">These records are stored in your ATProto Personal Data Server ") 78 78 + if templ_7745c5c3_Err != nil { 79 79 + return templ_7745c5c3_Err 80 80 + } 81 81 + if v.PDS != "" { 82 82 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 3, "(<span class=\"pds-name\">") 83 83 + if templ_7745c5c3_Err != nil { 84 84 + return templ_7745c5c3_Err 85 85 + } 86 86 + var templ_7745c5c3_Var3 string 87 87 + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(v.PDS) 88 88 + if templ_7745c5c3_Err != nil { 89 89 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 44, Col: 38} 90 90 + } 91 91 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) 92 92 + if templ_7745c5c3_Err != nil { 93 93 + return templ_7745c5c3_Err 94 94 + } 95 95 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</span>) ") 96 96 + if templ_7745c5c3_Err != nil { 97 97 + return templ_7745c5c3_Err 98 98 + } 99 99 + } 100 100 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "— they're yours and travel with your account. This is the core idea behind ATProto: your data lives in your repo, not in our database.</div><a href=\"/settings\" class=\"btn btn-ghost btn-sm\" style=\"margin-bottom:16px\">← back to settings</a> ") 101 101 + if templ_7745c5c3_Err != nil { 102 102 + return templ_7745c5c3_Err 103 103 + } 104 104 + for _, coll := range v.Collections { 105 105 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "<div class=\"settings-group\"><div class=\"settings-group-label\">") 106 106 + if templ_7745c5c3_Err != nil { 107 107 + return templ_7745c5c3_Err 108 108 + } 109 109 + var templ_7745c5c3_Var4 string 110 110 + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(coll.Name) 111 111 + if templ_7745c5c3_Err != nil { 112 112 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 54, Col: 52} 113 113 + } 114 114 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) 115 115 + if templ_7745c5c3_Err != nil { 116 116 + return templ_7745c5c3_Err 117 117 + } 118 118 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, " <span class=\"muted\" style=\"font-weight:normal\">(") 119 119 + if templ_7745c5c3_Err != nil { 120 120 + return templ_7745c5c3_Err 121 121 + } 122 122 + var templ_7745c5c3_Var5 string 123 123 + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(pdsRecordCount(len(coll.Records))) 124 124 + if templ_7745c5c3_Err != nil { 125 125 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 54, Col: 138} 126 126 + } 127 127 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) 128 128 + if templ_7745c5c3_Err != nil { 129 129 + return templ_7745c5c3_Err 130 130 + } 131 131 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, ")</span></div>") 132 132 + if templ_7745c5c3_Err != nil { 133 133 + return templ_7745c5c3_Err 134 134 + } 135 135 + if len(coll.Records) == 0 { 136 136 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<p class=\"muted\" style=\"padding:8px 0\">no records</p>") 137 137 + if templ_7745c5c3_Err != nil { 138 138 + return templ_7745c5c3_Err 139 139 + } 140 140 + } else { 141 141 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<div class=\"pds-records-list\">") 142 142 + if templ_7745c5c3_Err != nil { 143 143 + return templ_7745c5c3_Err 144 144 + } 145 145 + for _, rec := range coll.Records { 146 146 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "<details class=\"pds-record\"><summary class=\"pds-record-summary\"><code class=\"pds-record-rkey\">") 147 147 + if templ_7745c5c3_Err != nil { 148 148 + return templ_7745c5c3_Err 149 149 + } 150 150 + var templ_7745c5c3_Var6 string 151 151 + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(rec.RKey) 152 152 + if templ_7745c5c3_Err != nil { 153 153 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 62, Col: 52} 154 154 + } 155 155 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) 156 156 + if templ_7745c5c3_Err != nil { 157 157 + return templ_7745c5c3_Err 158 158 + } 159 159 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</code></summary><pre class=\"pds-record-json\">") 160 160 + if templ_7745c5c3_Err != nil { 161 161 + return templ_7745c5c3_Err 162 162 + } 163 163 + var templ_7745c5c3_Var7 string 164 164 + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(rec.Value) 165 165 + if templ_7745c5c3_Err != nil { 166 166 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/pds_data.templ`, Line: 64, Col: 51} 167 167 + } 168 168 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) 169 169 + if templ_7745c5c3_Err != nil { 170 170 + return templ_7745c5c3_Err 171 171 + } 172 172 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</pre></details>") 173 173 + if templ_7745c5c3_Err != nil { 174 174 + return templ_7745c5c3_Err 175 175 + } 176 176 + } 177 177 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "</div>") 178 178 + if templ_7745c5c3_Err != nil { 179 179 + return templ_7745c5c3_Err 180 180 + } 181 181 + } 182 182 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</div>") 183 183 + if templ_7745c5c3_Err != nil { 184 184 + return templ_7745c5c3_Err 185 185 + } 186 186 + } 187 187 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 188 188 + if templ_7745c5c3_Err != nil { 189 189 + return templ_7745c5c3_Err 190 190 + } 191 191 + templ_7745c5c3_Err = layouts.BottomNav("settings").Render(ctx, templ_7745c5c3_Buffer) 192 192 + if templ_7745c5c3_Err != nil { 193 193 + return templ_7745c5c3_Err 194 194 + } 195 195 + return nil 196 196 + }) 197 197 + templ_7745c5c3_Err = layouts.Base("PDS data", "Your atmo.quest records stored in your ATProto PDS.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 198 198 + if templ_7745c5c3_Err != nil { 199 199 + return templ_7745c5c3_Err 200 200 + } 201 201 + return nil 202 202 + }) 203 203 + } 204 204 + 205 205 + func pdsRecordCount(n int) string { 206 206 + if n == 1 { 207 207 + return "1 record" 208 208 + } 209 209 + return pdsItoa(n) + " records" 210 210 + } 211 211 + 212 212 + func pdsItoa(n int) string { 213 213 + return fmt.Sprintf("%d", n) 214 214 + } 215 215 + 216 216 + var _ = templruntime.GeneratedTemplate

+100 -46

features/settings/pages/settings.templ

Reviewed

··· 11 11 Handle string // user's atproto handle 12 12 DisplayName string // user's display name 13 13 AvatarInitial string // first letter for avatar placeholder 14 14 + AvatarURL string // user's avatar URL from Bluesky profile 14 15 PDS string // PDS hostname (e.g. "bsky.social") 15 16 NoteCount int // number of local notes 16 17 Deleted bool // true after a successful delete 17 18 DeleteError string // non-empty when confirmation failed 18 19 IsAdmin bool // show admin link when true 20 20 + ShowAttendees bool // true = visible on attendee lists (default) 21 21 + ShowLeaderboard bool // true = visible on leaderboard (default) 19 22 } 20 23 21 24 func settingsItoa(n int) string { 22 25 return fmt.Sprintf("%d", n) 26 26 + } 27 27 + 28 28 + func deleteConfirmStyle(deleteError string) string { 29 29 + if deleteError != "" { 30 30 + return "margin-top:8px;" 31 31 + } 32 32 + return "display:none;margin-top:8px;" 23 33 } 24 34 25 35 templ Settings(v SettingsView) { 26 26 - @layouts.Base("settings — atmo.quest", "Manage your account, privacy, and data.") { 36 36 + @layouts.Base("settings", "Manage your account, privacy, and data.") { 27 37 <div class="window"> 28 38 <div class="window-bar"> 29 39 <div class="dot dot-r"></div> ··· 35 45 <div class="window-body"> 36 46 <div class="settings-content"> 37 47 <div class="settings-title">Settings</div> 38 38 - <div class="settings-sub">v0.1 · atmo.quest</div> 48 48 + <div class="settings-sub">atmo.quest</div> 39 49 40 50 if v.Deleted { 41 51 <div class="settings-success" role="status"> ··· 46 56 47 57 // ── Account card ── 48 58 <div class="settings-account-card"> 49 49 - <div class="settings-account-avatar">{ v.AvatarInitial }</div> 59 59 + if v.AvatarURL != "" { 60 60 + <img class="settings-account-avatar-img" src={ v.AvatarURL } alt={ v.DisplayName } loading="lazy"/> 61 61 + } else { 62 62 + <div class="settings-account-avatar">{ v.AvatarInitial }</div> 63 63 + } 50 64 <div> 51 65 <div class="settings-account-name"> 52 66 if v.DisplayName != "" { ··· 66 80 <div class="settings-group"> 67 81 <div class="settings-group-label">Privacy</div> 68 82 <div class="settings-list"> 69 69 - <div class="settings-row"> 70 70 - <div class="settings-row-icon">◆</div> 71 71 - <div class="settings-row-body"> 72 72 - <div class="settings-row-title">Show me on event attendee lists</div> 73 73 - <div class="settings-row-desc">when off, you can still scan and connect</div> 74 74 - </div> 75 75 - <div class="toggle on"></div> 76 76 - </div> 77 77 - <div class="settings-row"> 78 78 - <div class="settings-row-icon">◇</div> 79 79 - <div class="settings-row-body"> 80 80 - <div class="settings-row-title">Appear on the leaderboard</div> 81 81 - <div class="settings-row-desc">opt out anytime</div> 82 82 - </div> 83 83 - <div class="toggle on"></div> 84 84 - </div> 83 83 + <form method="POST" action="/settings/privacy" class="settings-row" style="display:flex;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;padding:0;margin:0;"> 84 84 + <input type="hidden" name="field" value="hide_from_attendees"/> 85 85 + if v.ShowAttendees { 86 86 + <input type="hidden" name="value" value="1"/> 87 87 + } else { 88 88 + <input type="hidden" name="value" value="0"/> 89 89 + } 90 90 + <button type="submit" class="settings-row" style="width:100%;text-align:left;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;"> 91 91 + <div class="settings-row-icon">◆</div> 92 92 + <div class="settings-row-body"> 93 93 + <div class="settings-row-title">Show me on event attendee lists</div> 94 94 + <div class="settings-row-desc">when off, you can still scan and connect</div> 95 95 + </div> 96 96 + if v.ShowAttendees { 97 97 + <div class="toggle on"></div> 98 98 + } else { 99 99 + <div class="toggle off"></div> 100 100 + } 101 101 + </button> 102 102 + </form> 103 103 + <form method="POST" action="/settings/privacy" class="settings-row" style="display:flex;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;padding:0;margin:0;"> 104 104 + <input type="hidden" name="field" value="hide_from_leaderboard"/> 105 105 + if v.ShowLeaderboard { 106 106 + <input type="hidden" name="value" value="1"/> 107 107 + } else { 108 108 + <input type="hidden" name="value" value="0"/> 109 109 + } 110 110 + <button type="submit" class="settings-row" style="width:100%;text-align:left;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;"> 111 111 + <div class="settings-row-icon">◆</div> 112 112 + <div class="settings-row-body"> 113 113 + <div class="settings-row-title">Appear on the leaderboard</div> 114 114 + <div class="settings-row-desc">opt out anytime</div> 115 115 + </div> 116 116 + if v.ShowLeaderboard { 117 117 + <div class="toggle on"></div> 118 118 + } else { 119 119 + <div class="toggle off"></div> 120 120 + } 121 121 + </button> 122 122 + </form> 85 123 </div> 86 124 </div> 87 125 ··· 97 135 </div> 98 136 <div class="settings-row-value"><span class="arrow">›</span></div> 99 137 </a> 100 100 - <div class="settings-row"> 101 101 - <div class="settings-row-icon">◇</div> 138 138 + <a href="/settings/notes" class="settings-row"> 139 139 + <div class="settings-row-icon">◆</div> 102 140 <div class="settings-row-body"> 103 141 <div class="settings-row-title">Local notes</div> 104 104 - <div class="settings-row-desc">stored in the app</div> 142 142 + <div class="settings-row-desc">stored in the app's database (private)</div> 105 143 </div> 106 144 <div class="settings-row-value">{ settingsItoa(v.NoteCount) } notes <span class="arrow">›</span></div> 107 107 - </div> 145 145 + </a> 146 146 + <a href="/settings/pds" class="settings-row"> 147 147 + <div class="settings-row-icon">◆</div> 148 148 + <div class="settings-row-body"> 149 149 + <div class="settings-row-title">PDS data</div> 150 150 + <div class="settings-row-desc">stored in your ATProto PDS</div> 151 151 + </div> 152 152 + <div class="settings-row-value"><span class="arrow">›</span></div> 153 153 + </a> 108 154 </div> 109 155 </div> 110 156 ··· 121 167 <div class="settings-row-value"><span class="arrow">↗</span></div> 122 168 </a> 123 169 <a href="https://tangled.org/vvill.dev/atmoquest" class="settings-row" target="_blank" rel="noopener noreferrer"> 124 124 - <div class="settings-row-icon">◇</div> 170 170 + <div class="settings-row-icon">◆</div> 125 171 <div class="settings-row-body"> 126 172 <div class="settings-row-title">Open source</div> 127 173 <div class="settings-row-desc">contribute, file issues, fork</div> ··· 129 175 <div class="settings-row-value"><span class="arrow">↗</span></div> 130 176 </a> 131 177 <a href="https://tangled.org/vvill.dev/atmoquest/issues" class="settings-row" target="_blank" rel="noopener noreferrer"> 132 132 - <div class="settings-row-icon">▲</div> 178 178 + <div class="settings-row-icon">◆</div> 133 179 <div class="settings-row-body"> 134 180 <div class="settings-row-title">Send feedback</div> 135 181 <div class="settings-row-desc">tell us what's broken or missing</div> ··· 141 187 142 188 // ── Account (danger) ── 143 189 <div class="settings-group"> 144 144 - <div class="settings-group-label">Account</div> 190 190 + <div class="settings-group-label">Danger zone</div> 145 191 <div class="settings-list"> 146 192 <form method="POST" action="/oauth/logout" style="display:contents"> 147 193 <button type="submit" class="settings-row danger" style="width:100%;text-align:left;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;"> 148 148 - <div class="settings-row-icon">◇</div> 194 194 + <div class="settings-row-icon">◆</div> 149 195 <div class="settings-row-body"> 150 196 <div class="settings-row-title">Sign out</div> 151 197 <div class="settings-row-desc">your records stay in your PDS</div> ··· 174 220 } 175 221 176 222 <div class="settings-footer"> 177 177 - built on <a href="https://atproto.com" target="_blank" rel="noopener noreferrer">ATProto</a> · open source · made for conferences 178 178 - <div class="version">atmo.quest v0.1.0-pre</div> 223 223 + built on <a href="https://atproto.com" target="_blank" rel="noopener noreferrer">ATProto</a> · open source · made for connecting 224 224 + <div class="version">atmo.quest</div> 179 225 </div> 180 226 </div> 181 227 </div> ··· 193 239 194 240 templ deleteDataRow(v SettingsView) { 195 241 <div class="settings-row danger" id="delete-data-row"> 196 196 - <div class="settings-row-icon">▲</div> 242 242 + <div class="settings-row-icon">◆</div> 197 243 <div class="settings-row-body"> 198 244 <div class="settings-row-title">Delete atmo.quest data</div> 199 245 <div class="settings-row-desc">removes local notes and flags</div> ··· 202 248 { v.DeleteError } 203 249 </div> 204 250 } 205 205 - <form method="POST" action="/settings/delete" class="settings-delete-form" style="margin-top:8px;"> 206 206 - <label class="pv-followup-toggle" style="margin-bottom:8px;display:flex;align-items:center;gap:8px;cursor:pointer;"> 207 207 - <input type="checkbox" name="purge_pds" value="1"/> 208 208 - <span class="settings-row-desc" style="margin:0;">also delete all quest.atmo.* records from my PDS</span> 209 209 - </label> 210 210 - <input 211 211 - type="text" 212 212 - name="confirm_handle" 213 213 - placeholder={ "type " + v.Handle + " to confirm" } 214 214 - class="settings-confirm-input" 215 215 - autocomplete="off" 216 216 - required 217 217 - aria-label="Type your handle to confirm deletion" 218 218 - /> 219 219 - <button type="submit" class="btn btn-danger btn-sm">delete</button> 220 220 - </form> 251 251 + <div class="settings-delete-confirm" id="delete-confirm" style={ deleteConfirmStyle(v.DeleteError) }> 252 252 + <form method="POST" action="/settings/delete" class="settings-delete-form"> 253 253 + <label class="pv-followup-toggle" style="margin-bottom:8px;display:flex;align-items:center;gap:8px;cursor:pointer;"> 254 254 + <input type="checkbox" name="purge_pds" value="1"/> 255 255 + <span class="settings-row-desc" style="margin:0;">also delete all quest.atmo.* records from my PDS</span> 256 256 + </label> 257 257 + <div style="display:flex;gap:8px;align-items:center;"> 258 258 + <input 259 259 + type="text" 260 260 + name="confirm_handle" 261 261 + placeholder={ "type " + v.Handle + " to confirm" } 262 262 + class="settings-confirm-input" 263 263 + autocomplete="off" 264 264 + required 265 265 + aria-label="Type your handle to confirm deletion" 266 266 + /> 267 267 + <button type="submit" class="btn btn-danger btn-sm">confirm</button> 268 268 + <button type="button" class="btn btn-ghost btn-sm" onclick="document.getElementById('delete-confirm').style.display='none'">cancel</button> 269 269 + </div> 270 270 + </form> 271 271 + </div> 272 272 + </div> 273 273 + <div class="settings-row-value"> 274 274 + <button type="button" class="btn btn-danger btn-sm" onclick="document.getElementById('delete-confirm').style.display='block'">delete</button> 221 275 </div> 222 276 </div> 223 277 }

+194 -70

features/settings/pages/settings_templ.go

Reviewed

··· 16 16 17 17 // SettingsView is the data for the settings page. 18 18 type SettingsView struct { 19 19 - Handle string // user's atproto handle 20 20 - DisplayName string // user's display name 21 21 - AvatarInitial string // first letter for avatar placeholder 22 22 - PDS string // PDS hostname (e.g. "bsky.social") 23 23 - NoteCount int // number of local notes 24 24 - Deleted bool // true after a successful delete 25 25 - DeleteError string // non-empty when confirmation failed 26 26 - IsAdmin bool // show admin link when true 19 19 + Handle string // user's atproto handle 20 20 + DisplayName string // user's display name 21 21 + AvatarInitial string // first letter for avatar placeholder 22 22 + AvatarURL string // user's avatar URL from Bluesky profile 23 23 + PDS string // PDS hostname (e.g. "bsky.social") 24 24 + NoteCount int // number of local notes 25 25 + Deleted bool // true after a successful delete 26 26 + DeleteError string // non-empty when confirmation failed 27 27 + IsAdmin bool // show admin link when true 28 28 + ShowAttendees bool // true = visible on attendee lists (default) 29 29 + ShowLeaderboard bool // true = visible on leaderboard (default) 27 30 } 28 31 29 32 func settingsItoa(n int) string { 30 33 return fmt.Sprintf("%d", n) 34 34 + } 35 35 + 36 36 + func deleteConfirmStyle(deleteError string) string { 37 37 + if deleteError != "" { 38 38 + return "margin-top:8px;" 39 39 + } 40 40 + return "display:none;margin-top:8px;" 31 41 } 32 42 33 43 func Settings(v SettingsView) templ.Component { ··· 71 81 if templ_7745c5c3_Err != nil { 72 82 return templ_7745c5c3_Err 73 83 } 74 74 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div><div class=\"window-body\"><div class=\"settings-content\"><div class=\"settings-title\">Settings</div><div class=\"settings-sub\">v0.1 · atmo.quest</div>") 84 84 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 2, "</div><div class=\"window-body\"><div class=\"settings-content\"><div class=\"settings-title\">Settings</div><div class=\"settings-sub\">atmo.quest</div>") 75 85 if templ_7745c5c3_Err != nil { 76 86 return templ_7745c5c3_Err 77 87 } ··· 81 91 return templ_7745c5c3_Err 82 92 } 83 93 } 84 84 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"settings-account-card\"><div class=\"settings-account-avatar\">") 94 94 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "<div class=\"settings-account-card\">") 85 95 if templ_7745c5c3_Err != nil { 86 96 return templ_7745c5c3_Err 87 97 } 88 88 - var templ_7745c5c3_Var3 string 89 89 - templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(v.AvatarInitial) 90 90 - if templ_7745c5c3_Err != nil { 91 91 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 49, Col: 60} 92 92 - } 93 93 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) 94 94 - if templ_7745c5c3_Err != nil { 95 95 - return templ_7745c5c3_Err 98 98 + if v.AvatarURL != "" { 99 99 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<img class=\"settings-account-avatar-img\" src=\"") 100 100 + if templ_7745c5c3_Err != nil { 101 101 + return templ_7745c5c3_Err 102 102 + } 103 103 + var templ_7745c5c3_Var3 string 104 104 + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.AvatarURL) 105 105 + if templ_7745c5c3_Err != nil { 106 106 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 60, Col: 65} 107 107 + } 108 108 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3) 109 109 + if templ_7745c5c3_Err != nil { 110 110 + return templ_7745c5c3_Err 111 111 + } 112 112 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "\" alt=\"") 113 113 + if templ_7745c5c3_Err != nil { 114 114 + return templ_7745c5c3_Err 115 115 + } 116 116 + var templ_7745c5c3_Var4 string 117 117 + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.ResolveAttributeValue(v.DisplayName) 118 118 + if templ_7745c5c3_Err != nil { 119 119 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 60, Col: 87} 120 120 + } 121 121 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var4) 122 122 + if templ_7745c5c3_Err != nil { 123 123 + return templ_7745c5c3_Err 124 124 + } 125 125 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "\" loading=\"lazy\">") 126 126 + if templ_7745c5c3_Err != nil { 127 127 + return templ_7745c5c3_Err 128 128 + } 129 129 + } else { 130 130 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "<div class=\"settings-account-avatar\">") 131 131 + if templ_7745c5c3_Err != nil { 132 132 + return templ_7745c5c3_Err 133 133 + } 134 134 + var templ_7745c5c3_Var5 string 135 135 + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.AvatarInitial) 136 136 + if templ_7745c5c3_Err != nil { 137 137 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 62, Col: 61} 138 138 + } 139 139 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) 140 140 + if templ_7745c5c3_Err != nil { 141 141 + return templ_7745c5c3_Err 142 142 + } 143 143 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "</div>") 144 144 + if templ_7745c5c3_Err != nil { 145 145 + return templ_7745c5c3_Err 146 146 + } 96 147 } 97 97 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "</div><div><div class=\"settings-account-name\">") 148 148 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "<div><div class=\"settings-account-name\">") 98 149 if templ_7745c5c3_Err != nil { 99 150 return templ_7745c5c3_Err 100 151 } 101 152 if v.DisplayName != "" { 102 102 - var templ_7745c5c3_Var4 string 103 103 - templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.DisplayName) 153 153 + var templ_7745c5c3_Var6 string 154 154 + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.DisplayName) 104 155 if templ_7745c5c3_Err != nil { 105 105 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 53, Col: 24} 156 156 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 67, Col: 24} 106 157 } 107 107 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) 158 158 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) 108 159 if templ_7745c5c3_Err != nil { 109 160 return templ_7745c5c3_Err 110 161 } 111 162 } else { 112 112 - var templ_7745c5c3_Var5 string 113 113 - templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.Handle) 163 163 + var templ_7745c5c3_Var7 string 164 164 + templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.Handle) 114 165 if templ_7745c5c3_Err != nil { 115 115 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 55, Col: 19} 166 166 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 69, Col: 19} 116 167 } 117 117 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) 168 168 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) 118 169 if templ_7745c5c3_Err != nil { 119 170 return templ_7745c5c3_Err 120 171 } 121 172 } 122 122 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 6, "</div><div class=\"settings-account-handle\"><span class=\"at\">") 173 173 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div><div class=\"settings-account-handle\"><span class=\"at\">") 123 174 if templ_7745c5c3_Err != nil { 124 175 return templ_7745c5c3_Err 125 176 } 126 126 - var templ_7745c5c3_Var6 string 127 127 - templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs("@") 177 177 + var templ_7745c5c3_Var8 string 178 178 + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("@") 128 179 if templ_7745c5c3_Err != nil { 129 129 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 58, Col: 66} 180 180 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 72, Col: 66} 130 181 } 131 131 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) 182 182 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) 132 183 if templ_7745c5c3_Err != nil { 133 184 return templ_7745c5c3_Err 134 185 } 135 135 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "</span>") 186 186 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, "</span>") 136 187 if templ_7745c5c3_Err != nil { 137 188 return templ_7745c5c3_Err 138 189 } 139 139 - var templ_7745c5c3_Var7 string 140 140 - templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.Handle) 190 190 + var templ_7745c5c3_Var9 string 191 191 + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.Handle) 141 192 if templ_7745c5c3_Err != nil { 142 142 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 58, Col: 85} 193 193 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 72, Col: 85} 143 194 } 144 144 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) 195 195 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) 145 196 if templ_7745c5c3_Err != nil { 146 197 return templ_7745c5c3_Err 147 198 } 148 148 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "</div>") 199 199 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div>") 149 200 if templ_7745c5c3_Err != nil { 150 201 return templ_7745c5c3_Err 151 202 } 152 203 if v.PDS != "" { 153 153 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 9, "<div class=\"settings-account-pds\">PDS · <span class=\"pds-name\">") 204 204 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"settings-account-pds\">PDS · <span class=\"pds-name\">") 154 205 if templ_7745c5c3_Err != nil { 155 206 return templ_7745c5c3_Err 156 207 } 157 157 - var templ_7745c5c3_Var8 string 158 158 - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.PDS) 208 208 + var templ_7745c5c3_Var10 string 209 209 + templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(v.PDS) 159 210 if templ_7745c5c3_Err != nil { 160 160 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 60, Col: 79} 211 211 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 74, Col: 79} 161 212 } 162 162 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) 213 213 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) 163 214 if templ_7745c5c3_Err != nil { 164 215 return templ_7745c5c3_Err 165 216 } 166 166 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 10, "</span></div>") 217 217 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "</span></div>") 167 218 if templ_7745c5c3_Err != nil { 168 219 return templ_7745c5c3_Err 169 220 } 170 221 } 171 171 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 11, "</div></div><div class=\"settings-group\"><div class=\"settings-group-label\">Privacy</div><div class=\"settings-list\"><div class=\"settings-row\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Show me on event attendee lists</div><div class=\"settings-row-desc\">when off, you can still scan and connect</div></div><div class=\"toggle on\"></div></div><div class=\"settings-row\"><div class=\"settings-row-icon\">◇</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Appear on the leaderboard</div><div class=\"settings-row-desc\">opt out anytime</div></div><div class=\"toggle on\"></div></div></div></div><div class=\"settings-group\"><div class=\"settings-group-label\">Your data</div><div class=\"settings-list\"><a href=\"/settings/export\" class=\"settings-row\" download><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Export connections & notes</div><div class=\"settings-row-desc\">download a CSV summary</div></div><div class=\"settings-row-value\"><span class=\"arrow\">›</span></div></a><div class=\"settings-row\"><div class=\"settings-row-icon\">◇</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Local notes</div><div class=\"settings-row-desc\">stored in the app</div></div><div class=\"settings-row-value\">") 222 222 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "</div></div><div class=\"settings-group\"><div class=\"settings-group-label\">Privacy</div><div class=\"settings-list\"><form method=\"POST\" action=\"/settings/privacy\" class=\"settings-row\" style=\"display:flex;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;padding:0;margin:0;\"><input type=\"hidden\" name=\"field\" value=\"hide_from_attendees\"> ") 172 223 if templ_7745c5c3_Err != nil { 173 224 return templ_7745c5c3_Err 174 225 } 175 175 - var templ_7745c5c3_Var9 string 176 176 - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(settingsItoa(v.NoteCount)) 226 226 + if v.ShowAttendees { 227 227 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<input type=\"hidden\" name=\"value\" value=\"1\"> ") 228 228 + if templ_7745c5c3_Err != nil { 229 229 + return templ_7745c5c3_Err 230 230 + } 231 231 + } else { 232 232 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "<input type=\"hidden\" name=\"value\" value=\"0\"> ") 233 233 + if templ_7745c5c3_Err != nil { 234 234 + return templ_7745c5c3_Err 235 235 + } 236 236 + } 237 237 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<button type=\"submit\" class=\"settings-row\" style=\"width:100%;text-align:left;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Show me on event attendee lists</div><div class=\"settings-row-desc\">when off, you can still scan and connect</div></div>") 177 238 if templ_7745c5c3_Err != nil { 178 178 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 106, Col: 67} 239 239 + return templ_7745c5c3_Err 179 240 } 180 180 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) 241 241 + if v.ShowAttendees { 242 242 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "<div class=\"toggle on\"></div>") 243 243 + if templ_7745c5c3_Err != nil { 244 244 + return templ_7745c5c3_Err 245 245 + } 246 246 + } else { 247 247 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 21, "<div class=\"toggle off\"></div>") 248 248 + if templ_7745c5c3_Err != nil { 249 249 + return templ_7745c5c3_Err 250 250 + } 251 251 + } 252 252 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 22, "</button></form><form method=\"POST\" action=\"/settings/privacy\" class=\"settings-row\" style=\"display:flex;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;padding:0;margin:0;\"><input type=\"hidden\" name=\"field\" value=\"hide_from_leaderboard\"> ") 181 253 if templ_7745c5c3_Err != nil { 182 254 return templ_7745c5c3_Err 183 255 } 184 184 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 12, " notes <span class=\"arrow\">›</span></div></div></div></div><div class=\"settings-group\"><div class=\"settings-group-label\">About</div><div class=\"settings-list\"><a href=\"https://atproto.com\" class=\"settings-row\" target=\"_blank\" rel=\"noopener noreferrer\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">What's ATProto?</div><div class=\"settings-row-desc\">the protocol atmo.quest is built on</div></div><div class=\"settings-row-value\"><span class=\"arrow\">↗</span></div></a> <a href=\"https://tangled.org/vvill.dev/atmoquest\" class=\"settings-row\" target=\"_blank\" rel=\"noopener noreferrer\"><div class=\"settings-row-icon\">◇</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Open source</div><div class=\"settings-row-desc\">contribute, file issues, fork</div></div><div class=\"settings-row-value\"><span class=\"arrow\">↗</span></div></a> <a href=\"https://tangled.org/vvill.dev/atmoquest/issues\" class=\"settings-row\" target=\"_blank\" rel=\"noopener noreferrer\"><div class=\"settings-row-icon\">▲</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Send feedback</div><div class=\"settings-row-desc\">tell us what's broken or missing</div></div><div class=\"settings-row-value\"><span class=\"arrow\">↗</span></div></a></div></div><div class=\"settings-group\"><div class=\"settings-group-label\">Account</div><div class=\"settings-list\"><form method=\"POST\" action=\"/oauth/logout\" style=\"display:contents\"><button type=\"submit\" class=\"settings-row danger\" style=\"width:100%;text-align:left;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;\"><div class=\"settings-row-icon\">◇</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Sign out</div><div class=\"settings-row-desc\">your records stay in your PDS</div></div><div class=\"settings-row-value\"><span class=\"arrow\">›</span></div></button></form>") 256 256 + if v.ShowLeaderboard { 257 257 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 23, "<input type=\"hidden\" name=\"value\" value=\"1\"> ") 258 258 + if templ_7745c5c3_Err != nil { 259 259 + return templ_7745c5c3_Err 260 260 + } 261 261 + } else { 262 262 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 24, "<input type=\"hidden\" name=\"value\" value=\"0\"> ") 263 263 + if templ_7745c5c3_Err != nil { 264 264 + return templ_7745c5c3_Err 265 265 + } 266 266 + } 267 267 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 25, "<button type=\"submit\" class=\"settings-row\" style=\"width:100%;text-align:left;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Appear on the leaderboard</div><div class=\"settings-row-desc\">opt out anytime</div></div>") 268 268 + if templ_7745c5c3_Err != nil { 269 269 + return templ_7745c5c3_Err 270 270 + } 271 271 + if v.ShowLeaderboard { 272 272 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 26, "<div class=\"toggle on\"></div>") 273 273 + if templ_7745c5c3_Err != nil { 274 274 + return templ_7745c5c3_Err 275 275 + } 276 276 + } else { 277 277 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 27, "<div class=\"toggle off\"></div>") 278 278 + if templ_7745c5c3_Err != nil { 279 279 + return templ_7745c5c3_Err 280 280 + } 281 281 + } 282 282 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 28, "</button></form></div></div><div class=\"settings-group\"><div class=\"settings-group-label\">Your data</div><div class=\"settings-list\"><a href=\"/settings/export\" class=\"settings-row\" download><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Export connections & notes</div><div class=\"settings-row-desc\">download a CSV summary</div></div><div class=\"settings-row-value\"><span class=\"arrow\">›</span></div></a> <a href=\"/settings/notes\" class=\"settings-row\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Local notes</div><div class=\"settings-row-desc\">stored in the app's database (private)</div></div><div class=\"settings-row-value\">") 283 283 + if templ_7745c5c3_Err != nil { 284 284 + return templ_7745c5c3_Err 285 285 + } 286 286 + var templ_7745c5c3_Var11 string 287 287 + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(settingsItoa(v.NoteCount)) 288 288 + if templ_7745c5c3_Err != nil { 289 289 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 144, Col: 67} 290 290 + } 291 291 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) 292 292 + if templ_7745c5c3_Err != nil { 293 293 + return templ_7745c5c3_Err 294 294 + } 295 295 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 29, " notes <span class=\"arrow\">›</span></div></a> <a href=\"/settings/pds\" class=\"settings-row\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">PDS data</div><div class=\"settings-row-desc\">stored in your ATProto PDS</div></div><div class=\"settings-row-value\"><span class=\"arrow\">›</span></div></a></div></div><div class=\"settings-group\"><div class=\"settings-group-label\">About</div><div class=\"settings-list\"><a href=\"https://atproto.com\" class=\"settings-row\" target=\"_blank\" rel=\"noopener noreferrer\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">What's ATProto?</div><div class=\"settings-row-desc\">the protocol atmo.quest is built on</div></div><div class=\"settings-row-value\"><span class=\"arrow\">↗</span></div></a> <a href=\"https://tangled.org/vvill.dev/atmoquest\" class=\"settings-row\" target=\"_blank\" rel=\"noopener noreferrer\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Open source</div><div class=\"settings-row-desc\">contribute, file issues, fork</div></div><div class=\"settings-row-value\"><span class=\"arrow\">↗</span></div></a> <a href=\"https://tangled.org/vvill.dev/atmoquest/issues\" class=\"settings-row\" target=\"_blank\" rel=\"noopener noreferrer\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Send feedback</div><div class=\"settings-row-desc\">tell us what's broken or missing</div></div><div class=\"settings-row-value\"><span class=\"arrow\">↗</span></div></a></div></div><div class=\"settings-group\"><div class=\"settings-group-label\">Danger zone</div><div class=\"settings-list\"><form method=\"POST\" action=\"/oauth/logout\" style=\"display:contents\"><button type=\"submit\" class=\"settings-row danger\" style=\"width:100%;text-align:left;background:none;border:none;font-family:inherit;cursor:pointer;color:inherit;\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Sign out</div><div class=\"settings-row-desc\">your records stay in your PDS</div></div><div class=\"settings-row-value\"><span class=\"arrow\">›</span></div></button></form>") 185 296 if templ_7745c5c3_Err != nil { 186 297 return templ_7745c5c3_Err 187 298 } ··· 189 300 if templ_7745c5c3_Err != nil { 190 301 return templ_7745c5c3_Err 191 302 } 192 192 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, "</div></div>") 303 303 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 30, "</div></div>") 193 304 if templ_7745c5c3_Err != nil { 194 305 return templ_7745c5c3_Err 195 306 } 196 307 if v.IsAdmin { 197 197 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 14, "<div class=\"settings-group\"><div class=\"settings-group-label\">Admin</div><div class=\"settings-list\"><a href=\"/admin\" class=\"settings-row\"><div class=\"settings-row-icon\">⚙</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Admin console</div><div class=\"settings-row-desc\">manage events and users</div></div><div class=\"settings-row-value\"><span class=\"arrow\">›</span></div></a></div></div>") 308 308 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 31, "<div class=\"settings-group\"><div class=\"settings-group-label\">Admin</div><div class=\"settings-list\"><a href=\"/admin\" class=\"settings-row\"><div class=\"settings-row-icon\">⚙</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Admin console</div><div class=\"settings-row-desc\">manage events and users</div></div><div class=\"settings-row-value\"><span class=\"arrow\">›</span></div></a></div></div>") 198 309 if templ_7745c5c3_Err != nil { 199 310 return templ_7745c5c3_Err 200 311 } 201 312 } 202 202 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 15, "<div class=\"settings-footer\">built on <a href=\"https://atproto.com\" target=\"_blank\" rel=\"noopener noreferrer\">ATProto</a> · open source · made for conferences<div class=\"version\">atmo.quest v0.1.0-pre</div></div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 313 313 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 32, "<div class=\"settings-footer\">built on <a href=\"https://atproto.com\" target=\"_blank\" rel=\"noopener noreferrer\">ATProto</a> · open source · made for connecting<div class=\"version\">atmo.quest</div></div></div></div><div class=\"statusbar\"><a href=\"/\" class=\"statusbar-brand\">atmo.quest</a></div></div><footer><a href=\"https://tangled.org/vvill.dev/atmoquest\" rel=\"noopener noreferrer\" target=\"_blank\">source on tangled</a></footer>") 203 314 if templ_7745c5c3_Err != nil { 204 315 return templ_7745c5c3_Err 205 316 } ··· 209 320 } 210 321 return nil 211 322 }) 212 212 - templ_7745c5c3_Err = layouts.Base("settings — atmo.quest", "Manage your account, privacy, and data.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 323 323 + templ_7745c5c3_Err = layouts.Base("settings", "Manage your account, privacy, and data.").Render(templ.WithChildren(ctx, templ_7745c5c3_Var2), templ_7745c5c3_Buffer) 213 324 if templ_7745c5c3_Err != nil { 214 325 return templ_7745c5c3_Err 215 326 } ··· 233 344 }() 234 345 } 235 346 ctx = templ.InitializeContext(ctx) 236 236 - templ_7745c5c3_Var10 := templ.GetChildren(ctx) 237 237 - if templ_7745c5c3_Var10 == nil { 238 238 - templ_7745c5c3_Var10 = templ.NopComponent 347 347 + templ_7745c5c3_Var12 := templ.GetChildren(ctx) 348 348 + if templ_7745c5c3_Var12 == nil { 349 349 + templ_7745c5c3_Var12 = templ.NopComponent 239 350 } 240 351 ctx = templ.ClearChildren(ctx) 241 241 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<div class=\"settings-row danger\" id=\"delete-data-row\"><div class=\"settings-row-icon\">▲</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Delete atmo.quest data</div><div class=\"settings-row-desc\">removes local notes and flags</div>") 352 352 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 33, "<div class=\"settings-row danger\" id=\"delete-data-row\"><div class=\"settings-row-icon\">◆</div><div class=\"settings-row-body\"><div class=\"settings-row-title\">Delete atmo.quest data</div><div class=\"settings-row-desc\">removes local notes and flags</div>") 242 353 if templ_7745c5c3_Err != nil { 243 354 return templ_7745c5c3_Err 244 355 } 245 356 if v.DeleteError != "" { 246 246 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 17, "<div class=\"settings-error\" role=\"alert\" style=\"margin-top:8px;\">") 357 357 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 34, "<div class=\"settings-error\" role=\"alert\" style=\"margin-top:8px;\">") 247 358 if templ_7745c5c3_Err != nil { 248 359 return templ_7745c5c3_Err 249 360 } 250 250 - var templ_7745c5c3_Var11 string 251 251 - templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(v.DeleteError) 361 361 + var templ_7745c5c3_Var13 string 362 362 + templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(v.DeleteError) 252 363 if templ_7745c5c3_Err != nil { 253 253 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 202, Col: 20} 364 364 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 248, Col: 20} 254 365 } 255 255 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) 366 366 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) 256 367 if templ_7745c5c3_Err != nil { 257 368 return templ_7745c5c3_Err 258 369 } 259 259 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 18, "</div>") 370 370 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 35, "</div>") 260 371 if templ_7745c5c3_Err != nil { 261 372 return templ_7745c5c3_Err 262 373 } 263 374 } 264 264 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 19, "<form method=\"POST\" action=\"/settings/delete\" class=\"settings-delete-form\" style=\"margin-top:8px;\"><label class=\"pv-followup-toggle\" style=\"margin-bottom:8px;display:flex;align-items:center;gap:8px;cursor:pointer;\"><input type=\"checkbox\" name=\"purge_pds\" value=\"1\"> <span class=\"settings-row-desc\" style=\"margin:0;\">also delete all quest.atmo.* records from my PDS</span></label> <input type=\"text\" name=\"confirm_handle\" placeholder=\"") 375 375 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 36, "<div class=\"settings-delete-confirm\" id=\"delete-confirm\" style=\"") 376 376 + if templ_7745c5c3_Err != nil { 377 377 + return templ_7745c5c3_Err 378 378 + } 379 379 + var templ_7745c5c3_Var14 string 380 380 + templ_7745c5c3_Var14, templ_7745c5c3_Err = templruntime.SanitizeStyleAttributeValues(deleteConfirmStyle(v.DeleteError)) 381 381 + if templ_7745c5c3_Err != nil { 382 382 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 251, Col: 101} 383 383 + } 384 384 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) 265 385 if templ_7745c5c3_Err != nil { 266 386 return templ_7745c5c3_Err 267 387 } 268 268 - var templ_7745c5c3_Var12 string 269 269 - templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.ResolveAttributeValue("type " + v.Handle + " to confirm") 388 388 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 37, "\"><form method=\"POST\" action=\"/settings/delete\" class=\"settings-delete-form\"><label class=\"pv-followup-toggle\" style=\"margin-bottom:8px;display:flex;align-items:center;gap:8px;cursor:pointer;\"><input type=\"checkbox\" name=\"purge_pds\" value=\"1\"> <span class=\"settings-row-desc\" style=\"margin:0;\">also delete all quest.atmo.* records from my PDS</span></label><div style=\"display:flex;gap:8px;align-items:center;\"><input type=\"text\" name=\"confirm_handle\" placeholder=\"") 270 389 if templ_7745c5c3_Err != nil { 271 271 - return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 213, Col: 53} 390 390 + return templ_7745c5c3_Err 272 391 } 273 273 - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12) 392 392 + var templ_7745c5c3_Var15 string 393 393 + templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.ResolveAttributeValue("type " + v.Handle + " to confirm") 394 394 + if templ_7745c5c3_Err != nil { 395 395 + return templ.Error{Err: templ_7745c5c3_Err, FileName: `features/settings/pages/settings.templ`, Line: 261, Col: 55} 396 396 + } 397 397 + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15) 274 398 if templ_7745c5c3_Err != nil { 275 399 return templ_7745c5c3_Err 276 400 } 277 277 - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 20, "\" class=\"settings-confirm-input\" autocomplete=\"off\" required aria-label=\"Type your handle to confirm deletion\"> <button type=\"submit\" class=\"btn btn-danger btn-sm\">delete</button></form></div></div>") 401 401 + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 38, "\" class=\"settings-confirm-input\" autocomplete=\"off\" required aria-label=\"Type your handle to confirm deletion\"> <button type=\"submit\" class=\"btn btn-danger btn-sm\">confirm</button> <button type=\"button\" class=\"btn btn-ghost btn-sm\" onclick=\"document.getElementById('delete-confirm').style.display='none'\">cancel</button></div></form></div></div><div class=\"settings-row-value\"><button type=\"button\" class=\"btn btn-danger btn-sm\" onclick=\"document.getElementById('delete-confirm').style.display='block'\">delete</button></div></div>") 278 402 if templ_7745c5c3_Err != nil { 279 403 return templ_7745c5c3_Err 280 404 }

+6 -1

features/settings/routes.go

Reviewed

··· 11 11 // SetupRoutes wires the settings feature's HTTP routes. 12 12 // 13 13 // - GET /settings — settings page 14 14 - // - GET /settings/export — CSV download of notes 14 14 + // - GET /settings/export — CSV download of connections & notes 15 15 + // - GET /settings/notes — local notes table 16 16 + // - GET /settings/pds — PDS records viewer 15 17 // - POST /settings/delete — delete all notes (requires handle confirmation) 16 18 func SetupRoutes(router chi.Router, conn *sql.DB, authH *auth.Handlers) { 17 19 h := NewHandlers(conn, authH) 18 20 19 21 router.Get("/settings", h.Page) 20 22 router.Get("/settings/export", h.ExportCSV) 23 23 + router.Get("/settings/notes", h.NotesList) 24 24 + router.Get("/settings/pds", h.PDSData) 25 25 + router.Post("/settings/privacy", h.TogglePrivacy) 21 26 router.Post("/settings/delete", h.DeleteData) 22 27 }

+235

internal/admincrypto/signer_test.go

Reviewed

··· 1 1 + package admincrypto 2 2 + 3 3 + import ( 4 4 + "crypto/ed25519" 5 5 + "crypto/rand" 6 6 + "encoding/base64" 7 7 + "os" 8 8 + "path/filepath" 9 9 + "testing" 10 10 + ) 11 11 + 12 12 + // generateTestSigner creates a fresh Ed25519 Signer for testing. 13 13 + func generateTestSigner() (*Signer, error) { 14 14 + pub, priv, err := ed25519.GenerateKey(rand.Reader) 15 15 + if err != nil { 16 16 + return nil, err 17 17 + } 18 18 + return &Signer{priv: priv, pub: pub, KeyID: "v1"}, nil 19 19 + } 20 20 + 21 21 + func TestSigner_SignAndVerify(t *testing.T) { 22 22 + signer, err := generateTestSigner() 23 23 + if err != nil { 24 24 + t.Fatalf("generate signer: %v", err) 25 25 + } 26 26 + 27 27 + msg := []byte(`{"event_uri":"at://test","label":"CascadiaJS"}`) 28 28 + sig := signer.Sign(msg) 29 29 + if sig == "" { 30 30 + t.Fatal("Sign returned empty string") 31 31 + } 32 32 + 33 33 + if !signer.Verify(msg, sig) { 34 34 + t.Error("Verify returned false for valid signature") 35 35 + } 36 36 + } 37 37 + 38 38 + func TestSigner_VerifyRejectsModifiedMessage(t *testing.T) { 39 39 + signer, _ := generateTestSigner() 40 40 + 41 41 + msg := []byte(`{"test":"original"}`) 42 42 + sig := signer.Sign(msg) 43 43 + 44 44 + modified := []byte(`{"test":"modified"}`) 45 45 + if signer.Verify(modified, sig) { 46 46 + t.Error("Verify returned true for modified message") 47 47 + } 48 48 + } 49 49 + 50 50 + func TestSigner_VerifyRejectsModifiedSignature(t *testing.T) { 51 51 + signer, _ := generateTestSigner() 52 52 + 53 53 + msg := []byte(`{"test":"data"}`) 54 54 + sig := signer.Sign(msg) 55 55 + 56 56 + // Flip a character in the base64 signature. 57 57 + tampered := []byte(sig) 58 58 + if tampered[10] == 'A' { 59 59 + tampered[10] = 'B' 60 60 + } else { 61 61 + tampered[10] = 'A' 62 62 + } 63 63 + if signer.Verify(msg, string(tampered)) { 64 64 + t.Error("Verify returned true for tampered signature") 65 65 + } 66 66 + } 67 67 + 68 68 + func TestSigner_VerifyRejectsInvalidBase64(t *testing.T) { 69 69 + signer, _ := generateTestSigner() 70 70 + msg := []byte("test") 71 71 + if signer.Verify(msg, "not-valid-base64!@#$%") { 72 72 + t.Error("Verify returned true for invalid base64") 73 73 + } 74 74 + } 75 75 + 76 76 + func TestSigner_NilSafety(t *testing.T) { 77 77 + var s *Signer 78 78 + 79 79 + // Sign on nil signer returns empty. 80 80 + if got := s.Sign([]byte("test")); got != "" { 81 81 + t.Errorf("nil Sign = %q; want empty", got) 82 82 + } 83 83 + 84 84 + // Verify on nil signer returns false. 85 85 + if s.Verify([]byte("test"), "sig") { 86 86 + t.Error("nil Verify returned true") 87 87 + } 88 88 + 89 89 + // PublicKeyBase64 on nil returns empty. 90 90 + if got := s.PublicKeyBase64(); got != "" { 91 91 + t.Errorf("nil PublicKeyBase64 = %q; want empty", got) 92 92 + } 93 93 + } 94 94 + 95 95 + func TestSigner_KeyID(t *testing.T) { 96 96 + signer, _ := generateTestSigner() 97 97 + if signer.KeyID != "v1" { 98 98 + t.Errorf("KeyID = %q; want 'v1'", signer.KeyID) 99 99 + } 100 100 + } 101 101 + 102 102 + func TestSigner_PublicKeyBase64NotEmpty(t *testing.T) { 103 103 + signer, _ := generateTestSigner() 104 104 + pub := signer.PublicKeyBase64() 105 105 + if pub == "" { 106 106 + t.Error("PublicKeyBase64 is empty for valid signer") 107 107 + } 108 108 + } 109 109 + 110 110 + func TestSigner_DifferentSignersProduceDifferentSigs(t *testing.T) { 111 111 + s1, _ := generateTestSigner() 112 112 + s2, _ := generateTestSigner() 113 113 + 114 114 + msg := []byte("same message") 115 115 + sig1 := s1.Sign(msg) 116 116 + sig2 := s2.Sign(msg) 117 117 + 118 118 + if sig1 == sig2 { 119 119 + t.Error("different signers produced identical signatures") 120 120 + } 121 121 + 122 122 + // Cross-verify should fail. 123 123 + if s1.Verify(msg, sig2) { 124 124 + t.Error("signer 1 verified signer 2's signature") 125 125 + } 126 126 + if s2.Verify(msg, sig1) { 127 127 + t.Error("signer 2 verified signer 1's signature") 128 128 + } 129 129 + } 130 130 + 131 131 + func TestLoad_FromEnvVar(t *testing.T) { 132 132 + signer, _ := generateTestSigner() 133 133 + seed := signer.priv.Seed() 134 134 + 135 135 + encoded := base64.StdEncoding.EncodeToString(seed) 136 136 + t.Setenv("ADMIN_SIGNING_KEY", encoded) 137 137 + 138 138 + loaded, err := Load(false) 139 139 + if err != nil { 140 140 + t.Fatalf("Load from env: %v", err) 141 141 + } 142 142 + if loaded.PublicKeyBase64() != signer.PublicKeyBase64() { 143 143 + t.Error("loaded signer has different public key than original") 144 144 + } 145 145 + } 146 146 + 147 147 + func TestLoad_InvalidBase64InEnv(t *testing.T) { 148 148 + t.Setenv("ADMIN_SIGNING_KEY", "not-valid-base64!@#$") 149 149 + _, err := Load(false) 150 150 + if err == nil { 151 151 + t.Error("expected error for invalid base64 in env var") 152 152 + } 153 153 + } 154 154 + 155 155 + func TestLoad_WrongSizeInEnv(t *testing.T) { 156 156 + // 16 bytes instead of 32. 157 157 + t.Setenv("ADMIN_SIGNING_KEY", base64.StdEncoding.EncodeToString(make([]byte, 16))) 158 158 + _, err := Load(false) 159 159 + if err == nil { 160 160 + t.Error("expected error for wrong size key in env var") 161 161 + } 162 162 + } 163 163 + 164 164 + func TestLoad_NoKeyDisallowGenerate(t *testing.T) { 165 165 + t.Setenv("ADMIN_SIGNING_KEY", "") 166 166 + // Use a working dir that definitely has no key file. 167 167 + origDir, _ := os.Getwd() 168 168 + _ = os.Chdir(t.TempDir()) 169 169 + defer func() { _ = os.Chdir(origDir) }() 170 170 + 171 171 + _, err := Load(false) 172 172 + if err == nil { 173 173 + t.Error("expected error when no key and generate=false") 174 174 + } 175 175 + } 176 176 + 177 177 + func TestLoad_AllowGenerateCreatesKeyFile(t *testing.T) { 178 178 + t.Setenv("ADMIN_SIGNING_KEY", "") 179 179 + origDir, _ := os.Getwd() 180 180 + tmpDir := t.TempDir() 181 181 + _ = os.Chdir(tmpDir) 182 182 + defer func() { _ = os.Chdir(origDir) }() 183 183 + 184 184 + signer, err := Load(true) 185 185 + if err != nil { 186 186 + t.Fatalf("Load(generate=true): %v", err) 187 187 + } 188 188 + if signer == nil { 189 189 + t.Fatal("signer is nil") 190 190 + } 191 191 + 192 192 + // Key file should exist. 193 193 + keyPath := filepath.Join(tmpDir, "data", "admin_signing.key") 194 194 + if _, err := os.Stat(keyPath); os.IsNotExist(err) { 195 195 + t.Error("key file was not created") 196 196 + } 197 197 + 198 198 + // Loading again should produce the same key. 199 199 + signer2, err := Load(false) 200 200 + if err != nil { 201 201 + t.Fatalf("Load(reload): %v", err) 202 202 + } 203 203 + if signer2.PublicKeyBase64() != signer.PublicKeyBase64() { 204 204 + t.Error("reloaded signer has different public key") 205 205 + } 206 206 + } 207 207 + 208 208 + func TestLoad_FromFile(t *testing.T) { 209 209 + t.Setenv("ADMIN_SIGNING_KEY", "") 210 210 + 211 211 + origDir, _ := os.Getwd() 212 212 + tmpDir := t.TempDir() 213 213 + _ = os.Chdir(tmpDir) 214 214 + defer func() { _ = os.Chdir(origDir) }() 215 215 + 216 216 + // Write a known seed. 217 217 + _, priv, _ := ed25519.GenerateKey(rand.Reader) 218 218 + keyDir := filepath.Join(tmpDir, "data") 219 219 + _ = os.MkdirAll(keyDir, 0o700) 220 220 + _ = os.WriteFile(filepath.Join(keyDir, "admin_signing.key"), priv.Seed(), 0o600) 221 221 + 222 222 + signer, err := Load(false) 223 223 + if err != nil { 224 224 + t.Fatalf("Load from file: %v", err) 225 225 + } 226 226 + if signer == nil { 227 227 + t.Fatal("signer is nil") 228 228 + } 229 229 + 230 230 + // The public key should match what we seeded. 231 231 + expectedPub := priv.Public().(ed25519.PublicKey) 232 232 + if signer.PublicKeyBase64() != base64.StdEncoding.EncodeToString(expectedPub) { 233 233 + t.Error("loaded signer has wrong public key") 234 234 + } 235 235 + }

+138

internal/badge/award.go

Reviewed

··· 24 24 const ( 25 25 AwardFirstConnect AwardType = "first-connect" 26 26 AwardEventAttendee AwardType = "event-attendee" 27 27 + AwardExtraCurious AwardType = "extra-curious" 28 28 + AwardBesties AwardType = "besties" 27 29 ) 30 30 + 31 31 + // connectionMilestones are the thresholds that trigger a badge award. 32 32 + var connectionMilestones = []int{10, 50, 100, 200, 300, 400, 500} 33 33 + 34 34 + // AwardConnectionMilestones checks the user's total connection count and 35 35 + // awards any milestone badges they've reached but haven't earned yet. 36 36 + // Call after every new connection. Best-effort — errors are logged not returned. 37 37 + func AwardConnectionMilestones(ctx context.Context, sess *oauth.ClientSession, db *sql.DB) { 38 38 + if sess == nil || db == nil { 39 39 + return 40 40 + } 41 41 + did := sess.Data.AccountDID.String() 42 42 + count := CountConnectionsForDID(ctx, db, did) 43 43 + if count <= 0 { 44 44 + return 45 45 + } 46 46 + 47 47 + for _, threshold := range connectionMilestones { 48 48 + if count >= threshold { 49 49 + trigger := fmt.Sprintf("connections-%d", threshold) 50 50 + def, err := GetDefinitionByTrigger(ctx, db, trigger) 51 51 + if err != nil { 52 52 + continue 53 53 + } 54 54 + if HasEarned(ctx, db, did, def.ID) { 55 55 + continue 56 56 + } 57 57 + _, _ = Award(ctx, sess, db, AwardType(trigger), "") 58 58 + } 59 59 + } 60 60 + 61 61 + // Auto-create badges for multiples of 100 beyond 500. 62 62 + if count >= 600 { 63 63 + for t := 600; t <= count; t += 100 { 64 64 + trigger := fmt.Sprintf("connections-%d", t) 65 65 + _, err := GetDefinitionByTrigger(ctx, db, trigger) 66 66 + if err != nil { 67 67 + // Badge definition doesn't exist yet — create it. 68 68 + _, _ = CreateDefinition(ctx, db, Definition{ 69 69 + Slug: trigger, 70 70 + Name: fmt.Sprintf("%d Connections", t), 71 71 + Description: fmt.Sprintf("Made %d connections", t), 72 72 + Shape: "circle", 73 73 + PrimaryColor: "#cba6f7", 74 74 + AccentColor: "#1e1e2e", 75 75 + RibbonColor: "#fab387", 76 76 + Label: fmt.Sprintf("%d", t), 77 77 + Trigger: trigger, 78 78 + }) 79 79 + } 80 80 + def, err := GetDefinitionByTrigger(ctx, db, trigger) 81 81 + if err != nil { 82 82 + continue 83 83 + } 84 84 + if HasEarned(ctx, db, did, def.ID) { 85 85 + continue 86 86 + } 87 87 + _, _ = Award(ctx, sess, db, AwardType(trigger), "") 88 88 + } 89 89 + } 90 90 + } 28 91 29 92 // Award writes a quest.atmo.badge record to the user's PDS and caches 30 93 // the result in earned_badges. It is idempotent — if the user already ··· 132 195 } 133 196 return false 134 197 } 198 198 + 199 199 + // DrainResult summarizes the badge drain operation. 200 200 + type DrainResult struct { 201 201 + Written int 202 202 + Skipped int 203 203 + Names []string // names of newly written badges (for toast notifications) 204 204 + } 205 205 + 206 206 + // DrainPending writes any locally-earned badges (record_uri = '') to the 207 207 + // user's PDS. Called on login/page load, similar to the connection drain. 208 208 + // Returns the names of badges that were newly written for toast display. 209 209 + func DrainPending(ctx context.Context, sess *oauth.ClientSession, db *sql.DB) DrainResult { 210 210 + res := DrainResult{} 211 211 + if sess == nil || db == nil { 212 212 + return res 213 213 + } 214 214 + did := sess.Data.AccountDID.String() 215 215 + 216 216 + // Find earned badges with no PDS record. 217 217 + rows, err := db.QueryContext(ctx, ` 218 218 + SELECT e.badge_id, d.slug, d.name, d.event_uri 219 219 + FROM earned_badges e 220 220 + JOIN badge_definitions d ON d.id = e.badge_id 221 221 + WHERE e.did = ? AND (e.record_uri = '' OR e.record_uri IS NULL) 222 222 + `, did) 223 223 + if err != nil { 224 224 + return res 225 225 + } 226 226 + defer rows.Close() 227 227 + 228 228 + type pending struct { 229 229 + badgeID int 230 230 + slug string 231 231 + name string 232 232 + eventURI string 233 233 + } 234 234 + var items []pending 235 235 + for rows.Next() { 236 236 + var p pending 237 237 + if err := rows.Scan(&p.badgeID, &p.slug, &p.name, &p.eventURI); err != nil { 238 238 + continue 239 239 + } 240 240 + items = append(items, p) 241 241 + } 242 242 + 243 243 + for _, item := range items { 244 244 + value := map[string]any{ 245 245 + "$type": AwardNSID, 246 246 + "type": item.slug, 247 247 + "earnedAt": time.Now().UTC().Format(time.RFC3339), 248 248 + } 249 249 + if item.eventURI != "" { 250 250 + value["event"] = item.eventURI 251 251 + } 252 252 + input := map[string]any{ 253 253 + "repo": did, 254 254 + "collection": AwardNSID, 255 255 + "record": value, 256 256 + } 257 257 + var out struct { 258 258 + URI string `json:"uri"` 259 259 + } 260 260 + if err := sess.APIClient().Post(ctx, syntax.NSID(nsidCreateRecord), input, &out); err != nil { 261 261 + res.Skipped++ 262 262 + continue 263 263 + } 264 264 + // Update the local record with the PDS URI. 265 265 + _, _ = db.ExecContext(ctx, ` 266 266 + UPDATE earned_badges SET record_uri = ? WHERE did = ? AND badge_id = ? 267 267 + `, out.URI, did, item.badgeID) 268 268 + res.Written++ 269 269 + res.Names = append(res.Names, item.name) 270 270 + } 271 271 + return res 272 272 + }

+66 -32

internal/badge/badge.go

Reviewed

··· 33 33 34 34 // DefaultPrimaryColors / DefaultAccentColors / DefaultRibbonColors 35 35 // are Catppuccin-ish swatches chosen to read well at small sizes. 36 36 - DefaultPrimaryColors = []string{"#fab387", "#f9e2af", "#a6e3a1", "#89b4fa", "#cba6f7", "#f38ba8"} 36 36 + // Includes metallic gold/silver/bronze for leaderboard badges. 37 37 + DefaultPrimaryColors = []string{"#fab387", "#f9e2af", "#a6e3a1", "#89b4fa", "#cba6f7", "#f38ba8", "#FFD700", "#C0C0C0", "#CD7F32"} 37 38 DefaultAccentColors = []string{"#11111b", "#1e1e2e", "#313244", "#cdd6f4"} 38 39 DefaultRibbonColors = []string{"#f38ba8", "#94e2d5", "#89dceb", "#fab387", "#a6e3a1"} 39 40 ) ··· 48 49 49 50 // Design is the persisted badge configuration plus signature metadata. 50 51 type Design struct { 51 51 - EventURI string 52 52 - Shape string 53 53 - PrimaryColor string 54 54 - AccentColor string 55 55 - RibbonColor string 56 56 - Label string 57 57 - Signature string // base64 58 58 - SigningKeyID string // typically "v1" 59 59 - CreatedAt time.Time 60 60 - UpdatedAt time.Time 52 52 + EventURI string 53 53 + BadgeType string // e.g. "event-attendee", "event-leaderboard-1st" 54 54 + Shape string 55 55 + PrimaryColor string 56 56 + AccentColor string 57 57 + RibbonColor string 58 58 + Label string 59 59 + MessageTemplate string // custom message for badge awards 60 60 + Signature string // base64 61 61 + SigningKeyID string // typically "v1" 62 62 + CreatedAt time.Time 63 63 + UpdatedAt time.Time 61 64 } 62 65 63 66 // canonicalPayload is the deterministic JSON we sign. It deliberately ··· 67 70 // so we list fields alphabetically here for stability. 68 71 type canonicalPayload struct { 69 72 AccentColor string `json:"accent_color"` 73 73 + BadgeType string `json:"badge_type"` 70 74 EventURI string `json:"event_uri"` 71 75 Label string `json:"label"` 72 76 PrimaryColor string `json:"primary_color"` ··· 80 84 func canonicalBytes(d Design) ([]byte, error) { 81 85 p := canonicalPayload{ 82 86 AccentColor: d.AccentColor, 87 87 + BadgeType: d.BadgeType, 83 88 EventURI: d.EventURI, 84 89 Label: d.Label, 85 90 PrimaryColor: d.PrimaryColor, ··· 109 114 110 115 _, err = db.ExecContext(ctx, ` 111 116 INSERT INTO event_badges ( 112 112 - event_uri, shape, primary_color, accent_color, ribbon_color, 113 113 - label, signature, signing_key_id, created_at, updated_at 114 114 - ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) 115 115 - ON CONFLICT(event_uri) DO UPDATE SET 116 116 - shape = excluded.shape, 117 117 - primary_color = excluded.primary_color, 118 118 - accent_color = excluded.accent_color, 119 119 - ribbon_color = excluded.ribbon_color, 120 120 - label = excluded.label, 121 121 - signature = excluded.signature, 122 122 - signing_key_id = excluded.signing_key_id, 123 123 - updated_at = CURRENT_TIMESTAMP 117 117 + event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, 118 118 + label, message_template, signature, signing_key_id, created_at, updated_at 119 119 + ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) 120 120 + ON CONFLICT(event_uri, badge_type) DO UPDATE SET 121 121 + shape = excluded.shape, 122 122 + primary_color = excluded.primary_color, 123 123 + accent_color = excluded.accent_color, 124 124 + ribbon_color = excluded.ribbon_color, 125 125 + label = excluded.label, 126 126 + message_template = excluded.message_template, 127 127 + signature = excluded.signature, 128 128 + signing_key_id = excluded.signing_key_id, 129 129 + updated_at = CURRENT_TIMESTAMP 124 130 `, 125 125 - d.EventURI, d.Shape, d.PrimaryColor, d.AccentColor, d.RibbonColor, 126 126 - d.Label, d.Signature, d.SigningKeyID, 131 131 + d.EventURI, d.BadgeType, d.Shape, d.PrimaryColor, d.AccentColor, d.RibbonColor, 132 132 + d.Label, d.MessageTemplate, d.Signature, d.SigningKeyID, 127 133 ) 128 134 if err != nil { 129 135 return Design{}, fmt.Errorf("badge: save: %w", err) ··· 134 140 // Get returns the badge design for an event AND verifies its signature. 135 141 // Returns ErrNotFound when no design is saved; ErrInvalidSignature when 136 142 // the stored signature doesn't verify under signer. 137 137 - func Get(ctx context.Context, db *sql.DB, signer *admincrypto.Signer, eventURI string) (Design, error) { 143 143 + func Get(ctx context.Context, db *sql.DB, signer *admincrypto.Signer, eventURI string, badgeType string) (Design, error) { 144 144 + if badgeType == "" { 145 145 + badgeType = "event-attendee" 146 146 + } 138 147 row := db.QueryRowContext(ctx, ` 139 139 - SELECT event_uri, shape, primary_color, accent_color, ribbon_color, 140 140 - label, signature, signing_key_id, created_at, updated_at 148 148 + SELECT event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, 149 149 + label, message_template, signature, signing_key_id, created_at, updated_at 141 150 FROM event_badges 142 142 - WHERE event_uri = ? 143 143 - `, eventURI) 151 151 + WHERE event_uri = ? AND badge_type = ? 152 152 + `, eventURI, badgeType) 144 153 var d Design 145 154 err := row.Scan( 146 146 - &d.EventURI, &d.Shape, &d.PrimaryColor, &d.AccentColor, &d.RibbonColor, 147 147 - &d.Label, &d.Signature, &d.SigningKeyID, &d.CreatedAt, &d.UpdatedAt, 155 155 + &d.EventURI, &d.BadgeType, &d.Shape, &d.PrimaryColor, &d.AccentColor, &d.RibbonColor, 156 156 + &d.Label, &d.MessageTemplate, &d.Signature, &d.SigningKeyID, &d.CreatedAt, &d.UpdatedAt, 148 157 ) 149 158 if errors.Is(err, sql.ErrNoRows) { 150 159 return Design{}, ErrNotFound ··· 213 222 } 214 223 return true 215 224 } 225 225 + 226 226 + // ListForEvent returns all badge designs saved for an event, keyed by badge_type. 227 227 + func ListForEvent(ctx context.Context, db *sql.DB, eventURI string) (map[string]Design, error) { 228 228 + rows, err := db.QueryContext(ctx, ` 229 229 + SELECT event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, 230 230 + label, message_template, signature, signing_key_id, created_at, updated_at 231 231 + FROM event_badges 232 232 + WHERE event_uri = ? 233 233 + `, eventURI) 234 234 + if err != nil { 235 235 + return nil, err 236 236 + } 237 237 + defer rows.Close() 238 238 + out := make(map[string]Design) 239 239 + for rows.Next() { 240 240 + var d Design 241 241 + if err := rows.Scan(&d.EventURI, &d.BadgeType, &d.Shape, &d.PrimaryColor, 242 242 + &d.AccentColor, &d.RibbonColor, &d.Label, &d.MessageTemplate, &d.Signature, 243 243 + &d.SigningKeyID, &d.CreatedAt, &d.UpdatedAt); err != nil { 244 244 + return nil, err 245 245 + } 246 246 + out[d.BadgeType] = d 247 247 + } 248 248 + return out, rows.Err() 249 249 + }

+303

internal/badge/badge_test.go

Reviewed

··· 1 1 + package badge 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "errors" 7 7 + "path/filepath" 8 8 + "testing" 9 9 + 10 10 + "atmoquest/internal/admincrypto" 11 11 + atdb "atmoquest/internal/db" 12 12 + ) 13 13 + 14 14 + const testEventURI = "at://did:plc:org/quest.atmo.event/test-badge" 15 15 + 16 16 + func newBadgeTestDB(t *testing.T) (context.Context, *sql.DB) { 17 17 + t.Helper() 18 18 + dir := t.TempDir() 19 19 + dsn := "file:" + filepath.Join(dir, "badge_design.db") + "?_pragma=foreign_keys(ON)" 20 20 + conn, err := atdb.Open(dsn) 21 21 + if err != nil { 22 22 + t.Fatalf("db open: %v", err) 23 23 + } 24 24 + if err := atdb.Migrate(conn); err != nil { 25 25 + t.Fatalf("migrate: %v", err) 26 26 + } 27 27 + t.Cleanup(func() { _ = conn.Close() }) 28 28 + return context.Background(), conn 29 29 + } 30 30 + 31 31 + // seedEvent inserts a minimal event row to satisfy FK constraints in event_badges. 32 32 + func seedEvent(t *testing.T, db *sql.DB, uri string) { 33 33 + t.Helper() 34 34 + _, err := db.Exec(` 35 35 + INSERT INTO events (uri, name, start_time, end_time, location, organizer_did, cached_at) 36 36 + VALUES (?, 'Test Event', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Test', 'did:plc:org', CURRENT_TIMESTAMP) 37 37 + `, uri) 38 38 + if err != nil { 39 39 + t.Fatalf("seed event %q: %v", uri, err) 40 40 + } 41 41 + } 42 42 + 43 43 + func testSigner(t *testing.T) *admincrypto.Signer { 44 44 + t.Helper() 45 45 + s, err := admincrypto.Load(true) 46 46 + if err != nil { 47 47 + // Load with generate=true might fail if we can't write to data/. 48 48 + // Fall back to creating directly. 49 49 + t.Skipf("could not load signer: %v", err) 50 50 + } 51 51 + return s 52 52 + } 53 53 + 54 54 + func sampleDesign() Design { 55 55 + return Design{ 56 56 + EventURI: testEventURI, 57 57 + Shape: "shield", 58 58 + PrimaryColor: "#fab387", 59 59 + AccentColor: "#11111b", 60 60 + RibbonColor: "#f38ba8", 61 61 + Label: "CascadiaJS", 62 62 + } 63 63 + } 64 64 + 65 65 + func TestSave_AndGet(t *testing.T) { 66 66 + ctx, db := newBadgeTestDB(t) 67 67 + signer := testSigner(t) 68 68 + d := sampleDesign() 69 69 + seedEvent(t, db, d.EventURI) 70 70 + 71 71 + saved, err := Save(ctx, db, signer, d) 72 72 + if err != nil { 73 73 + t.Fatalf("Save: %v", err) 74 74 + } 75 75 + if saved.Signature == "" { 76 76 + t.Error("Signature is empty after Save") 77 77 + } 78 78 + if saved.SigningKeyID != "v1" { 79 79 + t.Errorf("SigningKeyID = %q; want 'v1'", saved.SigningKeyID) 80 80 + } 81 81 + 82 82 + got, err := Get(ctx, db, signer, testEventURI) 83 83 + if err != nil { 84 84 + t.Fatalf("Get: %v", err) 85 85 + } 86 86 + if got.Shape != d.Shape { 87 87 + t.Errorf("Shape = %q; want %q", got.Shape, d.Shape) 88 88 + } 89 89 + if got.PrimaryColor != d.PrimaryColor { 90 90 + t.Errorf("PrimaryColor = %q; want %q", got.PrimaryColor, d.PrimaryColor) 91 91 + } 92 92 + if got.Label != d.Label { 93 93 + t.Errorf("Label = %q; want %q", got.Label, d.Label) 94 94 + } 95 95 + } 96 96 + 97 97 + func TestSave_Upsert(t *testing.T) { 98 98 + ctx, db := newBadgeTestDB(t) 99 99 + signer := testSigner(t) 100 100 + 101 101 + d := sampleDesign() 102 102 + seedEvent(t, db, d.EventURI) 103 103 + _, _ = Save(ctx, db, signer, d) 104 104 + 105 105 + // Update the label. 106 106 + d.Label = "Updated Label" 107 107 + saved, err := Save(ctx, db, signer, d) 108 108 + if err != nil { 109 109 + t.Fatalf("Save update: %v", err) 110 110 + } 111 111 + 112 112 + got, _ := Get(ctx, db, signer, testEventURI) 113 113 + if got.Label != "Updated Label" { 114 114 + t.Errorf("Label after upsert = %q; want 'Updated Label'", got.Label) 115 115 + } 116 116 + // Signature should have changed since the payload changed. 117 117 + if got.Signature == "" { 118 118 + t.Error("Signature empty after update") 119 119 + } 120 120 + _ = saved 121 121 + } 122 122 + 123 123 + func TestSave_NilSigner(t *testing.T) { 124 124 + ctx, db := newBadgeTestDB(t) 125 125 + _, err := Save(ctx, db, nil, sampleDesign()) 126 126 + if err == nil { 127 127 + t.Error("Save with nil signer should fail") 128 128 + } 129 129 + } 130 130 + 131 131 + func TestGet_NotFound(t *testing.T) { 132 132 + ctx, db := newBadgeTestDB(t) 133 133 + signer := testSigner(t) 134 134 + _, err := Get(ctx, db, signer, "at://nonexistent") 135 135 + if !errors.Is(err, ErrNotFound) { 136 136 + t.Errorf("Get missing = %v; want ErrNotFound", err) 137 137 + } 138 138 + } 139 139 + 140 140 + func TestGet_DetectsTampering(t *testing.T) { 141 141 + ctx, db := newBadgeTestDB(t) 142 142 + signer := testSigner(t) 143 143 + 144 144 + seedEvent(t, db, testEventURI) 145 145 + _, _ = Save(ctx, db, signer, sampleDesign()) 146 146 + 147 147 + // Tamper with the stored label directly in the database. 148 148 + _, err := db.ExecContext(ctx, ` 149 149 + UPDATE event_badges SET label = 'TAMPERED' WHERE event_uri = ? 150 150 + `, testEventURI) 151 151 + if err != nil { 152 152 + t.Fatalf("tamper: %v", err) 153 153 + } 154 154 + 155 155 + _, err = Get(ctx, db, signer, testEventURI) 156 156 + if !errors.Is(err, ErrInvalidSignature) { 157 157 + t.Errorf("Get tampered = %v; want ErrInvalidSignature", err) 158 158 + } 159 159 + } 160 160 + 161 161 + func TestGet_NilSignerSkipsVerification(t *testing.T) { 162 162 + ctx, db := newBadgeTestDB(t) 163 163 + signer := testSigner(t) 164 164 + 165 165 + seedEvent(t, db, testEventURI) 166 166 + _, _ = Save(ctx, db, signer, sampleDesign()) 167 167 + 168 168 + // Tamper with the label. 169 169 + _, _ = db.ExecContext(ctx, ` 170 170 + UPDATE event_badges SET label = 'TAMPERED' WHERE event_uri = ? 171 171 + `, testEventURI) 172 172 + 173 173 + // With nil signer, verification is skipped — tampered data is returned. 174 174 + got, err := Get(ctx, db, nil, testEventURI) 175 175 + if err != nil { 176 176 + t.Fatalf("Get nil signer: %v", err) 177 177 + } 178 178 + if got.Label != "TAMPERED" { 179 179 + t.Errorf("Label = %q; expected tampered value since verification was skipped", got.Label) 180 180 + } 181 181 + } 182 182 + 183 183 + // --- Validation Tests --- 184 184 + 185 185 + func TestSave_RejectsEmptyEventURI(t *testing.T) { 186 186 + ctx, db := newBadgeTestDB(t) 187 187 + signer := testSigner(t) 188 188 + d := sampleDesign() 189 189 + seedEvent(t, db, d.EventURI) 190 190 + d.EventURI = "" 191 191 + _, err := Save(ctx, db, signer, d) 192 192 + if err == nil { 193 193 + t.Error("Save with empty event URI should fail") 194 194 + } 195 195 + } 196 196 + 197 197 + func TestSave_RejectsInvalidShape(t *testing.T) { 198 198 + ctx, db := newBadgeTestDB(t) 199 199 + signer := testSigner(t) 200 200 + d := sampleDesign() 201 201 + seedEvent(t, db, d.EventURI) 202 202 + d.Shape = "triangle" // not in DefaultShapes 203 203 + _, err := Save(ctx, db, signer, d) 204 204 + if err == nil { 205 205 + t.Error("Save with invalid shape should fail") 206 206 + } 207 207 + } 208 208 + 209 209 + func TestSave_RejectsInvalidColor(t *testing.T) { 210 210 + ctx, db := newBadgeTestDB(t) 211 211 + signer := testSigner(t) 212 212 + 213 213 + seedEvent(t, db, testEventURI) 214 214 + cases := []struct { 215 215 + name string 216 216 + mut func(*Design) 217 217 + }{ 218 218 + {"short hex primary", func(d *Design) { d.PrimaryColor = "#fff" }}, 219 219 + {"no hash primary", func(d *Design) { d.PrimaryColor = "fab387" }}, 220 220 + {"invalid chars primary", func(d *Design) { d.PrimaryColor = "#GGGGGG" }}, 221 221 + {"short hex accent", func(d *Design) { d.AccentColor = "#abc" }}, 222 222 + {"short hex ribbon", func(d *Design) { d.RibbonColor = "#123" }}, 223 223 + } 224 224 + for _, tc := range cases { 225 225 + t.Run(tc.name, func(t *testing.T) { 226 226 + d := sampleDesign() 227 227 + tc.mut(&d) 228 228 + _, err := Save(ctx, db, signer, d) 229 229 + if err == nil { 230 230 + t.Error("Save with invalid color should fail") 231 231 + } 232 232 + }) 233 233 + } 234 234 + } 235 235 + 236 236 + func TestSave_RejectsEmptyLabel(t *testing.T) { 237 237 + ctx, db := newBadgeTestDB(t) 238 238 + signer := testSigner(t) 239 239 + d := sampleDesign() 240 240 + seedEvent(t, db, d.EventURI) 241 241 + d.Label = "" 242 242 + _, err := Save(ctx, db, signer, d) 243 243 + if err == nil { 244 244 + t.Error("Save with empty label should fail") 245 245 + } 246 246 + } 247 247 + 248 248 + func TestSave_RejectsTooLongLabel(t *testing.T) { 249 249 + ctx, db := newBadgeTestDB(t) 250 250 + signer := testSigner(t) 251 251 + d := sampleDesign() 252 252 + seedEvent(t, db, d.EventURI) 253 253 + d.Label = "This label is way too long and exceeds the 40 character maximum allowed by the badge system" 254 254 + _, err := Save(ctx, db, signer, d) 255 255 + if err == nil { 256 256 + t.Error("Save with too-long label should fail") 257 257 + } 258 258 + } 259 259 + 260 260 + func TestSave_AcceptsAllValidShapes(t *testing.T) { 261 261 + ctx, db := newBadgeTestDB(t) 262 262 + signer := testSigner(t) 263 263 + 264 264 + for i, shape := range DefaultShapes { 265 265 + d := sampleDesign() 266 266 + d.EventURI = testEventURI + "/" + shape // unique URI per shape 267 267 + seedEvent(t, db, d.EventURI) 268 268 + d.Shape = shape 269 269 + _, err := Save(ctx, db, signer, d) 270 270 + if err != nil { 271 271 + t.Errorf("shape %q (index %d): %v", shape, i, err) 272 272 + } 273 273 + } 274 274 + } 275 275 + 276 276 + // --- isHex Tests --- 277 277 + 278 278 + func TestIsHex(t *testing.T) { 279 279 + cases := []struct { 280 280 + input string 281 281 + want bool 282 282 + }{ 283 283 + {"#fab387", true}, 284 284 + {"#11111b", true}, 285 285 + {"#AABBCC", true}, 286 286 + {"#aAbBcC", true}, 287 287 + {"#000000", true}, 288 288 + {"#ffffff", true}, 289 289 + {"#fff", false}, // too short 290 290 + {"fab387", false}, // no hash 291 291 + {"#GGGGGG", false}, // invalid chars 292 292 + {"", false}, // empty 293 293 + {"#1234567", false}, // too long 294 294 + {"#12345", false}, // wrong length 295 295 + } 296 296 + for _, tc := range cases { 297 297 + t.Run(tc.input, func(t *testing.T) { 298 298 + if got := isHex(tc.input); got != tc.want { 299 299 + t.Errorf("isHex(%q) = %v; want %v", tc.input, got, tc.want) 300 300 + } 301 301 + }) 302 302 + } 303 303 + }

+12 -7

internal/badge/definitions.go

Reviewed

··· 27 27 Definition 28 28 RecordURI string 29 29 EarnedAt time.Time 30 30 + Message string 30 31 } 31 32 32 33 // ListDefinitions returns all badge definitions, ordered by creation time. ··· 115 116 return res.LastInsertId() 116 117 } 117 118 118 118 - // RecordEarned caches a badge earn in the local DB. 119 119 - func RecordEarned(ctx context.Context, db *sql.DB, did string, badgeID int, recordURI string) error { 119 119 + // RecordEarned caches a badge earn in the local DB with an optional message. 120 120 + func RecordEarned(ctx context.Context, db *sql.DB, did string, badgeID int, recordURI string, message ...string) error { 121 121 + msg := "" 122 122 + if len(message) > 0 { 123 123 + msg = message[0] 124 124 + } 120 125 _, err := db.ExecContext(ctx, ` 121 121 - INSERT INTO earned_badges (did, badge_id, record_uri, earned_at) 122 122 - VALUES (?, ?, ?, CURRENT_TIMESTAMP) 126 126 + INSERT INTO earned_badges (did, badge_id, record_uri, message, earned_at) 127 127 + VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP) 123 128 ON CONFLICT(did, badge_id) DO NOTHING 124 124 - `, did, badgeID, recordURI) 129 129 + `, did, badgeID, recordURI, msg) 125 130 return err 126 131 } 127 132 ··· 131 136 SELECT d.id, d.slug, d.name, d.description, COALESCE(d.event_uri,''), 132 137 d.shape, d.primary_color, d.accent_color, d.ribbon_color, d.label, 133 138 COALESCE(d.trigger,''), d.created_at, 134 134 - e.record_uri, e.earned_at 139 139 + e.record_uri, e.earned_at, COALESCE(e.message,'') 135 140 FROM earned_badges e 136 141 JOIN badge_definitions d ON d.id = e.badge_id 137 142 WHERE e.did = ? ··· 147 152 if err := rows.Scan(&eb.ID, &eb.Slug, &eb.Name, &eb.Description, &eb.EventURI, 148 153 &eb.Shape, &eb.PrimaryColor, &eb.AccentColor, &eb.RibbonColor, &eb.Label, 149 154 &eb.Trigger, &eb.CreatedAt, 150 150 - &eb.RecordURI, &eb.EarnedAt); err != nil { 155 155 + &eb.RecordURI, &eb.EarnedAt, &eb.Message); err != nil { 151 156 return nil, err 152 157 } 153 158 out = append(out, eb)

+291

internal/badge/definitions_test.go

Reviewed

··· 1 1 + package badge 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "path/filepath" 7 7 + "testing" 8 8 + 9 9 + atdb "atmoquest/internal/db" 10 10 + ) 11 11 + 12 12 + func newTestDB(t *testing.T) (context.Context, *sql.DB) { 13 13 + t.Helper() 14 14 + dir := t.TempDir() 15 15 + dsn := "file:" + filepath.Join(dir, "badge.db") + "?_pragma=foreign_keys(ON)" 16 16 + conn, err := atdb.Open(dsn) 17 17 + if err != nil { 18 18 + t.Fatalf("db open: %v", err) 19 19 + } 20 20 + if err := atdb.Migrate(conn); err != nil { 21 21 + t.Fatalf("migrate: %v", err) 22 22 + } 23 23 + t.Cleanup(func() { _ = conn.Close() }) 24 24 + return context.Background(), conn 25 25 + } 26 26 + 27 27 + // --- Badge Definition Tests --- 28 28 + 29 29 + func TestListDefinitions_SeededDefaults(t *testing.T) { 30 30 + ctx, db := newTestDB(t) 31 31 + defs, err := ListDefinitions(ctx, db) 32 32 + if err != nil { 33 33 + t.Fatalf("ListDefinitions: %v", err) 34 34 + } 35 35 + // Migration 007 seeds 6 badge definitions. 36 36 + if len(defs) < 6 { 37 37 + t.Errorf("ListDefinitions returned %d; want at least 6 seeded defaults", len(defs)) 38 38 + } 39 39 + // Check known slugs exist. 40 40 + slugs := make(map[string]bool, len(defs)) 41 41 + for _, d := range defs { 42 42 + slugs[d.Slug] = true 43 43 + } 44 44 + for _, expected := range []string{"first-connect", "event-attendee", "profile-complete", "connections-50", "connections-100", "connections-200"} { 45 45 + if !slugs[expected] { 46 46 + t.Errorf("missing seeded badge definition: %q", expected) 47 47 + } 48 48 + } 49 49 + } 50 50 + 51 51 + func TestGetDefinitionBySlug(t *testing.T) { 52 52 + ctx, db := newTestDB(t) 53 53 + d, err := GetDefinitionBySlug(ctx, db, "first-connect") 54 54 + if err != nil { 55 55 + t.Fatalf("GetDefinitionBySlug: %v", err) 56 56 + } 57 57 + if d.Name != "First Connection" { 58 58 + t.Errorf("Name = %q; want 'First Connection'", d.Name) 59 59 + } 60 60 + if d.Trigger != "first-connect" { 61 61 + t.Errorf("Trigger = %q; want 'first-connect'", d.Trigger) 62 62 + } 63 63 + if d.Shape != "star" { 64 64 + t.Errorf("Shape = %q; want 'star'", d.Shape) 65 65 + } 66 66 + } 67 67 + 68 68 + func TestGetDefinitionBySlug_NotFound(t *testing.T) { 69 69 + ctx, db := newTestDB(t) 70 70 + _, err := GetDefinitionBySlug(ctx, db, "nonexistent-badge") 71 71 + if err != ErrNotFound { 72 72 + t.Errorf("err = %v; want ErrNotFound", err) 73 73 + } 74 74 + } 75 75 + 76 76 + func TestGetDefinitionByTrigger(t *testing.T) { 77 77 + ctx, db := newTestDB(t) 78 78 + d, err := GetDefinitionByTrigger(ctx, db, "event-attendee") 79 79 + if err != nil { 80 80 + t.Fatalf("GetDefinitionByTrigger: %v", err) 81 81 + } 82 82 + if d.Slug != "event-attendee" { 83 83 + t.Errorf("Slug = %q; want 'event-attendee'", d.Slug) 84 84 + } 85 85 + } 86 86 + 87 87 + func TestGetDefinitionByTrigger_NotFound(t *testing.T) { 88 88 + ctx, db := newTestDB(t) 89 89 + _, err := GetDefinitionByTrigger(ctx, db, "nonexistent-trigger") 90 90 + if err != ErrNotFound { 91 91 + t.Errorf("err = %v; want ErrNotFound", err) 92 92 + } 93 93 + } 94 94 + 95 95 + func TestCreateDefinition(t *testing.T) { 96 96 + ctx, db := newTestDB(t) 97 97 + d := Definition{ 98 98 + Slug: "custom-badge", 99 99 + Name: "Custom Badge", 100 100 + Description: "A custom test badge", 101 101 + Shape: "hexagon", 102 102 + PrimaryColor: "#fab387", 103 103 + AccentColor: "#11111b", 104 104 + RibbonColor: "#f38ba8", 105 105 + Label: "Custom", 106 106 + } 107 107 + id, err := CreateDefinition(ctx, db, d) 108 108 + if err != nil { 109 109 + t.Fatalf("CreateDefinition: %v", err) 110 110 + } 111 111 + if id <= 0 { 112 112 + t.Errorf("id = %d; want positive", id) 113 113 + } 114 114 + 115 115 + // Retrieve by slug. 116 116 + got, err := GetDefinitionBySlug(ctx, db, "custom-badge") 117 117 + if err != nil { 118 118 + t.Fatalf("GetDefinitionBySlug: %v", err) 119 119 + } 120 120 + if got.Name != "Custom Badge" { 121 121 + t.Errorf("Name = %q; want 'Custom Badge'", got.Name) 122 122 + } 123 123 + if got.Description != "A custom test badge" { 124 124 + t.Errorf("Description = %q", got.Description) 125 125 + } 126 126 + } 127 127 + 128 128 + func TestCreateDefinition_WithEventURI(t *testing.T) { 129 129 + ctx, db := newTestDB(t) 130 130 + d := Definition{ 131 131 + Slug: "event-specific", 132 132 + Name: "Event Specific", 133 133 + EventURI: "at://did:plc:org/quest.atmo.event/abc", 134 134 + Shape: "shield", 135 135 + PrimaryColor: "#89b4fa", 136 136 + AccentColor: "#11111b", 137 137 + RibbonColor: "#94e2d5", 138 138 + Label: "ESB", 139 139 + } 140 140 + _, err := CreateDefinition(ctx, db, d) 141 141 + if err != nil { 142 142 + t.Fatalf("CreateDefinition: %v", err) 143 143 + } 144 144 + got, _ := GetDefinitionBySlug(ctx, db, "event-specific") 145 145 + if got.EventURI != d.EventURI { 146 146 + t.Errorf("EventURI = %q; want %q", got.EventURI, d.EventURI) 147 147 + } 148 148 + } 149 149 + 150 150 + func TestCreateDefinition_WithTrigger(t *testing.T) { 151 151 + ctx, db := newTestDB(t) 152 152 + d := Definition{ 153 153 + Slug: "triggered-badge", 154 154 + Name: "Triggered", 155 155 + Trigger: "custom-trigger", 156 156 + Shape: "circle", 157 157 + PrimaryColor: "#fab387", 158 158 + AccentColor: "#11111b", 159 159 + RibbonColor: "#f38ba8", 160 160 + Label: "T", 161 161 + } 162 162 + _, err := CreateDefinition(ctx, db, d) 163 163 + if err != nil { 164 164 + t.Fatalf("CreateDefinition: %v", err) 165 165 + } 166 166 + got, err := GetDefinitionByTrigger(ctx, db, "custom-trigger") 167 167 + if err != nil { 168 168 + t.Fatalf("GetDefinitionByTrigger: %v", err) 169 169 + } 170 170 + if got.Slug != "triggered-badge" { 171 171 + t.Errorf("Slug = %q; want 'triggered-badge'", got.Slug) 172 172 + } 173 173 + } 174 174 + 175 175 + func TestCreateDefinition_DuplicateSlugFails(t *testing.T) { 176 176 + ctx, db := newTestDB(t) 177 177 + // "first-connect" is seeded by migration. 178 178 + d := Definition{ 179 179 + Slug: "first-connect", 180 180 + Name: "Duplicate", 181 181 + Shape: "circle", 182 182 + PrimaryColor: "#fab387", 183 183 + AccentColor: "#11111b", 184 184 + RibbonColor: "#f38ba8", 185 185 + Label: "Dup", 186 186 + } 187 187 + _, err := CreateDefinition(ctx, db, d) 188 188 + if err == nil { 189 189 + t.Fatal("expected error for duplicate slug") 190 190 + } 191 191 + } 192 192 + 193 193 + // --- Earned Badge Tests --- 194 194 + 195 195 + func TestRecordEarned_And_HasEarned(t *testing.T) { 196 196 + ctx, db := newTestDB(t) 197 197 + did := "did:plc:testuser1234567890abcd" 198 198 + 199 199 + d, _ := GetDefinitionBySlug(ctx, db, "first-connect") 200 200 + 201 201 + // Not earned yet. 202 202 + if HasEarned(ctx, db, did, d.ID) { 203 203 + t.Error("HasEarned = true before earning") 204 204 + } 205 205 + 206 206 + // Record it. 207 207 + err := RecordEarned(ctx, db, did, d.ID, "at://did:plc:x/quest.atmo.badge/abc") 208 208 + if err != nil { 209 209 + t.Fatalf("RecordEarned: %v", err) 210 210 + } 211 211 + 212 212 + // Now earned. 213 213 + if !HasEarned(ctx, db, did, d.ID) { 214 214 + t.Error("HasEarned = false after earning") 215 215 + } 216 216 + } 217 217 + 218 218 + func TestRecordEarned_Idempotent(t *testing.T) { 219 219 + ctx, db := newTestDB(t) 220 220 + did := "did:plc:testuser1234567890abcd" 221 221 + d, _ := GetDefinitionBySlug(ctx, db, "first-connect") 222 222 + 223 223 + // Insert twice — ON CONFLICT DO NOTHING should not error. 224 224 + if err := RecordEarned(ctx, db, did, d.ID, "at://uri1"); err != nil { 225 225 + t.Fatalf("first RecordEarned: %v", err) 226 226 + } 227 227 + if err := RecordEarned(ctx, db, did, d.ID, "at://uri2"); err != nil { 228 228 + t.Fatalf("second RecordEarned: %v", err) 229 229 + } 230 230 + } 231 231 + 232 232 + func TestListEarned(t *testing.T) { 233 233 + ctx, db := newTestDB(t) 234 234 + did := "did:plc:testuser1234567890abcd" 235 235 + 236 236 + fc, _ := GetDefinitionBySlug(ctx, db, "first-connect") 237 237 + ea, _ := GetDefinitionBySlug(ctx, db, "event-attendee") 238 238 + 239 239 + _ = RecordEarned(ctx, db, did, fc.ID, "at://uri-fc") 240 240 + _ = RecordEarned(ctx, db, did, ea.ID, "at://uri-ea") 241 241 + 242 242 + earned, err := ListEarned(ctx, db, did) 243 243 + if err != nil { 244 244 + t.Fatalf("ListEarned: %v", err) 245 245 + } 246 246 + if len(earned) != 2 { 247 247 + t.Fatalf("ListEarned returned %d; want 2", len(earned)) 248 248 + } 249 249 + // Both earned at ~same time; just verify both slugs are present. 250 250 + slugs := make(map[string]bool, len(earned)) 251 251 + for _, e := range earned { 252 252 + slugs[e.Slug] = true 253 253 + } 254 254 + if !slugs["first-connect"] || !slugs["event-attendee"] { 255 255 + t.Errorf("expected both 'first-connect' and 'event-attendee'; got slugs %v", slugs) 256 256 + } 257 257 + } 258 258 + 259 259 + func TestListEarned_Empty(t *testing.T) { 260 260 + ctx, db := newTestDB(t) 261 261 + earned, err := ListEarned(ctx, db, "did:plc:nobody") 262 262 + if err != nil { 263 263 + t.Fatalf("ListEarned: %v", err) 264 264 + } 265 265 + if len(earned) != 0 { 266 266 + t.Errorf("ListEarned empty = %d; want 0", len(earned)) 267 267 + } 268 268 + } 269 269 + 270 270 + func TestListEarned_IsolatedByDID(t *testing.T) { 271 271 + ctx, db := newTestDB(t) 272 272 + didA := "did:plc:useraaaa1234567890abcd" 273 273 + didB := "did:plc:userbbbb1234567890abcd" 274 274 + 275 275 + fc, _ := GetDefinitionBySlug(ctx, db, "first-connect") 276 276 + _ = RecordEarned(ctx, db, didA, fc.ID, "at://a") 277 277 + _ = RecordEarned(ctx, db, didB, fc.ID, "at://b") 278 278 + 279 279 + earnedA, _ := ListEarned(ctx, db, didA) 280 280 + if len(earnedA) != 1 { 281 281 + t.Errorf("user A has %d earned; want 1", len(earnedA)) 282 282 + } 283 283 + } 284 284 + 285 285 + func TestHasEarned_UnknownBadgeID(t *testing.T) { 286 286 + ctx, db := newTestDB(t) 287 287 + // Badge ID 9999 doesn't exist. 288 288 + if HasEarned(ctx, db, "did:plc:x", 9999) { 289 289 + t.Error("HasEarned should be false for unknown badge ID") 290 290 + } 291 291 + }

+216

internal/checkin/list_test.go

Reviewed

··· 1 1 + package checkin 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "path/filepath" 7 7 + "testing" 8 8 + "time" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + 12 12 + atdb "atmoquest/internal/db" 13 13 + ) 14 14 + 15 15 + // newListTestDB returns a freshly-migrated SQLite DB. Separate from 16 16 + // checkin_test.go's newTestDB to avoid redeclaration. 17 17 + func newListTestDB(t *testing.T) (context.Context, *sql.DB) { 18 18 + t.Helper() 19 19 + dir := t.TempDir() 20 20 + dsn := "file:" + filepath.Join(dir, "list.db") + "?_pragma=foreign_keys(ON)" 21 21 + conn, err := atdb.Open(dsn) 22 22 + if err != nil { 23 23 + t.Fatalf("db open: %v", err) 24 24 + } 25 25 + if err := atdb.Migrate(conn); err != nil { 26 26 + t.Fatalf("migrate: %v", err) 27 27 + } 28 28 + t.Cleanup(func() { _ = conn.Close() }) 29 29 + return context.Background(), conn 30 30 + } 31 31 + 32 32 + const ( 33 33 + listUserDID = "did:plc:listuser123456789abcde" 34 34 + listOrgDID = "did:plc:listorg1234567890abcde" 35 35 + ) 36 36 + 37 37 + func seedListEvent(t *testing.T, db *sql.DB, uri, name string, start, end time.Time) { 38 38 + t.Helper() 39 39 + _, err := db.Exec(` 40 40 + INSERT INTO events (uri, name, start_time, end_time, location, organizer_did, cached_at) 41 41 + VALUES (?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP) 42 42 + `, uri, name, start.UTC(), end.UTC(), "TestLocation", listOrgDID) 43 43 + if err != nil { 44 44 + t.Fatalf("seed event %q: %v", uri, err) 45 45 + } 46 46 + } 47 47 + 48 48 + func seedListCheckin(t *testing.T, db *sql.DB, recordURI, did, eventURI string, at time.Time) { 49 49 + t.Helper() 50 50 + _, err := db.Exec(` 51 51 + INSERT INTO checkins (record_uri, did, event_uri, checked_in_at, cached_at) 52 52 + VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP) 53 53 + `, recordURI, did, eventURI, at.UTC()) 54 54 + if err != nil { 55 55 + t.Fatalf("seed checkin: %v", err) 56 56 + } 57 57 + } 58 58 + 59 59 + func TestListForUser_Empty(t *testing.T) { 60 60 + ctx, db := newListTestDB(t) 61 61 + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), time.Now()) 62 62 + if err != nil { 63 63 + t.Fatalf("ListForUser: %v", err) 64 64 + } 65 65 + if len(events) != 0 { 66 66 + t.Errorf("ListForUser empty = %d; want 0", len(events)) 67 67 + } 68 68 + } 69 69 + 70 70 + func TestListForUser_ReturnsEventsWithMetadata(t *testing.T) { 71 71 + ctx, db := newListTestDB(t) 72 72 + now := time.Now().UTC() 73 73 + evURI := "at://did:plc:org/quest.atmo.event/cascadia" 74 74 + seedListEvent(t, db, evURI, "CascadiaJS 2026", now.Add(-1*time.Hour), now.Add(8*time.Hour)) 75 75 + seedListCheckin(t, db, "at://did:plc:user/quest.atmo.checkin/1", listUserDID, evURI, now) 76 76 + 77 77 + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), now) 78 78 + if err != nil { 79 79 + t.Fatalf("ListForUser: %v", err) 80 80 + } 81 81 + if len(events) != 1 { 82 82 + t.Fatalf("ListForUser returned %d; want 1", len(events)) 83 83 + } 84 84 + if events[0].EventName != "CascadiaJS 2026" { 85 85 + t.Errorf("EventName = %q", events[0].EventName) 86 86 + } 87 87 + if events[0].EventURI != evURI { 88 88 + t.Errorf("EventURI = %q", events[0].EventURI) 89 89 + } 90 90 + if events[0].Location != "TestLocation" { 91 91 + t.Errorf("Location = %q", events[0].Location) 92 92 + } 93 93 + } 94 94 + 95 95 + func TestListForUser_OngoingFlag(t *testing.T) { 96 96 + ctx, db := newListTestDB(t) 97 97 + now := time.Now().UTC() 98 98 + 99 99 + ongoingURI := "at://did:plc:org/quest.atmo.event/ongoing" 100 100 + endedURI := "at://did:plc:org/quest.atmo.event/ended" 101 101 + 102 102 + seedListEvent(t, db, ongoingURI, "Ongoing", now.Add(-1*time.Hour), now.Add(8*time.Hour)) 103 103 + seedListEvent(t, db, endedURI, "Ended", now.Add(-48*time.Hour), now.Add(-24*time.Hour)) 104 104 + seedListCheckin(t, db, "at://u/c/1", listUserDID, ongoingURI, now) 105 105 + seedListCheckin(t, db, "at://u/c/2", listUserDID, endedURI, now.Add(-30*time.Hour)) 106 106 + 107 107 + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), now) 108 108 + if err != nil { 109 109 + t.Fatalf("ListForUser: %v", err) 110 110 + } 111 111 + if len(events) != 2 { 112 112 + t.Fatalf("expected 2 events; got %d", len(events)) 113 113 + } 114 114 + 115 115 + ongoingCount := 0 116 116 + for _, e := range events { 117 117 + if e.IsOngoing { 118 118 + ongoingCount++ 119 119 + } 120 120 + } 121 121 + if ongoingCount != 1 { 122 122 + t.Errorf("ongoing count = %d; want 1", ongoingCount) 123 123 + } 124 124 + } 125 125 + 126 126 + func TestListForUser_DeduplicatesMultipleCheckins(t *testing.T) { 127 127 + ctx, db := newListTestDB(t) 128 128 + now := time.Now().UTC() 129 129 + evURI := "at://did:plc:org/quest.atmo.event/dedup" 130 130 + seedListEvent(t, db, evURI, "Dedup Event", now.Add(-2*time.Hour), now.Add(6*time.Hour)) 131 131 + 132 132 + // User checked in twice to the same event. 133 133 + seedListCheckin(t, db, "at://u/c/a", listUserDID, evURI, now.Add(-1*time.Hour)) 134 134 + seedListCheckin(t, db, "at://u/c/b", listUserDID, evURI, now) 135 135 + 136 136 + events, err := ListForUser(ctx, db, syntax.DID(listUserDID), now) 137 137 + if err != nil { 138 138 + t.Fatalf("ListForUser: %v", err) 139 139 + } 140 140 + // Should return 1 event, not 2. 141 141 + if len(events) != 1 { 142 142 + t.Errorf("expected 1 event (deduplicated); got %d", len(events)) 143 143 + } 144 144 + } 145 145 + 146 146 + func TestListForUser_IsolatedByUser(t *testing.T) { 147 147 + ctx, db := newListTestDB(t) 148 148 + now := time.Now().UTC() 149 149 + evURI := "at://did:plc:org/quest.atmo.event/shared" 150 150 + seedListEvent(t, db, evURI, "Shared Event", now.Add(-1*time.Hour), now.Add(8*time.Hour)) 151 151 + seedListCheckin(t, db, "at://other/c/1", "did:plc:otheruser12345678abcde", evURI, now) 152 152 + 153 153 + events, _ := ListForUser(ctx, db, syntax.DID(listUserDID), now) 154 154 + if len(events) != 0 { 155 155 + t.Errorf("should not see other user's checkins; got %d events", len(events)) 156 156 + } 157 157 + } 158 158 + 159 159 + func TestListForUser_OrderedMostRecentFirst(t *testing.T) { 160 160 + ctx, db := newListTestDB(t) 161 161 + now := time.Now().UTC() 162 162 + 163 163 + evA := "at://did:plc:org/quest.atmo.event/A" 164 164 + evB := "at://did:plc:org/quest.atmo.event/B" 165 165 + seedListEvent(t, db, evA, "Event A", now.Add(-10*time.Hour), now.Add(-2*time.Hour)) 166 166 + seedListEvent(t, db, evB, "Event B", now.Add(-1*time.Hour), now.Add(8*time.Hour)) 167 167 + seedListCheckin(t, db, "at://u/c/a", listUserDID, evA, now.Add(-8*time.Hour)) 168 168 + seedListCheckin(t, db, "at://u/c/b", listUserDID, evB, now) 169 169 + 170 170 + events, _ := ListForUser(ctx, db, syntax.DID(listUserDID), now) 171 171 + if len(events) != 2 { 172 172 + t.Fatalf("expected 2; got %d", len(events)) 173 173 + } 174 174 + // Most recent checkin first → Event B. 175 175 + if events[0].EventName != "Event B" { 176 176 + t.Errorf("first event = %q; want 'Event B' (most recent)", events[0].EventName) 177 177 + } 178 178 + } 179 179 + 180 180 + // --- ListAttendeesForEvent --- 181 181 + 182 182 + func TestListAttendeesForEvent_Empty(t *testing.T) { 183 183 + ctx, db := newListTestDB(t) 184 184 + dids, err := ListAttendeesForEvent(ctx, db, "at://did:plc:org/quest.atmo.event/none") 185 185 + if err != nil { 186 186 + t.Fatalf("ListAttendeesForEvent: %v", err) 187 187 + } 188 188 + if len(dids) != 0 { 189 189 + t.Errorf("expected 0; got %d", len(dids)) 190 190 + } 191 191 + } 192 192 + 193 193 + func TestListAttendeesForEvent_ReturnsDistinctDIDs(t *testing.T) { 194 194 + ctx, db := newListTestDB(t) 195 195 + now := time.Now().UTC() 196 196 + evURI := "at://did:plc:org/quest.atmo.event/attendees" 197 197 + seedListEvent(t, db, evURI, "Attendee Event", now.Add(-1*time.Hour), now.Add(8*time.Hour)) 198 198 + 199 199 + userA := "did:plc:usera12345678901234567" 200 200 + userB := "did:plc:userb12345678901234567" 201 201 + seedListCheckin(t, db, "at://a/c/1", userA, evURI, now.Add(-30*time.Minute)) 202 202 + seedListCheckin(t, db, "at://a/c/2", userA, evURI, now) // duplicate 203 203 + seedListCheckin(t, db, "at://b/c/1", userB, evURI, now.Add(-15*time.Minute)) 204 204 + 205 205 + dids, err := ListAttendeesForEvent(ctx, db, evURI) 206 206 + if err != nil { 207 207 + t.Fatalf("ListAttendeesForEvent: %v", err) 208 208 + } 209 209 + if len(dids) != 2 { 210 210 + t.Fatalf("expected 2 distinct attendees; got %d", len(dids)) 211 211 + } 212 212 + // Ordered by earliest check-in. 213 213 + if dids[0] != userA { 214 214 + t.Errorf("first attendee = %q; want %q (checked in earliest)", dids[0], userA) 215 215 + } 216 216 + }

+22 -1

internal/connection/drain.go

Reviewed

··· 27 27 // are logged (if logger is non-nil) and the row is left in the queue for a 28 28 // future retry. 29 29 // 30 30 + // pdsHost is the PDS URL of the draining user, used to dedup against existing 31 31 + // connection records on their PDS. 32 32 + // 30 33 // If onDrain is non-nil it is called after each successfully written + 31 34 // deleted pending item, e.g. to auto-check-in the user to the event. 32 35 // ··· 35 38 // blocking the user's redirect to /profile. 36 39 // 37 40 // A wrapper-level error (e.g. queue lookup failure) is returned as-is. 38 38 - func Drain(ctx context.Context, q *Queue, sess *oauth.ClientSession, logger *slog.Logger, onDrain DrainHook) (DrainResult, error) { 41 41 + func Drain(ctx context.Context, q *Queue, sess *oauth.ClientSession, pdsHost string, logger *slog.Logger, onDrain DrainHook) (DrainResult, error) { 39 42 res := DrainResult{} 40 43 if sess == nil { 41 44 return res, errNoSession ··· 46 49 return res, err 47 50 } 48 51 for _, item := range items { 52 52 + // Dedup: skip if the user already has this connection on their PDS. 53 53 + if pdsHost != "" && HasConnection(ctx, pdsHost, target, item.InitiatorDID, item.EventURI) { 54 54 + if logger != nil { 55 55 + logger.Debug("connection drain: duplicate skipped", 56 56 + "target", target.String(), 57 57 + "initiator", item.InitiatorDID.String(), 58 58 + "event", item.EventURI, 59 59 + ) 60 60 + } 61 61 + // Delete the queue row — no need to retry. 62 62 + _ = q.Delete(ctx, item.ID) 63 63 + res.Skipped++ 64 64 + // Still fire the hook so auto-checkin happens even for skipped connections. 65 65 + if onDrain != nil { 66 66 + onDrain(ctx, sess, item) 67 67 + } 68 68 + continue 69 69 + } 49 70 _, _, err := Put(ctx, sess, Record{With: item.InitiatorDID, EventURI: item.EventURI}) 50 71 if err != nil { 51 72 if logger != nil {

+6

internal/db/migrations/009_privacy_toggles.sql

Reviewed

··· 1 1 + -- 009_privacy_toggles.sql 2 2 + -- Adds per-user privacy settings for event attendee lists and leaderboard. 3 3 + -- Stored in the users table (not PDS) because these are private preferences. 4 4 + 5 5 + ALTER TABLE users ADD COLUMN hide_from_attendees INTEGER NOT NULL DEFAULT 0; 6 6 + ALTER TABLE users ADD COLUMN hide_from_leaderboard INTEGER NOT NULL DEFAULT 0;

+15

internal/db/migrations/010_new_badge_definitions.sql

Reviewed

··· 1 1 + -- 010_new_badge_definitions.sql 2 2 + -- Seeds additional badge definitions for connection milestones and special badges. 3 3 + 4 4 + INSERT OR IGNORE INTO badge_definitions (slug, name, description, shape, primary_color, accent_color, ribbon_color, label, trigger) 5 5 + VALUES 6 6 + ('connections-10', '10 Connections', 'Made 10 connections', 'circle', '#f9e2af', '#1e1e2e', '#94e2d5', '10', 'connections-10'), 7 7 + ('connections-300', '300 Connections', 'Made 300 connections', 'circle', '#cba6f7', '#1e1e2e', '#fab387', '300', 'connections-300'), 8 8 + ('connections-400', '400 Connections', 'Made 400 connections', 'circle', '#cba6f7', '#1e1e2e', '#fab387', '400', 'connections-400'), 9 9 + ('connections-500', '500 Connections', 'Made 500 connections', 'circle', '#cba6f7', '#1e1e2e', '#fab387', '500', 'connections-500'), 10 10 + ('extra-curious', 'Extra Curious', 'Explored your data in settings', 'hexagon', '#89b4fa', '#1e1e2e', '#89dceb', '?', 'extra-curious'), 11 11 + ('besties', 'Besties', 'Connected with the same person at multiple events', 'star', '#fab387', '#1e1e2e', '#f38ba8', '♥', 'besties'), 12 12 + ('event-leaderboard-1st', 'Event Champion', 'First place on the event leaderboard', 'shield', '#FFD700', '#1e1e2e', '#f38ba8', '1st', 'event-leaderboard-1st'), 13 13 + ('event-leaderboard-2nd', 'Event Runner-Up', 'Second place on the event leaderboard', 'shield', '#C0C0C0', '#1e1e2e', '#94e2d5', '2nd', 'event-leaderboard-2nd'), 14 14 + ('event-leaderboard-3rd', 'Event Third Place', 'Third place on the event leaderboard', 'shield', '#CD7F32', '#1e1e2e', '#a6e3a1', '3rd', 'event-leaderboard-3rd'), 15 15 + ('event-exceeded', 'Beyond Expectations', 'Checked in when attendance exceeded expectations', 'star', '#FFD700', '#1e1e2e', '#fab387', '★', 'event-exceeded');

+31

internal/db/migrations/011_event_badges_per_type.sql

Reviewed

··· 1 1 + -- 011_event_badges_per_type.sql 2 2 + -- Changes event_badges to support multiple badge designs per event, 3 3 + -- one per badge type (e.g. check-in, leaderboard-1st, exceeded). 4 4 + 5 5 + -- Create new table with composite primary key. 6 6 + CREATE TABLE event_badges_new ( 7 7 + event_uri TEXT NOT NULL, 8 8 + badge_type TEXT NOT NULL DEFAULT 'event-attendee', 9 9 + shape TEXT NOT NULL, 10 10 + primary_color TEXT NOT NULL, 11 11 + accent_color TEXT NOT NULL, 12 12 + ribbon_color TEXT NOT NULL, 13 13 + label TEXT NOT NULL, 14 14 + signature TEXT NOT NULL, 15 15 + signing_key_id TEXT NOT NULL DEFAULT 'v1', 16 16 + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, 17 17 + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, 18 18 + PRIMARY KEY (event_uri, badge_type), 19 19 + FOREIGN KEY (event_uri) REFERENCES events (uri) ON DELETE CASCADE 20 20 + ); 21 21 + 22 22 + -- Migrate existing data (all existing designs become 'event-attendee' type). 23 23 + INSERT INTO event_badges_new 24 24 + (event_uri, badge_type, shape, primary_color, accent_color, ribbon_color, 25 25 + label, signature, signing_key_id, created_at, updated_at) 26 26 + SELECT event_uri, 'event-attendee', shape, primary_color, accent_color, ribbon_color, 27 27 + label, signature, signing_key_id, created_at, updated_at 28 28 + FROM event_badges; 29 29 + 30 30 + DROP TABLE event_badges; 31 31 + ALTER TABLE event_badges_new RENAME TO event_badges;

+11

internal/db/migrations/012_badge_message_and_host.sql

Reviewed

··· 1 1 + -- 012_badge_message_and_host.sql 2 2 + -- Adds a customizable message to earned badges and the event-host badge type. 3 3 + 4 4 + ALTER TABLE earned_badges ADD COLUMN message TEXT NOT NULL DEFAULT ''; 5 5 + 6 6 + -- Add message template column to event_badges for admin-customizable text. 7 7 + ALTER TABLE event_badges ADD COLUMN message_template TEXT NOT NULL DEFAULT ''; 8 8 + 9 9 + -- Seed the event-host badge definition. 10 10 + INSERT OR IGNORE INTO badge_definitions (slug, name, description, shape, primary_color, accent_color, ribbon_color, label, trigger) 11 11 + VALUES ('event-host', 'Event Host', 'Hosted a successful event', 'shield', '#FFD700', '#1e1e2e', '#fab387', '★', 'event-host');

+48

internal/event/put.go

Reviewed

··· 7 7 "encoding/base32" 8 8 "errors" 9 9 "fmt" 10 10 + "strings" 10 11 "time" 11 12 12 13 "github.com/bluesky-social/indigo/atproto/auth/oauth" ··· 267 268 } 268 269 return string(out), nil 269 270 } 271 271 + 272 272 + // Delete removes an event and all associated data (checkins, stats, badges) 273 273 + // from the local database. It also deletes the quest.atmo.event record from 274 274 + // the organizer's PDS if a session is provided. 275 275 + // 276 276 + // The PDS deletion is best-effort — if it fails the local data is still 277 277 + // removed so the event disappears from the admin UI. 278 278 + func Delete(ctx context.Context, sess *oauth.ClientSession, db *sql.DB, uri string) error { 279 279 + if uri == "" { 280 280 + return errors.New("event: empty URI") 281 281 + } 282 282 + 283 283 + // Delete the record from PDS if we have a session. 284 284 + if sess != nil { 285 285 + rkey := rkeyFromURI(uri) 286 286 + if rkey != "" { 287 287 + input := map[string]any{ 288 288 + "repo": sess.Data.AccountDID.String(), 289 289 + "collection": NSID, 290 290 + "rkey": rkey, 291 291 + } 292 292 + if err := sess.APIClient().Post(ctx, syntax.NSID("com.atproto.repo.deleteRecord"), input, nil); err != nil { 293 293 + // Log but don't fail — local cleanup is more important. 294 294 + fmt.Printf("event delete: PDS record delete failed: %v\n", err) 295 295 + } 296 296 + } 297 297 + } 298 298 + 299 299 + // Remove all local data associated with this event. 300 300 + _, _ = db.ExecContext(ctx, `DELETE FROM checkins WHERE event_uri = ?`, uri) 301 301 + _, _ = db.ExecContext(ctx, `DELETE FROM event_stats WHERE event_uri = ?`, uri) 302 302 + _, _ = db.ExecContext(ctx, `DELETE FROM event_badges WHERE event_uri = ?`, uri) 303 303 + _, _ = db.ExecContext(ctx, `DELETE FROM badge_definitions WHERE event_uri = ?`, uri) 304 304 + _, _ = db.ExecContext(ctx, `DELETE FROM pending_connections WHERE event_uri = ?`, uri) 305 305 + _, _ = db.ExecContext(ctx, `DELETE FROM events WHERE uri = ?`, uri) 306 306 + 307 307 + return nil 308 308 + } 309 309 + 310 310 + // rkeyFromURI extracts the record key (last path segment) from an at:// URI. 311 311 + func rkeyFromURI(uri string) string { 312 312 + parts := strings.Split(uri, "/") 313 313 + if len(parts) == 0 { 314 314 + return "" 315 315 + } 316 316 + return parts[len(parts)-1] 317 317 + }

+324

internal/event/stats_test.go

Reviewed

··· 1 1 + package event 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "path/filepath" 7 7 + "testing" 8 8 + "time" 9 9 + 10 10 + atdb "atmoquest/internal/db" 11 11 + ) 12 12 + 13 13 + // Test fixtures for event stats tests. Reuse newTestDB from event_test.go. 14 14 + func newStatsTestDB(t *testing.T) (context.Context, *sql.DB) { 15 15 + t.Helper() 16 16 + dir := t.TempDir() 17 17 + dsn := "file:" + filepath.Join(dir, "stats.db") + "?_pragma=foreign_keys(ON)" 18 18 + conn, err := atdb.Open(dsn) 19 19 + if err != nil { 20 20 + t.Fatalf("db open: %v", err) 21 21 + } 22 22 + if err := atdb.Migrate(conn); err != nil { 23 23 + t.Fatalf("migrate: %v", err) 24 24 + } 25 25 + t.Cleanup(func() { _ = conn.Close() }) 26 26 + return context.Background(), conn 27 27 + } 28 28 + 29 29 + func TestGetStats_EmptyReturnsZeros(t *testing.T) { 30 30 + ctx, db := newStatsTestDB(t) 31 31 + s, err := GetStats(ctx, db, "at://did:plc:org/quest.atmo.event/nonexistent") 32 32 + if err != nil { 33 33 + t.Fatalf("GetStats: %v", err) 34 34 + } 35 35 + if s.UniqueConnectors != 0 || s.TotalCheckins != 0 { 36 36 + t.Errorf("GetStats empty = %+v; want zeros", s) 37 37 + } 38 38 + } 39 39 + 40 40 + func TestIncrementConnectors(t *testing.T) { 41 41 + ctx, db := newStatsTestDB(t) 42 42 + uri := "at://did:plc:org/quest.atmo.event/test1" 43 43 + 44 44 + for i := 0; i < 5; i++ { 45 45 + if err := IncrementConnectors(ctx, db, uri); err != nil { 46 46 + t.Fatalf("IncrementConnectors #%d: %v", i, err) 47 47 + } 48 48 + } 49 49 + s, _ := GetStats(ctx, db, uri) 50 50 + if s.UniqueConnectors != 5 { 51 51 + t.Errorf("UniqueConnectors = %d; want 5", s.UniqueConnectors) 52 52 + } 53 53 + if s.TotalCheckins != 0 { 54 54 + t.Errorf("TotalCheckins = %d; want 0", s.TotalCheckins) 55 55 + } 56 56 + } 57 57 + 58 58 + func TestIncrementCheckins(t *testing.T) { 59 59 + ctx, db := newStatsTestDB(t) 60 60 + uri := "at://did:plc:org/quest.atmo.event/test2" 61 61 + 62 62 + for i := 0; i < 3; i++ { 63 63 + if err := IncrementCheckins(ctx, db, uri); err != nil { 64 64 + t.Fatalf("IncrementCheckins #%d: %v", i, err) 65 65 + } 66 66 + } 67 67 + s, _ := GetStats(ctx, db, uri) 68 68 + if s.TotalCheckins != 3 { 69 69 + t.Errorf("TotalCheckins = %d; want 3", s.TotalCheckins) 70 70 + } 71 71 + if s.UniqueConnectors != 0 { 72 72 + t.Errorf("UniqueConnectors = %d; want 0", s.UniqueConnectors) 73 73 + } 74 74 + } 75 75 + 76 76 + func TestIncrementBoth(t *testing.T) { 77 77 + ctx, db := newStatsTestDB(t) 78 78 + uri := "at://did:plc:org/quest.atmo.event/both" 79 79 + 80 80 + _ = IncrementConnectors(ctx, db, uri) 81 81 + _ = IncrementConnectors(ctx, db, uri) 82 82 + _ = IncrementCheckins(ctx, db, uri) 83 83 + 84 84 + s, _ := GetStats(ctx, db, uri) 85 85 + if s.UniqueConnectors != 2 { 86 86 + t.Errorf("UniqueConnectors = %d; want 2", s.UniqueConnectors) 87 87 + } 88 88 + if s.TotalCheckins != 1 { 89 89 + t.Errorf("TotalCheckins = %d; want 1", s.TotalCheckins) 90 90 + } 91 91 + } 92 92 + 93 93 + func TestIncrement_EmptyURIIsNoop(t *testing.T) { 94 94 + ctx, db := newStatsTestDB(t) 95 95 + // Empty URI should be a no-op, not an error. 96 96 + if err := IncrementConnectors(ctx, db, ""); err != nil { 97 97 + t.Errorf("IncrementConnectors empty URI: %v", err) 98 98 + } 99 99 + if err := IncrementCheckins(ctx, db, ""); err != nil { 100 100 + t.Errorf("IncrementCheckins empty URI: %v", err) 101 101 + } 102 102 + } 103 103 + 104 104 + func TestStats_IsolatedByEvent(t *testing.T) { 105 105 + ctx, db := newStatsTestDB(t) 106 106 + uriA := "at://did:plc:org/quest.atmo.event/A" 107 107 + uriB := "at://did:plc:org/quest.atmo.event/B" 108 108 + 109 109 + _ = IncrementConnectors(ctx, db, uriA) 110 110 + _ = IncrementConnectors(ctx, db, uriA) 111 111 + _ = IncrementConnectors(ctx, db, uriB) 112 112 + 113 113 + sA, _ := GetStats(ctx, db, uriA) 114 114 + sB, _ := GetStats(ctx, db, uriB) 115 115 + if sA.UniqueConnectors != 2 { 116 116 + t.Errorf("event A connectors = %d; want 2", sA.UniqueConnectors) 117 117 + } 118 118 + if sB.UniqueConnectors != 1 { 119 119 + t.Errorf("event B connectors = %d; want 1", sB.UniqueConnectors) 120 120 + } 121 121 + } 122 122 + 123 123 + // --- Event List Tests --- 124 124 + 125 125 + func TestListAll_Empty(t *testing.T) { 126 126 + ctx, db := newStatsTestDB(t) 127 127 + list, err := ListAll(ctx, db) 128 128 + if err != nil { 129 129 + t.Fatalf("ListAll: %v", err) 130 130 + } 131 131 + if len(list) != 0 { 132 132 + t.Errorf("ListAll empty = %d; want 0", len(list)) 133 133 + } 134 134 + } 135 135 + 136 136 + func TestListAll_ReturnsEvents(t *testing.T) { 137 137 + ctx, db := newStatsTestDB(t) 138 138 + now := time.Now().UTC() 139 139 + // Insert two events. 140 140 + rec1 := sampleEvent() 141 141 + rec1.Name = "Event A" 142 142 + rec1.StartTime = now.Add(-2 * time.Hour) 143 143 + rec1.EndTime = now.Add(2 * time.Hour) 144 144 + _ = Cache(ctx, db, rec1) 145 145 + 146 146 + rec2 := Record{ 147 147 + URI: "at://did:plc:org2/quest.atmo.event/second", 148 148 + Name: "Event B", 149 149 + StartTime: now.Add(-1 * time.Hour), 150 150 + EndTime: now.Add(3 * time.Hour), 151 151 + Location: "Seattle", 152 152 + } 153 153 + _ = Cache(ctx, db, rec2) 154 154 + 155 155 + list, err := ListAll(ctx, db) 156 156 + if err != nil { 157 157 + t.Fatalf("ListAll: %v", err) 158 158 + } 159 159 + if len(list) != 2 { 160 160 + t.Fatalf("ListAll returned %d; want 2", len(list)) 161 161 + } 162 162 + // Ordered by start_time DESC — Event B started later. 163 163 + if list[0].Name != "Event B" { 164 164 + t.Errorf("first event = %q; want 'Event B' (most recent start)", list[0].Name) 165 165 + } 166 166 + } 167 167 + 168 168 + func TestQRTokenForURI_NotFound(t *testing.T) { 169 169 + ctx, db := newStatsTestDB(t) 170 170 + token := QRTokenForURI(ctx, db, "at://nonexistent") 171 171 + if token != "" { 172 172 + t.Errorf("QRTokenForURI nonexistent = %q; want empty", token) 173 173 + } 174 174 + } 175 175 + 176 176 + func TestLookupByQRToken_NotFound(t *testing.T) { 177 177 + ctx, db := newStatsTestDB(t) 178 178 + _, err := LookupByQRToken(ctx, db, "nonexistent-token") 179 179 + if err != ErrNotFound { 180 180 + t.Errorf("LookupByQRToken = %v; want ErrNotFound", err) 181 181 + } 182 182 + } 183 183 + 184 184 + func TestLookupByQRToken_EmptyToken(t *testing.T) { 185 185 + ctx, db := newStatsTestDB(t) 186 186 + _, err := LookupByQRToken(ctx, db, "") 187 187 + if err != ErrNotFound { 188 188 + t.Errorf("LookupByQRToken empty = %v; want ErrNotFound", err) 189 189 + } 190 190 + } 191 191 + 192 192 + // --- Event Put Validation Tests --- 193 193 + 194 194 + func TestValidateCreate(t *testing.T) { 195 195 + now := time.Now().UTC() 196 196 + cases := []struct { 197 197 + name string 198 198 + input CreateInput 199 199 + wantErr bool 200 200 + }{ 201 201 + { 202 202 + "valid", 203 203 + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(time.Hour), ExpectedAttendees: 100}, 204 204 + false, 205 205 + }, 206 206 + { 207 207 + "empty name", 208 208 + CreateInput{Name: "", StartTime: now, EndTime: now.Add(time.Hour)}, 209 209 + true, 210 210 + }, 211 211 + { 212 212 + "missing start", 213 213 + CreateInput{Name: "Test", EndTime: now.Add(time.Hour)}, 214 214 + true, 215 215 + }, 216 216 + { 217 217 + "missing end", 218 218 + CreateInput{Name: "Test", StartTime: now}, 219 219 + true, 220 220 + }, 221 221 + { 222 222 + "end before start", 223 223 + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(-time.Hour)}, 224 224 + true, 225 225 + }, 226 226 + { 227 227 + "negative attendees", 228 228 + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(time.Hour), ExpectedAttendees: -1}, 229 229 + true, 230 230 + }, 231 231 + { 232 232 + "zero attendees ok", 233 233 + CreateInput{Name: "Test", StartTime: now, EndTime: now.Add(time.Hour), ExpectedAttendees: 0}, 234 234 + false, 235 235 + }, 236 236 + } 237 237 + for _, tc := range cases { 238 238 + t.Run(tc.name, func(t *testing.T) { 239 239 + err := validateCreate(tc.input) 240 240 + if (err != nil) != tc.wantErr { 241 241 + t.Errorf("validateCreate() = %v; wantErr = %v", err, tc.wantErr) 242 242 + } 243 243 + }) 244 244 + } 245 245 + } 246 246 + 247 247 + // --- QR Token Generation --- 248 248 + 249 249 + func TestNewQRToken_Unique(t *testing.T) { 250 250 + seen := make(map[string]bool, 100) 251 251 + for i := 0; i < 100; i++ { 252 252 + tok, err := newQRToken() 253 253 + if err != nil { 254 254 + t.Fatalf("newQRToken: %v", err) 255 255 + } 256 256 + if tok == "" { 257 257 + t.Fatal("empty token") 258 258 + } 259 259 + if seen[tok] { 260 260 + t.Fatalf("duplicate token after %d iterations: %q", i, tok) 261 261 + } 262 262 + seen[tok] = true 263 263 + } 264 264 + } 265 265 + 266 266 + func TestNewQRToken_Lowercase(t *testing.T) { 267 267 + for i := 0; i < 20; i++ { 268 268 + tok, _ := newQRToken() 269 269 + for _, c := range tok { 270 270 + if c >= 'A' && c <= 'Z' { 271 271 + t.Errorf("token %q contains uppercase", tok) 272 272 + break 273 273 + } 274 274 + } 275 275 + } 276 276 + } 277 277 + 278 278 + // --- Event Delete Validation --- 279 279 + 280 280 + func TestDelete_EmptyURI(t *testing.T) { 281 281 + ctx, db := newStatsTestDB(t) 282 282 + err := Delete(ctx, nil, db, "") 283 283 + if err == nil { 284 284 + t.Error("Delete empty URI should fail") 285 285 + } 286 286 + } 287 287 + 288 288 + func TestDelete_RemovesLocalData(t *testing.T) { 289 289 + ctx, db := newStatsTestDB(t) 290 290 + rec := sampleEvent() 291 291 + _ = Cache(ctx, db, rec) 292 292 + _ = IncrementConnectors(ctx, db, rec.URI) 293 293 + _ = IncrementCheckins(ctx, db, rec.URI) 294 294 + 295 295 + // Seed a checkin referencing this event. 296 296 + _, _ = db.ExecContext(ctx, ` 297 297 + INSERT INTO checkins (record_uri, did, event_uri, checked_in_at, cached_at) 298 298 + VALUES ('at://rec/1', 'did:plc:user', ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP) 299 299 + `, rec.URI) 300 300 + 301 301 + err := Delete(ctx, nil, db, rec.URI) 302 302 + if err != nil { 303 303 + t.Fatalf("Delete: %v", err) 304 304 + } 305 305 + 306 306 + // Event should be gone. 307 307 + _, err = Get(ctx, db, rec.URI) 308 308 + if err != ErrNotFound { 309 309 + t.Errorf("Get after delete = %v; want ErrNotFound", err) 310 310 + } 311 311 + 312 312 + // Stats should be gone. 313 313 + s, _ := GetStats(ctx, db, rec.URI) 314 314 + if s.UniqueConnectors != 0 || s.TotalCheckins != 0 { 315 315 + t.Errorf("stats after delete = %+v; want zeros", s) 316 316 + } 317 317 + 318 318 + // Checkins should be cascade-deleted. 319 319 + var count int 320 320 + _ = db.QueryRowContext(ctx, `SELECT COUNT(*) FROM checkins WHERE event_uri = ?`, rec.URI).Scan(&count) 321 321 + if count != 0 { 322 322 + t.Errorf("checkins after delete = %d; want 0", count) 323 323 + } 324 324 + }

+94

internal/interest/match_test.go

Reviewed

··· 1 1 + package interest 2 2 + 3 3 + import ( 4 4 + "testing" 5 5 + 6 6 + "github.com/bluesky-social/indigo/atproto/syntax" 7 7 + ) 8 8 + 9 9 + // Since FindMatches calls profile.FetchQuest directly (making PDS network 10 10 + // calls), we test the input validation, self-skip, and edge cases that 11 11 + // don't require a live PDS. Tests that exercise the full PDS → match 12 12 + // pipeline belong in integration tests (which require a running devnet). 13 13 + 14 14 + func TestFindMatches_EmptyViewerInterests(t *testing.T) { 15 15 + matches := FindMatches( 16 16 + t.Context(), 17 17 + nil, // no viewer interests 18 18 + []string{"did:plc:aaaaaa1234567890abcdef"}, 19 19 + syntax.DID("did:plc:viewer1234567890abcdef"), 20 20 + nil, 21 21 + func(d syntax.DID) string { return "https://bsky.social" }, 22 22 + func(pds string, did syntax.DID) (string, string) { return "", "" }, 23 23 + ) 24 24 + if len(matches) != 0 { 25 25 + t.Errorf("expected 0 matches for empty interests; got %d", len(matches)) 26 26 + } 27 27 + } 28 28 + 29 29 + func TestFindMatches_SkipsSelfInList(t *testing.T) { 30 30 + viewerDID := "did:plc:viewer1234567890abcdef" 31 31 + // Even if the viewer is in the attendee list, they should be skipped. 32 32 + // FetchQuest will fail for this test (no real PDS), but the skip 33 33 + // should happen before the fetch. 34 34 + matches := FindMatches( 35 35 + t.Context(), 36 36 + []string{"rust", "go"}, 37 37 + []string{viewerDID}, 38 38 + syntax.DID(viewerDID), 39 39 + nil, 40 40 + func(d syntax.DID) string { return "https://bsky.social" }, 41 41 + func(pds string, did syntax.DID) (string, string) { return "", "" }, 42 42 + ) 43 43 + if len(matches) != 0 { 44 44 + t.Errorf("expected 0 matches (self only in list); got %d", len(matches)) 45 45 + } 46 46 + } 47 47 + 48 48 + func TestFindMatches_SkipsInvalidDIDs(t *testing.T) { 49 49 + matches := FindMatches( 50 50 + t.Context(), 51 51 + []string{"rust"}, 52 52 + []string{"not-a-did", "", "also invalid"}, 53 53 + syntax.DID("did:plc:viewer1234567890abcdef"), 54 54 + nil, 55 55 + func(d syntax.DID) string { return "https://bsky.social" }, 56 56 + func(pds string, did syntax.DID) (string, string) { return "", "" }, 57 57 + ) 58 58 + if len(matches) != 0 { 59 59 + t.Errorf("expected 0 matches for invalid DIDs; got %d", len(matches)) 60 60 + } 61 61 + } 62 62 + 63 63 + func TestFindMatches_EmptyAttendeeList(t *testing.T) { 64 64 + matches := FindMatches( 65 65 + t.Context(), 66 66 + []string{"rust", "go"}, 67 67 + nil, // no attendees 68 68 + syntax.DID("did:plc:viewer1234567890abcdef"), 69 69 + nil, 70 70 + func(d syntax.DID) string { return "https://bsky.social" }, 71 71 + func(pds string, did syntax.DID) (string, string) { return "", "" }, 72 72 + ) 73 73 + if len(matches) != 0 { 74 74 + t.Errorf("expected 0 matches for empty attendees; got %d", len(matches)) 75 75 + } 76 76 + } 77 77 + 78 78 + func TestFindMatches_GracefulOnFetchFailure(t *testing.T) { 79 79 + // When profile.FetchQuest fails (no PDS running), attendees are 80 80 + // silently skipped — the function should return empty, not panic. 81 81 + matches := FindMatches( 82 82 + t.Context(), 83 83 + []string{"rust"}, 84 84 + []string{"did:plc:aaaaaa1234567890abcdef"}, 85 85 + syntax.DID("did:plc:viewer1234567890abcdef"), 86 86 + nil, 87 87 + func(d syntax.DID) string { return "https://127.0.0.1:1" }, // unreachable 88 88 + func(pds string, did syntax.DID) (string, string) { return "", "" }, 89 89 + ) 90 90 + // Should gracefully return empty, not error. 91 91 + if len(matches) != 0 { 92 92 + t.Errorf("expected 0 matches with unreachable PDS; got %d", len(matches)) 93 93 + } 94 94 + }

+231

internal/notes/notes_test.go

Reviewed

··· 1 1 + package notes 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "path/filepath" 7 7 + "testing" 8 8 + 9 9 + atdb "atmoquest/internal/db" 10 10 + ) 11 11 + 12 12 + const ( 13 13 + viewerDID = "did:plc:viewer1234567890abcdef" 14 14 + targetDID = "did:plc:target1234567890abcdef" 15 15 + otherDID = "did:plc:other11234567890abcdef" 16 16 + ) 17 17 + 18 18 + func newTestDB(t *testing.T) (context.Context, *sql.DB) { 19 19 + t.Helper() 20 20 + dir := t.TempDir() 21 21 + dsn := "file:" + filepath.Join(dir, "notes.db") + "?_pragma=foreign_keys(ON)" 22 22 + conn, err := atdb.Open(dsn) 23 23 + if err != nil { 24 24 + t.Fatalf("db open: %v", err) 25 25 + } 26 26 + if err := atdb.Migrate(conn); err != nil { 27 27 + t.Fatalf("migrate: %v", err) 28 28 + } 29 29 + t.Cleanup(func() { _ = conn.Close() }) 30 30 + return context.Background(), conn 31 31 + } 32 32 + 33 33 + func TestGet_EmptyReturnsZeroNote(t *testing.T) { 34 34 + ctx, db := newTestDB(t) 35 35 + note, err := Get(ctx, db, viewerDID, targetDID) 36 36 + if err != nil { 37 37 + t.Fatalf("Get: %v", err) 38 38 + } 39 39 + if note.Notes != "" || note.FollowUp { 40 40 + t.Errorf("Get empty = %+v; want zero Note", note) 41 41 + } 42 42 + } 43 43 + 44 44 + func TestPut_InsertAndGet(t *testing.T) { 45 45 + ctx, db := newTestDB(t) 46 46 + want := Note{Notes: "Met at CascadiaJS, really liked their talk on Rust", FollowUp: true} 47 47 + if err := Put(ctx, db, viewerDID, targetDID, want); err != nil { 48 48 + t.Fatalf("Put: %v", err) 49 49 + } 50 50 + got, err := Get(ctx, db, viewerDID, targetDID) 51 51 + if err != nil { 52 52 + t.Fatalf("Get: %v", err) 53 53 + } 54 54 + if got.Notes != want.Notes { 55 55 + t.Errorf("Notes = %q, want %q", got.Notes, want.Notes) 56 56 + } 57 57 + if got.FollowUp != want.FollowUp { 58 58 + t.Errorf("FollowUp = %v, want %v", got.FollowUp, want.FollowUp) 59 59 + } 60 60 + } 61 61 + 62 62 + func TestPut_UpsertOverwrites(t *testing.T) { 63 63 + ctx, db := newTestDB(t) 64 64 + // Initial note. 65 65 + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "v1"}); err != nil { 66 66 + t.Fatalf("Put v1: %v", err) 67 67 + } 68 68 + // Update. 69 69 + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "v2", FollowUp: true}); err != nil { 70 70 + t.Fatalf("Put v2: %v", err) 71 71 + } 72 72 + got, _ := Get(ctx, db, viewerDID, targetDID) 73 73 + if got.Notes != "v2" { 74 74 + t.Errorf("Notes after upsert = %q, want v2", got.Notes) 75 75 + } 76 76 + if !got.FollowUp { 77 77 + t.Error("FollowUp after upsert = false, want true") 78 78 + } 79 79 + } 80 80 + 81 81 + func TestPut_EmptyDeletesRow(t *testing.T) { 82 82 + ctx, db := newTestDB(t) 83 83 + // Seed a note. 84 84 + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "hi"}); err != nil { 85 85 + t.Fatalf("Put: %v", err) 86 86 + } 87 87 + // Clear it — empty notes + no follow-up should delete the row. 88 88 + if err := Put(ctx, db, viewerDID, targetDID, Note{}); err != nil { 89 89 + t.Fatalf("Put empty: %v", err) 90 90 + } 91 91 + got, _ := Get(ctx, db, viewerDID, targetDID) 92 92 + if got.Notes != "" || got.FollowUp { 93 93 + t.Errorf("after clearing: %+v; want zero Note", got) 94 94 + } 95 95 + } 96 96 + 97 97 + func TestPut_FollowUpOnlyPreservesRow(t *testing.T) { 98 98 + ctx, db := newTestDB(t) 99 99 + // A follow-up flag with no text should still persist. 100 100 + if err := Put(ctx, db, viewerDID, targetDID, Note{FollowUp: true}); err != nil { 101 101 + t.Fatalf("Put: %v", err) 102 102 + } 103 103 + got, _ := Get(ctx, db, viewerDID, targetDID) 104 104 + if !got.FollowUp { 105 105 + t.Error("FollowUp = false; want true (row should persist for follow-up-only)") 106 106 + } 107 107 + } 108 108 + 109 109 + func TestGet_IsolatedByViewer(t *testing.T) { 110 110 + ctx, db := newTestDB(t) 111 111 + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "viewer's note"}); err != nil { 112 112 + t.Fatalf("Put: %v", err) 113 113 + } 114 114 + // A different viewer should see nothing. 115 115 + got, _ := Get(ctx, db, otherDID, targetDID) 116 116 + if got.Notes != "" { 117 117 + t.Errorf("other viewer sees %q; want empty", got.Notes) 118 118 + } 119 119 + } 120 120 + 121 121 + func TestGet_IsolatedByTarget(t *testing.T) { 122 122 + ctx, db := newTestDB(t) 123 123 + if err := Put(ctx, db, viewerDID, targetDID, Note{Notes: "about target"}); err != nil { 124 124 + t.Fatalf("Put: %v", err) 125 125 + } 126 126 + // Same viewer, different target — should see nothing. 127 127 + got, _ := Get(ctx, db, viewerDID, otherDID) 128 128 + if got.Notes != "" { 129 129 + t.Errorf("wrong target sees %q; want empty", got.Notes) 130 130 + } 131 131 + } 132 132 + 133 133 + func TestListAll_ReturnsAllForViewer(t *testing.T) { 134 134 + ctx, db := newTestDB(t) 135 135 + _ = Put(ctx, db, viewerDID, targetDID, Note{Notes: "note A"}) 136 136 + _ = Put(ctx, db, viewerDID, otherDID, Note{Notes: "note B", FollowUp: true}) 137 137 + // Another viewer's note should not appear. 138 138 + _ = Put(ctx, db, otherDID, targetDID, Note{Notes: "other viewer"}) 139 139 + 140 140 + rows, err := ListAll(ctx, db, viewerDID) 141 141 + if err != nil { 142 142 + t.Fatalf("ListAll: %v", err) 143 143 + } 144 144 + if len(rows) != 2 { 145 145 + t.Fatalf("ListAll returned %d rows; want 2", len(rows)) 146 146 + } 147 147 + // Should be ordered by updated_at DESC — most recent first. 148 148 + // The second Put happened after the first, so "note B" should be first. 149 149 + if rows[0].TargetDID != otherDID { 150 150 + t.Errorf("first row target = %q; want %q (most recent)", rows[0].TargetDID, otherDID) 151 151 + } 152 152 + } 153 153 + 154 154 + func TestListAll_Empty(t *testing.T) { 155 155 + ctx, db := newTestDB(t) 156 156 + rows, err := ListAll(ctx, db, viewerDID) 157 157 + if err != nil { 158 158 + t.Fatalf("ListAll: %v", err) 159 159 + } 160 160 + if len(rows) != 0 { 161 161 + t.Errorf("ListAll empty = %d rows; want 0", len(rows)) 162 162 + } 163 163 + } 164 164 + 165 165 + func TestListAll_FollowUpFlag(t *testing.T) { 166 166 + ctx, db := newTestDB(t) 167 167 + _ = Put(ctx, db, viewerDID, targetDID, Note{Notes: "with followup", FollowUp: true}) 168 168 + _ = Put(ctx, db, viewerDID, otherDID, Note{Notes: "no followup"}) 169 169 + 170 170 + rows, err := ListAll(ctx, db, viewerDID) 171 171 + if err != nil { 172 172 + t.Fatalf("ListAll: %v", err) 173 173 + } 174 174 + followUpCount := 0 175 175 + for _, r := range rows { 176 176 + if r.FollowUp { 177 177 + followUpCount++ 178 178 + } 179 179 + } 180 180 + if followUpCount != 1 { 181 181 + t.Errorf("follow-up count = %d; want 1", followUpCount) 182 182 + } 183 183 + } 184 184 + 185 185 + func TestDeleteAll_RemovesAllForViewer(t *testing.T) { 186 186 + ctx, db := newTestDB(t) 187 187 + _ = Put(ctx, db, viewerDID, targetDID, Note{Notes: "a"}) 188 188 + _ = Put(ctx, db, viewerDID, otherDID, Note{Notes: "b"}) 189 189 + _ = Put(ctx, db, otherDID, targetDID, Note{Notes: "other"}) 190 190 + 191 191 + count, err := DeleteAll(ctx, db, viewerDID) 192 192 + if err != nil { 193 193 + t.Fatalf("DeleteAll: %v", err) 194 194 + } 195 195 + if count != 2 { 196 196 + t.Errorf("DeleteAll returned count=%d; want 2", count) 197 197 + } 198 198 + // Viewer's notes gone. 199 199 + rows, _ := ListAll(ctx, db, viewerDID) 200 200 + if len(rows) != 0 { 201 201 + t.Errorf("viewer still has %d rows after DeleteAll", len(rows)) 202 202 + } 203 203 + // Other viewer's notes untouched. 204 204 + otherRows, _ := ListAll(ctx, db, otherDID) 205 205 + if len(otherRows) != 1 { 206 206 + t.Errorf("other viewer has %d rows; want 1 (untouched)", len(otherRows)) 207 207 + } 208 208 + } 209 209 + 210 210 + func TestDeleteAll_NoNotes(t *testing.T) { 211 211 + ctx, db := newTestDB(t) 212 212 + count, err := DeleteAll(ctx, db, viewerDID) 213 213 + if err != nil { 214 214 + t.Fatalf("DeleteAll: %v", err) 215 215 + } 216 216 + if count != 0 { 217 217 + t.Errorf("DeleteAll on empty = %d; want 0", count) 218 218 + } 219 219 + } 220 220 + 221 221 + func TestPut_UnicodeNotes(t *testing.T) { 222 222 + ctx, db := newTestDB(t) 223 223 + want := Note{Notes: "日本語テスト 🎉 café résumé"} 224 224 + if err := Put(ctx, db, viewerDID, targetDID, want); err != nil { 225 225 + t.Fatalf("Put unicode: %v", err) 226 226 + } 227 227 + got, _ := Get(ctx, db, viewerDID, targetDID) 228 228 + if got.Notes != want.Notes { 229 229 + t.Errorf("Notes = %q, want %q", got.Notes, want.Notes) 230 230 + } 231 231 + }

+1 -1

internal/qrcode/qrcode.go

Reviewed

··· 39 39 ModulePx: 8, 40 40 Margin: 4, 41 41 Foreground: "#11111b", 42 42 - Background: "#cdd6f4", 42 42 + Background: "#ffffff", 43 43 Level: qr.High, 44 44 } 45 45 }

+64

internal/users/users.go

Reviewed

··· 244 244 u.IsBanned = isBanned == 1 245 245 return u, nil 246 246 } 247 247 + 248 248 + // Privacy holds the user's privacy toggle states. 249 249 + type Privacy struct { 250 250 + HideFromAttendees bool 251 251 + HideFromLeaderboard bool 252 252 + } 253 253 + 254 254 + // GetPrivacy returns the privacy settings for the given DID. 255 255 + // Returns zero-value (all visible) for unknown DIDs. 256 256 + func GetPrivacy(ctx context.Context, db *sql.DB, did syntax.DID) (Privacy, error) { 257 257 + var hideAtt, hideLb int 258 258 + err := db.QueryRowContext(ctx, ` 259 259 + SELECT hide_from_attendees, hide_from_leaderboard 260 260 + FROM users WHERE did = ? 261 261 + `, did.String()).Scan(&hideAtt, &hideLb) 262 262 + if errors.Is(err, sql.ErrNoRows) { 263 263 + return Privacy{}, nil 264 264 + } 265 265 + if err != nil { 266 266 + return Privacy{}, err 267 267 + } 268 268 + return Privacy{ 269 269 + HideFromAttendees: hideAtt == 1, 270 270 + HideFromLeaderboard: hideLb == 1, 271 271 + }, nil 272 272 + } 273 273 + 274 274 + // SetPrivacy updates one of the privacy toggle columns. 275 275 + func SetPrivacy(ctx context.Context, db *sql.DB, did syntax.DID, column string, value bool) error { 276 276 + // Only allow known columns to prevent SQL injection. 277 277 + switch column { 278 278 + case "hide_from_attendees", "hide_from_leaderboard": 279 279 + default: 280 280 + return errors.New("users: unknown privacy column") 281 281 + } 282 282 + v := 0 283 283 + if value { 284 284 + v = 1 285 285 + } 286 286 + _, err := db.ExecContext(ctx, ` 287 287 + UPDATE users SET `+column+` = ? WHERE did = ? 288 288 + `, v, did.String()) 289 289 + return err 290 290 + } 291 291 + 292 292 + // IsHiddenFromAttendees returns true if the DID should be hidden from 293 293 + // event attendee lists. Returns false for unknown DIDs. 294 294 + func IsHiddenFromAttendees(ctx context.Context, db *sql.DB, did string) bool { 295 295 + var v int 296 296 + err := db.QueryRowContext(ctx, ` 297 297 + SELECT hide_from_attendees FROM users WHERE did = ? 298 298 + `, did).Scan(&v) 299 299 + return err == nil && v == 1 300 300 + } 301 301 + 302 302 + // IsHiddenFromLeaderboard returns true if the DID should be hidden from 303 303 + // leaderboards. Returns false for unknown DIDs. 304 304 + func IsHiddenFromLeaderboard(ctx context.Context, db *sql.DB, did string) bool { 305 305 + var v int 306 306 + err := db.QueryRowContext(ctx, ` 307 307 + SELECT hide_from_leaderboard FROM users WHERE did = ? 308 308 + `, did).Scan(&v) 309 309 + return err == nil && v == 1 310 310 + }

+349

internal/users/users_test.go

Reviewed

··· 1 1 + package users 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "errors" 7 7 + "path/filepath" 8 8 + "testing" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + 12 12 + atdb "atmoquest/internal/db" 13 13 + ) 14 14 + 15 15 + const ( 16 16 + testDIDA = "did:plc:usera12345678901234567" 17 17 + testDIDB = "did:plc:userb12345678901234567" 18 18 + testDIDC = "did:plc:userc12345678901234567" 19 19 + ) 20 20 + 21 21 + func newTestDB(t *testing.T) (context.Context, *sql.DB) { 22 22 + t.Helper() 23 23 + dir := t.TempDir() 24 24 + dsn := "file:" + filepath.Join(dir, "users.db") + "?_pragma=foreign_keys(ON)" 25 25 + conn, err := atdb.Open(dsn) 26 26 + if err != nil { 27 27 + t.Fatalf("db open: %v", err) 28 28 + } 29 29 + if err := atdb.Migrate(conn); err != nil { 30 30 + t.Fatalf("migrate: %v", err) 31 31 + } 32 32 + t.Cleanup(func() { _ = conn.Close() }) 33 33 + return context.Background(), conn 34 34 + } 35 35 + 36 36 + func TestTouch_InsertNew(t *testing.T) { 37 37 + ctx, db := newTestDB(t) 38 38 + did := syntax.DID(testDIDA) 39 39 + if err := Touch(ctx, db, did, "alice.bsky.social", "Alice"); err != nil { 40 40 + t.Fatalf("Touch: %v", err) 41 41 + } 42 42 + u, err := Get(ctx, db, did) 43 43 + if err != nil { 44 44 + t.Fatalf("Get: %v", err) 45 45 + } 46 46 + if u.Handle != "alice.bsky.social" { 47 47 + t.Errorf("Handle = %q; want alice.bsky.social", u.Handle) 48 48 + } 49 49 + if u.DisplayName != "Alice" { 50 50 + t.Errorf("DisplayName = %q; want Alice", u.DisplayName) 51 51 + } 52 52 + if u.AuthCount != 1 { 53 53 + t.Errorf("AuthCount = %d; want 1", u.AuthCount) 54 54 + } 55 55 + } 56 56 + 57 57 + func TestTouch_BumpsAuthCount(t *testing.T) { 58 58 + ctx, db := newTestDB(t) 59 59 + did := syntax.DID(testDIDA) 60 60 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 61 61 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 62 62 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 63 63 + 64 64 + u, _ := Get(ctx, db, did) 65 65 + if u.AuthCount != 3 { 66 66 + t.Errorf("AuthCount after 3 touches = %d; want 3", u.AuthCount) 67 67 + } 68 68 + } 69 69 + 70 70 + func TestTouch_PreservesHandleOnEmpty(t *testing.T) { 71 71 + ctx, db := newTestDB(t) 72 72 + did := syntax.DID(testDIDA) 73 73 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 74 74 + // Re-touch with empty handle — should preserve the previous one. 75 75 + _ = Touch(ctx, db, did, "", "") 76 76 + 77 77 + u, _ := Get(ctx, db, did) 78 78 + if u.Handle != "alice.bsky.social" { 79 79 + t.Errorf("Handle after empty touch = %q; want alice.bsky.social (preserved)", u.Handle) 80 80 + } 81 81 + if u.DisplayName != "Alice" { 82 82 + t.Errorf("DisplayName after empty touch = %q; want Alice (preserved)", u.DisplayName) 83 83 + } 84 84 + } 85 85 + 86 86 + func TestTouch_UpdatesHandle(t *testing.T) { 87 87 + ctx, db := newTestDB(t) 88 88 + did := syntax.DID(testDIDA) 89 89 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 90 90 + _ = Touch(ctx, db, did, "alice.dev", "Alice Dev") 91 91 + 92 92 + u, _ := Get(ctx, db, did) 93 93 + if u.Handle != "alice.dev" { 94 94 + t.Errorf("Handle = %q; want alice.dev (updated)", u.Handle) 95 95 + } 96 96 + if u.DisplayName != "Alice Dev" { 97 97 + t.Errorf("DisplayName = %q; want 'Alice Dev'", u.DisplayName) 98 98 + } 99 99 + } 100 100 + 101 101 + func TestTouch_RejectsEmptyDID(t *testing.T) { 102 102 + ctx, db := newTestDB(t) 103 103 + err := Touch(ctx, db, "", "h", "n") 104 104 + if err == nil { 105 105 + t.Fatal("Touch with empty DID should fail") 106 106 + } 107 107 + } 108 108 + 109 109 + func TestGet_NotFound(t *testing.T) { 110 110 + ctx, db := newTestDB(t) 111 111 + _, err := Get(ctx, db, syntax.DID(testDIDA)) 112 112 + if !errors.Is(err, ErrNotFound) { 113 113 + t.Errorf("err = %v; want ErrNotFound", err) 114 114 + } 115 115 + } 116 116 + 117 117 + func TestIsAdmin_DefaultFalse(t *testing.T) { 118 118 + ctx, db := newTestDB(t) 119 119 + did := syntax.DID(testDIDA) 120 120 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 121 121 + 122 122 + ok, err := IsAdmin(ctx, db, did) 123 123 + if err != nil { 124 124 + t.Fatalf("IsAdmin: %v", err) 125 125 + } 126 126 + if ok { 127 127 + t.Error("IsAdmin = true; want false by default") 128 128 + } 129 129 + } 130 130 + 131 131 + func TestSetAdmin_PromoteAndDemote(t *testing.T) { 132 132 + ctx, db := newTestDB(t) 133 133 + did := syntax.DID(testDIDA) 134 134 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 135 135 + 136 136 + // Promote. 137 137 + if err := SetAdmin(ctx, db, did, true); err != nil { 138 138 + t.Fatalf("SetAdmin true: %v", err) 139 139 + } 140 140 + ok, _ := IsAdmin(ctx, db, did) 141 141 + if !ok { 142 142 + t.Error("IsAdmin = false after promote") 143 143 + } 144 144 + 145 145 + // Demote. 146 146 + if err := SetAdmin(ctx, db, did, false); err != nil { 147 147 + t.Fatalf("SetAdmin false: %v", err) 148 148 + } 149 149 + ok, _ = IsAdmin(ctx, db, did) 150 150 + if ok { 151 151 + t.Error("IsAdmin = true after demote") 152 152 + } 153 153 + } 154 154 + 155 155 + func TestSetAdmin_NotFoundForUnknownUser(t *testing.T) { 156 156 + ctx, db := newTestDB(t) 157 157 + err := SetAdmin(ctx, db, syntax.DID(testDIDA), true) 158 158 + if !errors.Is(err, ErrNotFound) { 159 159 + t.Errorf("SetAdmin unknown = %v; want ErrNotFound", err) 160 160 + } 161 161 + } 162 162 + 163 163 + func TestIsAdmin_BannedOverridesAdmin(t *testing.T) { 164 164 + ctx, db := newTestDB(t) 165 165 + did := syntax.DID(testDIDA) 166 166 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 167 167 + _ = SetAdmin(ctx, db, did, true) 168 168 + 169 169 + // Ban the user. 170 170 + _, _ = db.ExecContext(ctx, `UPDATE users SET is_banned = 1 WHERE did = ?`, did.String()) 171 171 + 172 172 + ok, _ := IsAdmin(ctx, db, did) 173 173 + if ok { 174 174 + t.Error("banned admin should not return IsAdmin=true") 175 175 + } 176 176 + } 177 177 + 178 178 + func TestIsAdmin_EmptyDID(t *testing.T) { 179 179 + ctx, db := newTestDB(t) 180 180 + ok, err := IsAdmin(ctx, db, "") 181 181 + if err != nil { 182 182 + t.Fatalf("IsAdmin empty: %v", err) 183 183 + } 184 184 + if ok { 185 185 + t.Error("IsAdmin empty DID = true; want false") 186 186 + } 187 187 + } 188 188 + 189 189 + func TestIsAdmin_UnknownDIDReturnsFalse(t *testing.T) { 190 190 + ctx, db := newTestDB(t) 191 191 + ok, err := IsAdmin(ctx, db, syntax.DID(testDIDA)) 192 192 + if err != nil { 193 193 + t.Fatalf("IsAdmin unknown: %v", err) 194 194 + } 195 195 + if ok { 196 196 + t.Error("IsAdmin unknown DID = true; want false") 197 197 + } 198 198 + } 199 199 + 200 200 + func TestList_AllUsers(t *testing.T) { 201 201 + ctx, db := newTestDB(t) 202 202 + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") 203 203 + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") 204 204 + 205 205 + list, err := List(ctx, db, ListOptions{}) 206 206 + if err != nil { 207 207 + t.Fatalf("List: %v", err) 208 208 + } 209 209 + if len(list) != 2 { 210 210 + t.Errorf("List returned %d; want 2", len(list)) 211 211 + } 212 212 + } 213 213 + 214 214 + func TestList_SearchByHandle(t *testing.T) { 215 215 + ctx, db := newTestDB(t) 216 216 + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") 217 217 + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") 218 218 + 219 219 + list, _ := List(ctx, db, ListOptions{Query: "alice"}) 220 220 + if len(list) != 1 { 221 221 + t.Fatalf("List(alice) returned %d; want 1", len(list)) 222 222 + } 223 223 + if list[0].Handle != "alice.bsky.social" { 224 224 + t.Errorf("found handle = %q; want alice.bsky.social", list[0].Handle) 225 225 + } 226 226 + } 227 227 + 228 228 + func TestList_SearchByDID(t *testing.T) { 229 229 + ctx, db := newTestDB(t) 230 230 + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") 231 231 + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") 232 232 + 233 233 + list, _ := List(ctx, db, ListOptions{Query: testDIDA}) 234 234 + if len(list) != 1 { 235 235 + t.Errorf("List by DID returned %d; want 1", len(list)) 236 236 + } 237 237 + } 238 238 + 239 239 + func TestList_SearchCaseInsensitive(t *testing.T) { 240 240 + ctx, db := newTestDB(t) 241 241 + _ = Touch(ctx, db, syntax.DID(testDIDA), "Alice.Bsky.Social", "Alice Johnson") 242 242 + 243 243 + list, _ := List(ctx, db, ListOptions{Query: "alice"}) 244 244 + if len(list) != 1 { 245 245 + t.Errorf("case-insensitive search returned %d; want 1", len(list)) 246 246 + } 247 247 + } 248 248 + 249 249 + func TestList_AdminsOnly(t *testing.T) { 250 250 + ctx, db := newTestDB(t) 251 251 + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") 252 252 + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") 253 253 + _ = SetAdmin(ctx, db, syntax.DID(testDIDA), true) 254 254 + 255 255 + list, _ := List(ctx, db, ListOptions{AdminsOnly: true}) 256 256 + if len(list) != 1 { 257 257 + t.Fatalf("List admins = %d; want 1", len(list)) 258 258 + } 259 259 + if list[0].Handle != "alice.bsky.social" { 260 260 + t.Errorf("admin handle = %q; want alice.bsky.social", list[0].Handle) 261 261 + } 262 262 + } 263 263 + 264 264 + func TestList_Pagination(t *testing.T) { 265 265 + ctx, db := newTestDB(t) 266 266 + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") 267 267 + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") 268 268 + _ = Touch(ctx, db, syntax.DID(testDIDC), "carol.bsky.social", "Carol") 269 269 + 270 270 + // Page 1, limit 2. 271 271 + page1, _ := List(ctx, db, ListOptions{Limit: 2, Offset: 0}) 272 272 + if len(page1) != 2 { 273 273 + t.Fatalf("page 1 = %d; want 2", len(page1)) 274 274 + } 275 275 + // Page 2, limit 2. 276 276 + page2, _ := List(ctx, db, ListOptions{Limit: 2, Offset: 2}) 277 277 + if len(page2) != 1 { 278 278 + t.Fatalf("page 2 = %d; want 1", len(page2)) 279 279 + } 280 280 + } 281 281 + 282 282 + func TestList_DefaultLimit(t *testing.T) { 283 283 + ctx, db := newTestDB(t) 284 284 + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") 285 285 + 286 286 + // Passing 0 limit should default to 50 (not fail). 287 287 + list, err := List(ctx, db, ListOptions{Limit: 0}) 288 288 + if err != nil { 289 289 + t.Fatalf("List default limit: %v", err) 290 290 + } 291 291 + if len(list) != 1 { 292 292 + t.Errorf("default limit returned %d; want 1", len(list)) 293 293 + } 294 294 + } 295 295 + 296 296 + func TestCounts(t *testing.T) { 297 297 + ctx, db := newTestDB(t) 298 298 + _ = Touch(ctx, db, syntax.DID(testDIDA), "alice.bsky.social", "Alice") 299 299 + _ = Touch(ctx, db, syntax.DID(testDIDB), "bob.bsky.social", "Bob") 300 300 + _ = SetAdmin(ctx, db, syntax.DID(testDIDA), true) 301 301 + _, _ = db.ExecContext(ctx, `UPDATE users SET is_banned = 1 WHERE did = ?`, testDIDB) 302 302 + 303 303 + stats, err := Counts(ctx, db) 304 304 + if err != nil { 305 305 + t.Fatalf("Counts: %v", err) 306 306 + } 307 307 + if stats.TotalUsers != 2 { 308 308 + t.Errorf("TotalUsers = %d; want 2", stats.TotalUsers) 309 309 + } 310 310 + if stats.AdminCount != 1 { 311 311 + t.Errorf("AdminCount = %d; want 1", stats.AdminCount) 312 312 + } 313 313 + if stats.BannedCount != 1 { 314 314 + t.Errorf("BannedCount = %d; want 1", stats.BannedCount) 315 315 + } 316 316 + // Both touched "now", so both active in last 7d. 317 317 + if stats.ActiveLast7d != 2 { 318 318 + t.Errorf("ActiveLast7d = %d; want 2", stats.ActiveLast7d) 319 319 + } 320 320 + } 321 321 + 322 322 + func TestCounts_Empty(t *testing.T) { 323 323 + ctx, db := newTestDB(t) 324 324 + // The Counts function uses SUM() which returns NULL on an empty table. 325 325 + // The current implementation scans into int directly — if it fails, 326 326 + // the function needs to use sql.NullInt64 or COALESCE. Test the 327 327 + // actual behavior. 328 328 + stats, err := Counts(ctx, db) 329 329 + if err != nil { 330 330 + // If the function doesn't handle NULL SUM, this is the expected 331 331 + // failure path — document it as a known issue. 332 332 + t.Skipf("Counts on empty table: %v (known: SUM returns NULL on empty set)", err) 333 333 + } 334 334 + if stats.TotalUsers != 0 { 335 335 + t.Errorf("TotalUsers = %d; want 0", stats.TotalUsers) 336 336 + } 337 337 + } 338 338 + 339 339 + func TestGet_ReturnsBannedFlag(t *testing.T) { 340 340 + ctx, db := newTestDB(t) 341 341 + did := syntax.DID(testDIDA) 342 342 + _ = Touch(ctx, db, did, "alice.bsky.social", "Alice") 343 343 + _, _ = db.ExecContext(ctx, `UPDATE users SET is_banned = 1 WHERE did = ?`, did.String()) 344 344 + 345 345 + u, _ := Get(ctx, db, did) 346 346 + if !u.IsBanned { 347 347 + t.Error("IsBanned = false; want true") 348 348 + } 349 349 + }

+36

router/router.go

Reviewed

··· 83 83 _, _ = w.Write([]byte("ok")) 84 84 }) 85 85 86 86 + // Recent badges endpoint for toast notifications. 87 87 + router.Get("/badges/recent", func(w http.ResponseWriter, r *http.Request) { 88 88 + didStr, _ := sess.Get(r) 89 89 + if didStr == "" { 90 90 + w.Header().Set("Content-Type", "application/json") 91 91 + _, _ = w.Write([]byte(`{"badges":[]}`)) 92 92 + return 93 93 + } 94 94 + did, err := syntax.ParseDID(didStr) 95 95 + if err != nil { 96 96 + w.Header().Set("Content-Type", "application/json") 97 97 + _, _ = w.Write([]byte(`{"badges":[]}`)) 98 98 + return 99 99 + } 100 100 + // Find badges earned in the last 60 seconds. 101 101 + rows, err := conn.QueryContext(r.Context(), ` 102 102 + SELECT d.name FROM earned_badges e 103 103 + JOIN badge_definitions d ON d.id = e.badge_id 104 104 + WHERE e.did = ? AND e.earned_at >= datetime('now', '-60 seconds') 105 105 + ORDER BY e.earned_at DESC 106 106 + `, did.String()) 107 107 + var names []string 108 108 + if err == nil { 109 109 + defer rows.Close() 110 110 + for rows.Next() { 111 111 + var name string 112 112 + if rows.Scan(&name) == nil { 113 113 + names = append(names, name) 114 114 + } 115 115 + } 116 116 + } 117 117 + w.Header().Set("Content-Type", "application/json") 118 118 + w.Header().Set("Cache-Control", "no-cache") 119 119 + _ = json.NewEncoder(w).Encode(map[string]any{"badges": names}) 120 120 + }) 121 121 + 86 122 return nil 87 123 } 88 124

web/resources/static/assets/android-chrome-192x192.png

Reviewed

This is a binary file and will not be displayed.

web/resources/static/assets/android-chrome-512x512.png

Reviewed

This is a binary file and will not be displayed.

web/resources/static/assets/apple-touch-icon.png

Reviewed

This is a binary file and will not be displayed.

web/resources/static/assets/favicon-16x16.png

Reviewed

This is a binary file and will not be displayed.

web/resources/static/assets/favicon-32x32.png

Reviewed

This is a binary file and will not be displayed.

web/resources/static/assets/favicon.ico

Reviewed

This is a binary file and will not be displayed.

+19

web/resources/static/assets/site.webmanifest

Reviewed

··· 1 1 + { 2 2 + "name": "atmo.quest", 3 3 + "short_name": "atmo.quest", 4 4 + "icons": [ 5 5 + { 6 6 + "src": "/static/assets/android-chrome-192x192.png", 7 7 + "sizes": "192x192", 8 8 + "type": "image/png" 9 9 + }, 10 10 + { 11 11 + "src": "/static/assets/android-chrome-512x512.png", 12 12 + "sizes": "512x512", 13 13 + "type": "image/png" 14 14 + } 15 15 + ], 16 16 + "theme_color": "#1e1e2e", 17 17 + "background_color": "#1e1e2e", 18 18 + "display": "standalone" 19 19 + }

+213 -7

web/resources/static/css/terminal.css

Reviewed

··· 555 555 } 556 556 .profile-flip-back { 557 557 transform: rotateY(180deg); 558 558 - background: var(--text); 558 558 + background: #ffffff; 559 559 padding: 6px; 560 560 + position: relative; 560 561 } 561 562 .profile-qr { 562 563 width: 100%; ··· 564 565 object-fit: contain; 565 566 display: block; 566 567 border-radius: 12px; 567 567 - background: var(--text); 568 568 + background: #ffffff; 569 569 + } 570 570 + .qr-copy-link { 571 571 + font-size: 0.65rem; 572 572 + margin-top: 2px; 568 573 } 569 574 .profile-flip-hint { 570 575 margin-top: 10px; ··· 987 992 } 988 993 .home-identity { 989 994 display: flex; 995 995 + flex-direction: column; 990 996 align-items: center; 991 997 gap: 24px; 992 992 - flex-wrap: wrap; 998 998 + } 999 999 + .profile-flip-wrap { 1000 1000 + display: flex; 1001 1001 + flex-direction: column; 1002 1002 + align-items: center; 1003 1003 + gap: 6px; 993 1004 } 994 1005 .home-identity .profile-flip { 995 1006 width: 160px; ··· 999 1010 .home-identity-text { 1000 1011 display: flex; 1001 1012 flex-direction: column; 1013 1013 + align-items: center; 1002 1014 gap: 6px; 1003 1015 min-width: 0; 1004 1004 - flex: 1 1 200px; 1016 1016 + text-align: center; 1005 1017 } 1006 1018 .home-name { 1007 1019 font-size: 22px; ··· 1108 1120 } 1109 1121 1110 1122 @media (max-width: 520px) { 1111 1111 - .home-identity { flex-direction: column; align-items: flex-start; gap: 16px; } 1112 1123 .home-identity .profile-flip { width: 140px; height: 140px; } 1113 1124 } 1114 1125 ··· 1374 1385 gap: 10px; 1375 1386 } 1376 1387 .admin-badge-preview svg { display: block; max-width: 100%; height: auto; } 1388 1388 + .active-badge-type { 1389 1389 + border-color: var(--peach) !important; 1390 1390 + background: rgba(250, 179, 135, 0.06); 1391 1391 + } 1392 1392 + 1393 1393 + /* ─── Admin badges grid ─────────────────────────────────────── */ 1394 1394 + .admin-badges-grid { 1395 1395 + display: grid; 1396 1396 + grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); 1397 1397 + gap: 12px; 1398 1398 + margin: 12px 0; 1399 1399 + } 1400 1400 + .admin-badge-card { 1401 1401 + display: flex; 1402 1402 + flex-direction: column; 1403 1403 + align-items: center; 1404 1404 + gap: 8px; 1405 1405 + padding: 16px 12px; 1406 1406 + background: var(--surface0); 1407 1407 + border: 1px solid var(--surface1); 1408 1408 + border-radius: 8px; 1409 1409 + text-decoration: none; 1410 1410 + color: inherit; 1411 1411 + transition: border-color 0.15s; 1412 1412 + } 1413 1413 + .admin-badge-card:hover { border-color: var(--peach); } 1414 1414 + .admin-badge-card-svg svg { max-width: 80px; height: auto; display: block; } 1415 1415 + .admin-badge-card-info { text-align: center; } 1416 1416 + .admin-badge-card-name { font-size: 0.85rem; font-weight: 600; color: var(--text); } 1417 1417 + .admin-badge-card-desc { font-size: 0.7rem; margin-top: 2px; } 1418 1418 + .admin-badge-card-trigger { font-size: 0.65rem; margin-top: 4px; color: var(--lavender); } 1377 1419 .admin-badge-uri { font-size: 11px; text-align: center; margin: 0; word-break: break-all; } 1378 1420 .admin-badge-signature { font-size: 12px; color: var(--green); margin: 0; } 1379 1421 .admin-badge-form { max-width: 100%; } ··· 2136 2178 flex-direction: column; 2137 2179 align-items: center; 2138 2180 gap: 4px; 2139 2139 - cursor: default; 2181 2181 + cursor: pointer; 2182 2182 + background: none; 2183 2183 + border: none; 2184 2184 + font-family: inherit; 2185 2185 + color: inherit; 2186 2186 + padding: 4px; 2187 2187 + border-radius: 8px; 2188 2188 + transition: background 0.15s; 2140 2189 } 2190 2190 + .profile-badge:hover { background: rgba(250, 179, 135, 0.08); } 2141 2191 .profile-badge-icon { 2142 2192 width: 44px; 2143 2193 height: 44px; ··· 2161 2211 line-height: 1.2; 2162 2212 } 2163 2213 2214 2214 + /* ── Badge Modal ────────────────────────────────── */ 2215 2215 + .badge-modal-overlay { 2216 2216 + position: fixed; 2217 2217 + inset: 0; 2218 2218 + background: rgba(17, 17, 27, 0.85); 2219 2219 + z-index: 1000; 2220 2220 + display: flex; 2221 2221 + align-items: center; 2222 2222 + justify-content: center; 2223 2223 + padding: 24px; 2224 2224 + backdrop-filter: blur(4px); 2225 2225 + } 2226 2226 + .badge-modal { 2227 2227 + background: var(--base); 2228 2228 + border: 1px solid var(--surface1); 2229 2229 + border-radius: 12px; 2230 2230 + padding: 32px 28px; 2231 2231 + max-width: 320px; 2232 2232 + width: 100%; 2233 2233 + display: flex; 2234 2234 + flex-direction: column; 2235 2235 + align-items: center; 2236 2236 + gap: 12px; 2237 2237 + position: relative; 2238 2238 + text-align: center; 2239 2239 + } 2240 2240 + .badge-modal-close { 2241 2241 + position: absolute; 2242 2242 + top: 10px; 2243 2243 + right: 14px; 2244 2244 + background: none; 2245 2245 + border: none; 2246 2246 + color: var(--subtext0); 2247 2247 + font-size: 16px; 2248 2248 + cursor: pointer; 2249 2249 + } 2250 2250 + .badge-modal-close:hover { color: var(--text); } 2251 2251 + .badge-modal-svg svg { max-width: 160px; height: auto; display: block; } 2252 2252 + .badge-modal-name { font-size: 1.1rem; font-weight: 600; color: var(--text); } 2253 2253 + .badge-modal-desc { font-size: 0.8rem; color: var(--subtext0); } 2254 2254 + .badge-modal-date { font-size: 0.75rem; } 2255 2255 + .badge-modal-message { 2256 2256 + font-size: 0.8rem; 2257 2257 + color: var(--lavender); 2258 2258 + font-style: italic; 2259 2259 + margin-top: 4px; 2260 2260 + } 2261 2261 + 2262 2262 + /* ── Badge Toast ────────────────────────────────── */ 2263 2263 + .badge-toast { 2264 2264 + position: fixed; 2265 2265 + bottom: 16px; 2266 2266 + left: 16px; 2267 2267 + z-index: 999; 2268 2268 + display: flex; 2269 2269 + align-items: center; 2270 2270 + gap: 10px; 2271 2271 + padding: 12px 16px; 2272 2272 + background: var(--surface0); 2273 2273 + border: 1px solid var(--peach); 2274 2274 + border-radius: 8px; 2275 2275 + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.3); 2276 2276 + font-size: 0.8rem; 2277 2277 + color: var(--text); 2278 2278 + max-width: 340px; 2279 2279 + animation: badge-toast-in 0.3s ease; 2280 2280 + transition: opacity 0.3s; 2281 2281 + } 2282 2282 + @keyframes badge-toast-in { 2283 2283 + from { transform: translateY(20px); opacity: 0; } 2284 2284 + to { transform: translateY(0); opacity: 1; } 2285 2285 + } 2286 2286 + .badge-toast-icon { font-size: 1.2rem; } 2287 2287 + .badge-toast-text { flex: 1; } 2288 2288 + .badge-toast-text strong { color: var(--peach); } 2289 2289 + .badge-toast-close { 2290 2290 + background: none; 2291 2291 + border: none; 2292 2292 + color: var(--subtext0); 2293 2293 + font-size: 14px; 2294 2294 + cursor: pointer; 2295 2295 + padding: 0 4px; 2296 2296 + } 2297 2297 + .badge-toast-close:hover { color: var(--text); } 2298 2298 + 2164 2299 /* ── Leaderboard ────────────────────────────────── */ 2165 2300 .leaderboard-list { margin: 12px 0; } 2166 2301 .leaderboard-row { ··· 2184 2319 border-radius: 50%; 2185 2320 object-fit: cover; 2186 2321 } 2322 2322 + .leaderboard-avatar.not-connected { filter: grayscale(100%); opacity: 0.6; } 2187 2323 .leaderboard-avatar-empty { 2188 2324 width: 32px; 2189 2325 height: 32px; ··· 2195 2331 color: var(--subtext0); 2196 2332 font-size: 0.7rem; 2197 2333 } 2334 2334 + .leaderboard-avatar-empty.not-connected { opacity: 0.6; } 2198 2335 .leaderboard-name { flex: 1; font-size: 0.85rem; } 2199 2336 .leaderboard-count { font-size: 0.8rem; color: var(--subtext0); } 2200 2337 ··· 2487 2624 } 2488 2625 .attendee-avatar.connected { border-color: var(--peach); } 2489 2626 .attendee-avatar.not-connected { filter: grayscale(100%); opacity: 0.6; border-color: var(--surface1); } 2627 2627 + .pagination { 2628 2628 + display: flex; 2629 2629 + align-items: center; 2630 2630 + justify-content: center; 2631 2631 + gap: 12px; 2632 2632 + margin-top: 12px; 2633 2633 + padding: 8px 0; 2634 2634 + } 2635 2635 + .pagination-info { 2636 2636 + font-size: 0.75rem; 2637 2637 + } 2490 2638 .attendee-name { 2491 2639 font-size: 9px; 2492 2640 color: var(--subtext1); ··· 2536 2684 border: 1px solid var(--surface1); 2537 2685 } 2538 2686 .interest-match-card.connected { 2539 2539 - border-color: var(--peach); 2687 2687 + border-color: var(--surface1); 2540 2688 border-style: solid; 2541 2689 } 2542 2690 .interest-match-header { ··· 2550 2698 border-radius: 50%; 2551 2699 object-fit: cover; 2552 2700 } 2701 2701 + .interest-match-avatar.not-connected { filter: grayscale(100%); opacity: 0.6; } 2553 2702 .interest-match-name { 2554 2703 flex: 1; 2555 2704 font-size: 0.8rem; ··· 2997 3146 font-size: 24px; 2998 3147 color: var(--crust); 2999 3148 text-transform: uppercase; 3149 3149 + flex-shrink: 0; 3150 3150 + } 3151 3151 + .settings-account-avatar-img { 3152 3152 + width: 52px; 3153 3153 + height: 52px; 3154 3154 + border-radius: 50%; 3155 3155 + object-fit: cover; 3156 3156 + flex-shrink: 0; 3000 3157 } 3001 3158 .settings-account-name { 3002 3159 font-size: 15px; ··· 3108 3265 background: var(--peach); 3109 3266 left: 17px; 3110 3267 } 3268 3268 + .toggle-label { 3269 3269 + font-size: 11px; 3270 3270 + color: var(--subtext0); 3271 3271 + margin-right: 8px; 3272 3272 + flex-shrink: 0; 3273 3273 + } 3111 3274 3112 3275 .settings-footer { 3113 3276 text-align: center; ··· 3126 3289 font-family: 'JetBrains Mono', monospace; 3127 3290 color: var(--overlay); 3128 3291 margin-top: 6px; 3292 3292 + } 3293 3293 + 3294 3294 + /* ─── PDS data viewer ───────────────────────────────────────── */ 3295 3295 + .pds-records-list { 3296 3296 + display: flex; 3297 3297 + flex-direction: column; 3298 3298 + gap: 4px; 3299 3299 + margin: 8px 0; 3300 3300 + } 3301 3301 + .pds-record { 3302 3302 + background: var(--surface0); 3303 3303 + border: 1px solid var(--surface1); 3304 3304 + border-radius: 6px; 3305 3305 + } 3306 3306 + .pds-record-summary { 3307 3307 + padding: 8px 12px; 3308 3308 + cursor: pointer; 3309 3309 + font-size: 0.8rem; 3310 3310 + list-style: none; 3311 3311 + } 3312 3312 + .pds-record-summary::-webkit-details-marker { display: none; } 3313 3313 + .pds-record-summary::before { 3314 3314 + content: "▸ "; 3315 3315 + color: var(--subtext0); 3316 3316 + } 3317 3317 + .pds-record[open] .pds-record-summary::before { 3318 3318 + content: "▾ "; 3319 3319 + } 3320 3320 + .pds-record-rkey { 3321 3321 + font-family: 'JetBrains Mono', monospace; 3322 3322 + font-size: 0.75rem; 3323 3323 + color: var(--lavender); 3324 3324 + } 3325 3325 + .pds-record-json { 3326 3326 + margin: 0; 3327 3327 + padding: 8px 12px 12px; 3328 3328 + font-family: 'JetBrains Mono', monospace; 3329 3329 + font-size: 0.7rem; 3330 3330 + line-height: 1.5; 3331 3331 + color: var(--text); 3332 3332 + white-space: pre-wrap; 3333 3333 + word-break: break-word; 3334 3334 + border-top: 1px solid var(--surface1); 3129 3335 } 3130 3336 3131 3337 .events-empty {

+55

web/resources/static/js/badge-designer.js

Reviewed

··· 1 1 + // atmo.quest — live badge designer preview. 2 2 + // 3 3 + // Listens for changes on the badge form (shape, colors, label) and 4 4 + // fetches a fresh SVG preview from /admin/badge-preview.svg, replacing 5 5 + // the preview container's SVG in-place. 6 6 + (function () { 7 7 + "use strict"; 8 8 + 9 9 + var form = document.querySelector(".admin-badge-form"); 10 10 + var preview = document.getElementById("badge-preview"); 11 11 + if (!form || !preview) return; 12 12 + 13 13 + var debounce = null; 14 14 + 15 15 + function getVal(name) { 16 16 + var el = form.querySelector('[name="' + name + '"]:checked') || 17 17 + form.querySelector('[name="' + name + '"]'); 18 18 + return el ? el.value : ""; 19 19 + } 20 20 + 21 21 + function refresh() { 22 22 + var params = new URLSearchParams({ 23 23 + shape: getVal("shape"), 24 24 + primary_color: getVal("primary_color"), 25 25 + accent_color: getVal("accent_color"), 26 26 + ribbon_color: getVal("ribbon_color"), 27 27 + label: getVal("label") 28 28 + }); 29 29 + fetch("/admin/badge-preview.svg?" + params.toString(), { 30 30 + credentials: "same-origin" 31 31 + }) 32 32 + .then(function (r) { return r.text(); }) 33 33 + .then(function (svg) { 34 34 + var existing = preview.querySelector("svg"); 35 35 + if (existing) { 36 36 + existing.outerHTML = svg; 37 37 + } 38 38 + }) 39 39 + .catch(function () {}); 40 40 + } 41 41 + 42 42 + // Listen for changes on all form inputs. 43 43 + form.addEventListener("change", function () { 44 44 + refresh(); 45 45 + }); 46 46 + 47 47 + // Debounce label text input. 48 48 + var labelInput = form.querySelector('[name="label"]'); 49 49 + if (labelInput) { 50 50 + labelInput.addEventListener("input", function () { 51 51 + clearTimeout(debounce); 52 52 + debounce = setTimeout(refresh, 300); 53 53 + }); 54 54 + } 55 55 + })();

+42

web/resources/static/js/badge-toast.js

Reviewed

··· 1 1 + // atmo.quest — badge toast notifications. 2 2 + // 3 3 + // On page load, checks for recently earned badges and shows a dismissable 4 4 + // toast in the bottom-left corner. Disappears after 30 seconds or on click. 5 5 + (function () { 6 6 + "use strict"; 7 7 + 8 8 + fetch("/badges/recent", { credentials: "same-origin" }) 9 9 + .then(function (r) { return r.ok ? r.json() : { badges: [] }; }) 10 10 + .then(function (data) { 11 11 + if (!data.badges || data.badges.length === 0) return; 12 12 + 13 13 + data.badges.forEach(function (name, i) { 14 14 + var toast = document.createElement("div"); 15 15 + toast.className = "badge-toast"; 16 16 + toast.style.bottom = (16 + i * 60) + "px"; 17 17 + toast.innerHTML = 18 18 + '<span class="badge-toast-icon">🏅</span>' + 19 19 + '<span class="badge-toast-text">Badge earned: <strong>' + escapeHtml(name) + '</strong></span>' + 20 20 + '<button class="badge-toast-close" aria-label="Dismiss">✕</button>'; 21 21 + toast.querySelector(".badge-toast-close").addEventListener("click", function () { 22 22 + toast.remove(); 23 23 + }); 24 24 + document.body.appendChild(toast); 25 25 + 26 26 + // Auto-dismiss after 30 seconds. 27 27 + setTimeout(function () { 28 28 + if (toast.parentNode) { 29 29 + toast.style.opacity = "0"; 30 30 + setTimeout(function () { toast.remove(); }, 300); 31 31 + } 32 32 + }, 30000); 33 33 + }); 34 34 + }) 35 35 + .catch(function () {}); 36 36 + 37 37 + function escapeHtml(s) { 38 38 + var d = document.createElement("div"); 39 39 + d.textContent = s; 40 40 + return d.innerHTML; 41 41 + } 42 42 + })();

+16

web/resources/static/js/profile.js

Reviewed

··· 17 17 "use strict"; 18 18 19 19 // ---- Flip card ----------------------------------------------------------- 20 20 + var qrCopyTimer = null; 21 21 + var qrCopyBtn = document.getElementById("qr-copy-btn"); 22 22 + 20 23 document.querySelectorAll("[data-flip-toggle]").forEach(function (btn) { 21 24 var card = btn.closest("[data-flip]"); 22 25 if (!card) return; ··· 25 28 var next = flipped ? "0" : "1"; 26 29 card.setAttribute("data-flip", next); 27 30 btn.setAttribute("aria-pressed", next === "1" ? "true" : "false"); 31 31 + 32 32 + // Show copy button after 5s of QR being visible. 33 33 + if (qrCopyTimer) { clearTimeout(qrCopyTimer); qrCopyTimer = null; } 34 34 + if (qrCopyBtn) { 35 35 + if (next === "1") { 36 36 + qrCopyBtn.style.display = "none"; 37 37 + qrCopyTimer = setTimeout(function () { 38 38 + qrCopyBtn.style.display = ""; 39 39 + }, 5000); 40 40 + } else { 41 41 + qrCopyBtn.style.display = "none"; 42 42 + } 43 43 + } 28 44 }); 29 45 }); 30 46