diff --git a/.eslintignore b/.eslintignore index fb3ace7a..af0fbc5a 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,4 @@ +front-src/libs/ejs.js app/client/css/ app/client/js/ node_modules/ diff --git a/.prettierignore b/.prettierignore index 0b993790..3570672f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,3 +6,4 @@ node_modules/ dist/ *_.* *_ +front-src/libs/ejs.js diff --git a/app/main/window/hideOnClose.js b/app/main/window/hideOnClose.js index 99ff22ff..68908c07 100644 --- a/app/main/window/hideOnClose.js +++ b/app/main/window/hideOnClose.js @@ -1,15 +1,12 @@ const { app } = require("electron"); const quit = require("../quit"); - - module.exports = function hideOnClose(win) { let willQuitApp = false; win.on("close", (event) => { - // Quit on Cmd + Q on Mac - if (willQuitApp && process.platform === 'darwin') { + if (willQuitApp && process.platform === "darwin") { quit(); } @@ -20,6 +17,5 @@ module.exports = function hideOnClose(win) { }); // Detect If the user decide to quit app - app.on('before-quit', () => willQuitApp = true); - + app.on("before-quit", () => (willQuitApp = true)); }; diff --git a/app/server/libs/twitch/AuthProvider.js b/app/server/libs/twitch/AuthProvider.js index c925dad1..5c3b4933 100644 --- a/app/server/libs/twitch/AuthProvider.js +++ b/app/server/libs/twitch/AuthProvider.js @@ -44,8 +44,8 @@ module.exports = class AuthProvider { getAuthUrl(scopes) { return encodeURI( `${authBaseURL}&client_id=${this.clientId}` + - `&redirect_uri=${this.redirectURI}&scope=${scopes.join(" ")}` + - `&force_verify=${this.forceVerify ? "true" : "false"}` + `&redirect_uri=${this.redirectURI}&scope=${scopes.join(" ")}` + + `&force_verify=${this.forceVerify ? "true" : "false"}` ); } diff --git a/app/static/locales/en/app.json b/app/static/locales/en/app.json index 4fb7b642..60986e8c 100644 --- a/app/static/locales/en/app.json +++ b/app/static/locales/en/app.json @@ -225,7 +225,8 @@ "onCommand": "Command", "onRedemption": "Redemption", "onBits": "Bits", - "onShortcut": "Shortcut" + "onShortcut": "Shortcut", + "null": "twitch.events.null" } }, "labels": { diff --git a/app/static/locales/es/app.json b/app/static/locales/es/app.json index e0acdb8f..fd70185f 100644 --- a/app/static/locales/es/app.json +++ b/app/static/locales/es/app.json @@ -224,7 +224,8 @@ "onCommand": "Comando", "onRedemption": "Redemption", "onBits": "Bits", - "onShortcut": "Shortcut" + "onShortcut": "Shortcut", + "null": "twitch.events.null" } }, "labels": { diff --git a/app/static/locales/fr/app.json b/app/static/locales/fr/app.json index ff92c27d..b77070cb 100644 --- a/app/static/locales/fr/app.json +++ b/app/static/locales/fr/app.json @@ -225,7 +225,8 @@ "onCommand": "Command", "onRedemption": "Redemption", "onBits": "Bits", - "onShortcut": "Shortcut" + "onShortcut": "Shortcut", + "null": "twitch.events.null" } }, "labels": { diff --git a/front-src/client/components/Anime/Timeline/Editor/InsertTextModal.svelte b/front-src/client/components/Anime/Timeline/Editor/InsertTextModal.svelte index 93482359..597c2012 100644 --- a/front-src/client/components/Anime/Timeline/Editor/InsertTextModal.svelte +++ b/front-src/client/components/Anime/Timeline/Editor/InsertTextModal.svelte @@ -8,7 +8,6 @@ export let notify = null; - const dispatch = createEventDispatcher(); let value = ""; diff --git a/front-src/client/components/Anime/Timeline/Editor/Timeline/EventSelect.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/EventSelect.svelte index 307bcd22..eb5f96bf 100644 --- a/front-src/client/components/Anime/Timeline/Editor/Timeline/EventSelect.svelte +++ b/front-src/client/components/Anime/Timeline/Editor/Timeline/EventSelect.svelte @@ -12,8 +12,8 @@ let eventsNames = []; function setEventName(name) { - $fakeEventName = name; - $fakeEvent = { eventName: `on${name}`, ...$events[$fakeEventName] }; + fakeEventName.set(name); + fakeEvent.set({ eventName: `on${name}`, ...$events[$fakeEventName] }); } function updateEvents() { diff --git a/front-src/client/components/Anime/Timeline/Editor/Timeline/ItemButtons.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/ItemButtons.svelte index fbedf5c4..718246e0 100644 --- a/front-src/client/components/Anime/Timeline/Editor/Timeline/ItemButtons.svelte +++ b/front-src/client/components/Anime/Timeline/Editor/Timeline/ItemButtons.svelte @@ -24,8 +24,8 @@ function selectItem(item) { if (!$selectedItem || $selectedItem.id !== item.id) { - $selectedKeyframe = null; - $selectedItem = item; + selectedKeyframe.set(null); + selectedItem.set(item); } } diff --git a/front-src/client/components/Anime/Timeline/Editor/Timeline/TagList.svelte b/front-src/client/components/Anime/Timeline/Editor/Timeline/TagList.svelte index 61db0009..1f1188ea 100644 --- a/front-src/client/components/Anime/Timeline/Editor/Timeline/TagList.svelte +++ b/front-src/client/components/Anime/Timeline/Editor/Timeline/TagList.svelte @@ -1,6 +1,5 @@