Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3604683df3 | ||
|
|
1193894b02 | ||
|
|
574d0bfe71 | ||
|
|
309e30f36d | ||
|
|
748241709a | ||
|
|
a70690a736 | ||
|
|
827a75be3d | ||
|
|
4e0a56be13 | ||
|
|
04204bef23 | ||
|
|
c766dedc0e | ||
|
|
a822f2175f | ||
|
|
f2b131ebbb | ||
|
|
6b72ae568a |
@@ -4,6 +4,21 @@ One line per change, grouped by the release that shipped it. Newest
|
||||
first. A release is a Cargo.toml bump plus a `v<version>` tag; the
|
||||
content repos pin the tag they run (see the end of this file).
|
||||
|
||||
## 0.6.3 (2026-09-30)
|
||||
|
||||
- Pages move the way their addresses do. Deeper in the address comes in from the right, back up comes in from the left, and a page at the same depth comes from below or above, with the index on top. The cards on screen leave as layers of their own, one after another, and the next page's cards arrive the same way. The old page stays on screen until the new one has loaded, where it used to go blank in between. Only transforms and opacity are animated, through the browser's View Transitions (`public/page-motion.js`, before the router). Browsers without them, and anyone who asks for reduced motion, navigate as before.
|
||||
- A record that carries a picture, in a list with no buttons, is shown as a card: the picture, the first field as the heading, the rest under it, with no field names, state or time. Cards are shown in the order they were put up. On a desk, the same picture is a thumbnail.
|
||||
- Trainer: `values` in a plan and `presents: true` on a need make a "who we are" card on the front door. The business's own statements are carried word for word, beside every record the need presents: the people who work there, entered from inside, each with a `picture` field (a file that only takes JPEG, PNG or WebP) that shows as their portrait. A public list keeps the form's field order, so the first field heads each row.
|
||||
|
||||
## 0.6.2 (2026-09-30)
|
||||
|
||||
- The header knows who is here: on a site with sign-in, a link top right to sign in, or the person's name and the way out. A page with a `slideshow` gets the wordmark as a bar of its own, the strip full width under it, and the question after.
|
||||
- "My cases": `where: { field: email, equals: "{user.email}" }` lists the records that carry the signed-in person's own address, filled from the session and never from the caller; nobody signed in matches nothing. An attachment is fetched only through a list that shows its record, so a list of my cases opens my files and nobody else's.
|
||||
- A stored file on a listed record shows as the name it was sent with and opens from the row, for whoever the list shows the record to. It used to show as its storage key, a string nobody could open.
|
||||
- Form controls scale with the text around them (em, not rem): fields, pills, buttons and labels follow a site's body size. The date picker's calendar icon is the size of the text beside it, and the file picker's button takes the field's colours instead of the browser's.
|
||||
- `KANIDM_GROUP_PREFIX`: a site on a Kanidm it shares with others keeps plain group names in its content; the prefix is put on when portal adds or removes a member, and the client's claim map takes it off.
|
||||
- Fixed: `maps` never reached the browser (`serde(skip)`), so a page with a map drew it on the server and dropped it on hydration.
|
||||
|
||||
## 0.6.1 (2026-09-30)
|
||||
|
||||
- Trainer: `documents` in a plan. A text the site carries word for word (bylaws, terms) becomes a page of its own where every section is one alternative: its heading the card's, its paragraphs the card's words, from a markdown file beside the plan. No model touches it.
|
||||
|
||||
Generated
+1
-1
@@ -3357,7 +3357,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "portal"
|
||||
version = "0.6.1"
|
||||
version = "0.6.3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"arc-swap",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "portal"
|
||||
version = "0.6.1"
|
||||
version = "0.6.3"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
|
||||
@@ -263,6 +263,20 @@ A spec with neither `public: true` nor `requires_group` is
|
||||
unreachable: reads fail closed, and mutations always need a group
|
||||
whatever `public` says.
|
||||
|
||||
`where: { field: email, equals: "{user.email}" }` is "my cases": the
|
||||
records carrying the signed-in person's own address, read from the
|
||||
session. A file on such a record is theirs alone to open.
|
||||
|
||||
A record that carries a picture (a `type: file` field holding a JPEG,
|
||||
PNG, WebP, AVIF or GIF) is shown rather than read when the list has no
|
||||
`transitions`: a card with the picture on top, the first field as its
|
||||
heading, and the other fields under it, with no field names, state or
|
||||
time. The cards appear in the order the records were put up. That is
|
||||
how a site shows the people who work there, or a gallery of what it
|
||||
has built. On a desk, the same picture is a thumbnail that opens.
|
||||
`accept: image/jpeg,image/png,image/webp` on the field makes a phone
|
||||
send a JPEG whatever it keeps its photos as.
|
||||
|
||||
`states` and `where` narrow a listing. They matter most for a register
|
||||
that is public by law — public about what was decided, not about what
|
||||
was withdrawn — while the desk working the same bucket is a different
|
||||
|
||||
@@ -71,6 +71,7 @@ values.
|
||||
| `KANIDM_URL`, `OAUTH2_CLIENT_ID`, `OAUTH2_CLIENT_SECRET` | sign-in |
|
||||
| `PEOPLE_BACKEND` | `kanidm` or `memberships` (see [Memberships](memberships.md)); unset, Kanidm when `KANIDM_API_TOKEN` is set, memberships otherwise |
|
||||
| `KANIDM_API_TOKEN` | invites and `grants:` through Kanidm |
|
||||
| `KANIDM_GROUP_PREFIX` | for a Kanidm shared with other sites: the content's `kunder` is the group `<prefix>kunder` there, and the OAuth2 client's claim map gives it back to portal as `kunder` |
|
||||
| `PHONE_COUNTRY` | the calling code a bare phone number gets, `+47` unless set |
|
||||
| `OIDC_EXTRA_SCOPES` | scopes to ask the provider for besides `openid profile email`: `phoneNumber` for Vipps. Not for Kanidm, which denies a sign-in that asks for a scope the person does not hold |
|
||||
| `SEED_ADMIN_EMAIL` or `SEED_ADMIN_PHONE`, `SEED_ADMIN_NAME`, `SEED_GROUP` | the first person in, invited once at start into the most privileged group (or `SEED_GROUP`) |
|
||||
|
||||
@@ -0,0 +1,279 @@
|
||||
# Klingenberg Bygg: tilstand, prosjektering og søknad for bygg, for
|
||||
# kommuner, borettslag, bedrifter og private. Bygget på det gamle
|
||||
# spørreskjemaet (klingenbergbygg/kundeportal, questions.ts) og et
|
||||
# intervju 2026-09-30: alle fire kundegrupper, én pult (Fredrik), og
|
||||
# hele oppdraget på siden - fra henvendelse over befaring og tilbud til
|
||||
# levert, med kunden innlogget for å følge saken og hente dokumentene.
|
||||
# Færre felt enn det gamle skjemaet: det som må til for å ta kontakt og
|
||||
# komme på befaring, resten tar vi der.
|
||||
business: Klingenberg Bygg
|
||||
language: "no"
|
||||
contact: { name: Fredrik Borch Lynghaug, email: fredrik@klingenbergbygg.no }
|
||||
mail: { from: "Klingenberg Bygg <portal@klingenbergbygg.no>", reply_to: fredrik@klingenbergbygg.no }
|
||||
about: >
|
||||
Med vår erfaring får vi kartlagt **tilstand**, utarbeidet **prosjekt**
|
||||
og godkjent **søknad** for ditt bygg.
|
||||
|
||||
# Kontoret er pulten; kundene får konto i det de takker ja til et
|
||||
# tilbud, og ser da sine egne oppdrag og dokumentene vi leverer.
|
||||
groups:
|
||||
- { id: kontor, label: Kontoret }
|
||||
- { id: kunder, label: Kunder }
|
||||
invites_by: [kontor]
|
||||
|
||||
# Forsiden åpner med det vi gjør, uten knapp: to trekk.
|
||||
does:
|
||||
- id: tilstand
|
||||
for: tilstand
|
||||
text: >
|
||||
Vi utarbeider tilstandsrapporter etter NS-EN 3424 og NS 3423, med
|
||||
befaring, materialprøver og termofotografering. Skal bygget rives,
|
||||
leverer vi miljøsaneringsrapport; energibruk og besparelser hører
|
||||
med i vurderingen. Du får et tilbud og sier selv ja eller nei.
|
||||
- id: soknad
|
||||
for: soknad
|
||||
text: >
|
||||
Vi prosjekterer og søker: arbeidsbeskrivelse opp mot NS 3420,
|
||||
fremdriftsplan, og byggesøknad med ansvarsrett. Vi har sentral
|
||||
godkjenning innen flere fagområder. Når tilbudet er godtatt,
|
||||
følger du oppdraget og henter dokumentene innlogget.
|
||||
|
||||
# Hvem vi er: erfaringen, i våre egne ord, og menneskene. Verdiene
|
||||
# skriver Fredrik selv; de legges inn her som en `values`-linje til.
|
||||
values:
|
||||
- id: erfaring
|
||||
text: >
|
||||
Skoler i drift, brannstasjoner, omsorgsboliger, kantina på Det
|
||||
Norske Teatret og en Munch-eiendom på Hvitsten. Vi har gått over,
|
||||
prosjektert og fulgt opp bygg for kommuner, borettslag, bedrifter
|
||||
og private, fra borprøver i gammel mur til kunstgress på
|
||||
Fredrikstad stasjon.
|
||||
|
||||
needs:
|
||||
- id: tilstand
|
||||
who: en eier eller forvalter som må vite hvilken forfatning bygget er i, for en kommune, et borettslag, en bedrift eller seg selv
|
||||
wants: en tilstandsrapport å planlegge og beslutte ut fra
|
||||
lands_in: tilstandsrapporter
|
||||
handled_by: kontor
|
||||
followed_by: [kunder]
|
||||
stages: [open, befaring, tilbud, akseptert, i_arbeid, levert, avslatt]
|
||||
stages_text: { open: "mottatt", befaring: "befaring avtalt", tilbud: "tilbud sendt", akseptert: "tilbud godtatt", i_arbeid: "i arbeid", levert: "levert", avslatt: "avsluttet uten oppdrag" }
|
||||
done_when: [levert, avslatt]
|
||||
success: [levert]
|
||||
turned_down_from: [open, befaring, tilbud]
|
||||
# Kunden sier selv ja eller nei til tilbudet, gjennom sin egen lenke.
|
||||
moves_by: { akseptert: [submitter], avslatt: [submitter, kontor] }
|
||||
mails: { open: submitter, befaring: submitter, tilbud: submitter, akseptert: fredrik@klingenbergbygg.no, levert: submitter }
|
||||
# Et godtatt tilbud er kundeforholdet: konto og plass blant kundene.
|
||||
grants: { akseptert: kunder }
|
||||
max_fields: 4
|
||||
collects:
|
||||
- { name: name }
|
||||
- { name: email, type: email }
|
||||
- { name: telefon, type: tel, optional: true }
|
||||
- { name: eiendom, type: select, options: [Skole eller annet offentlig bygg, Borettslag eller sameie, Næringsbygg, Enebolig, Leilighet, Fritidsbolig, Annet] }
|
||||
- { name: adresse }
|
||||
- { name: mangler, type: textarea, optional: true }
|
||||
- { name: tegninger, type: file, optional: true }
|
||||
|
||||
- id: prosjekt
|
||||
who: en byggherre som har planer for bygget og trenger dem prosjektert før noen kan bygge
|
||||
wants: en arbeidsbeskrivelse og fremdriftsplan som gir det beste grunnlaget for utførelse
|
||||
lands_in: prosjekteringer
|
||||
handled_by: kontor
|
||||
followed_by: [kunder]
|
||||
stages: [open, befaring, tilbud, akseptert, i_arbeid, levert, avslatt]
|
||||
stages_text: { open: "mottatt", befaring: "befaring avtalt", tilbud: "tilbud sendt", akseptert: "tilbud godtatt", i_arbeid: "i arbeid", levert: "levert", avslatt: "avsluttet uten oppdrag" }
|
||||
done_when: [levert, avslatt]
|
||||
success: [levert]
|
||||
turned_down_from: [open, befaring, tilbud]
|
||||
moves_by: { akseptert: [submitter], avslatt: [submitter, kontor] }
|
||||
mails: { open: submitter, befaring: submitter, tilbud: submitter, akseptert: fredrik@klingenbergbygg.no, levert: submitter }
|
||||
grants: { akseptert: kunder }
|
||||
max_fields: 4
|
||||
collects:
|
||||
- { name: name }
|
||||
- { name: email, type: email }
|
||||
- { name: telefon, type: tel, optional: true }
|
||||
- { name: adresse }
|
||||
- { name: planer, type: textarea }
|
||||
- { name: oppstart, type: date, optional: true }
|
||||
- { name: skisser, type: file, optional: true }
|
||||
|
||||
- id: soknad
|
||||
who: en byggherre med et ferdig prosjektert bygg som trenger offentlig godkjenning før første spadetak
|
||||
wants: en godkjent byggesøknad, med ansvarsrett der det kreves
|
||||
lands_in: soknader
|
||||
handled_by: kontor
|
||||
followed_by: [kunder]
|
||||
stages: [open, befaring, tilbud, akseptert, i_arbeid, levert, avslatt]
|
||||
stages_text: { open: "mottatt", befaring: "forhåndskonferanse eller befaring avtalt", tilbud: "tilbud sendt", akseptert: "tilbud godtatt", i_arbeid: "søknad under arbeid", levert: "søknad levert", avslatt: "avsluttet uten oppdrag" }
|
||||
done_when: [levert, avslatt]
|
||||
success: [levert]
|
||||
turned_down_from: [open, befaring, tilbud]
|
||||
moves_by: { akseptert: [submitter], avslatt: [submitter, kontor] }
|
||||
mails: { open: submitter, befaring: submitter, tilbud: submitter, akseptert: fredrik@klingenbergbygg.no, levert: submitter }
|
||||
grants: { akseptert: kunder }
|
||||
max_fields: 4
|
||||
collects:
|
||||
- { name: name }
|
||||
- { name: email, type: email }
|
||||
- { name: telefon, type: tel, optional: true }
|
||||
- { name: adresse }
|
||||
- { name: tiltak, type: textarea }
|
||||
- { name: tegninger, type: file, optional: true }
|
||||
|
||||
# Det kontoret leverer: rapporten, tegningene, vedtaket. Kunden får
|
||||
# e-post og henter dokumentet innlogget, fra sin egen liste.
|
||||
- id: leveranse
|
||||
who: kontoret, når en rapport, tegninger eller et vedtak er klart til kunden
|
||||
wants: at kunden får dokumentet og vet at det ligger der
|
||||
enters_as: kontor
|
||||
lands_in: leveranser
|
||||
handled_by: kontor
|
||||
followed_by: [kunder]
|
||||
stages: [open, arkivert]
|
||||
stages_text: { open: "levert", arkivert: "arkivert" }
|
||||
done_when: [arkivert]
|
||||
success: [arkivert]
|
||||
mails: { open: submitter }
|
||||
max_fields: 3
|
||||
collects:
|
||||
- { name: email, type: email }
|
||||
- { name: hva }
|
||||
- { name: dokument, type: file }
|
||||
|
||||
# Menneskene: kontoret legger inn hver ansatt med navn, rolle,
|
||||
# erfaring og portrett, og forsiden viser dem alle.
|
||||
- id: ansatt
|
||||
who: kontoret, når noen begynner hos oss eller skal ha nytt portrett
|
||||
wants: at den som vurderer oss ser hvem som gjør jobben
|
||||
enters_as: kontor
|
||||
lands_in: ansatte
|
||||
handled_by: kontor
|
||||
watched_by: [public]
|
||||
presents: true
|
||||
public_states: [open]
|
||||
stages: [open, sluttet]
|
||||
stages_text: { open: "vises på forsiden", sluttet: "sluttet" }
|
||||
done_when: [sluttet]
|
||||
success: [sluttet]
|
||||
max_fields: 4
|
||||
collects:
|
||||
- { name: name }
|
||||
- { name: rolle }
|
||||
- { name: erfaring, type: textarea }
|
||||
- { name: portrett, type: picture }
|
||||
|
||||
personas:
|
||||
- { id: kommune-skole, need: tilstand, text: "Vi i kommunen skal legge fram en sak om rehabilitering av en barneskole fra 1972 og trenger en tilstandsanalyse politikerne kan beslutte ut fra." }
|
||||
- { id: borettslag, need: tilstand, text: "Styret i borettslaget lurer på hva som haster mest av tak, fasade og rør. Vi trenger noen som kan gå over byggene og si hva det står til." }
|
||||
- { id: sprekk, need: tilstand, text: "Det har kommet en sprekk midt på stueveggen og jeg vet ikke om det er farlig. Kan noen komme og se på det?" }
|
||||
- { id: tilbygg, need: prosjekt, text: "Vi vil bygge på et tilbygg på lageret vårt og trenger noen som kan beskrive arbeidet så vi kan hente inn priser fra entreprenører." }
|
||||
- { id: skole-i-drift, need: prosjekt, text: "Skolen skal utvides mens den er i drift. Vi trenger en beskrivelse og en fremdriftsplan med byggetrinn." }
|
||||
- { id: soke-garasje, need: soknad, text: "Tegningene til garasjen er ferdige, men jeg aner ikke hvordan jeg søker kommunen. Kan dere ta søknaden?" }
|
||||
- { id: ansvarsrett, need: soknad, text: "Vi har prosjektert ombyggingen selv, men mangler noen med ansvarsrett som kan stå for søknaden." }
|
||||
|
||||
slideshow:
|
||||
max_height: 60
|
||||
slides:
|
||||
- image: images/bildeserie/01.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Tilstandsanalyse for politisk vurdering.
|
||||
- image: images/bildeserie/02.webp
|
||||
width: 2365
|
||||
height: 1400
|
||||
caption: Tilleggsisolert fasade uten fasadeendring. Tanum skole.
|
||||
- image: images/bildeserie/03.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Fundamenteringen av brannstasjonen i Ytre Enebakk
|
||||
- image: images/bildeserie/04.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Gammel stjernehimmel skal fornyes
|
||||
- image: images/bildeserie/05.webp
|
||||
width: 1050
|
||||
height: 1400
|
||||
caption: Sprekk midt på stuevegg
|
||||
- image: images/bildeserie/06.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Snart klart for overlevering! Løvenstad omsorgsboliger.
|
||||
- image: images/bildeserie/07.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Omlegging av vannforsyning før etablering av nye boliger
|
||||
- image: images/bildeserie/08.webp
|
||||
width: 1777
|
||||
height: 1400
|
||||
caption: Utbedring parkett i gymsal, sliping og lakking.
|
||||
- image: images/bildeserie/09.webp
|
||||
width: 3629
|
||||
height: 1400
|
||||
caption: Tilbygg på skole i drift, i Ås
|
||||
- image: images/bildeserie/10.webp
|
||||
width: 3207
|
||||
height: 1400
|
||||
caption: Fornying kantine Det Norske Teatret
|
||||
- image: images/bildeserie/11.webp
|
||||
width: 1050
|
||||
height: 1400
|
||||
caption: Solid veggprofil tilpasset lyd- og brannkrav
|
||||
- image: images/bildeserie/12.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Nye vinduer med tradisjonelt utseende «Restover»-glass som avslører utsikten fra Munkeramme på Hvitsten
|
||||
- image: images/bildeserie/13.webp
|
||||
width: 2571
|
||||
height: 1400
|
||||
caption: Kjerneved til verandaen og inngangspartiet til Muncheramme
|
||||
- image: images/bildeserie/14.webp
|
||||
width: 1050
|
||||
height: 1400
|
||||
caption: Drenering og riktige rammer før kunstgressbanen legges mesterfullt ned helt uten gummikuler
|
||||
- image: images/bildeserie/15.webp
|
||||
width: 2098
|
||||
height: 1400
|
||||
caption: Navnebror sprenger plass til ny brannstasjon
|
||||
- image: images/bildeserie/16.webp
|
||||
width: 1283
|
||||
height: 1400
|
||||
caption: Kontroll av betong før støping
|
||||
- image: images/bildeserie/17.webp
|
||||
width: 1050
|
||||
height: 1400
|
||||
caption: Etablering av ny byggekran
|
||||
- image: images/bildeserie/18.webp
|
||||
width: 1050
|
||||
height: 1400
|
||||
caption: Armeringskontroll før støping
|
||||
- image: images/bildeserie/19.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Brannstasjonens tårn under oppføring blir også klatrevegg
|
||||
- image: images/bildeserie/20.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Her heises Moelvens modulskole i Vestby på plass. Den blir stående i 10 år.
|
||||
- image: images/bildeserie/21.webp
|
||||
width: 1867
|
||||
height: 1400
|
||||
caption: Nyetablering av vei.
|
||||
- image: images/bildeserie/22.webp
|
||||
width: 838
|
||||
height: 1400
|
||||
caption: Støpefeil med frosset treverk i søyle fra 1960, avdekket og utbedret
|
||||
- image: images/bildeserie/23.webp
|
||||
width: 2095
|
||||
height: 1400
|
||||
caption: Nytt kunstgress med varme på Fredrikstad stasjon.
|
||||
- image: images/bildeserie/24.webp
|
||||
width: 1050
|
||||
height: 1400
|
||||
caption: Sydvendte fasader er utsatt for slagregn. Dette bygget er på byantikvarens gule liste.
|
||||
- image: images/bildeserie/25.webp
|
||||
width: 1487
|
||||
height: 1400
|
||||
caption: pH-test av borprøver i mur fra forskjellige dybder
|
||||
@@ -0,0 +1,525 @@
|
||||
{
|
||||
"questions/index.yaml": {
|
||||
"question": "Hvordan inkluderer vi ditt bygg i framtiden?",
|
||||
"description": "Med vår erfaring får vi kartlagt **tilstand**, utarbeidet **prosjekt** og godkjent **søknad** for ditt bygg.",
|
||||
"opener": {
|
||||
"heading": "Dette gjør vi",
|
||||
"description": "For kommuner, borettslag, bedrifter og private.",
|
||||
"features": {
|
||||
"tilstand": {
|
||||
"heading": "Tilstand, målt og dokumentert",
|
||||
"description": "Vi utarbeider tilstandsrapporter etter NS-EN 3424 og NS 3423, med befaring, materialprøver og termofotografering. Skal bygget rives, leverer vi miljøsaneringsrapport; energibruk og besparelser hører med i vurderingen. Vi har samarbeidet med [Drammen Kommune](https://drammen.kommune.no), [Nordre Follo Kommune](https://nordrefollo.kommune.no) og [Bølerskogens Borettslag](https://bolerskogenborettslag.no/).",
|
||||
"icon": "clipboard-check"
|
||||
},
|
||||
"soknad": {
|
||||
"heading": "Prosjekt og søknad, med ansvarsrett",
|
||||
"description": "Vi lager arbeidsbeskrivelse opp mot [NS 3420](https://standard.no/fagomrader/ns-3420-/) og fremdriftsplan, og utarbeider byggesøknaden. Vi har sentral [godkjenning](https://sgregister.dibk.no/enterprises/976015711) innen flere fagområder og kan stå med det offentligrettslige ansvaret. Samarbeidspartner: [Westra Engineering AS](https://www.westra-engineering.no/).",
|
||||
"icon": "file-check"
|
||||
}
|
||||
}
|
||||
},
|
||||
"needs": {
|
||||
"tilstand": {
|
||||
"heading": "Få kartlagt byggets tilstand",
|
||||
"description": "Vi utarbeider tilstandsrapporter som representerer bygget med hensyn til fremtidige mål.",
|
||||
"button": "Kom i gang",
|
||||
"encouragement": "Mindre stillstand etter dette.",
|
||||
"icon": "clipboard-list",
|
||||
"road_title": "Slik går det videre",
|
||||
"road_description": "Vi avtaler befaring og sender deg et tilbud. Du sier selv ja eller nei, og med et ja får du en innlogging der du følger oppdraget og henter dokumentene.",
|
||||
"road_icon": "route",
|
||||
"who_title": "Hvem leser dette",
|
||||
"who_description": "Fredrik på kontoret leser henvendelsen og tar kontakt. Du når ham også på fredrik@klingenbergbygg.no.",
|
||||
"who_icon": "users",
|
||||
"form_title": "Om bygget",
|
||||
"form_description": "Det vi trenger for å komme på befaring. Har du tegninger, bilder eller video, tar vi gjerne imot dem.",
|
||||
"labels": {
|
||||
"name": "Navn",
|
||||
"email": "E-post",
|
||||
"telefon": "Telefon",
|
||||
"adresse": "Hvor ligger eiendommen?",
|
||||
"eiendom": "Hva slags eiendom er det?",
|
||||
"mangler": "Hvilke mangler ønskes adressert?",
|
||||
"tegninger": "Bilder, tegninger, skisser eller video"
|
||||
},
|
||||
"hints": {
|
||||
"name": "Navn",
|
||||
"email": "bruker@eksempel.no",
|
||||
"telefon": "Telefonnummer",
|
||||
"adresse": "Adresse",
|
||||
"mangler": "Forfall, skader eller annet…"
|
||||
}
|
||||
},
|
||||
"prosjekt": {
|
||||
"heading": "Prosjektér dine planer med oss",
|
||||
"description": "Ivareta eksisterende ressurser for et velfungerende og helhetlig bygg.",
|
||||
"button": "Start samarbeidet",
|
||||
"encouragement": "Gi det beste grunnlaget for utførelse.",
|
||||
"icon": "ruler",
|
||||
"road_title": "Slik går det videre",
|
||||
"road_description": "Vi avtaler befaring og sender deg et tilbud. Du sier selv ja eller nei, og med et ja får du en innlogging der du følger oppdraget og henter dokumentene.",
|
||||
"road_icon": "route",
|
||||
"who_title": "Hvem leser dette",
|
||||
"who_description": "Fredrik på kontoret leser henvendelsen og tar kontakt. Du når ham også på fredrik@klingenbergbygg.no.",
|
||||
"who_icon": "users",
|
||||
"form_title": "Om planene",
|
||||
"form_description": "Beskriv hva du ønsker for bygget. Har du noe digitalt å vise oss, blir det lettere å vite hvor vi skal starte.",
|
||||
"labels": {
|
||||
"name": "Navn",
|
||||
"email": "E-post",
|
||||
"telefon": "Telefon",
|
||||
"adresse": "Hvor ligger eiendommen?",
|
||||
"planer": "Hva er dine planer for bygget?",
|
||||
"oppstart": "Ønsket start",
|
||||
"skisser": "Bilder, CAD-filer og skisser"
|
||||
},
|
||||
"hints": {
|
||||
"name": "Navn",
|
||||
"email": "bruker@eksempel.no",
|
||||
"telefon": "Telefonnummer",
|
||||
"adresse": "Adresse",
|
||||
"planer": "Ønsker for bygget…"
|
||||
}
|
||||
},
|
||||
"soknad": {
|
||||
"heading": "Ta det første spadetaket med en godkjent søknad",
|
||||
"description": "Er bygget ferdig prosjektert, kan vi utarbeide en byggesøknad og utførelsesbeskrivelse for offentlig godkjenning.",
|
||||
"button": "Send henvendelse",
|
||||
"encouragement": "Nesten som å ha gravemaskin!",
|
||||
"icon": "file-text",
|
||||
"road_title": "Slik går det videre",
|
||||
"road_description": "Vi går gjennom det du har, avtaler befaring eller forhåndskonferanse, og sender deg et tilbud. Du sier selv ja eller nei, og med et ja får du en innlogging der du følger søknaden og henter dokumentene.",
|
||||
"road_icon": "route",
|
||||
"who_title": "Hvem leser dette",
|
||||
"who_description": "Fredrik på kontoret leser henvendelsen og tar kontakt. Du når ham også på fredrik@klingenbergbygg.no.",
|
||||
"who_icon": "users",
|
||||
"form_title": "Om tiltaket",
|
||||
"form_description": "Hva skal bygges, og hvor. Avhengig av størrelsen kan vi holde forhåndskonferanse med kommunen først.",
|
||||
"labels": {
|
||||
"name": "Navn",
|
||||
"email": "E-post",
|
||||
"telefon": "Telefon",
|
||||
"adresse": "Hvor ligger eiendommen?",
|
||||
"tiltak": "Hva går tiltaket ut på?",
|
||||
"tegninger": "Tegninger og prosjektering"
|
||||
},
|
||||
"hints": {
|
||||
"name": "Navn",
|
||||
"email": "bruker@eksempel.no",
|
||||
"telefon": "Telefonnummer",
|
||||
"adresse": "Adresse",
|
||||
"tiltak": "Tilbygg, ombygging, nybygg…"
|
||||
}
|
||||
}
|
||||
},
|
||||
"who": {
|
||||
"heading": "Hvem består Klingenberg Bygg av?",
|
||||
"description": "Mennesker, verdier og erfaringer.",
|
||||
"items": {
|
||||
"erfaring": {
|
||||
"heading": "Erfaringene",
|
||||
"description": "Skoler i drift, brannstasjoner, omsorgsboliger, kantina på Det Norske Teatret og en Munch-eiendom på Hvitsten. Vi har gått over, prosjektert og fulgt opp bygg for kommuner, borettslag, bedrifter og private, fra borprøver i gammel mur til kunstgress på Fredrikstad stasjon.",
|
||||
"icon": "award"
|
||||
},
|
||||
"people-ansatte": {
|
||||
"heading": "Menneskene",
|
||||
"description": "De som går befaringene, skriver rapportene og står for søknadene.",
|
||||
"empty": "Snart presenterer vi oss her.",
|
||||
"icon": "users"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"questions/received/tilstand.yaml": {
|
||||
"question": "Vent på svar på din henvendelse!",
|
||||
"description": "Vi vil gå gjennom din henvendelse og om mulig komme med et tilbud så fort vi kan.",
|
||||
"next_heading": "Vi tar kontakt for befaring",
|
||||
"next_description": "Du har fått en e-post som bekrefter at henvendelsen om tilstandsrapport er mottatt. Fredrik tar kontakt for å avtale befaring; spørsmål i mellomtiden går til fredrik@klingenbergbygg.no."
|
||||
},
|
||||
"questions/received/prosjekt.yaml": {
|
||||
"question": "Vent på svar på din henvendelse!",
|
||||
"description": "Vi vil gå gjennom din henvendelse og om mulig komme med et tilbud så fort vi kan.",
|
||||
"next_heading": "Vi tar kontakt for befaring",
|
||||
"next_description": "Du har fått en e-post som bekrefter at henvendelsen om prosjektering er mottatt. Fredrik tar kontakt for å avtale befaring; spørsmål i mellomtiden går til fredrik@klingenbergbygg.no."
|
||||
},
|
||||
"questions/received/soknad.yaml": {
|
||||
"question": "Vent på svar på din henvendelse!",
|
||||
"description": "Vi vil gå gjennom din henvendelse og om mulig komme med et tilbud så fort vi kan.",
|
||||
"next_heading": "Vi tar kontakt for befaring",
|
||||
"next_description": "Du har fått en e-post som bekrefter at henvendelsen om byggesøknad er mottatt. Fredrik tar kontakt for å avtale befaring; spørsmål i mellomtiden går til fredrik@klingenbergbygg.no."
|
||||
},
|
||||
"questions/decide/tilstand.yaml": {
|
||||
"question": "Vil du gå videre med tilbudet?",
|
||||
"description": "Tilbudet på tilstandsrapporten har du fått i egen e-post fra oss. Her sier du ja eller nei.",
|
||||
"moves": {
|
||||
"akseptert": {
|
||||
"heading": "Ja, jeg godtar tilbudet",
|
||||
"description": "Vi setter i gang. Du får en innlogging på e-post, der du følger oppdraget og henter dokumentene når de er klare.",
|
||||
"button": "Godta tilbudet"
|
||||
},
|
||||
"avslatt": {
|
||||
"heading": "Nei takk",
|
||||
"description": "Henvendelsen avsluttes hos oss uten oppdrag. Du kan når som helst sende en ny.",
|
||||
"button": "Takk nei"
|
||||
}
|
||||
}
|
||||
},
|
||||
"questions/decide/prosjekt.yaml": {
|
||||
"question": "Vil du gå videre med tilbudet?",
|
||||
"description": "Tilbudet på prosjekteringen har du fått i egen e-post fra oss. Her sier du ja eller nei.",
|
||||
"moves": {
|
||||
"akseptert": {
|
||||
"heading": "Ja, jeg godtar tilbudet",
|
||||
"description": "Vi setter i gang. Du får en innlogging på e-post, der du følger oppdraget og henter dokumentene når de er klare.",
|
||||
"button": "Godta tilbudet"
|
||||
},
|
||||
"avslatt": {
|
||||
"heading": "Nei takk",
|
||||
"description": "Henvendelsen avsluttes hos oss uten oppdrag. Du kan når som helst sende en ny.",
|
||||
"button": "Takk nei"
|
||||
}
|
||||
}
|
||||
},
|
||||
"questions/decide/soknad.yaml": {
|
||||
"question": "Vil du gå videre med tilbudet?",
|
||||
"description": "Tilbudet på byggesøknaden har du fått i egen e-post fra oss. Her sier du ja eller nei.",
|
||||
"moves": {
|
||||
"akseptert": {
|
||||
"heading": "Ja, jeg godtar tilbudet",
|
||||
"description": "Vi setter i gang. Du får en innlogging på e-post, der du følger oppdraget og henter dokumentene når de er klare.",
|
||||
"button": "Godta tilbudet"
|
||||
},
|
||||
"avslatt": {
|
||||
"heading": "Nei takk",
|
||||
"description": "Henvendelsen avsluttes hos oss uten oppdrag. Du kan når som helst sende en ny.",
|
||||
"button": "Takk nei"
|
||||
}
|
||||
}
|
||||
},
|
||||
"questions/kontor/index.yaml": {
|
||||
"question": "Hva ligger på pulten nå?",
|
||||
"description": "Alle henvendelser og oppdrag, fra første melding til levert dokument.",
|
||||
"confirm": "Bekreft",
|
||||
"buckets": {
|
||||
"tilstandsrapporter": {
|
||||
"heading": "Tilstandsrapporter",
|
||||
"description": "Henvendelser om tilstandsrapport, fra mottatt til levert.",
|
||||
"moves": {
|
||||
"open->befaring": "Befaring avtalt",
|
||||
"open->avslatt": "Avslutt uten oppdrag",
|
||||
"befaring->tilbud": "Tilbud sendt",
|
||||
"befaring->avslatt": "Avslutt uten oppdrag",
|
||||
"tilbud->avslatt": "Avslutt uten oppdrag",
|
||||
"akseptert->i_arbeid": "Arbeidet er i gang",
|
||||
"i_arbeid->levert": "Levert"
|
||||
},
|
||||
"list_title": "Tilstandsrapporter",
|
||||
"list_note": "Hver rad er én henvendelse. Knappene fører opp det du nettopp har gjort; kunden får e-post ved befaring, tilbud og levering, og sier selv ja til tilbudet."
|
||||
},
|
||||
"prosjekteringer": {
|
||||
"heading": "Prosjekteringer",
|
||||
"description": "Henvendelser om prosjektering, fra mottatt til levert.",
|
||||
"moves": {
|
||||
"open->befaring": "Befaring avtalt",
|
||||
"open->avslatt": "Avslutt uten oppdrag",
|
||||
"befaring->tilbud": "Tilbud sendt",
|
||||
"befaring->avslatt": "Avslutt uten oppdrag",
|
||||
"tilbud->avslatt": "Avslutt uten oppdrag",
|
||||
"akseptert->i_arbeid": "Arbeidet er i gang",
|
||||
"i_arbeid->levert": "Levert"
|
||||
},
|
||||
"list_title": "Prosjekteringer",
|
||||
"list_note": "Hver rad er én henvendelse. Knappene fører opp det du nettopp har gjort; kunden får e-post ved befaring, tilbud og levering, og sier selv ja til tilbudet."
|
||||
},
|
||||
"soknader": {
|
||||
"heading": "Byggesøknader",
|
||||
"description": "Henvendelser om byggesøknad, fra mottatt til levert.",
|
||||
"moves": {
|
||||
"open->befaring": "Befaring avtalt",
|
||||
"open->avslatt": "Avslutt uten oppdrag",
|
||||
"befaring->tilbud": "Tilbud sendt",
|
||||
"befaring->avslatt": "Avslutt uten oppdrag",
|
||||
"tilbud->avslatt": "Avslutt uten oppdrag",
|
||||
"akseptert->i_arbeid": "Arbeidet er i gang",
|
||||
"i_arbeid->levert": "Levert"
|
||||
},
|
||||
"list_title": "Byggesøknader",
|
||||
"list_note": "Hver rad er én henvendelse. Knappene fører opp det du nettopp har gjort; kunden får e-post ved befaring, tilbud og levering, og sier selv ja til tilbudet."
|
||||
},
|
||||
"leveranser": {
|
||||
"heading": "Leverte dokumenter",
|
||||
"description": "Rapporter, tegninger og vedtak som er sendt til kunder.",
|
||||
"moves": {
|
||||
"open->arkivert": "Arkiver"
|
||||
},
|
||||
"list_title": "Leveranser",
|
||||
"list_note": "Hver rad er ett dokument en kunde har fått. Arkiver når saken er avsluttet."
|
||||
},
|
||||
"ansatte": {
|
||||
"heading": "Ansatte på forsiden",
|
||||
"description": "Menneskene slik besøkende ser dem.",
|
||||
"moves": {
|
||||
"open->sluttet": "Tatt av forsiden"
|
||||
},
|
||||
"list_title": "Ansatte",
|
||||
"list_note": "Hver rad er én person på forsiden."
|
||||
}
|
||||
},
|
||||
"links": {
|
||||
"leveranse": {
|
||||
"heading": "Lever et dokument til en kunde",
|
||||
"description": "Rapporten, tegningene eller vedtaket. Kunden får e-post og henter det innlogget.",
|
||||
"button": "Ny leveranse"
|
||||
},
|
||||
"ansatt": {
|
||||
"heading": "Legg inn en ansatt",
|
||||
"description": "Navn, rolle, erfaring og portrett, rett ut på forsiden.",
|
||||
"button": "Åpne"
|
||||
}
|
||||
},
|
||||
"invites": {
|
||||
"kontor": {
|
||||
"heading": "Gi en kollega tilgang",
|
||||
"description": "De får en konto og plass på kontoret, og ser de samme sakene som deg.",
|
||||
"button": "Inviter",
|
||||
"form_title": "Hvem",
|
||||
"form_description": "Navnet deres, og adressen kontoen og engangslenken går til.",
|
||||
"labels": {
|
||||
"name": "Navn",
|
||||
"phone": "Telefon",
|
||||
"email": "E-post"
|
||||
}
|
||||
},
|
||||
"kunder": {
|
||||
"heading": "Gi en kunde tilgang",
|
||||
"description": "For en kunde som ikke kom inn gjennom et tilbud. De får en konto og ser sine egne oppdrag.",
|
||||
"button": "Inviter",
|
||||
"form_title": "Hvem",
|
||||
"form_description": "Navnet deres, og adressen kontoen og engangslenken går til.",
|
||||
"labels": {
|
||||
"name": "Navn",
|
||||
"phone": "Telefon",
|
||||
"email": "E-post"
|
||||
}
|
||||
}
|
||||
},
|
||||
"invited": {
|
||||
"heading": "Sendte invitasjoner",
|
||||
"description": "Hver invitasjon og hvor den står. En lenke som går ut ubrukt, kan sendes på nytt.",
|
||||
"done": "Er inne",
|
||||
"again": "Send på nytt",
|
||||
"list_title": "Hvem som er invitert",
|
||||
"list_note": "Hver rad er én invitasjon. Den blir ferdig av seg selv når personen logger inn, og står som utløpt når lenken gikk ut ubrukt."
|
||||
},
|
||||
"suggestions": {
|
||||
"heading": "Forslag til endringer på siden",
|
||||
"description": "Det de som står som ansvarlige for et spørsmål, har foreslått å endre.",
|
||||
"list_title": "Forslag",
|
||||
"list_note": "Hver rad er ett forslag, med siden det gjelder.",
|
||||
"looking": "Vi ser på det",
|
||||
"changed": "Endringen er gjort",
|
||||
"declined": "Gjøres ikke"
|
||||
}
|
||||
},
|
||||
"questions/kunder/index.yaml": {
|
||||
"question": "Hvor står oppdraget ditt?",
|
||||
"description": "Her følger du dine egne oppdrag hos Klingenberg Bygg og henter dokumentene vi har levert.",
|
||||
"confirm": "Bekreft",
|
||||
"buckets": {
|
||||
"leveranser": {
|
||||
"heading": "Dokumenter til deg",
|
||||
"description": "Rapporter, tegninger og vedtak vi har levert. Trykk på filnavnet for å hente dokumentet.",
|
||||
"moves": {},
|
||||
"list_title": "Dokumenter",
|
||||
"list_note": "Hver rad er ett dokument vi har levert til deg."
|
||||
},
|
||||
"tilstandsrapporter": {
|
||||
"heading": "Tilstandsrapporter",
|
||||
"description": "Dine oppdrag om tilstandsrapport, og hvor langt de har kommet.",
|
||||
"moves": {},
|
||||
"list_title": "Tilstandsrapporter",
|
||||
"list_note": "Hver rad er ett av dine egne oppdrag og hvor langt det har kommet."
|
||||
},
|
||||
"prosjekteringer": {
|
||||
"heading": "Prosjekteringer",
|
||||
"description": "Dine oppdrag om prosjektering, og hvor langt de har kommet.",
|
||||
"moves": {},
|
||||
"list_title": "Prosjekteringer",
|
||||
"list_note": "Hver rad er ett av dine egne oppdrag og hvor langt det har kommet."
|
||||
},
|
||||
"soknader": {
|
||||
"heading": "Byggesøknader",
|
||||
"description": "Dine oppdrag om byggesøknad, og hvor langt de har kommet.",
|
||||
"moves": {},
|
||||
"list_title": "Byggesøknader",
|
||||
"list_note": "Hver rad er ett av dine egne oppdrag og hvor langt det har kommet."
|
||||
}
|
||||
}
|
||||
},
|
||||
"questions/kontor/leveranse.yaml": {
|
||||
"heading": "Lever et dokument til en kunde",
|
||||
"description": "Last opp rapporten, tegningene eller vedtaket. Kunden får e-post og henter dokumentet innlogget.",
|
||||
"button": "Lever",
|
||||
"encouragement": "Kunden får beskjed med en gang.",
|
||||
"icon": "send",
|
||||
"road_title": "Hva skjer",
|
||||
"road_description": "Dokumentet legges på kundens side, og kunden får e-post om at det ligger der.",
|
||||
"road_icon": "route",
|
||||
"who_title": "Hvem ser dette",
|
||||
"who_description": "Kunden med den e-postadressen du oppgir, og kontoret.",
|
||||
"who_icon": "users",
|
||||
"form_title": "Leveransen",
|
||||
"form_description": "Bruk den e-postadressen kunden logger inn med.",
|
||||
"labels": {
|
||||
"email": "Kundens e-post",
|
||||
"hva": "Hva er levert",
|
||||
"dokument": "Dokument"
|
||||
},
|
||||
"hints": {
|
||||
"email": "kunde@eksempel.no",
|
||||
"hva": "Tilstandsrapport for Storgata 12",
|
||||
"dokument": ""
|
||||
},
|
||||
"question": "Hvilket dokument er klart til kunden?",
|
||||
"page_description": "Ferdige rapporter, tegninger og vedtak leveres her."
|
||||
},
|
||||
"questions/kontor/leveranse-sent.yaml": {
|
||||
"question": "Hva skjer nå?",
|
||||
"description": "Dokumentet er levert.",
|
||||
"next_heading": "Kunden har fått beskjed",
|
||||
"next_description": "Kunden har fått e-post og finner dokumentet på sin side. Leveransen ligger i listen på pulten til du arkiverer den."
|
||||
},
|
||||
"aggregates.yaml": {
|
||||
"tilstandsrapporter": {
|
||||
"open": {
|
||||
"subject": "Vi har mottatt henvendelsen om {adresse}",
|
||||
"body": "Hei {name},\n\nVi har mottatt henvendelsen din om tilstandsrapport for {adresse}. Fredrik tar kontakt for å avtale befaring.\n\nVil du trekke henvendelsen, gjør du det her:\n{site}/decide/tilstand?chain={chain}&email={email}\n\nKlingenberg Bygg"
|
||||
},
|
||||
"befaring": {
|
||||
"subject": "Befaring avtalt for {adresse}",
|
||||
"body": "Hei {name},\n\nVi har avtalt befaring for {adresse}. Etter befaringen sender vi deg et tilbud.\n\nVil du trekke henvendelsen, gjør du det her:\n{site}/decide/tilstand?chain={chain}&email={email}\n\nKlingenberg Bygg"
|
||||
},
|
||||
"tilbud": {
|
||||
"subject": "Tilbud på tilstandsrapport for {adresse}",
|
||||
"body": "Hei {name},\n\nTilbudet på tilstandsrapport for {adresse} er sendt deg i egen e-post. Si ja eller nei her:\n{site}/decide/tilstand?chain={chain}&email={email}\n\nMed et ja får du en innlogging der du følger oppdraget og henter dokumentene. Svar på denne e-posten om du lurer på noe.\n\nKlingenberg Bygg"
|
||||
},
|
||||
"akseptert": {
|
||||
"subject": "Tilbudet for {adresse} er godtatt",
|
||||
"body": "{name} ({email}) har godtatt tilbudet på tilstandsrapport for {adresse}.\n\nOppdraget ligger på pulten: {site}/kontor"
|
||||
},
|
||||
"levert": {
|
||||
"subject": "Tilstandsrapport for {adresse} er levert",
|
||||
"body": "Hei {name},\n\nTilstandsrapport for {adresse} er levert. Dokumentene henter du innlogget:\n{site}/kunder\n\nTakk for oppdraget.\n\nKlingenberg Bygg"
|
||||
}
|
||||
},
|
||||
"prosjekteringer": {
|
||||
"open": {
|
||||
"subject": "Vi har mottatt henvendelsen om {adresse}",
|
||||
"body": "Hei {name},\n\nVi har mottatt henvendelsen din om prosjektering for {adresse}. Fredrik tar kontakt for å avtale befaring.\n\nVil du trekke henvendelsen, gjør du det her:\n{site}/decide/prosjekt?chain={chain}&email={email}\n\nKlingenberg Bygg"
|
||||
},
|
||||
"befaring": {
|
||||
"subject": "Befaring avtalt for {adresse}",
|
||||
"body": "Hei {name},\n\nVi har avtalt befaring for {adresse}. Etter befaringen sender vi deg et tilbud.\n\nVil du trekke henvendelsen, gjør du det her:\n{site}/decide/prosjekt?chain={chain}&email={email}\n\nKlingenberg Bygg"
|
||||
},
|
||||
"tilbud": {
|
||||
"subject": "Tilbud på prosjektering for {adresse}",
|
||||
"body": "Hei {name},\n\nTilbudet på prosjektering for {adresse} er sendt deg i egen e-post. Si ja eller nei her:\n{site}/decide/prosjekt?chain={chain}&email={email}\n\nMed et ja får du en innlogging der du følger oppdraget og henter dokumentene. Svar på denne e-posten om du lurer på noe.\n\nKlingenberg Bygg"
|
||||
},
|
||||
"akseptert": {
|
||||
"subject": "Tilbudet for {adresse} er godtatt",
|
||||
"body": "{name} ({email}) har godtatt tilbudet på prosjektering for {adresse}.\n\nOppdraget ligger på pulten: {site}/kontor"
|
||||
},
|
||||
"levert": {
|
||||
"subject": "Prosjektering for {adresse} er levert",
|
||||
"body": "Hei {name},\n\nProsjektering for {adresse} er levert. Dokumentene henter du innlogget:\n{site}/kunder\n\nTakk for oppdraget.\n\nKlingenberg Bygg"
|
||||
}
|
||||
},
|
||||
"soknader": {
|
||||
"open": {
|
||||
"subject": "Vi har mottatt henvendelsen om {adresse}",
|
||||
"body": "Hei {name},\n\nVi har mottatt henvendelsen din om byggesøknad for {adresse}. Fredrik tar kontakt for å avtale befaring.\n\nVil du trekke henvendelsen, gjør du det her:\n{site}/decide/soknad?chain={chain}&email={email}\n\nKlingenberg Bygg"
|
||||
},
|
||||
"befaring": {
|
||||
"subject": "Befaring avtalt for {adresse}",
|
||||
"body": "Hei {name},\n\nVi har avtalt befaring for {adresse}. Etter befaringen sender vi deg et tilbud.\n\nVil du trekke henvendelsen, gjør du det her:\n{site}/decide/soknad?chain={chain}&email={email}\n\nKlingenberg Bygg"
|
||||
},
|
||||
"tilbud": {
|
||||
"subject": "Tilbud på byggesøknad for {adresse}",
|
||||
"body": "Hei {name},\n\nTilbudet på byggesøknad for {adresse} er sendt deg i egen e-post. Si ja eller nei her:\n{site}/decide/soknad?chain={chain}&email={email}\n\nMed et ja får du en innlogging der du følger oppdraget og henter dokumentene. Svar på denne e-posten om du lurer på noe.\n\nKlingenberg Bygg"
|
||||
},
|
||||
"akseptert": {
|
||||
"subject": "Tilbudet for {adresse} er godtatt",
|
||||
"body": "{name} ({email}) har godtatt tilbudet på byggesøknad for {adresse}.\n\nOppdraget ligger på pulten: {site}/kontor"
|
||||
},
|
||||
"levert": {
|
||||
"subject": "Byggesøknad for {adresse} er levert",
|
||||
"body": "Hei {name},\n\nByggesøknad for {adresse} er levert. Dokumentene henter du innlogget:\n{site}/kunder\n\nTakk for oppdraget.\n\nKlingenberg Bygg"
|
||||
}
|
||||
},
|
||||
"leveranser": {
|
||||
"open": {
|
||||
"subject": "{hva} ligger klar til deg",
|
||||
"body": "Hei,\n\n{hva} er levert fra Klingenberg Bygg. Logg inn og hent dokumentet her:\n{site}/kunder\n\nSvar på denne e-posten om noe mangler.\n\nKlingenberg Bygg"
|
||||
}
|
||||
}
|
||||
},
|
||||
"site.yaml": {
|
||||
"invite": {
|
||||
"subject": "Din innlogging hos {site_name}",
|
||||
"body": "Hei {name},\n\nDu har fått en konto hos {site_name}, med plass blant {group}. Velg passord eller passnøkkel her, lenken virker fram til {expires}:\n\n{link}\n\nBrukernavnet ditt er {username}. Etterpå logger du inn på {site}."
|
||||
}
|
||||
},
|
||||
"questions/kontor/ansatt-sent.yaml": {
|
||||
"question": "Lagt ut",
|
||||
"description": "Den ansatte vises nå blant menneskene på forsiden.",
|
||||
"next_heading": "Skal noen ned igjen?",
|
||||
"next_description": "Trykk «Tatt av forsiden» på raden deres i listen over ansatte på kontoret. Nytt portrett: legg personen inn på nytt, og ta den gamle raden av.",
|
||||
"see_all": {
|
||||
"heading": "Se alle ansatte",
|
||||
"description": "",
|
||||
"button": "Åpne"
|
||||
}
|
||||
},
|
||||
"questions/kontor/ansatt.yaml": {
|
||||
"heading": "Legg inn en ansatt",
|
||||
"description": "Navn, rolle, erfaring og portrett. Den ansatte vises på forsiden så snart du sender.",
|
||||
"button": "Legg ut",
|
||||
"encouragement": "",
|
||||
"icon": "user-plus",
|
||||
"requires_title": "",
|
||||
"requires_description": "",
|
||||
"requires_icon": "",
|
||||
"road_title": "Hva skjer så",
|
||||
"road_description": "Personen vises på forsiden til du tar dem av igjen fra kontoret.",
|
||||
"road_icon": "route",
|
||||
"who_title": "Hvem ser det",
|
||||
"who_description": "Alle som besøker siden. Portrettet vises som det er, så velg et bilde du er fornøyd med.",
|
||||
"who_icon": "users",
|
||||
"form_title": "Den ansatte",
|
||||
"form_description": "",
|
||||
"labels": {
|
||||
"name": "Navn",
|
||||
"rolle": "Rolle",
|
||||
"erfaring": "Erfaring",
|
||||
"portrett": "Portrett"
|
||||
},
|
||||
"hints": {
|
||||
"name": "",
|
||||
"rolle": "For eksempel daglig leder, rådgivende ingeniør",
|
||||
"erfaring": "Utdanning, fagområder, år i faget, bygg du er stolt av",
|
||||
"portrett": "Et stående bilde, gjerne tatt i dagslys"
|
||||
},
|
||||
"question": "Hvem skal vises på forsiden?",
|
||||
"page_description": ""
|
||||
},
|
||||
"questions/status/ansatte/index.yaml": {
|
||||
"question": "Hvem består Klingenberg Bygg av?",
|
||||
"description": "Menneskene som går befaringene, skriver rapportene og står for søknadene.",
|
||||
"heading": "Menneskene",
|
||||
"list_description": "",
|
||||
"list_title": "Menneskene",
|
||||
"list_note": "",
|
||||
"empty": "Snart presenterer vi oss her.",
|
||||
"answer": ""
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
// Pages move the way their addresses do.
|
||||
//
|
||||
// Deeper in the address comes in from the right and going back up
|
||||
// comes in from the left: /kontor/ansatt sits to the right of /kontor.
|
||||
// A page at the same depth comes from below, or from above when it
|
||||
// sorts first, so the index is on top. The cards on a page leave as
|
||||
// islands of their own and the next page's cards arrive one after
|
||||
// another.
|
||||
//
|
||||
// The router swaps the page after its data has arrived, and in between
|
||||
// shows nothing at all. So the click is held here, before the router
|
||||
// sees it: the browser takes its picture of the page as it is, the
|
||||
// click is handed on, and the transition waits until the new page has
|
||||
// replaced the old one. Only transforms and opacity are animated, on
|
||||
// layers the browser composites itself. Without View Transitions, or
|
||||
// with reduced motion asked for, nothing here does anything and the
|
||||
// router navigates as it always did.
|
||||
(() => {
|
||||
if (!document.startViewTransition) return;
|
||||
const still = matchMedia("(prefers-reduced-motion: reduce)");
|
||||
const MAX_CARDS = 8;
|
||||
const WAIT_MS = 2500;
|
||||
const handed = new WeakSet();
|
||||
|
||||
const segments = (path) => path.split("/").filter(Boolean);
|
||||
|
||||
// forward, back, down or up: which way the new page comes from.
|
||||
function direction(from, to) {
|
||||
const a = segments(from);
|
||||
const b = segments(to);
|
||||
if (b.length > a.length) return "forward";
|
||||
if (b.length < a.length) return "back";
|
||||
return to < from ? "up" : "down";
|
||||
}
|
||||
|
||||
// Only the cards on screen become islands: each is a picture the
|
||||
// browser has to take and hold, and one nobody sees costs the same.
|
||||
function inView(card) {
|
||||
const r = card.getBoundingClientRect();
|
||||
return r.bottom > 0 && r.top < innerHeight;
|
||||
}
|
||||
|
||||
function name(cards, prefix) {
|
||||
cards.filter(inView).slice(0, MAX_CARDS).forEach((card, i) => {
|
||||
card.style.viewTransitionName = `${prefix}-${i + 1}`;
|
||||
});
|
||||
}
|
||||
|
||||
function unname() {
|
||||
document.querySelectorAll(".alt-card").forEach((card) => {
|
||||
card.style.viewTransitionName = "";
|
||||
});
|
||||
}
|
||||
|
||||
// Resolves once the page that was showing has been replaced by the
|
||||
// one at `path`, or after WAIT_MS whatever happened.
|
||||
function replaced(old, path) {
|
||||
return new Promise((resolve) => {
|
||||
const done = () => {
|
||||
observer.disconnect();
|
||||
clearTimeout(timer);
|
||||
resolve();
|
||||
};
|
||||
const check = () => {
|
||||
if (location.pathname !== path) return;
|
||||
if (document.querySelector("main.loading")) return;
|
||||
if (old && old.isConnected) return;
|
||||
if (!document.querySelector(".alternatives, main.not-found")) return;
|
||||
done();
|
||||
};
|
||||
const observer = new MutationObserver(check);
|
||||
observer.observe(document.body, { childList: true, subtree: true });
|
||||
const timer = setTimeout(done, WAIT_MS);
|
||||
check();
|
||||
});
|
||||
}
|
||||
|
||||
function move(from, to, handOn) {
|
||||
const root = document.documentElement;
|
||||
const old = document.querySelector(".alternatives");
|
||||
root.dataset.motion = direction(from, to);
|
||||
name([...document.querySelectorAll(".alt-card")], "pm-out");
|
||||
const transition = document.startViewTransition(async () => {
|
||||
unname();
|
||||
handOn();
|
||||
await replaced(old, to);
|
||||
name([...document.querySelectorAll(".alt-card")], "pm-in");
|
||||
});
|
||||
transition.finished.finally(() => {
|
||||
unname();
|
||||
delete root.dataset.motion;
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener(
|
||||
"click",
|
||||
(ev) => {
|
||||
if (still.matches || handed.has(ev) || ev.defaultPrevented) return;
|
||||
if (ev.button !== 0 || ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
|
||||
const a = ev.target.closest && ev.target.closest("a[href]");
|
||||
if (!a || a.target || a.hasAttribute("download")) return;
|
||||
if ((a.getAttribute("rel") || "").split(/\s+/).includes("external")) return;
|
||||
const url = new URL(a.href, location.href);
|
||||
if (url.origin !== location.origin || url.pathname === location.pathname) return;
|
||||
ev.preventDefault();
|
||||
ev.stopImmediatePropagation();
|
||||
move(location.pathname, url.pathname, () => {
|
||||
const again = new MouseEvent("click", { bubbles: true, cancelable: true, composed: true, button: 0 });
|
||||
handed.add(again);
|
||||
a.dispatchEvent(again);
|
||||
});
|
||||
},
|
||||
true,
|
||||
);
|
||||
|
||||
// Back and forward: the address has already changed when this runs,
|
||||
// so the router is told a moment later, inside the transition.
|
||||
let shown = location.pathname;
|
||||
window.addEventListener(
|
||||
"popstate",
|
||||
(ev) => {
|
||||
const to = location.pathname;
|
||||
const from = shown;
|
||||
shown = to;
|
||||
if (still.matches || handed.has(ev) || from === to) return;
|
||||
ev.stopImmediatePropagation();
|
||||
move(from, to, () => {
|
||||
const again = new PopStateEvent("popstate", { state: ev.state });
|
||||
handed.add(again);
|
||||
window.dispatchEvent(again);
|
||||
});
|
||||
},
|
||||
true,
|
||||
);
|
||||
// Keep `shown` right after the router's own pushes.
|
||||
for (const method of ["pushState", "replaceState"]) {
|
||||
const original = history[method].bind(history);
|
||||
history[method] = (...args) => {
|
||||
const result = original(...args);
|
||||
shown = location.pathname;
|
||||
return result;
|
||||
};
|
||||
}
|
||||
})();
|
||||
+227
-61
@@ -57,6 +57,8 @@ pub fn shell(options: LeptosOptions) -> impl IntoView {
|
||||
// Server-side, so it can read hash.txt and link the
|
||||
// content-hashed stylesheet (hash-files = true).
|
||||
<HashedStylesheet id="leptos" options=options.clone()/>
|
||||
// Before the router, so it sees a link's click first.
|
||||
<script src="/page-motion.js" defer=true></script>
|
||||
<AutoReload options=options.clone()/>
|
||||
<HydrationScripts options/>
|
||||
<MetaTags/>
|
||||
@@ -396,61 +398,9 @@ fn QuestionView(
|
||||
landing=question_id == "/"
|
||||
site=site.clone()
|
||||
current_id=question_id.clone()
|
||||
user=user.clone()
|
||||
slideshow=question.slideshow.clone()
|
||||
/>
|
||||
// Pictures across the page: the full width of the screen, each
|
||||
// as wide as its own shape at the strip's height, the caption
|
||||
// laid over its foot. Inert until the Swiper bundle upgrades
|
||||
// the elements; without it, a row that scrolls sideways.
|
||||
{question
|
||||
.slideshow
|
||||
.clone()
|
||||
.map(|show| {
|
||||
let height = format!("--slideshow-height: {}svh", show.max_height);
|
||||
view! {
|
||||
// In the page itself, so the strip works from the
|
||||
// server's HTML alone; the head's copy above covers
|
||||
// arriving here by a link within the site.
|
||||
<script src="/swiper-element-bundle.min.js" defer=true></script>
|
||||
<swiper-container
|
||||
class="slideshow"
|
||||
style=height
|
||||
slides-per-view="auto"
|
||||
space-between="6"
|
||||
grab-cursor="true"
|
||||
free-mode="true"
|
||||
mousewheel-force-to-axis="true"
|
||||
keyboard="true"
|
||||
navigation="true"
|
||||
>
|
||||
<For
|
||||
each={move || show.slides.clone().into_iter().enumerate().collect::<Vec<_>>()}
|
||||
key=|(_, slide)| slide.image.clone()
|
||||
children=|(n, slide): (usize, crate::content::Slide)| {
|
||||
let caption = slide.caption.clone();
|
||||
// The first screenful loads with the
|
||||
// page; the rest when swiped to.
|
||||
let loading = if n < 4 { "eager" } else { "lazy" };
|
||||
view! {
|
||||
<swiper-slide>
|
||||
<figure class="slide">
|
||||
<img
|
||||
src=slide.src()
|
||||
alt=slide.caption.clone()
|
||||
width=slide.width.map(|w| w.to_string())
|
||||
height=slide.height.map(|h| h.to_string())
|
||||
loading=loading
|
||||
decoding="async"
|
||||
/>
|
||||
{(!caption.trim().is_empty()).then(|| view! { <figcaption>{caption}</figcaption> })}
|
||||
</figure>
|
||||
</swiper-slide>
|
||||
}
|
||||
.into_any()
|
||||
}
|
||||
/>
|
||||
</swiper-container>
|
||||
}
|
||||
})}
|
||||
// A page that is about somewhere says where, under the
|
||||
// question: a still from this origin, and the place in words
|
||||
// for anyone who cannot see it.
|
||||
@@ -895,7 +845,15 @@ mod gesture {
|
||||
}
|
||||
|
||||
#[component]
|
||||
fn Hero(title: String, description: String, landing: bool, site: SiteConfig, current_id: String) -> impl IntoView {
|
||||
fn Hero(
|
||||
title: String,
|
||||
description: String,
|
||||
landing: bool,
|
||||
site: SiteConfig,
|
||||
current_id: String,
|
||||
#[prop(optional_no_strip)] user: Option<User>,
|
||||
#[prop(optional_no_strip)] slideshow: Option<crate::content::Slideshow>,
|
||||
) -> impl IntoView {
|
||||
// Only the landing page gets a piece - it's the one page a hero is
|
||||
// actually "the" hero for; every other page gets the plain header.
|
||||
// WHAT the piece is belongs to the content repo: site.yaml's
|
||||
@@ -994,9 +952,37 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig, cur
|
||||
)
|
||||
});
|
||||
|
||||
// Who is here, and the way in or out, at the top of every page of
|
||||
// a site that has sign-in at all.
|
||||
let session = site.sign_in.then(|| {
|
||||
let redirect = current_id.clone();
|
||||
match user {
|
||||
Some(user) => view! {
|
||||
<nav class="session">
|
||||
<span class="session-name">{user.display_name}</span>
|
||||
<a href="/auth/logout" rel="external">{move || t(&lang().get(), "sign_out")}</a>
|
||||
</nav>
|
||||
}
|
||||
.into_any(),
|
||||
None => view! {
|
||||
<nav class="session">
|
||||
<a href=format!("/auth/login?redirect={redirect}") rel="external">{move || t(&lang().get(), "sign_in")}</a>
|
||||
</nav>
|
||||
}
|
||||
.into_any(),
|
||||
}
|
||||
});
|
||||
let has_slides = slideshow.is_some();
|
||||
let mark = move || view! {
|
||||
<a class="wordmark" class:wordmark-house=house_wordmark href="/">
|
||||
<img src=wordmark.clone() alt=site_title.clone() style=wordmark_style.clone()/>
|
||||
</a>
|
||||
};
|
||||
|
||||
view! {
|
||||
<header class="hero" class:hero-module=has_module>
|
||||
<header class="hero" class:hero-module=has_module class:hero-slides=has_slides>
|
||||
<Announcements current_id=current_id/>
|
||||
{session}
|
||||
{has_module
|
||||
.then(|| {
|
||||
view! {
|
||||
@@ -1004,10 +990,13 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig, cur
|
||||
<script type="module" inner_html=early_script.unwrap_or_default()></script>
|
||||
}
|
||||
})}
|
||||
// With pictures, the wordmark is a bar of its own above
|
||||
// them and the question comes under; without, the wordmark
|
||||
// heads the copy as it always has.
|
||||
{has_slides.then(|| view! { <div class="hero-bar">{mark()}</div> })}
|
||||
{slideshow.map(|show| view! { <SlideStrip show=show/> })}
|
||||
<div class="hero-copy">
|
||||
<a class="wordmark" class:wordmark-house=house_wordmark href="/">
|
||||
<img src=wordmark alt=site_title style=wordmark_style/>
|
||||
</a>
|
||||
{(!has_slides).then(|| mark())}
|
||||
<h1>{title}</h1>
|
||||
<p inner_html=render_inline_markdown(&description)></p>
|
||||
</div>
|
||||
@@ -1015,6 +1004,59 @@ fn Hero(title: String, description: String, landing: bool, site: SiteConfig, cur
|
||||
}
|
||||
}
|
||||
|
||||
/// Pictures across the page (`slideshow`): the full width of the
|
||||
/// screen, each picture as wide as its own shape at the strip's height,
|
||||
/// the caption laid over its foot. Inert until the Swiper bundle
|
||||
/// upgrades the elements; without it, a row that scrolls sideways.
|
||||
#[component]
|
||||
fn SlideStrip(show: crate::content::Slideshow) -> impl IntoView {
|
||||
let height = format!("--slideshow-height: {}svh", show.max_height);
|
||||
view! {
|
||||
// In the page itself, so the strip works from the
|
||||
// server's HTML alone; the head's copy above covers
|
||||
// arriving here by a link within the site.
|
||||
<script src="/swiper-element-bundle.min.js" defer=true></script>
|
||||
<swiper-container
|
||||
class="slideshow"
|
||||
style=height
|
||||
slides-per-view="auto"
|
||||
space-between="6"
|
||||
grab-cursor="true"
|
||||
free-mode="true"
|
||||
mousewheel-force-to-axis="true"
|
||||
keyboard="true"
|
||||
navigation="true"
|
||||
>
|
||||
<For
|
||||
each={move || show.slides.clone().into_iter().enumerate().collect::<Vec<_>>()}
|
||||
key=|(_, slide)| slide.image.clone()
|
||||
children=|(n, slide): (usize, crate::content::Slide)| {
|
||||
let caption = slide.caption.clone();
|
||||
// The first screenful loads with the
|
||||
// page; the rest when swiped to.
|
||||
let loading = if n < 4 { "eager" } else { "lazy" };
|
||||
view! {
|
||||
<swiper-slide>
|
||||
<figure class="slide">
|
||||
<img
|
||||
src=slide.src()
|
||||
alt=slide.caption.clone()
|
||||
width=slide.width.map(|w| w.to_string())
|
||||
height=slide.height.map(|h| h.to_string())
|
||||
loading=loading
|
||||
decoding="async"
|
||||
/>
|
||||
{(!caption.trim().is_empty()).then(|| view! { <figcaption>{caption}</figcaption> })}
|
||||
</figure>
|
||||
</swiper-slide>
|
||||
}
|
||||
.into_any()
|
||||
}
|
||||
/>
|
||||
</swiper-container>
|
||||
}
|
||||
}
|
||||
|
||||
/// An alternative's banner imagery: nothing, a plain image, or - for
|
||||
/// several urls - a Swiper Element card deck. The `swiper-container`/
|
||||
/// `swiper-slide` custom elements render inert server-side and upgrade
|
||||
@@ -1360,6 +1402,7 @@ fn AlternativeCard(
|
||||
feature_name=feature_name.clone()
|
||||
transitions=spec.transitions.clone()
|
||||
link=spec.link.clone()
|
||||
bucket=spec.bucket().map(str::to_string)
|
||||
empty=spec.empty.clone()
|
||||
pending_transitions=pending_transitions
|
||||
transition_batch=transition_batch
|
||||
@@ -1813,6 +1856,7 @@ fn ResourceFeature(
|
||||
feature_name: String,
|
||||
transitions: Vec<Transition>,
|
||||
link: Option<RowLink>,
|
||||
bucket: Option<String>,
|
||||
empty: Option<String>,
|
||||
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
|
||||
transition_batch: ServerAction<TransitionAnswers>,
|
||||
@@ -1848,6 +1892,7 @@ fn ResourceFeature(
|
||||
let feature_name = feature_name.clone();
|
||||
let transitions = transitions.clone();
|
||||
let link = link.clone();
|
||||
let bucket = bucket.clone();
|
||||
let empty = empty.clone().unwrap_or_else(|| t(&lang().get(), "nothing_here_yet").to_string());
|
||||
data.get()
|
||||
.map(|res| match res {
|
||||
@@ -1857,6 +1902,7 @@ fn ResourceFeature(
|
||||
feature_name=feature_name
|
||||
transitions=transitions
|
||||
link=link
|
||||
bucket=bucket
|
||||
empty=empty
|
||||
value=value
|
||||
pending_transitions=pending_transitions
|
||||
@@ -1885,6 +1931,7 @@ fn ResourceValue(
|
||||
feature_name: String,
|
||||
transitions: Vec<Transition>,
|
||||
link: Option<RowLink>,
|
||||
bucket: Option<String>,
|
||||
empty: String,
|
||||
value: serde_json::Value,
|
||||
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
|
||||
@@ -1904,12 +1951,16 @@ fn ResourceValue(
|
||||
}
|
||||
if let Ok(answers) = serde_json::from_value::<Vec<Answer>>(value.clone()) {
|
||||
let mut answers = answers;
|
||||
// Cards are shown in the order they were put up, the way a
|
||||
// team or a gallery is read; a list of cases, newest first.
|
||||
let cards = transitions.is_empty() && answers.iter().all(|a| picture_of(a, bucket.as_deref()).is_some());
|
||||
answers.sort_by(|a, b| {
|
||||
let open = |s: &str| s != crate::answers::OPEN_STATE;
|
||||
open(&a.state).cmp(&open(&b.state)).then(b.submitted_ms.cmp(&a.submitted_ms))
|
||||
let when = if cards { a.submitted_ms.cmp(&b.submitted_ms) } else { b.submitted_ms.cmp(&a.submitted_ms) };
|
||||
open(&a.state).cmp(&open(&b.state)).then(when)
|
||||
});
|
||||
return view! {
|
||||
<div class="answer-list">
|
||||
<div class="answer-list" class:answer-cards=cards>
|
||||
<For
|
||||
each=move || answers.clone()
|
||||
key=|a| a.id.clone()
|
||||
@@ -1917,12 +1968,14 @@ fn ResourceValue(
|
||||
let feature_name = feature_name.clone();
|
||||
let transitions = transitions.clone();
|
||||
let link = link.clone();
|
||||
let bucket = bucket.clone();
|
||||
move |answer: Answer| {
|
||||
view! {
|
||||
<AnswerRow
|
||||
feature_name=feature_name.clone()
|
||||
transitions=transitions.clone()
|
||||
link=link.clone()
|
||||
bucket=bucket.clone()
|
||||
answer=answer
|
||||
pending_transitions=pending_transitions
|
||||
transition_batch=transition_batch
|
||||
@@ -2177,11 +2230,37 @@ fn SelectField(
|
||||
}
|
||||
}
|
||||
|
||||
/// The file's own name, if a field's value is an upload's key: a
|
||||
/// uuid, a dash, and the name it was sent with (`upload.rs`).
|
||||
pub fn uploaded_filename(value: &str) -> Option<&str> {
|
||||
let (id, rest) = value.split_at_checked(36)?;
|
||||
let shaped = id.char_indices().all(|(i, c)| if matches!(i, 8 | 13 | 18 | 23) { c == '-' } else { c.is_ascii_hexdigit() });
|
||||
rest.strip_prefix('-').filter(|name| shaped && !name.is_empty())
|
||||
}
|
||||
|
||||
/// Whether an uploaded file is a picture a browser shows as it is.
|
||||
pub fn is_picture(filename: &str) -> bool {
|
||||
let lower = filename.to_ascii_lowercase();
|
||||
[".jpg", ".jpeg", ".png", ".webp", ".avif", ".gif"].iter().any(|ext| lower.ends_with(ext))
|
||||
}
|
||||
|
||||
/// A record that carries a picture, in a list nobody works from, is
|
||||
/// shown rather than read: the picture, then what it says, first field
|
||||
/// as its heading. A team, a gallery of what has been built.
|
||||
fn picture_of(answer: &Answer, bucket: Option<&str>) -> Option<String> {
|
||||
let bucket = bucket?;
|
||||
answer.responses.as_object()?.iter().find_map(|(key, value)| {
|
||||
let name = uploaded_filename(value.as_str()?)?;
|
||||
is_picture(name).then(|| format!("/attachment/{bucket}/{}/{key}", answer.id))
|
||||
})
|
||||
}
|
||||
|
||||
#[component]
|
||||
fn AnswerRow(
|
||||
feature_name: String,
|
||||
transitions: Vec<Transition>,
|
||||
link: Option<RowLink>,
|
||||
bucket: Option<String>,
|
||||
answer: Answer,
|
||||
pending_transitions: RwSignal<std::collections::HashMap<(String, String), String>>,
|
||||
transition_batch: ServerAction<TransitionAnswers>,
|
||||
@@ -2204,6 +2283,11 @@ fn AnswerRow(
|
||||
} else {
|
||||
available.is_empty()
|
||||
};
|
||||
if transitions.is_empty() {
|
||||
if let Some(picture) = picture_of(&answer, bucket.as_deref()) {
|
||||
return AnswerCard(answer, picture, link).into_any();
|
||||
}
|
||||
}
|
||||
let responses = answer
|
||||
.responses
|
||||
.as_object()
|
||||
@@ -2215,6 +2299,9 @@ fn AnswerRow(
|
||||
let item_id = answer.id.clone();
|
||||
let key = (feature_name.clone(), item_id.clone());
|
||||
let link = link.map(|l| (l.href(&answer.id, &answer.responses), l.label));
|
||||
// Where a stored file on this record is fetched from: the record
|
||||
// names it, never the key (see `upload::attachment`).
|
||||
let attachment_base = bucket.map(|b| format!("/attachment/{b}/{}", answer.id));
|
||||
|
||||
view! {
|
||||
<article class="answer-row" class:decided=move || decided>
|
||||
@@ -2248,6 +2335,28 @@ fn AnswerRow(
|
||||
.into_any();
|
||||
}
|
||||
let text = value.as_str().map(str::to_string).unwrap_or_else(|| value.to_string());
|
||||
// A stored file shows as its name, and opens.
|
||||
if let (Some(base), Some(filename)) = (attachment_base.clone(), uploaded_filename(&text)) {
|
||||
let href = format!("{base}/{key}");
|
||||
if is_picture(filename) {
|
||||
return view! {
|
||||
<div class="answer-field">
|
||||
<span class="answer-field-key">{key}</span>
|
||||
<a class="answer-field-value" href=href.clone() rel="external">
|
||||
<img class="answer-thumb" src=href.clone() alt=filename.to_string() loading="lazy" />
|
||||
</a>
|
||||
</div>
|
||||
}
|
||||
.into_any();
|
||||
}
|
||||
return view! {
|
||||
<div class="answer-field">
|
||||
<span class="answer-field-key">{key}</span>
|
||||
<a class="answer-field-value answer-file" href=href rel="external">{filename.to_string()}</a>
|
||||
</div>
|
||||
}
|
||||
.into_any();
|
||||
}
|
||||
view! {
|
||||
<div class="answer-field">
|
||||
<span class="answer-field-key">{key}</span>
|
||||
@@ -2342,6 +2451,36 @@ fn AnswerRow(
|
||||
</Show>
|
||||
</article>
|
||||
}
|
||||
.into_any()
|
||||
}
|
||||
|
||||
/// A record shown as a card: its picture, its first field as the
|
||||
/// heading and the others under it, and nothing a reader has no use
|
||||
/// for - no field names, no state, no time.
|
||||
#[allow(non_snake_case)]
|
||||
fn AnswerCard(answer: Answer, picture: String, link: Option<RowLink>) -> impl IntoView {
|
||||
let link = link.map(|l| (l.href(&answer.id, &answer.responses), l.label));
|
||||
let texts: Vec<String> = answer
|
||||
.responses
|
||||
.as_object()
|
||||
.into_iter()
|
||||
.flatten()
|
||||
.filter_map(|(_, v)| v.as_str())
|
||||
.filter(|v| uploaded_filename(v).is_none() && !v.trim().is_empty())
|
||||
.map(str::to_string)
|
||||
.collect();
|
||||
let heading = texts.first().cloned().unwrap_or_default();
|
||||
let rest: Vec<String> = texts.into_iter().skip(1).collect();
|
||||
view! {
|
||||
<article class="answer-row answer-card">
|
||||
<img class="answer-picture" src=picture alt=heading.clone() loading="lazy" />
|
||||
<div class="answer-card-text">
|
||||
<h4 class="answer-card-heading">{heading}</h4>
|
||||
{rest.into_iter().map(|t| view! { <p>{t}</p> }).collect_view()}
|
||||
</div>
|
||||
{link.map(|(href, label)| view! { <a class="answer-link" href=href>{label}</a> })}
|
||||
</article>
|
||||
}
|
||||
}
|
||||
|
||||
/// Iconify names are `{prefix}:{name}`, both lowercase-alphanumeric-
|
||||
@@ -2461,6 +2600,7 @@ pub async fn get_site() -> Result<SiteConfig, ServerFnError> {
|
||||
// own configuration, and the browser has to know before it decides
|
||||
// whether to draw a map or ask for two numbers.
|
||||
site.maps = crate::maps::enabled();
|
||||
site.sign_in = state.oidc.enabled();
|
||||
Ok(site)
|
||||
}
|
||||
|
||||
@@ -2987,6 +3127,14 @@ mod responsible_tests {
|
||||
Responsible { name: "R".into(), contact: contact.into(), group: group.map(String::from) }
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_uploads_key_shows_as_the_name_it_was_sent_with() {
|
||||
assert_eq!(super::uploaded_filename("3f2b8c1e-9a4d-4e7b-8c21-0a1b2c3d4e5f-rapport 2026.pdf"), Some("rapport 2026.pdf"));
|
||||
assert_eq!(super::uploaded_filename("rapport.pdf"), None);
|
||||
assert_eq!(super::uploaded_filename("3f2b8c1e-9a4d-4e7b-8c21-0a1b2c3d4e5f-"), None);
|
||||
assert_eq!(super::uploaded_filename("Storgata 1, 1850 Mysen - se vedlegg i e-post fra oss"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn only_the_person_a_page_names_may_suggest_a_change_to_it() {
|
||||
assert!(is_responsible(Some(&user(Some("kari@vel.no"), &[])), &named("mailto:Kari@Vel.no", None)));
|
||||
@@ -3006,3 +3154,21 @@ mod responsible_tests {
|
||||
assert!(!is_responsible(None, &board));
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod picture_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn a_record_with_a_picture_is_shown_by_it() {
|
||||
assert!(is_picture("Portrett.JPG") && is_picture("a.webp") && !is_picture("rapport.pdf"));
|
||||
let answer: Answer = serde_json::from_value(serde_json::json!({
|
||||
"id": "r1", "question_id": "kontor/ansatt", "alternative": "a", "state": "open", "submitted_ms": 1,
|
||||
"responses": { "name": "Kari", "portrett": "0f8fad5b-d9cb-469f-a165-70867728950e-kari.jpg", "cv": "0f8fad5b-d9cb-469f-a165-70867728950e-cv.pdf" }
|
||||
}))
|
||||
.unwrap();
|
||||
assert_eq!(picture_of(&answer, Some("ansatte")).as_deref(), Some("/attachment/ansatte/r1/portrett"));
|
||||
// Without a bucket there is nowhere to fetch it from.
|
||||
assert_eq!(picture_of(&answer, None), None);
|
||||
}
|
||||
}
|
||||
|
||||
+6
-1
@@ -779,8 +779,13 @@ pub struct SiteConfig {
|
||||
/// the way to the browser (see `get_site`), never from content, so
|
||||
/// a `type: location` field knows whether to offer a map or two
|
||||
/// number inputs.
|
||||
#[serde(skip)]
|
||||
#[serde(default)]
|
||||
pub maps: bool,
|
||||
/// Whether this instance has sign-in at all (a provider is
|
||||
/// configured): set on the way to the browser like `maps`, so the
|
||||
/// header knows whether to offer it.
|
||||
#[serde(default)]
|
||||
pub sign_in: bool,
|
||||
/// Who this site's mail comes from. Absent means the site sends
|
||||
/// nothing: a state's `mail:` and the invite mail are logged and
|
||||
/// skipped, never half-sent (see `mail.rs`).
|
||||
|
||||
@@ -22,6 +22,7 @@ fn lookup(lang: &str, key: &str) -> Option<&'static str> {
|
||||
("en", "if_stuck") => " if you get stuck.",
|
||||
("en", "send") => "Send",
|
||||
("en", "sign_in") => "Sign in",
|
||||
("en", "sign_out") => "Sign out",
|
||||
("en", "nothing_here_yet") => "Nothing here yet.",
|
||||
("en", "nothing_here") => "Nothing here",
|
||||
("en", "back_to_start") => "back to the start",
|
||||
@@ -51,6 +52,7 @@ fn lookup(lang: &str, key: &str) -> Option<&'static str> {
|
||||
("no", "if_stuck") => " om du står fast.",
|
||||
("no", "send") => "Send",
|
||||
("no", "sign_in") => "Logg inn",
|
||||
("no", "sign_out") => "Logg ut",
|
||||
("no", "nothing_here_yet") => "Ingenting her ennå.",
|
||||
("no", "nothing_here") => "Ingenting her",
|
||||
("no", "back_to_start") => "tilbake til start",
|
||||
@@ -98,6 +100,7 @@ mod tests {
|
||||
"if_stuck",
|
||||
"send",
|
||||
"sign_in",
|
||||
"sign_out",
|
||||
"nothing_here_yet",
|
||||
"nothing_here",
|
||||
"back_to_start",
|
||||
|
||||
+11
@@ -231,6 +231,7 @@ async fn serve() -> anyhow::Result<()> {
|
||||
let maplibre_js = format!("{}/maplibre-gl.js", leptos_options.site_root);
|
||||
let maplibre_css = format!("{}/maplibre-gl.css", leptos_options.site_root);
|
||||
let fonts_dir = format!("{}/fonts", leptos_options.site_root);
|
||||
let page_motion = format!("{}/page-motion.js", leptos_options.site_root);
|
||||
|
||||
let app = Router::new()
|
||||
.route("/auth/login", get(oidc::login))
|
||||
@@ -284,6 +285,16 @@ async fn serve() -> anyhow::Result<()> {
|
||||
"/swiper-element-bundle.min.js",
|
||||
ServeFile::new(swiper_path),
|
||||
)
|
||||
// Same name every release, so revalidated like /pkg.
|
||||
.route_service(
|
||||
"/page-motion.js",
|
||||
tower::ServiceBuilder::new()
|
||||
.layer(tower_http::set_header::SetResponseHeaderLayer::overriding(
|
||||
axum::http::header::CACHE_CONTROL,
|
||||
axum::http::HeaderValue::from_static("no-cache"),
|
||||
))
|
||||
.service(ServeFile::new(page_motion)),
|
||||
)
|
||||
.route_service("/maplibre-gl.js", ServeFile::new(maplibre_js))
|
||||
.route_service("/maplibre-gl.css", ServeFile::new(maplibre_css))
|
||||
.leptos_routes_with_context(
|
||||
|
||||
+11
-4
@@ -184,6 +184,12 @@ fn name_from_search(body: &str) -> Option<String> {
|
||||
pub struct Kanidm {
|
||||
base: String,
|
||||
token: String,
|
||||
/// What this site's groups are called in a Kanidm it shares with
|
||||
/// other sites: `KANIDM_GROUP_PREFIX=klingenberg_` makes the
|
||||
/// content's `kunder` the group `klingenberg_kunder` there. The
|
||||
/// OAuth2 client's claim map takes the prefix off again, so content
|
||||
/// and policy never see it. Empty for a Kanidm of the site's own.
|
||||
group_prefix: String,
|
||||
}
|
||||
|
||||
impl Kanidm {
|
||||
@@ -192,7 +198,8 @@ impl Kanidm {
|
||||
pub fn from_env() -> Option<Self> {
|
||||
let base = std::env::var("KANIDM_URL").ok()?.trim_end_matches('/').to_string();
|
||||
let token = std::env::var("KANIDM_API_TOKEN").ok().filter(|t| !t.is_empty())?;
|
||||
Some(Kanidm { base, token })
|
||||
let group_prefix = std::env::var("KANIDM_GROUP_PREFIX").unwrap_or_default().trim().to_string();
|
||||
Some(Kanidm { base, token, group_prefix })
|
||||
}
|
||||
|
||||
async fn call(&self, method: openidconnect::reqwest::Method, path: &str, body: Option<serde_json::Value>) -> anyhow::Result<(u16, String)> {
|
||||
@@ -262,7 +269,7 @@ impl Kanidm {
|
||||
|
||||
/// Who is in a group, by account name.
|
||||
pub async fn members(&self, group: &str) -> anyhow::Result<Vec<String>> {
|
||||
let (status, text) = self.call(openidconnect::reqwest::Method::GET, &format!("/v1/group/{group}/_attr/member"), None).await?;
|
||||
let (status, text) = self.call(openidconnect::reqwest::Method::GET, &format!("/v1/group/{}{group}/_attr/member", self.group_prefix), None).await?;
|
||||
if !(200..300).contains(&status) {
|
||||
anyhow::bail!("kanidm: reading the members of {group}: http {status}: {text}");
|
||||
}
|
||||
@@ -273,7 +280,7 @@ impl Kanidm {
|
||||
/// service account manages, like adding them was.
|
||||
pub async fn remove_member(&self, group: &str, username: &str) -> anyhow::Result<()> {
|
||||
let (status, text) = self
|
||||
.call(openidconnect::reqwest::Method::DELETE, &format!("/v1/group/{group}/_attr/member"), Some(serde_json::json!([username])))
|
||||
.call(openidconnect::reqwest::Method::DELETE, &format!("/v1/group/{}{group}/_attr/member", self.group_prefix), Some(serde_json::json!([username])))
|
||||
.await?;
|
||||
if !(200..300).contains(&status) {
|
||||
anyhow::bail!("kanidm: removing {username} from {group}: http {status}: {text}");
|
||||
@@ -340,7 +347,7 @@ impl Kanidm {
|
||||
// tidying up after itself.
|
||||
already_member = !created && self.members(group).await.is_ok_and(|m| m.contains(&username));
|
||||
let (status, text) = self
|
||||
.call(openidconnect::reqwest::Method::POST, &format!("/v1/group/{group}/_attr/member"), Some(serde_json::json!([username])))
|
||||
.call(openidconnect::reqwest::Method::POST, &format!("/v1/group/{}{group}/_attr/member", self.group_prefix), Some(serde_json::json!([username])))
|
||||
.await?;
|
||||
if !(200..300).contains(&status) {
|
||||
anyhow::bail!("kanidm: adding {username} to {group}: http {status}: {text}");
|
||||
|
||||
+59
-8
@@ -39,7 +39,7 @@ pub async fn get_resource(
|
||||
.as_ref()
|
||||
.ok_or_else(|| ServerFnError::new("feature has no resource"))?;
|
||||
authorize_resource(&state, &question_id, &alternative, &feature_name).await?;
|
||||
fetch_resource_value(&state, resource, ¶ms).await
|
||||
fetch_resource_value(&state, resource, &as_the_person_asking(params).await).await
|
||||
}
|
||||
|
||||
/// The `Requirement.resource`-backed counterpart to `get_resource` -
|
||||
@@ -83,7 +83,7 @@ pub async fn get_requirement_options(
|
||||
.as_ref()
|
||||
.ok_or_else(|| ServerFnError::new("requirement has no resource"))?;
|
||||
authorize_resource(&state, &question_id, &alternative, &format!("{feature_name}|{requirement_name}")).await?;
|
||||
fetch_resource_value(&state, resource, ¶ms).await
|
||||
fetch_resource_value(&state, resource, &as_the_person_asking(params).await).await
|
||||
}
|
||||
|
||||
/// The `Requirement.bind`-backed counterpart to
|
||||
@@ -114,7 +114,7 @@ pub async fn get_requirement_binding(
|
||||
.as_ref()
|
||||
.ok_or_else(|| ServerFnError::new("requirement has no binding"))?;
|
||||
authorize_resource(&state, &question_id, &alternative, &format!("{feature_name}|{requirement_name}|bind")).await?;
|
||||
fetch_resource_value(&state, &bind.resource, ¶ms).await
|
||||
fetch_resource_value(&state, &bind.resource, &as_the_person_asking(params).await).await
|
||||
}
|
||||
|
||||
/// Scoped to the named alternative first, not flattened across all of
|
||||
@@ -211,8 +211,12 @@ fn shows_state(resource: &crate::content::ResourceSpec, value: &serde_json::Valu
|
||||
/// stamped on it. A missing field never matches: "everything that did
|
||||
/// not say" is not something a page should be able to ask for by
|
||||
/// accident.
|
||||
///
|
||||
/// `equals: "{user.email}"` is the signed-in person's own address: a
|
||||
/// list of "my cases". It is filled from the session, never from the
|
||||
/// caller, and with nobody signed in it matches nothing.
|
||||
#[cfg(feature = "ssr")]
|
||||
fn matches_filter(
|
||||
pub(crate) fn matches_filter(
|
||||
resource: &crate::content::ResourceSpec,
|
||||
value: &serde_json::Value,
|
||||
params: &std::collections::HashMap<String, String>,
|
||||
@@ -220,19 +224,54 @@ fn matches_filter(
|
||||
let Some(filter) = &resource.filter else {
|
||||
return true;
|
||||
};
|
||||
let wanted = crate::content::template_action(&filter.equals, &serde_json::json!(params))
|
||||
.unwrap_or_else(|| filter.equals.clone());
|
||||
let equals = if filter.equals.contains("{user.email}") {
|
||||
match params.get(USER_EMAIL).filter(|e| !e.is_empty()) {
|
||||
Some(email) => filter.equals.replace("{user.email}", email),
|
||||
None => return false,
|
||||
}
|
||||
} else {
|
||||
filter.equals.clone()
|
||||
};
|
||||
let wanted = crate::content::template_action(&equals, &serde_json::json!(params)).unwrap_or(equals);
|
||||
// Addresses compare without case; everything else as written.
|
||||
let same = |found: &str| if filter.equals.contains("{user.email}") { found.trim().eq_ignore_ascii_case(&wanted) } else { found == wanted };
|
||||
let found = value
|
||||
.get("responses")
|
||||
.and_then(|r| r.get(&filter.field))
|
||||
.or_else(|| value.get(&filter.field));
|
||||
match found {
|
||||
Some(serde_json::Value::String(s)) => s == &wanted,
|
||||
Some(other) => other.to_string() == wanted,
|
||||
Some(serde_json::Value::String(s)) => same(s),
|
||||
Some(other) => same(&other.to_string()),
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// The parameter a `where` reads the signed-in person's address from.
|
||||
/// Set by the server from the session; a caller's own is thrown away.
|
||||
#[cfg(feature = "ssr")]
|
||||
pub(crate) const USER_EMAIL: &str = "__user_email";
|
||||
|
||||
/// The caller's parameters with the session's person put in and
|
||||
/// anything pretending to be them taken out.
|
||||
#[cfg(feature = "ssr")]
|
||||
pub(crate) fn with_person(mut params: std::collections::HashMap<String, String>, user: Option<&crate::auth::User>) -> std::collections::HashMap<String, String> {
|
||||
params.retain(|k, _| !k.starts_with("__"));
|
||||
if let Some(email) = user.and_then(|u| u.email.as_deref()).filter(|e| !e.trim().is_empty()) {
|
||||
params.insert(USER_EMAIL.to_string(), email.trim().to_lowercase());
|
||||
}
|
||||
params
|
||||
}
|
||||
|
||||
#[cfg(feature = "ssr")]
|
||||
async fn as_the_person_asking(params: std::collections::HashMap<String, String>) -> std::collections::HashMap<String, String> {
|
||||
use crate::auth::{User, SESSION_USER_KEY};
|
||||
let user = match leptos_axum::extract::<tower_sessions::Session>().await {
|
||||
Ok(session) => session.get::<User>(SESSION_USER_KEY).await.ok().flatten(),
|
||||
Err(_) => None,
|
||||
};
|
||||
with_person(params, user.as_ref())
|
||||
}
|
||||
|
||||
#[cfg(feature = "ssr")]
|
||||
async fn fetch_resource_value(
|
||||
state: &crate::server::AppState,
|
||||
@@ -559,6 +598,18 @@ mod tests {
|
||||
assert!(!matches_filter(&children, &theirs, ¶ms));
|
||||
// A record that did not say is not everyone's child.
|
||||
assert!(!matches_filter(&children, &neither, ¶ms));
|
||||
|
||||
// "My cases": the session's address, never the caller's.
|
||||
let own = spec("source: { kind: kv, bucket: cases }\nrequires_group: customers\nwhere: { field: email, equals: \"{user.email}\" }\n");
|
||||
let hers = serde_json::json!({ "responses": { "email": "Kari@Vel.no" } });
|
||||
let his = serde_json::json!({ "responses": { "email": "ola@vel.no" } });
|
||||
let kari = crate::auth::User { sub: "s".into(), username: "kari".into(), display_name: "Kari".into(), groups: vec![], phone: None, email: Some("kari@vel.no".into()) };
|
||||
let forged: std::collections::HashMap<String, String> = [(USER_EMAIL.to_string(), "ola@vel.no".to_string())].into_iter().collect();
|
||||
let asked = with_person(forged.clone(), Some(&kari));
|
||||
assert!(matches_filter(&own, &hers, &asked) && !matches_filter(&own, &his, &asked));
|
||||
// Nobody signed in: the forged parameter is dropped, and nothing matches.
|
||||
let anonymous = with_person(forged, None);
|
||||
assert!(!matches_filter(&own, &hers, &anonymous) && !matches_filter(&own, &his, &anonymous));
|
||||
// No filter, no narrowing: every resource written before this
|
||||
// existed still lists its whole bucket.
|
||||
let plain = spec("source: { kind: kv, bucket: objections }\npublic: true\n");
|
||||
|
||||
@@ -50,6 +50,11 @@ const NONCE_KEY: &str = "oidc_nonce";
|
||||
const REDIRECT_KEY: &str = "oidc_post_login_redirect";
|
||||
|
||||
impl Oidc {
|
||||
/// Whether a provider is configured.
|
||||
pub fn enabled(&self) -> bool {
|
||||
self.inner.is_some()
|
||||
}
|
||||
|
||||
/// Sign-in disabled: what a content-only instance has, and what a
|
||||
/// test builds an `AppState` with.
|
||||
pub fn disabled() -> Self {
|
||||
|
||||
+152
-20
@@ -62,6 +62,12 @@ pub struct Plan {
|
||||
/// is what the page-load limit asks for.
|
||||
#[serde(default)]
|
||||
pub doors: Vec<Door>,
|
||||
/// Pictures across the front door, under the wordmark and above
|
||||
/// the question: portal's `slideshow` block, verbatim (`max_height`,
|
||||
/// `slides` with `image`, `caption`, `width`, `height`). What the
|
||||
/// business has made, shown before anything is asked.
|
||||
#[serde(default)]
|
||||
pub slideshow: Option<Value>,
|
||||
/// Texts the site carries word for word - bylaws, terms - each as
|
||||
/// a page of its own where every section of the text is one
|
||||
/// alternative: its heading the card's, its paragraphs the card's
|
||||
@@ -89,6 +95,13 @@ pub struct Plan {
|
||||
/// from its `wants`.
|
||||
#[serde(default)]
|
||||
pub does: Vec<Does>,
|
||||
/// What the business stands on, in its own words: values, the
|
||||
/// experience behind it. Each is a feature of the front door's
|
||||
/// "who we are" card, beside the needs that `present` - the people
|
||||
/// who work there. Nothing rewords the facts; the words model only
|
||||
/// heads them.
|
||||
#[serde(default)]
|
||||
pub values: Vec<Does>,
|
||||
/// Things a visitor may look at before asking for anything - the
|
||||
/// window shopping: a list of what has been built, releases, a
|
||||
/// live count - each a portal resource block, passed through as
|
||||
@@ -200,7 +213,7 @@ pub fn sections_of(markdown: &str) -> Vec<Section> {
|
||||
let mut heading: Option<String> = None;
|
||||
let mut paragraphs: Vec<String> = Vec::new();
|
||||
let mut current: Vec<&str> = Vec::new();
|
||||
let mut close = |heading: &mut Option<String>, paragraphs: &mut Vec<String>, out: &mut Vec<Section>| {
|
||||
let close = |heading: &mut Option<String>, paragraphs: &mut Vec<String>, out: &mut Vec<Section>| {
|
||||
if let Some(h) = heading.take() {
|
||||
if !paragraphs.is_empty() {
|
||||
out.push(Section { heading: h, text: std::mem::take(paragraphs) });
|
||||
@@ -343,6 +356,14 @@ pub struct PlanNeed {
|
||||
/// Groups that see these cases on their desk and move nothing.
|
||||
#[serde(default)]
|
||||
pub watched_by: Vec<String>,
|
||||
/// Groups whose members each see *their own* cases and nobody
|
||||
/// else's: the ones that carry the address they are signed in
|
||||
/// with. A customer follows their assignment; a member sees what
|
||||
/// they sent. The form must collect a required `email`, and the
|
||||
/// group is usually one a stage `grants`, so the person who sent
|
||||
/// the case is who ends up able to follow it.
|
||||
#[serde(default)]
|
||||
pub followed_by: Vec<String>,
|
||||
/// The event name a stage is entered by, where it must not be the
|
||||
/// builder's default (the stage's own name; `received` for the
|
||||
/// first). A live site replays its records by event name, so a
|
||||
@@ -397,6 +418,13 @@ pub struct PlanNeed {
|
||||
/// taken down; a register shows what was decided.
|
||||
#[serde(default)]
|
||||
pub public_states: Vec<String>,
|
||||
/// Its records are something the business shows, not cases it
|
||||
/// works: the people who work there, what it has built. With
|
||||
/// `watched_by: [public]`, the front door shows every one of them
|
||||
/// in the "who we are" card, and a `picture` field shows as the
|
||||
/// picture.
|
||||
#[serde(default)]
|
||||
pub presents: bool,
|
||||
pub collects: Vec<Field>,
|
||||
/// How many required fields this person will tolerate: what the
|
||||
/// business said about them, not what the form happens to ask.
|
||||
@@ -432,7 +460,7 @@ impl Field {
|
||||
/// What a public listing may show: everything but contact details
|
||||
/// and what the plan marks private.
|
||||
pub fn is_public(&self) -> bool {
|
||||
!self.private && self.kind != "email" && self.kind != "tel"
|
||||
!self.private && self.kind != "email" && self.kind != "tel" && self.kind != "file"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -474,7 +502,7 @@ impl Plan {
|
||||
}
|
||||
}
|
||||
|
||||
const FIELD_TYPES: &[&str] = &["text", "email", "tel", "textarea", "date", "select", "location"];
|
||||
const FIELD_TYPES: &[&str] = &["text", "email", "tel", "textarea", "date", "select", "location", "file", "picture"];
|
||||
|
||||
fn is_id(s: &str) -> bool {
|
||||
!s.is_empty() && s.chars().all(|c| c.is_ascii_lowercase() || c.is_ascii_digit() || c == '_' || c == '-')
|
||||
@@ -615,8 +643,11 @@ impl Plan {
|
||||
// small application and the firm's large one, and is one
|
||||
// page either way. A bucket only a role ever writes to has
|
||||
// its group's desk and nothing to publish.
|
||||
// Unless it presents: the people are entered from inside
|
||||
// precisely so that everyone can see them.
|
||||
if need.watched_by.iter().any(|g| g == PUBLIC)
|
||||
&& need.enters_as.is_some()
|
||||
&& !need.presents
|
||||
&& !self
|
||||
.needs
|
||||
.iter()
|
||||
@@ -687,6 +718,14 @@ impl Plan {
|
||||
bail!(at("a stage that grants a group makes an account for the person, so the form must collect a required `name` (text) and a required `email` (type email)"));
|
||||
}
|
||||
}
|
||||
for group in &need.followed_by {
|
||||
if !is_id(group) || group == PUBLIC || group == SUBMITTER {
|
||||
bail!(at(&format!("followed_by must name groups, not {group:?}")));
|
||||
}
|
||||
if !need.collects.iter().any(|f| f.name == "email" && f.kind == "email" && !f.optional) {
|
||||
bail!(at("followed_by shows a person the cases that carry their address, so the form must collect a required `email` of type email"));
|
||||
}
|
||||
}
|
||||
for (stage, e) in &need.escalate {
|
||||
if e.days == 0 {
|
||||
bail!(at(&format!("escalate from {stage:?} must wait at least one day")));
|
||||
@@ -709,6 +748,9 @@ impl Plan {
|
||||
bail!(at(&format!("deadline on {state:?} goes to {:?}, which is not a move the state machine has from there", d.to)));
|
||||
}
|
||||
}
|
||||
if need.presents && !need.watched_by.iter().any(|g| g == PUBLIC) {
|
||||
bail!(at("presents shows its records to everyone, and the need has no `public` in watched_by"));
|
||||
}
|
||||
if !need.public_states.is_empty() {
|
||||
if !need.watched_by.iter().any(|g| g == PUBLIC) {
|
||||
bail!(at("public_states says what the public list shows, and the need has no `public` in watched_by"));
|
||||
@@ -1091,7 +1133,7 @@ pub fn fallback_words(plan: &Plan) -> BTreeMap<String, Value> {
|
||||
};
|
||||
let mut shopping: Map<String, Value> =
|
||||
plan.shows.iter().map(|s| (s.id.clone(), json!({ "heading": humanize(&s.id), "description": s.text, "icon": "" }))).collect();
|
||||
for (bucket, needs) in public_buckets(plan) {
|
||||
for (bucket, needs) in public_buckets(plan).into_iter().filter(|(_, n)| !n.iter().any(|n| n.presents)) {
|
||||
shopping.insert(
|
||||
format!("status-{bucket}"),
|
||||
json!({
|
||||
@@ -1109,6 +1151,15 @@ pub fn fallback_words(plan: &Plan) -> BTreeMap<String, Value> {
|
||||
"question": "What brings you here?",
|
||||
"description": plan.about,
|
||||
"opener": { "heading": "What we do", "description": "", "features": does },
|
||||
"who": {
|
||||
"heading": loc(lang, "Who we are", "Hvem vi er"),
|
||||
"description": "",
|
||||
"items": plan.values.iter().map(|v| (v.id.clone(), json!({ "heading": humanize(&v.id), "description": v.text, "icon": "" })))
|
||||
.chain(public_buckets(plan).into_iter().filter(|(_, n)| n.iter().any(|n| n.presents)).map(|(bucket, _)| (format!("people-{bucket}"), json!({
|
||||
"heading": humanize(bucket), "description": "", "empty": loc(lang, "Nothing here yet.", "Ingenting her ennå."), "icon": "",
|
||||
}))))
|
||||
.collect::<Map<String, Value>>(),
|
||||
},
|
||||
// Named for what it shows, never an invitation to look.
|
||||
"shopping": { "heading": format!("{} {}", loc(lang, "Latest from", "Siste fra"), plan.business), "description": "", "items": shopping },
|
||||
// A door's feature says what is behind it, from the needs
|
||||
@@ -1184,7 +1235,9 @@ pub fn fallback_words(plan: &Plan) -> BTreeMap<String, Value> {
|
||||
// The list itself says what a row is and what the
|
||||
// buttons under it do; the card's own description says
|
||||
// what the cases are.
|
||||
let note = if moves.is_empty() {
|
||||
let note = if follows_own(needs[0], &group) {
|
||||
loc(lang, "Each row is one of your own cases and the stage it has reached.", "Hver rad er én av dine egne saker og hvor langt den har kommet.")
|
||||
} else if moves.is_empty() {
|
||||
loc(lang, "Each row is one case and the stage it has reached. Another desk moves these.", "Hver rad er én sak og hvor langt den har kommet. En annen pult flytter disse.")
|
||||
} else {
|
||||
loc(lang, "Each row is one case. The buttons record what you have just done with it.", "Hver rad er én sak. Knappene fører opp det du nettopp har gjort med den.")
|
||||
@@ -1480,7 +1533,16 @@ fn escalated_states_for(need: &PlanNeed, group: &str) -> Vec<String> {
|
||||
/// A group's desk shows a bucket when it moves something in it, is
|
||||
/// answerable for it, or watches it.
|
||||
fn on_desk(need: &PlanNeed, group: &str) -> bool {
|
||||
group != PUBLIC && (need.handled_by == group || need.watched_by.iter().any(|g| g == group) || !moves_of(need, group).is_empty())
|
||||
group != PUBLIC && (need.handled_by == group || need.watched_by.iter().any(|g| g == group) || need.followed_by.iter().any(|g| g == group) || !moves_of(need, group).is_empty())
|
||||
}
|
||||
|
||||
/// A group that has the bucket only to follow its own cases: its list
|
||||
/// is narrowed to the signed-in person's address.
|
||||
fn follows_own(need: &PlanNeed, group: &str) -> bool {
|
||||
need.followed_by.iter().any(|g| g == group)
|
||||
&& need.handled_by != group
|
||||
&& !need.watched_by.iter().any(|g| g == group)
|
||||
&& !need.moves_by.values().flatten().any(|m| m == group)
|
||||
}
|
||||
|
||||
fn groups(plan: &Plan) -> BTreeSet<String> {
|
||||
@@ -1493,6 +1555,7 @@ fn groups(plan: &Plan) -> BTreeSet<String> {
|
||||
.chain(n.watched_by.iter().filter(|g| *g != PUBLIC).cloned())
|
||||
.chain(n.moves_by.values().flatten().filter(|m| *m != SUBMITTER).cloned())
|
||||
.chain(n.escalate.values().map(|e| e.to.clone()))
|
||||
.chain(n.followed_by.iter().cloned())
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
@@ -1555,9 +1618,13 @@ const FRONT_DOOR_LATEST: usize = 3;
|
||||
/// and at most `limit` records when given. Portal filters by `states`
|
||||
/// while listing, before `jq` runs, so the limit counts shown records.
|
||||
fn public_resource(bucket: &str, needs: &[&PlanNeed], empty: &str, limit: Option<usize>, answer: &str) -> Value {
|
||||
let mut shown: BTreeSet<&str> = BTreeSet::new();
|
||||
for n in needs {
|
||||
shown.extend(n.collects.iter().filter(|f| f.is_public()).map(|f| f.name.as_str()));
|
||||
// In the order the form asks for them: the first is what a row, or
|
||||
// a card, is headed by.
|
||||
let mut shown: Vec<&str> = Vec::new();
|
||||
for f in needs.iter().flat_map(|n| n.collects.iter()).filter(|f| f.is_public()) {
|
||||
if !shown.contains(&f.name.as_str()) {
|
||||
shown.push(f.name.as_str());
|
||||
}
|
||||
}
|
||||
let take = limit.map(|n| format!(" | .[:{n}]")).unwrap_or_default();
|
||||
// One record per yielded value: portal collects what the filter
|
||||
@@ -1830,6 +1897,12 @@ fn form_alternative(plan: &Plan, need: &PlanNeed, w: &Value, action: &str) -> Va
|
||||
let parent = plan.parent_of(need);
|
||||
let mut requirements: Vec<Value> = need.collects.iter().map(|f| {
|
||||
let mut r = json!({ "name": f.name, "label": text(&w["labels"][&f.name]), "type": f.kind });
|
||||
// A picture is a file the browser can show: a phone offers its
|
||||
// camera roll and sends a JPEG, whatever it keeps them as.
|
||||
if f.kind == "picture" {
|
||||
r["type"] = json!("file");
|
||||
r["accept"] = json!("image/jpeg,image/png,image/webp");
|
||||
}
|
||||
if f.optional { r["optional"] = json!(true); }
|
||||
if f.kind == "select" { r["options"] = json!(select_options(plan, f)); }
|
||||
if f.multiple { r["multiple"] = json!(true); }
|
||||
@@ -1990,7 +2063,23 @@ pub fn render(plan: &Plan, words: &BTreeMap<String, Value>) -> anyhow::Result<BT
|
||||
.collect();
|
||||
// A public list is shown, not pointed at: its newest few records
|
||||
// inline, and a link to the whole list.
|
||||
for (bucket, needs) in public_buckets(plan) {
|
||||
// Who the business is: its values in its own words, and every
|
||||
// record of what it presents - the people - shown, not listed.
|
||||
let mut who: Vec<Value> = plan.values.iter().map(|v| card(&front["who"]["items"][&v.id])).collect();
|
||||
for (bucket, needs) in public_buckets(plan).into_iter().filter(|(_, n)| n.iter().any(|n| n.presents)) {
|
||||
let w = &front["who"]["items"][&format!("people-{bucket}")];
|
||||
let mut f = card(w);
|
||||
f["resource"] = public_resource(bucket, &needs, s(&w["empty"]), None, "");
|
||||
who.push(f);
|
||||
}
|
||||
if !who.is_empty() {
|
||||
alternatives.push(json!({
|
||||
"name": text(&front["who"]["heading"]),
|
||||
"description": text(&front["who"]["description"]),
|
||||
"features": who,
|
||||
}));
|
||||
}
|
||||
for (bucket, needs) in public_buckets(plan).into_iter().filter(|(_, n)| !n.iter().any(|n| n.presents)) {
|
||||
let w = &front["shopping"]["items"][&format!("status-{bucket}")];
|
||||
let mut f = card(w);
|
||||
let link = match s(&w["link"]).trim() { "" => s(&w["heading"]).trim().to_string(), l => l.to_string() };
|
||||
@@ -2040,10 +2129,11 @@ pub fn render(plan: &Plan, words: &BTreeMap<String, Value>) -> anyhow::Result<BT
|
||||
plan.front_door_count()
|
||||
);
|
||||
}
|
||||
files.insert(
|
||||
"questions/index.yaml".into(),
|
||||
json!({ "name": text(&front["question"]), "description": text(&front["description"]), "responsible": responsible, "alternatives": alternatives }),
|
||||
);
|
||||
let mut front_page = json!({ "name": text(&front["question"]), "description": text(&front["description"]), "responsible": responsible, "alternatives": alternatives });
|
||||
if let Some(slideshow) = &plan.slideshow {
|
||||
front_page["slideshow"] = slideshow.clone();
|
||||
}
|
||||
files.insert("questions/index.yaml".into(), front_page);
|
||||
|
||||
// A door's page: a nav page (index.yaml), public, holding the
|
||||
// forms of the needs behind it.
|
||||
@@ -2154,6 +2244,10 @@ pub fn render(plan: &Plan, words: &BTreeMap<String, Value>) -> anyhow::Result<BT
|
||||
if !escalated.is_empty() {
|
||||
resource["states"] = json!(escalated);
|
||||
}
|
||||
// A group that follows its own cases sees those alone.
|
||||
if follows_own(needs[0], &group) {
|
||||
resource["where"] = json!({ "field": "email", "equals": "{user.email}" });
|
||||
}
|
||||
alternatives.push(json!({
|
||||
"name": text(&bw["heading"]),
|
||||
"description": text(&bw["description"]),
|
||||
@@ -2370,6 +2464,8 @@ pub fn render(plan: &Plan, words: &BTreeMap<String, Value>) -> anyhow::Result<BT
|
||||
files.into_iter().map(|(path, value)| Ok((path, serde_yaml::to_string(&value)?))).collect()
|
||||
}
|
||||
|
||||
const DESK_PURPOSE: &str = "a desk: the page one role inside the business works from. Under `buckets`, each entry is a list of cases; `moves` are the buttons that move a case from one stage to the next (key `from->to`), so label each with what the person has just done. Under `links` are pages this role can open. Under `invites`, each entry is a form that invites a person into that group - they get an account and a one-time link - and `invited` is the list of invites sent, where `again` is the button that sends an invite whose link ran out once more. `suggestions`, on the desk that has it, is the list of changes the people responsible for a page have suggested: `looking`, `changed` and `declined` are its buttons.";
|
||||
|
||||
fn words_prompt(plan: &Plan, path: &str, fallback: &Value, tone: Option<&str>) -> String {
|
||||
let voice = match tone {
|
||||
Some(tone) => format!("\n\nTone of voice for every word on this page: {tone}. The site is told in more than one tone, each written in a pass of its own, so keep to this one throughout and do not hedge between tones."),
|
||||
@@ -2385,6 +2481,21 @@ fn words_prompt(plan: &Plan, path: &str, fallback: &Value, tone: Option<&str>) -
|
||||
} else {
|
||||
format!("a public page anyone can open, read-only, listing ONLY the cases that have reached: {shown_only}. Nothing else is shown - do not promise the reader anything waiting or turned down. `question` is what this page asks; `heading` names the list.")
|
||||
};
|
||||
// A desk is not always a place of work: a group that only follows
|
||||
// its own cases reads a list of what it sent in, and the words
|
||||
// should not hand it a job it does not have.
|
||||
let desk_group = path.strip_prefix("questions/").and_then(|p| p.split('/').next()).unwrap_or_default();
|
||||
let own: Vec<&str> = plan.needs.iter().filter(|n| follows_own(n, desk_group)).map(|n| n.lands_in.as_str()).collect();
|
||||
let mut desk_purpose = DESK_PURPOSE.to_string();
|
||||
if !own.is_empty() {
|
||||
desk_purpose.push_str(&format!(" On this page, the list(s) {} show the signed-in person ONLY the cases they sent in themselves: they are following their own case, not working through other people's, so head those lists as theirs ('Your cases') and say nothing of a queue.", own.iter().map(|b| format!("`{b}`")).collect::<Vec<_>>().join(", ")));
|
||||
}
|
||||
// A form a role enters from inside is sent by a colleague at work,
|
||||
// not by a visitor waiting on an answer.
|
||||
let sent_purpose = match plan.needs.iter().find(|n| n.enters_as.as_deref().is_some_and(|g| path == format!("questions/{g}/{}-sent.yaml", n.id))) {
|
||||
Some(n) => format!("a page shown right after someone in the group `{}` has sent a form from inside the business. The reader is that colleague, at work, not a visitor: nobody comes back to them. Say what has now happened to what they entered, and who it reaches.", n.enters_as.as_deref().unwrap_or_default()),
|
||||
None => "a page shown right after someone has sent a form. Say who reads it, when they answer, and what happens next.".to_string(),
|
||||
};
|
||||
let purpose = if path == "site.yaml" {
|
||||
"the invite mail: the first mail a person gets when a member of the business brings them in to help (onto a desk, into a committee), carrying the one-time link that lets them set a password. `subject` and `body` under `invite`. They did not ask for it, so say who brought them in and to what, then the link and when it runs out, then where they sign in afterwards. Plain text, short lines. Keep every `{...}` placeholder exactly as it is: `{name}`, `{username}`, `{group}`, `{link}`, `{expires}`, `{site}`, `{site_name}` are filled in by the site, and `{link}` must stay on a line of its own."
|
||||
} else if path == "aggregates.yaml" {
|
||||
@@ -2392,17 +2503,17 @@ fn words_prompt(plan: &Plan, path: &str, fallback: &Value, tone: Option<&str>) -
|
||||
} else if path.contains("/decide/") {
|
||||
"a page the person who sent a form reaches later, through a private link, to make a decision that is theirs: under `moves`, each entry is one thing they can decide."
|
||||
} else if path == "questions/index.yaml" {
|
||||
"the front door: the first page any visitor sees. `question` is the page's one question. It opens modestly: `opener` is the first card, what the business does in several features and no button at all - a stranger reads it and decides whether to trust the place, so say what is true and useful, not what to press. `shopping` is the second card: the site's live content, presented as it is - the latest records, a figure that matters, what has been built. It works best presented plainly: a heading that names what it shows ('Latest from the noticeboard', 'What we have built'), each item headed by its own content, `link` naming the full list. The content does the persuading; the card only has to label it, so it needs no invitation to look around and no word about forms. Only then come the offers: under `doors`, each entry is one alternative that leads to a page of its own for one kind of visitor, and its heading must let that visitor recognise themselves from the heading alone; under `needs`, each entry is one alternative with a form behind it."
|
||||
"the front door: the first page any visitor sees. `question` is the page's one question. It opens modestly: `opener` is the first card, what the business does in several features and no button at all - a stranger reads it and decides whether to trust the place, so say what is true and useful, not what to press. `shopping` is the second card: the site's live content, presented as it is - the latest records, a figure that matters, what has been built. It works best presented plainly: a heading that names what it shows ('Latest from the noticeboard', 'What we have built'), each item headed by its own content, `link` naming the full list. The content does the persuading; the card only has to label it, so it needs no invitation to look around and no word about forms. `who`, when there is one, is who the business is: its heading asks or names that plainly ('Who we are'), each item under it heads one of the business's own statements (values, experience) or the list of its people, and those statements are the business's facts - head them, never add to them. Only then come the offers: under `doors`, each entry is one alternative that leads to a page of its own for one kind of visitor, and its heading must let that visitor recognise themselves from the heading alone; under `needs`, each entry is one alternative with a form behind it."
|
||||
} else if path.starts_with("questions/status/") {
|
||||
status_purpose.as_str()
|
||||
} else if plan.doors.iter().any(|d| door_path(d) == path) {
|
||||
"a page one kind of visitor reaches from the front door. `question` is what this page asks them; under `needs`, each entry is one alternative they can pick, with the form behind it - or, for a need that is members' only, the card that leads to the members' page, where the form is behind sign-in: say so in its description."
|
||||
} else if path.ends_with("/index.yaml") {
|
||||
"a desk: the page one role inside the business works from. Under `buckets`, each entry is a list of cases; `moves` are the buttons that move a case from one stage to the next (key `from->to`), so label each with what the person has just done. Under `links` are pages this role can open. Under `invites`, each entry is a form that invites a person into that group - they get an account and a one-time link - and `invited` is the list of invites sent, where `again` is the button that sends an invite whose link ran out once more. `suggestions`, on the desk that has it, is the list of changes the people responsible for a page have suggested: `looking`, `changed` and `declined` are its buttons."
|
||||
desk_purpose.as_str()
|
||||
} else if path.ends_with("/[key].yaml") {
|
||||
"a page one record of a public list opens to. This is NOT where a notice is posted: the visitor has read somebody else's record on the list (a notice, an application) and is answering it. `question` asks the visitor what they have to say to it; under `forms`, each entry is one kind of answer (an objection, an appeal, an offer to lend), with the form behind it. An answer that mails the record's owner goes straight to them; nobody at a desk passes it on, so never say so."
|
||||
} else if path.contains("/received/") || path.ends_with("-sent.yaml") {
|
||||
"a page shown right after someone has sent a form. Say who reads it, when they answer, and what happens next."
|
||||
sent_purpose.as_str()
|
||||
} else {
|
||||
"a page only one role inside the business can open, holding one form."
|
||||
};
|
||||
@@ -2570,8 +2681,8 @@ mod tests {
|
||||
lands_in: "b".into(), handled_by: "g".into(),
|
||||
stages: v(stages), done_when: v(done), success: v(success), skippable: v(skippable),
|
||||
moves_by: BTreeMap::new(), watched_by: vec![],
|
||||
events: BTreeMap::new(), attended_by: None, mails: BTreeMap::new(), stages_text: BTreeMap::new(), turned_down_from: vec![], reached_from: BTreeMap::new(), requires: String::new(),
|
||||
grants: BTreeMap::new(), deadlines: BTreeMap::new(), escalate: BTreeMap::new(), public_states: vec![],
|
||||
events: BTreeMap::new(), attended_by: None, mails: BTreeMap::new(), stages_text: BTreeMap::new(), turned_down_from: vec![], reached_from: BTreeMap::new(), requires: String::new(), followed_by: vec![],
|
||||
grants: BTreeMap::new(), deadlines: BTreeMap::new(), escalate: BTreeMap::new(), public_states: vec![], presents: false,
|
||||
collects: vec![], max_fields: 3,
|
||||
}
|
||||
}
|
||||
@@ -2981,7 +3092,7 @@ mod tests {
|
||||
let resource = &view["alternatives"][0]["features"][0]["resource"];
|
||||
assert_eq!(resource["public"], true);
|
||||
assert!(resource.get("requires_group").is_none());
|
||||
assert_eq!(resource["jq"], "sort_by(.submitted_ms) | reverse | .[] | .responses |= {what: .what, where: .where}");
|
||||
assert_eq!(resource["jq"], "sort_by(.submitted_ms) | reverse | .[] | .responses |= {where: .where, what: .what}");
|
||||
assert!(view.get("qualifies").is_none());
|
||||
// The followup page points people at the list.
|
||||
let followup: Value = serde_yaml::from_str(&files["questions/received/traffic.yaml"]).unwrap();
|
||||
@@ -3385,6 +3496,27 @@ mod invite_tests {
|
||||
assert!(blank.validate().unwrap_err().to_string().contains("tones"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_group_that_follows_sees_its_own_cases_and_a_form_may_take_a_file() {
|
||||
let yaml = "business: B\ncontact: { name: I, email: i@b.example }\nmail: { from: post@b.example }\nneeds:\n - id: job\n who: an owner\n wants: a report\n lands_in: jobs\n handled_by: office\n followed_by: [customers]\n stages: [open, accepted, delivered]\n done_when: [delivered]\n grants: { accepted: customers }\n max_fields: 3\n collects:\n - { name: name }\n - { name: email, type: email }\n - { name: drawings, type: file, optional: true }\n";
|
||||
let plan: Plan = serde_yaml::from_str(yaml).unwrap();
|
||||
plan.validate().unwrap();
|
||||
let files = render(&plan, &fallback_words(&plan)).unwrap();
|
||||
let mine: Value = serde_yaml::from_str(&files["questions/customers/index.yaml"]).unwrap();
|
||||
let resource = &mine["alternatives"][0]["features"][0]["resource"];
|
||||
assert_eq!(resource["where"], json!({ "field": "email", "equals": "{user.email}" }));
|
||||
assert_eq!(resource["transitions"], json!([]));
|
||||
// The office sees everything.
|
||||
let office: Value = serde_yaml::from_str(&files["questions/office/index.yaml"]).unwrap();
|
||||
assert!(office["alternatives"][0]["features"][0]["resource"].get("where").is_none());
|
||||
// The form takes the file.
|
||||
assert!(files["questions/index.yaml"].contains("type: file"));
|
||||
// A group the case grants does not invite into itself.
|
||||
assert!(!files["questions/customers/index.yaml"].contains("invite:"));
|
||||
let no_mail: Plan = serde_yaml::from_str(&yaml.replace(" - { name: email, type: email }\n", "").replace(" grants: { accepted: customers }\n", "")).unwrap();
|
||||
assert!(no_mail.validate().unwrap_err().to_string().contains("followed_by"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_document_is_a_page_with_one_card_per_section_word_for_word() {
|
||||
let text = "# Vedtekter\n\n### av 23.04.2018\n\n##### § 1\n\nTomter vel er upolitisk. Foreningen har som\nformål å virke for stedets velferd.\n\n##### § 4.\n\nEkstraordinært årsmøte holdes når styret krever det.\n\nGjennomføringen følger samme prosedyre.\n";
|
||||
|
||||
@@ -175,9 +175,25 @@ rest. Each is one line in the plan, and the builder does the wiring:
|
||||
each brought in. Two is plenty; name them as a person would ("plain,
|
||||
like a good notice on the door"; "warm, as a neighbour would put
|
||||
it"). Leave it out to tell one story.
|
||||
- **Let a person follow their own.** `followed_by: [customers]` gives
|
||||
a group a desk that lists each member's own cases and nobody else's
|
||||
(the ones carrying the address they sign in with), and the files on
|
||||
them. With `grants` on the stage where a customer says yes, the
|
||||
person who sent the case is the one who ends up able to follow it.
|
||||
A `file` field takes drawings, photos, a report.
|
||||
- **Carry a text word for word.** `documents` puts bylaws or terms on
|
||||
a page of their own, one card per section, from a markdown file
|
||||
beside the plan. Nothing rewords them.
|
||||
- **Say who you are.** `values` are the business's own statements -
|
||||
what it stands on, the experience behind it - carried word for word
|
||||
into a "who we are" card on the front door. A need with `presents:
|
||||
true` and `watched_by: [public]` puts its records in that card, all
|
||||
of them, as cards: the people who work there, entered from inside
|
||||
(`enters_as`), each with a `picture` field that shows as their
|
||||
portrait.
|
||||
- **Show the work.** `slideshow` on the plan is portal's own block,
|
||||
carried onto the front door as written: a strip of pictures under
|
||||
the question, each with its caption.
|
||||
- **Keep the people in portal.** `people: memberships` keeps every
|
||||
group in portal itself: a desk invite is a place held until the
|
||||
person signs in, a person is their phone number first, and any
|
||||
|
||||
+11
-6
@@ -277,13 +277,15 @@ pub async fn attachment(
|
||||
// cannot be used to learn which buckets, records or fields exist.
|
||||
let missing = || (StatusCode::NOT_FOUND, "not found".to_string());
|
||||
|
||||
if !may_read_bucket(&state, &session, &bucket).await {
|
||||
return Err(missing());
|
||||
}
|
||||
|
||||
let store = state.jetstream.get_key_value(&bucket).await.map_err(|_| missing())?;
|
||||
let bytes = store.get(&record).await.map_err(|_| missing())?.ok_or_else(missing)?;
|
||||
let answer: crate::answers::Answer = serde_json::from_slice(&bytes).map_err(|_| missing())?;
|
||||
let as_listed: serde_json::Value = serde_json::from_slice(&bytes).map_err(|_| missing())?;
|
||||
// Through a list the caller may read, and one that shows this
|
||||
// record: a list of "my cases" opens my files and nobody else's.
|
||||
if !may_read_record(&state, &session, &bucket, &as_listed).await {
|
||||
return Err(missing());
|
||||
}
|
||||
let answer: crate::answers::Answer = serde_json::from_value(as_listed).map_err(|_| missing())?;
|
||||
let key = answer
|
||||
.responses
|
||||
.get(&field)
|
||||
@@ -331,20 +333,23 @@ pub async fn attachment(
|
||||
/// Whether this caller may see this bucket at all: whether any feature
|
||||
/// in the loaded content lists it and the policy lets them read that
|
||||
/// feature. The desk that shows the record is what grants the file.
|
||||
async fn may_read_bucket(
|
||||
async fn may_read_record(
|
||||
state: &AppState,
|
||||
session: &tower_sessions::Session,
|
||||
bucket: &str,
|
||||
record: &serde_json::Value,
|
||||
) -> bool {
|
||||
use crate::auth::{User, SESSION_USER_KEY};
|
||||
|
||||
let user = session.get::<User>(SESSION_USER_KEY).await.ok().flatten();
|
||||
let principal = crate::access::Principal::from_user(user.as_ref());
|
||||
let params = crate::resource::with_person(Default::default(), user.as_ref());
|
||||
let access = state.access.load();
|
||||
state.questions.load().values().any(|question| {
|
||||
question.alternatives.iter().any(|alternative| {
|
||||
alternative.features.iter().any(|feature| {
|
||||
feature.resource.as_ref().and_then(|r| r.bucket()) == Some(bucket)
|
||||
&& feature.resource.as_ref().is_some_and(|r| crate::resource::matches_filter(r, record, ¶ms))
|
||||
&& access.allows(
|
||||
&principal,
|
||||
crate::access::Action::Read,
|
||||
|
||||
+250
-11
@@ -173,6 +173,61 @@ main.not-found {
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
/* Who is here and the way in or out: top right of every page, on a
|
||||
site that has sign-in. */
|
||||
.session {
|
||||
position: absolute;
|
||||
top: 1rem;
|
||||
right: 1.5rem;
|
||||
z-index: 5;
|
||||
display: flex;
|
||||
gap: 0.9rem;
|
||||
align-items: baseline;
|
||||
font-size: 0.88rem;
|
||||
}
|
||||
|
||||
.session a {
|
||||
color: var(--ink);
|
||||
text-decoration: none;
|
||||
border-bottom: 0.06rem solid var(--line);
|
||||
}
|
||||
|
||||
.session a:hover {
|
||||
color: var(--accent);
|
||||
border-bottom-color: var(--accent);
|
||||
}
|
||||
|
||||
.session-name {
|
||||
color: var(--ink-dim);
|
||||
}
|
||||
|
||||
/* A page with pictures: the wordmark is a bar of its own, the strip
|
||||
runs the full width under it, and the question follows. */
|
||||
.hero-slides {
|
||||
max-width: none;
|
||||
padding: 0 0 2rem;
|
||||
align-items: stretch;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.hero-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 0.9rem 1.5rem;
|
||||
}
|
||||
|
||||
.hero-slides .slideshow {
|
||||
margin-bottom: 2rem;
|
||||
}
|
||||
|
||||
.hero-slides .hero-copy {
|
||||
width: 100%;
|
||||
max-width: 46rem;
|
||||
margin: 0 auto;
|
||||
padding: 0 1.5rem;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.wordmark {
|
||||
display: inline-flex;
|
||||
opacity: 0.85;
|
||||
@@ -742,7 +797,7 @@ main.not-found {
|
||||
|
||||
.feature p {
|
||||
color: var(--ink-dim);
|
||||
font-size: 0.95rem;
|
||||
font-size: 0.95em;
|
||||
}
|
||||
|
||||
.field {
|
||||
@@ -753,7 +808,7 @@ main.not-found {
|
||||
}
|
||||
|
||||
.field-label {
|
||||
font-size: 0.85rem;
|
||||
font-size: 0.85em;
|
||||
font-weight: 600;
|
||||
color: var(--ink-dim);
|
||||
}
|
||||
@@ -763,17 +818,74 @@ main.not-found {
|
||||
margin-left: 0.2em;
|
||||
}
|
||||
|
||||
/* Controls take their size from the text around them (em, not rem):
|
||||
a site that sets its body larger, or a card that sets itself
|
||||
smaller, gets fields, pills and buttons to match, and everything
|
||||
inside a control - the date picker's icon, the file picker's button
|
||||
- scales with the control. */
|
||||
input,
|
||||
textarea {
|
||||
font: inherit;
|
||||
color: var(--ink);
|
||||
background: var(--paper);
|
||||
border: 0.06rem solid var(--line);
|
||||
border-radius: 0.6rem;
|
||||
padding: 0.65rem 0.8rem;
|
||||
border-radius: 0.6em;
|
||||
padding: 0.65em 0.8em;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* The calendar icon at the size of the text it sits beside, and a
|
||||
target worth aiming at. */
|
||||
input[type="date"],
|
||||
input[type="time"],
|
||||
input[type="datetime-local"] {
|
||||
min-height: 2.9em;
|
||||
}
|
||||
|
||||
input[type="date"]::-webkit-calendar-picker-indicator,
|
||||
input[type="time"]::-webkit-calendar-picker-indicator,
|
||||
input[type="datetime-local"]::-webkit-calendar-picker-indicator {
|
||||
width: 1.35em;
|
||||
height: 1.35em;
|
||||
padding: 0.2em;
|
||||
margin-left: 0.4em;
|
||||
cursor: pointer;
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
||||
input[type="date"]::-webkit-calendar-picker-indicator:hover,
|
||||
input[type="time"]::-webkit-calendar-picker-indicator:hover,
|
||||
input[type="datetime-local"]::-webkit-calendar-picker-indicator:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
/* The file picker's own button, in the field's colours rather than
|
||||
the browser's: it follows whatever ink the field has, so it holds
|
||||
on a light field and a dark one alike. */
|
||||
input[type="file"] {
|
||||
padding: 0.45em;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
input[type="file"]::file-selector-button {
|
||||
font: inherit;
|
||||
font-size: 0.85em;
|
||||
font-weight: 600;
|
||||
color: inherit;
|
||||
background: color-mix(in srgb, currentColor 9%, transparent);
|
||||
border: 0.06rem solid color-mix(in srgb, currentColor 28%, transparent);
|
||||
border-radius: 999rem;
|
||||
padding: 0.4em 1em;
|
||||
margin-right: 0.8em;
|
||||
cursor: pointer;
|
||||
transition: border-color 120ms, background 120ms;
|
||||
}
|
||||
|
||||
input[type="file"]::file-selector-button:hover {
|
||||
background: var(--accent-soft);
|
||||
border-color: var(--accent);
|
||||
}
|
||||
|
||||
textarea {
|
||||
min-height: 5rem;
|
||||
resize: vertical;
|
||||
@@ -1034,14 +1146,14 @@ textarea:focus {
|
||||
}
|
||||
|
||||
.alt-submit {
|
||||
font-family: var(--sans);
|
||||
font-family: inherit;
|
||||
font-weight: 600;
|
||||
font-size: 0.95rem;
|
||||
font-size: 0.95em;
|
||||
color: var(--paper);
|
||||
background: var(--accent);
|
||||
border: none;
|
||||
border-radius: 0.7rem;
|
||||
padding: 0.75rem 1.4rem;
|
||||
border-radius: 0.7em;
|
||||
padding: 0.75em 1.4em;
|
||||
cursor: pointer;
|
||||
transition: filter 120ms, transform 120ms;
|
||||
/* A gateway alternative renders this as an <a> (navigation, no POST);
|
||||
@@ -1157,6 +1269,69 @@ textarea:focus {
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
/* A read-only list whose records carry a picture: shown, not read. */
|
||||
.answer-cards {
|
||||
grid-template-columns: repeat(auto-fill, minmax(min(100%, 11rem), 1fr));
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
.answer-card {
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
.answer-picture {
|
||||
display: block;
|
||||
width: 100%;
|
||||
aspect-ratio: 4 / 5;
|
||||
object-fit: cover;
|
||||
background: var(--line);
|
||||
}
|
||||
|
||||
.answer-card-text {
|
||||
padding: 0.9rem 1.1rem 1.1rem;
|
||||
display: grid;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
|
||||
.answer-card-heading {
|
||||
margin: 0;
|
||||
font-size: 1.05rem;
|
||||
}
|
||||
|
||||
.answer-card-text p {
|
||||
margin: 0;
|
||||
font-size: 0.92rem;
|
||||
color: var(--ink-dim);
|
||||
white-space: pre-line;
|
||||
}
|
||||
|
||||
.answer-card-text p:first-of-type {
|
||||
color: var(--ink);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.answer-card .answer-link {
|
||||
margin: 0 1.1rem 1.1rem;
|
||||
}
|
||||
|
||||
/* A picture on a desk's record: small, and it opens. */
|
||||
.answer-thumb {
|
||||
display: block;
|
||||
max-width: 8rem;
|
||||
max-height: 8rem;
|
||||
border-radius: 0.4rem;
|
||||
object-fit: cover;
|
||||
}
|
||||
|
||||
/* A stored file on a record: its name, and it opens. */
|
||||
.answer-file {
|
||||
color: var(--accent);
|
||||
text-decoration: none;
|
||||
border-bottom: 0.06rem solid var(--accent);
|
||||
}
|
||||
|
||||
/* The page about a listed record, when the list offers one. */
|
||||
.answer-link {
|
||||
display: inline-block;
|
||||
@@ -1247,13 +1422,13 @@ textarea:focus {
|
||||
}
|
||||
|
||||
.select-option {
|
||||
font-family: var(--sans);
|
||||
font-size: 0.85rem;
|
||||
font-family: inherit;
|
||||
font-size: 0.85em;
|
||||
color: var(--ink);
|
||||
background: var(--paper);
|
||||
border: 0.06rem solid var(--line);
|
||||
border-radius: 999rem;
|
||||
padding: 0.4rem 0.9rem;
|
||||
padding: 0.45em 1em;
|
||||
cursor: pointer;
|
||||
transition: border-color 120ms, color 120ms, background 120ms;
|
||||
}
|
||||
@@ -1401,3 +1576,67 @@ textarea:focus {
|
||||
.resource-loading {
|
||||
min-height: 1.4em;
|
||||
}
|
||||
|
||||
/* Pages move the way their addresses do (public/page-motion.js):
|
||||
deeper comes in from the right, back up from the left, a page at the
|
||||
same depth from below or above. The cards leave and arrive as
|
||||
islands of their own, one after another. Transforms and opacity
|
||||
only. */
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
:root {
|
||||
--pm-duration: 340ms;
|
||||
--pm-ease: cubic-bezier(0.22, 0.8, 0.24, 1);
|
||||
--pm-step: 45ms;
|
||||
}
|
||||
|
||||
::view-transition-old(*),
|
||||
::view-transition-new(*) {
|
||||
animation-duration: var(--pm-duration);
|
||||
animation-timing-function: var(--pm-ease);
|
||||
animation-fill-mode: both;
|
||||
}
|
||||
|
||||
/* A named card has only an old or only a new picture; its group must
|
||||
not also morph. */
|
||||
::view-transition-group(*) {
|
||||
animation-duration: var(--pm-duration);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@keyframes pm-out-left { to { transform: translateX(-18%); opacity: 0; } }
|
||||
@keyframes pm-out-right { to { transform: translateX(18%); opacity: 0; } }
|
||||
@keyframes pm-out-up { to { transform: translateY(-10%); opacity: 0; } }
|
||||
@keyframes pm-out-down { to { transform: translateY(10%); opacity: 0; } }
|
||||
@keyframes pm-in-right { from { transform: translateX(18%); opacity: 0; } }
|
||||
@keyframes pm-in-left { from { transform: translateX(-18%); opacity: 0; } }
|
||||
@keyframes pm-in-below { from { transform: translateY(10%); opacity: 0; } }
|
||||
@keyframes pm-in-above { from { transform: translateY(-10%); opacity: 0; } }
|
||||
|
||||
/* The cards, one step apart: out first, in after the page has begun. */
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
:root[data-motion="forward"]::view-transition-old(*) { animation-name: pm-out-left; }
|
||||
:root[data-motion="forward"]::view-transition-new(*) { animation-name: pm-in-right; }
|
||||
:root[data-motion="back"]::view-transition-old(*) { animation-name: pm-out-right; }
|
||||
:root[data-motion="back"]::view-transition-new(*) { animation-name: pm-in-left; }
|
||||
:root[data-motion="down"]::view-transition-old(*) { animation-name: pm-out-up; }
|
||||
:root[data-motion="down"]::view-transition-new(*) { animation-name: pm-in-below; }
|
||||
:root[data-motion="up"]::view-transition-old(*) { animation-name: pm-out-down; }
|
||||
:root[data-motion="up"]::view-transition-new(*) { animation-name: pm-in-above; }
|
||||
::view-transition-old(pm-out-1) { animation-delay: calc(0 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-1) { animation-delay: calc(90ms + 0 * var(--pm-step)); }
|
||||
::view-transition-old(pm-out-2) { animation-delay: calc(1 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-2) { animation-delay: calc(90ms + 1 * var(--pm-step)); }
|
||||
::view-transition-old(pm-out-3) { animation-delay: calc(2 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-3) { animation-delay: calc(90ms + 2 * var(--pm-step)); }
|
||||
::view-transition-old(pm-out-4) { animation-delay: calc(3 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-4) { animation-delay: calc(90ms + 3 * var(--pm-step)); }
|
||||
::view-transition-old(pm-out-5) { animation-delay: calc(4 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-5) { animation-delay: calc(90ms + 4 * var(--pm-step)); }
|
||||
::view-transition-old(pm-out-6) { animation-delay: calc(5 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-6) { animation-delay: calc(90ms + 5 * var(--pm-step)); }
|
||||
::view-transition-old(pm-out-7) { animation-delay: calc(6 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-7) { animation-delay: calc(90ms + 6 * var(--pm-step)); }
|
||||
::view-transition-old(pm-out-8) { animation-delay: calc(7 * var(--pm-step)); }
|
||||
::view-transition-new(pm-in-8) { animation-delay: calc(90ms + 7 * var(--pm-step)); }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user