Merge remote-tracking branch 'origin' into issue-16-Create_ProgressBar_Component

Author: survivzhang

.env.production.example

@@ -0,0 +1,22 @@
+
+# FRONTEND
+APP_ENV=PRODUCTION
+NEXT_PUBLIC_BACKEND_URL="https://robodrone.codersforcauses.com/api"
+
+
+# BACKEND
+APP_NAME=DjangoAPI
+API_SECRET_KEY= CHANGE THIS TO A RANDOM STRING
+API_ALLOWED_HOSTS=".localhost 127.0.0.1 [::1] .codersforcauses.org"
+
+POSTGRES_HOST=db
+POSTGRES_NAME=postgres
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=password
+POSTGRES_PORT=5432
+
+DJANGO_SUPERUSER_PASSWORD= CHANGE THIS TO A RANDOM STRING
+DJANGO_SUPERUSER_EMAIL= CHANGE THIS TO A VALID EMAIL
+DJANGO_SUPERUSER_USERNAME= CHANGE THIS TO A VALID USERNAME
+
+FRONTEND_URL="https://robodrone.codersforcauses.com/"

.github/workflows/cd-pipeline.yml

@@ -0,0 +1,86 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches: [main]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-client:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push client image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/client/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-prod-client:latest
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-prod-client:${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          platforms: linux/amd64,linux/arm64
+
+      - name: Output client image name
+        if: github.event_name != 'pull_request'
+        run: |
+          echo "Client image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-prod-client:latest"
+
+  build-and-push-server:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push server image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/server/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-prod-server:latest
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-prod-server:${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          platforms: linux/amd64,linux/arm64
+
+      - name: Output server image name
+        if: github.event_name != 'pull_request'
+        run: |
+          echo "Server image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-prod-server:latest"

.gitignore

@@ -291,4 +291,5 @@ dist
 # misc
 .DS_Store
 
-opt/
+opt/
+/server/static_files

.vscode/settings.json

@@ -9,5 +9,6 @@
   "typescript.tsdk": "${workspaceFolder}/client/node_modules/typescript/lib",
   "shellcheck.ignorePatterns": {
     "**/.env*": true
-  }
+  },
+  "editor.formatOnSave": true
 }

client/.env.example

@@ -1,4 +1,4 @@
 REACT_EDITOR=code
 
 APP_ENV=DEVELOPMENT
-NEXT_PUBLIC_BACKEND_URL="http://localhost:8000/api"
+NEXT_PUBLIC_BACKEND_URL="http://localhost:8000/api"

client/.gitignore

@@ -33,4 +33,4 @@ yarn-error.log*
 
 # typescript
 *.tsbuildinfo
-next-env.d.ts
+next-env.d.ts

client/next.config.mjs

@@ -11,6 +11,9 @@ const nextConfig = {
     domains: ["squadrone.com.au"],
   },
   reactStrictMode: true,
+  images: {
+    domains: ['localhost', '127.0.0.1', 'squadrone.com.au'], 
+  },
   // dumb fix for windows docker
   webpack: isWindowsDevContainer()
     ? (config) => {
@@ -23,4 +26,4 @@ const nextConfig = {
     : undefined,
 };
 
-export default nextConfig;
+export default nextConfig;