From cc968ff38531991828fc48bf73571ebe95457051 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 11 Aug 2020 20:00:31 +0100 Subject: [PATCH 01/13] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 41 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 22 ++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..ced01b4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,41 @@ +--- +name: Bug report +about: Create a report to help us improve +title: "[Bug] ..." +labels: bug +assignees: '' + +--- + +**UI or Mechanical Bug?** +Is this a user Interface bug or a mechanical/operational bug? + +**Describe the bug** +A clear and concise description of what the bug is. + +**Was there an error dialogue for this bug? If so please provide a screenshot/its contents here** +[Error dialog if applicable] + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Launcher Logs** +Please upload the logs from your launcher either here, or on a site such as pastebin. +You can find the logs in the "logs" folder in the "Config/Log Folder". Use the button in the Settings menu in launcher to find the folder. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..0aaccfc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,22 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: "[Enhancement] ..." +labels: enhancement +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Is your feature request graphical or mechanical in nature?** +Please describe if this request is related to the UI, or to the inner workings of the application. + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Would you like to work on this yourself, or leave it to the team and the community?** +Yes or no. + +**Extra Information** From dec6cb4e6c16a86c73f2fdf2174728ccd187bf23 Mon Sep 17 00:00:00 2001 From: rob5300 Date: Wed, 12 Aug 2020 23:27:50 +0100 Subject: [PATCH 02/13] Changed checks and added linux specific check to prevent incorrect validation failures (cherry picked from commit 947d22456634d6ca6757c8147edaeb80ddf16e64) --- modules/mod_manager.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/modules/mod_manager.js b/modules/mod_manager.js index 41dcd92..462798b 100644 --- a/modules/mod_manager.js +++ b/modules/mod_manager.js @@ -954,20 +954,25 @@ function ValidateTF2Dir(){ } //Check if the directory contains an hl2 win32 executable if we are on windows. - if(os.platform() == "win32"){ + const plat = os.platform(); + if(plat == "win32"){ if(fs.existsSync(path.join(global.config.tf2_directory, "hl2.exe"))){ return true; } } - else{ - //Check if the directory has the app id txt and it has 440 in it. - let appid_path = path.join(global.config.tf2_directory, "steam_appid.txt"); - if(fs.existsSync(appid_path)){ - let content = fs.readFileSync(appid_path, "utf-8"); - let appid = content.split("\n")[0]; - if(appid != null && appid == "440"){ - return true; - } + else if (plat == "linux" || plat == "freebsd" || plat == "openbsd"){ + if(fs.existsSync(path.join(global.config.tf2_directory, "hl2_linux"))){ + return true; + } + } + + //Check if the directory has the app id txt and it has 440 in it. + let appid_path = path.join(global.config.tf2_directory, "steam_appid.txt"); + if(fs.existsSync(appid_path)){ + let content = fs.readFileSync(appid_path, "utf-8"); + let appid = content.split("\n")[0]; + if(appid != null && appid == "440"){ + return true; } } From b09ac5a25435e6148886e94f2f8ad9488b23186b Mon Sep 17 00:00:00 2001 From: jota11 Date: Wed, 12 Aug 2020 21:22:50 -0300 Subject: [PATCH 03/13] Changes. - Small layout changes. [WINDOWS INSTALLER USERS ONLY] - Fixed a rare case where the launcher wouldn't return update status. (Launcher update, not mod-related) --- README.md | 5 +- .../{creatorstf_circle.png => creatorstf.png} | Bin .../{creatorstf_full.png => creatorstf.png} | Bin images/logos/tf2logo.svg | 44 ------------------ images/logos/tf2logo_dark.svg | 19 ++++++++ images/logos/tf2logo_dark_fade.svg | 19 ++++++++ images/logos/tf2logo_light.svg | 19 ++++++++ images/logos/tf2logowhite.png | Bin 14443 -> 0 bytes index.html | 2 +- internal/mods.json | 4 +- main.js | 17 ++++--- renderer.js | 4 +- style.css | 19 ++++++-- 13 files changed, 90 insertions(+), 62 deletions(-) rename images/logos/modcirclelogos/{creatorstf_circle.png => creatorstf.png} (100%) rename images/logos/modlogos/{creatorstf_full.png => creatorstf.png} (100%) delete mode 100644 images/logos/tf2logo.svg create mode 100644 images/logos/tf2logo_dark.svg create mode 100644 images/logos/tf2logo_dark_fade.svg create mode 100644 images/logos/tf2logo_light.svg delete mode 100644 images/logos/tf2logowhite.png diff --git a/README.md b/README.md index 0aeb218..76adcf7 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,8 @@ * [License](https://github.com/ampersoftware/Creators.TF-Community-Launcher/blob/master/LICENSE) * [Code of conduct](https://github.com/ampersoftware/Creators.TF-Community-Launcher/blob/master/CODE_OF_CONDUCT.md) (TL;DR; common sense) - ### Maintainers -* [Jota](https://github.com/jota11) -* [rob5300](https://github.com/rob5300) +* [Jota](https://github.com/jota11) - jota@creators.tf +* [rob5300](https://github.com/rob5300) - rob5300@creators.tf ### Feel free to make pull requests and contribute to this repository. The launcher is currently in an alpha state so any help is appreciated. diff --git a/images/logos/modcirclelogos/creatorstf_circle.png b/images/logos/modcirclelogos/creatorstf.png similarity index 100% rename from images/logos/modcirclelogos/creatorstf_circle.png rename to images/logos/modcirclelogos/creatorstf.png diff --git a/images/logos/modlogos/creatorstf_full.png b/images/logos/modlogos/creatorstf.png similarity index 100% rename from images/logos/modlogos/creatorstf_full.png rename to images/logos/modlogos/creatorstf.png diff --git a/images/logos/tf2logo.svg b/images/logos/tf2logo.svg deleted file mode 100644 index ab7257f..0000000 --- a/images/logos/tf2logo.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/logos/tf2logo_dark.svg b/images/logos/tf2logo_dark.svg new file mode 100644 index 0000000..bc23f23 --- /dev/null +++ b/images/logos/tf2logo_dark.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/images/logos/tf2logo_dark_fade.svg b/images/logos/tf2logo_dark_fade.svg new file mode 100644 index 0000000..c154d51 --- /dev/null +++ b/images/logos/tf2logo_dark_fade.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/images/logos/tf2logo_light.svg b/images/logos/tf2logo_light.svg new file mode 100644 index 0000000..85eacb7 --- /dev/null +++ b/images/logos/tf2logo_light.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/images/logos/tf2logowhite.png b/images/logos/tf2logowhite.png deleted file mode 100644 index 7b7641bfe4042e8ae1213ce1a0e0618c8a9a788c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14443 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 -

Description Text goes here

+

diff --git a/internal/mods.json b/internal/mods.json index f652b4d..9e90b97 100644 --- a/internal/mods.json +++ b/internal/mods.json @@ -4,8 +4,8 @@ { "name": "Creators.TF", "blurb": "A TF2 celebration project", - "icon": "images/logos/modcirclelogos/creatorstf_circle.png", - "titleimage": "images/logos/modlogos/creatorstf_full.png", + "icon": "images/logos/modcirclelogos/creatorstf.png", + "titleimage": "images/logos/modlogos/creatorstf.png", "backgroundimage": "images/backgrounds/creatorstf.png", "bordercolor": "orange", "backgroundpos": "left", diff --git a/main.js b/main.js index 667c07c..2f1bb14 100644 --- a/main.js +++ b/main.js @@ -97,16 +97,21 @@ function createWindow() { } } -app.whenReady().then(createWindow); - -autoUpdater.checkForUpdatesAndNotify(); -log.info("The launcher was opened and is currently checking for updates"); +// app.whenReady().then(createWindow); +app.on("ready", () => { + createWindow(); + autoUpdater.checkForUpdatesAndNotify(); + log.info("Launcher was opened and is currently checking for updates."); +}); app.on("window-all-closed", function() { // On macOS it is common for applications and their menu bar // to stay active until the user quits explicitly with Cmd + Q - if (process.platform !== 'darwin') app.quit() -}) + if (process.platform !== "darwin") { + app.quit(); + log.info("Launcher was closed"); + } +}); app.on("activate", function() { // On macOS it's common to re-create a window in the app when the diff --git a/renderer.js b/renderer.js index 05332e9..ebdaa7e 100644 --- a/renderer.js +++ b/renderer.js @@ -46,7 +46,7 @@ function OnClick_Mod(data) { installButton.style.background = ""; installButton.style.backgroundColor = "grey"; installButton.style.color = "black"; - installButton.innerText = "... LOADING ..."; + installButton.innerText = "LOADING..."; installButton.disabled = true; website.style.display = data.website != "" ? "block" : "none"; @@ -110,7 +110,7 @@ document.getElementById("patchnotes-button").addEventListener("click", (a,b) => }); installButton.addEventListener("click", (e) => { - installButton.innerText = "... STARTING ..."; + installButton.innerText = "STARTING..."; installButton.disabled = true; ipcRenderer.send("install-play-click", e); }); diff --git a/style.css b/style.css index dc1741e..700c998 100644 --- a/style.css +++ b/style.css @@ -5,8 +5,7 @@ body { margin: 0; padding: 0; display: flex; - background: rgb(0,0,0); - background: linear-gradient(0deg, rgba(0,0,0,1) 0%, rgba(40,40,40,1) 100%); + background: linear-gradient(0deg, rgba(0,0,0,1) 0%, rgba(35,35,35,1) 100%); user-select: none; } @@ -167,7 +166,12 @@ body { } #contentdummy { + background-image: url(images/logos/tf2logo_dark_fade.svg); + background-repeat: no-repeat; + background-position: center; + background-size: 115%; width: 78.5%; + opacity: 0.2; } #content { @@ -300,8 +304,8 @@ body { text-transform: uppercase; font-family: Roboto Light, Arial, sans-serif; border: none; - color: black; - text-shadow: 1px 1px 25px #000; + color: #000; + text-shadow: 1px 1px 20px #000; position: relative; bottom: 235px; left: 0; @@ -310,6 +314,13 @@ body { z-index: 1; } +#remove-mod:hover { + background-color: #CC4747; + color: #FFF; + cursor: pointer; + filter: brightness(0.8); +} + /* #version { display: block; From 15b1d1efc44b4941e0254deeadfde971ba269aec Mon Sep 17 00:00:00 2001 From: jota11 Date: Thu, 13 Aug 2020 00:34:27 -0300 Subject: [PATCH 04/13] Changes - two - Small tooltip changes. --- index.html | 4 ++-- main.js | 10 +++++----- settings-page/settingspage.js | 4 +--- style.css | 5 +++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index fdbfa0a..8919a92 100644 --- a/index.html +++ b/index.html @@ -12,8 +12,8 @@ diff --git a/patchnotes-page/patchnotespage.js b/patchnotes-page/patchnotespage.js index 5c2551a..1c225a5 100644 --- a/patchnotes-page/patchnotespage.js +++ b/patchnotes-page/patchnotespage.js @@ -24,7 +24,6 @@ function OpenWindow() { width: 700, height: 550 }); - patchNotesWindow.removeMenu(); patchNotesWindow.loadFile(path.resolve(__dirname, "patchnotes.html")); patchNotesWindow.once("ready-to-show", () => { diff --git a/settings-page/settingspage.js b/settings-page/settingspage.js index 7eb5096..228566d 100644 --- a/settings-page/settingspage.js +++ b/settings-page/settingspage.js @@ -28,7 +28,7 @@ function OpenWindow() { }); settingsWindow.removeMenu(); settingsWindow.loadFile("./settings-page/settings.html"); - + settingsWindow.once("ready-to-show", () => { settingsWindow.show(); diff --git a/style.css b/style.css index f824d50..d0b4231 100644 --- a/style.css +++ b/style.css @@ -345,22 +345,23 @@ body { } [tooltip]:after { - width: 200%; content: attr(tooltip); background-color: #111; border-radius: 5px; color: #CCC; + display: block; font-family: Roboto Thin, Arial, sans-serif; font-size: 16px; position: absolute; padding: 5px; - bottom: -3.3em; left: 0; - /* white-space: nowrap; */ + top: 37px; + white-space: nowrap; box-shadow: 0px 0px 20px rgba(50,50,50,0.5); z-index: 9999999; visibility: hidden; pointer-events: none; + user-select: none; opacity: 0; transition: 0.25s; } From 7f7c202fa949aae20579d1d7c51e5cdcaa33c4bc Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 15 Aug 2020 18:25:55 +0100 Subject: [PATCH 07/13] Removed pointless blank mod version entry from default config. --- modules/config.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/config.js b/modules/config.js index e1acf20..bc3c1da 100644 --- a/modules/config.js +++ b/modules/config.js @@ -35,9 +35,7 @@ module.exports = { this.config = { steam_directory: "", tf2_directory: "", - current_mod_versions: [ - {name: "_blank", version: 0.1} - ] + current_mod_versions: [] } //Try to populate the default values of the steam directory and tf2 directory automatically. From 58715b872c03df5d46b420159877bae335a9bbfa Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 15 Aug 2020 18:43:21 +0100 Subject: [PATCH 08/13] Added build instructions to readme --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 9a4b51b..df49e4c 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,11 @@ If you have something to contribute then please open a pull request! Make sure y If you have a bug or a suggestion, open and issue! Try to use the templates and give good information. The launcher is currently in an alpha state so any help is appreciated. + +## Launching and Building from Source +If you want to build the launcher yourself, you need to have [Node.JS](https://nodejs.org/en/download/) installed, which should also include npm. +Clone the repository using git (or download from this page) and then do `npm install` in the main repository directory to download the required packages. + +You can start the launcher without building via `npm run start`. +You can build for Windows or Linux via the included build scripts using `npm run buildwindows` and `npm run buildlinux`. +If you need you can edit these in [*package.json*](https://github.com/ampersoftware/Creators.TF-Community-Launcher/blob/7f7c202fa949aae20579d1d7c51e5cdcaa33c4bc/package.json#L8) to build to your liking, but changes made to these shold not be committed if you plan to make a pr. From 84625878beb93f0e98bc3d58e71af8c8be344b7d Mon Sep 17 00:00:00 2001 From: jota11 Date: Sat, 15 Aug 2020 15:55:29 -0300 Subject: [PATCH 09/13] Patch notes window now uses markdown. --- changelog.md | 3 +- images/thatarrowfromthetfblog.svg | 68 +++++++++++++++++++++++++++++++ package.json | 3 +- patchnotes-page/patch.js | 16 ++++++++ patchnotes-page/patchnotes.html | 19 ++------- patchnotes-page/patchnotespage.js | 8 ++-- patchnotes-page/style.css | 55 +++++++++++++++++-------- 7 files changed, 133 insertions(+), 39 deletions(-) create mode 100644 images/thatarrowfromthetfblog.svg create mode 100644 patchnotes-page/patch.js diff --git a/changelog.md b/changelog.md index 6647661..ab22144 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,3 @@ -# Changelog - ## Version 0.0.5 (ALPHA) +### 08/08/2020 - 00:28:00 (GMT) - Released launcher's alpha version diff --git a/images/thatarrowfromthetfblog.svg b/images/thatarrowfromthetfblog.svg new file mode 100644 index 0000000..0a23348 --- /dev/null +++ b/images/thatarrowfromthetfblog.svg @@ -0,0 +1,68 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/package.json b/package.json index f0859dc..e2fdc2d 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "electron-log": "^4.2.2", "electron-progressbar": "^1.2.0", "electron-updater": "^4.3.4", - "jszip": "^3.5.0" + "jszip": "^3.5.0", + "marked": "^1.1.1" } } diff --git a/patchnotes-page/patch.js b/patchnotes-page/patch.js new file mode 100644 index 0000000..e56831d --- /dev/null +++ b/patchnotes-page/patch.js @@ -0,0 +1,16 @@ +const marked = require("marked"); +marked.setOptions({ + breaks: true, + gfm: true, + headerIds: false +}); +var request = new XMLHttpRequest(); +request.open("GET", "https://raw.githubusercontent.com/ampersoftware/Creators.TF-Community-Launcher/master/changelog.md"); +request.send(); +request.onload = function lol() { + if (request.status === 200) { + document.getElementById("patchnotes").innerHTML = marked(request.responseText); + } else { + document.getElementById("patchnotes").innerHTML = marked("## If you are reading this, there are two options:\n- Github is down (You can check their status page at githubstatus.com)\n- Your internet is down"); + } +} diff --git a/patchnotes-page/patchnotes.html b/patchnotes-page/patchnotes.html index c9fb969..f1c59e6 100644 --- a/patchnotes-page/patchnotes.html +++ b/patchnotes-page/patchnotes.html @@ -2,29 +2,18 @@ - + Patch Notes +

Launcher Changelogs

-

Creators.TF Launcher

-
-
Changelogs — 23/06/2020
-
-
    -
  • Moved something
    • -
  • Really long note to see how it goes Moved somethingMoved something
    • -
  • Moved somethingMoved somethingMoved somethingMoved somethingMoved somethingMoved somethingMoved something
    • -
      -
    • Moved somethingMoved somethingMoved somethingMoved somethingMoved something
      • -
    -
-
-
+
+ diff --git a/patchnotes-page/patchnotespage.js b/patchnotes-page/patchnotespage.js index 1c225a5..5694498 100644 --- a/patchnotes-page/patchnotespage.js +++ b/patchnotes-page/patchnotespage.js @@ -19,12 +19,12 @@ function OpenWindow() { maximizable: true, resizable: true, autoHideMenuBar: true, - minWidth: 640, + minWidth: 700, minHeight: 500, - width: 700, - height: 550 + width: 960, + height: 540 }); - patchNotesWindow.removeMenu(); + // patchNotesWindow.removeMenu(); patchNotesWindow.loadFile(path.resolve(__dirname, "patchnotes.html")); patchNotesWindow.once("ready-to-show", () => { patchNotesWindow.show(); diff --git a/patchnotes-page/style.css b/patchnotes-page/style.css index eb9a55f..fb5c8dd 100644 --- a/patchnotes-page/style.css +++ b/patchnotes-page/style.css @@ -29,34 +29,55 @@ body { ::-webkit-scrollbar-thumb { background: #555; border-radius: 5px; } ::-webkit-scrollbar-thumb:hover { background: #888; } -#wrapper { - margin: 25px auto; - width: 90%; - color: #FFF; -} - #modname { - margin: 0; - font-size: 60px; + margin: 25px auto; font-family: Roboto Bold, Arial, sans-serif; + font-size: 60px; text-align: center; + color: #EEE; } -.patch { - margin: 20px 0px 0px 0px; - background-color: rgba(0,0,0,0.8); - padding: 20px; +#wrapper { + margin: 0px auto; + width: 75%; + color: #FFF; +} + +#patchnotes { + margin: 20px auto 0px auto; + background-color: rgba(0,0,0,0.65); + padding: 25px 25px 10px 25px; border-radius: 5px; } -.patchTitle { - font-size: 35px; +h2 { + margin: 0; + padding-top: 25px; + font-size: 42px; font-family: Roboto Medium, Arial, sans-serif; + border-top: 1px solid rgba(255,255,255,0.5); +} +h3 { + margin: 0; + font-size: 15px; + font-family: Roboto Thin, Arial, sans-serif; } -.patchNotes { +h2:first-of-type { + border-top: 0px; + padding-top: 0px; +} + +ul { + list-style-image: url(../images/thatarrowfromthetfblog.svg); font-size: 22px; - font-family: Roboto Thin, Arial, sans-serif; + font-family: Roboto Light, Arial, sans-serif; } -ul { list-style-image: url(../images/thatarrowfromthetfblog.png); } +code { + background-color: rgba(25,25,25,0.9); + padding: 0px 5px; + border-radius: 5px; + font-family: Roboto Thin, Arial, sans-serif; + font-size: 20px; +} From 21cd48c831634b5e37a114c18c7b622f43172dfb Mon Sep 17 00:00:00 2001 From: Bruce Lay <33815726+brucelay@users.noreply.github.com> Date: Sun, 16 Aug 2020 15:27:12 +0100 Subject: [PATCH 10/13] Modify config.js to use async/await & bug fixes Functions return a Promise by default. Bug fix. GetConfig() and GetTF2Directory() now return a Promise by default rather than the previous handwritten Promise. A bug in GetTF2Directory() causing the TF2 directory to not be found was fixed by using path.join instead of string concatenation, as currently it checks for '...x86)/Steamsteamapps/Tea...'. Reduced code repetition in GetConfig() via finally block of try ... catch. --- modules/config.js | 160 +++++++++++++++++++++------------------------- 1 file changed, 74 insertions(+), 86 deletions(-) diff --git a/modules/config.js b/modules/config.js index bc3c1da..7993984 100644 --- a/modules/config.js +++ b/modules/config.js @@ -17,103 +17,91 @@ module.exports = { }, //Get the config from disk. - GetConfig() { - return new Promise((resolvec, rejectc) => { - try{ - //If config is null, load it. - let filepathfull = this.GetConfigFullPath(); - - //If the config file exists, read and parse it. - if(fs.existsSync(filepathfull)){ - this.config = JSON.parse(fs.readFileSync(filepathfull, 'utf8')); - global.log.log("Loaded pre existing config"); - resolvec(this.config); - } - else{ - global.log.log("User does not have a config file, creating one"); - //Create default config - this.config = { - steam_directory: "", - tf2_directory: "", - current_mod_versions: [] - } + GetConfig: async function GetConfig() { + //If config is null, load it. + let filepathfull = this.GetConfigFullPath(); - //Try to populate the default values of the steam directory and tf2 directory automatically. - this.config.steam_directory = GetSteamDirectory(); - - global.log.log(`Auto locater for the users steam directory returned '${this.config.steam_directory}'`); - - if(this.config.steam_directory != "") { - //Try to find the users tf2 directory automatically. - this.GetTF2Directory(this.config.steam_directory). - then((result) => { - global.log.log("TF2 directory was found successfully at: " + result); - this.config.tf2_directory = result; - this.SaveConfig(this.config); - resolvec(this.config); - }).catch((e) => { - //We failed to get the tf2 dir. Finish anyway. - //The user is notified later if it is left blank. - global.log.error("TF2 directory was not found automatically"); - this.SaveConfig(this.config); - resolvec(this.config); - }); - } - else { - //Resolve now without the steam dir or a tf2 dir. - //User is told later anyway. - this.SaveConfig(this.config); - resolvec(this.config); - } - } + //If the config file exists, read and parse it. + if(fs.existsSync(filepathfull)){ + this.config = JSON.parse(fs.readFileSync(filepathfull, 'utf8')); + global.log.log("Loaded pre existing config"); + return this.config; + } else { + global.log.log("User does not have a config file, creating one"); + //Create default config + this.config = { + steam_directory: "", + tf2_directory: "", + current_mod_versions: [] } - catch (e){ - rejectc(e); + + //Try to populate the default values of the steam directory and tf2 directory automatically. + this.config.steam_directory = GetSteamDirectory(); + + global.log.log(`Auto locater for the users steam directory returned '${this.config.steam_directory}'`); + + if(this.config.steam_directory != "") { + //Try to find the users tf2 directory automatically. + try { + let result = await this.GetTF2Directory(this.config.steam_directory) + .catch((e) => { + //We failed to get the tf2 dir. Finish anyway. + //The user is notified later if it is left blank. + global.log.error("TF2 directory was not found automatically"); + }); + + global.log.log("TF2 directory was found successfully at: " + result); + this.config.tf2_directory = result; + } finally { + this.SaveConfig(this.config); + return this.config; + } + } else { + //Resolve now without the steam dir or a tf2 dir. + //User is told later anyway. + this.SaveConfig(this.config); + return this.config; } - }); + } }, //This attempts to find the users tf2 directory automatically. - GetTF2Directory(steamdir) { + GetTF2Directory: async function GetTF2Directory(steamdir) { let tf2path = "steamapps/common/Team Fortress 2/"; - - let p = new Promise((resolvet, rejectt) => { - //Check if tf2 is installed in the steam installation steamapps. - if (fs.existsSync(steamdir + tf2path)) { - let tf2path = steamdir + tf2path; - resolve(tf2path); - } - else { - //Check the library folders file and check all those for the tf2 directory. - let libraryfolders = `${steamdir}/steamapps/libraryfolders.vdf`; - if (fs.existsSync(libraryfolders)) { - //How this works: - //Read the lines of the libraryfolders - //If we find a match with the regular expression, we have a possible other library folder. - //We check this library folder to see if it has a tf2 install folder. - //If yes, we use this! - //If no, we just fail. - - let data = fs.readFileSync(libraryfolders, 'utf8'); - let lines = data.split("\n"); - for (let i = 0; i < lines.length; i++) { - let result = pathStringRegex.exec(lines[i]); - if (result) { - if (result[2]) { - let potentialPath = path.join(result[2], "/", tf2path); - if(fs.existsSync(potentialPath)){ - resolvet(potentialPath); - } + + //Check if tf2 is installed in the steam installation steamapps. + if (fs.existsSync(path.join(steamdir, tf2path))) { + tf2path = path.join(steamdir, tf2path); + return tf2path; + } else { + //Check the library folders file and check all those for the tf2 directory. + let libraryfolders = `${steamdir}/steamapps/libraryfolders.vdf`; + if (fs.existsSync(libraryfolders)) { + //How this works: + //Read the lines of the libraryfolders + //If we find a match with the regular expression, we have a possible other library folder. + //We check this library folder to see if it has a tf2 install folder. + //If yes, we use this! + //If no, we just fail. + + let data = fs.readFileSync(libraryfolders, 'utf8'); + let lines = data.split("\n"); + for (let i = 0; i < lines.length; i++) { + let result = pathStringRegex.exec(lines[i]); + if (result) { + if (result[2]) { + let potentialPath = path.join(result[2], "/", tf2path); + if(fs.existsSync(potentialPath)){ + return potentialPath; } } } - rejectt("No other tf2 libraries had TF2"); } - rejectt("TF2 not found in base install location, no other libraries found."); + throw new Error("No other tf2 libraries had TF2"); + } else { + throw new Error("TF2 not found in base install location, no other libraries found."); } - }); - - return p; + } }, GetConfigFullPath(){ @@ -153,4 +141,4 @@ function GetSteamDirectory() { if(!fs.existsSync(basedir)) basedir = ""; } return basedir; -} \ No newline at end of file +} From 201de30d302c66066e972aca9a284ade397494a4 Mon Sep 17 00:00:00 2001 From: Bruce Lay <33815726+brucelay@users.noreply.github.com> Date: Sun, 16 Aug 2020 15:44:15 +0100 Subject: [PATCH 11/13] Reduced code repetition in config.js. Bug fixes. Removed SaveConfig() duplicates and corrected error handling. --- modules/config.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/modules/config.js b/modules/config.js index 7993984..4a119d4 100644 --- a/modules/config.js +++ b/modules/config.js @@ -44,24 +44,17 @@ module.exports = { //Try to find the users tf2 directory automatically. try { let result = await this.GetTF2Directory(this.config.steam_directory) - .catch((e) => { - //We failed to get the tf2 dir. Finish anyway. - //The user is notified later if it is left blank. - global.log.error("TF2 directory was not found automatically"); - }); global.log.log("TF2 directory was found successfully at: " + result); this.config.tf2_directory = result; - } finally { - this.SaveConfig(this.config); - return this.config; + } catch { + global.log.error("TF2 directory was not found automatically"); } - } else { - //Resolve now without the steam dir or a tf2 dir. - //User is told later anyway. - this.SaveConfig(this.config); - return this.config; } + //Return whether or not the TF2/Steam directory was found + //User is told later anyway. + this.SaveConfig(this.config); + return this.config; } }, From f3a0db2ea54fcdf3b0a4bb0c0be9bd4b676d7546 Mon Sep 17 00:00:00 2001 From: jota11 Date: Sun, 16 Aug 2020 20:04:42 -0300 Subject: [PATCH 12/13] Better patch notes implementation --- changelog.md | 2 +- images/thatarrowfromthetfblog.svg | 21 +++++++++++---------- patchnotes-page/patch.js | 10 +++++----- patchnotes-page/style.css | 7 ++++--- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/changelog.md b/changelog.md index ab22144..1a3fb55 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,3 @@ ## Version 0.0.5 (ALPHA) -### 08/08/2020 - 00:28:00 (GMT) +### 08/08/2020 - 00:28 (GMT) - Released launcher's alpha version diff --git a/images/thatarrowfromthetfblog.svg b/images/thatarrowfromthetfblog.svg index 0a23348..c93882d 100644 --- a/images/thatarrowfromthetfblog.svg +++ b/images/thatarrowfromthetfblog.svg @@ -9,9 +9,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="11" - height="11" - viewBox="0 0 2.9104169 2.9104169" + width="7.3800001" + height="10.1" + viewBox="0 0 1.9526251 2.6722919" version="1.1" id="svg49" inkscape:version="0.92.4 (5da689c313, 2019-01-14)" @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="45.254834" - inkscape:cx="11.641455" - inkscape:cy="4.9792751" + inkscape:cx="8.5361949" + inkscape:cy="5.5139345" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -36,7 +36,8 @@ inkscape:window-height="705" inkscape:window-x="-8" inkscape:window-y="-8" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + showguides="false" /> @@ -45,7 +46,7 @@ image/svg+xml - + @@ -53,15 +54,15 @@ inkscape:label="Camada 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-294.08945)"> + transform="translate(0,-294.32757)"> diff --git a/patchnotes-page/patch.js b/patchnotes-page/patch.js index e56831d..9d17c9c 100644 --- a/patchnotes-page/patch.js +++ b/patchnotes-page/patch.js @@ -1,16 +1,16 @@ const marked = require("marked"); marked.setOptions({ - breaks: true, - gfm: true, - headerIds: false + breaks: true, + gfm: true, + headerIds: false }); var request = new XMLHttpRequest(); request.open("GET", "https://raw.githubusercontent.com/ampersoftware/Creators.TF-Community-Launcher/master/changelog.md"); request.send(); -request.onload = function lol() { +request.onload = () => { if (request.status === 200) { document.getElementById("patchnotes").innerHTML = marked(request.responseText); } else { - document.getElementById("patchnotes").innerHTML = marked("## If you are reading this, there are two options:\n- Github is down (You can check their status page at githubstatus.com)\n- Your internet is down"); + document.getElementById("patchnotes").innerHTML = marked("## If you are reading this, there are two options:\n- Github is down (You can check their status page at `githubstatus.com`)\n- Your internet is down"); } } diff --git a/patchnotes-page/style.css b/patchnotes-page/style.css index fb5c8dd..2437138 100644 --- a/patchnotes-page/style.css +++ b/patchnotes-page/style.css @@ -34,6 +34,7 @@ body { font-family: Roboto Bold, Arial, sans-serif; font-size: 60px; text-align: center; + text-shadow: 0px 0px 20px #000; color: #EEE; } @@ -53,7 +54,7 @@ body { h2 { margin: 0; padding-top: 25px; - font-size: 42px; + font-size: 39px; font-family: Roboto Medium, Arial, sans-serif; border-top: 1px solid rgba(255,255,255,0.5); } @@ -70,7 +71,7 @@ h2:first-of-type { ul { list-style-image: url(../images/thatarrowfromthetfblog.svg); - font-size: 22px; + font-size: 20px; font-family: Roboto Light, Arial, sans-serif; } @@ -79,5 +80,5 @@ code { padding: 0px 5px; border-radius: 5px; font-family: Roboto Thin, Arial, sans-serif; - font-size: 20px; + font-size: 19px; } From 16b5b0ca6734740325be038b44dfde0e665c3294 Mon Sep 17 00:00:00 2001 From: jota11 Date: Sun, 16 Aug 2020 20:14:38 -0300 Subject: [PATCH 13/13] Reverted unwanted change on patch notes window --- patchnotes-page/patchnotespage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patchnotes-page/patchnotespage.js b/patchnotes-page/patchnotespage.js index 5694498..a8cb949 100644 --- a/patchnotes-page/patchnotespage.js +++ b/patchnotes-page/patchnotespage.js @@ -24,7 +24,7 @@ function OpenWindow() { width: 960, height: 540 }); - // patchNotesWindow.removeMenu(); + patchNotesWindow.removeMenu(); patchNotesWindow.loadFile(path.resolve(__dirname, "patchnotes.html")); patchNotesWindow.once("ready-to-show", () => { patchNotesWindow.show();