Merge pull request #128 from AltarikMC/changer-packager

Move npm to yarn, added publishers, move credits to in app fullcreen

.github/workflows/electron.yml

@@ -1,32 +0,0 @@
-name: CI
-on: [ push ]
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ windows-latest]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js 14
-      uses: actions/setup-node@v1
-      with:
-        node-version: 14.x
-    - name: Get npm cache directory
-      id: npm-cache
-      run: |
-        echo "::set-output name=dir::$(npm config get cache)"
-    - uses: actions/cache@v2
-      with:
-        path: ${{ steps.npm-cache.outputs.dir }}
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-    - name: Intall dependencies
-      run: npm ci
-    - run: npm run make --if-present
-    # - uses: actions/upload-artifact@v2
-    #   with:
-    #     name: Artifact
-    #     path: out\make\squirrel.windows\x64
-    #     if-no-files-found: error

config.forge.js

@@ -20,5 +20,17 @@ module.exports = {
                 setupExe: `${pkg.name}-${pkg.version}-win32-x64.exe`
             }
         }
+    ],
+    publishers: [
+        {
+            name: '@electron-forge/publisher-github',
+            config: {
+                repository: {
+                    owner: 'AltarikMC',
+                    name: 'Launcher'
+                },
+                preRelease: false
+            }
+        }
     ]
 }

package.json

@@ -29,6 +29,7 @@
   "devDependencies": {
     "@electron-forge/cli": "^6.0.0-beta.63",
     "@electron-forge/maker-squirrel": "^6.0.0-beta.63",
+    "@electron-forge/publisher-github": "^6.0.0-beta.63",
     "electron": "^18.2.3"
   },
   "dependencies": {

src/client/assets/css/index.css

@@ -159,7 +159,7 @@ h3 {
 	cursor: pointer;
 }
 
-#settings {
+#settings, #credits {
 	position: relative;
 	top: 50%;
 	left: 50%;
@@ -170,6 +170,12 @@ h3 {
 	background-repeat: no-repeat;
 	background-size: 100%;
 	padding: 10px 65px;
+	max-height: 80vh;
+}
+
+#credits > .content {
+	overflow: auto;
+	max-height: inherit;
 }
 
 #settings > h2 {

src/client/assets/js/index.js

@@ -11,6 +11,8 @@ app = vue.createApp({
             invalidateButtonText: "Supprimer et retélécharger les bibliothèques",
             invalidateButtonDisabled: false,
             displayFullscreen: "none",
+            displaySettings: "none",
+            displayCredits: "none",
             nick: "Chargement",
             launchBtnText: "Selectionnez un chapitre",
             launchBtnDisable: true,
@@ -73,20 +75,27 @@ app = vue.createApp({
             ipcRenderer.send('disconnect')
         },
         options () {
-            if(!this.gameLaunching)
+            if(!this.gameLaunching) {
                 this.displayFullscreen = "block"
+                this.displaySettings = "block"
+                this.displayCredits = "none"
+            }
         },
         discord() {
-            shell.openExternal("https://discord.gg/b923tMhmRE") }
+            shell.openExternal("https://discord.gg/b923tMhmRE") 
-            ,
+        },
         web() {
             shell.openExternal("https://altarik.fr")
         },
         closeFullscreen () {
             this.displayFullscreen = "none"
+            this.displaySettings = "none"
+            this.displayCredits = "none"
         },
         credits() {
-            ipcRenderer.send("credits")
+            this.displayFullscreen = "block"
+            this.displaySettings = "none"
+            this.displayCredits = "block"
         },
         updateModsInformations(content) {
             this.modsInformations = content

src/client/index.html

@@ -23,7 +23,7 @@
         </div>
         <div id="fullscreen" :style="{ display: displayFullscreen }">
             <div @click="closeFullscreen" id="close"><i class="material-icons">close</i></div>
-            <div id="settings">
+            <div id="settings" :style="{ display: displaySettings }">
                     <h2>Paramètres</h2>
                     <span href="" id="disconnect-btn" @click="disconnectBtn">Se déconnecter</span>
                     <h4>Allocation mémoire</h4>
@@ -35,6 +35,39 @@
                     <button @click="invalidateData" :disabled="invalidateButtonDisabled">{{ invalidateButtonText }}</button><br />
                     <span @click="credits">Voir crédits</span>
             </div>
+            <div id="credits" :style="{ display: displayCredits }">
+                <div class="content">
+                    <p>BSD 3-Clause License</p>
+
+<p>Copyright (c) 2021, Altarik<br />
+All rights reserved.</p>
+
+<p>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:</p>
+
+<ol>
+    <li>Redistributions of source code must retain the above copyright notice, this
+        list of conditions and the following disclaimer.</li>
+    <li>Redistributions in binary form must reproduce the above copyright notice,
+        this list of conditions and the following disclaimer in the documentation
+        and/or other materials provided with the distribution.</li>
+    <li>Neither the name of the copyright holder nor the names of its
+        contributors may be used to endorse or promote products derived from
+        this software without specific prior written permission.</li>
+</ol>
+
+<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+                </div>
+            </div>
         </div>
         <div id="content">
             <div id="sidebar">

src/server/main.js

@@ -61,46 +61,6 @@ app.on('activate', () => {
     }
 })
 
-ipcMain.on("credits", () => {
-    const dialogOpts = {
-        type: 'info',
-        buttons: ['OK'],
-        title: 'Crédits',
-        message: 'Altarik Launcher',
-        detail: `BSD 3-Clause License
-
-Copyright (c) 2021, Altarik
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-`
-    }
-    dialog.showMessageBox(dialogOpts)
-})
-
 ipcMain.on("login", (event, args) => {
     minecraft.login(event, win, args.user, args.pass)
 })