Jonttu
/
HeliosLauncher
mirror of https://github.com/dscalzi/HeliosLauncher
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Added settings container, updated dependencies.

pull/1/head
Daniel Scalzi 2018-05-22 22:34:35 -04:00
parent a67dac23cf
commit e9e2ec162a
No known key found for this signature in database
GPG Key ID: 5CA2F145B63535F9
6 changed files with 91 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.ejs
View File

@ -30,6 +30,7 @@
<div id="main">
<% include welcome.ejs %>
<% include login.ejs %>
<% include settings.ejs %>
<% include landing.ejs %>
</div>
<% include overlay.ejs %>

12
app/assets/css/launcher.css
View File

@ -824,6 +824,18 @@ p {
}
*/
/*******************************************************************************
* *
* Settings View (sttings.ejs) *
* *
******************************************************************************/
#settingsContainer {
position: relative;
height: 100%;
background: rgba(0, 0, 0, 0.50);
}
/*******************************************************************************
* *
* Landing View (Structural Styles) *

1
app/assets/js/scripts/uibinder.js
View File

@ -15,6 +15,7 @@ let fatalStartupError = false
const VIEWS = {
landing: 'landingContainer',
login: 'loginContainer',
settings: 'settingsContainer',
welcome: 'welcomeContainer'
}

3
app/settings.ejs 100644
View File

@ -0,0 +1,3 @@
<div id="settingsContainer">
</div>

219
package-lock.json generated
View File

@ -5,41 +5,15 @@
"requires": true,
"dependencies": {
"7zip-bin": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-3.1.0.tgz",
"integrity": "sha512-juYJNi8JEpTUWXwz8ssa8Oop4n/kwJ/pIQP22vJAVAe6RTRD+0m+e9LRNnfK2EDaX8uwmUzLNGviFQRD6SxeOw==",
"dev": true,
"requires": {
"7zip-bin-linux": "~1.3.1",
"7zip-bin-mac": "~1.0.1",
"7zip-bin-win": "~2.2.0"
}
},
"7zip-bin-linux": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/7zip-bin-linux/-/7zip-bin-linux-1.3.1.tgz",
"integrity": "sha512-Wv1uEEeHbTiS1+ycpwUxYNuIcyohU6Y6vEqY3NquBkeqy0YhVdsNUGsj0XKSRciHR6LoJSEUuqYUexmws3zH7Q==",
"dev": true,
"optional": true
},
"7zip-bin-mac": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz",
"integrity": "sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=",
"dev": true,
"optional": true
},
"7zip-bin-win": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.2.0.tgz",
"integrity": "sha512-uPHXapEmUtlUKTBx4asWMlxtFUWXzEY0KVEgU7QKhgO2LJzzM3kYxM6yOyUZTtYE6mhK4dDn3FDut9SCQWHzgg==",
"dev": true,
"optional": true
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-4.0.2.tgz",
"integrity": "sha512-XtGk+IF57pr852UK1AhQJXqmm1WmSgS5uISL+LPs0z/iAxXouMvdlLJrHPeukP6gd7yR2rDTMSMkHNODgwIq7A==",
"dev": true
},
"@types/node": {
"version": "8.10.15",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.15.tgz",
"integrity": "sha512-qNb+m5Cuj6YUMK7YFcvuSgcHCKfVg1uXAUOP91SWvAakZlZTzbGmJaBi99CgDWEAyfZo51NlUhXkuP5WtXsgjg==",
"version": "8.10.17",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.17.tgz",
"integrity": "sha512-3N3FRd/rA1v5glXjb90YdYUa+sOB7WrkU2rAhKZnF4TKD86Cym9swtulGuH0p9nxo7fP5woRNa8b0oFTpCO1bg==",
"dev": true
},
"adm-zip": {
@ -122,36 +96,10 @@
}
},
"app-builder-bin": {
"version": "1.8.6",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.8.6.tgz",
"integrity": "sha512-jQiCV8fxW3SPtPnU/BnTEQqawWtBmanCgydzRuzsptFVb/6Q4OKWdB5T3B+XHOf8lqaH89+XeJf6oA1b/QQEnQ==",
"dev": true,
"requires": {
"app-builder-bin-linux": "1.8.6",
"app-builder-bin-mac": "1.8.6",
"app-builder-bin-win": "1.8.6"
}
},
"app-builder-bin-linux": {
"version": "1.8.6",
"resolved": "https://registry.npmjs.org/app-builder-bin-linux/-/app-builder-bin-linux-1.8.6.tgz",
"integrity": "sha512-IZSv5Wcz3/OYZENwn3iaTLjDSSVPVFobBiJjUrP3hXeOnitRvB0aI8X5KMFYzfkv7kIhSlyPnRsvNjPqgbjyrw==",
"dev": true,
"optional": true
},
"app-builder-bin-mac": {
"version": "1.8.6",
"resolved": "https://registry.npmjs.org/app-builder-bin-mac/-/app-builder-bin-mac-1.8.6.tgz",
"integrity": "sha512-lWIpI2zmOmQ4JCp1IGxK6KngKAEN6QO9nu5k8h+ZzMxHBTCk8+kbBTE+R36BSRGX9q/4FhHBpYGXHVj+N9xOXg==",
"dev": true,
"optional": true
},
"app-builder-bin-win": {
"version": "1.8.6",
"resolved": "https://registry.npmjs.org/app-builder-bin-win/-/app-builder-bin-win-1.8.6.tgz",
"integrity": "sha512-nlceArzkRtWgqNoif6OFKaAKNNZ3uZuiG+9UkpOPLf/EDoYdeAq4YdvKWaQx1RHsNNfQTx0s/IODvlD0AdUmPA==",
"dev": true,
"optional": true
"version": "1.9.5",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.9.5.tgz",
"integrity": "sha512-Uw8jhfww5gYcAvMVgeRZ9cdlXOv+Ivqy4LSbALPMrQrCHHTmfVXETthkhW3cQKdvDo9pRuYn+Q5egSSn04F+Wg==",
"dev": true
},
"argparse": {
"version": "1.0.10",
@ -282,14 +230,6 @@
"bluebird": "^3.5.1"
}
},
"boom": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
"requires": {
"hoek": "4.x.x"
}
},
"boxen": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
@ -378,13 +318,13 @@
"integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
},
"builder-util": {
"version": "5.8.1",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.8.1.tgz",
"integrity": "sha512-jWqFPUMO2FBrumqA6U6/UppVkftbwCP+2YM8y9DA7g2rJHzHRZ3J6fHDpPCSWIYYEHbAiEwONTWuVKbwu3oYIw==",
"version": "5.11.1",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.11.1.tgz",
"integrity": "sha512-fZu9j33B4VMeUJaeb1q2TubKWrk9tAg2Jwpgjstxk7Mu7sNw7v/XB87/EbpNBlE3RPMrXblG6f8asfCRC8IiNQ==",
"dev": true,
"requires": {
"7zip-bin": "~3.1.0",
"app-builder-bin": "1.8.6",
"7zip-bin": "~4.0.2",
"app-builder-bin": "1.9.5",
"bluebird-lst": "^1.0.5",
"builder-util-runtime": "^4.2.1",
"chalk": "^2.4.1",
@ -394,7 +334,7 @@
"js-yaml": "^3.11.0",
"lazy-val": "^1.0.3",
"semver": "^5.5.0",
"source-map-support": "^0.5.5",
"source-map-support": "^0.5.6",
"stat-mode": "^0.2.2",
"temp-file": "^3.1.2"
},
@ -407,6 +347,16 @@
"requires": {
"ms": "2.0.0"
}
},
"source-map-support": {
"version": "0.5.6",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
"integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
"dev": true,
"requires": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
}
}
}
},
@ -671,24 +621,6 @@
"which": "^1.2.9"
}
},
"cryptiles": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
"requires": {
"boom": "5.x.x"
},
"dependencies": {
"boom": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
"requires": {
"hoek": "4.x.x"
}
}
}
},
"crypto-random-string": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@ -780,14 +712,14 @@
}
},
"dmg-builder": {
"version": "4.1.8",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.1.8.tgz",
"integrity": "sha512-OuGpvbnzu5MC7stpTdYSE3rWiPPOd550X2N/Djomz5PbIZ4Xd96IBM1qd2TDhrZUnIT/un++ns0/FWqd1Wopyg==",
"version": "4.10.1",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.10.1.tgz",
"integrity": "sha512-+NqdmZb5uhPV1exzeH+hD+WLtr79qRjfA38S7DckOIMQW0C5Vykvp4dqCypnupfEnEOVZMcaNCCKK639h/uS/g==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
"builder-util": "^5.8.1",
"electron-builder-lib": "~20.13.2",
"builder-util": "^5.11.0",
"electron-builder-lib": "~20.14.6",
"fs-extra-p": "^4.6.0",
"iconv-lite": "^0.4.23",
"js-yaml": "^3.11.0",
@ -846,9 +778,9 @@
}
},
"electron": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-2.0.1.tgz",
"integrity": "sha512-piSwY2P7L6NWx672MNdSvtGPdQP/mhwAg8ICN6ofTTItPkd7D6kNHBPkq+DXwZcXVH1EifYR9yD/l3Xw1haVpQ==",
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/electron/-/electron-2.0.2.tgz",
"integrity": "sha512-XmkGVoHLOqmjZ2nU/0zEzMl3TZEz452Q1fTJFKjylg4pLYaq7na7V2uxzydVQNQukZGbERoA7ayjxXzTsXbtdA==",
"dev": true,
"requires": {
"@types/node": "^8.0.24",
@ -857,17 +789,17 @@
}
},
"electron-builder": {
"version": "20.13.5",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.13.5.tgz",
"integrity": "sha512-QhgUq1GKGEJUO6C0jjJeNwAymvHJb4mfUmUfVuVLoVNoOgmAC9AYSQuiw214TswyhlOh+yfXNG6qC4MUaoIlcA==",
"version": "20.14.7",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.14.7.tgz",
"integrity": "sha512-f6k0hDmMof3tKn/RqNMfgNYdSl/UNomFTFw7pizbj8v33iVwCqST02Iqo/xpuXWi0KrJNdBlJvbva1DU/vkYkg==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
"builder-util": "5.8.1",
"builder-util": "5.11.1",
"builder-util-runtime": "4.2.1",
"chalk": "^2.4.1",
"dmg-builder": "4.1.8",
"electron-builder-lib": "20.13.5",
"dmg-builder": "4.10.1",
"electron-builder-lib": "20.14.7",
"electron-download-tf": "4.3.4",
"fs-extra-p": "^4.6.0",
"is-ci": "^1.1.0",
@ -953,22 +885,22 @@
}
},
"electron-builder-lib": {
"version": "20.13.5",
"resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.13.5.tgz",
"integrity": "sha512-SLMfFTryJUueWxX8IiNWJ7+BN6moMdLyIiJlBSe6EMq5TKkj4TWzstU5EsnZAkiFVt6shhPZnzkgKk1JlwWbxQ==",
"version": "20.14.7",
"resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.14.7.tgz",
"integrity": "sha512-sPlpRN5Nea9ZK+nwZcD5ZuGoK2uCj2muQ7enc+9BeXPAxnEu4yYmYanICAi4BQqUdusm4yjjnN9uPowlbvCNzA==",
"dev": true,
"requires": {
"7zip-bin": "~3.1.0",
"app-builder-bin": "1.8.6",
"7zip-bin": "~4.0.2",
"app-builder-bin": "1.9.5",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.5",
"builder-util": "5.8.1",
"builder-util": "5.11.1",
"builder-util-runtime": "4.2.1",
"chromium-pickle-js": "^0.2.0",
"debug": "^3.1.0",
"ejs": "^2.6.1",
"electron-osx-sign": "0.4.10",
"electron-publish": "20.13.2",
"electron-publish": "20.14.6",
"fs-extra-p": "^4.6.0",
"hosted-git-info": "^2.6.0",
"is-ci": "^1.1.0",
@ -981,6 +913,7 @@
"read-config-file": "3.0.1",
"sanitize-filename": "^1.6.1",
"semver": "^5.5.0",
"stream-json": "^0.6.1",
"temp-file": "^3.1.2"
},
"dependencies": {
@ -1045,13 +978,13 @@
}
},
"electron-publish": {
"version": "20.13.2",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.13.2.tgz",
"integrity": "sha512-Mg/GdDZdUgQep9Ex/NpWM8yeq1Lp2z5k42FB1awW5rz+mSvS/O0MQLJVZ7RaSzEFEgkhBoNlhU7GqirzSxJQTw==",
"version": "20.14.6",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.14.6.tgz",
"integrity": "sha512-14u2eT8qTNKD1ek20UK5AbjDn6qmdhAOEiTcgmjmrMoRJFQIhGwV3emFmfaY1S6uFnFdY/4MyMcU92AXD1oRsw==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.5",
"builder-util": "^5.8.1",
"builder-util": "^5.11.0",
"builder-util-runtime": "^4.2.1",
"chalk": "^2.4.1",
"fs-extra-p": "^4.6.0",
@ -1408,22 +1341,6 @@
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
"dev": true
},
"hawk": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
"integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
"requires": {
"boom": "4.x.x",
"cryptiles": "3.x.x",
"hoek": "4.x.x",
"sntp": "2.x.x"
}
},
"hoek": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
},
"home-path": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
@ -2049,6 +1966,12 @@
"error-ex": "^1.2.0"
}
},
"parser-toolkit": {
"version": "0.0.5",
"resolved": "https://registry.npmjs.org/parser-toolkit/-/parser-toolkit-0.0.5.tgz",
"integrity": "sha1-7EthcpyGMYtW6pcb+6azxnLWLAE=",
"dev": true
},
"path-exists": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
@ -2320,9 +2243,9 @@
}
},
"request": {
"version": "2.86.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.86.0.tgz",
"integrity": "sha512-BQZih67o9r+Ys94tcIW4S7Uu8pthjrQVxhsZ/weOwHbDfACxvIyvnAbzFQxjy1jMtvFSzv5zf4my6cZsJBbVzw==",
"version": "2.87.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
"integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
"requires": {
"aws-sign2": "~0.7.0",
"aws4": "^1.6.0",
@ -2332,7 +2255,6 @@
"forever-agent": "~0.6.1",
"form-data": "~2.3.1",
"har-validator": "~5.0.3",
"hawk": "~6.0.2",
"http-signature": "~1.2.0",
"is-typedarray": "~1.0.0",
"isstream": "~0.1.2",
@ -2447,14 +2369,6 @@
"resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz",
"integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw=="
},
"sntp": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
"integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
"requires": {
"hoek": "4.x.x"
}
},
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@ -2533,6 +2447,15 @@
"integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
"dev": true
},
"stream-json": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/stream-json/-/stream-json-0.6.1.tgz",
"integrity": "sha512-Tmhl5yUVusgkgCiWnoHD1BA8/LqFX5/OlYj+YMCgUuUMjbacQvSWV8p1grbKvzP6s4EBS4nK5WNsMHX7kugzyg==",
"dev": true,
"requires": {
"parser-toolkit": ">=0.0.3"
}
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",

6
package.json
View File

@ -37,15 +37,15 @@
"electron-updater": "^2.21.10",
"jquery": "^3.3.1",
"mkdirp": "^0.5.1",
"request": "^2.86.0",
"request": "^2.87.0",
"rimraf": "^2.6.2",
"tar-fs": "^1.16.2",
"uuid": "^3.2.1",
"winreg": "^1.2.4"
},
"devDependencies": {
"electron": "^2.0.1",
"electron-builder": "^20.13.5"
"electron": "^2.0.2",
"electron-builder": "^20.14.7"
},
"build": {
"appId": "westeroscraftlauncher",