Compare commits
15 Commits
dev
..
59c6b19ad6
| Author | SHA1 | Date | |
|---|---|---|---|
| 59c6b19ad6 | |||
| aa1a4cf6ff | |||
| 5f0fad3cbb | |||
| 545fae59b2 | |||
| d748d2db21 | |||
| 095c91e56d | |||
| f2017068d5 | |||
| c9702495a3 | |||
| e965cb55ef | |||
| 505a9b8496 | |||
| c6dc5b22b8 | |||
| f16e88e2f0 | |||
| 016bc187d4 | |||
| 104f01f75d | |||
| 568aee3e70 |
@@ -14,7 +14,6 @@ PHOTO_DELIVERY_MODE=proxy
|
|||||||
FRONTEND_URL=http://localhost:3000
|
FRONTEND_URL=http://localhost:3000
|
||||||
BACKEND_URL=http://localhost:5000
|
BACKEND_URL=http://localhost:5000
|
||||||
VITE_API_BASE_URL=http://localhost:5000/api
|
VITE_API_BASE_URL=http://localhost:5000/api
|
||||||
MAPBOX_ACCESS_TOKEN=
|
|
||||||
NODE_ENV=development
|
NODE_ENV=development
|
||||||
TRUST_PROXY=
|
TRUST_PROXY=
|
||||||
ADMIN_EMAILS=corey@blaishome.online
|
ADMIN_EMAILS=corey@blaishome.online
|
||||||
|
|||||||
@@ -3,13 +3,14 @@ name: Deploy
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
|
- main
|
||||||
- dev
|
- dev
|
||||||
- develop
|
- develop
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy-dev:
|
deploy-dev:
|
||||||
if: ${{ github.event_name == 'push' }}
|
if: ${{ github.event_name == 'push' && (github.ref_name == 'dev' || github.ref_name == 'develop') }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
volumes:
|
volumes:
|
||||||
@@ -48,7 +49,7 @@ jobs:
|
|||||||
docker compose -f docker-compose.dev.yaml up -d --build
|
docker compose -f docker-compose.dev.yaml up -d --build
|
||||||
|
|
||||||
deploy-prod:
|
deploy-prod:
|
||||||
if: ${{ github.event_name == 'workflow_dispatch' }}
|
if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref_name == 'main') }}
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -86,7 +86,6 @@ curl -H "Authorization: Bearer <admin-token>" https://your-host/api/metrics
|
|||||||
- `FRONTEND_URL`
|
- `FRONTEND_URL`
|
||||||
- `BACKEND_URL`
|
- `BACKEND_URL`
|
||||||
- `VITE_API_BASE_URL`
|
- `VITE_API_BASE_URL`
|
||||||
- `MAPBOX_ACCESS_TOKEN`
|
|
||||||
- `REDIS_URL`
|
- `REDIS_URL`
|
||||||
- `IMAGE_STORAGE_PROVIDER`
|
- `IMAGE_STORAGE_PROVIDER`
|
||||||
- `S3_ENDPOINT`
|
- `S3_ENDPOINT`
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 234 KiB |
Generated
+1
-1049
File diff suppressed because it is too large
Load Diff
@@ -23,10 +23,7 @@
|
|||||||
"helmet": "8.1.0",
|
"helmet": "8.1.0",
|
||||||
"morgan": "1.10.0",
|
"morgan": "1.10.0",
|
||||||
"nodemailer": "^8.0.5",
|
"nodemailer": "^8.0.5",
|
||||||
"pdfkit": "^0.18.0",
|
|
||||||
"pg": "8.13.1",
|
"pg": "8.13.1",
|
||||||
"qrcode": "^1.5.4",
|
|
||||||
"sharp": "^0.34.5",
|
|
||||||
"stripe": "^22.0.2",
|
"stripe": "^22.0.2",
|
||||||
"zod": "3.24.1"
|
"zod": "3.24.1"
|
||||||
},
|
},
|
||||||
@@ -35,9 +32,7 @@
|
|||||||
"@types/express": "4.17.21",
|
"@types/express": "4.17.21",
|
||||||
"@types/morgan": "1.9.9",
|
"@types/morgan": "1.9.9",
|
||||||
"@types/node": "22.10.2",
|
"@types/node": "22.10.2",
|
||||||
"@types/pdfkit": "^0.17.6",
|
|
||||||
"@types/pg": "8.11.10",
|
"@types/pg": "8.11.10",
|
||||||
"@types/qrcode": "^1.5.6",
|
|
||||||
"tsx": "4.19.2",
|
"tsx": "4.19.2",
|
||||||
"typescript": "5.7.2"
|
"typescript": "5.7.2"
|
||||||
}
|
}
|
||||||
|
|||||||
+51
-1065
File diff suppressed because it is too large
Load Diff
@@ -30,9 +30,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
ALTER TABLE workspaces
|
ALTER TABLE workspaces
|
||||||
DROP CONSTRAINT IF EXISTS workspaces_id_check;
|
DROP CONSTRAINT IF EXISTS workspaces_id_check;
|
||||||
|
|
||||||
ALTER TABLE users
|
|
||||||
ADD COLUMN IF NOT EXISTS education_opt_out BOOLEAN NOT NULL DEFAULT FALSE;
|
|
||||||
|
|
||||||
ALTER TABLE workspaces
|
ALTER TABLE workspaces
|
||||||
ADD COLUMN IF NOT EXISTS billing_email VARCHAR(255),
|
ADD COLUMN IF NOT EXISTS billing_email VARCHAR(255),
|
||||||
ADD COLUMN IF NOT EXISTS billing_plan VARCHAR(32) NOT NULL DEFAULT 'household_basic',
|
ADD COLUMN IF NOT EXISTS billing_plan VARCHAR(32) NOT NULL DEFAULT 'household_basic',
|
||||||
@@ -142,37 +139,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
CREATE INDEX IF NOT EXISTS idx_auth_sessions_created_user
|
CREATE INDEX IF NOT EXISTS idx_auth_sessions_created_user
|
||||||
ON auth_sessions (created_at DESC, user_id);
|
ON auth_sessions (created_at DESC, user_id);
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS daily_education (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
publish_date DATE NOT NULL UNIQUE,
|
|
||||||
fact TEXT NOT NULL,
|
|
||||||
quiz_questions JSONB NOT NULL DEFAULT '[]'::jsonb,
|
|
||||||
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER TABLE daily_education
|
|
||||||
ALTER COLUMN quiz_questions SET DEFAULT '[]'::jsonb;
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_daily_education_publish_date
|
|
||||||
ON daily_education (publish_date DESC);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS education_question_bank (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
prompt VARCHAR(500) NOT NULL,
|
|
||||||
options JSONB NOT NULL,
|
|
||||||
correct_answer_index INTEGER NOT NULL,
|
|
||||||
explanation VARCHAR(800),
|
|
||||||
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
CHECK (correct_answer_index >= 0 AND correct_answer_index <= 3)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_education_question_bank_created
|
|
||||||
ON education_question_bank (created_at DESC);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS integration_tokens (
|
CREATE TABLE IF NOT EXISTS integration_tokens (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||||
@@ -249,8 +215,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
motivators VARCHAR(1000),
|
motivators VARCHAR(1000),
|
||||||
demotivators VARCHAR(1000),
|
demotivators VARCHAR(1000),
|
||||||
favorite_snack VARCHAR(160),
|
favorite_snack VARCHAR(160),
|
||||||
location_label VARCHAR(160),
|
|
||||||
location_details JSONB,
|
|
||||||
vet_clinic_name VARCHAR(160),
|
vet_clinic_name VARCHAR(160),
|
||||||
vet_clinic_address VARCHAR(500),
|
vet_clinic_address VARCHAR(500),
|
||||||
vet_account_number VARCHAR(120),
|
vet_account_number VARCHAR(120),
|
||||||
@@ -279,8 +243,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
ADD COLUMN IF NOT EXISTS motivators VARCHAR(1000),
|
ADD COLUMN IF NOT EXISTS motivators VARCHAR(1000),
|
||||||
ADD COLUMN IF NOT EXISTS demotivators VARCHAR(1000),
|
ADD COLUMN IF NOT EXISTS demotivators VARCHAR(1000),
|
||||||
ADD COLUMN IF NOT EXISTS favorite_snack VARCHAR(160),
|
ADD COLUMN IF NOT EXISTS favorite_snack VARCHAR(160),
|
||||||
ADD COLUMN IF NOT EXISTS location_label VARCHAR(160),
|
|
||||||
ADD COLUMN IF NOT EXISTS location_details JSONB,
|
|
||||||
ADD COLUMN IF NOT EXISTS vet_clinic_name VARCHAR(160),
|
ADD COLUMN IF NOT EXISTS vet_clinic_name VARCHAR(160),
|
||||||
ADD COLUMN IF NOT EXISTS vet_clinic_address VARCHAR(500),
|
ADD COLUMN IF NOT EXISTS vet_clinic_address VARCHAR(500),
|
||||||
ADD COLUMN IF NOT EXISTS vet_account_number VARCHAR(120),
|
ADD COLUMN IF NOT EXISTS vet_account_number VARCHAR(120),
|
||||||
@@ -406,32 +368,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
WHERE completed_at IS NULL
|
WHERE completed_at IS NULL
|
||||||
AND revoked_at IS NULL;
|
AND revoked_at IS NULL;
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS bird_timeline_events (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
|
|
||||||
event_type VARCHAR(40) NOT NULL,
|
|
||||||
from_workspace_id INTEGER REFERENCES workspaces(id) ON DELETE SET NULL,
|
|
||||||
to_workspace_id INTEGER REFERENCES workspaces(id) ON DELETE SET NULL,
|
|
||||||
from_workspace_name VARCHAR(160),
|
|
||||||
to_workspace_name VARCHAR(160),
|
|
||||||
from_owner_email VARCHAR(255),
|
|
||||||
to_owner_email VARCHAR(255),
|
|
||||||
location_label VARCHAR(160),
|
|
||||||
location_details JSONB,
|
|
||||||
note TEXT,
|
|
||||||
event_date DATE NOT NULL DEFAULT CURRENT_DATE,
|
|
||||||
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER TABLE bird_timeline_events
|
|
||||||
ADD COLUMN IF NOT EXISTS note TEXT,
|
|
||||||
ADD COLUMN IF NOT EXISTS location_details JSONB,
|
|
||||||
ADD COLUMN IF NOT EXISTS event_date DATE NOT NULL DEFAULT CURRENT_DATE;
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_bird_timeline_events_bird_created
|
|
||||||
ON bird_timeline_events (bird_id, event_date DESC, created_at DESC);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS flock_notes (
|
CREATE TABLE IF NOT EXISTS flock_notes (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
|
workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
|
||||||
@@ -501,7 +437,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
start_date DATE NOT NULL,
|
start_date DATE NOT NULL,
|
||||||
end_date DATE,
|
end_date DATE,
|
||||||
notes VARCHAR(1000),
|
notes VARCHAR(1000),
|
||||||
reminders_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
|
||||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
CHECK (end_date IS NULL OR end_date >= start_date)
|
CHECK (end_date IS NULL OR end_date >= start_date)
|
||||||
);
|
);
|
||||||
@@ -509,9 +444,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
ALTER TABLE medications
|
ALTER TABLE medications
|
||||||
ADD COLUMN IF NOT EXISTS dose_schedule JSONB NOT NULL DEFAULT '[{"key":"dose-1","label":"Dose","time":""}]'::jsonb;
|
ADD COLUMN IF NOT EXISTS dose_schedule JSONB NOT NULL DEFAULT '[{"key":"dose-1","label":"Dose","time":""}]'::jsonb;
|
||||||
|
|
||||||
ALTER TABLE medications
|
|
||||||
ADD COLUMN IF NOT EXISTS reminders_enabled BOOLEAN NOT NULL DEFAULT FALSE;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS bird_milestone_reminder_deliveries (
|
CREATE TABLE IF NOT EXISTS bird_milestone_reminder_deliveries (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
|
bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
|
||||||
@@ -545,17 +477,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
ALTER TABLE medication_administrations
|
ALTER TABLE medication_administrations
|
||||||
ADD COLUMN IF NOT EXISTS administration_slot VARCHAR(80) NOT NULL DEFAULT 'dose-1';
|
ADD COLUMN IF NOT EXISTS administration_slot VARCHAR(80) NOT NULL DEFAULT 'dose-1';
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS medication_reminder_deliveries (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
medication_id UUID NOT NULL REFERENCES medications(id) ON DELETE CASCADE,
|
|
||||||
bird_id UUID NOT NULL REFERENCES birds(id) ON DELETE CASCADE,
|
|
||||||
workspace_id INTEGER NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
|
|
||||||
scheduled_on DATE NOT NULL,
|
|
||||||
administration_slot VARCHAR(80) NOT NULL,
|
|
||||||
delivered_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
UNIQUE (medication_id, scheduled_on, administration_slot)
|
|
||||||
);
|
|
||||||
|
|
||||||
ALTER TABLE medication_administrations
|
ALTER TABLE medication_administrations
|
||||||
DROP CONSTRAINT IF EXISTS medication_administrations_medication_id_administered_on_key;
|
DROP CONSTRAINT IF EXISTS medication_administrations_medication_id_administered_on_key;
|
||||||
|
|
||||||
@@ -574,9 +495,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
|||||||
CREATE INDEX IF NOT EXISTS idx_bird_milestone_reminder_deliveries_workspace
|
CREATE INDEX IF NOT EXISTS idx_bird_milestone_reminder_deliveries_workspace
|
||||||
ON bird_milestone_reminder_deliveries (workspace_id, delivered_on DESC);
|
ON bird_milestone_reminder_deliveries (workspace_id, delivered_on DESC);
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_medication_reminder_deliveries_workspace
|
|
||||||
ON medication_reminder_deliveries (workspace_id, scheduled_on DESC);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_medication_administrations_bird_administered_on
|
CREATE INDEX IF NOT EXISTS idx_medication_administrations_bird_administered_on
|
||||||
ON medication_administrations (bird_id, administered_on DESC);
|
ON medication_administrations (bird_id, administered_on DESC);
|
||||||
|
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
import { Queue, QueueEvents, type Job } from 'bullmq';
|
|
||||||
|
|
||||||
import { redisConnection } from './redisConnection.js';
|
|
||||||
|
|
||||||
export type AdoptionReportJobData = {
|
|
||||||
birdId: string;
|
|
||||||
workspaceId: number;
|
|
||||||
transferCode: string;
|
|
||||||
printFriendly: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type AdoptionReportJobResult = {
|
|
||||||
pdfBase64: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const adoptionReportQueueName = 'adoption-reports';
|
|
||||||
|
|
||||||
export const adoptionReportQueue = new Queue<AdoptionReportJobData, AdoptionReportJobResult>(adoptionReportQueueName, {
|
|
||||||
connection: redisConnection,
|
|
||||||
defaultJobOptions: {
|
|
||||||
attempts: 2,
|
|
||||||
backoff: {
|
|
||||||
type: 'exponential',
|
|
||||||
delay: 10_000,
|
|
||||||
},
|
|
||||||
removeOnComplete: 50,
|
|
||||||
removeOnFail: 500,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export const adoptionReportQueueEvents = new QueueEvents(adoptionReportQueueName, {
|
|
||||||
connection: redisConnection,
|
|
||||||
});
|
|
||||||
|
|
||||||
export const enqueueAdoptionReportJob = (
|
|
||||||
data: AdoptionReportJobData,
|
|
||||||
): Promise<Job<AdoptionReportJobData, AdoptionReportJobResult>> => adoptionReportQueue.add('render-adoption-report', data);
|
|
||||||
|
|
||||||
export const closeAdoptionReportQueue = async () => {
|
|
||||||
await adoptionReportQueue.close();
|
|
||||||
await adoptionReportQueueEvents.close();
|
|
||||||
};
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
import { Queue, type Job } from 'bullmq';
|
|
||||||
|
|
||||||
import { redisConnection } from './redisConnection.js';
|
|
||||||
|
|
||||||
export type MedicationReminderJobData = {
|
|
||||||
runDate: string;
|
|
||||||
currentTime: string;
|
|
||||||
requestedBy: 'scheduler';
|
|
||||||
};
|
|
||||||
|
|
||||||
export type MedicationReminderJobResult = {
|
|
||||||
runDate: string;
|
|
||||||
currentTime: string;
|
|
||||||
checked: number;
|
|
||||||
sent: number;
|
|
||||||
skipped: number;
|
|
||||||
failed: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const medicationReminderQueueName = 'medication-reminders';
|
|
||||||
|
|
||||||
export const medicationReminderQueue = new Queue<MedicationReminderJobData, MedicationReminderJobResult>(medicationReminderQueueName, {
|
|
||||||
connection: redisConnection,
|
|
||||||
defaultJobOptions: {
|
|
||||||
attempts: 3,
|
|
||||||
backoff: {
|
|
||||||
type: 'exponential',
|
|
||||||
delay: 60_000,
|
|
||||||
},
|
|
||||||
removeOnComplete: 100,
|
|
||||||
removeOnFail: 1_000,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
export const enqueueMedicationReminderJob = (
|
|
||||||
runDate: string,
|
|
||||||
currentTime: string,
|
|
||||||
): Promise<Job<MedicationReminderJobData, MedicationReminderJobResult>> =>
|
|
||||||
medicationReminderQueue.add(
|
|
||||||
'run-medication-reminders',
|
|
||||||
{
|
|
||||||
runDate,
|
|
||||||
currentTime,
|
|
||||||
requestedBy: 'scheduler',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
jobId: `medication-reminders-${runDate}-${currentTime.slice(0, 2)}`,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
export const closeMedicationReminderQueue = async () => {
|
|
||||||
await medicationReminderQueue.close();
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getMedicationReminderQueueCounts = () => medicationReminderQueue.getJobCounts('waiting', 'active', 'delayed', 'completed', 'failed');
|
|
||||||
@@ -1,422 +0,0 @@
|
|||||||
import fs from 'fs';
|
|
||||||
import PDFDocument from 'pdfkit';
|
|
||||||
import QRCode from 'qrcode';
|
|
||||||
|
|
||||||
import type { BirdRow, FlockNoteRow, VetVisitRow, WeightRow } from '../types.js';
|
|
||||||
|
|
||||||
type AdoptionReportInput = {
|
|
||||||
bird: BirdRow;
|
|
||||||
weights: WeightRow[];
|
|
||||||
vetVisits: VetVisitRow[];
|
|
||||||
notes: FlockNoteRow[];
|
|
||||||
transferCode: string;
|
|
||||||
birdPhotoBuffer?: Buffer | null;
|
|
||||||
assets: {
|
|
||||||
logoPath: string;
|
|
||||||
wordmarkPath: string;
|
|
||||||
defaultBirdPhotoPath: string;
|
|
||||||
};
|
|
||||||
printFriendly?: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
const page = { width: 612, height: 792, margin: 42 };
|
|
||||||
|
|
||||||
const colors = {
|
|
||||||
ink: '#1f2a2a',
|
|
||||||
muted: '#5d5f59',
|
|
||||||
red: '#cb3a35',
|
|
||||||
green: '#238a5a',
|
|
||||||
blue: '#2769b3',
|
|
||||||
border: '#cfe0d5',
|
|
||||||
panel: '#fbf7ee',
|
|
||||||
paper: '#fffdf9',
|
|
||||||
};
|
|
||||||
|
|
||||||
const formatDate = (value: string | null) => {
|
|
||||||
if (!value) {
|
|
||||||
return 'Not recorded';
|
|
||||||
}
|
|
||||||
return new Intl.DateTimeFormat('en-US', { month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' }).format(
|
|
||||||
new Date(`${value.slice(0, 10)}T00:00:00Z`),
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const formatDateTime = (value: string | null) => {
|
|
||||||
if (!value) {
|
|
||||||
return 'Not recorded';
|
|
||||||
}
|
|
||||||
return new Intl.DateTimeFormat('en-US', { month: 'short', day: 'numeric', year: 'numeric' }).format(new Date(value));
|
|
||||||
};
|
|
||||||
|
|
||||||
const formatShortDate = (value: string | null) => {
|
|
||||||
if (!value) {
|
|
||||||
return 'No data yet';
|
|
||||||
}
|
|
||||||
return new Intl.DateTimeFormat('en-US', { month: 'short', day: 'numeric', timeZone: 'UTC' }).format(new Date(`${value.slice(0, 10)}T00:00:00Z`));
|
|
||||||
};
|
|
||||||
|
|
||||||
const formatWeight = (value: string | number | null) => {
|
|
||||||
const numericValue = value === null ? null : Number(value);
|
|
||||||
return numericValue && Number.isFinite(numericValue) ? `${numericValue.toFixed(1)} g` : 'Pending';
|
|
||||||
};
|
|
||||||
|
|
||||||
const genderLabel = (value: string) => {
|
|
||||||
if (value === 'female_dna') {
|
|
||||||
return 'Female (DNA confirmed)';
|
|
||||||
}
|
|
||||||
if (value === 'male_dna') {
|
|
||||||
return 'Male (DNA confirmed)';
|
|
||||||
}
|
|
||||||
if (value === 'female') {
|
|
||||||
return 'Female (assumed)';
|
|
||||||
}
|
|
||||||
if (value === 'male') {
|
|
||||||
return 'Male (assumed)';
|
|
||||||
}
|
|
||||||
return 'Unknown';
|
|
||||||
};
|
|
||||||
|
|
||||||
const parseList = (value: string | null) =>
|
|
||||||
(value ?? '')
|
|
||||||
.split(/\r?\n|,/)
|
|
||||||
.map((entry) => entry.trim())
|
|
||||||
.filter(Boolean);
|
|
||||||
|
|
||||||
const dataUrlToBuffer = (value: string | null) => {
|
|
||||||
if (!value) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
const match = value.match(/^data:image\/(?:png|jpeg|jpg);base64,(.+)$/);
|
|
||||||
return match ? Buffer.from(match[1], 'base64') : null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const collectPdf = (doc: PDFKit.PDFDocument) =>
|
|
||||||
new Promise<Buffer>((resolve, reject) => {
|
|
||||||
const chunks: Buffer[] = [];
|
|
||||||
doc.on('data', (chunk: Buffer) => chunks.push(chunk));
|
|
||||||
doc.on('end', () => resolve(Buffer.concat(chunks)));
|
|
||||||
doc.on('error', reject);
|
|
||||||
});
|
|
||||||
|
|
||||||
const fitText = (doc: PDFKit.PDFDocument, text: string, x: number, y: number, width: number, options: PDFKit.Mixins.TextOptions = {}) => {
|
|
||||||
doc.text(text, x, y, { width, lineGap: 1.5, ...options });
|
|
||||||
return doc.y;
|
|
||||||
};
|
|
||||||
|
|
||||||
const drawFact = (doc: PDFKit.PDFDocument, label: string, value: string, x: number, y: number, width: number) => {
|
|
||||||
doc.roundedRect(x, y, width, 43, 6).fillAndStroke(colors.panel, colors.border);
|
|
||||||
doc.fillColor(colors.muted).fontSize(7).font('Helvetica-Bold').text(label.toUpperCase(), x + 8, y + 8, { width: width - 16 });
|
|
||||||
doc.fillColor(colors.ink).fontSize(10).font('Helvetica-Bold').text(value, x + 8, y + 21, { width: width - 16, ellipsis: true });
|
|
||||||
};
|
|
||||||
|
|
||||||
const drawTextCard = (doc: PDFKit.PDFDocument, label: string, value: string, x: number, y: number, width: number, height = 58) => {
|
|
||||||
doc.roundedRect(x, y, width, height, 6).fillAndStroke(colors.panel, colors.border);
|
|
||||||
doc.fillColor(colors.blue).fontSize(8).font('Helvetica-Bold').text(label.toUpperCase(), x + 8, y + 8, { width: width - 16 });
|
|
||||||
doc.fillColor(colors.ink).fontSize(9.2).font('Helvetica').text(value, x + 8, y + 23, {
|
|
||||||
width: width - 16,
|
|
||||||
height: height - 31,
|
|
||||||
ellipsis: true,
|
|
||||||
lineGap: 1.2,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const drawSectionTitle = (doc: PDFKit.PDFDocument, title: string, y: number) => {
|
|
||||||
doc.fillColor(colors.green).font('Helvetica-Bold').fontSize(14).text(title, page.margin, y);
|
|
||||||
doc.moveTo(page.margin, y + 19).lineTo(page.width - page.margin, y + 19).strokeColor(colors.border).lineWidth(1).stroke();
|
|
||||||
return y + 27;
|
|
||||||
};
|
|
||||||
|
|
||||||
const drawSimpleWeightChart = (doc: PDFKit.PDFDocument, weights: WeightRow[], birdColor: string, x: number, y: number, width: number, height: number) => {
|
|
||||||
const plottedWeights = weights
|
|
||||||
.slice()
|
|
||||||
.sort((left, right) => left.recorded_on.localeCompare(right.recorded_on))
|
|
||||||
.map((entry) => ({ ...entry, numericWeight: Number(entry.weight_grams) }))
|
|
||||||
.filter((entry) => Number.isFinite(entry.numericWeight));
|
|
||||||
|
|
||||||
doc.roundedRect(x, y, width, height, 8).fillAndStroke('#fffdf9', colors.border);
|
|
||||||
|
|
||||||
if (!plottedWeights.length) {
|
|
||||||
doc.fillColor(colors.muted).fontSize(10).text('Add more weight records to show a trend graph.', x + 14, y + height / 2 - 6, {
|
|
||||||
width: width - 28,
|
|
||||||
align: 'center',
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const latestDate = new Date(`${plottedWeights[plottedWeights.length - 1].recorded_on.slice(0, 10)}T00:00:00Z`);
|
|
||||||
const startDate = new Date(latestDate);
|
|
||||||
startDate.setUTCDate(startDate.getUTCDate() - 29);
|
|
||||||
const visibleWeights = plottedWeights.filter((entry) => {
|
|
||||||
const recordedOn = new Date(`${entry.recorded_on.slice(0, 10)}T00:00:00Z`);
|
|
||||||
return recordedOn >= startDate && recordedOn <= latestDate;
|
|
||||||
});
|
|
||||||
const rawMinWeight = Math.min(...visibleWeights.map((entry) => entry.numericWeight));
|
|
||||||
const rawMaxWeight = Math.max(...visibleWeights.map((entry) => entry.numericWeight));
|
|
||||||
const rangePadding = Math.max((rawMaxWeight - rawMinWeight) * 0.12, 2);
|
|
||||||
const minWeight = Math.max(0, rawMinWeight - rangePadding);
|
|
||||||
const maxWeight = rawMaxWeight + rangePadding;
|
|
||||||
const weightRange = Math.max(1, maxWeight - minWeight);
|
|
||||||
const padding = { top: 16, right: 18, bottom: 32, left: 48 };
|
|
||||||
const plotWidth = width - padding.left - padding.right;
|
|
||||||
const plotHeight = height - padding.top - padding.bottom;
|
|
||||||
const startMs = startDate.getTime();
|
|
||||||
const endMs = latestDate.getTime();
|
|
||||||
const dateRange = Math.max(endMs - startMs, 24 * 60 * 60 * 1000);
|
|
||||||
const chartColor = /^#[0-9a-fA-F]{6}$/.test(birdColor) ? birdColor : colors.green;
|
|
||||||
const midWeight = minWeight + (maxWeight - minWeight) / 2;
|
|
||||||
const midDate = new Date((startMs + endMs) / 2);
|
|
||||||
const yTicks = [
|
|
||||||
{ label: `${maxWeight.toFixed(0)} g`, y: y + padding.top },
|
|
||||||
{ label: `${midWeight.toFixed(0)} g`, y: y + padding.top + plotHeight / 2 },
|
|
||||||
{ label: `${minWeight.toFixed(0)} g`, y: y + padding.top + plotHeight },
|
|
||||||
];
|
|
||||||
const xTicks = [
|
|
||||||
{ label: formatShortDate(startDate.toISOString().slice(0, 10)), x: x + padding.left },
|
|
||||||
{ label: formatShortDate(midDate.toISOString().slice(0, 10)), x: x + padding.left + plotWidth / 2 },
|
|
||||||
{ label: formatShortDate(latestDate.toISOString().slice(0, 10)), x: x + padding.left + plotWidth },
|
|
||||||
];
|
|
||||||
|
|
||||||
const points = visibleWeights.map((entry) => {
|
|
||||||
const recordedOn = new Date(`${entry.recorded_on.slice(0, 10)}T00:00:00Z`);
|
|
||||||
return {
|
|
||||||
...entry,
|
|
||||||
x: x + padding.left + ((recordedOn.getTime() - startMs) / dateRange) * plotWidth,
|
|
||||||
y: y + padding.top + (1 - (entry.numericWeight - minWeight) / weightRange) * plotHeight,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
doc.font('Helvetica').fontSize(7).fillColor(colors.muted);
|
|
||||||
yTicks.forEach((tick) => {
|
|
||||||
doc.text(tick.label, x + 4, tick.y - 3, { width: padding.left - 12, align: 'right' });
|
|
||||||
doc
|
|
||||||
.save()
|
|
||||||
.dash(4, { space: 6 })
|
|
||||||
.strokeColor('#d8e5ef')
|
|
||||||
.lineWidth(0.8)
|
|
||||||
.moveTo(x + padding.left, tick.y)
|
|
||||||
.lineTo(x + width - padding.right, tick.y)
|
|
||||||
.stroke()
|
|
||||||
.restore();
|
|
||||||
});
|
|
||||||
doc.strokeColor('#c7cdca').lineWidth(1).moveTo(x + padding.left, y + padding.top + plotHeight).lineTo(x + width - padding.right, y + padding.top + plotHeight).stroke();
|
|
||||||
xTicks.forEach((tick) => {
|
|
||||||
doc.fillColor(colors.muted).fontSize(7).text(tick.label, tick.x - 28, y + height - 18, { width: 56, align: 'center' });
|
|
||||||
});
|
|
||||||
|
|
||||||
points.forEach((entry, index) => {
|
|
||||||
if (index === 0) {
|
|
||||||
doc.moveTo(entry.x, entry.y);
|
|
||||||
} else {
|
|
||||||
doc.lineTo(entry.x, entry.y);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (points.length > 1) {
|
|
||||||
doc.lineCap('round').strokeColor(chartColor).lineWidth(2.4).stroke();
|
|
||||||
}
|
|
||||||
|
|
||||||
points.forEach((entry) => {
|
|
||||||
doc.circle(entry.x, entry.y, 3.5).fillAndStroke(chartColor, '#fffdf9');
|
|
||||||
});
|
|
||||||
|
|
||||||
const latestPoint = points[points.length - 1];
|
|
||||||
const calloutOnLeft = latestPoint.x > x + width - padding.right - 84;
|
|
||||||
const calloutX = calloutOnLeft ? latestPoint.x - 82 : latestPoint.x + 8;
|
|
||||||
const calloutY = latestPoint.y < y + padding.top + 18 ? latestPoint.y + 8 : latestPoint.y - 22;
|
|
||||||
doc.roundedRect(calloutX, calloutY, 74, 18, 5).fillAndStroke('#fffdf9', '#d9dedb');
|
|
||||||
doc.fillColor(colors.ink).font('Helvetica-Bold').fontSize(7.5).text(`Latest ${formatWeight(latestPoint.numericWeight)}`, calloutX + 5, calloutY + 5, {
|
|
||||||
width: 64,
|
|
||||||
align: 'center',
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const drawTable = (doc: PDFKit.PDFDocument, headers: string[], rows: string[][], x: number, y: number, widths: number[], rowHeight = 28) => {
|
|
||||||
doc.font('Helvetica-Bold').fontSize(8).fillColor(colors.muted);
|
|
||||||
headers.forEach((header, index) => {
|
|
||||||
doc.text(header.toUpperCase(), x + widths.slice(0, index).reduce((sum, value) => sum + value, 0), y, { width: widths[index] - 8 });
|
|
||||||
});
|
|
||||||
y += 15;
|
|
||||||
doc.moveTo(x, y - 4).lineTo(x + widths.reduce((sum, value) => sum + value, 0), y - 4).strokeColor(colors.border).stroke();
|
|
||||||
|
|
||||||
doc.font('Helvetica').fontSize(8.5).fillColor(colors.ink);
|
|
||||||
rows.forEach((row) => {
|
|
||||||
if (y + rowHeight > page.height - page.margin) {
|
|
||||||
doc.addPage();
|
|
||||||
y = page.margin;
|
|
||||||
}
|
|
||||||
row.forEach((value, index) => {
|
|
||||||
doc.text(value, x + widths.slice(0, index).reduce((sum, columnWidth) => sum + columnWidth, 0), y, {
|
|
||||||
width: widths[index] - 8,
|
|
||||||
height: rowHeight - 6,
|
|
||||||
ellipsis: true,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
y += rowHeight;
|
|
||||||
doc.moveTo(x, y - 4).lineTo(x + widths.reduce((sum, value) => sum + value, 0), y - 4).strokeColor(colors.border).stroke();
|
|
||||||
});
|
|
||||||
|
|
||||||
return y + 6;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const renderAdoptionReportPdf = async ({
|
|
||||||
bird,
|
|
||||||
weights,
|
|
||||||
vetVisits,
|
|
||||||
notes,
|
|
||||||
transferCode,
|
|
||||||
birdPhotoBuffer = null,
|
|
||||||
assets,
|
|
||||||
printFriendly = false,
|
|
||||||
}: AdoptionReportInput) => {
|
|
||||||
const doc = new PDFDocument({
|
|
||||||
size: 'LETTER',
|
|
||||||
margin: page.margin,
|
|
||||||
info: { Title: `FlockPal Adoption Report - ${bird.name}`, Author: 'FlockPal', Subject: `Adoption report for ${bird.name}` },
|
|
||||||
});
|
|
||||||
const output = collectPdf(doc);
|
|
||||||
|
|
||||||
if (!printFriendly) {
|
|
||||||
doc.rect(0, 0, page.width, page.height).fill(colors.paper);
|
|
||||||
}
|
|
||||||
|
|
||||||
const logoPath = fs.existsSync(assets.logoPath) ? assets.logoPath : null;
|
|
||||||
const wordmarkPath = fs.existsSync(assets.wordmarkPath) ? assets.wordmarkPath : logoPath;
|
|
||||||
const defaultPhotoPath = fs.existsSync(assets.defaultBirdPhotoPath) ? assets.defaultBirdPhotoPath : null;
|
|
||||||
const photoBuffer = birdPhotoBuffer ?? dataUrlToBuffer(bird.photo_data_url);
|
|
||||||
const contentWidth = page.width - page.margin * 2;
|
|
||||||
const headerY = page.margin;
|
|
||||||
const headerHeight = 136;
|
|
||||||
|
|
||||||
doc.roundedRect(page.margin, headerY, contentWidth, headerHeight, 12).fillAndStroke(printFriendly ? '#ffffff' : '#f8f4e8', colors.border);
|
|
||||||
if (logoPath) {
|
|
||||||
doc.image(logoPath, page.margin + 10, headerY + 18, { fit: [92, 84], align: 'center', valign: 'center' });
|
|
||||||
}
|
|
||||||
|
|
||||||
const photoX = page.margin + 235;
|
|
||||||
const photoY = headerY + 13;
|
|
||||||
if (photoBuffer) {
|
|
||||||
doc.image(photoBuffer, photoX, photoY, { fit: [58, 58], align: 'center', valign: 'center' });
|
|
||||||
} else if (defaultPhotoPath) {
|
|
||||||
doc.image(defaultPhotoPath, photoX, photoY, { fit: [58, 58], align: 'center', valign: 'center' });
|
|
||||||
}
|
|
||||||
doc.roundedRect(photoX, photoY, 58, 58, 10).strokeColor('#ffffff').lineWidth(2).stroke();
|
|
||||||
doc.fillColor(colors.red).font('Helvetica-Bold').fontSize(22).text(bird.name, page.margin + 140, headerY + 75, { width: 250, align: 'center' });
|
|
||||||
doc.fillColor(colors.muted).font('Helvetica').fontSize(9).text('Adoption Report', page.margin + 140, headerY + 98, { width: 250, align: 'center' });
|
|
||||||
|
|
||||||
const qrDataUrl = await QRCode.toDataURL(transferCode, { margin: 1, width: 96, errorCorrectionLevel: 'H' });
|
|
||||||
const qrBuffer = dataUrlToBuffer(qrDataUrl);
|
|
||||||
const qrX = page.width - page.margin - 132;
|
|
||||||
const qrWidth = 124;
|
|
||||||
doc.fillColor(colors.green).font('Helvetica-Bold').fontSize(8).text('JOIN', qrX, headerY + 7, { width: qrWidth, align: 'center' });
|
|
||||||
if (wordmarkPath) {
|
|
||||||
doc.image(wordmarkPath, qrX + 7, headerY + 18, { fit: [110, 34], align: 'center', valign: 'center' });
|
|
||||||
}
|
|
||||||
doc.fillColor(colors.red).font('Helvetica-Bold').fontSize(7.5).text('Keep my story growing', qrX, headerY + 51, {
|
|
||||||
width: qrWidth,
|
|
||||||
align: 'center',
|
|
||||||
});
|
|
||||||
if (qrBuffer) {
|
|
||||||
doc.image(qrBuffer, qrX + 37, headerY + 62, { width: 50 });
|
|
||||||
}
|
|
||||||
doc.fillColor(colors.green).font('Helvetica-Bold').fontSize(6.8).text('Scan to continue tracking in FlockPal', qrX, headerY + 114, {
|
|
||||||
width: qrWidth,
|
|
||||||
align: 'center',
|
|
||||||
});
|
|
||||||
doc.fillColor(colors.ink).font('Helvetica').fontSize(6.5).text(transferCode, qrX, headerY + 126, { width: qrWidth, align: 'center' });
|
|
||||||
|
|
||||||
let y = headerY + headerHeight + 16;
|
|
||||||
const factGap = 8;
|
|
||||||
const factWidth = (contentWidth - factGap) / 2;
|
|
||||||
const facts = [
|
|
||||||
['Species', bird.species],
|
|
||||||
['Band/tag ID', bird.tag_id || 'Not recorded'],
|
|
||||||
['Sex', genderLabel(bird.gender)],
|
|
||||||
['Hatch day', formatDate(bird.date_of_birth)],
|
|
||||||
['Favorite snack', bird.favorite_snack || 'Not recorded'],
|
|
||||||
['Latest weight', bird.latest_weight_grams ? `${formatWeight(bird.latest_weight_grams)}${bird.latest_recorded_on ? ` on ${formatDate(bird.latest_recorded_on)}` : ''}` : 'Pending'],
|
|
||||||
];
|
|
||||||
facts.forEach(([label, value], index) => {
|
|
||||||
drawFact(doc, label, value, page.margin + (index % 2) * (factWidth + factGap), y + Math.floor(index / 2) * 50, factWidth);
|
|
||||||
});
|
|
||||||
y += Math.ceil(facts.length / 2) * 50 + 8;
|
|
||||||
|
|
||||||
const motivators = parseList(bird.motivators);
|
|
||||||
const demotivators = parseList(bird.demotivators);
|
|
||||||
drawTextCard(doc, 'Motivators', motivators.length ? motivators.join(', ') : 'Not recorded', page.margin, y, factWidth);
|
|
||||||
drawTextCard(
|
|
||||||
doc,
|
|
||||||
'Demotivators',
|
|
||||||
demotivators.length ? demotivators.join(', ') : 'Not recorded',
|
|
||||||
page.margin + factWidth + factGap,
|
|
||||||
y,
|
|
||||||
factWidth,
|
|
||||||
);
|
|
||||||
y += 72;
|
|
||||||
|
|
||||||
if (y > 610) {
|
|
||||||
doc.addPage();
|
|
||||||
y = page.margin;
|
|
||||||
}
|
|
||||||
y = drawSectionTitle(doc, 'Veterinary Clinic Info', y);
|
|
||||||
const vetFacts = [
|
|
||||||
['Clinic name', bird.vet_clinic_name || 'Not recorded'],
|
|
||||||
['Clinic address', bird.vet_clinic_address || 'Not recorded'],
|
|
||||||
['Account #', bird.vet_account_number || 'Not recorded'],
|
|
||||||
['Dr. name', bird.vet_doctor_name || 'Not recorded'],
|
|
||||||
];
|
|
||||||
vetFacts.forEach(([label, value], index) => {
|
|
||||||
drawFact(doc, label, value, page.margin + (index % 2) * (factWidth + factGap), y + Math.floor(index / 2) * 50, factWidth);
|
|
||||||
});
|
|
||||||
y += Math.ceil(vetFacts.length / 2) * 50 + 8;
|
|
||||||
|
|
||||||
y = drawSectionTitle(doc, 'Vet Visit History', y);
|
|
||||||
y = drawTable(
|
|
||||||
doc,
|
|
||||||
['Date', 'Clinic', 'Reason', 'Notes'],
|
|
||||||
vetVisits.length ? vetVisits.map((visit) => [formatDate(visit.visited_on), visit.clinic_name, visit.reason, visit.notes || '']) : [['No vet visits recorded.', '', '', '']],
|
|
||||||
page.margin,
|
|
||||||
y,
|
|
||||||
[70, 115, 120, contentWidth - 305],
|
|
||||||
28,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (y > 575) {
|
|
||||||
doc.addPage();
|
|
||||||
y = page.margin;
|
|
||||||
}
|
|
||||||
y = drawSectionTitle(doc, 'Weight Graph', y);
|
|
||||||
drawSimpleWeightChart(doc, weights, bird.chart_color, page.margin, y, contentWidth, 120);
|
|
||||||
y += 140;
|
|
||||||
|
|
||||||
y = drawSectionTitle(doc, 'Weight History', y);
|
|
||||||
y = drawTable(
|
|
||||||
doc,
|
|
||||||
['Date', 'Weight', 'Notes'],
|
|
||||||
weights.length ? weights.map((entry) => [formatDate(entry.recorded_on), formatWeight(entry.weight_grams), entry.notes || '']) : [['No weights recorded.', '', '']],
|
|
||||||
page.margin,
|
|
||||||
y,
|
|
||||||
[95, 70, contentWidth - 165],
|
|
||||||
24,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (notes.length) {
|
|
||||||
if (y > 635) {
|
|
||||||
doc.addPage();
|
|
||||||
y = page.margin;
|
|
||||||
}
|
|
||||||
y = drawSectionTitle(doc, 'Notes', y);
|
|
||||||
notes.slice(0, 8).forEach((note) => {
|
|
||||||
if (y > page.height - page.margin - 48) {
|
|
||||||
doc.addPage();
|
|
||||||
y = page.margin;
|
|
||||||
}
|
|
||||||
doc.fillColor(colors.muted).font('Helvetica-Bold').fontSize(8).text(formatDateTime(note.updated_at), page.margin, y);
|
|
||||||
y = fitText(doc, note.body, page.margin, y + 12, contentWidth, { height: 44, ellipsis: true });
|
|
||||||
y += 8;
|
|
||||||
doc.moveTo(page.margin, y).lineTo(page.width - page.margin, y).strokeColor(colors.border).stroke();
|
|
||||||
y += 8;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
doc.end();
|
|
||||||
return output;
|
|
||||||
};
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
import path from 'path';
|
|
||||||
import sharp from 'sharp';
|
|
||||||
|
|
||||||
import { listFlockNotes } from '../repositories/auditRepository.js';
|
|
||||||
import { getBirdById, listVetVisitsForBird, listWeightsForBird } from '../repositories/birdRepository.js';
|
|
||||||
import { getS3ImageStorageConfig } from '../storage/imageStorageConfig.js';
|
|
||||||
import { getSignedS3ObjectUrl } from '../storage/s3Client.js';
|
|
||||||
import type { BirdRow } from '../types.js';
|
|
||||||
import { renderAdoptionReportPdf } from './adoptionReport.js';
|
|
||||||
|
|
||||||
const adoptionReportWeightHistoryDays = 14;
|
|
||||||
|
|
||||||
const parseDataImage = (value: string | null) => {
|
|
||||||
if (!value) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const match = value.match(/^data:image\/(?:png|jpeg|jpg|webp|gif);base64,(.+)$/);
|
|
||||||
return match ? Buffer.from(match[1], 'base64') : null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const normalizeReportPhotoBuffer = async (imageBuffer: Buffer | null) => {
|
|
||||||
if (!imageBuffer) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
return await sharp(imageBuffer).rotate().png().toBuffer();
|
|
||||||
} catch (error) {
|
|
||||||
console.warn('Unable to normalize bird photo for adoption report:', error);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const loadBirdReportPhotoBuffer = async (bird: BirdRow) => {
|
|
||||||
if (!bird.photo_object_key) {
|
|
||||||
return normalizeReportPhotoBuffer(parseDataImage(bird.photo_data_url));
|
|
||||||
}
|
|
||||||
|
|
||||||
const s3Config = getS3ImageStorageConfig();
|
|
||||||
|
|
||||||
if (!s3Config) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const signedUrl = getSignedS3ObjectUrl({
|
|
||||||
config: s3Config,
|
|
||||||
objectKey: bird.photo_object_key,
|
|
||||||
expiresInSeconds: 5 * 60,
|
|
||||||
});
|
|
||||||
const imageResponse = await fetch(signedUrl);
|
|
||||||
|
|
||||||
if (!imageResponse.ok) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return normalizeReportPhotoBuffer(Buffer.from(await imageResponse.arrayBuffer()));
|
|
||||||
};
|
|
||||||
|
|
||||||
export const renderAdoptionReportForBird = async ({
|
|
||||||
birdId,
|
|
||||||
workspaceId,
|
|
||||||
transferCode,
|
|
||||||
printFriendly,
|
|
||||||
}: {
|
|
||||||
birdId: string;
|
|
||||||
workspaceId: number;
|
|
||||||
transferCode: string;
|
|
||||||
printFriendly: boolean;
|
|
||||||
}) => {
|
|
||||||
const bird = await getBirdById(birdId, workspaceId);
|
|
||||||
|
|
||||||
if (!bird) {
|
|
||||||
throw new Error('Bird not found.');
|
|
||||||
}
|
|
||||||
|
|
||||||
const [weights, vetVisits, notes, birdPhotoBuffer] = await Promise.all([
|
|
||||||
listWeightsForBird(bird.id, workspaceId, adoptionReportWeightHistoryDays),
|
|
||||||
listVetVisitsForBird(bird.id, workspaceId),
|
|
||||||
listFlockNotes(workspaceId),
|
|
||||||
loadBirdReportPhotoBuffer(bird),
|
|
||||||
]);
|
|
||||||
const birdNotes = notes.filter((note) => note.bird_id === bird.id);
|
|
||||||
|
|
||||||
return renderAdoptionReportPdf({
|
|
||||||
bird,
|
|
||||||
weights,
|
|
||||||
vetVisits,
|
|
||||||
notes: birdNotes,
|
|
||||||
transferCode,
|
|
||||||
birdPhotoBuffer,
|
|
||||||
printFriendly,
|
|
||||||
assets: {
|
|
||||||
logoPath: path.join(process.cwd(), 'assets', 'flockpal-logo.png'),
|
|
||||||
wordmarkPath: path.join(process.cwd(), 'assets', 'flockpal-text.png'),
|
|
||||||
defaultBirdPhotoPath: path.join(process.cwd(), 'assets', 'yoda-default.png'),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@@ -188,46 +188,6 @@ test('completePendingBirdTransfersForOwner moves pending birds and marks complet
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
{ rowCount: 1, rows: [] },
|
{ rowCount: 1, rows: [] },
|
||||||
{
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
workspace_id: 10,
|
|
||||||
workspace_name: 'Original Flock',
|
|
||||||
owner_email: 'sender@example.com',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
workspace_id: 22,
|
|
||||||
workspace_name: 'Receiving Flock',
|
|
||||||
owner_email: 'receiver@example.com',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
id: 'timeline-1',
|
|
||||||
bird_id: 'bird-1',
|
|
||||||
event_type: 'transferred',
|
|
||||||
from_workspace_id: 10,
|
|
||||||
to_workspace_id: 22,
|
|
||||||
from_workspace_name: 'Original Flock',
|
|
||||||
to_workspace_name: 'Receiving Flock',
|
|
||||||
from_owner_email: 'sender@example.com',
|
|
||||||
to_owner_email: 'receiver@example.com',
|
|
||||||
location_label: 'Receiving Flock',
|
|
||||||
location_details: null,
|
|
||||||
created_by_user_id: 'user-1',
|
|
||||||
created_at: '2026-04-15T00:00:00.000Z',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
);
|
);
|
||||||
|
|
||||||
const result = await completePendingBirdTransfersForOwner('receiver@example.com', 22);
|
const result = await completePendingBirdTransfersForOwner('receiver@example.com', 22);
|
||||||
@@ -237,19 +197,4 @@ test('completePendingBirdTransfersForOwner moves pending birds and marks complet
|
|||||||
assert.deepEqual(calls[1].params, ['bird-1', 10, 22]);
|
assert.deepEqual(calls[1].params, ['bird-1', 10, 22]);
|
||||||
assert.deepEqual(calls[2].params, ['transfer-1', 22]);
|
assert.deepEqual(calls[2].params, ['transfer-1', 22]);
|
||||||
assert.match(calls[2].text, /completed_at = CURRENT_TIMESTAMP/);
|
assert.match(calls[2].text, /completed_at = CURRENT_TIMESTAMP/);
|
||||||
assert.deepEqual(calls[5].params, [
|
|
||||||
'bird-1',
|
|
||||||
'transferred',
|
|
||||||
10,
|
|
||||||
22,
|
|
||||||
'Original Flock',
|
|
||||||
'Receiving Flock',
|
|
||||||
'sender@example.com',
|
|
||||||
'receiver@example.com',
|
|
||||||
null,
|
|
||||||
null,
|
|
||||||
null,
|
|
||||||
'user-1',
|
|
||||||
null,
|
|
||||||
]);
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -5,14 +5,10 @@ import type {
|
|||||||
BirdMilestoneReminderDeliveryRow,
|
BirdMilestoneReminderDeliveryRow,
|
||||||
BirdMilestoneReminderType,
|
BirdMilestoneReminderType,
|
||||||
BirdRow,
|
BirdRow,
|
||||||
BirdTimelineEventRow,
|
|
||||||
BirdTimelineEventType,
|
|
||||||
BirdTransferCodeRow,
|
BirdTransferCodeRow,
|
||||||
LostBirdMatchRow,
|
LostBirdMatchRow,
|
||||||
MedicationAdministrationRow,
|
MedicationAdministrationRow,
|
||||||
MedicationDoseScheduleItem,
|
MedicationDoseScheduleItem,
|
||||||
MedicationReminderCandidateRow,
|
|
||||||
MedicationReminderDeliveryRow,
|
|
||||||
MedicationRow,
|
MedicationRow,
|
||||||
PendingBirdTransferRow,
|
PendingBirdTransferRow,
|
||||||
VetVisitRow,
|
VetVisitRow,
|
||||||
@@ -28,8 +24,6 @@ const birdSelectFields = `
|
|||||||
birds.motivators,
|
birds.motivators,
|
||||||
birds.demotivators,
|
birds.demotivators,
|
||||||
birds.favorite_snack,
|
birds.favorite_snack,
|
||||||
birds.location_label,
|
|
||||||
birds.location_details,
|
|
||||||
birds.vet_clinic_name,
|
birds.vet_clinic_name,
|
||||||
birds.vet_clinic_address,
|
birds.vet_clinic_address,
|
||||||
birds.vet_account_number,
|
birds.vet_account_number,
|
||||||
@@ -55,34 +49,6 @@ const birdSelectFields = `
|
|||||||
latest.recorded_on::text AS latest_recorded_on
|
latest.recorded_on::text AS latest_recorded_on
|
||||||
`;
|
`;
|
||||||
|
|
||||||
type WorkspaceTimelineSnapshot = {
|
|
||||||
workspace_id: number;
|
|
||||||
workspace_name: string;
|
|
||||||
owner_email: string | null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const getWorkspaceTimelineSnapshot = async (workspaceId: number) => {
|
|
||||||
const result = await db.query<WorkspaceTimelineSnapshot>(
|
|
||||||
`SELECT
|
|
||||||
workspaces.id AS workspace_id,
|
|
||||||
workspaces.name AS workspace_name,
|
|
||||||
COALESCE(workspaces.billing_email, owner_member.invite_email, owner_member.email) AS owner_email
|
|
||||||
FROM workspaces
|
|
||||||
LEFT JOIN LATERAL (
|
|
||||||
SELECT invite_email, email
|
|
||||||
FROM workspace_members
|
|
||||||
WHERE workspace_members.workspace_id = workspaces.id
|
|
||||||
AND workspace_members.role = 'owner'
|
|
||||||
ORDER BY accepted_at DESC NULLS LAST, created_at ASC
|
|
||||||
LIMIT 1
|
|
||||||
) owner_member ON TRUE
|
|
||||||
WHERE workspaces.id = $1`,
|
|
||||||
[workspaceId],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getBirdById = async (birdId: string, workspaceId: number) => {
|
export const getBirdById = async (birdId: string, workspaceId: number) => {
|
||||||
const result = await db.query<BirdRow>(
|
const result = await db.query<BirdRow>(
|
||||||
`SELECT
|
`SELECT
|
||||||
@@ -166,102 +132,6 @@ export const listMemorializedBirds = async (workspaceId: number) => {
|
|||||||
return result.rows;
|
return result.rows;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const createBirdTimelineEvent = async ({
|
|
||||||
birdId,
|
|
||||||
eventType,
|
|
||||||
fromWorkspaceId,
|
|
||||||
toWorkspaceId,
|
|
||||||
locationLabel,
|
|
||||||
locationDetails,
|
|
||||||
note,
|
|
||||||
eventDate,
|
|
||||||
createdByUserId,
|
|
||||||
}: {
|
|
||||||
birdId: string;
|
|
||||||
eventType: BirdTimelineEventType;
|
|
||||||
fromWorkspaceId?: number | null;
|
|
||||||
toWorkspaceId?: number | null;
|
|
||||||
locationLabel?: string | null;
|
|
||||||
locationDetails?: Record<string, unknown> | null;
|
|
||||||
note?: string | null;
|
|
||||||
eventDate?: string | null;
|
|
||||||
createdByUserId?: string | null;
|
|
||||||
}) => {
|
|
||||||
const [fromWorkspace, toWorkspace] = await Promise.all([
|
|
||||||
fromWorkspaceId ? getWorkspaceTimelineSnapshot(fromWorkspaceId) : Promise.resolve(null),
|
|
||||||
toWorkspaceId ? getWorkspaceTimelineSnapshot(toWorkspaceId) : Promise.resolve(null),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const result = await db.query<BirdTimelineEventRow>(
|
|
||||||
`INSERT INTO bird_timeline_events (
|
|
||||||
bird_id,
|
|
||||||
event_type,
|
|
||||||
from_workspace_id,
|
|
||||||
to_workspace_id,
|
|
||||||
from_workspace_name,
|
|
||||||
to_workspace_name,
|
|
||||||
from_owner_email,
|
|
||||||
to_owner_email,
|
|
||||||
location_label,
|
|
||||||
note,
|
|
||||||
event_date,
|
|
||||||
created_by_user_id,
|
|
||||||
location_details
|
|
||||||
)
|
|
||||||
VALUES (
|
|
||||||
$1,
|
|
||||||
$2,
|
|
||||||
$3,
|
|
||||||
$4,
|
|
||||||
$5::varchar(160),
|
|
||||||
$6::varchar(160),
|
|
||||||
$7::varchar(320),
|
|
||||||
$8::varchar(320),
|
|
||||||
COALESCE($9::varchar(160), $6::varchar(160), $5::varchar(160)),
|
|
||||||
$10,
|
|
||||||
COALESCE($11::date, CURRENT_DATE),
|
|
||||||
$12,
|
|
||||||
$13
|
|
||||||
)
|
|
||||||
RETURNING id, bird_id, event_type, from_workspace_id, to_workspace_id, from_workspace_name, to_workspace_name, from_owner_email, to_owner_email, location_label, location_details, note, event_date::text, created_by_user_id, created_at`,
|
|
||||||
[
|
|
||||||
birdId,
|
|
||||||
eventType,
|
|
||||||
fromWorkspaceId ?? null,
|
|
||||||
toWorkspaceId ?? null,
|
|
||||||
fromWorkspace?.workspace_name ?? null,
|
|
||||||
toWorkspace?.workspace_name ?? null,
|
|
||||||
fromWorkspace?.owner_email ?? null,
|
|
||||||
toWorkspace?.owner_email ?? null,
|
|
||||||
locationLabel ?? null,
|
|
||||||
note ?? null,
|
|
||||||
eventDate ?? null,
|
|
||||||
createdByUserId ?? null,
|
|
||||||
locationDetails ?? null,
|
|
||||||
],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const listBirdTimelineEvents = async (birdId: string, workspaceId: number) => {
|
|
||||||
const result = await db.query<BirdTimelineEventRow>(
|
|
||||||
`SELECT id, bird_id, event_type, from_workspace_id, to_workspace_id, from_workspace_name, to_workspace_name, from_owner_email, to_owner_email, location_label, location_details, note, event_date::text, created_by_user_id, created_at
|
|
||||||
FROM bird_timeline_events
|
|
||||||
WHERE bird_id = $1
|
|
||||||
AND EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM birds
|
|
||||||
WHERE birds.id = bird_timeline_events.bird_id
|
|
||||||
AND birds.workspace_id = $2
|
|
||||||
)
|
|
||||||
ORDER BY event_date DESC, created_at DESC`,
|
|
||||||
[birdId, workspaceId],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const findBirdsByBandId = async (tagId: string) => {
|
export const findBirdsByBandId = async (tagId: string) => {
|
||||||
const result = await db.query<LostBirdMatchRow>(
|
const result = await db.query<LostBirdMatchRow>(
|
||||||
`SELECT
|
`SELECT
|
||||||
@@ -413,79 +283,6 @@ export const createBirdMilestoneReminderDelivery = async ({
|
|||||||
return result.rows[0] ?? null;
|
return result.rows[0] ?? null;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const listDueMedicationReminders = async (runDate: string, currentTime: string) => {
|
|
||||||
const result = await db.query<MedicationReminderCandidateRow>(
|
|
||||||
`SELECT
|
|
||||||
${birdSelectFields},
|
|
||||||
workspaces.name AS workspace_name,
|
|
||||||
medications.id AS medication_id,
|
|
||||||
medications.name AS medication_name,
|
|
||||||
medications.dosage,
|
|
||||||
medications.frequency,
|
|
||||||
medications.dose_schedule,
|
|
||||||
medications.route,
|
|
||||||
medications.start_date::text AS medication_start_date,
|
|
||||||
medications.end_date::text AS medication_end_date,
|
|
||||||
medications.notes AS medication_notes,
|
|
||||||
$1::date::text AS scheduled_on,
|
|
||||||
dose.key AS administration_slot,
|
|
||||||
dose.label AS administration_label,
|
|
||||||
dose.time AS administration_time
|
|
||||||
FROM medications
|
|
||||||
INNER JOIN birds ON birds.id = medications.bird_id
|
|
||||||
INNER JOIN workspaces ON workspaces.id = birds.workspace_id
|
|
||||||
CROSS JOIN LATERAL jsonb_to_recordset(medications.dose_schedule) AS dose(key text, label text, time text)
|
|
||||||
LEFT JOIN LATERAL (
|
|
||||||
SELECT weight_grams, recorded_on
|
|
||||||
FROM weight_records
|
|
||||||
WHERE weight_records.bird_id = birds.id
|
|
||||||
ORDER BY recorded_on DESC
|
|
||||||
LIMIT 1
|
|
||||||
) latest ON TRUE
|
|
||||||
WHERE medications.reminders_enabled = TRUE
|
|
||||||
AND birds.memorialized_at IS NULL
|
|
||||||
AND medications.start_date <= $1::date
|
|
||||||
AND (medications.end_date IS NULL OR medications.end_date >= $1::date)
|
|
||||||
AND COALESCE(NULLIF(BTRIM(dose.time), ''), '') <> ''
|
|
||||||
AND dose.time <= $2
|
|
||||||
AND NOT EXISTS (
|
|
||||||
SELECT 1
|
|
||||||
FROM medication_reminder_deliveries deliveries
|
|
||||||
WHERE deliveries.medication_id = medications.id
|
|
||||||
AND deliveries.scheduled_on = $1::date
|
|
||||||
AND deliveries.administration_slot = dose.key
|
|
||||||
)
|
|
||||||
ORDER BY workspaces.name ASC, birds.name ASC, dose.time ASC, medications.name ASC`,
|
|
||||||
[runDate, currentTime],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const createMedicationReminderDelivery = async ({
|
|
||||||
medicationId,
|
|
||||||
birdId,
|
|
||||||
workspaceId,
|
|
||||||
scheduledOn,
|
|
||||||
administrationSlot,
|
|
||||||
}: {
|
|
||||||
medicationId: string;
|
|
||||||
birdId: string;
|
|
||||||
workspaceId: number;
|
|
||||||
scheduledOn: string;
|
|
||||||
administrationSlot: string;
|
|
||||||
}) => {
|
|
||||||
const result = await db.query<MedicationReminderDeliveryRow>(
|
|
||||||
`INSERT INTO medication_reminder_deliveries (medication_id, bird_id, workspace_id, scheduled_on, administration_slot)
|
|
||||||
VALUES ($1, $2, $3, $4, $5)
|
|
||||||
ON CONFLICT (medication_id, scheduled_on, administration_slot) DO NOTHING
|
|
||||||
RETURNING id, medication_id, bird_id, workspace_id, scheduled_on::text, administration_slot, delivered_at`,
|
|
||||||
[medicationId, birdId, workspaceId, scheduledOn, administrationSlot],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const createBird = async ({
|
export const createBird = async ({
|
||||||
birdId,
|
birdId,
|
||||||
workspaceId,
|
workspaceId,
|
||||||
@@ -495,8 +292,6 @@ export const createBird = async ({
|
|||||||
motivators,
|
motivators,
|
||||||
demotivators,
|
demotivators,
|
||||||
favoriteSnack,
|
favoriteSnack,
|
||||||
locationLabel = null,
|
|
||||||
locationDetails = null,
|
|
||||||
vetClinicName = null,
|
vetClinicName = null,
|
||||||
vetClinicAddress = null,
|
vetClinicAddress = null,
|
||||||
vetAccountNumber = null,
|
vetAccountNumber = null,
|
||||||
@@ -522,8 +317,6 @@ export const createBird = async ({
|
|||||||
motivators: string | null;
|
motivators: string | null;
|
||||||
demotivators: string | null;
|
demotivators: string | null;
|
||||||
favoriteSnack: string | null;
|
favoriteSnack: string | null;
|
||||||
locationLabel?: string | null;
|
|
||||||
locationDetails?: Record<string, unknown> | null;
|
|
||||||
vetClinicName?: string | null;
|
vetClinicName?: string | null;
|
||||||
vetClinicAddress?: string | null;
|
vetClinicAddress?: string | null;
|
||||||
vetAccountNumber?: string | null;
|
vetAccountNumber?: string | null;
|
||||||
@@ -542,9 +335,9 @@ export const createBird = async ({
|
|||||||
publicProfileEnabled?: boolean;
|
publicProfileEnabled?: boolean;
|
||||||
}) => {
|
}) => {
|
||||||
const result = await db.query<BirdRow>(
|
const result = await db.query<BirdRow>(
|
||||||
`INSERT INTO birds (id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth, gotcha_day, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled)
|
`INSERT INTO birds (id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth, gotcha_day, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled)
|
||||||
VALUES (COALESCE($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)
|
VALUES (COALESCE($1::uuid, gen_random_uuid()), $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24)
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at, NULL::text AS latest_weight_grams, NULL::text AS latest_recorded_on`,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at, NULL::text AS latest_weight_grams, NULL::text AS latest_recorded_on`,
|
||||||
[
|
[
|
||||||
birdId ?? null,
|
birdId ?? null,
|
||||||
workspaceId,
|
workspaceId,
|
||||||
@@ -554,8 +347,6 @@ export const createBird = async ({
|
|||||||
motivators,
|
motivators,
|
||||||
demotivators,
|
demotivators,
|
||||||
favoriteSnack,
|
favoriteSnack,
|
||||||
locationLabel,
|
|
||||||
locationDetails,
|
|
||||||
vetClinicName,
|
vetClinicName,
|
||||||
vetClinicAddress,
|
vetClinicAddress,
|
||||||
vetAccountNumber,
|
vetAccountNumber,
|
||||||
@@ -587,8 +378,6 @@ export const updateBird = async ({
|
|||||||
motivators,
|
motivators,
|
||||||
demotivators,
|
demotivators,
|
||||||
favoriteSnack,
|
favoriteSnack,
|
||||||
locationLabel,
|
|
||||||
locationDetails,
|
|
||||||
vetClinicName,
|
vetClinicName,
|
||||||
vetClinicAddress,
|
vetClinicAddress,
|
||||||
vetAccountNumber,
|
vetAccountNumber,
|
||||||
@@ -614,8 +403,6 @@ export const updateBird = async ({
|
|||||||
motivators: string | null;
|
motivators: string | null;
|
||||||
demotivators: string | null;
|
demotivators: string | null;
|
||||||
favoriteSnack: string | null;
|
favoriteSnack: string | null;
|
||||||
locationLabel: string | null;
|
|
||||||
locationDetails?: Record<string, unknown> | null;
|
|
||||||
vetClinicName: string | null;
|
vetClinicName: string | null;
|
||||||
vetClinicAddress: string | null;
|
vetClinicAddress: string | null;
|
||||||
vetAccountNumber: string | null;
|
vetAccountNumber: string | null;
|
||||||
@@ -641,28 +428,26 @@ export const updateBird = async ({
|
|||||||
motivators = $5,
|
motivators = $5,
|
||||||
demotivators = $6,
|
demotivators = $6,
|
||||||
favorite_snack = $7,
|
favorite_snack = $7,
|
||||||
location_label = $8,
|
vet_clinic_name = $8,
|
||||||
vet_clinic_name = $9,
|
vet_clinic_address = $9,
|
||||||
vet_clinic_address = $10,
|
vet_account_number = $10,
|
||||||
vet_account_number = $11,
|
vet_doctor_name = $11,
|
||||||
vet_doctor_name = $12,
|
gender = $12,
|
||||||
gender = $13,
|
date_of_birth = $13,
|
||||||
date_of_birth = $14,
|
gotcha_day = $14,
|
||||||
gotcha_day = $15,
|
chart_color = $15,
|
||||||
chart_color = $16,
|
photo_data_url = $16,
|
||||||
photo_data_url = $17,
|
photo_object_key = $17,
|
||||||
photo_object_key = $18,
|
photo_content_type = $18,
|
||||||
photo_content_type = $19,
|
photo_updated_at = $19,
|
||||||
photo_updated_at = $20,
|
notify_on_dob = $20,
|
||||||
notify_on_dob = $21,
|
notify_on_gotcha_day = $21,
|
||||||
notify_on_gotcha_day = $22,
|
public_profile_code = $22,
|
||||||
public_profile_code = $23,
|
public_profile_enabled = $23
|
||||||
public_profile_enabled = $24,
|
|
||||||
location_details = $25
|
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $26
|
AND workspace_id = $24
|
||||||
AND memorialized_at IS NULL
|
AND memorialized_at IS NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
@@ -685,7 +470,6 @@ export const updateBird = async ({
|
|||||||
motivators,
|
motivators,
|
||||||
demotivators,
|
demotivators,
|
||||||
favoriteSnack,
|
favoriteSnack,
|
||||||
locationLabel,
|
|
||||||
vetClinicName,
|
vetClinicName,
|
||||||
vetClinicAddress,
|
vetClinicAddress,
|
||||||
vetAccountNumber,
|
vetAccountNumber,
|
||||||
@@ -702,7 +486,6 @@ export const updateBird = async ({
|
|||||||
notifyOnGotchaDay,
|
notifyOnGotchaDay,
|
||||||
publicProfileCode,
|
publicProfileCode,
|
||||||
publicProfileEnabled,
|
publicProfileEnabled,
|
||||||
locationDetails ?? null,
|
|
||||||
workspaceId,
|
workspaceId,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@@ -732,7 +515,7 @@ export const memorializeBird = async ({
|
|||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $2
|
AND workspace_id = $2
|
||||||
AND memorialized_at IS NULL
|
AND memorialized_at IS NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
@@ -768,7 +551,7 @@ export const updateMemorialReminderPreference = async ({
|
|||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $2
|
AND workspace_id = $2
|
||||||
AND memorialized_at IS NOT NULL
|
AND memorialized_at IS NOT NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
@@ -808,7 +591,7 @@ export const transferBirdToWorkspace = async (birdId: string, sourceWorkspaceId:
|
|||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $2
|
AND workspace_id = $2
|
||||||
AND memorialized_at IS NULL
|
AND memorialized_at IS NULL
|
||||||
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, location_label, location_details, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
RETURNING id, workspace_id, name, tag_id, species, motivators, demotivators, favorite_snack, vet_clinic_name, vet_clinic_address, vet_account_number, vet_doctor_name, gender, date_of_birth::text, gotcha_day::text, chart_color, photo_data_url, photo_object_key, photo_content_type, photo_updated_at, notify_on_dob, notify_on_gotcha_day, public_profile_code, public_profile_enabled, memorialized_at, memorialized_on::text, memorial_note, notify_on_memorial_day, created_at,
|
||||||
(
|
(
|
||||||
SELECT weight_grams::text
|
SELECT weight_grams::text
|
||||||
FROM weight_records
|
FROM weight_records
|
||||||
@@ -904,17 +687,6 @@ export const completePendingBirdTransfersForOwner = async (ownerEmail: string, t
|
|||||||
}
|
}
|
||||||
|
|
||||||
await markPendingBirdTransferCompleted(transfer.id, targetWorkspaceId);
|
await markPendingBirdTransferCompleted(transfer.id, targetWorkspaceId);
|
||||||
try {
|
|
||||||
await createBirdTimelineEvent({
|
|
||||||
birdId: bird.id,
|
|
||||||
eventType: 'transferred',
|
|
||||||
fromWorkspaceId: transfer.source_workspace_id,
|
|
||||||
toWorkspaceId: targetWorkspaceId,
|
|
||||||
createdByUserId: transfer.requested_by_user_id,
|
|
||||||
});
|
|
||||||
} catch (timelineError) {
|
|
||||||
console.error('Unable to write bird timeline event', timelineError);
|
|
||||||
}
|
|
||||||
completed += 1;
|
completed += 1;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
failed += 1;
|
failed += 1;
|
||||||
@@ -1048,34 +820,6 @@ export const createWeightForBird = async (birdId: string, weightGrams: number, r
|
|||||||
return result.rows[0] ?? null;
|
return result.rows[0] ?? null;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const updateWeightForBird = async (
|
|
||||||
weightId: string,
|
|
||||||
birdId: string,
|
|
||||||
weightGrams: number,
|
|
||||||
recordedOn: string,
|
|
||||||
notes: string | null,
|
|
||||||
) => {
|
|
||||||
const result = await db.query<WeightRow>(
|
|
||||||
`UPDATE weight_records
|
|
||||||
SET weight_grams = $3,
|
|
||||||
recorded_on = $4,
|
|
||||||
notes = $5
|
|
||||||
WHERE id = $1
|
|
||||||
AND bird_id = $2
|
|
||||||
AND id IN (
|
|
||||||
SELECT recent.id
|
|
||||||
FROM weight_records recent
|
|
||||||
WHERE recent.bird_id = $2
|
|
||||||
ORDER BY recent.recorded_on DESC, recent.created_at DESC
|
|
||||||
LIMIT 3
|
|
||||||
)
|
|
||||||
RETURNING id, bird_id, weight_grams, recorded_on::text, notes`,
|
|
||||||
[weightId, birdId, weightGrams, recordedOn, notes],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const listVetVisitsForBird = async (birdId: string, workspaceId: number) => {
|
export const listVetVisitsForBird = async (birdId: string, workspaceId: number) => {
|
||||||
const result = await db.query<VetVisitRow>(
|
const result = await db.query<VetVisitRow>(
|
||||||
`SELECT id, bird_id, visited_on::text, clinic_name, reason, notes
|
`SELECT id, bird_id, visited_on::text, clinic_name, reason, notes
|
||||||
@@ -1142,7 +886,7 @@ export const deleteVetVisitForBird = async (visitId: string, birdId: string) =>
|
|||||||
|
|
||||||
export const listMedicationsForBird = async (birdId: string, workspaceId: number) => {
|
export const listMedicationsForBird = async (birdId: string, workspaceId: number) => {
|
||||||
const result = await db.query<MedicationRow>(
|
const result = await db.query<MedicationRow>(
|
||||||
`SELECT id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes, reminders_enabled
|
`SELECT id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes
|
||||||
FROM medications
|
FROM medications
|
||||||
WHERE bird_id = $1
|
WHERE bird_id = $1
|
||||||
AND EXISTS (
|
AND EXISTS (
|
||||||
@@ -1168,13 +912,12 @@ export const createMedicationForBird = async (
|
|||||||
startDate: string,
|
startDate: string,
|
||||||
endDate: string | null,
|
endDate: string | null,
|
||||||
notes: string | null,
|
notes: string | null,
|
||||||
remindersEnabled: boolean,
|
|
||||||
) => {
|
) => {
|
||||||
const result = await db.query<MedicationRow>(
|
const result = await db.query<MedicationRow>(
|
||||||
`INSERT INTO medications (bird_id, name, dosage, frequency, dose_schedule, route, start_date, end_date, notes, reminders_enabled)
|
`INSERT INTO medications (bird_id, name, dosage, frequency, dose_schedule, route, start_date, end_date, notes)
|
||||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
|
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
|
||||||
RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes, reminders_enabled`,
|
RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes`,
|
||||||
[birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes, remindersEnabled],
|
[birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes],
|
||||||
);
|
);
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
return result.rows[0] ?? null;
|
||||||
@@ -1191,7 +934,6 @@ export const updateMedicationForBird = async (
|
|||||||
startDate: string,
|
startDate: string,
|
||||||
endDate: string | null,
|
endDate: string | null,
|
||||||
notes: string | null,
|
notes: string | null,
|
||||||
remindersEnabled: boolean,
|
|
||||||
) => {
|
) => {
|
||||||
const result = await db.query<MedicationRow>(
|
const result = await db.query<MedicationRow>(
|
||||||
`UPDATE medications
|
`UPDATE medications
|
||||||
@@ -1202,12 +944,11 @@ export const updateMedicationForBird = async (
|
|||||||
route = $7,
|
route = $7,
|
||||||
start_date = $8,
|
start_date = $8,
|
||||||
end_date = $9,
|
end_date = $9,
|
||||||
notes = $10,
|
notes = $10
|
||||||
reminders_enabled = $11
|
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND bird_id = $2
|
AND bird_id = $2
|
||||||
RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes, reminders_enabled`,
|
RETURNING id, bird_id, name, dosage, frequency, dose_schedule, route, start_date::text, end_date::text, notes`,
|
||||||
[medicationId, birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes, remindersEnabled],
|
[medicationId, birdId, name, dosage, frequency, JSON.stringify(doseSchedule), route, startDate, endDate, notes],
|
||||||
);
|
);
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
return result.rows[0] ?? null;
|
||||||
|
|||||||
@@ -1,153 +0,0 @@
|
|||||||
import { db } from '../db/client.js';
|
|
||||||
import type { DailyEducationQuestion, DailyEducationRow, EducationQuestionRow } from '../types.js';
|
|
||||||
|
|
||||||
export const getEducationOptOut = async (userId: string) => {
|
|
||||||
const result = await db.query<{ education_opt_out: boolean }>(
|
|
||||||
`SELECT education_opt_out
|
|
||||||
FROM users
|
|
||||||
WHERE id = $1`,
|
|
||||||
[userId],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0]?.education_opt_out ?? false;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const updateEducationOptOut = async (userId: string, educationOptOut: boolean) => {
|
|
||||||
const result = await db.query<{ education_opt_out: boolean }>(
|
|
||||||
`UPDATE users
|
|
||||||
SET education_opt_out = $2
|
|
||||||
WHERE id = $1
|
|
||||||
RETURNING education_opt_out`,
|
|
||||||
[userId, educationOptOut],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0]?.education_opt_out ?? educationOptOut;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getDailyEducationForDate = async (publishDate?: string) => {
|
|
||||||
const result = publishDate
|
|
||||||
? await db.query<DailyEducationRow>(
|
|
||||||
`SELECT id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at
|
|
||||||
FROM daily_education
|
|
||||||
WHERE publish_date = $1`,
|
|
||||||
[publishDate],
|
|
||||||
)
|
|
||||||
: await db.query<DailyEducationRow>(
|
|
||||||
`SELECT id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at
|
|
||||||
FROM daily_education
|
|
||||||
WHERE publish_date = CURRENT_DATE`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const listDailyEducationForAdmin = async () => {
|
|
||||||
const result = await db.query<DailyEducationRow>(
|
|
||||||
`SELECT id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at
|
|
||||||
FROM daily_education
|
|
||||||
ORDER BY publish_date DESC
|
|
||||||
LIMIT 120`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const upsertDailyEducation = async ({
|
|
||||||
publishDate,
|
|
||||||
fact,
|
|
||||||
createdByUserId,
|
|
||||||
}: {
|
|
||||||
publishDate: string;
|
|
||||||
fact: string;
|
|
||||||
createdByUserId: string;
|
|
||||||
}) => {
|
|
||||||
const result = await db.query<DailyEducationRow>(
|
|
||||||
`INSERT INTO daily_education (publish_date, fact, created_by_user_id)
|
|
||||||
VALUES ($1, $2, $3)
|
|
||||||
ON CONFLICT (publish_date) DO UPDATE
|
|
||||||
SET fact = EXCLUDED.fact,
|
|
||||||
updated_at = CURRENT_TIMESTAMP
|
|
||||||
RETURNING id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at`,
|
|
||||||
[publishDate, fact, createdByUserId],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
export const listEducationQuestionsForAdmin = async () => {
|
|
||||||
const result = await db.query<EducationQuestionRow>(
|
|
||||||
`SELECT id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at
|
|
||||||
FROM education_question_bank
|
|
||||||
ORDER BY updated_at DESC, created_at DESC
|
|
||||||
LIMIT 400`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const listDailyEducationQuestions = async (seedDate?: string) => {
|
|
||||||
const result = await db.query<EducationQuestionRow>(
|
|
||||||
`SELECT id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at
|
|
||||||
FROM education_question_bank
|
|
||||||
ORDER BY md5(COALESCE($1::text, CURRENT_DATE::text) || id::text)
|
|
||||||
LIMIT 4`,
|
|
||||||
[seedDate ?? null],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const createEducationQuestion = async ({
|
|
||||||
question,
|
|
||||||
createdByUserId,
|
|
||||||
}: {
|
|
||||||
question: DailyEducationQuestion;
|
|
||||||
createdByUserId: string;
|
|
||||||
}) => {
|
|
||||||
const result = await db.query<EducationQuestionRow>(
|
|
||||||
`INSERT INTO education_question_bank (prompt, options, correct_answer_index, explanation, created_by_user_id)
|
|
||||||
VALUES ($1, $2::jsonb, $3, $4, $5)
|
|
||||||
RETURNING id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at`,
|
|
||||||
[question.prompt, JSON.stringify(question.options), question.correctAnswerIndex, question.explanation, createdByUserId],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0];
|
|
||||||
};
|
|
||||||
|
|
||||||
export const updateEducationQuestion = async (questionId: string, question: DailyEducationQuestion) => {
|
|
||||||
const result = await db.query<EducationQuestionRow>(
|
|
||||||
`UPDATE education_question_bank
|
|
||||||
SET prompt = $2,
|
|
||||||
options = $3::jsonb,
|
|
||||||
correct_answer_index = $4,
|
|
||||||
explanation = $5,
|
|
||||||
updated_at = CURRENT_TIMESTAMP
|
|
||||||
WHERE id = $1
|
|
||||||
RETURNING id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at`,
|
|
||||||
[questionId, question.prompt, JSON.stringify(question.options), question.correctAnswerIndex, question.explanation],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const deleteEducationQuestion = async (questionId: string) => {
|
|
||||||
const result = await db.query<{ id: string }>(
|
|
||||||
`DELETE FROM education_question_bank
|
|
||||||
WHERE id = $1
|
|
||||||
RETURNING id`,
|
|
||||||
[questionId],
|
|
||||||
);
|
|
||||||
|
|
||||||
return Boolean(result.rowCount);
|
|
||||||
};
|
|
||||||
|
|
||||||
export const deleteDailyEducation = async (educationId: string) => {
|
|
||||||
const result = await db.query<{ id: string }>(
|
|
||||||
`DELETE FROM daily_education
|
|
||||||
WHERE id = $1
|
|
||||||
RETURNING id`,
|
|
||||||
[educationId],
|
|
||||||
);
|
|
||||||
|
|
||||||
return Boolean(result.rowCount);
|
|
||||||
};
|
|
||||||
@@ -3,7 +3,6 @@ import test from 'node:test';
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
createWorkspace,
|
createWorkspace,
|
||||||
deleteWorkspaceMember,
|
|
||||||
deleteWorkspaceIfEmpty,
|
deleteWorkspaceIfEmpty,
|
||||||
ensureDefaultWorkspaceForUser,
|
ensureDefaultWorkspaceForUser,
|
||||||
ensurePersonalWorkspaceForUser,
|
ensurePersonalWorkspaceForUser,
|
||||||
@@ -11,7 +10,6 @@ import {
|
|||||||
getPlatformAdminSummary,
|
getPlatformAdminSummary,
|
||||||
listOwnedWorkspacesByOwnerEmail,
|
listOwnedWorkspacesByOwnerEmail,
|
||||||
updateWorkspace,
|
updateWorkspace,
|
||||||
updateWorkspaceMemberRole,
|
|
||||||
} from './workspaceRepository.js';
|
} from './workspaceRepository.js';
|
||||||
import { mockDb } from '../test/mockDb.js';
|
import { mockDb } from '../test/mockDb.js';
|
||||||
import type { UserRow } from '../types.js';
|
import type { UserRow } from '../types.js';
|
||||||
@@ -261,263 +259,6 @@ test('listOwnedWorkspacesByOwnerEmail resolves accepted owner flocks by email',
|
|||||||
assert.match(calls[0].text, /workspaces\.id <> \$2/);
|
assert.match(calls[0].text, /workspaces\.id <> \$2/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole changes a non-owner member role', async () => {
|
|
||||||
const { calls } = mockDb({
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
id: 'member-1',
|
|
||||||
workspace_id: 42,
|
|
||||||
user_id: 'user-2',
|
|
||||||
invite_email: 'helper@example.com',
|
|
||||||
name: 'Helper',
|
|
||||||
role: 'viewer',
|
|
||||||
accepted_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
created_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'member-1',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'viewer',
|
|
||||||
requesterMemberId: 'owner-member',
|
|
||||||
requesterIsBillingOwner: false,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member?.role, 'viewer');
|
|
||||||
assert.deepEqual(calls[0].params, ['member-1', 42, 'viewer', false, 'owner-member', 'billing@example.com', 'owner']);
|
|
||||||
assert.match(calls[0].text, /UPDATE workspace_members/);
|
|
||||||
assert.match(calls[0].text, /role <> 'owner'/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole returns null when no non-owner member matches', async () => {
|
|
||||||
mockDb({
|
|
||||||
rowCount: 0,
|
|
||||||
rows: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'owner-member',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'viewer',
|
|
||||||
requesterMemberId: 'owner-member',
|
|
||||||
requesterIsBillingOwner: false,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member, null);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole lets the billing owner change another owner role', async () => {
|
|
||||||
const { calls } = mockDb({
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
id: 'other-owner',
|
|
||||||
workspace_id: 42,
|
|
||||||
user_id: 'user-2',
|
|
||||||
invite_email: 'other@example.com',
|
|
||||||
name: 'Other Owner',
|
|
||||||
role: 'assistant',
|
|
||||||
accepted_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
created_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'other-owner',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'assistant',
|
|
||||||
requesterMemberId: 'billing-owner',
|
|
||||||
requesterIsBillingOwner: true,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member?.role, 'assistant');
|
|
||||||
assert.deepEqual(calls[0].params, ['other-owner', 42, 'assistant', true, 'billing-owner', 'billing@example.com', 'owner']);
|
|
||||||
assert.match(calls[0].text, /id <> \$5/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole does not let the billing owner change their own owner role', async () => {
|
|
||||||
mockDb({
|
|
||||||
rowCount: 0,
|
|
||||||
rows: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'billing-owner',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'assistant',
|
|
||||||
requesterMemberId: 'billing-owner',
|
|
||||||
requesterIsBillingOwner: true,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member, null);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole lets a non-billing owner change another non-billing owner role', async () => {
|
|
||||||
const { calls } = mockDb({
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
id: 'other-owner',
|
|
||||||
workspace_id: 42,
|
|
||||||
user_id: 'user-2',
|
|
||||||
invite_email: 'other@example.com',
|
|
||||||
name: 'Other Owner',
|
|
||||||
role: 'assistant',
|
|
||||||
accepted_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
created_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'other-owner',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'assistant',
|
|
||||||
requesterMemberId: 'non-billing-owner',
|
|
||||||
requesterIsBillingOwner: false,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member?.role, 'assistant');
|
|
||||||
assert.deepEqual(calls[0].params, ['other-owner', 42, 'assistant', false, 'non-billing-owner', 'billing@example.com', 'owner']);
|
|
||||||
assert.match(calls[0].text, /LOWER\(BTRIM\(COALESCE\(invite_email, email\)\)\) <> LOWER\(BTRIM\(\$6\)\)/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole does not let a non-billing owner change the billing owner role', async () => {
|
|
||||||
mockDb({
|
|
||||||
rowCount: 0,
|
|
||||||
rows: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'billing-owner',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'assistant',
|
|
||||||
requesterMemberId: 'non-billing-owner',
|
|
||||||
requesterIsBillingOwner: false,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member, null);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole lets the billing owner promote a non-owner to owner', async () => {
|
|
||||||
const { calls } = mockDb({
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [
|
|
||||||
{
|
|
||||||
id: 'member-1',
|
|
||||||
workspace_id: 42,
|
|
||||||
user_id: 'user-2',
|
|
||||||
invite_email: 'helper@example.com',
|
|
||||||
name: 'Helper',
|
|
||||||
role: 'owner',
|
|
||||||
accepted_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
created_at: '2026-04-14T00:00:00.000Z',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'member-1',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'owner',
|
|
||||||
requesterMemberId: 'billing-owner',
|
|
||||||
requesterIsBillingOwner: true,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member?.role, 'owner');
|
|
||||||
assert.deepEqual(calls[0].params, ['member-1', 42, 'owner', true, 'billing-owner', 'billing@example.com', 'owner']);
|
|
||||||
assert.match(calls[0].text, /\$3 <> 'owner'/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('updateWorkspaceMemberRole does not let a non-billing owner promote a member to owner', async () => {
|
|
||||||
mockDb({
|
|
||||||
rowCount: 0,
|
|
||||||
rows: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
const member = await updateWorkspaceMemberRole({
|
|
||||||
memberId: 'member-1',
|
|
||||||
workspaceId: 42,
|
|
||||||
role: 'owner',
|
|
||||||
requesterMemberId: 'non-billing-owner',
|
|
||||||
requesterIsBillingOwner: false,
|
|
||||||
requesterRole: 'owner',
|
|
||||||
billingEmail: 'billing@example.com',
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(member, null);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('deleteWorkspaceMember removes non-owner members without billing owner access', async () => {
|
|
||||||
const { calls } = mockDb({
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [{ id: 'member-1' }],
|
|
||||||
});
|
|
||||||
|
|
||||||
const deleted = await deleteWorkspaceMember({
|
|
||||||
memberId: 'member-1',
|
|
||||||
workspaceId: 42,
|
|
||||||
requesterMemberId: 'owner-member',
|
|
||||||
requesterIsBillingOwner: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(deleted, true);
|
|
||||||
assert.deepEqual(calls[0].params, ['member-1', 42, false, 'owner-member']);
|
|
||||||
assert.match(calls[0].text, /role <> 'owner'/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('deleteWorkspaceMember lets the billing owner remove another owner', async () => {
|
|
||||||
const { calls } = mockDb({
|
|
||||||
rowCount: 1,
|
|
||||||
rows: [{ id: 'other-owner' }],
|
|
||||||
});
|
|
||||||
|
|
||||||
const deleted = await deleteWorkspaceMember({
|
|
||||||
memberId: 'other-owner',
|
|
||||||
workspaceId: 42,
|
|
||||||
requesterMemberId: 'billing-owner',
|
|
||||||
requesterIsBillingOwner: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(deleted, true);
|
|
||||||
assert.deepEqual(calls[0].params, ['other-owner', 42, true, 'billing-owner']);
|
|
||||||
assert.match(calls[0].text, /id <> \$4/);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('deleteWorkspaceMember does not let the billing owner remove their own owner membership', async () => {
|
|
||||||
mockDb({
|
|
||||||
rowCount: 0,
|
|
||||||
rows: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
const deleted = await deleteWorkspaceMember({
|
|
||||||
memberId: 'billing-owner',
|
|
||||||
workspaceId: 42,
|
|
||||||
requesterMemberId: 'billing-owner',
|
|
||||||
requesterIsBillingOwner: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
assert.equal(deleted, false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('getPlatformAdminSummary counts memorialized birds separately', async () => {
|
test('getPlatformAdminSummary counts memorialized birds separately', async () => {
|
||||||
const { calls } = mockDb({
|
const { calls } = mockDb({
|
||||||
rowCount: 1,
|
rowCount: 1,
|
||||||
|
|||||||
@@ -364,81 +364,19 @@ export const upsertWorkspaceMember = async ({
|
|||||||
return result.rows[0] ?? null;
|
return result.rows[0] ?? null;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const deleteWorkspaceMember = async ({
|
export const deleteWorkspaceMember = async (memberId: string, workspaceId: number) => {
|
||||||
memberId,
|
|
||||||
workspaceId,
|
|
||||||
requesterMemberId,
|
|
||||||
requesterIsBillingOwner,
|
|
||||||
}: {
|
|
||||||
memberId: string;
|
|
||||||
workspaceId: number;
|
|
||||||
requesterMemberId: string;
|
|
||||||
requesterIsBillingOwner: boolean;
|
|
||||||
}) => {
|
|
||||||
const result = await db.query<{ id: string }>(
|
const result = await db.query<{ id: string }>(
|
||||||
`DELETE FROM workspace_members
|
`DELETE FROM workspace_members
|
||||||
WHERE id = $1
|
WHERE id = $1
|
||||||
AND workspace_id = $2
|
AND workspace_id = $2
|
||||||
AND (
|
AND role <> 'owner'
|
||||||
role <> 'owner'
|
|
||||||
OR (
|
|
||||||
$3 = TRUE
|
|
||||||
AND id <> $4
|
|
||||||
)
|
|
||||||
)
|
|
||||||
RETURNING id`,
|
RETURNING id`,
|
||||||
[memberId, workspaceId, requesterIsBillingOwner, requesterMemberId],
|
[memberId, workspaceId],
|
||||||
);
|
);
|
||||||
|
|
||||||
return Boolean(result.rowCount);
|
return Boolean(result.rowCount);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const updateWorkspaceMemberRole = async ({
|
|
||||||
memberId,
|
|
||||||
workspaceId,
|
|
||||||
role,
|
|
||||||
requesterMemberId,
|
|
||||||
requesterIsBillingOwner,
|
|
||||||
requesterRole,
|
|
||||||
billingEmail,
|
|
||||||
}: {
|
|
||||||
memberId: string;
|
|
||||||
workspaceId: number;
|
|
||||||
role: WorkspaceMemberRow['role'];
|
|
||||||
requesterMemberId: string;
|
|
||||||
requesterIsBillingOwner: boolean;
|
|
||||||
requesterRole: WorkspaceMemberRow['role'];
|
|
||||||
billingEmail: string;
|
|
||||||
}) => {
|
|
||||||
const result = await db.query<WorkspaceMemberRow>(
|
|
||||||
`UPDATE workspace_members
|
|
||||||
SET role = $3
|
|
||||||
WHERE id = $1
|
|
||||||
AND workspace_id = $2
|
|
||||||
AND (
|
|
||||||
$3 <> 'owner'
|
|
||||||
OR $4 = TRUE
|
|
||||||
)
|
|
||||||
AND (
|
|
||||||
role <> 'owner'
|
|
||||||
OR (
|
|
||||||
id <> $5
|
|
||||||
AND (
|
|
||||||
$4 = TRUE
|
|
||||||
OR (
|
|
||||||
$7 = 'owner'
|
|
||||||
AND LOWER(BTRIM(COALESCE(invite_email, email))) <> LOWER(BTRIM($6))
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
RETURNING id, workspace_id, user_id, COALESCE(invite_email, email) AS invite_email, name, role, accepted_at::text, created_at`,
|
|
||||||
[memberId, workspaceId, role, requesterIsBillingOwner, requesterMemberId, billingEmail, requesterRole],
|
|
||||||
);
|
|
||||||
|
|
||||||
return result.rows[0] ?? null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const listRescueWorkspacesForAdmin = async () => {
|
export const listRescueWorkspacesForAdmin = async () => {
|
||||||
const result = await db.query<
|
const result = await db.query<
|
||||||
WorkspaceRow & {
|
WorkspaceRow & {
|
||||||
|
|||||||
+1
-80
@@ -6,45 +6,16 @@ export type SubscriptionStatus = 'active' | 'trialing' | 'past_due' | 'canceled'
|
|||||||
export type RescueVerificationStatus = 'not_required' | 'pending' | 'approved' | 'rejected';
|
export type RescueVerificationStatus = 'not_required' | 'pending' | 'approved' | 'rejected';
|
||||||
export type ProviderKey = 'google' | 'microsoft' | 'apple';
|
export type ProviderKey = 'google' | 'microsoft' | 'apple';
|
||||||
export type IntegrationTokenScope = 'read_only' | 'read_write';
|
export type IntegrationTokenScope = 'read_only' | 'read_write';
|
||||||
export type BirdGender = 'unknown' | 'male' | 'female' | 'male_dna' | 'female_dna';
|
export type BirdGender = 'unknown' | 'male' | 'female';
|
||||||
|
|
||||||
export type UserRow = {
|
export type UserRow = {
|
||||||
id: string;
|
id: string;
|
||||||
email: string;
|
email: string;
|
||||||
password_hash: string | null;
|
password_hash: string | null;
|
||||||
name: string;
|
name: string;
|
||||||
education_opt_out?: boolean;
|
|
||||||
created_at: string;
|
created_at: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type DailyEducationQuestion = {
|
|
||||||
prompt: string;
|
|
||||||
options: string[];
|
|
||||||
correctAnswerIndex: number;
|
|
||||||
explanation: string | null;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type DailyEducationRow = {
|
|
||||||
id: string;
|
|
||||||
publish_date: string;
|
|
||||||
fact: string;
|
|
||||||
quiz_questions: DailyEducationQuestion[];
|
|
||||||
created_by_user_id: string | null;
|
|
||||||
created_at: string;
|
|
||||||
updated_at: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type EducationQuestionRow = {
|
|
||||||
id: string;
|
|
||||||
prompt: string;
|
|
||||||
options: string[];
|
|
||||||
correct_answer_index: number;
|
|
||||||
explanation: string | null;
|
|
||||||
created_by_user_id: string | null;
|
|
||||||
created_at: string;
|
|
||||||
updated_at: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type WorkspaceRow = {
|
export type WorkspaceRow = {
|
||||||
id: number;
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
@@ -130,8 +101,6 @@ export type BirdRow = {
|
|||||||
motivators: string | null;
|
motivators: string | null;
|
||||||
demotivators: string | null;
|
demotivators: string | null;
|
||||||
favorite_snack: string | null;
|
favorite_snack: string | null;
|
||||||
location_label: string | null;
|
|
||||||
location_details: Record<string, unknown> | null;
|
|
||||||
vet_clinic_name: string | null;
|
vet_clinic_name: string | null;
|
||||||
vet_clinic_address: string | null;
|
vet_clinic_address: string | null;
|
||||||
vet_account_number: string | null;
|
vet_account_number: string | null;
|
||||||
@@ -205,26 +174,6 @@ export type BirdTransferCodeRow = {
|
|||||||
created_at: string;
|
created_at: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type BirdTimelineEventType = 'profile_created' | 'transferred' | 'location_updated' | 'owner_changed' | 'manual_note';
|
|
||||||
|
|
||||||
export type BirdTimelineEventRow = {
|
|
||||||
id: string;
|
|
||||||
bird_id: string;
|
|
||||||
event_type: BirdTimelineEventType;
|
|
||||||
from_workspace_id: number | null;
|
|
||||||
to_workspace_id: number | null;
|
|
||||||
from_workspace_name: string | null;
|
|
||||||
to_workspace_name: string | null;
|
|
||||||
from_owner_email: string | null;
|
|
||||||
to_owner_email: string | null;
|
|
||||||
location_label: string | null;
|
|
||||||
location_details: Record<string, unknown> | null;
|
|
||||||
note: string | null;
|
|
||||||
event_date: string;
|
|
||||||
created_by_user_id: string | null;
|
|
||||||
created_at: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type WeightRow = {
|
export type WeightRow = {
|
||||||
id: string;
|
id: string;
|
||||||
bird_id: string;
|
bird_id: string;
|
||||||
@@ -253,7 +202,6 @@ export type MedicationRow = {
|
|||||||
start_date: string;
|
start_date: string;
|
||||||
end_date: string | null;
|
end_date: string | null;
|
||||||
notes: string | null;
|
notes: string | null;
|
||||||
reminders_enabled: boolean;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export type MedicationDoseScheduleItem = {
|
export type MedicationDoseScheduleItem = {
|
||||||
@@ -262,33 +210,6 @@ export type MedicationDoseScheduleItem = {
|
|||||||
time: string;
|
time: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type MedicationReminderCandidateRow = BirdRow & {
|
|
||||||
workspace_name: string;
|
|
||||||
medication_id: string;
|
|
||||||
medication_name: string;
|
|
||||||
dosage: string;
|
|
||||||
frequency: string;
|
|
||||||
dose_schedule: MedicationDoseScheduleItem[];
|
|
||||||
route: string | null;
|
|
||||||
medication_start_date: string;
|
|
||||||
medication_end_date: string | null;
|
|
||||||
medication_notes: string | null;
|
|
||||||
scheduled_on: string;
|
|
||||||
administration_slot: string;
|
|
||||||
administration_label: string;
|
|
||||||
administration_time: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type MedicationReminderDeliveryRow = {
|
|
||||||
id: string;
|
|
||||||
medication_id: string;
|
|
||||||
bird_id: string;
|
|
||||||
workspace_id: number;
|
|
||||||
scheduled_on: string;
|
|
||||||
administration_slot: string;
|
|
||||||
delivered_at: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type MedicationAdministrationRow = {
|
export type MedicationAdministrationRow = {
|
||||||
id: string;
|
id: string;
|
||||||
medication_id: string;
|
medication_id: string;
|
||||||
|
|||||||
+1
-64
@@ -2,36 +2,16 @@ import { Worker } from 'bullmq';
|
|||||||
|
|
||||||
import { ensureSchema } from './db/schema.js';
|
import { ensureSchema } from './db/schema.js';
|
||||||
import { db } from './db/client.js';
|
import { db } from './db/client.js';
|
||||||
import {
|
import { runBirdMilestoneReminders, startBirdMilestoneReminderScheduler } from './app.js';
|
||||||
runBirdMilestoneReminders,
|
|
||||||
runMedicationReminders,
|
|
||||||
startBirdMilestoneReminderScheduler,
|
|
||||||
startMedicationReminderScheduler,
|
|
||||||
} from './app.js';
|
|
||||||
import {
|
|
||||||
adoptionReportQueueName,
|
|
||||||
closeAdoptionReportQueue,
|
|
||||||
type AdoptionReportJobData,
|
|
||||||
type AdoptionReportJobResult,
|
|
||||||
} from './queues/adoptionReportQueue.js';
|
|
||||||
import {
|
import {
|
||||||
birdMilestoneReminderQueueName,
|
birdMilestoneReminderQueueName,
|
||||||
closeBirdMilestoneReminderQueue,
|
closeBirdMilestoneReminderQueue,
|
||||||
type BirdMilestoneReminderJobData,
|
type BirdMilestoneReminderJobData,
|
||||||
type BirdMilestoneReminderJobResult,
|
type BirdMilestoneReminderJobResult,
|
||||||
} from './queues/birdMilestoneReminderQueue.js';
|
} from './queues/birdMilestoneReminderQueue.js';
|
||||||
import {
|
|
||||||
closeMedicationReminderQueue,
|
|
||||||
medicationReminderQueueName,
|
|
||||||
type MedicationReminderJobData,
|
|
||||||
type MedicationReminderJobResult,
|
|
||||||
} from './queues/medicationReminderQueue.js';
|
|
||||||
import { redisConnection } from './queues/redisConnection.js';
|
import { redisConnection } from './queues/redisConnection.js';
|
||||||
import { renderAdoptionReportForBird } from './reports/adoptionReportJob.js';
|
|
||||||
|
|
||||||
let birdMilestoneWorker: Worker<BirdMilestoneReminderJobData, BirdMilestoneReminderJobResult> | null = null;
|
let birdMilestoneWorker: Worker<BirdMilestoneReminderJobData, BirdMilestoneReminderJobResult> | null = null;
|
||||||
let medicationReminderWorker: Worker<MedicationReminderJobData, MedicationReminderJobResult> | null = null;
|
|
||||||
let adoptionReportWorker: Worker<AdoptionReportJobData, AdoptionReportJobResult> | null = null;
|
|
||||||
|
|
||||||
const startWorker = async () => {
|
const startWorker = async () => {
|
||||||
await ensureSchema();
|
await ensureSchema();
|
||||||
@@ -55,57 +35,14 @@ const startWorker = async () => {
|
|||||||
console.error(`Bird milestone reminder job failed: id=${job?.id ?? 'unknown'}`, error);
|
console.error(`Bird milestone reminder job failed: id=${job?.id ?? 'unknown'}`, error);
|
||||||
});
|
});
|
||||||
|
|
||||||
medicationReminderWorker = new Worker<MedicationReminderJobData, MedicationReminderJobResult>(
|
|
||||||
medicationReminderQueueName,
|
|
||||||
async (job) => {
|
|
||||||
const result = await runMedicationReminders(job.data.runDate, job.data.currentTime);
|
|
||||||
console.log(
|
|
||||||
`Medication reminder job completed for ${result.runDate} ${result.currentTime}: checked=${result.checked}, sent=${result.sent}, skipped=${result.skipped}, failed=${result.failed}`,
|
|
||||||
);
|
|
||||||
return result;
|
|
||||||
},
|
|
||||||
{
|
|
||||||
connection: redisConnection,
|
|
||||||
concurrency: 1,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
medicationReminderWorker.on('failed', (job, error) => {
|
|
||||||
console.error(`Medication reminder job failed: id=${job?.id ?? 'unknown'}`, error);
|
|
||||||
});
|
|
||||||
|
|
||||||
adoptionReportWorker = new Worker<AdoptionReportJobData, AdoptionReportJobResult>(
|
|
||||||
adoptionReportQueueName,
|
|
||||||
async (job) => {
|
|
||||||
const pdf = await renderAdoptionReportForBird(job.data);
|
|
||||||
console.log(`Adoption report job completed: id=${job.id ?? 'unknown'}, birdId=${job.data.birdId}, bytes=${pdf.length}`);
|
|
||||||
return {
|
|
||||||
pdfBase64: pdf.toString('base64'),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
{
|
|
||||||
connection: redisConnection,
|
|
||||||
concurrency: 1,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
adoptionReportWorker.on('failed', (job, error) => {
|
|
||||||
console.error(`Adoption report job failed: id=${job?.id ?? 'unknown'}, birdId=${job?.data.birdId ?? 'unknown'}`, error);
|
|
||||||
});
|
|
||||||
|
|
||||||
startBirdMilestoneReminderScheduler();
|
startBirdMilestoneReminderScheduler();
|
||||||
startMedicationReminderScheduler();
|
|
||||||
console.log('FlockPal worker started.');
|
console.log('FlockPal worker started.');
|
||||||
};
|
};
|
||||||
|
|
||||||
const shutdown = async (signal: string) => {
|
const shutdown = async (signal: string) => {
|
||||||
console.log(`FlockPal worker received ${signal}; shutting down.`);
|
console.log(`FlockPal worker received ${signal}; shutting down.`);
|
||||||
await birdMilestoneWorker?.close();
|
await birdMilestoneWorker?.close();
|
||||||
await medicationReminderWorker?.close();
|
|
||||||
await adoptionReportWorker?.close();
|
|
||||||
await closeBirdMilestoneReminderQueue();
|
await closeBirdMilestoneReminderQueue();
|
||||||
await closeMedicationReminderQueue();
|
|
||||||
await closeAdoptionReportQueue();
|
|
||||||
await db.close();
|
await db.close();
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ services:
|
|||||||
POSTGRES_USER: ${POSTGRES_USER:-flockpal}
|
POSTGRES_USER: ${POSTGRES_USER:-flockpal}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD for production}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?set POSTGRES_PASSWORD for production}
|
||||||
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
||||||
ADOPTION_REPORT_RENDER_TIMEOUT_MS: ${ADOPTION_REPORT_RENDER_TIMEOUT_MS:-45000}
|
|
||||||
IMAGE_STORAGE_PROVIDER: ${IMAGE_STORAGE_PROVIDER:-database}
|
IMAGE_STORAGE_PROVIDER: ${IMAGE_STORAGE_PROVIDER:-database}
|
||||||
S3_ENDPOINT: ${S3_ENDPOINT:-}
|
S3_ENDPOINT: ${S3_ENDPOINT:-}
|
||||||
S3_REGION: ${S3_REGION:-}
|
S3_REGION: ${S3_REGION:-}
|
||||||
@@ -55,12 +54,10 @@ services:
|
|||||||
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
||||||
FRONTEND_URL: ${FRONTEND_URL:?set FRONTEND_URL for production}
|
FRONTEND_URL: ${FRONTEND_URL:?set FRONTEND_URL for production}
|
||||||
BACKEND_URL: ${BACKEND_URL:?set BACKEND_URL for production}
|
BACKEND_URL: ${BACKEND_URL:?set BACKEND_URL for production}
|
||||||
MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
|
|
||||||
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
||||||
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
||||||
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
||||||
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
||||||
MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
|
|
||||||
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
||||||
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
|
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
|
||||||
GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
|
GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
|
||||||
@@ -137,12 +134,10 @@ services:
|
|||||||
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
||||||
FRONTEND_URL: ${FRONTEND_URL:?set FRONTEND_URL for production}
|
FRONTEND_URL: ${FRONTEND_URL:?set FRONTEND_URL for production}
|
||||||
BACKEND_URL: ${BACKEND_URL:?set BACKEND_URL for production}
|
BACKEND_URL: ${BACKEND_URL:?set BACKEND_URL for production}
|
||||||
MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
|
|
||||||
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
||||||
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
||||||
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
||||||
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
||||||
MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
|
|
||||||
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
||||||
SMTP_HOST: ${SMTP_HOST:-}
|
SMTP_HOST: ${SMTP_HOST:-}
|
||||||
SMTP_PORT: ${SMTP_PORT:-587}
|
SMTP_PORT: ${SMTP_PORT:-587}
|
||||||
|
|||||||
+1
-6
@@ -41,7 +41,6 @@ services:
|
|||||||
POSTGRES_USER: ${POSTGRES_USER:-flockpal}
|
POSTGRES_USER: ${POSTGRES_USER:-flockpal}
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-flockpal_dev_password}
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-flockpal_dev_password}
|
||||||
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
REDIS_URL: ${REDIS_URL:-redis://redis:6379}
|
||||||
ADOPTION_REPORT_RENDER_TIMEOUT_MS: ${ADOPTION_REPORT_RENDER_TIMEOUT_MS:-45000}
|
|
||||||
IMAGE_STORAGE_PROVIDER: ${IMAGE_STORAGE_PROVIDER:-database}
|
IMAGE_STORAGE_PROVIDER: ${IMAGE_STORAGE_PROVIDER:-database}
|
||||||
S3_ENDPOINT: ${S3_ENDPOINT:-}
|
S3_ENDPOINT: ${S3_ENDPOINT:-}
|
||||||
S3_REGION: ${S3_REGION:-}
|
S3_REGION: ${S3_REGION:-}
|
||||||
@@ -53,12 +52,10 @@ services:
|
|||||||
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
||||||
FRONTEND_URL: ${FRONTEND_URL:-http://localhost:3000}
|
FRONTEND_URL: ${FRONTEND_URL:-http://localhost:3000}
|
||||||
BACKEND_URL: ${BACKEND_URL:-http://localhost:5000}
|
BACKEND_URL: ${BACKEND_URL:-http://localhost:5000}
|
||||||
MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
|
|
||||||
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
||||||
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
||||||
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
||||||
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
||||||
MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
|
|
||||||
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
||||||
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
|
GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
|
||||||
GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
|
GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET:-}
|
||||||
@@ -130,12 +127,10 @@ services:
|
|||||||
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
PHOTO_DELIVERY_MODE: ${PHOTO_DELIVERY_MODE:-proxy}
|
||||||
FRONTEND_URL: ${FRONTEND_URL:-http://localhost:3000}
|
FRONTEND_URL: ${FRONTEND_URL:-http://localhost:3000}
|
||||||
BACKEND_URL: ${BACKEND_URL:-http://localhost:5000}
|
BACKEND_URL: ${BACKEND_URL:-http://localhost:5000}
|
||||||
MAPBOX_ACCESS_TOKEN: ${MAPBOX_ACCESS_TOKEN:-}
|
|
||||||
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
ADMIN_EMAILS: ${ADMIN_EMAILS:-}
|
||||||
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
RESCUE_STATUS_NOTIFICATION_EMAIL: ${RESCUE_STATUS_NOTIFICATION_EMAIL:-appadmin@flockpal.app}
|
||||||
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
RESCUE_ONBOARDING_WEBHOOK_URL: ${RESCUE_ONBOARDING_WEBHOOK_URL:-https://n8n.blaishome.online/webhook/395cd538-5e0d-4e89-8070-9e66f571b7ee}
|
||||||
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
MILESTONE_REMINDERS_ENABLED: ${MILESTONE_REMINDERS_ENABLED:-true}
|
||||||
MEDICATION_REMINDERS_ENABLED: ${MEDICATION_REMINDERS_ENABLED:-true}
|
|
||||||
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
MILESTONE_REMINDER_TIME_ZONE: ${MILESTONE_REMINDER_TIME_ZONE:-America/New_York}
|
||||||
SMTP_HOST: ${SMTP_HOST:-}
|
SMTP_HOST: ${SMTP_HOST:-}
|
||||||
SMTP_PORT: ${SMTP_PORT:-587}
|
SMTP_PORT: ${SMTP_PORT:-587}
|
||||||
@@ -162,7 +157,7 @@ services:
|
|||||||
dockerfile: Dockerfile.dev
|
dockerfile: Dockerfile.dev
|
||||||
container_name: flockpal-frontend
|
container_name: flockpal-frontend
|
||||||
environment:
|
environment:
|
||||||
VITE_API_BASE_URL: ${VITE_API_BASE_URL:-/api}
|
VITE_API_BASE_URL: ${VITE_API_BASE_URL:-http://localhost:5000/api}
|
||||||
depends_on:
|
depends_on:
|
||||||
- backend
|
- backend
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ Role requirements are called out per endpoint below. If the signed-in member lac
|
|||||||
"vetClinicAddress": "123 Feather Lane, Raleigh, NC",
|
"vetClinicAddress": "123 Feather Lane, Raleigh, NC",
|
||||||
"vetAccountNumber": "FP-1001",
|
"vetAccountNumber": "FP-1001",
|
||||||
"vetDoctorName": "Dr. Rivera",
|
"vetDoctorName": "Dr. Rivera",
|
||||||
"gender": "female_dna",
|
"gender": "female",
|
||||||
"dateOfBirth": "2023-05-10",
|
"dateOfBirth": "2023-05-10",
|
||||||
"gotchaDay": "2023-08-21",
|
"gotchaDay": "2023-08-21",
|
||||||
"chartColor": "#cb3a35",
|
"chartColor": "#cb3a35",
|
||||||
@@ -299,7 +299,7 @@ Role requirements are called out per endpoint below. If the signed-in member lac
|
|||||||
- Dates use `YYYY-MM-DD`
|
- Dates use `YYYY-MM-DD`
|
||||||
- `workspaceType` is `standard` or `rescue`
|
- `workspaceType` is `standard` or `rescue`
|
||||||
- member `role` is `owner`, `assistant`, `caregiver`, or `viewer`
|
- member `role` is `owner`, `assistant`, `caregiver`, or `viewer`
|
||||||
- bird `gender` is `unknown`, `male`, `female`, `male_dna`, or `female_dna`; `male` and `female` indicate assumed sex
|
- bird `gender` is `unknown`, `male`, or `female`
|
||||||
- bird `chartColor` must be a `#RRGGBB` hex color
|
- bird `chartColor` must be a `#RRGGBB` hex color
|
||||||
- `photoDataUrl` must be a base64 `data:image/...` URL
|
- `photoDataUrl` must be a base64 `data:image/...` URL
|
||||||
- `weightGrams` must be a positive number up to `10000`
|
- `weightGrams` must be a positive number up to `10000`
|
||||||
@@ -801,7 +801,7 @@ Request body:
|
|||||||
"vetClinicAddress": "123 Feather Lane, Raleigh, NC",
|
"vetClinicAddress": "123 Feather Lane, Raleigh, NC",
|
||||||
"vetAccountNumber": "FP-1001",
|
"vetAccountNumber": "FP-1001",
|
||||||
"vetDoctorName": "Dr. Rivera",
|
"vetDoctorName": "Dr. Rivera",
|
||||||
"gender": "female_dna",
|
"gender": "female",
|
||||||
"dateOfBirth": "2023-05-10",
|
"dateOfBirth": "2023-05-10",
|
||||||
"gotchaDay": "2023-08-21",
|
"gotchaDay": "2023-08-21",
|
||||||
"chartColor": "#cb3a35",
|
"chartColor": "#cb3a35",
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ RUN npm ci
|
|||||||
COPY tsconfig*.json ./
|
COPY tsconfig*.json ./
|
||||||
COPY vite.config.ts ./
|
COPY vite.config.ts ./
|
||||||
COPY index.html ./
|
COPY index.html ./
|
||||||
COPY public ./public
|
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ RUN npm install
|
|||||||
COPY tsconfig*.json ./
|
COPY tsconfig*.json ./
|
||||||
COPY vite.config.ts ./
|
COPY vite.config.ts ./
|
||||||
COPY index.html ./
|
COPY index.html ./
|
||||||
COPY public ./public
|
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
CMD ["npm", "run", "dev", "--", "--host"]
|
CMD ["npm", "run", "dev", "--", "--host"]
|
||||||
|
|||||||
+755
-1925
File diff suppressed because it is too large
Load Diff
+15
-570
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
:root {
|
:root {
|
||||||
--ink: #1f2a2a;
|
--ink: #1f2a2a;
|
||||||
--muted: #5d5f59;
|
--muted: #5d5f59;
|
||||||
@@ -617,6 +616,14 @@ textarea {
|
|||||||
break-inside: avoid;
|
break-inside: avoid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.settings-card-bird-profiles {
|
||||||
|
order: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-card-bird-profiles[hidden] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.settings-card-collaborators {
|
.settings-card-collaborators {
|
||||||
order: 2;
|
order: 2;
|
||||||
}
|
}
|
||||||
@@ -743,123 +750,6 @@ textarea {
|
|||||||
align-content: start;
|
align-content: start;
|
||||||
}
|
}
|
||||||
|
|
||||||
.daily-education-panel,
|
|
||||||
.daily-quiz,
|
|
||||||
.quiz-options,
|
|
||||||
.education-question-editor {
|
|
||||||
display: grid;
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.daily-education-panel.condensed {
|
|
||||||
gap: 0.35rem;
|
|
||||||
padding-block: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.daily-education-panel.condensed .panel-header {
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.daily-education-teaser {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.daily-fact {
|
|
||||||
margin: 0;
|
|
||||||
padding: 1rem;
|
|
||||||
border-left: 4px solid var(--accent-gold);
|
|
||||||
border-radius: 0 8px 8px 0;
|
|
||||||
background: rgba(255, 254, 250, 0.7);
|
|
||||||
font-size: 1.08rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.daily-quiz {
|
|
||||||
grid-template-columns: repeat(auto-fit, minmax(min(290px, 100%), 1fr));
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-question,
|
|
||||||
.quiz-editor-question {
|
|
||||||
min-width: 0;
|
|
||||||
margin: 0;
|
|
||||||
border: 1px solid var(--button-border);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-question {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.85rem;
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 8px;
|
|
||||||
background: rgba(255, 254, 250, 0.64);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-question legend,
|
|
||||||
.quiz-editor-question legend {
|
|
||||||
padding: 0 0.35rem;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-option {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: auto minmax(0, 1fr);
|
|
||||||
align-items: start;
|
|
||||||
gap: 0.65rem;
|
|
||||||
min-width: 0;
|
|
||||||
padding: 0.7rem;
|
|
||||||
border: 1px solid rgba(39, 105, 179, 0.12);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: rgba(255, 255, 255, 0.58);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-option.correct {
|
|
||||||
border-color: rgba(35, 138, 90, 0.42);
|
|
||||||
background: rgba(223, 247, 229, 0.82);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-option.incorrect {
|
|
||||||
border-color: rgba(203, 58, 53, 0.36);
|
|
||||||
background: rgba(255, 236, 232, 0.82);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-option input {
|
|
||||||
width: auto;
|
|
||||||
margin: 0.25rem 0 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-feedback {
|
|
||||||
margin: 0;
|
|
||||||
color: var(--accent-red);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-feedback.correct {
|
|
||||||
color: var(--accent-green);
|
|
||||||
}
|
|
||||||
|
|
||||||
.admin-education-panel,
|
|
||||||
.education-admin-basics,
|
|
||||||
.quiz-editor-question,
|
|
||||||
.education-admin-list {
|
|
||||||
display: grid;
|
|
||||||
gap: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.education-admin-basics {
|
|
||||||
grid-template-columns: minmax(180px, 0.35fr) minmax(0, 1fr);
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-editor-question {
|
|
||||||
padding: 1rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiz-editor-options {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
|
||||||
gap: 0.8rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.education-admin-list span {
|
|
||||||
overflow-wrap: anywhere;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button-row {
|
.button-row {
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 0.75rem;
|
gap: 0.75rem;
|
||||||
@@ -993,19 +883,10 @@ textarea {
|
|||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bird-card-title .bird-card-gender-cluster {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.28rem;
|
|
||||||
line-height: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-inline {
|
.gender-inline {
|
||||||
font-size: 1.45rem;
|
font-size: 1.2rem;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.gender-inline.male {
|
.gender-inline.male {
|
||||||
@@ -1020,99 +901,6 @@ textarea {
|
|||||||
color: var(--muted);
|
color: var(--muted);
|
||||||
}
|
}
|
||||||
|
|
||||||
.gender-source-icon {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 1.45rem;
|
|
||||||
height: 1.45rem;
|
|
||||||
flex: 0 0 1.45rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
font-weight: 800;
|
|
||||||
line-height: 1;
|
|
||||||
vertical-align: middle;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon svg {
|
|
||||||
width: 1.28rem;
|
|
||||||
height: 1.28rem;
|
|
||||||
fill: none;
|
|
||||||
stroke-linecap: round;
|
|
||||||
stroke-linejoin: round;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon.dna {
|
|
||||||
width: 1.9rem;
|
|
||||||
height: 1.9rem;
|
|
||||||
flex-basis: 1.9rem;
|
|
||||||
background: rgba(91, 74, 161, 0.1);
|
|
||||||
color: #5b4aa1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon.dna svg {
|
|
||||||
width: 1.72rem;
|
|
||||||
height: 1.72rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon .dna-ring {
|
|
||||||
fill: none;
|
|
||||||
stroke: currentColor;
|
|
||||||
stroke-width: 1.15;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon .dna-strand {
|
|
||||||
stroke: currentColor;
|
|
||||||
stroke-width: 1.35;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon .dna-rung {
|
|
||||||
stroke: currentColor;
|
|
||||||
stroke-width: 1.05;
|
|
||||||
opacity: 0.82;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon .dna-dot {
|
|
||||||
fill: currentColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon.assumed {
|
|
||||||
width: 1.9rem;
|
|
||||||
height: 1.9rem;
|
|
||||||
flex-basis: 1.9rem;
|
|
||||||
background: rgba(93, 95, 89, 0.12);
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon.assumed svg {
|
|
||||||
width: 1.72rem;
|
|
||||||
height: 1.72rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon .assumed-eye {
|
|
||||||
stroke: currentColor;
|
|
||||||
stroke-width: 1.7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-source-icon .assumed-pupil {
|
|
||||||
fill: currentColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-card-title .gender-source-icon {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 1.05rem;
|
|
||||||
height: 1.05rem;
|
|
||||||
flex-basis: 1.05rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-card-title .gender-source-icon svg {
|
|
||||||
display: block;
|
|
||||||
width: 0.92rem;
|
|
||||||
height: 0.92rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-avatar,
|
.bird-avatar,
|
||||||
.profile-photo {
|
.profile-photo {
|
||||||
width: 56px;
|
width: 56px;
|
||||||
@@ -1325,264 +1113,6 @@ textarea {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bird-timeline-card {
|
|
||||||
grid-template-columns: 18px minmax(0, 1fr);
|
|
||||||
gap: 0.75rem;
|
|
||||||
border: 1px solid rgba(39, 105, 179, 0.12);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: rgba(255, 255, 255, 0.76);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-card {
|
|
||||||
padding: 0.85rem;
|
|
||||||
border: 1px solid rgba(39, 105, 179, 0.12);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: rgba(255, 255, 255, 0.72);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph {
|
|
||||||
position: relative;
|
|
||||||
min-height: 340px;
|
|
||||||
isolation: isolate;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-line {
|
|
||||||
position: absolute;
|
|
||||||
left: calc(8.125% + 18px);
|
|
||||||
right: 8.125%;
|
|
||||||
top: 50%;
|
|
||||||
height: 4px;
|
|
||||||
border-radius: 999px;
|
|
||||||
background: var(--timeline-color, var(--accent-green));
|
|
||||||
transform: translateY(-50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-scale {
|
|
||||||
position: absolute;
|
|
||||||
inset: 0;
|
|
||||||
pointer-events: none;
|
|
||||||
z-index: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-tick {
|
|
||||||
position: absolute;
|
|
||||||
top: calc(50% + 78px);
|
|
||||||
transform: translateX(-50%);
|
|
||||||
color: var(--muted);
|
|
||||||
font-size: 0.68rem;
|
|
||||||
font-weight: 600;
|
|
||||||
line-height: 1;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-tick::before {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
bottom: calc(100% + 0.35rem);
|
|
||||||
width: 1px;
|
|
||||||
height: 68px;
|
|
||||||
background: linear-gradient(to bottom, rgba(39, 105, 179, 0.22), rgba(39, 105, 179, 0));
|
|
||||||
transform: translateX(-50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-tick.today {
|
|
||||||
color: var(--accent-green);
|
|
||||||
font-weight: 800;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-tick.today::before {
|
|
||||||
background: linear-gradient(to bottom, rgba(35, 138, 90, 0.42), rgba(35, 138, 90, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point {
|
|
||||||
position: absolute;
|
|
||||||
top: 50%;
|
|
||||||
width: 136px;
|
|
||||||
height: 0;
|
|
||||||
transform: translateX(-50%);
|
|
||||||
z-index: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-dot {
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
z-index: 2;
|
|
||||||
display: grid;
|
|
||||||
place-items: center;
|
|
||||||
width: 34px;
|
|
||||||
height: 34px;
|
|
||||||
border: 0;
|
|
||||||
border-radius: 0;
|
|
||||||
background: transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.above .bird-timeline-graph-dot {
|
|
||||||
left: calc(50% + var(--branch-offset, 0px));
|
|
||||||
bottom: var(--branch-distance, 34px);
|
|
||||||
transform: translate(-50%, 50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.below .bird-timeline-graph-dot {
|
|
||||||
left: calc(50% + var(--branch-offset, 0px));
|
|
||||||
top: var(--branch-distance, 34px);
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.on-line .bird-timeline-graph-dot {
|
|
||||||
top: 0;
|
|
||||||
transform: translate(-50%, -50%);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.hatch_date .bird-timeline-graph-dot {
|
|
||||||
width: 34px;
|
|
||||||
height: 34px;
|
|
||||||
border: 0;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: #fffdf9;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-connector {
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
width: 2px;
|
|
||||||
height: var(--branch-connector-length, var(--branch-distance, 34px));
|
|
||||||
background: repeating-linear-gradient(
|
|
||||||
to bottom,
|
|
||||||
rgba(39, 105, 179, 0.18) 0 4px,
|
|
||||||
transparent 4px 9px
|
|
||||||
);
|
|
||||||
transform: translateX(-50%) rotate(var(--branch-angle, 0deg));
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.above .bird-timeline-graph-connector {
|
|
||||||
bottom: 0;
|
|
||||||
transform-origin: bottom center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.below .bird-timeline-graph-connector {
|
|
||||||
top: 0;
|
|
||||||
transform-origin: top center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.on-line .bird-timeline-graph-connector {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-icon {
|
|
||||||
width: 24px;
|
|
||||||
height: 24px;
|
|
||||||
color: var(--accent-green);
|
|
||||||
fill: currentColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.hatch_date .bird-timeline-graph-icon {
|
|
||||||
width: 34px;
|
|
||||||
height: 34px;
|
|
||||||
color: var(--accent-gold);
|
|
||||||
font-size: 34px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.owner_changed .bird-timeline-graph-icon {
|
|
||||||
color: var(--accent-blue);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.transferred .bird-timeline-graph-icon {
|
|
||||||
color: var(--accent-red);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-copy {
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
width: 124px;
|
|
||||||
transform: translateX(-50%);
|
|
||||||
display: grid;
|
|
||||||
gap: 0.08rem;
|
|
||||||
justify-items: center;
|
|
||||||
text-align: center;
|
|
||||||
color: var(--ink);
|
|
||||||
font-size: 0.68rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-copy strong {
|
|
||||||
font-weight: 700;
|
|
||||||
line-height: 1.15;
|
|
||||||
max-width: 100%;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
overflow-wrap: anywhere;
|
|
||||||
display: -webkit-box;
|
|
||||||
-webkit-box-orient: vertical;
|
|
||||||
-webkit-line-clamp: 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-copy span {
|
|
||||||
color: var(--muted);
|
|
||||||
line-height: 1.1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.above .bird-timeline-graph-copy {
|
|
||||||
left: calc(50% + var(--branch-offset, 0px));
|
|
||||||
bottom: calc(var(--branch-distance, 34px) + 24px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.below .bird-timeline-graph-copy {
|
|
||||||
left: calc(50% + var(--branch-offset, 0px));
|
|
||||||
top: calc(var(--branch-distance, 34px) + 24px);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-graph-point.on-line .bird-timeline-graph-copy {
|
|
||||||
bottom: 28px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-form {
|
|
||||||
padding: 0.85rem;
|
|
||||||
border: 1px solid rgba(35, 138, 90, 0.14);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: rgba(240, 248, 244, 0.54);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-marker {
|
|
||||||
width: 12px;
|
|
||||||
height: 12px;
|
|
||||||
margin-top: 0.25rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
background: var(--accent-green);
|
|
||||||
box-shadow: 0 0 0 4px rgba(35, 138, 90, 0.12);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-content {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.3rem;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-content > div {
|
|
||||||
display: flex;
|
|
||||||
align-items: baseline;
|
|
||||||
justify-content: space-between;
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-content strong,
|
|
||||||
.bird-timeline-content span,
|
|
||||||
.bird-timeline-content small,
|
|
||||||
.bird-timeline-content p {
|
|
||||||
overflow-wrap: anywhere;
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-content span,
|
|
||||||
.bird-timeline-content small {
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.bird-timeline-content p {
|
|
||||||
margin: 0;
|
|
||||||
color: var(--ink);
|
|
||||||
}
|
|
||||||
|
|
||||||
.legend-grid,
|
.legend-grid,
|
||||||
.detail-grid,
|
.detail-grid,
|
||||||
.summary-grid {
|
.summary-grid {
|
||||||
@@ -1682,7 +1212,6 @@ textarea {
|
|||||||
.bird-detail-tab .info-tab-icon,
|
.bird-detail-tab .info-tab-icon,
|
||||||
.bird-detail-tab .note-tab-icon,
|
.bird-detail-tab .note-tab-icon,
|
||||||
.bird-detail-tab .report-tab-icon,
|
.bird-detail-tab .report-tab-icon,
|
||||||
.bird-detail-tab .timeline-tab-icon,
|
|
||||||
.bird-detail-tab .audit-tab-icon,
|
.bird-detail-tab .audit-tab-icon,
|
||||||
.bird-detail-tab .vet-tab-icon {
|
.bird-detail-tab .vet-tab-icon {
|
||||||
width: 24px;
|
width: 24px;
|
||||||
@@ -1711,7 +1240,7 @@ textarea {
|
|||||||
|
|
||||||
.profile-copy {
|
.profile-copy {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 0.18rem;
|
gap: 0.3rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.profile-copy h3 {
|
.profile-copy h3 {
|
||||||
@@ -1719,10 +1248,6 @@ textarea {
|
|||||||
font-size: 1.6rem;
|
font-size: 1.6rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.profile-copy p {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.profile-title {
|
.profile-title {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -1733,26 +1258,14 @@ textarea {
|
|||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
width: 1.9rem;
|
min-width: 1.9rem;
|
||||||
height: 1.9rem;
|
height: 1.9rem;
|
||||||
flex: 0 0 1.9rem;
|
|
||||||
border-radius: 999px;
|
border-radius: 999px;
|
||||||
font-size: 1.45rem;
|
font-size: 1.2rem;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.gender-symbol-mark {
|
|
||||||
display: block;
|
|
||||||
line-height: 0.82;
|
|
||||||
transform: scale(1.16);
|
|
||||||
transform-origin: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.profile-title .gender-symbol-mark {
|
|
||||||
transform: scale(1.28);
|
|
||||||
}
|
|
||||||
|
|
||||||
.gender-symbol.male {
|
.gender-symbol.male {
|
||||||
background: rgba(39, 105, 179, 0.12);
|
background: rgba(39, 105, 179, 0.12);
|
||||||
color: var(--accent-blue);
|
color: var(--accent-blue);
|
||||||
@@ -1775,7 +1288,7 @@ textarea {
|
|||||||
|
|
||||||
.segmented-control {
|
.segmented-control {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(auto-fit, minmax(8.5rem, 1fr));
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
gap: 0.55rem;
|
gap: 0.55rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2171,60 +1684,6 @@ label {
|
|||||||
font-size: 0.95rem;
|
font-size: 0.95rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.verified-location-field {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-label {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.35rem;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-search-row {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: minmax(0, 1fr) auto;
|
|
||||||
gap: 0.65rem;
|
|
||||||
align-items: end;
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-search-row.has-selected-location {
|
|
||||||
grid-template-columns: minmax(0, 1fr) auto auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-search-row.has-selected-location input {
|
|
||||||
border-color: rgba(35, 138, 90, 0.45);
|
|
||||||
background: rgba(35, 138, 90, 0.08);
|
|
||||||
box-shadow: 0 0 0 3px rgba(35, 138, 90, 0.08);
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-result small {
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-results {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.45rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-result {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.15rem;
|
|
||||||
width: 100%;
|
|
||||||
padding: 0.8rem 0.9rem;
|
|
||||||
text-align: left;
|
|
||||||
color: var(--ink);
|
|
||||||
border: 1px solid rgba(53, 129, 98, 0.2);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: rgba(255, 255, 255, 0.55);
|
|
||||||
}
|
|
||||||
|
|
||||||
.verified-location-result:hover {
|
|
||||||
border-color: rgba(39, 105, 179, 0.28);
|
|
||||||
background: rgba(255, 255, 255, 0.78);
|
|
||||||
}
|
|
||||||
|
|
||||||
.toggle-card input[type="checkbox"] {
|
.toggle-card input[type="checkbox"] {
|
||||||
width: 20px;
|
width: 20px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
@@ -2544,11 +2003,6 @@ label {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 980px) {
|
@media (max-width: 980px) {
|
||||||
.education-admin-basics,
|
|
||||||
.quiz-editor-options {
|
|
||||||
grid-template-columns: 1fr;
|
|
||||||
}
|
|
||||||
|
|
||||||
.app-shell,
|
.app-shell,
|
||||||
.auth-panel,
|
.auth-panel,
|
||||||
.hero-card,
|
.hero-card,
|
||||||
@@ -2559,8 +2013,7 @@ label {
|
|||||||
.inline-form,
|
.inline-form,
|
||||||
.profile-hero,
|
.profile-hero,
|
||||||
.photo-editor,
|
.photo-editor,
|
||||||
.settings-nested-grid,
|
.settings-nested-grid {
|
||||||
.verified-location-search-row {
|
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2637,25 +2090,17 @@ label {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.page-tabs {
|
.page-tabs {
|
||||||
grid-auto-flow: column;
|
grid-template-columns: repeat(auto-fit, minmax(64px, 1fr));
|
||||||
grid-auto-columns: minmax(5.5rem, max-content);
|
|
||||||
grid-template-columns: none;
|
|
||||||
gap: 0.4rem;
|
gap: 0.4rem;
|
||||||
min-width: 0;
|
|
||||||
overflow-x: auto;
|
|
||||||
padding-bottom: 0.1rem;
|
|
||||||
scrollbar-width: thin;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-tab {
|
.page-tab {
|
||||||
min-height: 42px;
|
min-height: 42px;
|
||||||
min-width: 5.5rem;
|
|
||||||
padding: 0.55rem 0.65rem;
|
padding: 0.55rem 0.65rem;
|
||||||
border-radius: 14px;
|
border-radius: 14px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 0.92rem;
|
font-size: 0.92rem;
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
white-space: nowrap;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.side-nav .secondary-button {
|
.side-nav .secondary-button {
|
||||||
|
|||||||
@@ -5,11 +5,5 @@ export default defineConfig({
|
|||||||
plugins: [react()],
|
plugins: [react()],
|
||||||
server: {
|
server: {
|
||||||
port: 3000,
|
port: 3000,
|
||||||
proxy: {
|
|
||||||
'/api': {
|
|
||||||
target: 'http://backend:5000',
|
|
||||||
changeOrigin: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user