diff --git a/.gitignore b/.gitignore index 6704566..c56be81 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ npm-debug.log* yarn-debug.log* yarn-error.log* lerna-debug.log* +gittoken.json # Diagnostic reports (https://nodejs.org/api/report.html) report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json diff --git a/gittoken.json b/gittoken.json index bc47b05..b419316 100644 --- a/gittoken.json +++ b/gittoken.json @@ -1 +1 @@ -{"token": "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"} \ No newline at end of file +{"token": "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"} \ No newline at end of file diff --git a/index.html b/index.html index ec6cc11..94400e3 100644 --- a/index.html +++ b/index.html @@ -18,8 +18,8 @@
-

Downloading...

-
100%
+

idling

+
0%

diff --git a/index.js b/index.js index 6abc295..7e3d239 100644 --- a/index.js +++ b/index.js @@ -15,7 +15,6 @@ const createWindow = () => { width: 600, height: 300, backgroundColor: '#2f3241', - symbolColor: '#74b1be', resizable: false, titleBarStyle: 'hidden', titleBarOverlay: true, @@ -40,7 +39,12 @@ async function initGithub (){ console.log(`token: %s`, token) mainWindow.webContents.send("github-lookup", "looking up releases"); // Compare: https://docs.github.com/en/rest/reference/users#get-the-authenticated-user - const { data: { login }, } = await octokit.rest.users.getAuthenticated(); + const { data: { login }, } = await octokit.rest.users.getAuthenticated().catch(async err => { + if (err) { + console.log(err); + mainWindow.webContents.send("error-message", {label: "authentication failed", err: err}) + } + }); console.log("Hello, %s", login); } diff --git a/preload.js b/preload.js index e9e4173..abe7a1f 100644 --- a/preload.js +++ b/preload.js @@ -3,6 +3,7 @@ const { contextBridge, ipcRenderer } = require('electron') contextBridge.exposeInMainWorld('electronAPI', { + handleError: (callback) => ipcRenderer.on("error-message", callback), updateProgress: (callback) => ipcRenderer.on('github-lookup', callback) }) diff --git a/render.js b/render.js index 5bf6d5f..2845203 100644 --- a/render.js +++ b/render.js @@ -1,9 +1,27 @@ -window.electronAPI.updateProgress(async (_event, value) => { +window.electronAPI.updateProgress((_event, value) => { console.log(_event) console.log(value) updateProgressStep(value); }) +window.electronAPI.handleError((_event, value) => { + let error = ` +
NCOS Companion
+
+

An Error Occured

+
+
+

${value.label}

+

pleas report this to us

+
${value.err}
+
+
+
+ `; + + document.querySelector("body").innerHTML = error; +}) + function updateProgressBar(progress){ document.getElementById("progress-bar").style.width = progress + "%"; document.getElementById("progress-label").textContent = progress + "%"; diff --git a/style.css b/style.css index bab82cd..23b90f6 100644 --- a/style.css +++ b/style.css @@ -13,6 +13,13 @@ h4 { margin: 0; margin-bottom: 10px; } + +pre { + border: 1px solid #74b1be; + border-radius: 5px; + padding: 5px; +} + .content { padding-left: 15.5%; padding-right: 15.5%; @@ -68,6 +75,10 @@ div[class^=col-] { padding: 1rem 0 } +.link { + color: #74b1be; +} + .row { display: flex; flex-wrap: wrap