Merge branch 'emine' of git.unistra.fr:erkarakurt/fodomust-web-vue into emine

src/assets/_connexion.scss

@@ -2,7 +2,7 @@
 
 .accueil-connexion{
     &__form{
-        min-width: 400px;
+        width: 50vw;
         h3{
             text-align: center;
         }

src/assets/_interface.scss

@@ -590,6 +590,7 @@ body{
             color: $bleu-nuit;
             margin: auto;
             padding: 15px;
+            width: 50vw;
             &-row{
                 margin-bottom: 20px;
                 img{

src/store/index.js

@@ -300,7 +300,7 @@ const moduleA = {
                 console.log("After load");
                 // context.dispatch('sendMessage')
             }).then(() => {
-                context.state.ws = new WebSocket("ws://127.0.0.1:8081");
+                context.state.ws = new WebSocket("ws://xu@vm-sdc-09.icube.unistra.fr:8081");
                 context.state.ws.binaryType = "arraybuffer";
                 context.state.ws.onmessage = function (event) {
                     // let msg = context.state.Resp.decode(Uint8Array.from(event.data));

src/views/CreateProjectView.vue

@@ -2,11 +2,12 @@
   <div class="container">
     <div class="preproject align-self-center d-flex align-center column space-around">
       <div class="preproject-row">
-        <input type="file" name="images" id="images" v-on:change="readFile($event)" multiple>
-        <router-link to="/projectsolo"><font-awesome-icon icon="fa-solid fa-image" />Ouvrir une image</router-link>
+        <input type="file" name="image" id="image" v-on:change="readFile($event)" >
+        <label for="image" class="d-flex justify-center align-center"><font-awesome-icon icon="fa-solid fa-image" />Ouvrir une image</label>
       </div>
       <div class="preproject-row">
-        <router-link to="/projectduo"><font-awesome-icon icon="fa-solid fa-images" />Ouvrir une séquence d'image</router-link>
+        <input type="file" name="images" id="images" multiple>
+        <label for="images" class="d-flex justify-center align-center"><font-awesome-icon icon="fa-solid fa-images" />Ouvrir une séquence d'image</label>
       </div>
     </div>
   </div>
@@ -14,6 +15,7 @@
 
 <script>
 import store from "@/store";
+import router from "@/router"
 // import {base64String} from "../../public/javascript/base64";
 // import {toRaw} from "vue";
 
@@ -41,6 +43,10 @@ export default {
         store.commit('updateRawMessageBuffer', payloadFunction)
 
         store.dispatch('sendMessage', 'requestOpenImage')
+
+        //Permet de changer de page sans avoir à cliquer sur un lien, comme window.location de Javascript
+        router.push('/projectsolo')
+
         // store.commit('requestGetImageInterface');
         // store.dispatch('sendMessage', 'requestGetImageInterface')
 
@@ -60,6 +66,7 @@ export default {
                 store.commit('updateRawMessageBuffer', payloadFunction)
                 store.dispatch('sendMessage', 'requestOpenImage')
               };
+
               // console.log(reader.onload)
 
               break;
@@ -117,6 +124,7 @@ export default {
                 let payloadFunction3 = {result : resultVar};
                 store.commit('updateRawMessageBuffer', payloadFunction3)
                 store.dispatch('sendMessage', 'requestBufferImage')
+                window.location('localhost:8080/projectsolo')
               }
               if(message.bufferedImageResp){
                 console.log(message.bufferedImageResp.base64File)
@@ -166,5 +174,18 @@ export default {
 </script>
 
 <style scoped>
-
+svg{
+  height: 2em;
+  margin: 0 2vw 0 0
+}
+input{
+  display: none;
+}
+label:hover{
+  text-decoration: underline;
+  cursor: pointer;
+}
+.preproject-row{
+  width: 100%;
+}
 </style>
\ No newline at end of file

src/views/LangueView.vue

@@ -3,7 +3,6 @@
     <div class="container">
       <div class="accueil accueil-langue d-flex justify-center align-center">
         <div class="accueil-langue__selection">
-          <button @click="sendSecondMessage">Langue</button>
           <ul>
             <li class="selected"><router-link to="/connexion"> <img src="@/assets/images/drapeaufr.png" alt=""> Français</router-link></li>
             <li><router-link to="/connexion"><img src="@/assets/images/drapeauang.png" alt=""> Anglais</router-link> </li>
@@ -21,23 +20,6 @@ import store from "@/store";
 
 export default {
   name: "LangueView",
-  // beforeMount() {
-  //   console.log("Starting connection to WebSocket Server")
-  //   this.connection = new WebSocket("ws://127.0.0.7:8081")
-  //
-  //   this.connection.onmessage = function(event) {
-  //     console.log(event);
-  //   }
-  //
-  //   this.connection.onopen = function(event) {
-  //     console.log(event)
-  //     console.log("Successfully connected to the echo websocket server...")
-  //   }
-  // },
-  methods : {
-      sendSecondMessage(){
-      }
-  },
   mounted() {
     store.dispatch('initConnection');
     store.commit('setCurrentHandler', function handler(message){

src/views/OpenOrCreateView.vue

@@ -2,10 +2,10 @@
   <div class="container">
     <div class="preproject align-self-center d-flex align-center column justify-center">
       <div class="preproject-row">
-        <router-link to="/openproject"><font-awesome-icon icon="fa-solid fa-folder-open" /><span>Ouvrir un projet</span></router-link>
+        <router-link to="/openproject" class="d-flex justify-center align-center"><font-awesome-icon icon="fa-solid fa-folder-open" /><span>Ouvrir un projet</span></router-link>
       </div>
       <div class="preproject-row">
-        <router-link to="/createproject"><font-awesome-icon icon="fa-solid fa-plus" /><span>Créer un projet</span></router-link>
+        <router-link to="/createproject" class="d-flex justify-center align-center"><font-awesome-icon icon="fa-solid fa-plus" /><span>Créer un projet</span></router-link>
       </div>
     </div>
   </div>
@@ -18,5 +18,11 @@ export default {
 </script>
 
 <style scoped>
-
+svg{
+  height: 2em;
+  margin: 0 2vw 0 0
+}
+.preproject-row{
+  width: 100%;
+}
 </style>
\ No newline at end of file