Merge branch 'main' of https://github.com/gaveshalabs/weatherkids-dat…

…a-api into dev

.github/workflows/digitalocean-deploy.yml

@@ -1,40 +1,39 @@
 name: Deploy NestJS API to DigitalOcean
 
 on:
-    push:
-        branches:
-            - main
-
-env:
-    DOCKER_SERVICE_NAME: unknown
-    DOCKER_REPO: unknown
+  push:
+    branches:
+      - main
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout files
-              uses: actions/checkout@v4
-            - name: Login to Docker Hub
-              uses: docker/login-action@v3
-              with:
-                username: ${{ secrets.DOCKERHUB_USERNAME }}
-                passsword: ${{ secrets.DOCKERHUB_PASSWORD }}
-            - name: Build and push
-              uses: docker/build-push-action@v5
-              with:
-                push: true
-                tags: ${{ env.DOCKER_REPO }}
-
-    deploy:
-        needs: build
-        runs-on: ubuntu-latest
-        steps:
-            - name: Updating docker image
-              uses: appleboy/[email protected]
-              with:
-                host: ${{ secrets.DROPLET_SSH_HOST }}
-                username: ${{ secrets.DROPLET_SSH_USERNAME }}
-                key: ${{ secrets.DROPLET_SSH_KEY }}
-                script: |
-                    docker service update --image "${{ env.DOCKER_REPO }}:latest" ${{ env.DOCKER_SERVICE_NAME }}
+  deploy:
+      runs-on: ubuntu-latest
+      environment: WeatherKids_PROD
+      steps:
+          - name: Pull changes into server
+            uses: appleboy/[email protected]
+            with:
+              host: ${{ secrets.DROPLET_SSH_HOST }}
+              username: ${{ secrets.DROPLET_SSH_USERNAME }}
+              key: ${{ secrets.DROPLET_SSH_KEY }}
+              script: |
+                # Variables
+                REPO_URL="https://github.com/gaveshalabs/weatherkids-data-api"
+                TARGET_DIR="weatherkids-data-api"
+                
+                # Check if the target directory exists
+                if [ -d "$TARGET_DIR" ]; then
+                  echo "Directory $TARGET_DIR exists. Performing git pull."
+                  cd "$TARGET_DIR"
+                  git pull
+                else
+                  echo "Directory $TARGET_DIR does not exist. Cloning repository."
+                  git clone "$REPO_URL" "$TARGET_DIR"
+                  cp .env.prod "$TARGET_DIR/.env.prod"
+                  cd "$TARGET_DIR"
+                fi
+                nvm use 20
+                npm ci --only=production
+                npm run build
+                node dist/index.js
+                echo 'Deployment Done!'

.github/workflows/firebase-deploy.yml

@@ -3,7 +3,7 @@ name: Deploy NestJS API to Firebase
 on:
   push:
     branches:
-      - main
+      # - main
       - dev
 
 jobs:

src/modules/common/guards/gavesha-client.guard.ts

@@ -1,8 +1,8 @@
 import {
-  Injectable,
   CanActivate,
   ExecutionContext,
   HttpException,
+  Injectable,
 } from '@nestjs/common';
 import { TokenService } from '../../users/token/token.service';