Riyadh
e97f103a73
The four default home-screen tiles (Notes / Services / Meetings /
Admin) showed up as three blue tiles + one orange one. Root cause was
NOT the DB — seed.ts already gave each app a distinct hex — but the
`gradientForColor()` mapper in `artifacts/tx-os/src/pages/home.tsx`
only recognised blue/purple/green/orange/pink/teal, so yellow
(#eab308), red (#ef4444), and the dark navy meetings colour all fell
through to the default blue gradient.
Changes:
1. `artifacts/tx-os/src/index.css` — added `.icon-tile-red` and
`.icon-tile-yellow` gradients matching the existing tile style.
2. `artifacts/tx-os/src/pages/home.tsx` — `gradientForColor()` now
maps red/dc2626 and yellow/facc15 first. Purple branch stays for
admin-custom apps but no seeded row uses it.
3. `scripts/src/seed.ts` —
- Meetings: `#0B1E3F` → `#22c55e` (green).
- Notifications: `#8b5cf6` → `#06b6d4` (cyan) — kills the last
purple in the default palette per user direction.
4. `scripts/src/update-app-colors.ts` (new) — idempotent migration
that bumps existing rows ONLY when they still hold the exact old
default colour, so admin customisations from the Apps editor are
preserved. Wired into `scripts/package.json` as
`pnpm run update-app-colors`.
5. `scripts/redeploy.sh` — new step 5/6 runs the colour migration
after seed and before `docker compose up -d`, on the same one-shot
`migrate` container pattern as other one-shot scripts.
No schema changes, no new deps. tx-os tsc passes, scripts tsc passes.
After `./scripts/redeploy.sh` on Mac, home shows four distinct hues
(yellow / orange / green / red) and no tile is purple anywhere.
112 lines
3.9 KiB
Bash
Executable File
112 lines
3.9 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Tx OS — redeploy after `git pull` on the Mac (or any Docker host).
|
|
#
|
|
# Why this exists:
|
|
# The SPA is baked into the `web` (nginx) image at build time, and the
|
|
# API binary is baked into the `api` image. `docker compose up -d` on
|
|
# its own re-uses the existing images, so a plain `git pull` will NOT
|
|
# pick up new front-end assets (e.g. service tile images), code
|
|
# changes, or DB-seed updates.
|
|
#
|
|
# What it does:
|
|
# 1. git pull — fast-forward the working tree (skipped with --no-pull)
|
|
# 2. docker compose build api web
|
|
# — rebuild both images so source + static assets are fresh
|
|
# 3. docker compose run --rm migrate
|
|
# — apply Drizzle schema (migrate.sh also runs the seed,
|
|
# but tolerates seed failures — see step 4)
|
|
# 4. docker compose run --rm --entrypoint "" --no-deps migrate \
|
|
# pnpm --filter @workspace/scripts run seed
|
|
# — explicit seed pass that fails hard if the seed
|
|
# errors. Catches new-app / renamed-app regressions
|
|
# that migrate.sh would otherwise swallow.
|
|
# 5. docker compose up -d
|
|
# — restart api + web with the new images
|
|
#
|
|
# Safe to re-run. Each step is idempotent.
|
|
|
|
set -euo pipefail
|
|
|
|
PULL=1
|
|
for arg in "$@"; do
|
|
case "$arg" in
|
|
--no-pull) PULL=0 ;;
|
|
-h|--help)
|
|
sed -n '2,27p' "$0"
|
|
exit 0
|
|
;;
|
|
*)
|
|
echo "Unknown argument: $arg" >&2
|
|
echo "Usage: $0 [--no-pull]" >&2
|
|
exit 2
|
|
;;
|
|
esac
|
|
done
|
|
|
|
# Resolve the repo root so the script works no matter where it's invoked from.
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
cd "$REPO_ROOT"
|
|
|
|
if [ ! -f docker-compose.yml ]; then
|
|
echo "[redeploy] error: docker-compose.yml not found in $REPO_ROOT" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if ! command -v docker >/dev/null 2>&1; then
|
|
echo "[redeploy] error: docker CLI not found in PATH" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Pick `docker compose` (v2) and fall back to `docker-compose` (v1) so this
|
|
# works on older hosts.
|
|
if docker compose version >/dev/null 2>&1; then
|
|
DC=(docker compose)
|
|
elif command -v docker-compose >/dev/null 2>&1; then
|
|
DC=(docker-compose)
|
|
else
|
|
echo "[redeploy] error: neither 'docker compose' nor 'docker-compose' is available" >&2
|
|
exit 1
|
|
fi
|
|
|
|
step() { echo; echo "==> $*"; }
|
|
|
|
if [ "$PULL" -eq 1 ]; then
|
|
step "1/6 git pull"
|
|
git pull --ff-only
|
|
else
|
|
step "1/6 git pull (skipped via --no-pull)"
|
|
fi
|
|
|
|
step "2/6 docker compose build api web (rebuilds SPA + API images)"
|
|
# Stamp the API image with the current git SHA + UTC build time so the
|
|
# admin "System Updates" panel shows visible proof that the new image
|
|
# is actually running (instead of the old, hand-edited version.json).
|
|
# Both are read inside docker/api-server.Dockerfile as ARGs.
|
|
export GIT_SHA="$(git rev-parse --short HEAD 2>/dev/null || echo unknown)"
|
|
export BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
|
|
echo "[redeploy] GIT_SHA=$GIT_SHA BUILD_DATE=$BUILD_DATE"
|
|
"${DC[@]}" build api web
|
|
|
|
step "3/6 docker compose run --rm migrate (schema push + tolerant seed)"
|
|
"${DC[@]}" run --rm migrate
|
|
|
|
step "4/6 explicit seed pass (fails hard on seed regressions)"
|
|
"${DC[@]}" run --rm --no-deps --entrypoint "" migrate \
|
|
pnpm --filter @workspace/scripts run seed
|
|
|
|
step "5/6 one-shot data migrations (idempotent)"
|
|
# #603: bump seeded app tile colours on existing installs. The seed
|
|
# step above uses onConflictDoNothing for `slug`, so already-seeded
|
|
# rows keep their old colours forever without this. The script only
|
|
# touches rows that still hold the OLD default — admin customisations
|
|
# from the Apps editor are left alone.
|
|
"${DC[@]}" run --rm --no-deps --entrypoint "" migrate \
|
|
pnpm --filter @workspace/scripts run update-app-colors
|
|
|
|
step "6/6 docker compose up -d (restart with the new images)"
|
|
"${DC[@]}" up -d
|
|
|
|
echo
|
|
echo "[redeploy] done. Verify in a browser; hard-refresh once to bust the SPA cache."
|