diff --git a/.editorconfig b/.editorconfig index 48252e96..234fe79b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,6 +8,7 @@ insert_final_newline = true trim_trailing_whitespace = true indent_style = space indent_size = 2 +max_line_length = 100 [*.go] indent_style = tab diff --git a/.prettierrc b/.prettierrc index 2c126df5..619d9a1e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,6 +3,7 @@ "useTabs": false, "singleQuote": true, "semi": true, - "bracketSpacing": false, + "bracketSpacing": true, + "bracketSameLine": true, "arrowParens": "always" } diff --git a/web/app/index.html b/web/app/index.html index e6959f31..46c96dd5 100644 --- a/web/app/index.html +++ b/web/app/index.html @@ -2,9 +2,9 @@ - - - + + + Flamenco Manager diff --git a/web/app/src/App.vue b/web/app/src/App.vue index 269709ff..3e9327ce 100644 --- a/web/app/src/App.vue +++ b/web/app/src/App.vue @@ -20,8 +20,7 @@ add-on - | API - | version: {{ flamencoVersion }} + | API | version: {{ flamencoVersion }} @@ -29,14 +28,14 @@ diff --git a/web/app/src/SetupAssistant.vue b/web/app/src/SetupAssistant.vue index 95d74f2e..1ecfbb14 100644 --- a/web/app/src/SetupAssistant.vue +++ b/web/app/src/SetupAssistant.vue @@ -12,12 +12,11 @@ diff --git a/web/app/src/api-client.js b/web/app/src/api-client.js index 4d8742de..6e510936 100644 --- a/web/app/src/api-client.js +++ b/web/app/src/api-client.js @@ -1,6 +1,6 @@ -import { ApiClient } from "@/manager-api"; -import { CountingApiClient } from "@/stores/api-query-count"; -import { api as apiURL } from '@/urls' +import { ApiClient } from '@/manager-api'; +import { CountingApiClient } from '@/stores/api-query-count'; +import { api as apiURL } from '@/urls'; /** * Scrub the custom User-Agent header from the API client, for those webbrowsers diff --git a/web/app/src/autoreloader.js b/web/app/src/autoreloader.js index 9282891a..7c68c683 100644 --- a/web/app/src/autoreloader.js +++ b/web/app/src/autoreloader.js @@ -1,9 +1,9 @@ -import { DateTime } from "luxon"; +import { DateTime } from 'luxon'; // Do a full refresh once per hour. This is just to make sure that long-lived // displays (like the TV in the hallway at Blender HQ) pick up on HTML/JS/CSS // changes eventually. -const reloadAfter = {minute: 60}; +const reloadAfter = { minute: 60 }; function getReloadDeadline() { return DateTime.now().plus(reloadAfter); @@ -27,10 +27,10 @@ export default function autoreload() { // Check whether reloading is needed every minute. window.setInterval(maybeReload, 60 * 1000); - window.addEventListener("resize", deferReload); - window.addEventListener("mousedown", deferReload); - window.addEventListener("mouseup", deferReload); - window.addEventListener("mousemove", deferReload); - window.addEventListener("keydown", deferReload); - window.addEventListener("keyup", deferReload); + window.addEventListener('resize', deferReload); + window.addEventListener('mousedown', deferReload); + window.addEventListener('mouseup', deferReload); + window.addEventListener('mousemove', deferReload); + window.addEventListener('keydown', deferReload); + window.addEventListener('keyup', deferReload); } diff --git a/web/app/src/clipboard.js b/web/app/src/clipboard.js index 6ce430eb..8110996d 100644 --- a/web/app/src/clipboard.js +++ b/web/app/src/clipboard.js @@ -1,4 +1,3 @@ - /** * The duration in milliseconds of the "flash" effect, when an element has been * copied. @@ -7,7 +6,6 @@ */ const flashAfterCopyDuration = 150; - /** * Copy the inner text of an element to the clipboard. * @@ -30,9 +28,9 @@ export function copyElementData(clickEvent) { } function copyElementValue(sourceElement, value) { - const inputElement = document.createElement("input"); + const inputElement = document.createElement('input'); document.body.appendChild(inputElement); - inputElement.setAttribute("value", value); + inputElement.setAttribute('value', value); inputElement.select(); // Note that the `navigator.clipboard` interface is only available when using @@ -40,15 +38,15 @@ function copyElementValue(sourceElement, value) { // This is why this code falls back to the deprecated `document.execCommand()` // call. // Source: https://developer.mozilla.org/en-US/docs/Web/API/Clipboard - document.execCommand("copy"); + document.execCommand('copy'); document.body.removeChild(inputElement); flashElement(sourceElement); } function flashElement(element) { - element.classList.add("copied"); + element.classList.add('copied'); window.setTimeout(() => { - element.classList.remove("copied"); + element.classList.remove('copied'); }, 150); } diff --git a/web/app/src/components/ApiSpinner.vue b/web/app/src/components/ApiSpinner.vue index ec622acb..ff98436e 100644 --- a/web/app/src/components/ApiSpinner.vue +++ b/web/app/src/components/ApiSpinner.vue @@ -29,7 +29,7 @@ span { .spinner { -webkit-animation: rotate 2s linear infinite; - animation: rotate 2s linear infinite; + animation: rotate 2s linear infinite; z-index: 2; position: absolute; top: 50%; @@ -42,7 +42,7 @@ span { stroke: var(--color-text-hint); stroke-linecap: round; -webkit-animation: dash 1.5s ease-in-out infinite; - animation: dash 1.5s ease-in-out infinite; + animation: dash 1.5s ease-in-out infinite; } @-webkit-keyframes rotate { diff --git a/web/app/src/components/ConnectionStatus.vue b/web/app/src/components/ConnectionStatus.vue index c870fc99..0ca587d2 100644 --- a/web/app/src/components/ConnectionStatus.vue +++ b/web/app/src/components/ConnectionStatus.vue @@ -1,5 +1,7 @@ diff --git a/web/app/src/components/LinkWorkerTask.vue b/web/app/src/components/LinkWorkerTask.vue index 32dc43e5..ee82ebcd 100644 --- a/web/app/src/components/LinkWorkerTask.vue +++ b/web/app/src/components/LinkWorkerTask.vue @@ -1,8 +1,13 @@