Merge branch 'develop' into S1TNR-23-backend-autenticacion-y-seguridad

No-Country-simulation · Aug 31, 2024 · 8aaac64 · 8aaac64
2 parents eb05734 + c5b15e9
commit 8aaac64
Show file tree

Hide file tree

Showing 8 changed files with 537 additions and 5 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,17 @@
+## TICKET
+
+- [INSERTAR NOMBRE LA ISSUE AQUI](INSERTAR DEL LINK TICKET AQUI)
+
+## Descripción
+
+Describe brevemente el cambio que has hecho.
+
+## Evidencia:
+
+### Happy Path
+
+(Poner screenshots/video/gifs aquí)
+
+### Unhappy Path
+
+(Poner screenshots/video/gifs aquí)
diff --git a/.github/workflows/deploy_backtend.yml b/.github/workflows/deploy_backtend.yml
@@ -0,0 +1,32 @@
+name: Deploy Backend
+on:
+  pull_request:
+    types: [closed]
+    paths:
+      - "backend/**"
+      - ".github/workflows/deploy-backend.yml"
+
+jobs:
+  deploy-backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+
+      - name: Install Dependencies
+        run: |
+          rm package-lock.json
+          npm install
+
+      # Pasos para el deploy en Railway
+      - name: Install Railway
+        run: npm i -g @railway/cli
+
+      - name: Deploy
+        run: npm run deploy -w backend
+        env:
+          RAILWAY_TOKEN: ${{ secrets.RAILWAY_TOKEN }}
diff --git a/.github/workflows/deploy_frontend.yml b/.github/workflows/deploy_frontend.yml
@@ -0,0 +1,30 @@
+name: Vercel Production Deployment
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+on:
+  push:
+    paths:
+      - "frontend/**"
+jobs:
+  Deploy-Production:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: "18"
+
+      - name: Install Vercel CLI
+        run: npm install --global vercel@latest
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Deploy to Vercel
+        env:
+          VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }} # Configura la variable de entorno
+        run: npm run deploy -w frontend
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 node_modules
-
 mongo
 mongoDataBase
 .env
diff --git a/backend/package.json b/backend/package.json
@@ -17,7 +17,8 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "deploy": "railway up --service ohmytrip-backend"
   },
   "dependencies": {
     "@nestjs/common": "^10.0.0",

diff --git a/backend/public/index.html b/backend/public/index.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Oh My Trip</title>
+  </head>
+  <body>
+    <h2>Welcome to the OhMyTrip API!</h2>
+    <p>Here you will see the documentation soon.</p>
+  </body>
+</html>
diff --git a/frontend/package.json b/frontend/package.json
@@ -6,7 +6,8 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint"
+    "lint": "next lint",
+    "deploy": "vercel deploy --prod --token=$VERCEL_TOKEN"
   },
   "dependencies": {
     "next": "14.2.6",