gitoriaLog in with ident

tracker

All repositories: gitoria

ReadmeCodePull requestsReleasesTicketsSettings
Commit96ba683a96ba683adeploy.sh: a gate without a 'passed,' line (check-theme) no longer ends the scriptmre96ba683a/components/main.hl

7.7 KB

  1. // components/main.hl — THE SHELL (tracker.worldapi.org#32, mission 031): the WorldAPI theme's header and content-first shell
  2. // (theme/shell/*, vendored from layouts.worldapi.org — never edited here) around the slot every page renders into. All CSS is
  3. // in styles.hl (the theme's own rules come with theme/theme.hl and the shell files).
  4. // THE HEADER (creator, tracker#32): desktop — brand left, the search field in the middle, the main menu
  5. // Series | Shows | Movies | Genres | People, the user icon far right; its dropdown holds the personal lists and ends with
  6. // Settings, Logout. Signed out the ident selector stands in the user icon's place. Phone — ☰ (the sidebar overlay with the main
  7. // menu), brand, the loupe (opens the search field under the bar), the user icon far right; signed out that is the ident icon (a
  8. // small i and a big D lying on the floor, components/main.hl identIcon) whose dropdown holds the selector. The header's contents
  9. // are flush with the content column (the theme's --layout-column).
  10. // THE MARKED MENU ENTRY: a shell is not told the page's path (hl:web gives it only the route params), so MainMenu gets no
  11. // `current`; styles.hl marks the entry of the type the page's heading names ("Series | …" → Series) with :has().
  12. // THE SEARCH FIELD sends GET /find?q=… (project.hl findRoute → 302 /search/<text>, components/search.hl).
  13. // THE SELECTOR: `<ident-selector key=IDENT_API_KEY>` from <ident>/selector.js, as in calendar/gitoria. Choosing an
  14. // identity fires `ident-login` (one-time code); /login.js hands it to the hidden input #identcode, whose `change`
  15. // goes to the face trackerLogin (server-side exchange, no reload). The element's class is `in` / `out`; /login.js
  16. // mirrors it into the selector's `loggedIn`.
  17. // LOGIN: the selector, or (phone, in the ident dropdown) a plain link to <ident>/login?key=&return=<public url>/login/callback
  18. // (users.hl loginCallbackOf). After a login or logout in this tab the page is fetched again (navigate('/')).
  19. import { navigate } from 'hl:web'
  20. import { appTitle } from '../project.hl'
  21. import { identKey, selectorScript, loginHref, userIdOfSession, userOfCode } from '../lib/users.hl'
  22. import { randomBytes } from 'hl:crypto'
  23. import AppHeader from '../theme/shell/app-header.hl'
  24. import MainMenu from '../theme/shell/main-menu.hl'
  25. import UserMenu from '../theme/shell/user-menu.hl'
  26. import Sidebar from '../theme/shell/app-sidebar.hl'
  27. import ContentFirst from '../theme/shell/content-first.hl'
  28. static menu = [
  29. { label = 'Series' href = '/series' }
  30. { label = 'Shows' href = '/shows' }
  31. { label = 'Movies' href = '/movies' }
  32. { label = 'Genres' href = '/genres' }
  33. { label = 'People' href = '/people' }
  34. ]
  35. slot = null
  36. session = null
  37. loggedIn = userIdOfSession(session) != null
  38. loggedOut = userIdOfSession(session) == null
  39. buttonHref = loginHref
  40. selectorClass = loggedIn ? 'in' : 'out'
  41. selectorKey = identKey
  42. identScript = selectorScript
  43. loginError = ''
  44. hasLoginError = false
  45. // OFFLINE (tracker.worldapi.org#10): the service worker opens `/` from its cache without a network; the shell then
  46. // says so. hl:web gives a page no connection state and no "mounted" hook, so a tick asks the browser: `netProbe` runs
  47. // an endless 1 s CSS animation (styles.hl), and each `animationiteration` reads navigator.onLine — a write only when
  48. // it changed. (An `img` error or a socket event would race the hydration and be missed.)
  49. offline = false
  50. View {
  51. body {
  52. AppHeader { brand = appTitle search = "/find" searchPlaceholder = "Shows, movies, people"
  53. MainMenu { items = menu }
  54. if (loggedIn) {
  55. UserMenu {
  56. a { href = "/my/unwatched" "Unwatched" }
  57. a { href = "/my/schedule" "Schedule" }
  58. a { href = "/my/series" "My series" }
  59. a { href = "/my/shows" "My shows" }
  60. a { href = "/my/movies" "My movies" }
  61. a { id = "settingslink" href = "/settings" "Settings" }
  62. button { id = "logout" type = "button" "Logout" on click(e) { emit doLogout(e) } }
  63. }
  64. }
  65. if (loggedOut) {
  66. // the ident icon (phone) and its dropdown; from 60rem the dropdown stands open in the header: the selector alone
  67. identMenu {
  68. button { type = "button" class = "ident-toggle" popovertarget = "ident-panel" title = "Log in with ident" "aria-label" = "Log in with ident"
  69. // identIcon: a small i standing beside a big D that lies on the floor (tilted into the screen); the D's lower
  70. // face is its thickness (the 3-D effect), the counter is cut out (evenodd)
  71. svg { class = "ident-icon" viewBox = "1 10 20 13.2" "aria-hidden" = "true"
  72. path { class = "ident-d-side" d = "M5 22.6 L7.8 14.2 C15.1 14.2 19 16.6 19.6 18.4 C20.2 20.2 16.2 22.6 5 22.6 Z" }
  73. path { class = "ident-d" "fill-rule" = "evenodd" d = "M5 21 L7.8 12.6 C15.1 12.6 19 15 19.6 16.8 C20.2 18.6 16.2 21 5 21 Z M10.7 14.4 C13.6 14.4 15.4 15.3 15.6 16.8 C15.8 18.3 13.7 19.2 10 19.2 Z" }
  74. rect { class = "ident-i" x = "1.6" y = "14.2" width = "1.9" height = "6.8" rx = ".5" }
  75. circle { class = "ident-i" cx = "2.55" cy = "11.6" r = "1.15" }
  76. }
  77. }
  78. identPanel { id = "ident-panel" popover = "auto"
  79. identSelector { id = "selector" key = selectorKey class = selectorClass }
  80. a { id = "loginbutton" href = buttonHref title = "Log in with ident" "or log in at ident" }
  81. }
  82. }
  83. }
  84. }
  85. input { id = "identcode" type = "hidden" on change(e) { emit gotCode(e) } }
  86. if (hasLoginError) { p { id = "loginerror" class = "message banner" loginError } }
  87. if (offline) { offlineNote { id = "offline" "You are offline. Your shows and lists need the network." } }
  88. netProbe { "aria-hidden" = "true" on animationiteration(e) { emit netTick(e) } }
  89. // the phone's overlay with the main menu (desktop = "false": the header shows the menu from 60rem), then the shell with the
  90. // page. NOT the theme's `ContentFirst { Sidebar { … } main { slot } }`: hl:web renders a component's slot children on one
  91. // line, and a page slot that does not start its own line is rendered once per line of the page (WebFramework.hl
  92. // document(): the text before the marker is taken as the indent) — so `main` stands around the shell and the page is the
  93. // shell's slot itself
  94. Sidebar { desktop = "false" MainMenu { items = menu } }
  95. main {
  96. ContentFirst { slot }
  97. }
  98. script { src = identScript }
  99. script { src = "/login.js" }
  100. }
  101. }
  102. showIn = () => {
  103. loggedIn = true
  104. loggedOut = false
  105. selectorClass = 'in'
  106. loginError = ''
  107. hasLoginError = false
  108. }
  109. showOut = () => {
  110. loggedIn = false
  111. loggedOut = true
  112. selectorClass = 'out'
  113. }
  114. // the selector's code (via /login.js and the hidden input) → the server exchanges it
  115. on gotCode(e) {
  116. code = e.target.value
  117. e.target.value = ''
  118. if (code == null || code == '') { return null }
  119. r = emit server trackerLogin(code)
  120. if (r == null || r.error != null) {
  121. loginError = r != null ? r.error : 'the login failed'
  122. hasLoginError = true
  123. return null
  124. }
  125. showIn()
  126. navigate('/')
  127. }
  128. on client trackerSignedIn(tag) {
  129. showIn()
  130. navigate('/')
  131. }
  132. on client trackerSignedOut(tag) {
  133. showOut()
  134. navigate('/')
  135. }
  136. on netTick(e) {
  137. down = window.navigator.onLine == false
  138. if (down != offline) { offline = down }
  139. }
  140. on doLogout(e) {
  141. emit server trackerLogOut()
  142. showOut()
  143. navigate('/')
  144. }
  145. // ---- the faces (the trailing `session` is always the server's: hybriel #16) ----
  146. on server trackerLogin(code, session) {
  147. if (session == null) { return { error = 'no session — reload the page' } }
  148. x = userOfCode(code)
  149. if (x.error != null) { return { error = x.error } }
  150. tag = randomBytes(16)
  151. session.user = { id = x.user.id }
  152. session.data.tag = tag
  153. emit client trackerSignedIn(tag)
  154. return { ok = true }
  155. }
  156. on server trackerLogOut(session) {
  157. if (session == null) { return { error = 'no session' } }
  158. emit client trackerSignedOut(session.data.tag)
  159. session.user = null
  160. return { ok = true }
  161. }

Branches

Latest commits

  • 96ba683adeploy.sh: a gate without a 'passed,' line (check-theme) no longer ends the scriptmre
  • eb3b9205tracker: report 031mre
  • 9b5d2e89tracker mission 031: README (What it does, Test: four gates + the #32 checks, Files: theme/, new pages), STATUS (real copy, A/B load, how to repeat, open points), LOGmre
  • 39950e4ctracker#32 (mission 031): the WorldAPI theme (theme/ vendored verbatim from layouts.worldapi.org 85b5654; styles.hl inherits it: accent green-dark, type colours 1-6; own base/header rules, row lines, genre-pill and inverted-button frames removed, the season foldable keeps its line; check-theme 21 -> 0, 4th deploy gate; main actions class primary) and the #32 header (theme AppHeader/MainMenu/UserMenu/Sidebar/ContentFirst: desktop brand, search, Series|Shows|Movies|Genres|People, user icon with Unwatched..Settings, Logout; signed out the ident selector, phone the iD icon dropdown; phone menu in the sidebar overlay; marked entry by :has); /find -> /search/<q>, /genres, /people(/<letter>), /settings; main { ContentFirst { slot } } works around the hl:web one-line slot bug; gates 365/0, 32/0, 52/0, check-theme 0mre
  • a386dc92tracker: reports 029 + 030mre
  • 71e0fd7dtracker missions 029 + 030: README (What it does, Files, gate count), STATUS (real-copy numbers, how to repeat, open points), LOGmre
  • d36ea6eatracker#34 + #35 (mission 030): Follow directly under the poster, as wide as the poster (show.hl, styles.hl); the status pill next to a series' title — TVmaze's status (new tvmazeStatus, stored by the sync's TVmaze merge) else TMDB's, TVmaze Ended + TMDB Canceled = Canceled, inverted (filled, dark text, no border), green running / yellow pending / red canceled / muted ended (shows.hl statusOf); the daily delta asks TVmaze's status of an unfollowed series TVmaze's change list names (dailysync.hl syncRunStep, sync.hl syncTvmazeStatus); the status backfill after the details repair (backfill.hl, jobs.hl statusTick; resumable, 550 ms per TVmaze request); gates 354/0, 32/0, 52/0mre
  • 7d7d4487tracker#33 (mission 029): reduced titles — every title TMDB's details never went through this app (no detailsAt, no tmdbSync) is incomplete (shows.hl isIncomplete; the old tracker's migrated rows passed #26's test: 5,697 non-adult on the live copy, 691 series without seasons); the repair job does the visibly reduced first (shows.hl missingParts), the page completes one on open; a title TMDB has no poster for (The Remaining) shows the placeholder; tools/count-incomplete.hl; gate fixtures stand for synced titles (tmdbSync), tests/seed-reduced.hl + #33 checks; gates 347/0, 32/0, 52/0mre
  • 661c2592tracker: report 028mre
  • 27c916fatracker mission 028: README ("Code order", the new file map), STATUS (counts before/after, tests, how to repeat, open), LOGmre
  • d924f398tracker mission 028: comments name the new files (sync.hl, dailysync.hl, backfill.hl, credits.hl, jobs.hl, images.hl …); tools/ref-params.py + tools/lambda-audit.py also scan lib/ (they globbed the root only), lambda-audit counts a plain `x = p` alias like `let x = p`mre
  • 2e89b968tracker mission 028 (code order) 5/5 let: `let` only where a variable is reassigned — 667 never-reassigned lets became plain declarations (project.hl, lib/, components/, tools/, tests/); kept: 264 in loop bodies (a plain declaration there is 'Cannot reassign' on the 2nd pass), 234 reassigned, 27 whose name is also a member/outer/free name (a plain write would rebind it); tools/let-audit.py decides and fixes (README 'Code order'); tests/realdata-m028.{sh,mjs} = the page-output diff on a real copy; gates 342/0, 32/0, 52/0, real-copy pages identicalmre
  • 54796ff2tracker mission 028 (code order) 4/5 thin faces + last copies: the show page's check/follow faces call lib/watches.hl toggleWatched / toggleSeasonWatched (seasonAllWatched moved there) and lib/follows.hl toggleFollowed; both logins (header selector face, /login/callback) share lib/users.hl userOfCode; todayStr/listOf copies in components and the export readers copied into tools/migrate.hl + tools/old-short-ids.hl now once (lib/util.hl, lib/export.hl); gates 342/0, 32/0, 52/0; old-short-ids output byte-identical, migrate output identicalmre
  • 06b078e3tracker mission 028 (code order) 3/5 project.hl is the map: config, routes, wiring and a feature → file index (914 → 258 lines); the background jobs (daily sync run, backfills, details repair, credits job, merge, short ids, collection seed) moved unchanged into lib/jobs.hl (a class: their state is reassigned every step, a static cannot be; one instance made after the server), the login callback into lib/users.hl, poster/photo serving into lib/images.hl, the /shows/<slug> rule into lib/shows.hl showsMovedPath; route handlers are thin wrappers; gates 342/0, 32/0, 52/0, real-copy pages identicalmre
  • 94716fd2tracker mission 028 (code order) 2/5 util + topics: lib/util.hl holds envOr, storageDir, postersDir, profilesDir, newId, hexDigits, todayStr, dateOr, textOr, hasId, listOr, firstOf, sortDesc once (were copied into up to 5 files); tmdbsync.hl split into tmdb.hl (TMDB/TVmaze requests), sync.hl (one title's sync), sync-helpers.hl, backfill.hl; details.hl split into details.hl, credits.hl, credits-helpers.hl (isIncomplete to shows.hl); search-helpers.hl (words, query, ranking, slugs); collections.hl (the TMDB collection seed, out of franchises.hl); deltasync.hl renamed dailysync.hl; no behaviour change: gates 342/0, 32/0, 52/0, real-copy pages identicalmre
  • 186079b0tracker mission 028 (code order) 1/5 move: every root .hl except project.hl into lib/ (styles.hl into components/), import paths only; gates 342/0, 32/0, 52/0; real-copy pages identicalmre
  • 4f47f181tracker: report 027mre
  • dc1d4be4tracker mission 027: Hybriel master 06617221 vendored (plugin allocator fixes 3a781359 + 413f60e4); real copy RSS through first-start jobs + 400 loads flat ~2.55 GB (190aa11d 2.3 -> 5.6 GB), page times <= 1.1x; gates 342/0, 32/0, 52/0mre
  • 84e1b3e1tracker: reports 025 + 026mre
  • dc40d859tracker#31 (mission 026): duplicate titles merged — the 68 type+tmdbId pairs held by 157 records were the old tracker's (all migrated); merge.hl repair job (own clock, before the TMDB jobs) keeps one keeper per title (follows/watches > old short id > oldest), moves follows, watches, seasons, cast, credits, timelines, tombstones the rest (mergedInto, never deleted), slugs + short ids 301 to the keeper; stray seasons merged into their listed twin (Reacher S3 watches) or linked when watched; search import re-checks before its put; deploy.sh waits up to 90 s for 200; real copy 68 -> 0 dup ids, az5b2 follows/watches equal; gates 342/0, 32/0, 52/0mre