Merge branch 'peristanceBDD' of https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY into peristanceBDD

bob_party/Dockerfile

@@ -7,7 +7,7 @@ FROM node:latest
 # where available (npm@5+)
 COPY bob_party/package*.json ./
 
-RUN yarn install --frozen-lockfile
+RUN yarn
 
 # If you are building your code for production
 # RUN npm ci --only=production

bob_party/appManagers.ts

@@ -11,7 +11,7 @@ import LoaderSkinApi from "./src/services/skinService/loaderSkinApi";
 import ManagerSkin from "./src/services/skinService/managerSkin";
 import FakeSaverUser from "./src/services/userServices/fakeSaverUser";
 import LoaderUserApi from "./src/services/userServices/loaderUserApi";
-import ManagerUser from "./src/services/userServices/ManagerUser";
+import ManagerUser from "./src/services/userServices/managerUser";
 import SaverUserApi from "./src/services/userServices/saverUserApi";
 
 export const MANAGER_USER = new ManagerUser(new LoaderUserApi, new SaverUserApi);

bob_party/package.json

@@ -30,6 +30,7 @@
     "expo-linear-gradient": "^12.0.1",
     "expo-status-bar": "~1.4.0",
     "express": "^4.18.2",
+    "is-docker": "^3.0.0",
     "jest": "^29.3.1",
     "jquery": "^3.6.1",
     "node": "^18.10.0",

bob_party/server.js

@@ -1,11 +1,9 @@
 
 const express = require('express');
-const http = require('http');
-const { Server } = require("socket.io");
-
-
 const app = express();
+const http = require('http');
 const server = http.createServer(app);
+const { Server } = require("socket.io");
 const io = new Server(server);
 
 io.on('connection', (socket) => {
@@ -20,7 +18,7 @@ io.on('connection', (socket) => {
   });
 
   socket.on('quitConv', (conv) => {
-    socket.off("C" + conv);
+    socket.off("C" + conv.id);
   });
 
   socket.on("messageSent", (conv) =>{
@@ -53,6 +51,5 @@ io.on('connection', (socket) => {
   });
 });
 
-server.listen(3000, () => {
-  console.log('listening on *:3000');
-});
+server.listen(3000);
+

bob_party/socketConfig.js

@@ -1,4 +1,4 @@
 const { io } = require("socket.io-client");
 
 
-export const socket = io("https://codefirst.iut.uca.fr/containers/BOB_PARTEAM-server-bobParty/server:3000");
+export const socket = io("http://172.20.10.2:3000");   

bob_party/src/screens/Home.tsx

@@ -23,6 +23,7 @@ function Home(props: { navigation: any; }) {
   const { navigation } = props
 
 
+  console.log(socket.connected);
 
   //It has to be in the home page that way the database will reload the conversations when the user receive a message een if he is in another page
 

bob_party/src/screens/SignUp.tsx

@@ -199,7 +199,6 @@ function SignUp(props: { navigation: any; }) {
             await handleConversationLoad();
         });
         socket.on("addedToConv", async (conv) =>{
-            console.log("HEY");
             socket.emit("inConv", conv);
             await handleConversationLoad();
         });

bob_party/src/services/matchServices/saverMatchApi.ts

@@ -61,7 +61,6 @@ export default class SaverMatchApi implements ISaverMatch{
 
         await MANAGER_MATCH.getLoaderMatch().loadByID(id).then(async (response)=>{
             if (response!==undefined && response !== null){
-                console.log(response.getTabUsers().length + " : " + response.getGame().getNbPlayerMax());
                 if (response.getTabUsers().length<response.getGame().getNbPlayerMax() && response.getInGame()===false){
                     response.getTabUsers().push(u);
                     match=response;

bob_party/src/services/userServices/saverUserApi.ts

@@ -27,7 +27,6 @@ export default class SaverUserApi implements ISaverUser{
     async updateUser(u: User): Promise<void> {
         let us:User|null=null;
         const url=this.baseUrl + 'putUser/'+ u.getId() + "/" + u.getUsername()  + "/" + u.getPassword() + "/" + u.getSexe() + "/" + u.getNationality() + "/" + u.getCurrentCoins() + "/" + u.getTotalCoins() + "/" + u.getGamesPlayed() + "/" + u.getCurrentSkin().getSkinId();
-        console.log(url);
         await this.axios({
             method: 'put',
             url: url,

bob_party/tsconfig.json

@@ -22,6 +22,6 @@
   "include": [
     "**/*.ts",
     "**/*.tsx"
-, "socketConfig.js", "server.js", "src/Games/BlackJack/blackJack.js", "src/Games/BlackJack/blackJack.js"  ],
+, "socketConfig.js", "server.ts", "src/Games/BlackJack/blackJack.js", "src/Games/BlackJack/blackJack.js"  ],
   "extends": "expo/tsconfig.base"
 }

bob_party/yarn.lock

@@ -5514,6 +5514,11 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
+is-docker@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200"
+  integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"