Changes wikidata call

Arquisoft · Mar 21, 2024 · 8ffdf38 · 8ffdf38
1 parent b4c7353
commit 8ffdf38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
@@ -27,7 +27,6 @@ app.post('/login', async (req, res) => {
     const authResponse = await axios.post(userServiceUrl + '/auth/login', req.body);
     res.json(authResponse.data);
   } catch (error) {
-    res.status(error.response.status).json({ error: error.response.data.error });
     console.error(error);
   }
 });
@@ -38,7 +37,6 @@ app.post('/adduser', async (req, res) => {
     const userResponse = await axios.post(userServiceUrl + '/user/adduser', req.body);
     res.json(userResponse.data);
   } catch (error) {
-    res.status(error.response.status).json({ error: error.response.data.error });
     console.error(error);
   }
 });
@@ -49,7 +47,6 @@ app.post('/edituser', async (req, res) => {
     const userResponse = await axios.post(userServiceUrl + '/user/edituser', req.body);
     res.json(userResponse.data);
   } catch (error) {
-    res.status(error.response.status).json({ error: error.response.data.error });
     console.error(error);
   }
 });
@@ -61,7 +58,6 @@ app.get('/WikiData/GetCapitalsQuestions', async (_req, res) => {
     const wikiResponse = await axios.get(wikidataServiceUrl + '/WikiData/GetCapitalsQuestions');
     res.json(wikiResponse.data);
   } catch (error) {
-    res.status(error.response.status).json({ error: error.response.data.error });
     console.error(error);
   }
 });

diff --git a/webapp/src/stores/playing-store.ts b/webapp/src/stores/playing-store.ts
@@ -1,4 +1,5 @@
 
+import axios from 'axios';
 import {create} from 'zustand';
 import { getCorrectlyAnsweredQuestions, getQuestionsAnswered } from '../services/auth-service';
 
@@ -58,14 +59,15 @@ interface GameQuestions{
 
 const API_URL = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 
-const retrieveQuestions = () => {
-  console.log(`${API_URL}`);
-  return fetch(`${API_URL}/WikiData/GetCapitalsQuestions`)
-    .then((response) => response.json())
-    .catch((error) => {
-      console.error('There was a problem with the questions:', error);
-      return []; // Return an empty array in case of an error
-    });
+export const retrieveQuestions = async () => {
+  try {
+    let response = await axios.get(`${API_URL}/WikiData/GetCapitalsQuestions`);
+    console.log('response:', response);
+    return response.data.json();
+  } catch (error) {
+    console.error('There was a problem with the questions:', error);
+    return [];
+  }
 };
 
 export const useGameQuestions = create<GameQuestions>((set) => ({