Tentative pour le serveur sur docker

2 years ago · 6b2fe92a50
parent 75a4a525bc
commit 6b2fe92a50
8 changed files with 25 additions and 5 deletions
--- a/bob_party/Dockerfile
+++ b/bob_party/Dockerfile
@ -14,6 +14,7 @@ RUN yarn install --frozen-lockfile

 # Bundle app source
 COPY bob_party/server.js .
+COPY bob_party/index.html .

 EXPOSE 3000

--- a/bob_party/appManagers.ts
+++ b/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);
--- a/bob_party/index.html
+++ b/bob_party/index.html
@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+   <meta charset="UTF-8">
+   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+   <meta http-equiv="X-UA-Compatible" content="ie=edge">
+   <title>Node.js Socket.io Chat Application</title>
+   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+</head>
+<body>
+   NodeJs-Socket.on app running successfully!!!
+   <script>
+    jQuery(document).ready(function() {
+          var socket = io.connect();
+    });
+ </script>
+</body>
+</html>
--- a/bob_party/server.js
+++ b/bob_party/server.js
@ -8,6 +8,10 @@ const app = express();
 const server = http.createServer(app);
 const io = new Server(server);

+app.get('/', function (req, res) {
+  res.sendFile(__dirname + '/index.html');
+});
+
 io.on('connection', (socket) => {
  console.log(socket.id);  

--- a/bob_party/socketConfig.js
+++ b/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("https://codefirst.iut.uca.fr/containers/BOB_PARTEAM-server-bobParty");
--- a/bob_party/src/screens/SignUp.tsx
+++ b/bob_party/src/screens/SignUp.tsx
@ -198,7 +198,6 @@ function SignUp(props: { navigation: any; }) {
            await handleConversationLoad();
        });
        socket.on("addedToConv", async (conv) =>{
-            console.log("HEY");
            socket.emit("inConv", conv);
            await handleConversationLoad();
        });
--- a/bob_party/src/services/matchServices/saverMatchApi.ts
+++ b/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;
--- a/bob_party/src/services/userServices/saverUserApi.ts
+++ b/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,