Merge pull request #222 from Arquisoft/develop

Minimal changes for releasing

users/Dockerfile

@@ -14,7 +14,7 @@ RUN npm install --no-cache
 COPY . .
 
 # Expose the port the app runs on
-EXPOSE 8002
+EXPOSE 8003
 
 # Define the command to run your app
 CMD ["node", "index.js"]

users/index.js

@@ -30,8 +30,6 @@ app.use('/auth', authRoutes);
 app.use('/user', userRoutes);
 
 
-
-
 // Start the server
 const server = app.listen(port, () => {
     console.log(`Auth Service listening at http://localhost:${port}`);

webapp/src/components/Game/Trivia/trivia_service.ts

@@ -1,8 +1,6 @@
 import { Question } from "@/src/services/question-service";
 
-
-
-let url = 'http://localhost:8000/';
+let url = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000/';
 
 const getString = (string : string) : string => {
     return "Get" + string + "Questions";

webapp/src/services/auth-service.ts

@@ -1,7 +1,6 @@
 import axios from 'axios';
 import { jwtDecode } from "jwt-decode"; 
 import { useUserStore } from '../stores/user-store';
-// import { useStats } from '../stores/playing-store';
 
 const API_URL = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
 

webapp/src/services/question-service.ts

@@ -1,4 +1,4 @@
-
+import axios from 'axios';
 
 export type Question = {
   text: string,
@@ -10,14 +10,11 @@ export type Question = {
 
 let url = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000/';
 
-
-
 export const getQuestionsFromApi = async (): Promise<Question[]> => {
-    const response = await fetch(url + "GetQuestions");
-    const data = await response.json();
-
-    return data;
-  };
+    const response = await axios.get(url + "GetQuestions");
+    console.log('response:', response);
+    return response.data;
+};
 
 export const getEasyString = ():string => {
   return "easy";