added ghcr login to deploy step

.gitea/workflows/deploy.yml

@@ -7,8 +7,9 @@ on:
   # Triggers the workflow on push events but only for the main branch
   push:
     branches: [ main ]
-    paths: # Only run if backend code or Docker config changes
+    paths:
       - 'backend/**'
+      - 'interfaces/nativeapp/**'
       - '.gitea/workflows/deploy.yml'
       - 'backend/docker-compose.deploy.yml'
 
@@ -22,10 +23,10 @@ on:
 
 jobs:
   # ========================================================================
-  # Job to run unit tests.
+  # Job to run backend unit tests.
   # ========================================================================
-  test:
-    name: Run Linters and Tests
+  test-backend:
+    name: Run Linters and Tests (Backend)
     runs-on: ubuntu-latest
     steps:
       # Checks out the repo under $GITHUB_WORKSPACE
@@ -70,12 +71,12 @@ jobs:
           pytest
 
   # ========================================================================
-  # Job to build and deploy the Docker image to mara.
+  # Job to build the backend Docker image.
   # ========================================================================
-  build-and-deploy:
-    name: Build and Deploy
+  build-backend:
+    name: Build (Backend)
     runs-on: ubuntu-latest
-    needs: test # Ensure tests pass before deploying
+    needs: test-backend # Ensure tests pass before deploying
 
     # Only run this job if triggered by a push to main or manual dispatch/schedule
     if: gitea.event_name == 'push' || gitea.event_name == 'workflow_dispatch' || gitea.event_name == 'schedule'
@@ -116,50 +117,158 @@ jobs:
           # Pull latest base image updates when building (good for scheduled runs)
           pull: true
 
-      # ------------------------------------------------------------------
-      # Deploy to mara
-      # ------------------------------------------------------------------
+  # ========================================================================
+  # Job to build the frontend Nginx image.
+  # ========================================================================
+  build-frontend-web:
+    name: Build (Frontend Web)
+    runs-on: ubuntu-latest
+    # needs: test-frontend
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Install frontend dependencies
+        working-directory: ./interfaces/nativeapp
+        run: npm ci
+
+      - name: Build Expo web assets
+        working-directory: ./interfaces/nativeapp
+        run: npx expo export --platform web --output-dir dist
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+          password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push frontend nginx image
+        uses: docker/build-push-action@v5
+        with:
+          # Context is the frontend dir where Dockerfile.nginx, nginx.conf and dist/ are
+          context: ./interfaces/nativeapp
+          file: ./interfaces/nativeapp/Dockerfile.nginx # Path to the Nginx Dockerfile
+          push: true
+          tags: |
+            ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia-frontend:${{ gitea.sha }}
+            ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia-frontend:latest
+          pull: true # Pull base nginx image updates
+
+
+  # ========================================================================
+  # Build Native Android App (Trigger EAS Build)
+  # ========================================================================
+  build-native-android:
+    name: Build Native Android App (EAS)
+    runs-on: ubuntu-latest
+    # needs: test-frontend # Depends on frontend tests passing
+    # Only run for deploy triggers
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Install frontend dependencies
+        working-directory: ./interfaces/nativeapp
+        run: npm ci
+      - name: Install EAS CLI
+        run: npm install -g eas-cli
+      - name: Trigger EAS Build for Android
+        working-directory: ./interfaces/nativeapp
+        env:
+          EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }} # EAS token for authentication
+        run: |
+          eas build --platform android --profile production --non-interactive --no-wait
+  
+  # ========================================================================
+  # Deploy Backend and Frontend Web to Host
+  # ========================================================================
+  deploy:
+    name: Deploy to Host
+    runs-on: ubuntu-latest
+    needs:
+      - build-backend       # Wait for backend image build
+      - build-frontend-web  # Wait for frontend image build
+    if: gitea.event_name == 'push' || gitea.event_name == 'workflow_dispatch' || gitea.event_name == 'schedule'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
+          password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
+
       - name: Deploy Locally
+        env:
+          DB_HOST: ${{ vars.DB_HOST }}
+          DB_USER: ${{ vars.DB_USER }}
+          DB_NAME: ${{ vars.DB_NAME }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          REDIS_URL: ${{ vars.REDIS_URL }}
+          PEPPER: ${{ secrets.PEPPER }}
+          JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
         run: |
           #!/bin/bash -ex
 
-          # Define path to compose file WITHIN the checked-out workspace
-          COMPOSE_FILE="${{ gitea.workspace }}/backend/docker-compose.deploy.yml"
-          PROJECT_NAME="maia"
-
-          echo "--- Start Deploy Locally (using compose file from repo) ---"
-          echo "Workspace root: ${{ gitea.workspace }}"
+          # Define paths and names
+          WORKSPACE_DIR="${{ gitea.workspace }}/backend" # Dir where deploy compose file lives
+          COMPOSE_FILE="${WORKSPACE_DIR}/docker-compose.deploy.yml"
+          PROJECT_NAME="maia" # Project name used by docker compose
+          echo "--- Start Deployment ---"
           echo "Using compose file: ${COMPOSE_FILE}"
 
-          # Verify compose file exists
+          # --- Verify compose file exists ---
           if [ ! -f "${COMPOSE_FILE}" ]; then
             echo "ERROR: Compose file not found at ${COMPOSE_FILE}"
-            ls -la "${{ gitea.workspace }}/backend/" # List contents for debugging
             exit 1
           fi
 
-          # Pull the specific image version built in this workflow
-          echo "Pulling image ${{ gitea.sha }}..."
+          # --- Pull specific backend image version ---
+          echo "Pulling backend image ${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia:${{ gitea.sha }}..."
           docker pull ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia:${{ gitea.sha }}
-          echo "Pull complete."
+          echo "Backend pull complete."
 
-          # Pull other images defined in compose using the specific file
-          # Ensures base images like redis/db are up-to-date if specified in compose
-          echo "Pulling other compose services..."
-          docker compose -p "${PROJECT_NAME}" -f "${COMPOSE_FILE}" pull redis db
+          # --- Pull specific frontend image version ---
+          echo "Pulling frontend image ${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia-frontend:${{ gitea.sha }}..."
+          docker pull ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia-frontend:${{ gitea.sha }}
+          echo "Frontend pull complete."
+
+          # --- Pull other images defined in compose ---
+          echo "Pulling other compose services for project ${PROJECT_NAME}..."
+          cd "${WORKSPACE_DIR}" || exit 1
+          docker compose -p "${PROJECT_NAME}" -f "${COMPOSE_FILE##*/}" pull redis db
           echo "Other service pull complete."
 
-          # Update the image tag IN THE CHECKED-OUT COMPOSE FILE
-          # This change only exists within the job's workspace, it doesn't modify the repo source
-          echo "Running sed on ${COMPOSE_FILE}..."
-          sed -i 's|image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia:.*|image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia:${{ gitea.sha }}|g' "${COMPOSE_FILE}"
-          echo "sed complete. Showing updated line:"
-          grep "image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia" "${COMPOSE_FILE}" || echo "Image line not found after sed!"
+          # --- Update Backend image tag in compose file ---
+          echo "Updating Backend image tag in ${COMPOSE_FILE##*/}..."
+          sed -i "s|image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia:.*|image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia:${{ gitea.sha }}|g" "${COMPOSE_FILE##*/}"
+          grep "image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia:" "${COMPOSE_FILE##*/}" || echo "Backend image line not found!"
 
-          # Restart the services using the updated compose file from the workspace
-          # Docker compose interacts with the HOST daemon via the mounted socket
-          echo "Bringing compose stack down and up with new image..."
-          docker compose -p "${PROJECT_NAME}" -f "${COMPOSE_FILE}" up -d --force-recreate --remove-orphans
+          # --- Update Frontend image tag in compose file ---
+          echo "Updating Frontend image tag in ${COMPOSE_FILE##*/}..."
+          sed -i "s|image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia-frontend:.*|image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia-frontend:${{ gitea.sha }}|g" "${COMPOSE_FILE##*/}"
+          grep "image: ghcr.io/${{ secrets.DOCKER_REGISTRY_USERNAME }}/maia-frontend:" "${COMPOSE_FILE##*/}" || echo "Frontend image line not found!"
+
+          # --- Restart services using updated compose file ---
+          echo "Bringing compose stack down and up for project ${PROJECT_NAME}..."
+          docker compose -p "${PROJECT_NAME}" -f "${COMPOSE_FILE##*/}" up -d --force-recreate --remove-orphans
           echo "Docker compose up command finished."
-          echo "--- Local deployment complete! ---"
-          
+          echo "--- Deployment complete! ---"

.gitignore

@@ -1,13 +1,13 @@
 # backend
 backend/env
 backend/.env.local
+backend/.env.prod.bak
 backend/db
 backend/redis_data
 
 # frontend
 interfaces/nativeapp/node_modules
 interfaces/nativeapp/.expo/
-interfaces/nativeapp/dist/
 interfaces/nativeapp/web-build/
 interfaces/nativeapp/expo-env.d.ts
 interfaces/nativeapp/*.orig.*

backend/.env.deploy

@@ -1,10 +0,0 @@
-DB_HOST = "db"
-DB_USER = "maia"
-DB_PASSWORD = "Cr7#qVVYF*8s&#jsnay^!EDf5X31Fs"
-DB_NAME = "maia"
-
-REDIS_URL = "redis://redis:6379"
-
-PEPPER = "LsD7%"
-JWT_SECRET_KEY="1c8cf3ca6972b365f8108dad247e61abdcb6faff5a6c8ba00cb6fa17396702bf"
-GOOGLE_API_KEY="AIzaSyBrte_mETZJce8qE6cRTSz_fHOjdjlShBk"

backend/core/config.py

@@ -2,7 +2,7 @@
 from pydantic_settings import BaseSettings
 import os
 
-DOTENV_PATH = os.path.join(os.path.dirname(__file__), "../.env.local")
+DOTENV_PATH = os.path.join(os.path.dirname(__file__), "../.env")
 
 
 class Settings(BaseSettings):
@@ -26,7 +26,7 @@ class Settings(BaseSettings):
     JWT_SECRET_KEY: str = "secret"
 
     # Other settings
-    GOOGLE_API_KEY: str
+    GOOGLE_API_KEY: str = "google_api_key"
     EXPO_PUSH_API_URL: str = "https://exp.host/--/api/v2/push/send"
 
     class Config:

backend/docker-compose.deploy.yml

@@ -5,6 +5,15 @@ services:
     container_name: MAIA_API
     restart: unless-stopped
     command: uvicorn main:app --host 0.0.0.0 --port 8000
+    environment:
+      DB_HOST: ${DB_HOST}
+      DB_USER: ${DB_USER}
+      DB_NAME: ${DB_NAME}
+      DB_PASSWORD: ${DB_PASSWORD}
+      REDIS_URL: ${REDIS_URL}
+      PEPPER: ${PEPPER}
+      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
+      GOOGLE_API_KEY: ${GOOGLE_API_KEY}
     expose:
       - "8000"
     depends_on:
@@ -12,8 +21,6 @@ services:
       - redis
     networks:
       - default
-    env_file:
-      - ./.env.deploy
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.maia.rule=Host(`maia.depaoli.id.au`)"
@@ -29,11 +36,18 @@ services:
     container_name: MAIA_Worker
     restart: unless-stopped
     command: celery -A core.celery_app worker --loglevel=info
+    environment:
+      DB_HOST: ${DB_HOST}
+      DB_USER: ${DB_USER}
+      DB_NAME: ${DB_NAME}
+      DB_PASSWORD: ${DB_PASSWORD}
+      REDIS_URL: ${REDIS_URL}
+      PEPPER: ${PEPPER}
+      JWT_SECRET_KEY: ${JWT_SECRET_KEY}
+      GOOGLE_API_KEY: $GOOGLE_API_KEY}
     depends_on:
       - db
       - redis
-    env_file:
-      - ./.env.deploy
     networks:
       - default
 
@@ -47,8 +61,6 @@ services:
       - POSTGRES_USER=${DB_USER}
       - POSTGRES_PASSWORD=${DB_PASSWORD}
       - POSTGRES_DB=${DB_NAME}
-    env_file:
-      - ./.env.deploy
     networks:
       - default
     restart: unless-stopped
@@ -65,12 +77,9 @@ services:
   
   # ----- Frontend (nginx) ------
   frontend:
-    image: nginx:1.25-alpine
+    image: ghcr.io/c-d-p/maia-frontend:latest
     container_name: MAIA_FRONTEND
     restart: unless-stopped
-    volumes:
-      - /srv/docker/container/MAIA/frontend/dist:/usr/share/nginx/html:ro # read only
-      - /srv/docker/container/MAIA/frontend/conf/nginx.conf:/etc/nginx/conf.d/default.conf:ro
     networks:
       - default
     expose:

backend/main.py

@@ -26,7 +26,7 @@ app.include_router(router)
 
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=["http://localhost:8081", "exp://*", "https://maia.depaoli.id.au"],
+    allow_origins=["https://app.maia.depaoli.id.au"],
     allow_methods=["*"],
     allow_headers=["*"],
 )

interfaces/nativeapp/Dockerfile.nginx

@@ -0,0 +1,16 @@
+# ./frontend/Dockerfile.nginx
+
+FROM nginx:1.28-alpine
+
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# Remove default Nginx welcome page
+RUN rm /usr/share/nginx/html/*
+
+# Copy the pre-built Expo web output
+COPY dist/ /usr/share/nginx/html
+
+EXPOSE 80
+
+# Start Nginx in the foreground
+CMD ["nginx", "-g", "daemon off;"]

interfaces/nativeapp/dist/index.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <title>MAIA</title>
+    <!-- The `react-native-web` recommended style reset: https://necolas.github.io/react-native-web/docs/setup/#root-element -->
+    <style id="expo-reset">
+      /* These styles make the body full-height */
+      html,
+      body {
+        height: 100%;
+      }
+      /* These styles disable body scrolling if you are using <ScrollView> */
+      body {
+        overflow: hidden;
+      }
+      /* These styles make the root element full-height */
+      #root {
+        display: flex;
+        height: 100%;
+        flex: 1;
+      }
+    </style>
+  <link rel="shortcut icon" href="/favicon.ico" /></head>
+
+  <body>
+    <!-- Use static rendering with Expo Router to support running without JavaScript. -->
+    <noscript>
+      You need to enable JavaScript to run this app.
+    </noscript>
+    <!-- The root element for your Expo app. -->
+    <div id="root"></div>
+  <script src="/_expo/static/js/web/index-0ef639b7ebb0f592fe73fd94db0b4205.js" defer></script>
+</body>
+</html>

interfaces/nativeapp/dist/metadata.json

@@ -0,0 +1 @@
+{"version":0,"bundler":"metro","fileMetadata":{}}

interfaces/nativeapp/nginx.conf

@@ -0,0 +1,36 @@
+server {
+    listen 80;
+    server_name app.maia.depaoli.id.au;
+
+    # Set the root directory for static files
+    root /usr/share/nginx/html;
+    # Default file to serve
+    index index.html index.htm;
+
+    location / {
+        # Crucial for SPAs:
+        # - Try to serve the requested file ($uri)
+        # - If it's not found, try it as a directory ($uri/)
+        # - If that's not found, serve index.html (letting client-side routing handle it)
+        try_files $uri $uri/ /index.html;
+    }
+
+    # Add gzip compression for better performance
+    gzip on;
+    gzip_vary on;
+    gzip_proxied any;
+    gzip_comp_level 6;
+    gzip_types text/plain text/css text/xml application/json application/javascript application/xml+rss text/javascript image/svg+xml;
+
+    # Improve caching for assets
+    location ~* \.(?:css|js|jpg|jpeg|gif|png|ico|svg|woff|woff2|ttf|eot)$ {
+        expires 1y;
+        add_header Cache-Control "public";
+        access_log off; # Don't log access for static assets
+    }
+
+    # Deny access to hidden files
+    location ~ /\. {
+        deny all;
+    }
+}