From 2a4a594b14b37d9d58e02e1e0b7811560d650232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Mitress=C3=A9?= <96947354+kmitresse@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:05:30 +0200 Subject: [PATCH] refacto - restructure code --- S2/DevWeb/Projet/.gitignore => .gitignore | 0 .../Projet/.mvn => .mvn}/wrapper/maven-wrapper.jar | Bin .../.mvn => .mvn}/wrapper/maven-wrapper.properties | 0 S2/DevWeb/Projet/README.md => README.md | 0 S2/DevWeb/Projet/Sujet.pdf => Sujet.pdf | Bin .../docker-compose.yaml => docker-compose.yaml | 0 S2/DevWeb/Projet/mvnw => mvnw | 0 S2/DevWeb/Projet/mvnw.cmd => mvnw.cmd | 0 {S2/DevWeb/Projet/mysql => mysql}/.gitignore | 0 {S2/DevWeb/Projet/mysql => mysql}/build.sh | 0 {S2/DevWeb/Projet/mysql => mysql}/template.sql | 0 S2/DevWeb/Projet/pom.xml => pom.xml | 4 ++-- .../project_structure.png | Bin .../tomcat_configuration.png | Bin .../src => src}/main/java/uppa/project/Global.java | 0 .../uppa/project/bean/ForgottenPasswordBean.java | 0 .../main/java/uppa/project/bean/LoginBean.java | 0 .../main/java/uppa/project/bean/NewGameBean.java | 0 .../main/java/uppa/project/bean/PlayerBean.java | 0 .../main/java/uppa/project/bean/ProfileBean.java | 0 .../main/java/uppa/project/bean/RegisterBean.java | 0 .../java/uppa/project/bean/ResetPasswordBean.java | 0 .../project/database/dao/AbstractDAOFactory.java | 0 .../main/java/uppa/project/database/dao/DAO.java | 0 .../uppa/project/database/dao/DAOException.java | 0 .../project/database/dao/EntityManagerProvider.java | 0 .../uppa/project/database/dao/GameDAOFactory.java | 0 .../uppa/project/database/dao/PersistenceKind.java | 0 .../uppa/project/database/dao/jpa/DAO_JPA_Game.java | 0 .../project/database/dao/jpa/DAO_JPA_Player.java | 0 .../dao/jpa/DAO_JPA_RecoveryPasswordToken.java | 0 .../uppa/project/database/dao/jpa/DAO_JPA_User.java | 0 .../database/dao/jpa/Game_JPA_DAO_Factory.java | 0 .../main/java/uppa/project/database/pojo/Card.java | 0 .../main/java/uppa/project/database/pojo/Deck.java | 0 .../main/java/uppa/project/database/pojo/Game.java | 0 .../java/uppa/project/database/pojo/Player.java | 0 .../database/pojo/RecoveryPasswordToken.java | 0 .../main/java/uppa/project/database/pojo/User.java | 0 .../main/java/uppa/project/json/HttpResponse.java | 0 .../java/uppa/project/json/HttpResponseCode.java | 0 .../uppa/project/json/websocket/ClickChoice.java | 0 .../java/uppa/project/json/websocket/Message.java | 0 .../uppa/project/json/websocket/SimpleGame.java | 0 .../project/json/websocket/SimpleInvitation.java | 0 .../uppa/project/json/websocket/SimplePlayer.java | 0 .../uppa/project/json/websocket/SimpleUser.java | 0 .../project/web/filter/AlreadyLoggedFilter.java | 0 .../project/web/filter/AuthenticationFilter.java | 0 .../web/servlet/ForgottenPasswordServlet.java | 0 .../java/uppa/project/web/servlet/GameServlet.java | 0 .../project/web/servlet/GameStatisticsServlet.java | 0 .../java/uppa/project/web/servlet/IndexServlet.java | 0 .../java/uppa/project/web/servlet/LobbyServlet.java | 0 .../java/uppa/project/web/servlet/LoginServlet.java | 0 .../uppa/project/web/servlet/LogoutServlet.java | 0 .../uppa/project/web/servlet/NewGameServlet.java | 0 .../uppa/project/web/servlet/ProfileServlet.java | 0 .../uppa/project/web/servlet/RegisterServlet.java | 0 .../project/web/servlet/ResetPasswordServlet.java | 0 .../java/uppa/project/web/servlet/RulesServlet.java | 0 .../project/web/servlet/TranslationServlet.java | 0 .../uppa/project/web/translation/Translator.java | 0 .../project/web/websocket/ConnectedUsersWS.java | 0 .../java/uppa/project/web/websocket/GameWS.java | 0 .../src => src}/main/resources/META-INF/beans.xml | 0 .../main/resources/META-INF/persistence.xml | 0 .../WEB-INF/pages/errors/expired-token-password.jsp | 0 .../WEB-INF/pages/errors/invalid-token-password.jsp | 0 .../webapp/WEB-INF/pages/forgotten-password.jsp | 0 .../main/webapp/WEB-INF/pages/game-statistics.jsp | 0 .../src => src}/main/webapp/WEB-INF/pages/game.jsp | 0 .../src => src}/main/webapp/WEB-INF/pages/index.jsp | 0 .../src => src}/main/webapp/WEB-INF/pages/lobby.jsp | 0 .../src => src}/main/webapp/WEB-INF/pages/login.jsp | 0 .../main/webapp/WEB-INF/pages/new-game.jsp | 0 .../main/webapp/WEB-INF/pages/profile.jsp | 0 .../main/webapp/WEB-INF/pages/register.jsp | 0 .../main/webapp/WEB-INF/pages/reset-password.jsp | 0 .../src => src}/main/webapp/WEB-INF/pages/rules.jsp | 0 .../main/webapp/WEB-INF/tags/components/card.tag | 0 .../WEB-INF/tags/components/connected-user-list.tag | 0 .../main/webapp/WEB-INF/tags/components/footer.tag | 0 .../WEB-INF/tags/components/game-player-list.tag | 0 .../tags/components/game-room-information.tag | 0 .../webapp/WEB-INF/tags/components/game-start.tag | 0 .../WEB-INF/tags/components/game-statistics.tag | 0 .../main/webapp/WEB-INF/tags/components/hero.tag | 0 .../components/modal/connected-users-list-modal.tag | 0 .../main/webapp/WEB-INF/tags/components/navbar.tag | 0 .../webapp/WEB-INF/tags/components/statistics.tag | 0 .../WEB-INF/tags/forms/forgotten-password.tag | 0 .../main/webapp/WEB-INF/tags/forms/login.tag | 0 .../main/webapp/WEB-INF/tags/forms/new-game.tag | 0 .../main/webapp/WEB-INF/tags/forms/profile.tag | 0 .../main/webapp/WEB-INF/tags/forms/register.tag | 0 .../webapp/WEB-INF/tags/forms/reset-password.tag | 0 .../main/webapp/WEB-INF/tags/layouts/base.tag | 0 .../main/webapp/WEB-INF/tags/layouts/error.tag | 0 .../main/webapp/WEB-INF/tags/layouts/form.tag | 0 .../main/webapp/WEB-INF/translations.json | 0 .../Projet/src => src}/main/webapp/WEB-INF/web.xml | 0 .../Projet/src => src}/main/webapp/index.html | 0 .../src => src}/main/webapp/static/css/card.css | 0 .../src => src}/main/webapp/static/css/global.css | 0 .../main/webapp/static/css/notification.css | 0 .../Projet/src => src}/main/webapp/static/icon.svg | 0 .../main/webapp/static/img/CardsRushLogo.png | Bin .../main/webapp/static/img/CardsRushLogo.svg | 0 .../main/webapp/static/img/CardsRushLogoBlack.svg | 0 .../src => src}/main/webapp/static/img/Home.svg | 0 .../main/webapp/static/img/color/club.svg | 0 .../main/webapp/static/img/color/diamond.svg | 0 .../main/webapp/static/img/color/heart.svg | 0 .../main/webapp/static/img/color/spade.svg | 0 .../main/webapp/static/img/value/black_ace.svg | 0 .../main/webapp/static/img/value/black_eight.svg | 0 .../main/webapp/static/img/value/black_five.svg | 0 .../main/webapp/static/img/value/black_four.svg | 0 .../main/webapp/static/img/value/black_jack.svg | 0 .../main/webapp/static/img/value/black_king.svg | 0 .../main/webapp/static/img/value/black_nine.svg | 0 .../main/webapp/static/img/value/black_queen.svg | 0 .../main/webapp/static/img/value/black_seven.svg | 0 .../main/webapp/static/img/value/black_six.svg | 0 .../main/webapp/static/img/value/black_ten.svg | 0 .../main/webapp/static/img/value/black_three.svg | 0 .../main/webapp/static/img/value/black_two.svg | 0 .../main/webapp/static/img/value/red_ace.svg | 0 .../main/webapp/static/img/value/red_eight.svg | 0 .../main/webapp/static/img/value/red_five.svg | 0 .../main/webapp/static/img/value/red_four.svg | 0 .../main/webapp/static/img/value/red_jack.svg | 0 .../main/webapp/static/img/value/red_king.svg | 0 .../main/webapp/static/img/value/red_nine.svg | 0 .../main/webapp/static/img/value/red_queen.svg | 0 .../main/webapp/static/img/value/red_seven.svg | 0 .../main/webapp/static/img/value/red_six.svg | 0 .../main/webapp/static/img/value/red_ten.svg | 0 .../main/webapp/static/img/value/red_three.svg | 0 .../main/webapp/static/img/value/red_two.svg | 0 .../src => src}/main/webapp/static/js/Card.js | 0 .../src => src}/main/webapp/static/js/Message.js | 0 .../src => src}/main/webapp/static/js/PlayerHand.js | 0 .../main/webapp/static/js/WebsocketToolkit.js | 0 .../webapp/static/js/form/forgotten-password.js | 0 .../src => src}/main/webapp/static/js/form/login.js | 0 .../main/webapp/static/js/form/new-game.js | 0 .../main/webapp/static/js/form/profile.js | 0 .../main/webapp/static/js/form/register.js | 0 .../main/webapp/static/js/form/reset-password.js | 0 .../src => src}/main/webapp/static/js/modal.js | 0 .../src => src}/main/webapp/static/js/navbar.js | 0 .../main/webapp/static/js/notification/error.js | 0 .../webapp/static/js/notification/information.js | 0 .../main/webapp/static/js/notification/invite.js | 0 .../main/webapp/static/js/notification/success.js | 0 .../static/js/pagination/statistics-pagination.js | 0 .../src => src}/main/webapp/static/js/rewriteUrl.js | 0 .../js/websockets/connected-users-websocket.js | 0 .../js/websockets/game-management-websocket.js | 0 .../js/websockets/player-management-websocket.js | 0 162 files changed, 2 insertions(+), 2 deletions(-) rename S2/DevWeb/Projet/.gitignore => .gitignore (100%) rename {S2/DevWeb/Projet/.mvn => .mvn}/wrapper/maven-wrapper.jar (100%) rename {S2/DevWeb/Projet/.mvn => .mvn}/wrapper/maven-wrapper.properties (100%) rename S2/DevWeb/Projet/README.md => README.md (100%) rename S2/DevWeb/Projet/Sujet.pdf => Sujet.pdf (100%) rename S2/DevWeb/Projet/docker-compose.yaml => docker-compose.yaml (100%) rename S2/DevWeb/Projet/mvnw => mvnw (100%) mode change 100755 => 100644 rename S2/DevWeb/Projet/mvnw.cmd => mvnw.cmd (100%) rename {S2/DevWeb/Projet/mysql => mysql}/.gitignore (100%) rename {S2/DevWeb/Projet/mysql => mysql}/build.sh (100%) mode change 100755 => 100644 rename {S2/DevWeb/Projet/mysql => mysql}/template.sql (100%) rename S2/DevWeb/Projet/pom.xml => pom.xml (97%) rename {S2/DevWeb/Projet/readmeTools => readmeTools}/project_structure.png (100%) rename {S2/DevWeb/Projet/readmeTools => readmeTools}/tomcat_configuration.png (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/Global.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/bean/ForgottenPasswordBean.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/bean/LoginBean.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/bean/NewGameBean.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/bean/PlayerBean.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/bean/ProfileBean.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/bean/RegisterBean.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/bean/ResetPasswordBean.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/AbstractDAOFactory.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/DAO.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/DAOException.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/EntityManagerProvider.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/GameDAOFactory.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/PersistenceKind.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/pojo/Card.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/pojo/Deck.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/pojo/Game.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/pojo/Player.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/database/pojo/User.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/HttpResponse.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/HttpResponseCode.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/websocket/ClickChoice.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/websocket/Message.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/websocket/SimpleGame.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/websocket/SimpleInvitation.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/websocket/SimplePlayer.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/json/websocket/SimpleUser.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/filter/AuthenticationFilter.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/GameServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/GameStatisticsServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/IndexServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/LobbyServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/LoginServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/LogoutServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/NewGameServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/ProfileServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/RegisterServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/ResetPasswordServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/RulesServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/servlet/TranslationServlet.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/translation/Translator.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/websocket/ConnectedUsersWS.java (100%) rename {S2/DevWeb/Projet/src => src}/main/java/uppa/project/web/websocket/GameWS.java (100%) rename {S2/DevWeb/Projet/src => src}/main/resources/META-INF/beans.xml (100%) rename {S2/DevWeb/Projet/src => src}/main/resources/META-INF/persistence.xml (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/forgotten-password.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/game-statistics.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/game.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/index.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/lobby.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/login.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/new-game.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/profile.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/register.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/reset-password.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/pages/rules.jsp (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/card.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/connected-user-list.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/footer.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/game-player-list.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/game-room-information.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/game-start.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/game-statistics.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/hero.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/modal/connected-users-list-modal.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/navbar.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/components/statistics.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/forms/forgotten-password.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/forms/login.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/forms/new-game.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/forms/profile.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/forms/register.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/forms/reset-password.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/layouts/base.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/layouts/error.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/tags/layouts/form.tag (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/translations.json (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/WEB-INF/web.xml (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/index.html (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/css/card.css (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/css/global.css (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/css/notification.css (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/icon.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/CardsRushLogo.png (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/CardsRushLogo.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/CardsRushLogoBlack.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/Home.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/color/club.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/color/diamond.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/color/heart.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/color/spade.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_ace.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_eight.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_five.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_four.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_jack.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_king.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_nine.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_queen.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_seven.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_six.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_ten.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_three.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/black_two.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_ace.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_eight.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_five.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_four.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_jack.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_king.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_nine.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_queen.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_seven.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_six.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_ten.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_three.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/img/value/red_two.svg (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/Card.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/Message.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/PlayerHand.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/WebsocketToolkit.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/form/forgotten-password.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/form/login.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/form/new-game.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/form/profile.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/form/register.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/form/reset-password.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/modal.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/navbar.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/notification/error.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/notification/information.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/notification/invite.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/notification/success.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/pagination/statistics-pagination.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/rewriteUrl.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/websockets/connected-users-websocket.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/websockets/game-management-websocket.js (100%) rename {S2/DevWeb/Projet/src => src}/main/webapp/static/js/websockets/player-management-websocket.js (100%) diff --git a/S2/DevWeb/Projet/.gitignore b/.gitignore similarity index 100% rename from S2/DevWeb/Projet/.gitignore rename to .gitignore diff --git a/S2/DevWeb/Projet/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from S2/DevWeb/Projet/.mvn/wrapper/maven-wrapper.jar rename to .mvn/wrapper/maven-wrapper.jar diff --git a/S2/DevWeb/Projet/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from S2/DevWeb/Projet/.mvn/wrapper/maven-wrapper.properties rename to .mvn/wrapper/maven-wrapper.properties diff --git a/S2/DevWeb/Projet/README.md b/README.md similarity index 100% rename from S2/DevWeb/Projet/README.md rename to README.md diff --git a/S2/DevWeb/Projet/Sujet.pdf b/Sujet.pdf similarity index 100% rename from S2/DevWeb/Projet/Sujet.pdf rename to Sujet.pdf diff --git a/S2/DevWeb/Projet/docker-compose.yaml b/docker-compose.yaml similarity index 100% rename from S2/DevWeb/Projet/docker-compose.yaml rename to docker-compose.yaml diff --git a/S2/DevWeb/Projet/mvnw b/mvnw old mode 100755 new mode 100644 similarity index 100% rename from S2/DevWeb/Projet/mvnw rename to mvnw diff --git a/S2/DevWeb/Projet/mvnw.cmd b/mvnw.cmd similarity index 100% rename from S2/DevWeb/Projet/mvnw.cmd rename to mvnw.cmd diff --git a/S2/DevWeb/Projet/mysql/.gitignore b/mysql/.gitignore similarity index 100% rename from S2/DevWeb/Projet/mysql/.gitignore rename to mysql/.gitignore diff --git a/S2/DevWeb/Projet/mysql/build.sh b/mysql/build.sh old mode 100755 new mode 100644 similarity index 100% rename from S2/DevWeb/Projet/mysql/build.sh rename to mysql/build.sh diff --git a/S2/DevWeb/Projet/mysql/template.sql b/mysql/template.sql similarity index 100% rename from S2/DevWeb/Projet/mysql/template.sql rename to mysql/template.sql diff --git a/S2/DevWeb/Projet/pom.xml b/pom.xml similarity index 97% rename from S2/DevWeb/Projet/pom.xml rename to pom.xml index 50e0cb9..43342ff 100644 --- a/S2/DevWeb/Projet/pom.xml +++ b/pom.xml @@ -5,9 +5,9 @@ 4.0.0 uppa - project + cardsrush 1.0-SNAPSHOT - Projet + Cards Rush war diff --git a/S2/DevWeb/Projet/readmeTools/project_structure.png b/readmeTools/project_structure.png similarity index 100% rename from S2/DevWeb/Projet/readmeTools/project_structure.png rename to readmeTools/project_structure.png diff --git a/S2/DevWeb/Projet/readmeTools/tomcat_configuration.png b/readmeTools/tomcat_configuration.png similarity index 100% rename from S2/DevWeb/Projet/readmeTools/tomcat_configuration.png rename to readmeTools/tomcat_configuration.png diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/Global.java b/src/main/java/uppa/project/Global.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/Global.java rename to src/main/java/uppa/project/Global.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ForgottenPasswordBean.java b/src/main/java/uppa/project/bean/ForgottenPasswordBean.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/bean/ForgottenPasswordBean.java rename to src/main/java/uppa/project/bean/ForgottenPasswordBean.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/LoginBean.java b/src/main/java/uppa/project/bean/LoginBean.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/bean/LoginBean.java rename to src/main/java/uppa/project/bean/LoginBean.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/NewGameBean.java b/src/main/java/uppa/project/bean/NewGameBean.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/bean/NewGameBean.java rename to src/main/java/uppa/project/bean/NewGameBean.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/PlayerBean.java b/src/main/java/uppa/project/bean/PlayerBean.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/bean/PlayerBean.java rename to src/main/java/uppa/project/bean/PlayerBean.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ProfileBean.java b/src/main/java/uppa/project/bean/ProfileBean.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/bean/ProfileBean.java rename to src/main/java/uppa/project/bean/ProfileBean.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/RegisterBean.java b/src/main/java/uppa/project/bean/RegisterBean.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/bean/RegisterBean.java rename to src/main/java/uppa/project/bean/RegisterBean.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/bean/ResetPasswordBean.java b/src/main/java/uppa/project/bean/ResetPasswordBean.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/bean/ResetPasswordBean.java rename to src/main/java/uppa/project/bean/ResetPasswordBean.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/AbstractDAOFactory.java b/src/main/java/uppa/project/database/dao/AbstractDAOFactory.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/AbstractDAOFactory.java rename to src/main/java/uppa/project/database/dao/AbstractDAOFactory.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAO.java b/src/main/java/uppa/project/database/dao/DAO.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAO.java rename to src/main/java/uppa/project/database/dao/DAO.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAOException.java b/src/main/java/uppa/project/database/dao/DAOException.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/DAOException.java rename to src/main/java/uppa/project/database/dao/DAOException.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/EntityManagerProvider.java b/src/main/java/uppa/project/database/dao/EntityManagerProvider.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/EntityManagerProvider.java rename to src/main/java/uppa/project/database/dao/EntityManagerProvider.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/GameDAOFactory.java b/src/main/java/uppa/project/database/dao/GameDAOFactory.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/GameDAOFactory.java rename to src/main/java/uppa/project/database/dao/GameDAOFactory.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/PersistenceKind.java b/src/main/java/uppa/project/database/dao/PersistenceKind.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/PersistenceKind.java rename to src/main/java/uppa/project/database/dao/PersistenceKind.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java b/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java rename to src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Game.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java b/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java rename to src/main/java/uppa/project/database/dao/jpa/DAO_JPA_Player.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java b/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java rename to src/main/java/uppa/project/database/dao/jpa/DAO_JPA_RecoveryPasswordToken.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java b/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java rename to src/main/java/uppa/project/database/dao/jpa/DAO_JPA_User.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java b/src/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java rename to src/main/java/uppa/project/database/dao/jpa/Game_JPA_DAO_Factory.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Card.java b/src/main/java/uppa/project/database/pojo/Card.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Card.java rename to src/main/java/uppa/project/database/pojo/Card.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java b/src/main/java/uppa/project/database/pojo/Deck.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Deck.java rename to src/main/java/uppa/project/database/pojo/Deck.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java b/src/main/java/uppa/project/database/pojo/Game.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Game.java rename to src/main/java/uppa/project/database/pojo/Game.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Player.java b/src/main/java/uppa/project/database/pojo/Player.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/Player.java rename to src/main/java/uppa/project/database/pojo/Player.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java b/src/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java rename to src/main/java/uppa/project/database/pojo/RecoveryPasswordToken.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java b/src/main/java/uppa/project/database/pojo/User.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/database/pojo/User.java rename to src/main/java/uppa/project/database/pojo/User.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponse.java b/src/main/java/uppa/project/json/HttpResponse.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponse.java rename to src/main/java/uppa/project/json/HttpResponse.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponseCode.java b/src/main/java/uppa/project/json/HttpResponseCode.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/HttpResponseCode.java rename to src/main/java/uppa/project/json/HttpResponseCode.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/ClickChoice.java b/src/main/java/uppa/project/json/websocket/ClickChoice.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/ClickChoice.java rename to src/main/java/uppa/project/json/websocket/ClickChoice.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/Message.java b/src/main/java/uppa/project/json/websocket/Message.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/Message.java rename to src/main/java/uppa/project/json/websocket/Message.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleGame.java b/src/main/java/uppa/project/json/websocket/SimpleGame.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleGame.java rename to src/main/java/uppa/project/json/websocket/SimpleGame.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleInvitation.java b/src/main/java/uppa/project/json/websocket/SimpleInvitation.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleInvitation.java rename to src/main/java/uppa/project/json/websocket/SimpleInvitation.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimplePlayer.java b/src/main/java/uppa/project/json/websocket/SimplePlayer.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimplePlayer.java rename to src/main/java/uppa/project/json/websocket/SimplePlayer.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleUser.java b/src/main/java/uppa/project/json/websocket/SimpleUser.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/json/websocket/SimpleUser.java rename to src/main/java/uppa/project/json/websocket/SimpleUser.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java b/src/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java rename to src/main/java/uppa/project/web/filter/AlreadyLoggedFilter.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AuthenticationFilter.java b/src/main/java/uppa/project/web/filter/AuthenticationFilter.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/filter/AuthenticationFilter.java rename to src/main/java/uppa/project/web/filter/AuthenticationFilter.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java b/src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java rename to src/main/java/uppa/project/web/servlet/ForgottenPasswordServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameServlet.java b/src/main/java/uppa/project/web/servlet/GameServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameServlet.java rename to src/main/java/uppa/project/web/servlet/GameServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java b/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java rename to src/main/java/uppa/project/web/servlet/GameStatisticsServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/IndexServlet.java b/src/main/java/uppa/project/web/servlet/IndexServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/IndexServlet.java rename to src/main/java/uppa/project/web/servlet/IndexServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LobbyServlet.java b/src/main/java/uppa/project/web/servlet/LobbyServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LobbyServlet.java rename to src/main/java/uppa/project/web/servlet/LobbyServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java b/src/main/java/uppa/project/web/servlet/LoginServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LoginServlet.java rename to src/main/java/uppa/project/web/servlet/LoginServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LogoutServlet.java b/src/main/java/uppa/project/web/servlet/LogoutServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/LogoutServlet.java rename to src/main/java/uppa/project/web/servlet/LogoutServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/NewGameServlet.java b/src/main/java/uppa/project/web/servlet/NewGameServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/NewGameServlet.java rename to src/main/java/uppa/project/web/servlet/NewGameServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java b/src/main/java/uppa/project/web/servlet/ProfileServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ProfileServlet.java rename to src/main/java/uppa/project/web/servlet/ProfileServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/RegisterServlet.java b/src/main/java/uppa/project/web/servlet/RegisterServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/RegisterServlet.java rename to src/main/java/uppa/project/web/servlet/RegisterServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java b/src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java rename to src/main/java/uppa/project/web/servlet/ResetPasswordServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/RulesServlet.java b/src/main/java/uppa/project/web/servlet/RulesServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/RulesServlet.java rename to src/main/java/uppa/project/web/servlet/RulesServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/TranslationServlet.java b/src/main/java/uppa/project/web/servlet/TranslationServlet.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/servlet/TranslationServlet.java rename to src/main/java/uppa/project/web/servlet/TranslationServlet.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/translation/Translator.java b/src/main/java/uppa/project/web/translation/Translator.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/translation/Translator.java rename to src/main/java/uppa/project/web/translation/Translator.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java b/src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java rename to src/main/java/uppa/project/web/websocket/ConnectedUsersWS.java diff --git a/S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/GameWS.java b/src/main/java/uppa/project/web/websocket/GameWS.java similarity index 100% rename from S2/DevWeb/Projet/src/main/java/uppa/project/web/websocket/GameWS.java rename to src/main/java/uppa/project/web/websocket/GameWS.java diff --git a/S2/DevWeb/Projet/src/main/resources/META-INF/beans.xml b/src/main/resources/META-INF/beans.xml similarity index 100% rename from S2/DevWeb/Projet/src/main/resources/META-INF/beans.xml rename to src/main/resources/META-INF/beans.xml diff --git a/S2/DevWeb/Projet/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml similarity index 100% rename from S2/DevWeb/Projet/src/main/resources/META-INF/persistence.xml rename to src/main/resources/META-INF/persistence.xml diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp b/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp rename to src/main/webapp/WEB-INF/pages/errors/expired-token-password.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp b/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp rename to src/main/webapp/WEB-INF/pages/errors/invalid-token-password.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp b/src/main/webapp/WEB-INF/pages/forgotten-password.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/forgotten-password.jsp rename to src/main/webapp/WEB-INF/pages/forgotten-password.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp b/src/main/webapp/WEB-INF/pages/game-statistics.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game-statistics.jsp rename to src/main/webapp/WEB-INF/pages/game-statistics.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game.jsp b/src/main/webapp/WEB-INF/pages/game.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/game.jsp rename to src/main/webapp/WEB-INF/pages/game.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp b/src/main/webapp/WEB-INF/pages/index.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/index.jsp rename to src/main/webapp/WEB-INF/pages/index.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/lobby.jsp b/src/main/webapp/WEB-INF/pages/lobby.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/lobby.jsp rename to src/main/webapp/WEB-INF/pages/lobby.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp b/src/main/webapp/WEB-INF/pages/login.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/login.jsp rename to src/main/webapp/WEB-INF/pages/login.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/new-game.jsp b/src/main/webapp/WEB-INF/pages/new-game.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/new-game.jsp rename to src/main/webapp/WEB-INF/pages/new-game.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/profile.jsp b/src/main/webapp/WEB-INF/pages/profile.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/profile.jsp rename to src/main/webapp/WEB-INF/pages/profile.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp b/src/main/webapp/WEB-INF/pages/register.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/register.jsp rename to src/main/webapp/WEB-INF/pages/register.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp b/src/main/webapp/WEB-INF/pages/reset-password.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/reset-password.jsp rename to src/main/webapp/WEB-INF/pages/reset-password.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/rules.jsp b/src/main/webapp/WEB-INF/pages/rules.jsp similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/pages/rules.jsp rename to src/main/webapp/WEB-INF/pages/rules.jsp diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/card.tag b/src/main/webapp/WEB-INF/tags/components/card.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/card.tag rename to src/main/webapp/WEB-INF/tags/components/card.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connected-user-list.tag b/src/main/webapp/WEB-INF/tags/components/connected-user-list.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/connected-user-list.tag rename to src/main/webapp/WEB-INF/tags/components/connected-user-list.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/footer.tag b/src/main/webapp/WEB-INF/tags/components/footer.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/footer.tag rename to src/main/webapp/WEB-INF/tags/components/footer.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-player-list.tag b/src/main/webapp/WEB-INF/tags/components/game-player-list.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-player-list.tag rename to src/main/webapp/WEB-INF/tags/components/game-player-list.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-room-information.tag b/src/main/webapp/WEB-INF/tags/components/game-room-information.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-room-information.tag rename to src/main/webapp/WEB-INF/tags/components/game-room-information.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-start.tag b/src/main/webapp/WEB-INF/tags/components/game-start.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-start.tag rename to src/main/webapp/WEB-INF/tags/components/game-start.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag b/src/main/webapp/WEB-INF/tags/components/game-statistics.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/game-statistics.tag rename to src/main/webapp/WEB-INF/tags/components/game-statistics.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/hero.tag b/src/main/webapp/WEB-INF/tags/components/hero.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/hero.tag rename to src/main/webapp/WEB-INF/tags/components/hero.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/modal/connected-users-list-modal.tag b/src/main/webapp/WEB-INF/tags/components/modal/connected-users-list-modal.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/modal/connected-users-list-modal.tag rename to src/main/webapp/WEB-INF/tags/components/modal/connected-users-list-modal.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/navbar.tag b/src/main/webapp/WEB-INF/tags/components/navbar.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/navbar.tag rename to src/main/webapp/WEB-INF/tags/components/navbar.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag b/src/main/webapp/WEB-INF/tags/components/statistics.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/components/statistics.tag rename to src/main/webapp/WEB-INF/tags/components/statistics.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/forgotten-password.tag b/src/main/webapp/WEB-INF/tags/forms/forgotten-password.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/forgotten-password.tag rename to src/main/webapp/WEB-INF/tags/forms/forgotten-password.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag b/src/main/webapp/WEB-INF/tags/forms/login.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/login.tag rename to src/main/webapp/WEB-INF/tags/forms/login.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/new-game.tag b/src/main/webapp/WEB-INF/tags/forms/new-game.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/new-game.tag rename to src/main/webapp/WEB-INF/tags/forms/new-game.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/profile.tag b/src/main/webapp/WEB-INF/tags/forms/profile.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/profile.tag rename to src/main/webapp/WEB-INF/tags/forms/profile.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/register.tag b/src/main/webapp/WEB-INF/tags/forms/register.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/register.tag rename to src/main/webapp/WEB-INF/tags/forms/register.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/reset-password.tag b/src/main/webapp/WEB-INF/tags/forms/reset-password.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/forms/reset-password.tag rename to src/main/webapp/WEB-INF/tags/forms/reset-password.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag b/src/main/webapp/WEB-INF/tags/layouts/base.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/base.tag rename to src/main/webapp/WEB-INF/tags/layouts/base.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/error.tag b/src/main/webapp/WEB-INF/tags/layouts/error.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/error.tag rename to src/main/webapp/WEB-INF/tags/layouts/error.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/form.tag b/src/main/webapp/WEB-INF/tags/layouts/form.tag similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/tags/layouts/form.tag rename to src/main/webapp/WEB-INF/tags/layouts/form.tag diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/translations.json b/src/main/webapp/WEB-INF/translations.json similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/translations.json rename to src/main/webapp/WEB-INF/translations.json diff --git a/S2/DevWeb/Projet/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/WEB-INF/web.xml rename to src/main/webapp/WEB-INF/web.xml diff --git a/S2/DevWeb/Projet/src/main/webapp/index.html b/src/main/webapp/index.html similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/index.html rename to src/main/webapp/index.html diff --git a/S2/DevWeb/Projet/src/main/webapp/static/css/card.css b/src/main/webapp/static/css/card.css similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/css/card.css rename to src/main/webapp/static/css/card.css diff --git a/S2/DevWeb/Projet/src/main/webapp/static/css/global.css b/src/main/webapp/static/css/global.css similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/css/global.css rename to src/main/webapp/static/css/global.css diff --git a/S2/DevWeb/Projet/src/main/webapp/static/css/notification.css b/src/main/webapp/static/css/notification.css similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/css/notification.css rename to src/main/webapp/static/css/notification.css diff --git a/S2/DevWeb/Projet/src/main/webapp/static/icon.svg b/src/main/webapp/static/icon.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/icon.svg rename to src/main/webapp/static/icon.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.png b/src/main/webapp/static/img/CardsRushLogo.png similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.png rename to src/main/webapp/static/img/CardsRushLogo.png diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.svg b/src/main/webapp/static/img/CardsRushLogo.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogo.svg rename to src/main/webapp/static/img/CardsRushLogo.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogoBlack.svg b/src/main/webapp/static/img/CardsRushLogoBlack.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/CardsRushLogoBlack.svg rename to src/main/webapp/static/img/CardsRushLogoBlack.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/Home.svg b/src/main/webapp/static/img/Home.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/Home.svg rename to src/main/webapp/static/img/Home.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/color/club.svg b/src/main/webapp/static/img/color/club.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/color/club.svg rename to src/main/webapp/static/img/color/club.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/color/diamond.svg b/src/main/webapp/static/img/color/diamond.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/color/diamond.svg rename to src/main/webapp/static/img/color/diamond.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/color/heart.svg b/src/main/webapp/static/img/color/heart.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/color/heart.svg rename to src/main/webapp/static/img/color/heart.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/color/spade.svg b/src/main/webapp/static/img/color/spade.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/color/spade.svg rename to src/main/webapp/static/img/color/spade.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_ace.svg b/src/main/webapp/static/img/value/black_ace.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_ace.svg rename to src/main/webapp/static/img/value/black_ace.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_eight.svg b/src/main/webapp/static/img/value/black_eight.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_eight.svg rename to src/main/webapp/static/img/value/black_eight.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_five.svg b/src/main/webapp/static/img/value/black_five.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_five.svg rename to src/main/webapp/static/img/value/black_five.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_four.svg b/src/main/webapp/static/img/value/black_four.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_four.svg rename to src/main/webapp/static/img/value/black_four.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_jack.svg b/src/main/webapp/static/img/value/black_jack.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_jack.svg rename to src/main/webapp/static/img/value/black_jack.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_king.svg b/src/main/webapp/static/img/value/black_king.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_king.svg rename to src/main/webapp/static/img/value/black_king.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_nine.svg b/src/main/webapp/static/img/value/black_nine.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_nine.svg rename to src/main/webapp/static/img/value/black_nine.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_queen.svg b/src/main/webapp/static/img/value/black_queen.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_queen.svg rename to src/main/webapp/static/img/value/black_queen.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_seven.svg b/src/main/webapp/static/img/value/black_seven.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_seven.svg rename to src/main/webapp/static/img/value/black_seven.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_six.svg b/src/main/webapp/static/img/value/black_six.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_six.svg rename to src/main/webapp/static/img/value/black_six.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_ten.svg b/src/main/webapp/static/img/value/black_ten.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_ten.svg rename to src/main/webapp/static/img/value/black_ten.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_three.svg b/src/main/webapp/static/img/value/black_three.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_three.svg rename to src/main/webapp/static/img/value/black_three.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/black_two.svg b/src/main/webapp/static/img/value/black_two.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/black_two.svg rename to src/main/webapp/static/img/value/black_two.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_ace.svg b/src/main/webapp/static/img/value/red_ace.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_ace.svg rename to src/main/webapp/static/img/value/red_ace.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_eight.svg b/src/main/webapp/static/img/value/red_eight.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_eight.svg rename to src/main/webapp/static/img/value/red_eight.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_five.svg b/src/main/webapp/static/img/value/red_five.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_five.svg rename to src/main/webapp/static/img/value/red_five.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_four.svg b/src/main/webapp/static/img/value/red_four.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_four.svg rename to src/main/webapp/static/img/value/red_four.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_jack.svg b/src/main/webapp/static/img/value/red_jack.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_jack.svg rename to src/main/webapp/static/img/value/red_jack.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_king.svg b/src/main/webapp/static/img/value/red_king.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_king.svg rename to src/main/webapp/static/img/value/red_king.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_nine.svg b/src/main/webapp/static/img/value/red_nine.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_nine.svg rename to src/main/webapp/static/img/value/red_nine.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_queen.svg b/src/main/webapp/static/img/value/red_queen.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_queen.svg rename to src/main/webapp/static/img/value/red_queen.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_seven.svg b/src/main/webapp/static/img/value/red_seven.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_seven.svg rename to src/main/webapp/static/img/value/red_seven.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_six.svg b/src/main/webapp/static/img/value/red_six.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_six.svg rename to src/main/webapp/static/img/value/red_six.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_ten.svg b/src/main/webapp/static/img/value/red_ten.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_ten.svg rename to src/main/webapp/static/img/value/red_ten.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_three.svg b/src/main/webapp/static/img/value/red_three.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_three.svg rename to src/main/webapp/static/img/value/red_three.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/img/value/red_two.svg b/src/main/webapp/static/img/value/red_two.svg similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/img/value/red_two.svg rename to src/main/webapp/static/img/value/red_two.svg diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/Card.js b/src/main/webapp/static/js/Card.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/Card.js rename to src/main/webapp/static/js/Card.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/Message.js b/src/main/webapp/static/js/Message.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/Message.js rename to src/main/webapp/static/js/Message.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/PlayerHand.js b/src/main/webapp/static/js/PlayerHand.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/PlayerHand.js rename to src/main/webapp/static/js/PlayerHand.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/WebsocketToolkit.js b/src/main/webapp/static/js/WebsocketToolkit.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/WebsocketToolkit.js rename to src/main/webapp/static/js/WebsocketToolkit.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/form/forgotten-password.js b/src/main/webapp/static/js/form/forgotten-password.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/form/forgotten-password.js rename to src/main/webapp/static/js/form/forgotten-password.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/form/login.js b/src/main/webapp/static/js/form/login.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/form/login.js rename to src/main/webapp/static/js/form/login.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/form/new-game.js b/src/main/webapp/static/js/form/new-game.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/form/new-game.js rename to src/main/webapp/static/js/form/new-game.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/form/profile.js b/src/main/webapp/static/js/form/profile.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/form/profile.js rename to src/main/webapp/static/js/form/profile.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/form/register.js b/src/main/webapp/static/js/form/register.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/form/register.js rename to src/main/webapp/static/js/form/register.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/form/reset-password.js b/src/main/webapp/static/js/form/reset-password.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/form/reset-password.js rename to src/main/webapp/static/js/form/reset-password.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/modal.js b/src/main/webapp/static/js/modal.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/modal.js rename to src/main/webapp/static/js/modal.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/navbar.js b/src/main/webapp/static/js/navbar.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/navbar.js rename to src/main/webapp/static/js/navbar.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/notification/error.js b/src/main/webapp/static/js/notification/error.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/notification/error.js rename to src/main/webapp/static/js/notification/error.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/notification/information.js b/src/main/webapp/static/js/notification/information.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/notification/information.js rename to src/main/webapp/static/js/notification/information.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/notification/invite.js b/src/main/webapp/static/js/notification/invite.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/notification/invite.js rename to src/main/webapp/static/js/notification/invite.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/notification/success.js b/src/main/webapp/static/js/notification/success.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/notification/success.js rename to src/main/webapp/static/js/notification/success.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/pagination/statistics-pagination.js b/src/main/webapp/static/js/pagination/statistics-pagination.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/pagination/statistics-pagination.js rename to src/main/webapp/static/js/pagination/statistics-pagination.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/rewriteUrl.js b/src/main/webapp/static/js/rewriteUrl.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/rewriteUrl.js rename to src/main/webapp/static/js/rewriteUrl.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/websockets/connected-users-websocket.js b/src/main/webapp/static/js/websockets/connected-users-websocket.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/websockets/connected-users-websocket.js rename to src/main/webapp/static/js/websockets/connected-users-websocket.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/websockets/game-management-websocket.js b/src/main/webapp/static/js/websockets/game-management-websocket.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/websockets/game-management-websocket.js rename to src/main/webapp/static/js/websockets/game-management-websocket.js diff --git a/S2/DevWeb/Projet/src/main/webapp/static/js/websockets/player-management-websocket.js b/src/main/webapp/static/js/websockets/player-management-websocket.js similarity index 100% rename from S2/DevWeb/Projet/src/main/webapp/static/js/websockets/player-management-websocket.js rename to src/main/webapp/static/js/websockets/player-management-websocket.js