Skip to content

Commit

Permalink
Merge pull request #74 from Arquisoft/LaraFMz
Browse files Browse the repository at this point in the history
Cors arreglado
  • Loading branch information
uo276026 authored Mar 21, 2024
2 parents 94092e5 + b0cc6bc commit 56ead15
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
}
}
}
4 changes: 2 additions & 2 deletions questionservice/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
const express = require('express');
// Importamos el módulo Axios para realizar solicitudes HTTP
const axios = require('axios');
//const cors = require('cors');
const cors = require('cors');

// Creamos una nueva aplicación Express
const app = express();
//app.use(cors());
app.use(cors());

// Definimos una ruta GET en '/pregunta'
app.get('/pregunta', async (req, res) => {
Expand Down
22 changes: 22 additions & 0 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@testing-library/user-event": "^14.5.2",
"axios": "^1.6.5",
"bootstrap": "^5.3.3",
"cors": "^2.8.5",
"firebase": "^10.8.0",
"react": "^18.2.0",
"react-bootstrap": "^2.10.1",
Expand Down
2 changes: 2 additions & 0 deletions webapp/src/components/Pages/Juego.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import '../Estilos/juego.css';
import { Container, Typography, TextField, Button, Snackbar } from '@mui/material';
import Temporizador from '../Temporizador';



const Juego = ({isLogged}) => {
//La pregunta (string)
const [pregunta, setPregunta] = useState("")
Expand Down

0 comments on commit 56ead15

Please sign in to comment.