Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

chore: add Prettier to dev workflow #1511

Merged
ghiscoding merged 2 commits into from
Dec 20, 2024
Merged

chore: add Prettier to dev workflow #1511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2483f66
chore: add Prettier to dev workflow
ghiscoding Dec 20, 2024
5a071c8
chore: run Prettier on html files as well
ghiscoding Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ jobs:
- name: Lint
run: yarn lint

- name: Prettier
run: yarn prettier:check

- name: Run Project Build
run: yarn build

Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.md

**/test/jest-coverage/*.*
15 changes: 15 additions & 0 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"useTabs": false,
"tabWidth": 2,
"printWidth": 130,
"singleQuote": true,
"trailingComma": "es5",
"overrides": [
{
"files": ["**/*.spec.ts"],
"options": {
"printWidth": 160
}
}
]
}
2 changes: 1 addition & 1 deletion .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"andys8.jest-snippets",
"angular.ng-template",
"editorconfig.editorconfig",
"msjsdiag.debugger-for-chrome",
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint"
]
}
8 changes: 6 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"typescript.tsdk": "node_modules\\typescript\\lib"
}
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"eslint.validate": ["javascript", "typescript"],
"typescript.format.semicolons": "insert",
"typescript.tsdk": "node_modules\\typescript\\lib"
}
2 changes: 1 addition & 1 deletion global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
import 'jest-extended';
import 'jest-extended';
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"scripts": {
"start": "ng serve --port 4300",
"prebuild": "npm-run-all delete:dist lint",
"prebuild": "npm-run-all delete:dist lint prettier:check",
"build": "ng-packagr -p ng-package.json -c tsconfig.json",
"postbuild": "npm-run-all copy:i18n",
"copy:i18n": "copyfiles -f src/assets/i18n/*.json dist/i18n",
Expand All @@ -33,6 +33,8 @@
"build:demo": "ng build --configuration=production --base-href=\"\"",
"pack-lib": "npm pack ./dist",
"preview:release": "release-it --only-version --dry-run",
"prettier:check": "prettier --check **/*.{html,js,ts}",
"prettier:write": "prettier --write **/*.{html,js,ts}",
"release": "release-it --only-version",
"serve:demo": "servor ./website index.html 4300"
},
Expand Down Expand Up @@ -116,6 +118,7 @@
"ng-packagr": "^18.2.1",
"ngx-bootstrap": "^18.1.3",
"npm-run-all2": "^7.0.1",
"prettier": "^3.4.2",
"release-it": "^17.10.0",
"rimraf": "^5.0.10",
"rxjs": "^7.8.1",
Expand Down
4 changes: 2 additions & 2 deletions src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ const routes: Routes = [
{ path: 'tree-data-hierarchical', component: GridTreeDataHierarchicalComponent },
{ path: 'swt', component: SwtCommonGridTestComponent },
{ path: '', redirectTo: '/trading', pathMatch: 'full' },
{ path: '**', redirectTo: '/trading', pathMatch: 'full' }
{ path: '**', redirectTo: '/trading', pathMatch: 'full' },
];

@NgModule({
imports: [RouterModule.forRoot(routes, { useHash: true }), TranslateModule],
exports: [RouterModule, TranslateModule],
})
export class AppRoutingRoutingModule { }
export class AppRoutingRoutingModule {}
96 changes: 33 additions & 63 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,31 @@
<i class="mdi mdi-github"></i>
<span>Angular-SlickGrid</span>
</a>
<img src="assets/angular-logo.png" class="logo" height="35" alt="image">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-target="#navbarContent"
aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
<img src="assets/angular-logo.png" class="logo" height="35" alt="image" />
<button
class="navbar-toggler"
type="button"
data-bs-toggle="collapse"
data-target="#navbarContent"
aria-controls="navbarContent"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-icon"></span>
</button>
<div class="github-button-container">
<a href="https://github.com/ghiscoding/angular-slickgrid">
<img src="https://img.shields.io/github/stars/ghiscoding/angular-slickgrid?style=social" alt="github stars">
<img src="https://img.shields.io/github/stars/ghiscoding/angular-slickgrid?style=social" alt="github stars" />
</a>
</div>

<div class="navbar-collapse collapse justify-content-end me-2" id="navbarContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" [routerLink]="['/home']">
Home
</a>
<a class="nav-link" [routerLink]="['/home']"> Home </a>
</li>
<li class="nav-item">
<a class="nav-link" href="https://ghiscoding.gitbook.io/angular-slickgrid/" target="_blank">
Documentation
</a>
<a class="nav-link" href="https://ghiscoding.gitbook.io/angular-slickgrid/" target="_blank"> Documentation </a>
</li>
</ul>
</div>
Expand All @@ -35,9 +38,7 @@
<section id="panel-left" class="panel-wm-left">
<ul class="well nav nav-pills nav-stacked">
<li class="nav-item fw-bold nav-docs">
<a class="nav-link" href="https://ghiscoding.gitbook.io/angular-slickgrid/" target="_blank">
📘 Documentation
</a>
<a class="nav-link" href="https://ghiscoding.gitbook.io/angular-slickgrid/" target="_blank"> 📘 Documentation </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/basic']">1- Basic Grid / 2 Grids</a>
Expand All @@ -55,8 +56,7 @@
<a class="nav-link" routerLinkActive="active" [routerLink]="['/odata']">5- Backend Server with OData</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/gridgraphql']">6- Backend Server with
GraphQL</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/gridgraphql']">6- Backend Server with GraphQL</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/headerbutton']">7- Header Button Plugin</a>
Expand All @@ -71,8 +71,7 @@
<a class="nav-link" routerLinkActive="active" [routerLink]="['/selection']">10- Row Selection / 2 Grids</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/additem']">11- Add/Update/Highlight Datagrid
Item</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/additem']">11- Add/Update/Highlight Datagrid Item</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/localization']">12- Localization (i18n)</a>
Expand All @@ -87,8 +86,7 @@
<a class="nav-link" routerLinkActive="active" [routerLink]="['/colspan']">15- Column Span</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/gridstate']">16- Grid State &amp; Local
Storage</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/gridstate']">16- Grid State &amp; Local Storage</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/rowmove']">17- Row Move</a>
Expand All @@ -106,12 +104,10 @@
<a class="nav-link" routerLinkActive="active" [routerLink]="['/rowdetail']">21- Row Detail View</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/angular-components']">22- Use of Angular
Components</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/angular-components']">22- Use of Angular Components</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/autoheight']">23- Grid AutoHeight (full
height)</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/autoheight']">23- Grid AutoHeight (full height)</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/gridtabs']">24- within Bootstrap Tabs</a>
Expand All @@ -123,9 +119,7 @@
<a class="nav-link" routerLinkActive="active" [routerLink]="['/context']">26- Cell & Context Menu</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/graphql-nopage']">
27- GraphQL without Pagination
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/graphql-nopage']"> 27- GraphQL without Pagination </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/tree-data-parent-child']">
Expand All @@ -138,74 +132,50 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/composite-editor']">
30- Composite Editor Modal
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/composite-editor']"> 30- Composite Editor Modal </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/resize-by-content']">
31- Resize by Cell Content
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/resize-by-content']"> 31- Resize by Cell Content </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/custom-tooltip']">
32- Regular & Custom Tooltip
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/custom-tooltip']"> 32- Regular & Custom Tooltip </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/trading']">
33- Real-Time Trading Platform
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/trading']"> 33- Real-Time Trading Platform </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/header-footer']">
34- Custom header &amp; footer templates
</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/base-row-editing']">
35- Row Based Editing
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/base-row-editing']"> 35- Row Based Editing </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/excel-formula']">
36- Excel Export Formulas
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/excel-formula']"> 36- Excel Export Formulas </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/footer-totals']">
37- Footer Totals Row
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/footer-totals']"> 37- Footer Totals Row </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/infinite-odata']">
38- Infinite Scroll with OData
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/infinite-odata']"> 38- Infinite Scroll with OData </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/infinite-graphql']">
39- Infinite Scroll with GraphQL
</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/infinite-json']">
40- Infinite Scroll from JSON data
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/infinite-json']"> 40- Infinite Scroll from JSON data </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/drag-recycle']">
41- Drag & Drop
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/drag-recycle']"> 41- Drag & Drop </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/custom-pagination']">
42- Custom Pagination
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/custom-pagination']"> 42- Custom Pagination </a>
</li>
<li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/csv-grid']">
43- Create Grid from CSV
</a>
<a class="nav-link" routerLinkActive="active" [routerLink]="['/csv-grid']"> 43- Create Grid from CSV </a>
</li>
</ul>
</section>
Expand All @@ -216,4 +186,4 @@
</div>
</section>
</div>
</div>
</div>
6 changes: 2 additions & 4 deletions src/app/app.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [
AppComponent
],
declarations: [AppComponent],
providers: [],
imports: [RouterTestingModule],
teardown: { destroyAfterEach: false }
teardown: { destroyAfterEach: false },
}).compileComponents();
});

Expand Down
8 changes: 4 additions & 4 deletions src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ import { debounceTime, filter } from 'rxjs';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
styleUrls: ['./app.component.scss'],
})
export class AppComponent implements OnInit {
constructor(private router: Router) { }
constructor(private router: Router) {}

ngOnInit() {
// scroll to active link route
this.router.events
.pipe(filter(event => event instanceof NavigationEnd))
.pipe(filter((event) => event instanceof NavigationEnd))
.pipe(debounceTime(0))
.subscribe(() => {
const linkElm = document.querySelector('.nav-link.active');
if (linkElm) {
linkElm.scrollIntoView({ block: 'nearest' });
}
})
});
}
}
Loading
Loading