run prettier rules to pass linting

oklabflensburg · Oct 2, 2023 · c57d50b · c57d50b
1 parent a3de086
commit c57d50b
Show file tree

Hide file tree

Showing 21 changed files with 147 additions and 142 deletions.
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -76,7 +76,7 @@ rules:
 
   indent:
     - error
-    - 4
+    - 2
 
   key-spacing:
     - error
@@ -243,4 +243,4 @@ rules:
     - as-needed
 
   consistent-return: error
-  default-case-last: error
+  default-case-last: error
diff --git a/.gitattributes b/.gitattributes
@@ -2,7 +2,7 @@
 * text=auto
 
 # Force the following filetypes to have unix eols, so Windows does not break them
-*.* text eol=crlf
+*.* text eol=lf
 
 # Windows forced line-endings
 /.idea/* text eol=crlf

diff --git a/.prettierignore b/.prettierignore
@@ -2,7 +2,7 @@
 dist/
 
 # Ignore HTML formatting as the diffs are not great
-*.html
+tailwind.config.js
 
 # Ignore third party JavaScript
 node_modules/
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -1,11 +1,12 @@
 semi: false
 singleQuote: true
 bracketSameLine: true
-htmlWhitespaceSensitivity: 'css'
 singleAttributePerLine: false
-trailingComma: 'es5'
-arrowParens: 'always'
-endOfLine: 'crlf'
+htmlWhitespaceSensitivity: css
+trailingComma: none
+arrowParens: always
+
+endOfLine: lf
 
 overrides:
   - files:

diff --git a/package.json b/package.json
@@ -8,7 +8,8 @@
     "start": "parcel serve --no-cache",
     "build": "parcel build --public-url '.' --no-cache",
     "htmlhint": "htmlhint \"**/*.html\" --ignore \"dist/**/*.html\" --format unix",
-    "lint:js": "pnpm exec eslint src && pnpm exec prettier --check \"**/*.js\"",
+    "prettier": "npm:@yuhr/prettier",
+    "lint:js": "pnpm exec eslint src",
     "lint:html": "pnpm run htmlhint && pnpm exec prettier --check \"**/*.html\"",
     "lint:css": "pnpm exec stylelint \"**/*.css\" && pnpm exec prettier --check \"**/*.css\"",
     "lint": "pnpm run lint:js && pnpm run lint:css && pnpm run lint:html"
@@ -21,12 +22,12 @@
   },
   "devDependencies": {
     "@parcel/config-default": "^2.9.3",
+    "@yuhr/prettier": "^2.8.7",
     "eslint": "8.50.0",
     "htmlhint": "^1.1.4",
     "parcel": "latest",
     "parcel-reporter-static-files-copy": "^1.5.3",
     "postcss": "^8.4.30",
-    "prettier": "^3.0.3",
     "stylelint": "^15.10.3",
     "stylelint-config-standard": "^34.0.0",
     "tailwindcss": "^3.3.3"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app.js b/src/app.js
@@ -12,14 +12,16 @@ export default class App extends Controller {
 
     if (this.districtId === null) {
       this.model.setDistrictId(id)
-    } else {
+    }
+    else {
       this.model.setDistrictId(this.districtId)
     }
 
     if (this.data === null) {
       this.fetchData(url)
-    } else {
+    }
+    else {
       // this.state.onDataChanged(this.data)
     }
   }
-}
+}
diff --git a/src/appModel.js b/src/appModel.js
@@ -33,4 +33,4 @@ export default class AppModel extends Model {
       this.setStorage('districtObject', items[0])
     }
   }
-}
+}
diff --git a/src/districtSelectComponent.js b/src/districtSelectComponent.js
@@ -38,4 +38,4 @@ export default class DistrictSelectComponent extends Component {
       handler(selectedOption - 1)
     })
   }
-}
+}
diff --git a/src/index.html b/src/index.html
@@ -1,22 +1,23 @@
 <!DOCTYPE html>
 <html lang="de">
-<head>
-    <base href="./">
-    <meta charset="utf-8">
+  <head>
+    <base href="./" />
+    <meta charset="utf-8" />
     <title>Sozialatlas Dashboard - Stadt Flensburg</title>
-    <meta content="Stastische Daten des Sozialatlas 2022 der Stadt Flensburg" name="description">
-    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport">
+    <meta
+      content="Stastische Daten des Sozialatlas 2022 der Stadt Flensburg"
+      name="description" />
+    <meta
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+      name="viewport" />
     <!--script src="https://cdn.tailwindcss.com"></script-->
-    <link rel="stylesheet" href="main.css">
+    <link rel="stylesheet" href="main.css" />
     <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-</head>
+  </head>
 
-<body>
-
-    <div id="root">
-    </div>
+  <body>
+    <div id="root"></div>
 
     <script type="module" src="main.js"></script>
-
-</body>
-</html>
+  </body>
+</html>
diff --git a/src/index.js b/src/index.js
@@ -11,5 +11,5 @@ export {
   TestComponent,
   DistrictSelectComponent,
   PopComponent,
-  StateController,
-}
+  StateController
+}
diff --git a/src/main.css b/src/main.css
@@ -70,4 +70,4 @@ body {
 .xyz_popPercentage {
   font-size: 0.8em;
   padding: 8px 0;
-}
+}
diff --git a/src/main.js b/src/main.js
@@ -4,15 +4,15 @@ import {
   Router,
   Controller,
   Component,
-  GridComponent,
+  GridComponent
 } from '@sndcds/mvc'
 import {
   App,
   AppModel,
   TestComponent,
   DistrictSelectComponent,
   PopComponent,
-  StateController,
+  StateController
 } from './index.js'
 
 // Create an instance of AppModel
@@ -33,7 +33,7 @@ const demoController1 = () => {
 
 // Create an object that maps controller names to controller functions.
 const controllers = {
-  demoController1,
+  demoController1
 }
 
 // Create an instance of Router
@@ -44,4 +44,4 @@ router.start()
 app.buildView('root')
 
 // Initialize the application with url and district id
-app.initApp('./details.json', 13)
+app.initApp('./details.json', 13)
diff --git a/src/popComponent.js b/src/popComponent.js
@@ -93,4 +93,4 @@ export default class PopComponent extends Component {
   setProperties(data) {
     this.e.children.item(1).innerText = data.value
   }
-}
+}
diff --git a/src/stateController.js b/src/stateController.js
@@ -23,7 +23,7 @@ export default class StateController {
 
     const d = {
       data: this.app.model.data,
-      districtId: this.app.model.districtId,
+      districtId: this.app.model.districtId
     }
     this.app.setProperties('districtSelect', d)
     const c = this.app.componentById('districtSelect')
@@ -56,7 +56,7 @@ export default class StateController {
         '65 - 80',
         '80+',
         '0 - 8',
-        '60+',
+        '60+'
       ]
       new PopComponent(container2, `ageView${i}`, {
         classPrefix: 'xyz',
@@ -65,7 +65,7 @@ export default class StateController {
         percentage: 87.3,
         barOffset: 13.2,
         barColor1: '#d1e4fd',
-        barColor2: '#0069f6',
+        barColor2: '#0069f6'
       })
     }
   }
@@ -74,36 +74,36 @@ export default class StateController {
     const items = [
       {
         id: 'ageView1',
-        path: ['district_detail', '2021', 'age_groups', 'age_to_under_18'],
+        path: ['district_detail', '2021', 'age_groups', 'age_to_under_18']
       },
       {
         id: 'ageView2',
-        path: ['district_detail', '2021', 'age_groups', 'age_18_to_under_30'],
+        path: ['district_detail', '2021', 'age_groups', 'age_18_to_under_30']
       },
       {
         id: 'ageView3',
-        path: ['district_detail', '2021', 'age_groups', 'age_30_to_under_45'],
+        path: ['district_detail', '2021', 'age_groups', 'age_30_to_under_45']
       },
       {
         id: 'ageView4',
-        path: ['district_detail', '2021', 'age_groups', 'age_45_to_under_65'],
+        path: ['district_detail', '2021', 'age_groups', 'age_45_to_under_65']
       },
       {
         id: 'ageView5',
-        path: ['district_detail', '2021', 'age_groups', 'age_65_to_under_80'],
+        path: ['district_detail', '2021', 'age_groups', 'age_65_to_under_80']
       },
       {
         id: 'ageView6',
-        path: ['district_detail', '2021', 'age_groups', 'age_80_and_above'],
+        path: ['district_detail', '2021', 'age_groups', 'age_80_and_above']
       },
       {
         id: 'ageView7',
-        path: ['district_detail', '2021', 'age_groups', 'age_0_to_under_7'],
+        path: ['district_detail', '2021', 'age_groups', 'age_0_to_under_7']
       },
       {
         id: 'ageView8',
-        path: ['district_detail', '2021', 'age_groups', 'age_60_and_above'],
-      },
+        path: ['district_detail', '2021', 'age_groups', 'age_60_and_above']
+      }
     ]
 
     items.forEach((item) => {
@@ -119,4 +119,4 @@ export default class StateController {
   renderDistrictSelect() {
     new DistrictSelectComponent()
   }
-}
+}
diff --git a/src/testcomponent.js b/src/testcomponent.js
@@ -26,4 +26,4 @@ export default class TestComponent extends Component {
     this.parent.e.appendChild(this.e)
     this.buildChilds()
   }
-}
+}
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -2,7 +2,7 @@
 module.exports = {
   content: ['./src/**/*.{html,js}'],
   theme: {
-    extend: {},
+    extend: {}
   },
-  plugins: [],
-}
+  plugins: []
+}
diff --git a/temporary/dashboard.css b/temporary/dashboard.css
@@ -7,4 +7,4 @@ body {
 canvas {
   width: 100% !important;
   height: 100% !important;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,4 @@ export default class AppModel extends Model { @@
           this.setStorage('districtObject', items[0])
         }
       }
-    }
+    }