Cambios para despliegue

Arquisoft · May 5, 2022 · 559e2a1 · 559e2a1
1 parent f1549f4
commit 559e2a1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 33 deletions.
diff --git a/.github/workflows/asw2122.yml b/.github/workflows/asw2122.yml
@@ -59,6 +59,7 @@ jobs:
           password: ${{ secrets.DOCKER_PUSH_TOKEN }}
           registry: ghcr.io
           workdir: webapp
+          buildargs: API_URI
   docker-push-restapi:
     name: Push restapi Docker Image to GitHub Packages
     runs-on: ubuntu-latest
@@ -85,7 +86,7 @@ jobs:
         user: ${{ secrets.DEPLOY_USER }}
         key: ${{ secrets.DEPLOY_KEY }}
         command: |
-          wget https://github.com/Arquisoft/dede_es6b/blob/develop/docker-compose-deploy.yml -O docker-compose.yml
+          wget https://raw.githubusercontent.com/Arquisoft/dede_es6b/master/docker-compose-deploy.yml -O docker-compose.yml
           docker-compose stop
           docker-compose rm -f
           docker-compose pull   

diff --git a/restapi/server.ts b/restapi/server.ts
@@ -10,16 +10,16 @@ import api from "./api"
 const app: Application = express();
 const port: number = 5000;
 
-const options: cors.CorsOptions = {
-  origin: ['http://localhost:3000']
-};
+// const options: cors.CorsOptions = {
+//   origin: ['http://localhost:3000']
+// };
 
 let bd = require('./utils/connectDB')
 
 const metricsMiddleware:RequestHandler = promBundle({includeMethod: true});
 app.use(metricsMiddleware);
 
-app.use(cors(options));
+app.use(cors());
 app.use(bp.json());
 app.use(express.json());
 

diff --git a/webapp/src/api/api.ts b/webapp/src/api/api.ts
@@ -3,28 +3,8 @@ import {Product, Pedido, PaymentType} from '../shared/shareddtypes';
 import {ShipmentData, User} from '../shared/shareddtypes'; 
 
 
-export async function addUser(user:User):Promise<boolean>{
-    const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
-    let response = await fetch(apiEndPoint+'/users/add', {
-        method: 'POST',
-        headers: {'Content-Type':'application/json'},
-        body: JSON.stringify({'name':user.name, 'email':user.email})
-      });
-    if (response.status===200)
-      return true;
-    else
-      return false;
-}
-
-export async function getUsers():Promise<User[]>{
-    const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
-    let response = await fetch(apiEndPoint+'/users/list');
-    //The objects returned by the api are directly convertible to User objects
-    return response.json()
-}
-
 export async function addOrder(cartProducts:Product[], price:number, url:string, user_id:string|undefined){
-  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint+'/orders/add', {
       method: 'POST',
       headers: {'Content-Type':'application/json'},
@@ -34,7 +14,7 @@ export async function addOrder(cartProducts:Product[], price:number, url:string,
 }
 
 export async function getOrdersByUser(user_id:string|undefined){
-  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint + "/orders/" + user_id);
   return response.json();
 
@@ -43,21 +23,21 @@ export async function getOrdersByUser(user_id:string|undefined){
 
 //Devuelve los productos de la base de datos
 export async function getProducts():Promise<Product[]>{
-  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint+'/products/list');
   //The objects returned by the api are directly convertible to Product objects
   return response.json()
 }
 
 export async function getProductsByCategory(category: string): Promise<Product[]>{
-  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint + "/products/" + category);
   return response.json();
 }
 
 //Producto por código
 export async function getProductByCode(code: string): Promise<Product[]>{
-  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint + "/products/find/" + code);
   return response.json();
 }
@@ -94,7 +74,7 @@ export async function createTransaction(rate:string):Promise<JSON>{
 
 
 export async function getPedidos(): Promise<Pedido[]> {
-  const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint = process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint + '/orders/list');
   //The objects returned by the api are directly convertible to User objects
   console.log(response);
@@ -103,14 +83,14 @@ export async function getPedidos(): Promise<Pedido[]> {
 
 
 export async function getPedidosByUser(user_id:string):Promise<Pedido[]>{
-  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint+'/orders/'+user_id);
   //The objects returned by the api are directly convertible to Product objects
   return response.json()
 }
 
 export async function getPaymentsType():Promise<PaymentType[]>{
-  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000'
+  const apiEndPoint= process.env.REACT_APP_API_URI || 'http://localhost:5000/api'
   let response = await fetch(apiEndPoint+'/payments');
   //The objects returned by the api are directly convertible to Product objects
   return response.json()