chore(style): run prettier on web src files

belsakn · Dec 31, 2020 · 5634bff · 5634bff
1 parent 4a690fb
commit 5634bff
Show file tree

Hide file tree

Showing 79 changed files with 1,112 additions and 350 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "printWidth": 120,
+  "printWidth": 100,
   "singleQuote": true,
   "useTabs": false,
   "tabWidth": 2,

diff --git a/web/abstruse/package.json b/web/abstruse/package.json
@@ -51,6 +51,7 @@
     "ngx-monaco-editor": "9.0.0",
     "ngx-uploader": "^11.0.0",
     "parse-duration": "^0.4.4",
+    "prettier": "^2.2.1",
     "protractor": "~7.0.0",
     "purgecss-webpack-plugin": "^3.1.3",
     "ts-node": "~8.3.0",

diff --git a/web/abstruse/src/app/app.component.html b/web/abstruse/src/app/app.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="(loggedIn | async); else loggedOut">
+<div *ngIf="loggedIn | async; else loggedOut">
   <app-header></app-header>
   <main class="main">
     <router-outlet></router-outlet>

diff --git a/web/abstruse/src/app/auth/login/login.component.html b/web/abstruse/src/app/auth/login/login.component.html
@@ -15,17 +15,32 @@
               <div class="field">
                 <label class="label">Email</label>
                 <input class="input" type="text" formControlName="email" />
-                <span class="form-helper"
-                  [hidden]="loginForm.controls.email.valid || (loginForm.controls.email.pristine && !submitted)">
+                <span
+                  class="form-helper"
+                  [hidden]="
+                    loginForm.controls.email.valid ||
+                    (loginForm.controls.email.pristine && !submitted)
+                  "
+                >
                   <i class="fas fa-exclamation-circle"></i>
                   <span>Email is required.</span>
                 </span>
               </div>
               <div class="field">
                 <label class="label">Password</label>
-                <input class="input" type="password" formControlName="password" autocomplete="off" />
-                <span class="form-helper"
-                  [hidden]="loginForm.controls.password.valid || (loginForm.controls.password.pristine && !submitted)">
+                <input
+                  class="input"
+                  type="password"
+                  formControlName="password"
+                  autocomplete="off"
+                />
+                <span
+                  class="form-helper"
+                  [hidden]="
+                    loginForm.controls.password.valid ||
+                    (loginForm.controls.password.pristine && !submitted)
+                  "
+                >
                   <i class="fas fa-exclamation-circle"></i>
                   <span>Password is required.</span>
                 </span>

diff --git a/web/abstruse/src/app/builds/build/build.component.html b/web/abstruse/src/app/builds/build/build.component.html
@@ -1,26 +1,48 @@
 <header class="subheader">
   <nav class="subheader-links">
-    <a [routerLink]="['/builds', build?.id]" [queryParams]="{ tab: 'jobs' }"
-      [class.is-active]="isLinkActive('/builds/' + build?.id + '?tab=jobs')">Jobs</a>
-    <a [routerLink]="['/builds', build?.id]" [queryParams]="{ tab: 'config' }"
-      [class.is-active]="isLinkActive('/builds/' + build?.id + '?tab=config')">Config</a>
+    <a
+      [routerLink]="['/builds', build?.id]"
+      [queryParams]="{ tab: 'jobs' }"
+      [class.is-active]="isLinkActive('/builds/' + build?.id + '?tab=jobs')"
+      >Jobs</a
+    >
+    <a
+      [routerLink]="['/builds', build?.id]"
+      [queryParams]="{ tab: 'config' }"
+      [class.is-active]="isLinkActive('/builds/' + build?.id + '?tab=config')"
+      >Config</a
+    >
   </nav>
   <div class="container">
     <div class="subheader-container">
       <div class="subheader-left">
         <h1>Build</h1>
-        <h2 class="is-link" [routerLink]="['/repos', build?.repository?.id]">{{ build?.repository?.fullName }}</h2>
+        <h2 class="is-link" [routerLink]="['/repos', build?.repository?.id]">
+          {{ build?.repository?.fullName }}
+        </h2>
         <h2>Build #{{ build?.id }}</h2>
         <h2>{{ title }}</h2>
       </div>
       <div class="subheader-right">
-        <button type="button" class="button" (click)="restartBuild()"
-          [disabled]="build?.processing || !build?.repository?.perms?.exec">
+        <button
+          type="button"
+          class="button"
+          (click)="restartBuild()"
+          [disabled]="build?.processing || !build?.repository?.perms?.exec"
+        >
           <i class="fas fa-sync-alt"></i>
           <span>Restart</span>
         </button>
-        <button type="button" class="button" (click)="stopBuild()"
-          [disabled]="(build?.status !== 'running' && build?.status !== 'queued') || build?.processing || !build?.repository?.perms?.exec">
+        <button
+          type="button"
+          class="button"
+          (click)="stopBuild()"
+          [disabled]="
+            (build?.status !== 'running' && build?.status !== 'queued') ||
+            build?.processing ||
+            !build?.repository?.perms?.exec
+          "
+        >
           <i class="fas fa-hand-paper"></i>
           <span>Stop</span>
         </button>
@@ -47,12 +69,15 @@ <h2>{{ title }}</h2>
         <div class="columns">
           <div class="column is-2">
             <div class="build-info-content">
-              <span class="tag is-medium" [ngClass]="{
-                        'is-gray': build?.status === 'queued',
-                        'is-green': build?.status === 'passing',
-                        'is-red': build?.status === 'failing',
-                        'is-yellow': build?.status === 'running'
-                      }">
+              <span
+                class="tag is-medium"
+                [ngClass]="{
+                  'is-gray': build?.status === 'queued',
+                  'is-green': build?.status === 'passing',
+                  'is-red': build?.status === 'failing',
+                  'is-yellow': build?.status === 'running'
+                }"
+              >
                 <i class="fas fa-check-circle" *ngIf="build?.status === 'passing'"></i>
                 <i class="fas fa-times-circle" *ngIf="build?.status === 'failing'"></i>
                 <i class="far fa-clock" *ngIf="build?.status === 'queued'"></i>
@@ -65,21 +90,32 @@ <h2>{{ title }}</h2>
           </div>
           <div class="column is-4">
             <div class="build-info-content">
-              <img [src]="build?.committerAvatar" class="committer-avatar"
-                *ngIf="build?.pr === 0 || build?.committerLogin === build?.authorLogin" />
-              <div class="avatars-container" *ngIf="build?.pr !== 0 && build?.committerLogin !== build?.authorLogin">
-                <img [src]="build?.committerAvatar" class="committer-avatar">
-                <img [src]="build?.authorAvatar" class="author-avatar">
+              <img
+                [src]="build?.committerAvatar"
+                class="committer-avatar"
+                *ngIf="build?.pr === 0 || build?.committerLogin === build?.authorLogin"
+              />
+              <div
+                class="avatars-container"
+                *ngIf="build?.pr !== 0 && build?.committerLogin !== build?.authorLogin"
+              >
+                <img [src]="build?.committerAvatar" class="committer-avatar" />
+                <img [src]="build?.authorAvatar" class="author-avatar" />
               </div>
-              <span class="desc-text" *ngIf="build?.pr === 0">{{ build?.committerName || build?.committerLogin }}
-                authored and
-                commited</span>
-              <span class="desc-text" *ngIf="build?.pr !== 0 && build?.committerLogin === build?.authorLogin">{{
-                build?.committerName || build?.committerLogin }}
-                authored and commited</span>
-              <span class="desc-text" *ngIf="build?.pr !== 0 && build?.committerLogin !== build?.authorLogin">{{
-                build?.authorName || build?.authorLogin }}
-                authored with {{ build?.committerName || build?.committerLogin }}</span>
+              <span class="desc-text" *ngIf="build?.pr === 0"
+                >{{ build?.committerName || build?.committerLogin }} authored and commited</span
+              >
+              <span
+                class="desc-text"
+                *ngIf="build?.pr !== 0 && build?.committerLogin === build?.authorLogin"
+                >{{ build?.committerName || build?.committerLogin }} authored and commited</span
+              >
+              <span
+                class="desc-text"
+                *ngIf="build?.pr !== 0 && build?.committerLogin !== build?.authorLogin"
+                >{{ build?.authorName || build?.authorLogin }} authored with
+                {{ build?.committerName || build?.committerLogin }}</span
+              >
             </div>
           </div>
           <div class="column is-1">
@@ -117,13 +153,21 @@ <h2>{{ title }}</h2>
         </div>
       </div>
       <div class="list-items">
-        <app-job-list-item [build]="build" [job]="job" *ngFor="let job of build.jobs"></app-job-list-item>
+        <app-job-list-item
+          [build]="build"
+          [job]="job"
+          *ngFor="let job of build.jobs"
+        ></app-job-list-item>
       </div>
     </div>
 
     <div class="column is-12" *ngIf="!loading && build && tab === 'config'">
       <div class="config-container">
-        <ngx-monaco-editor style="height: 100%" [options]="editorOptions" [(ngModel)]="build.config">
+        <ngx-monaco-editor
+          style="height: 100%"
+          [options]="editorOptions"
+          [(ngModel)]="build.config"
+        >
         </ngx-monaco-editor>
       </div>
     </div>

diff --git a/web/abstruse/src/app/builds/build/build.component.ts b/web/abstruse/src/app/builds/build/build.component.ts
@@ -62,7 +62,10 @@ export class BuildComponent implements OnInit, OnDestroy {
         finalize(() => (this.loading = false)),
         untilDestroyed(this)
       )
-      .subscribe(resp => (this.build = resp), err => this.error = err.message);
+      .subscribe(
+        resp => (this.build = resp),
+        err => (this.error = err.message)
+      );
   }
 
   restartBuild(): void {
@@ -73,7 +76,10 @@ export class BuildComponent implements OnInit, OnDestroy {
         finalize(() => (this.processing = false)),
         untilDestroyed(this)
       )
-      .subscribe(() => {}, err => this.error = err.message);
+      .subscribe(
+        () => {},
+        err => (this.error = err.message)
+      );
   }
 
   stopBuild(): void {
@@ -84,7 +90,10 @@ export class BuildComponent implements OnInit, OnDestroy {
         finalize(() => (this.processing = false)),
         untilDestroyed(this)
       )
-      .subscribe(() => {}, err => this.error = err.message);
+      .subscribe(
+        () => {},
+        err => (this.error = err.message)
+      );
   }
 
   isLinkActive(url: string): boolean {

diff --git a/web/abstruse/src/app/builds/common/build-list-item/build-list-item.component.html b/web/abstruse/src/app/builds/common/build-list-item/build-list-item.component.html
@@ -1,13 +1,20 @@
-<div class="list-item-condensed" [routerLink]="['/builds', build?.id]" [queryParams]="{ tab: 'jobs' }">
+<div
+  class="list-item-condensed"
+  [routerLink]="['/builds', build?.id]"
+  [queryParams]="{ tab: 'jobs' }"
+>
   <div class="columns">
     <div class="column is-1 data-column">
       <div class="data-text has-text-left align-center no-padding">
-        <span class="status-line" [ngClass]="{
+        <span
+          class="status-line"
+          [ngClass]="{
             'is-queued': build?.status === 'queued',
             'is-passing': build?.status === 'passing',
             'is-failing': build?.status === 'failing',
             'is-running': build?.status === 'running'
-          }"></span>
+          }"
+        ></span>
         <span *ngIf="!build?.pr">#{{ build?.id }}</span>
         <span *ngIf="build?.pr">PR #{{ build?.pr }}</span>
       </div>
@@ -16,7 +23,7 @@
       <div class="info-text has-text-left align-center" *ngIf="style === 'history'">
         <a class="data-text" appStopPropagation [routerLink]="['/repos', build?.repository?.id]">{{
           build?.repository?.fullName
-          }}</a>
+        }}</a>
       </div>
       <div class="info-text has-text-left align-center" *ngIf="style === 'repo'">
         <span class="data-text is-small" *ngIf="!build?.pr">{{ build?.commitMessage }}</span>
@@ -25,12 +32,19 @@
     </div>
     <div class="column is-2 data-column">
       <div class="align-center justify-start mlr10">
-        <img [src]="build?.committerAvatar" class="committer-avatar" appTooltip
+        <img
+          [src]="build?.committerAvatar"
+          class="committer-avatar"
+          appTooltip
           [text]="build?.committerName || build?.committerLogin || null"
-          *ngIf="build?.pr === 0 || build?.committerLogin === build?.authorLogin" />
-        <div class="avatars-container" *ngIf="build?.pr !== 0 && build?.committerLogin !== build?.authorLogin">
-          <img [src]="build?.committerAvatar" class="committer-avatar">
-          <img [src]="build?.authorAvatar" class="author-avatar">
+          *ngIf="build?.pr === 0 || build?.committerLogin === build?.authorLogin"
+        />
+        <div
+          class="avatars-container"
+          *ngIf="build?.pr !== 0 && build?.committerLogin !== build?.authorLogin"
+        >
+          <img [src]="build?.committerAvatar" class="committer-avatar" />
+          <img [src]="build?.authorAvatar" class="author-avatar" />
         </div>
       </div>
       <div class="data-column direction-column">
@@ -46,17 +60,21 @@
     </div>
     <div class="column is-2 data-column">
       <div class="info-text justify-center align-center">
-        <span class="data-text" appTooltip [text]="build?.createdAt! | date:'medium'">{{ build?.createdAtWords! | async
-          }}</span>
+        <span class="data-text" appTooltip [text]="build?.createdAt! | date: 'medium'">{{
+          build?.createdAtWords! | async
+        }}</span>
       </div>
     </div>
     <div class="column is-1 data-column justify-center">
-      <span class="tag" [ngClass]="{
-                'is-gray': build?.status === 'queued',
-                'is-green': build?.status === 'passing',
-                'is-red': build?.status === 'failing',
-                'is-yellow': build?.status === 'running'
-              }">
+      <span
+        class="tag"
+        [ngClass]="{
+          'is-gray': build?.status === 'queued',
+          'is-green': build?.status === 'passing',
+          'is-red': build?.status === 'failing',
+          'is-yellow': build?.status === 'running'
+        }"
+      >
         <i class="fas fa-check-circle" *ngIf="build?.status === 'passing'"></i>
         <i class="fas fa-times-circle" *ngIf="build?.status === 'failing'"></i>
         <i class="far fa-clock" *ngIf="build?.status === 'queued'"></i>
@@ -72,13 +90,25 @@
       </div>
     </div>
     <div class="column is-2 data-column justify-center" appStopPropagation>
-      <button type="button" class="button is-small" (click)="restartBuild()"
-        [disabled]="build?.processing || !build?.repository?.perms?.exec">
+      <button
+        type="button"
+        class="button is-small"
+        (click)="restartBuild()"
+        [disabled]="build?.processing || !build?.repository?.perms?.exec"
+      >
         <i class="fas fa-sync-alt"></i>
         <span>Restart</span>
       </button>
-      <button type="button" class="button is-small" (click)="stopBuild()"
-        [disabled]="(build?.status !== 'running' && build?.status !== 'queued') || build?.processing || !build?.repository?.perms?.exec">
+      <button
+        type="button"
+        class="button is-small"
+        (click)="stopBuild()"
+        [disabled]="
+          (build?.status !== 'running' && build?.status !== 'queued') ||
+          build?.processing ||
+          !build?.repository?.perms?.exec
+        "
+      >
         <i class="fas fa-hand-paper"></i>
         <span>Stop</span>
       </button>

diff --git a/web/abstruse/src/app/builds/index/index.component.html b/web/abstruse/src/app/builds/index/index.component.html
@@ -6,7 +6,11 @@
     <a [routerLink]="['/builds']" [queryParams]="{ type: 'commits' }" routerLinkActive="is-active">
       Commits
     </a>
-    <a [routerLink]="['/builds']" [queryParams]="{ type: 'pull-requests' }" routerLinkActive="is-active">
+    <a
+      [routerLink]="['/builds']"
+      [queryParams]="{ type: 'pull-requests' }"
+      routerLinkActive="is-active"
+    >
       Pull Requests
     </a>
   </nav>