- During import from the legacy database the following members could not - be imported because the email address is already used by another member. -
- ${renderFailedLinkings(viewModel.failedImports)} - `, - pageTemplate(safe('Failed member imports'), viewModel.user) - ); +export const render = (viewModel: ViewModel) => html` ++ During import from the legacy database the following members could not be + imported because the email address is already used by another member. +
+ ${renderFailedLinkings(viewModel.failedImports)} +`; diff --git a/src/queries/log/index.ts b/src/queries/log/index.ts index 47b7b32..6234aa0 100644 --- a/src/queries/log/index.ts +++ b/src/queries/log/index.ts @@ -3,12 +3,12 @@ import * as TE from 'fp-ts/TaskEither'; import {render} from './render'; import {constructViewModel} from './construct-view-model'; import {Query} from '../query'; -import {HttpResponse} from '../../types'; +import {safe, toLoggedInContent} from '../../types/html'; export const log: Query = deps => user => pipe( user, constructViewModel(deps), TE.map(render), - TE.map(HttpResponse.CompleteHtmlPage) + TE.map(toLoggedInContent(safe('Event Log'))) ); diff --git a/src/queries/log/render.ts b/src/queries/log/render.ts index dc1ce10..759dff5 100644 --- a/src/queries/log/render.ts +++ b/src/queries/log/render.ts @@ -1,11 +1,10 @@ import {pipe} from 'fp-ts/lib/function'; import * as RA from 'fp-ts/ReadonlyArray'; -import {html, joinHtml, safe, sanitizeString} from '../../types/html'; +import {html, joinHtml, sanitizeString} from '../../types/html'; import {ViewModel} from './view-model'; import {DomainEvent} from '../../types'; import {inspect} from 'node:util'; import {displayDate} from '../../templates/display-date'; -import {pageTemplate} from '../../templates'; import {DateTime} from 'luxon'; import {renderActor} from '../../types/actor'; @@ -41,12 +40,8 @@ const renderLog = (log: ViewModel['events']) => ` ); -export const render = (viewModel: ViewModel) => - pipe( - html` -Most recent at top
- ${renderLog(viewModel.events)} - `, - pageTemplate(safe('Event Log'), viewModel.user) - ); +export const render = (viewModel: ViewModel) => html` +Most recent at top
+ ${renderLog(viewModel.events)} +`; diff --git a/src/queries/member/index.ts b/src/queries/member/index.ts index 342b130..0f3ebcf 100644 --- a/src/queries/member/index.ts +++ b/src/queries/member/index.ts @@ -9,7 +9,7 @@ import {failureWithStatus} from '../../types/failure-with-status'; import {StatusCodes} from 'http-status-codes'; import {formatValidationErrors} from 'io-ts-reporters'; import * as tt from 'io-ts-types'; -import {HttpResponse} from '../../types'; +import {safe, toLoggedInContent} from '../../types/html'; const invalidParams = flow( formatValidationErrors, @@ -25,6 +25,6 @@ export const member: Query = deps => (user, params) => E.map(constructViewModel(deps, user)), E.flatten, E.map(viewModel => render(viewModel)), - E.map(HttpResponse.CompleteHtmlPage), + E.map(toLoggedInContent(safe('Member'))), TE.fromEither ); diff --git a/src/queries/member/render.ts b/src/queries/member/render.ts index c792f02..21ac637 100644 --- a/src/queries/member/render.ts +++ b/src/queries/member/render.ts @@ -1,14 +1,6 @@ -import {pipe} from 'fp-ts/lib/function'; import {getGravatarProfile, getGravatarThumbnail} from '../../templates/avatar'; -import { - Html, - html, - sanitizeOption, - safe, - sanitizeString, -} from '../../types/html'; +import {Html, html, sanitizeOption, sanitizeString} from '../../types/html'; import {ViewModel} from './view-model'; -import {pageTemplate} from '../../templates'; import {renderMemberNumber} from '../../templates/member-number'; import {renderOwnerAgreementStatus} from '../shared-render/owner-agreement'; import {renderOwnerStatus} from '../shared-render/owner-status'; @@ -33,78 +25,74 @@ const editAvatar = () => const ifSelf = (viewModel: ViewModel, fragment: Html) => viewModel.isSelf ? fragment : ''; -export const render = (viewModel: ViewModel) => - pipe( - html` - ${ifSelf(viewModel, ownPageBanner)} -| Member number | -${renderMemberNumber(viewModel.member.memberNumber)} | -|||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| ${sanitizeString(viewModel.member.emailAddress)} | -||||||||||||||||||||||||||
| Name | +export const render = (viewModel: ViewModel) => html` + ${ifSelf(viewModel, ownPageBanner)} +
| Member number | +${renderMemberNumber(viewModel.member.memberNumber)} | +
|---|---|
| ${sanitizeString(viewModel.member.emailAddress)} | +|
| Name | ++ ${sanitizeOption(viewModel.member.name)} + ${ifSelf(viewModel, editName(viewModel))} + | +
| Pronouns | ++ ${sanitizeOption(viewModel.member.pronouns)} + ${ifSelf(viewModel, editPronouns(viewModel))} + | +
| Avatar | ++ ${getGravatarThumbnail( + viewModel.member.gravatarHash, + viewModel.member.memberNumber + )} + ${ifSelf(viewModel, editAvatar())} + | +
| Owner of | +${renderOwnerStatus(viewModel.member.ownerOf, true)} | +
| Owner agreement | - ${sanitizeOption(viewModel.member.name)} - ${ifSelf(viewModel, editName(viewModel))} - | -
| Pronouns | -- ${sanitizeOption(viewModel.member.pronouns)} - ${ifSelf(viewModel, editPronouns(viewModel))} - | -
| Avatar | -- ${getGravatarThumbnail( - viewModel.member.gravatarHash, - viewModel.member.memberNumber + ${renderOwnerAgreementStatus( + viewModel.member.agreementSigned, + true )} - ${ifSelf(viewModel, editAvatar())} | -
| Owner of | -${renderOwnerStatus(viewModel.member.ownerOf, true)} | -
| Owner agreement | -- ${renderOwnerAgreementStatus( - viewModel.member.agreementSigned, - true - )} - | -
| Trainer for | -${renderTrainerStatus(viewModel.member.trainerFor)} | -
| Trained on | -${renderTrainingStatus(viewModel.member.trainedOn, true)} | -