Merge pull request #107 from siliataider/main

rebase

BackSimulation/deploy.txt

@@ -1,3 +1,4 @@
 1
 1
+1
 1

front/src/assets/panel/CreationPanel.jsx

@@ -1,4 +1,5 @@
 import {useDispatch, useSelector} from 'react-redux';
+import {React, useState} from 'react';
 
 import { setCursorObject, setBuildingType, switchIsDragging } from "../mouse/mouseSlice";
 
@@ -18,6 +19,19 @@ const CreationPanel = (props) => {
     const isDragging = useSelector( (state) => state.mouse.isDragging);
     const socket = useSelector( (state) => state.socket.socket);
 
+    const [counter, setCounter] = useState(1);
+
+    const increase = () => {
+        setCounter(count => count+1)
+    }
+
+    const decrease = () => {
+        if(counter > 1){
+            setCounter(count => count-1)
+        }
+
+    }
+
     /**
      * Switch the cursore from dragging a building to not or the oposite
      */
@@ -61,7 +75,7 @@ const CreationPanel = (props) => {
             socket.off(socketEvents.saveAndStart)
         });
 
-        const startMessage = {nAgents : 10}
+        const startMessage = {nAgents : counter}
 
         console.log(startMessage)
 
@@ -73,9 +87,9 @@ const CreationPanel = (props) => {
     return(
     <>
         <h1>Config :</h1>
-
-        <button>Agent : 0</button>
-        <button>+</button>
+        <button onClick = {decrease}>-</button>
+        <button>Agents : {counter}</button>
+        <button onClick = {increase}>+</button>
         <br></br>
 
 

launcher.sh

@@ -1,17 +1,23 @@
 #!/bin/bash
 
-# Install python requirements
-pip install -r backAgent/requirements.txt
-
 # Start Nginx reverse proxy container
 cp ./nginx.conf /tmp/
 sudo docker run --name citymanager-nginx-container --network host -v /tmp/nginx.conf:/etc/nginx/nginx.conf:ro --rm nginx &
 
-# To kill all dockers : docker stop $(docker ps -a -q)
+# Install python requirements
+cd backAgent
+pip install -r requirements.txt
+python main.py &
+
+# Start the java backend
+cd ../BackSimulation
+mvn clean package
+java -jar target/BackSimulation-0.0.1-SNAPSHOT.jar &
 
 # Start the react front-end
-cd front
+cd ../front
 npm install
 npm run dev &
 
-echo "READY !"
+# Done
+echo "READY !"