Skip to content

Commit 17e7bed

Browse files
committed
small fixes
1 parent 747bb7e commit 17e7bed

File tree

4 files changed

+723
-22
lines changed

4 files changed

+723
-22
lines changed

index.html

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
259259

260260
<script>
261261

262+
263+
const settings_file = __dirname+"\\settings.json"
264+
262265
function toggle_keys(){
263266

264267
var x = document.getElementById("keycode_gen")
@@ -289,7 +292,7 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
289292

290293
function set_info(setting){
291294

292-
const config = require('./settings.json');
295+
const config = require(settings_file);
293296
const fs = require("fs");
294297

295298

@@ -300,7 +303,7 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
300303
if (setting_val.split("-").length == 5){
301304
config.csgo["reward_id_"+setting] = setting_val;
302305

303-
fs.writeFile('./settings.json', JSON.stringify(config, null, 4), err => {
306+
fs.writeFile(settings_file, JSON.stringify(config, null, 4), err => {
304307
//console.log("saved")
305308
})
306309

@@ -314,14 +317,14 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
314317

315318
function save_key(setting){
316319

317-
const config = require('./settings.json');
320+
const config = require(settings_file);
318321
const fs = require("fs");
319322

320323
var setting_val = document.getElementById(setting).value;
321324
if(setting_val){
322325
config.csgo[setting] = setting_val;
323326

324-
fs.writeFile('./settings.json', JSON.stringify(config, null, 4), err => {
327+
fs.writeFile(settings_file, JSON.stringify(config, null, 4), err => {
325328
//console.log("saved")
326329
})
327330

@@ -333,14 +336,14 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
333336

334337
function save_name(){
335338

336-
const config = require('./settings.json');
339+
const config = require(settings_file);
337340
const fs = require("fs");
338341

339342
var channelname = document.getElementById("channelname").value;
340343
if (channelname){
341344
config.login.channelname = channelname;
342345

343-
fs.writeFile('./settings.json', JSON.stringify(config, null, 4), err => {
346+
fs.writeFile(settings_file, JSON.stringify(config, null, 4), err => {
344347
//console.log("saved")
345348
})
346349

@@ -354,14 +357,14 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
354357
};
355358

356359
function save_oauth(){
357-
const config = require('./settings.json');
360+
const config = require(settings_file);
358361
const fs = require("fs");
359362

360363
var oauth = document.getElementById("oauth").value;
361364
if (oauth.startsWith("oauth:")){
362365
config.login.oauth = oauth;
363366

364-
fs.writeFile('./settings.json', JSON.stringify(config, null, 4), err => {
367+
fs.writeFile(settings_file, JSON.stringify(config, null, 4), err => {
365368
//console.log("saved")
366369
})
367370

@@ -375,7 +378,7 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
375378

376379
function load_settings(){
377380

378-
const config = require('./settings.json');
381+
const config = require(settings_file);
379382

380383
if (!config.csgo.cfg_folder){
381384
document.getElementById("set_path").innerHTML = "Select your autoexec.cfg (create one if not exist)"
@@ -425,13 +428,11 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
425428
document.getElementById("key_reset_viewmodel").placeholder = config.csgo.key_reset_viewmodel;
426429
}
427430

428-
429-
430431
};
431432

432433
function save_path(){
433434

434-
const config = require('./settings.json');
435+
const config = require(settings_file);
435436
const fs = require("fs");
436437

437438
if (document.getElementById("path").files[0].path.includes("autoexec.cfg")){
@@ -443,7 +444,7 @@ <h1 id="set_code" class="display-8 text-center text-dark bg-success">no Reward-I
443444
alert("Please press the 'Browse'-Button and select your Autoexec.cfg")
444445
}
445446

446-
fs.writeFile('./settings.json', JSON.stringify(config, null, 4), err => {
447+
fs.writeFile(settings_file, JSON.stringify(config, null, 4), err => {
447448
//console.log("saved")
448449
})
449450

main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function createWindow () {
1010
}
1111
})
1212

13-
win.setMenu(null)
13+
// win.setMenu(null)
1414
win.loadFile('index.html')
1515
};
1616

0 commit comments

Comments
 (0)