Merge branch 'master' into feature/serverlist

.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.

.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**

README.md

@@ -1,4 +1,4 @@
-# [Creators.TF](https://creators.tf) [Community Launcher](https://creators.tf/launcher)
+# [Creators.TF](https://creators.tf) [Community Launcher](https://creators.tf/launcher) (Alpha)
 
 ## This repository contains the source code and releases for [Creators.TF](https://creators.tf) [Community Launcher](https://creators.tf/launcher)
 
@@ -13,9 +13,20 @@
 * [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) - [email protected] - UI and UX Lead
+* [rob5300](https://github.com/rob5300) - [email protected] - Core Feature Lead
+
+### Contributing
+If you have something to contribute then please open a pull request! Make sure your pr tries to solve/improve one thing at a time and isn't messy. It should have a specicic goal to acomplish.
+
+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.
 
-### Feel free to make pull requests and contribute to this repository. The launcher is currently in an alpha state so any help is appreciated.
+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.

changelog.md

@@ -1,4 +1,3 @@
-# Changelog
-
 ## Version 0.0.5 (ALPHA)
+### 08/08/2020 - 00:28 (GMT)
 - Released launcher's alpha version

index.html

@@ -12,8 +12,8 @@
     <body>
         <div id="sidebar">
             <div id="boxOfButtons">
-                <button id="settings-button" tooltip="Settings. This is where you can see all the boring stuff."><i class="mdi mdi-cog"></i></button>
-                <button id="patchnotes-button" tooltip="Patch notes. Here we put all the changes that happened."><i class="mdi mdi-format-list-bulleted-square"></i></button>
+                <button id="settings-button" tooltip="Settings section. This is where you can change your folder directories and see other technical stuff."><i class="mdi mdi-cog"></i></button>
+                <button id="patchnotes-button" tooltip="Patch notes. Here we put all the changes that happened related to the launcher."><i class="mdi mdi-format-list-bulleted-square"></i></button>
                 <button id="update-button-updated" class="hidden" tooltip="Your launcher is up to date."><i class="mdi mdi-check-bold"></i></button>
                 <button id="update-button-download" class="hidden" tooltip="An update is available. Download now?"><i class="mdi mdi-download"></i></button>
                 <button id="update-button-downloading" class="hidden" tooltip="A new update is being downloaded."><i class="mdi mdi-loading"></i></button>

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",

main.js

@@ -96,16 +96,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
@@ -165,11 +170,11 @@ ipcMain.on("ServerListWindow", async (event, someArgument) => {
     serverlistPage.OpenWindow();
 });
 
-ipcMain.on("app_version", (event) => {
-  event.sender.send("app_version", {
-    version: app.getVersion()
-  });
-});
+//ipcMain.on("app_version", (event) => {
+//  event.sender.send("app_version", {
+//    version: app.getVersion()
+//  });
+//});
 
 ipcMain.on("GetConfig", async (event, someArgument) => {
     event.reply("GetConfig-Reply", global.config);