Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
802544e452 | ||
|
|
8205fee420 | ||
|
|
4869756957 |
No files matched your search
@@ -53,7 +53,6 @@ jobs:
|
||||
env:
|
||||
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
|
||||
JOB_STATUS: ${{ job.status }}
|
||||
DEPLOY_ENVIRONMENT: dev
|
||||
run: |
|
||||
if [ -z "$DISCORD_WEBHOOK_URL" ]; then
|
||||
echo "DISCORD_WEBHOOK_URL is not configured; skipping Discord notification."
|
||||
@@ -61,14 +60,53 @@ jobs:
|
||||
fi
|
||||
|
||||
if [ "$JOB_STATUS" = "success" ]; then
|
||||
STATUS_LABEL="SUCCESS"
|
||||
STATUS_TITLE="Deploy succeeded"
|
||||
COLOR=65280
|
||||
else
|
||||
STATUS_LABEL="FAILED"
|
||||
STATUS_TITLE="Deploy failed"
|
||||
COLOR=16711680
|
||||
fi
|
||||
RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
|
||||
AVATAR_URL="${{ vars.DISCORD_AVATAR_URL }}"
|
||||
AVATAR_URL="${AVATAR_URL:-https://www.flockpal.app/FlockPal-Paint.png}"
|
||||
COMMIT_MESSAGE="$(git -C /docker/FlockPal-dev log -1 --pretty=%s 2>/dev/null || printf '%s' '${{ github.sha }}')"
|
||||
json_escape() {
|
||||
printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
|
||||
}
|
||||
BRANCH="$(json_escape '${{ github.ref_name }}')"
|
||||
MESSAGE="$(json_escape "$COMMIT_MESSAGE")"
|
||||
AVATAR_URL="$(json_escape "$AVATAR_URL")"
|
||||
|
||||
cat > /tmp/discord-payload.json <<EOF
|
||||
{
|
||||
"username": "FlockPal Build",
|
||||
"avatar_url": "${AVATAR_URL}",
|
||||
"embeds": [
|
||||
{
|
||||
"title": "${STATUS_TITLE}",
|
||||
"url": "${RUN_URL}",
|
||||
"description": "FlockPal dev deploy",
|
||||
"color": ${COLOR},
|
||||
"fields": [
|
||||
{
|
||||
"name": "Branch",
|
||||
"value": "${BRANCH}",
|
||||
"inline": true
|
||||
},
|
||||
{
|
||||
"name": "Message",
|
||||
"value": "${MESSAGE}",
|
||||
"inline": false
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
EOF
|
||||
|
||||
curl --fail --show-error --silent \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"content\":\"[${STATUS_LABEL}] FlockPal ${DEPLOY_ENVIRONMENT} deploy completed with status: ${JOB_STATUS}\\nBranch: ${{ github.ref_name }}\\nCommit: ${{ github.sha }}\\nRun: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}" \
|
||||
-d @/tmp/discord-payload.json \
|
||||
"$DISCORD_WEBHOOK_URL" || echo "Discord notification failed."
|
||||
|
||||
deploy-prod:
|
||||
@@ -121,7 +159,6 @@ jobs:
|
||||
env:
|
||||
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
|
||||
JOB_STATUS: ${{ job.status }}
|
||||
DEPLOY_ENVIRONMENT: production
|
||||
run: |
|
||||
if [ -z "$DISCORD_WEBHOOK_URL" ]; then
|
||||
echo "DISCORD_WEBHOOK_URL is not configured; skipping Discord notification."
|
||||
@@ -129,12 +166,51 @@ jobs:
|
||||
fi
|
||||
|
||||
if [ "$JOB_STATUS" = "success" ]; then
|
||||
STATUS_LABEL="SUCCESS"
|
||||
STATUS_TITLE="Deploy succeeded"
|
||||
COLOR=65280
|
||||
else
|
||||
STATUS_LABEL="FAILED"
|
||||
STATUS_TITLE="Deploy failed"
|
||||
COLOR=16711680
|
||||
fi
|
||||
RUN_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
|
||||
AVATAR_URL="${{ vars.DISCORD_AVATAR_URL }}"
|
||||
AVATAR_URL="${AVATAR_URL:-https://www.flockpal.app/FlockPal-Paint.png}"
|
||||
COMMIT_MESSAGE="$(git -C /docker/FlockPal log -1 --pretty=%s 2>/dev/null || printf '%s' '${{ github.sha }}')"
|
||||
json_escape() {
|
||||
printf '%s' "$1" | sed 's/\\/\\\\/g; s/"/\\"/g'
|
||||
}
|
||||
BRANCH="$(json_escape '${{ github.ref_name }}')"
|
||||
MESSAGE="$(json_escape "$COMMIT_MESSAGE")"
|
||||
AVATAR_URL="$(json_escape "$AVATAR_URL")"
|
||||
|
||||
cat > /tmp/discord-payload.json <<EOF
|
||||
{
|
||||
"username": "FlockPal Build",
|
||||
"avatar_url": "${AVATAR_URL}",
|
||||
"embeds": [
|
||||
{
|
||||
"title": "${STATUS_TITLE}",
|
||||
"url": "${RUN_URL}",
|
||||
"description": "FlockPal production deploy",
|
||||
"color": ${COLOR},
|
||||
"fields": [
|
||||
{
|
||||
"name": "Branch",
|
||||
"value": "${BRANCH}",
|
||||
"inline": true
|
||||
},
|
||||
{
|
||||
"name": "Message",
|
||||
"value": "${MESSAGE}",
|
||||
"inline": false
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
EOF
|
||||
|
||||
curl --fail --show-error --silent \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"content\":\"[${STATUS_LABEL}] FlockPal ${DEPLOY_ENVIRONMENT} deploy completed with status: ${JOB_STATUS}\\nBranch: ${{ github.ref_name }}\\nCommit: ${{ github.sha }}\\nRun: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}" \
|
||||
-d @/tmp/discord-payload.json \
|
||||
"$DISCORD_WEBHOOK_URL" || echo "Discord notification failed."
|
||||
+1
-5
@@ -657,7 +657,6 @@ const normalizeBird = (row: BirdRow) => ({
|
||||
publicProfileEnabled: row.public_profile_enabled ?? false,
|
||||
memorializedAt: row.memorialized_at,
|
||||
memorializedOn: row.memorialized_on,
|
||||
memorialNote: row.memorial_note,
|
||||
notifyOnMemorialDay: row.notify_on_memorial_day,
|
||||
createdAt: row.created_at,
|
||||
latestWeightGrams: row.latest_weight_grams ? Number(row.latest_weight_grams) : null,
|
||||
@@ -1712,9 +1711,7 @@ const buildBirdMilestoneReminderCopy = (reminder: BirdMilestoneReminderCandidate
|
||||
yearCount > 0
|
||||
? `From our flock to yours, holding ${reminder.name}'s memory close on this ${formatOrdinal(yearCount)} memorial day.`
|
||||
: `From our flock to yours, holding ${reminder.name}'s memory close today.`,
|
||||
body: reminder.memorial_note
|
||||
? reminder.memorial_note
|
||||
: 'A quiet moment for the feathers, songs, routines, and happy memories that still stay with you.',
|
||||
body: 'A quiet moment for the feathers, songs, routines, and happy memories that still stay with you.',
|
||||
milestoneLabel: yearCount > 0 ? `${formatOrdinal(yearCount)} Memorial Day` : 'Memorial Day on file',
|
||||
};
|
||||
}
|
||||
@@ -4015,7 +4012,6 @@ app.post('/api/birds/:birdId/memorialize', requireAuth, requireWriteAccess, requ
|
||||
birdId: req.params.birdId,
|
||||
workspaceId: req.auth!.workspace.id,
|
||||
memorializedOn: parsed.data.memorializedOn,
|
||||
memorialNote: emptyToNull(parsed.data.memorialNote),
|
||||
notifyOnMemorialDay: parsed.data.notifyOnMemorialDay ?? false,
|
||||
});
|
||||
|
||||
|
||||
@@ -235,7 +235,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
||||
public_profile_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
memorialized_at TIMESTAMPTZ,
|
||||
memorialized_on DATE,
|
||||
memorial_note VARCHAR(1000),
|
||||
notify_on_memorial_day BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
);
|
||||
@@ -265,7 +264,6 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
|
||||
ADD COLUMN IF NOT EXISTS public_profile_enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
ADD COLUMN IF NOT EXISTS memorialized_at TIMESTAMPTZ,
|
||||
ADD COLUMN IF NOT EXISTS memorialized_on DATE,
|
||||
ADD COLUMN IF NOT EXISTS memorial_note VARCHAR(1000),
|
||||
ADD COLUMN IF NOT EXISTS notify_on_memorial_day BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
|
||||
ALTER TABLE birds
|
||||
|
||||
@@ -32,7 +32,7 @@ export const birdResponse = z.object({
|
||||
photoDataUrl: text.describe('Photo URL or legacy data URL. Storage-backed URLs expire; refresh the bird list to obtain a new URL.'),
|
||||
photoObjectKey: text, photoContentType: text, photoUpdatedAt: timestamp.nullable(),
|
||||
notifyOnDob: z.boolean(), notifyOnGotchaDay: z.boolean(), publicProfileCode: text, publicProfileEnabled: z.boolean(),
|
||||
memorializedAt: timestamp.nullable(), memorializedOn: date.nullable(), memorialNote: text,
|
||||
memorializedAt: timestamp.nullable(), memorializedOn: date.nullable(),
|
||||
notifyOnMemorialDay: z.boolean(), createdAt: timestamp,
|
||||
latestWeightGrams: z.number().nullable(), latestRecordedOn: date.nullable(),
|
||||
});
|
||||
|
||||
@@ -48,7 +48,6 @@ const birdSelectFields = `
|
||||
birds.public_profile_enabled,
|
||||
birds.memorialized_at,
|
||||
birds.memorialized_on::text,
|
||||
birds.memorial_note,
|
||||
birds.notify_on_memorial_day,
|
||||
birds.created_at,
|
||||
latest.weight_grams AS latest_weight_grams,
|
||||
@@ -544,7 +543,7 @@ export const createBird = async ({
|
||||
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)
|
||||
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)
|
||||
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, 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, notify_on_memorial_day, created_at, NULL::text AS latest_weight_grams, NULL::text AS latest_recorded_on`,
|
||||
[
|
||||
birdId ?? null,
|
||||
workspaceId,
|
||||
@@ -662,7 +661,7 @@ export const updateBird = async ({
|
||||
WHERE id = $1
|
||||
AND workspace_id = $26
|
||||
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, 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, notify_on_memorial_day, created_at,
|
||||
(
|
||||
SELECT weight_grams::text
|
||||
FROM weight_records
|
||||
@@ -714,25 +713,22 @@ export const memorializeBird = async ({
|
||||
birdId,
|
||||
workspaceId,
|
||||
memorializedOn,
|
||||
memorialNote,
|
||||
notifyOnMemorialDay,
|
||||
}: {
|
||||
birdId: string;
|
||||
workspaceId: number;
|
||||
memorializedOn: string;
|
||||
memorialNote: string | null;
|
||||
notifyOnMemorialDay: boolean;
|
||||
}) => {
|
||||
const result = await db.query<BirdRow>(
|
||||
`UPDATE birds
|
||||
SET memorialized_at = CURRENT_TIMESTAMP,
|
||||
memorialized_on = $3,
|
||||
memorial_note = $4,
|
||||
notify_on_memorial_day = $5
|
||||
notify_on_memorial_day = $4
|
||||
WHERE id = $1
|
||||
AND workspace_id = $2
|
||||
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, 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, notify_on_memorial_day, created_at,
|
||||
(
|
||||
SELECT weight_grams::text
|
||||
FROM weight_records
|
||||
@@ -747,7 +743,7 @@ export const memorializeBird = async ({
|
||||
ORDER BY recorded_on DESC
|
||||
LIMIT 1
|
||||
) AS latest_recorded_on`,
|
||||
[birdId, workspaceId, memorializedOn, memorialNote, notifyOnMemorialDay],
|
||||
[birdId, workspaceId, memorializedOn, notifyOnMemorialDay],
|
||||
);
|
||||
|
||||
return result.rows[0] ?? null;
|
||||
@@ -768,7 +764,7 @@ export const updateMemorialReminderPreference = async ({
|
||||
WHERE id = $1
|
||||
AND workspace_id = $2
|
||||
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, 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, notify_on_memorial_day, created_at,
|
||||
(
|
||||
SELECT weight_grams::text
|
||||
FROM weight_records
|
||||
@@ -796,7 +792,7 @@ export const transferBirdToWorkspace = async (birdId: string, sourceWorkspaceId:
|
||||
WHERE id = $1
|
||||
AND workspace_id = $2
|
||||
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, 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, notify_on_memorial_day, created_at,
|
||||
(
|
||||
SELECT weight_grams::text
|
||||
FROM weight_records
|
||||
|
||||
@@ -129,7 +129,6 @@ export const birdSchema = z.object({
|
||||
|
||||
export const memorializeBirdSchema = z.object({
|
||||
memorializedOn: dateStringSchema,
|
||||
memorialNote: z.string().trim().max(1000).optional().or(z.literal('')),
|
||||
notifyOnMemorialDay: z.boolean().optional(),
|
||||
});
|
||||
|
||||
|
||||
@@ -121,7 +121,6 @@ export type BirdRow = {
|
||||
public_profile_enabled: boolean;
|
||||
memorialized_at: string | null;
|
||||
memorialized_on: string | null;
|
||||
memorial_note: string | null;
|
||||
notify_on_memorial_day: boolean;
|
||||
created_at: string;
|
||||
latest_weight_grams: string | null;
|
||||
|
||||
@@ -65,7 +65,6 @@ type Bird = {
|
||||
publicProfileEnabled: boolean;
|
||||
memorializedAt: string | null;
|
||||
memorializedOn: string | null;
|
||||
memorialNote: string | null;
|
||||
notifyOnMemorialDay: boolean;
|
||||
createdAt: string;
|
||||
latestWeightGrams: number | null;
|
||||
@@ -335,7 +334,6 @@ type PublicBirdProfile = {
|
||||
|
||||
type MemorializeBirdFormState = {
|
||||
memorializedOn: string;
|
||||
memorialNote: string;
|
||||
notifyOnMemorialDay: boolean;
|
||||
};
|
||||
|
||||
@@ -856,7 +854,6 @@ const emptyVeterinaryInfoForm: VeterinaryInfoFormState = {
|
||||
|
||||
const emptyMemorializeBirdForm = (): MemorializeBirdFormState => ({
|
||||
memorializedOn: new Date().toISOString().slice(0, 10),
|
||||
memorialNote: '',
|
||||
notifyOnMemorialDay: false,
|
||||
});
|
||||
|
||||
@@ -6996,14 +6993,6 @@ function App() {
|
||||
required
|
||||
/>
|
||||
</label>
|
||||
<label className="wide-field">
|
||||
Memorial note
|
||||
<textarea
|
||||
rows={3}
|
||||
value={memorializeBirdForm.memorialNote}
|
||||
onChange={(event) => setMemorializeBirdForm({ ...memorializeBirdForm, memorialNote: event.target.value })}
|
||||
/>
|
||||
</label>
|
||||
<div className="button-row care-form-actions">
|
||||
<button className="danger-button" type="submit" disabled={memorializingBird || activeMembership?.role !== 'owner'}>
|
||||
{memorializingBird ? 'Memorializing...' : `Memorialize ${selectedBird.name}`}
|
||||
|
||||
Reference in new issue
Block a user