app/assets/js/scripts/loginSkirdaDiscord.js

@@ -103,7 +103,23 @@ loginSkirdaDiscordButton.addEventListener('click', async () =>{
     AuthManager.addSkirdaAccount(account.uuid, account.token, account.username, account.displayName)
 
     setTimeout(() => {
-        switchView(VIEWS.loginSkirdaDiscord, VIEWS.landing, 500, 500)
+        switchView(VIEWS.landing, VIEWS.landing, 500, 500, async () => {
+            console.log('kek')
+            // // Temporary workaround
+            // if(loginViewOnSuccess === VIEWS.settings){
+            //     await prepareSettings()
+            // }
+            // // loginViewOnSuccess = VIEWS.landing // Reset this for good measure.
+            // // loginCancelEnabled(false) // Reset this for good measure.
+            // // loginViewCancelHandler = null // Reset this for good measure.
+            // // loginUsername.value = ''
+            // // loginPassword.value = ''
+            // $('.circle-loader').toggleClass('load-complete')
+            // $('.checkmark').toggle()
+            // loginLoading(false)
+            // loginButton.innerHTML = loginButton.innerHTML.replace(Lang.queryJS('login.success'), Lang.queryJS('login.login'))
+            // formDisabled(false)
+        })
     }, 1000)
 })
 

app/assets/js/scripts/settings.js

@@ -1501,7 +1501,7 @@ function populateAboutVersionInformation(){
  */
 function populateReleaseNotes(){
     $.ajax({
-        url: 'https://git.brzezinski.ru/Skirda/SkirdaElectronLauncher/releases.atom',
+        url: 'https://github.com/dscalzi/HeliosLauncher/releases.atom',
         success: (data) => {
             const version = 'v' + remote.app.getVersion()
             const entries = $(data).find('entry')

app/assets/lang/_custom.toml

@@ -1,7 +1,7 @@
 # Custom Language File for Launcher Customizer
 
 [ejs.app]
-title = "Skirda Launcher"
+title = "Helios Launcher"
 
 [ejs.landing]
 mediaGitHubURL = "https://github.com/dscalzi/HeliosLauncher"

electron-builder.yml

@@ -1,5 +1,5 @@
-appId: 'skirdalauncher'
-productName: 'Skirda Launcher'
+appId: 'helioslauncher'
+productName: 'Helios Launcher'
 artifactName: '${productName}-setup-${version}.${ext}'
 
 copyright: 'Copyright © 2018-2022 Daniel Scalzi'
@@ -39,9 +39,9 @@ mac:
 # Linux Configuration
 linux: 
   target: 'AppImage'
-  maintainer: 'Greg Brzezinski'
-  vendor: 'Greg Brzezinski'
-  synopsis: 'Minecraft Launcher for Skirda Servers'
+  maintainer: 'Daniel Scalzi'
+  vendor: 'Daniel Scalzi'
+  synopsis: 'Modded Minecraft Launcher'
   description: 'Custom launcher which allows users to join modded servers. All mods, configurations, and updates are handled automatically.'
   category: 'Game'
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "helioslauncher",
-  "version": "2.1.1",
+  "version": "2.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "helioslauncher",
-      "version": "2.1.1",
+      "version": "2.1.0",
       "license": "UNLICENSED",
       "dependencies": {
         "@electron/remote": "^2.1.0",
@@ -18,7 +18,7 @@
         "fs-extra": "^11.1.1",
         "github-syntax-dark": "^0.5.0",
         "got": "^11.8.5",
-        "helios-core": "~2.1.1",
+        "helios-core": "~2.1.0",
         "helios-distribution-types": "^1.3.0",
         "jquery": "^3.7.1",
         "lodash.merge": "^4.6.2",
@@ -29,7 +29,7 @@
       "devDependencies": {
         "electron": "^27.1.3",
         "electron-builder": "^24.9.1",
-        "eslint": "^8.56.0"
+        "eslint": "^8.55.0"
       },
       "engines": {
         "node": "18.x.x"
@@ -384,9 +384,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
+      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1731,15 +1731,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "8.55.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
+      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
+        "@eslint/js": "8.55.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -1947,9 +1947,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.16.0.tgz",
-      "integrity": "sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -2342,11 +2342,11 @@
       }
     },
     "node_modules/helios-core": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.1.tgz",
-      "integrity": "sha512-un9QtEofI3jR8I1aoXodJhwoQyjUvJ34/Rc8PFsvNgMyWv25F4/i4AWgRX/pZKHpy8rtyS2SwgoBSKHV1WA1DA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/helios-core/-/helios-core-2.1.0.tgz",
+      "integrity": "sha512-3RvGMJ0RDzgdZF3e0o2VtBz/NCeucDVIopz9p3GA9tjy2cl7ll8HVHSXiLG5YE1JiINU5Akacv5L6MT1g6xZuA==",
       "dependencies": {
-        "fastq": "^1.16.0",
+        "fastq": "^1.15.0",
         "fs-extra": "^11.2.0",
         "got": "^11.8.6",
         "luxon": "^3.4.4",

package.json

@@ -1,52 +1,52 @@
-{
-  "name": "skirdalauncher",
-  "version": "2.1.1-skirda",
-  "productName": "Skirda Launcher",
-  "description": "Launcher for Skirda Minecraft servers",
-  "author": "Daniel Scalzi (https://github.com/dscalzi/)",
-  "license": "UNLICENSED",
-  "homepage": "https://github.com/dscalzi/HeliosLauncher",
-  "bugs": {
-    "url": "https://github.com/dscalzi/HeliosLauncher/issues"
-  },
-  "private": true,
-  "main": "index.js",
-  "scripts": {
-    "start": "electron .",
-    "dist": "electron-builder build",
-    "dist:win": "npm run dist -- -w",
-    "dist:mac": "npm run dist -- -m",
-    "dist:linux": "npm run dist -- -l",
-    "lint": "eslint --config .eslintrc.json ."
-  },
-  "engines": {
-    "node": "18.x.x"
-  },
-  "dependencies": {
-    "@electron/remote": "^2.1.0",
-    "adm-zip": "^0.5.9",
-    "discord-rpc-patch": "^4.0.1",
-    "ejs": "^3.1.9",
-    "ejs-electron": "^2.1.1",
-    "electron-updater": "^6.1.7",
-    "fs-extra": "^11.1.1",
-    "github-syntax-dark": "^0.5.0",
-    "got": "^11.8.5",
-    "helios-core": "~2.1.1",
-    "helios-distribution-types": "^1.3.0",
-    "jquery": "^3.7.1",
-    "lodash.merge": "^4.6.2",
-    "rest-client-sdk": "^7.0.0-rc.10",
-    "semver": "^7.5.4",
-    "toml": "^3.0.0"
-  },
-  "devDependencies": {
-    "electron": "^27.1.3",
-    "electron-builder": "^24.9.1",
-    "eslint": "^8.56.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/dscalzi/HeliosLauncher.git"
-  }
-}
+{
+  "name": "helioslauncher",
+  "version": "2.1.0",
+  "productName": "Helios Launcher",
+  "description": "Modded Minecraft Launcher",
+  "author": "Daniel Scalzi (https://github.com/dscalzi/)",
+  "license": "UNLICENSED",
+  "homepage": "https://github.com/dscalzi/HeliosLauncher",
+  "bugs": {
+    "url": "https://github.com/dscalzi/HeliosLauncher/issues"
+  },
+  "private": true,
+  "main": "index.js",
+  "scripts": {
+    "start": "electron .",
+    "dist": "electron-builder build",
+    "dist:win": "npm run dist -- -w",
+    "dist:mac": "npm run dist -- -m",
+    "dist:linux": "npm run dist -- -l",
+    "lint": "eslint --config .eslintrc.json ."
+  },
+  "engines": {
+    "node": "18.x.x"
+  },
+  "dependencies": {
+    "@electron/remote": "^2.1.0",
+    "adm-zip": "^0.5.9",
+    "discord-rpc-patch": "^4.0.1",
+    "ejs": "^3.1.9",
+    "ejs-electron": "^2.1.1",
+    "electron-updater": "^6.1.7",
+    "fs-extra": "^11.1.1",
+    "github-syntax-dark": "^0.5.0",
+    "got": "^11.8.5",
+    "helios-core": "~2.1.0",
+    "helios-distribution-types": "^1.3.0",
+    "jquery": "^3.7.1",
+    "lodash.merge": "^4.6.2",
+    "rest-client-sdk": "^7.0.0-rc.10",
+    "semver": "^7.5.4",
+    "toml": "^3.0.0"
+  },
+  "devDependencies": {
+    "electron": "^27.1.3",
+    "electron-builder": "^24.9.1",
+    "eslint": "^8.55.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dscalzi/HeliosLauncher.git"
+  }
+}