style: use prettier on other file formats as well (#648)

mainsail-crew · Feb 16, 2022 · 615ee73 · 615ee73
1 parent dfa3abc
commit 615ee73
Show file tree

Hide file tree

Showing 108 changed files with 1,874 additions and 2,402 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,12 +5,7 @@
         "es6": true,
         "node": true
     },
-    "extends": [
-        "plugin:vue/essential",
-        "eslint:recommended",
-        "@vue/typescript",
-        "prettier"
-    ],
+    "extends": ["plugin:vue/essential", "eslint:recommended", "@vue/typescript", "prettier"],
     "globals": {
         "Atomics": "readonly",
         "SharedArrayBuffer": "readonly"
@@ -20,7 +15,5 @@
         "parser": "@typescript-eslint/parser",
         "sourceType": "module"
     },
-    "plugins": [
-        "vue"
-    ]
+    "plugins": ["vue"]
 }
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -10,4 +10,4 @@ Project maintainers have the right and responsibility to remove, edit, or reject
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
 
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,7 +4,6 @@ about: Create a report to help us improve
 title: ''
 labels: bug
 assignees: ''
-
 ---
 
 **Describe the bug:**\
@@ -18,5 +17,6 @@ If applicable, add screenshots to help explain your problem.
 
 **Logfiles:**\
 Please upload your Logfiles here or upload them to [pastebin.com](http://pastebin.com) and paste your log links here.
+
 - klippy.log
 - moonraker.log
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,10 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[FR]"
+title: '[FR]'
 labels: ''
 assignees: ''
-
 ---
 
 **Is your feature request related to a problem? Please describe.**

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,9 +6,9 @@ name: Build
 on:
   # Triggers the workflow on push or pull request events but only for the develop branch
   push:
-    branches: [ develop ]
+    branches: [develop]
   pull_request:
-    branches: [ develop ]
+    branches: [develop]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/.github/workflows/build_size_report.yml b/.github/workflows/build_size_report.yml
@@ -1,7 +1,7 @@
 name: Build Size Report
 on:
   pull_request_target:
-    types: [ labeled ]
+    types: [labeled]
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -14,8 +14,8 @@ jobs:
       - uses: preactjs/compressed-size-action@v2
         with:
           strip-hash: "\\b\\w{8}\\."
-          pattern: "./dist/**/*.{js,css,html,json,woff2,svg,png}"
-          exclude: "{./dist/manifest.json,./dist/build.zip,**/*.map,**/node_modules/**}"
+          pattern: './dist/**/*.{js,css,html,json,woff2,svg,png}'
+          exclude: '{./dist/manifest.json,./dist/build.zip,**/*.map,**/node_modules/**}'
       - uses: actions-ecosystem/action-remove-labels@v1
         with:
-          labels: analyze # analyze complete, remote the label afterwards
+          labels: analyze # analyze complete, remote the label afterwards
diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml
@@ -6,10 +6,10 @@ name: Code style check
 on:
   # Triggers the workflow on push or pull request events but only for the develop branch
   push:
-    branches: [ develop ]
+    branches: [develop]
   pull_request:
     branches:
-      - "*"
+      - '*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -40,4 +40,4 @@ jobs:
           prettier: true
           eslint_dir: src
           eslint_extensions: ts,vue
-          prettier_dir: src
+          prettier_dir: src
diff --git a/.prettierrc b/.prettierrc
@@ -1,6 +1,22 @@
 {
-	"tabWidth": 4,
-	"singleQuote": true,
-	"semi": false,
-	"printWidth": 120
+    "tabWidth": 4,
+    "singleQuote": true,
+    "semi": false,
+    "printWidth": 120,
+    "bracketSameLine": true,
+    "htmlWhitespaceSensitivity": "ignore",
+    "overrides": [
+        {
+            "files": "*.yml",
+            "options": {
+                "tabWidth": 2
+            }
+        },
+        {
+            "files": "*.md",
+            "options": {
+                "tabWidth": 2
+            }
+        }
+    ]
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -19,12 +19,13 @@ Hi! I'm really excited that you are interested in contributing to Mainsail. Befo
 - It's OK to have multiple small commits as you work on the PR - GitHub will automatically squash it before merging.
 
 - If adding a new feature:
-    - Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first and have it approved before working on it.
+
+  - Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first and have it approved before working on it.
 
 - If fixing bug:
-    - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`.
-    - Provide a detailed description of the bug in the PR. Live demo preferred.
-    - Add appropriate test coverage if applicable.
+  - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`.
+  - Provide a detailed description of the bug in the PR. Live demo preferred.
+  - Add appropriate test coverage if applicable.
 
 ## Committing Changes
 
@@ -39,4 +40,4 @@ As a pure community-driven project without major corporate backing, we also welc
 
 ## Credits
 
-Thank you to all the people who have already contributed to Mainsail!
+Thank you to all the people who have already contributed to Mainsail!
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 </p>
 
 # Mainsail
+
 [![downloads](https://img.shields.io/github/downloads/mainsail-crew/mainsail/total?style=flat-square)](https://github.com/mainsail-crew/mainsail/releases) [![localizations](https://shields-staging.herokuapp.com/github/directory-file-count/mainsail-crew/mainsail/src%2Flocales?label=localizations&extension=json&type=file&style=flat-square)](https://docs.mainsail.xyz/development/localization) [![stars](https://img.shields.io/github/stars/meteyou/mainsail?style=flat-square)](https://github.com/mainsail-crew/mainsail/stargazers) [![forks](https://img.shields.io/github/forks/meteyou/mainsail?style=flat-square)](https://github.com/mainsail-crew/mainsail/network/members)
 [![license](https://img.shields.io/github/license/meteyou/mainsail?style=flat-square)](https://github.com/mainsail-crew/mainsail/blob/develop/LICENSE) [![last-commit](https://img.shields.io/github/last-commit/meteyou/mainsail?style=flat-square)](https://github.com/mainsail-crew/mainsail/commits/) ![size](https://img.shields.io/github/repo-size/meteyou/mainsail?style=flat-square)  
 [![discord](https://img.shields.io/discord/758059413700345988?color=%235865F2&label=discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/skWTwTD) [![patreons](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dmeteyou%26type%3Dpatrons&style=flat-square)](https://www.patreon.com/meteyou)
@@ -17,10 +18,12 @@ Mainsail is also available in remote mode on [http://my.mainsail.xyz](http://my.
 [Release Notes](https://github.com/mainsail-crew/mainsail/releases)
 
 ## Screenshots
+
 ![screenshot-dashboard](https://raw.githubusercontent.com/mainsail-crew/docs/master/assets/img/screenshot.png)
 ![Features](https://raw.githubusercontent.com/mainsail-crew/docs/master/assets/img/features.png)
 
-## Features 
+## Features
+
 - Responsive web interface, optimized for desktops, tablets and mobile devices
 - Supports multiple 3D printers (Printer Farm)
 - Localization (i18n)
@@ -40,21 +43,24 @@ Mainsail is also available in remote mode on [http://my.mainsail.xyz](http://my.
 - Exclude objects (not yet officially supported by Klipper)
 
 ## Help and Support
-Do you need help or just want to talk? Join our active community on [Discord](https://discord.gg/skWTwTD). 
+
+Do you need help or just want to talk? Join our active community on [Discord](https://discord.gg/skWTwTD).
 Have you found a bug? Please create an [Issue](https://github.com/mainsail-crew/mainsail/issues) in GitHub and let us know.
 
 ## Support Mainsail
+
 Mainsail is primarily developed and maintained by meteyou. To keep the project going he invests his free time, almost every day. To motivate him (☕🍺😜) there are several ways to support him:
 
-[![patreon](https://img.shields.io/badge/patreon-participate-yellow.svg?style=flat-square)](https://www.patreon.com/meteyou) 
-[![kofi](https://img.shields.io/badge/buy%20me%20a%20coffee-donate-yellow.svg?style=flat-square)](https://ko-fi.com/mainsail) 
+[![patreon](https://img.shields.io/badge/patreon-participate-yellow.svg?style=flat-square)](https://www.patreon.com/meteyou)
+[![kofi](https://img.shields.io/badge/buy%20me%20a%20coffee-donate-yellow.svg?style=flat-square)](https://ko-fi.com/mainsail)
 
 ## Credit, sources and inspiration
-* [Kevin O'Connor](https://github.com/KevinOConnor) for the awesome 3D printer firmware [Klipper](https://github.com/KevinOConnor/klipper)
-* [Eric Callahan (arksine)](https://github.com/Arksine) for [Moonraker (Klipper API)](https://github.com/Arksine/moonraker). Without Moonraker, Mainsail would not be possible.
-* [lixxbox](https://github.com/lixxbox) for the Mainsail logo & Docs
-* [Vue.js](https://vuejs.org/): The Progressive JavaScript Framework
-* [Vuetify](https://vuetifyjs.com/): Material Design Component Framework for Vue.js
+
+- [Kevin O'Connor](https://github.com/KevinOConnor) for the awesome 3D printer firmware [Klipper](https://github.com/KevinOConnor/klipper)
+- [Eric Callahan (arksine)](https://github.com/Arksine) for [Moonraker (Klipper API)](https://github.com/Arksine/moonraker). Without Moonraker, Mainsail would not be possible.
+- [lixxbox](https://github.com/lixxbox) for the Mainsail logo & Docs
+- [Vue.js](https://vuejs.org/): The Progressive JavaScript Framework
+- [Vuetify](https://vuetifyjs.com/): Material Design Component Framework for Vue.js
 
 Massive thanks to the whole [Voron Design](http://vorondesign.com/) community. Without them such a project would not be possible.
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.8"
+version: '3.8'
 services:
   api:
     build:
@@ -12,7 +12,7 @@ services:
       - ./docker/config/moonraker:/home/node/.moonraker_database
     container_name: mainsail-stack-api
     ports:
-      - "7125:7125"
+      - '7125:7125'
     networks:
       - dev_net
   npm:
@@ -30,7 +30,7 @@ services:
       - ./index.html:/home/node/mainsail/index.html
     container_name: mainsail-stack-npm
     ports:
-      - "8080:8080"
+      - '8080:8080'
     depends_on:
       - api
     networks:

diff --git a/index.html b/index.html
@@ -1,30 +1,31 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta name="viewport" content="width=device-width,initial-scale=1.0">
-	<title>Mainsail</title>
+    <head>
+        <meta charset="utf-8" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+        <title>Mainsail</title>
 
-	<link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png">
-	<link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png">
-	<meta name="theme-color" content="#121212">
-	<meta name="apple-mobile-web-app-capable" content="yes">
-	<meta name="apple-mobile-web-app-status-bar-style" content="black">
-	<link rel="manifest" href="/manifest.json">
-	<meta name="apple-mobile-web-app-title" content="Mainsail">
-	<link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png">
-	<link rel="mask-icon" href="/img/icons/icon-196-maskable.png" color="#121212">
-	<meta name="msapplication-TileImage" content="/img/icons/mstile-150x150.png">
-	<meta name="msapplication-TileColor" content="#121212">
+        <link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png" />
+        <link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png" />
+        <meta name="theme-color" content="#121212" />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+        <link rel="manifest" href="/manifest.json" />
+        <meta name="apple-mobile-web-app-title" content="Mainsail" />
+        <link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png" />
+        <link rel="mask-icon" href="/img/icons/icon-196-maskable.png" color="#121212" />
+        <meta name="msapplication-TileImage" content="/img/icons/mstile-150x150.png" />
+        <meta name="msapplication-TileColor" content="#121212" />
 
-	<script type="module" src="/src/main.ts"></script>
-</head>
-<body>
-<noscript>
-	<strong>We're sorry but Mainsail doesn't work properly without JavaScript enabled. Please enable it to
-		continue.</strong>
-</noscript>
-<div id="app"></div>
-</body>
+        <script type="module" src="/src/main.ts"></script>
+    </head>
+    <body>
+        <noscript>
+            <strong>
+                We're sorry but Mainsail doesn't work properly without JavaScript enabled. Please enable it to continue.
+            </strong>
+        </noscript>
+        <div id="app"></div>
+    </body>
 </html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ Project maintainers have the right and responsibility to remove, edit, or reject

		Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.

		This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
		This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)