Skip to content

Commit

Permalink
Merge pull request #55 from AmpersandTarski/fix/lint-all-files
Browse files Browse the repository at this point in the history
Fix/lint-all-files
  • Loading branch information
LiWeiYeh committed Nov 24, 2022
2 parents 13e18d9 + c577fef commit d348ebb
Show file tree
Hide file tree
Showing 59 changed files with 1,393 additions and 1,209 deletions.
9 changes: 5 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": true
},
},
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": true
},
},
"editor.formatOnSave": true,
"files.insertFinalNewline": true
}
"files.insertFinalNewline": true,
"eslint.format.enable": true
}
6 changes: 2 additions & 4 deletions src/app/admin/installer/installer.component.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';

@Component({
selector: 'app-installer',
templateUrl: './installer.component.html',
styleUrls: ['./installer.component.scss'],
})
export class InstallerComponent implements OnInit {
export class InstallerComponent {
constructor(private http: HttpClient) {}

ngOnInit(): void {}

reinstall(): void {
this.http.get('admin/installer').subscribe();
}
Expand Down
72 changes: 36 additions & 36 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
<router-outlet></router-outlet>

<!--
<app-atomic-alphanumeric></app-atomic-alphanumeric>
<app-atomic-bigalphanumeric></app-atomic-bigalphanumeric>
<app-atomic-boolean></app-atomic-boolean>
<app-atomic-float></app-atomic-float>
<app-atomic-hugealphanumeric></app-atomic-hugealphanumeric>
<app-atomic-integer></app-atomic-integer>
<app-atomic-date></app-atomic-date>
<app-atomic-datetime></app-atomic-datetime>
<app-atomic-password></app-atomic-password>
<app-atomic-object></app-atomic-object>
<app-box-table [data]="testData"></app-box-table>
<app-box-table [data]="testData">
<ng-template boxTableHeader>
<th>First name</th>
<th>Last name</th>
</ng-template>
</app-box-table>
<app-box-table [data]="testData">
<ng-template boxTableHeader>
<th>First name</th>
<th>Last name</th>
<th>Additional header</th>
</ng-template>
<ng-template boxTableRow let-row>
<td>{{ capitalizeFirstLetter(row.firstName) }}</td>
<td>{{ capitalizeFirstLetter(row.lastName) }}</td>
<td><button>Hi</button></td>
</ng-template>
</app-box-table>
-->
<router-outlet></router-outlet>

<!--
<app-atomic-alphanumeric></app-atomic-alphanumeric>
<app-atomic-bigalphanumeric></app-atomic-bigalphanumeric>
<app-atomic-boolean></app-atomic-boolean>
<app-atomic-float></app-atomic-float>
<app-atomic-hugealphanumeric></app-atomic-hugealphanumeric>
<app-atomic-integer></app-atomic-integer>
<app-atomic-date></app-atomic-date>
<app-atomic-datetime></app-atomic-datetime>
<app-atomic-password></app-atomic-password>
<app-atomic-object></app-atomic-object>
<app-box-table [data]="testData"></app-box-table>
<app-box-table [data]="testData">
<ng-template boxTableHeader>
<th>First name</th>
<th>Last name</th>
</ng-template>
</app-box-table>
<app-box-table [data]="testData">
<ng-template boxTableHeader>
<th>First name</th>
<th>Last name</th>
<th>Additional header</th>
</ng-template>
<ng-template boxTableRow let-row>
<td>{{ capitalizeFirstLetter(row.firstName) }}</td>
<td>{{ capitalizeFirstLetter(row.lastName) }}</td>
<td><button>Hi</button></td>
</ng-template>
</app-box-table>
-->
5 changes: 1 addition & 4 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ import { LayoutService } from './layout/service/app.layout.service';
export class AppComponent implements OnInit {
title = 'prototype-frontend';

constructor(
private primengConfig: PrimeNGConfig,
private layoutService: LayoutService
) { }
constructor(private primengConfig: PrimeNGConfig, private layoutService: LayoutService) {}

ngOnInit(): void {
this.primengConfig.ripple = true; //enables core ripple functionality
Expand Down
6 changes: 3 additions & 3 deletions src/app/layout/api/menuchangeevent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export interface MenuChangeEvent {
key: string;
routeEvent?: boolean;
}
key: string;
routeEvent?: boolean;
}
15 changes: 10 additions & 5 deletions src/app/layout/app.footer.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<div class="layout-footer">
<img src="assets/layout/images/{{layoutService.config.colorScheme === 'light' ? 'logo-dark' : 'logo-white'}}.svg" alt="Logo" height="20" class="mr-2"/>
by
<span class="font-medium ml-2">PrimeNG</span>
</div>
<div class="layout-footer">
<img
src="assets/layout/images/{{ layoutService.config.colorScheme === 'light' ? 'logo-dark' : 'logo-white' }}.svg"
alt="Logo"
height="20"
class="mr-2"
/>
by
<span class="font-medium ml-2">PrimeNG</span>
</div>
8 changes: 4 additions & 4 deletions src/app/layout/app.footer.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Component } from '@angular/core';
import { LayoutService } from "./service/app.layout.service";
import { LayoutService } from './service/app.layout.service';

@Component({
selector: 'app-footer',
templateUrl: './app.footer.component.html'
selector: 'app-footer',
templateUrl: './app.footer.component.html',
})
export class AppFooterComponent {
constructor(public layoutService: LayoutService) { }
constructor(public layoutService: LayoutService) {}
}
28 changes: 14 additions & 14 deletions src/app/layout/app.layout.component.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div class="layout-wrapper" [ngClass]="containerClass">
<app-topbar></app-topbar>
<div class="layout-sidebar">
<app-sidebar></app-sidebar>
</div>
<div class="layout-main-container">
<div class="layout-main">
<router-outlet></router-outlet>
</div>
<app-footer></app-footer>
</div>
<app-config></app-config>
<div class="layout-mask"></div>
</div>
<div class="layout-wrapper" [ngClass]="containerClass">
<app-topbar></app-topbar>
<div class="layout-sidebar">
<app-sidebar></app-sidebar>
</div>
<div class="layout-main-container">
<div class="layout-main">
<router-outlet></router-outlet>
</div>
<app-footer></app-footer>
</div>
<app-config></app-config>
<div class="layout-mask"></div>
</div>
Loading

0 comments on commit d348ebb

Please sign in to comment.