Updates to pages

Taskfile.yml

@@ -90,34 +90,40 @@ tasks:
   # Docker
   # -----------------------------------------------------------
   docker:build:
-    desc: "Build the Docker image (use v=x.x.x to set version, default is \"latest\")"
+    desc: "Build the Rust app Docker image (use v=x.x.x to set version, default is \"latest\")"
     cmds:
-      - docker build -f Dockerfile -t siren:{{.VERSION}} .
+      - docker build -f docker/Dockerfile -t siren:{{.VERSION}} .
+    silent: true
+
+  docker:build:ui:
+    desc: "Build the UI Docker image (use v=x.x.x to set version, default is \"latest\")"
+    cmds:
+      - docker build -f docker/Dockerfile.ui -t siren-ui:{{.VERSION}} .
     silent: true
 
   docker:up:
-    desc: "Start backend containers"
+    desc: "Start backend containers (postgres + valkey)"
     cmds:
-      - docker compose up -d
+      - docker compose -f docker/docker-compose.yml up -d
     silent: true
 
   docker:up:all:
-    desc: "Start all containers"
+    desc: "Start all containers (app + ui + postgres + valkey)"
     cmds:
-      - docker compose --profile app up -d
+      - docker compose -f docker/docker-compose.yml --profile app --profile ui up -d
     silent: true
 
   docker:down:
     desc: "Stop all containers"
     cmds:
-      - docker compose --profile app down
+      - docker compose -f docker/docker-compose.yml --profile app --profile ui down
     silent: true
 
   docker:clean:
     desc: "Stop all containers and remove volumes"
     prompt: "This will remove all docker containers, networks, volumes, and images. Are you sure?"
     cmds:
-      - docker compose --profile app down -v
+      - docker compose -f docker/docker-compose.yml --profile app --profile ui down -v
     silent: true
 
   docker:refresh:
@@ -169,13 +175,25 @@ tasks:
   # Utilities
   # -----------------------------------------------------------
   psql:
-    desc: Connect to the database
+    desc: "Connect to the docker database"
+    vars:
+      POSTGRES_USER: '{{.POSTGRES_USER | default "postgres"}}'
+      POSTGRES_DB: '{{.POSTGRES_DB | default "siren"}}'
+      deps: [ docker:up ]
     cmds:
-      - docker exec -it siren-postgres psql -U $DATABASE_USER -P pager=off
+      - docker exec -it siren-postgres psql -U {{.POSTGRES_USER}} -d {{.POSTGRES_DB}} -P pager=off
+    silent: true
+
+  psql:admin:
+    desc: "Grant admin role to a user"
+    cmds:
+      - docker exec -it siren-postgres psql -U {{.POSTGRES_USER}} -d {{.POSTGRES_DB}} -c "UPDATE users SET role = 'admin' WHERE username = '{{.user}}'"
+    requires:
+      vars: [ user ]
     silent: true
 
   ngrok:
-    desc: Start ngrok tunnel
+    desc: "Start ngrok tunnel"
     vars:
       UI_PORT: '{{.UI_PORT | default "5173"}}'
     cmds: