chore: Reinstate more old prettier rules

mwiraszka · Jul 3, 2024 · 1937b1b · 1937b1b
1 parent 7347b38
commit 1937b1b
Show file tree

Hide file tree

Showing 84 changed files with 383 additions and 481 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,10 +1,7 @@
 {
-  "tabWidth": 2,
-  "useTabs": false,
-  "printWidth": 90,
-  "semi": true,
-  "singleQuote": true,
-  "trailingComma": "all",
+  "arrowParens": "avoid",
+  "bracketSameLine": true,
+  "bracketSpacing": true,
   "jsxBracketSameLine": true,
   "overrides": [
     {
@@ -13,5 +10,11 @@
         "parser": "angular"
       }
     }
-  ]
+  ],
+  "printWidth": 90,
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "all",
+  "useTabs": false
 }
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -8,83 +8,79 @@ const routes: Routes = [
   {
     path: NavPathTypes.HOME,
     loadChildren: () =>
-      import('./screens/home/home-screen.module').then((m) => m.HomeScreenModule),
+      import('./screens/home/home-screen.module').then(m => m.HomeScreenModule),
     pathMatch: 'full',
   },
   {
     path: NavPathTypes.ABOUT,
     loadChildren: () =>
-      import('./screens/about/about-screen.module').then((m) => m.AboutScreenModule),
+      import('./screens/about/about-screen.module').then(m => m.AboutScreenModule),
   },
   {
     path: NavPathTypes.MEMBERS,
     loadChildren: () =>
-      import('./screens/members/members-screen.module').then(
-        (m) => m.MembersScreenModule,
-      ),
+      import('./screens/members/members-screen.module').then(m => m.MembersScreenModule),
   },
   {
     path: NavPathTypes.MEMBER,
     loadChildren: () =>
-      import('./screens/member/member-screen.module').then((m) => m.MemberScreenModule),
+      import('./screens/member/member-screen.module').then(m => m.MemberScreenModule),
   },
   {
     path: NavPathTypes.SCHEDULE,
     loadChildren: () =>
       import('./screens/schedule/schedule-screen.module').then(
-        (m) => m.ScheduleScreenModule,
+        m => m.ScheduleScreenModule,
       ),
   },
   {
     path: NavPathTypes.EVENT,
     loadChildren: () =>
-      import('./screens/event/event-screen.module').then((m) => m.EventScreenModule),
+      import('./screens/event/event-screen.module').then(m => m.EventScreenModule),
     canActivate: [AuthGuard],
   },
   {
     path: NavPathTypes.NEWS,
     loadChildren: () =>
-      import('./screens/news/news-screen.module').then((m) => m.NewsScreenModule),
+      import('./screens/news/news-screen.module').then(m => m.NewsScreenModule),
   },
   {
     path: NavPathTypes.ARTICLE,
     loadChildren: () =>
-      import('./screens/article/article-screen.module').then(
-        (m) => m.ArticleScreenModule,
-      ),
+      import('./screens/article/article-screen.module').then(m => m.ArticleScreenModule),
   },
   {
     path: NavPathTypes.CITY_CHAMPION,
     loadChildren: () =>
       import('./screens/champion/champion-screen.module').then(
-        (m) => m.ChampionScreenModule,
+        m => m.ChampionScreenModule,
       ),
   },
   {
     path: NavPathTypes.PHOTO_GALLERY,
     loadChildren: () =>
       import('./screens/photo-gallery/photo-gallery-screen.module').then(
-        (m) => m.PhotoGalleryScreenModule,
+        m => m.PhotoGalleryScreenModule,
       ),
   },
   {
     path: NavPathTypes.GAME_ARCHIVES,
     loadChildren: () =>
       import('./screens/game-archives/game-archives-screen.module').then(
-        (m) => m.GameArchivesScreenModule,
+        m => m.GameArchivesScreenModule,
       ),
   },
   {
     path: NavPathTypes.DOCUMENTS,
     loadChildren: () =>
       import('./screens/documents/documents-screen.module').then(
-        (m) => m.DocumentsScreenModule,
+        m => m.DocumentsScreenModule,
       ),
   },
   {
     path: NavPathTypes.LOGIN,
     loadChildren: () =>
-      import('./screens/login/login-screen.module').then((m) => m.LoginScreenModule),
+      import('./screens/login/login-screen.module').then(m => m.LoginScreenModule),
   },
   {
     path: NavPathTypes.LOGOUT,
@@ -94,7 +90,7 @@ const routes: Routes = [
     path: NavPathTypes.CHANGE_PASSWORD,
     loadChildren: () =>
       import('./screens/change-password/change-password-screen.module').then(
-        (m) => m.ChangePasswordScreenModule,
+        m => m.ChangePasswordScreenModule,
       ),
   },
   {

diff --git a/src/app/app.facade.ts b/src/app/app.facade.ts
@@ -31,13 +31,13 @@ export class AppFacade {
     @Inject(DOCUMENT) private document: Document,
     private readonly store: Store,
   ) {
-    this.isDarkMode$.pipe(untilDestroyed(this)).subscribe((isDarkMode) => {
+    this.isDarkMode$.pipe(untilDestroyed(this)).subscribe(isDarkMode => {
       this.document.body.setAttribute('data-theme', isDarkMode ? 'dark' : 'light');
     });
 
     this.bannerLastCleared$
       .pipe(first(), filter(isDefined))
-      .subscribe((lastClearedTime) => {
+      .subscribe(lastClearedTime => {
         const currentTime = new Date().getTime();
         if (currentTime - lastClearedTime > this.ONE_DAY_MS) {
           this.store.dispatch(UserSettingsActions.reinstateUpcomingEventBanner());

diff --git a/src/app/components/admin-controls/admin-controls.component.html b/src/app/components/admin-controls/admin-controls.component.html
@@ -1,27 +1,23 @@
 <a
   class="admin-control-button edit-button"
   [tooltip]="'Edit ' + itemName"
-  [routerLink]="editPath"
->
+  [routerLink]="editPath">
   <i-feather
     name="edit"
     class="edit-icon"
     [style.height.px]="height - 10"
-    [style.width.px]="height - 10"
-  >
+    [style.width.px]="height - 10">
   </i-feather>
 </a>
 
 <button
   class="admin-control-button delete-button"
   [tooltip]="'Delete ' + itemName"
-  (click)="onDelete($event)"
->
+  (click)="onDelete($event)">
   <i-feather
     name="trash-2"
     class="delete-icon"
     [style.height.px]="height - 10"
-    [style.width.px]="height - 10"
-  >
+    [style.width.px]="height - 10">
   </i-feather>
 </button>
diff --git a/src/app/components/article-form/article-form.component.html b/src/app/components/article-form/article-form.component.html
@@ -5,8 +5,7 @@
         class="banner-image"
         [src]="form.controls['imageUrl'].value"
         default="assets/image-placeholder.png"
-        alt="Article banner image"
-      />
+        alt="Article banner image" />
     } @placeholder {
       <div class="lcc-content-placeholder-wrapper loading-placeholder-image">
         <div class="lcc-content-placeholder"></div>
@@ -25,14 +24,12 @@
           type="file"
           name="imageFile"
           accept="image/*"
-          (change)="onChooseImage($event)"
-        />
+          (change)="onChooseImage($event)" />
         <button
           class="lcc-secondary-button image-revert-button"
           tooltip="Revert to original image"
           [disabled]="!(facade.hasNewImage$ | async)"
-          (click)="onRevert()"
-        >
+          (click)="onRevert()">
           <i-feather class="revert-icon" name="rotate-ccw"> </i-feather>
         </button>
       </div>
@@ -42,8 +39,7 @@
           <i-feather
             name="alert-triangle"
             class="lcc-form-error-icon validation-alert-icon"
-            [tooltip]="getErrorMessage(form.controls['imageFile'])"
-          >
+            [tooltip]="getErrorMessage(form.controls['imageFile'])">
           </i-feather>
         }
       </div>
@@ -54,15 +50,13 @@
         type="text"
         name="title"
         formControlName="title"
-        maxlength="120"
-      />
+        maxlength="120" />
       <div class="lcc-form-error-container">
         @if (hasError(form.controls['title'])) {
           <i-feather
             name="alert-triangle"
             class="lcc-form-error-icon validation-alert-icon"
-            [tooltip]="getErrorMessage(form.controls['title'])"
-          >
+            [tooltip]="getErrorMessage(form.controls['title'])">
           </i-feather>
         }
       </div>
@@ -75,8 +69,7 @@
           <i-feather
             name="alert-triangle"
             class="lcc-form-error-icon validation-alert-icon"
-            [tooltip]="getErrorMessage(form.controls['body'])"
-          >
+            [tooltip]="getErrorMessage(form.controls['body'])">
           </i-feather>
         }
       </div>
@@ -86,8 +79,7 @@
         id="is-sticky-input"
         type="checkbox"
         name="is-sticky"
-        formControlName="isSticky"
-      />
+        formControlName="isSticky" />
     </div>
 
     <aside class="lcc-required-fields-legend">Required fields</aside>
@@ -114,8 +106,7 @@ <h4>Preview</h4>
       <button
         class="lcc-primary-button"
         type="submit"
-        [disabled]="form.invalid || !(facade.hasUnsavedChanges$ | async)"
-      >
+        [disabled]="form.invalid || !(facade.hasUnsavedChanges$ | async)">
         @if (facade.isEditMode$ | async) {
           Update article
         } @else {

diff --git a/src/app/components/article-form/article-form.component.ts b/src/app/components/article-form/article-form.component.ts
@@ -29,13 +29,11 @@ export class ArticleFormComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.facade.articleCurrently$
-      .pipe(filter(isDefined), first())
-      .subscribe((article) => {
-        this.initForm(article);
-        this.initValueChangesListener();
-        this.initArticleImageRehydration();
-      });
+    this.facade.articleCurrently$.pipe(filter(isDefined), first()).subscribe(article => {
+      this.initForm(article);
+      this.initValueChangesListener();
+      this.initArticleImageRehydration();
+    });
   }
 
   hasError(control: AbstractControl): boolean {
@@ -108,7 +106,7 @@ export class ArticleFormComponent implements OnInit {
   }
 
   private initArticleImageRehydration(): void {
-    this.facade.articleImageCurrently$.pipe(untilDestroyed(this)).subscribe((article) => {
+    this.facade.articleImageCurrently$.pipe(untilDestroyed(this)).subscribe(article => {
       this.form.patchValue(
         {
           imageFile: article.imageFile,

diff --git a/src/app/components/article-form/article-form.facade.ts b/src/app/components/article-form/article-form.facade.ts
@@ -30,7 +30,7 @@ export class ArticleFormFacade {
   onSubmit(article: Article): void {
     this.isEditMode$
       .pipe(
-        map((isEditMode) =>
+        map(isEditMode =>
           isEditMode
             ? this.store.dispatch(
                 ArticlesActions.updateArticleSelected({

diff --git a/src/app/components/article-grid/article-grid.component.html b/src/app/components/article-grid/article-grid.component.html
@@ -8,16 +8,14 @@
       class="lcc-admin-controls-container article"
       [routerLink]="
         '/' + NavPathTypes.ARTICLE + '/' + NavPathTypes.VIEW + '/' + article.id
-      "
-    >
+      ">
       @if (facade.isAdmin$ | async) {
         <lcc-admin-controls
           [editPath]="
             '/' + NavPathTypes.ARTICLE + '/' + NavPathTypes.EDIT + '/' + article.id
           "
           [itemName]="article.title"
-          (delete)="facade.onDeleteArticle(article)"
-        >
+          (delete)="facade.onDeleteArticle(article)">
         </lcc-admin-controls>
       }
 
@@ -30,8 +28,7 @@
           class="article-thumbnail-image"
           [src]="article.thumbnailImageUrl"
           default="assets/image-placeholder.png"
-          alt="Article banner image"
-        />
+          alt="Article banner image" />
       } @placeholder {
         <div class="lcc-content-placeholder-wrapper loading-placeholder-image">
           <div class="lcc-content-placeholder"></div>
@@ -41,7 +38,9 @@
       <div class="article-summary-container">
         <h3 class="lcc-truncate-max-2-lines">{{ article.title }}</h3>
         <hr />
-        <p class="lcc-truncate-max-5-lines">{{ article.body | stripMarkdown }}</p>
+        <p class="lcc-truncate-max-5-lines">
+          {{ article.body | stripMarkdown }}
+        </p>
         <div class="article-dates-container">
           <span class="date-created">
             {{ article?.modificationInfo?.dateCreated | formatDate: 'short no-time' }}

diff --git a/src/app/components/article-grid/article-grid.component.ts b/src/app/components/article-grid/article-grid.component.ts
@@ -31,7 +31,7 @@ export class ArticleGridComponent implements OnInit {
   ngOnInit(): void {
     this.facade.fetchArticles();
 
-    this.facade.articles$.pipe(untilDestroyed(this)).subscribe((articles) => {
+    this.facade.articles$.pipe(untilDestroyed(this)).subscribe(articles => {
       this.articles = articles.slice(0, this.maxArticles ?? articles.length);
     });
   }

diff --git a/src/app/components/article/article.component.html b/src/app/components/article/article.component.html
@@ -5,8 +5,7 @@
         <img
           [src]="article.imageUrl"
           default="assets/image-placeholder.png"
-          alt="Article image banner"
-        />
+          alt="Article image banner" />
       } @placeholder {
         <div class="lcc-content-placeholder-wrapper loading-placeholder-image">
           <div class="lcc-content-placeholder"></div>