Merge pull request #69 from Miorey/migration/vue3-add-vue3-package

Migration/vue3 add vue3 package

.github/workflows/nodejs.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v2

package.json

@@ -24,6 +24,7 @@
     "sound-play": "^1.1.0",
     "unzipper": "^0.10.11",
     "vue": "^2.7.14",
+    "vue-i18n": "^8.28.2",
     "vuetify": "^2.6.14"
   },
   "devDependencies": {
@@ -33,7 +34,7 @@
     "@vue/cli-plugin-babel": "^5.0.8",
     "@vue/cli-plugin-eslint": "^5.0.8",
     "@vue/cli-service": "^5.0.8",
-    "electron": "^28.1.3",
+    "electron": "^29.0.1",
     "electron-devtools-installer": "^3.1.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.7.1",

src/components/AddonOptions.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <span class="display-1 text_wow_style section_title">{{ `lbl_addons` }}</span>
+    <span class="display-1 text_wow_style section_title">{{ $t(`lbl_addons`) }}</span>
     <div class="addons_list">
 
       <div v-for="item in getAddons()" :key="item.id">

src/components/FooterAction.vue

@@ -1,13 +1,13 @@
 <template>
     <div>
         <v-btn :disabled="patchManager.downloadInProgress" class="pt-6 pb-6 mr-3" @click="downloadFtp(true)">
-            {{ `repair` }}
+          {{ $t(`repair`) }}
         </v-btn>
         <v-btn :disabled="patchManager.downloadInProgress" class="pt-6 pb-6 mr-3" v-if="canPlay" @click="play">
-            {{ `play`  }}
+          {{ $t(`play`)  }}
         </v-btn>
         <v-btn :disabled="patchManager.downloadInProgress" v-else class="pt-6 pb-6 mr-5" @click="downloadFtp(false)">
-            {{ `download`  }}
+          {{ $t(`download`)  }}
         </v-btn>
     </div>
 </template>
@@ -57,6 +57,7 @@ export default {
     }
   },
   async mounted() {
+    this.$i18n.locale = config.conf?.default_language;
     if(Array.isArray(patchManager.selectedPatches)) {
       this.canPlay = this.isUpToDate();
     }
@@ -228,12 +229,12 @@ export default {
             .on(`close`, () => {
               console.log(`Extraction complete`);
               this.canPlay = this.isUpToDate();
+              fs.unlinkSync(this.getBaseFolder(addonsToDownload[key].targetPath));
             })
             .on(`error`, (err) => {
               console.error(`Error during extraction`, err);
               this.canPlay = this.isUpToDate();
             });
-          fs.unlinkSync(this.getBaseFolder(addonsToDownload[key].targetPath));
         }
         doneSize += await connPromise.connSize(addonsToDownload[key].sourcePath);
         await EventBus.$emit(`event_total_percent`,  doneSize/totalSize*100);
@@ -309,7 +310,7 @@ export default {
       const nIntervId = setInterval(() => { EventBus.$emit(`event_file_percent`,  stream.bytesRead/size*100); }, 100);
       const dirPath = targetPath.substr(0, targetPath.lastIndexOf(`\\`)) || targetPath.substr(0, targetPath.lastIndexOf(`/`));
       createDirIfNotExists(dirPath);
-      console.info(`Put file in ${targetPath}`);
+      console.info(`Put file in 1 ${targetPath}`);
       stream.pipe(fs.createWriteStream(targetPath));
       await streamPromise.once(`close`);
       clearInterval(nIntervId);

src/components/GameOptions.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <span class="display-1 text_wow_style section_title">{{ `lbl_game_options` }}</span>
+    <span class="display-1 text_wow_style section_title">{{ $t(`lbl_game_options`) }}</span>
     <div v-for="item in getPatchList()" :key="item.id">
       <input
           :disabled="patchManager.downloadInProgress"

src/components/MainContent.vue

@@ -7,15 +7,15 @@
             right
             background-color="transparent"
         >
-          <v-tab>{{ `lbl_game_options`  }}</v-tab>
-          <v-tab>{{ `lbl_addons`  }}</v-tab>
+          <v-tab>{{ $t(`lbl_game_options`)  }}</v-tab>
+          <v-tab>{{ $t(`lbl_addons`)  }}</v-tab>
         </v-tabs>
         <v-tabs-items v-model="tab" id="download_options">
-          <v-tab-item key="{{ `lbl_game_options`  }}">
+          <v-tab-item key="{{ $t(`lbl_game_options`)  }}">
 
             <game-options></game-options>
           </v-tab-item>
-          <v-tab-item key="{{ `lbl_addons`  }}">
+          <v-tab-item key="{{ $t(`lbl_addons`)  }}">
             <addon-options></addon-options>
           </v-tab-item>
         </v-tabs-items>

src/components/PageLoader.vue

@@ -2,19 +2,19 @@
     <v-overlay :value="isLoaded">
         <v-card v-if="isLoaded">
             <v-card-title>
-                {{ `page_loading` }}
+              {{ $t(`page_loading`) }}
             </v-card-title>
             <v-card-text>
-                {{`warning_message`}}
+              {{ $t(`warning_message`) }}
                 <ul>
                     <li>
-                        {{ `warn_storage` }} {{ (loaded.storage)?`ok`:`...` }}
+                      {{ $t(`warn_storage`) }} {{ (loaded.storage)?`ok`:`...` }}
                     </li>
                     <li>
-                        {{ `warn_ftp` }} {{ (loaded.ftp_cli)?`ok`:`...` }}
+                      {{ $t(`warn_ftp`) }} {{ (loaded.ftp_cli)?`ok`:`...` }}
                     </li>
                     <li>
-                        {{ `patches` }} {{ (loaded.patches)?`ok`:`...` }}
+                      {{ $t(`patches`) }} {{ (loaded.patches)?`ok`:`...` }}
                     </li>
                 </ul>
             </v-card-text>

src/dictionary.js

@@ -0,0 +1,28 @@
+export const dictionary = {
+  enUS: {
+    download: `Update`,
+    download_launcher: `Launcher Update`,
+    lbl_game_options: `Game Options`,
+    lbl_addons: `Addons`,
+    repair: `Repair`,
+    play: `Play`,
+    page_loading: `Loading in progress`,
+    warning_message: `If after one minute the resources are not loaded please restart`,
+    warn_storage: `Local data`,
+    warn_ftp: `Remote data`,
+    app_error: `An unexpected error happened, please contact a Game Master.`
+  },
+  frFR: {
+    download: `Mettre à jour`,
+    download_launcher: `Mettre à jour le Launcher`,
+    lbl_game_options: `Options du jeu`,
+    lbl_addons: `Addons`,
+    repair: `Réparer`,
+    play: `Jouer`,
+    page_loading: `Chargement en cours`,
+    warning_message: `Si après une minute les ressources ne sont pas chargées veuillez redémarrer`,
+    warn_storage: `Données locales`,
+    warn_ftp: `Données distantes`,
+    app_error: `Une erreur inattendue s'est produite, merci de contacter un Maître du jeu.`
+  }
+};

src/main.js

@@ -1,19 +1,25 @@
 import Vue from 'vue';
 import vuetify from './plugins/vuetify';
+import VueI18n from 'vue-i18n';
+import {dictionary} from './dictionary';
+
 try {
 
+  Vue.use(VueI18n);
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   const App = require(`./App.vue`).default;
   Vue.config.productionTip = false;
-
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-
+  const i18n = new VueI18n({
+    locale: `enUS`,
+    messages: dictionary
+  });
   Vue.config.errorHandler = function(err, vm, info) {
     console.error(`Vue Launcher Error: ${err.toString()}\nInfo: ${info}`);
     alert(`APP ERROR`);
   };
 
   new Vue({
+    i18n,
     vuetify,
     render: h => h(App)
   }).$mount(`#app`);