Skip to content

Commit b9e12ce

Browse files
committed
Fix npm install issues and update dependencies for Angular 18 compatibility
1 parent 2038920 commit b9e12ce

File tree

10 files changed

+18965
-44018
lines changed

10 files changed

+18965
-44018
lines changed

package-lock.json

Lines changed: 18796 additions & 43972 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,43 @@
1717
},
1818
"private": true,
1919
"dependencies": {
20-
"@angular/animations": "^15.2.10",
21-
"@angular/cdk": "^15.2.9",
22-
"@angular/common": "^15.2.10",
23-
"@angular/compiler": "^15.2.10",
24-
"@angular/core": "^15.2.10",
25-
"@angular/forms": "^15.2.10",
26-
"@angular/platform-browser": "^15.2.10",
27-
"@angular/platform-browser-dynamic": "^15.2.10",
28-
"@angular/router": "^15.2.10",
29-
"@ant-design/icons-angular": "^15.0.0",
20+
"@angular/animations": "^18.2.12",
21+
"@angular/cdk": "^18.2.13",
22+
"@angular/common": "^18.2.12",
23+
"@angular/compiler": "^18.2.12",
24+
"@angular/core": "^18.2.12",
25+
"@angular/forms": "^18.2.12",
26+
"@angular/platform-browser": "^18.2.12",
27+
"@angular/platform-browser-dynamic": "^18.2.12",
28+
"@angular/router": "^18.2.12",
29+
"@ant-design/icons-angular": "^18.0.0",
30+
"@ctrl/tinycolor": "^4.2.0",
3031
"@datorama/akita": "^7.1.1",
3132
"@datorama/akita-ng-entity-service": "^7.0.0",
32-
"@ngneat/content-loader": "^6.0.0",
33+
"@ngneat/content-loader": "^7.0.0",
3334
"@ngneat/tailwind": "^7.0.3",
3435
"@ngneat/until-destroy": "^8.0.3",
3536
"@sentry/angular": "^9.30.0",
3637
"@sentry/tracing": "^6.18.1",
3738
"date-fns": "^2.14.0",
3839
"karma-coverage": "^2.0.3",
39-
"ng-zorro-antd": "^15.0.0",
40-
"ngx-quill": "^16.1.2",
40+
"ng-zorro-antd": "^18.2.1",
41+
"ngx-quill": "^24.0.0",
4142
"quill": "^1.3.7",
42-
"rxjs": "~6.6.3",
43-
"tslib": "^2.0.0",
44-
"zone.js": "~0.11.4"
43+
"rxjs": "~7.8.2",
44+
"tslib": "^2.8.1",
45+
"zone.js": "~0.14.10"
4546
},
4647
"devDependencies": {
47-
"@angular-builders/custom-webpack": "^15.0.0",
48-
"@angular-devkit/build-angular": "^15.2.11",
49-
"@angular-eslint/builder": "15.2.1",
50-
"@angular-eslint/eslint-plugin": "15.2.1",
51-
"@angular-eslint/eslint-plugin-template": "15.2.1",
52-
"@angular-eslint/schematics": "15.2.1",
53-
"@angular-eslint/template-parser": "15.2.1",
54-
"@angular/cli": "^15.2.11",
55-
"@angular/compiler-cli": "^15.2.10",
48+
"@angular-builders/custom-webpack": "^18.0.0",
49+
"@angular-devkit/build-angular": "^18.2.12",
50+
"@angular-eslint/builder": "18.3.0",
51+
"@angular-eslint/eslint-plugin": "18.3.0",
52+
"@angular-eslint/eslint-plugin-template": "18.3.0",
53+
"@angular-eslint/schematics": "18.3.0",
54+
"@angular-eslint/template-parser": "18.3.0",
55+
"@angular/cli": "^18.2.12",
56+
"@angular/compiler-cli": "^18.2.12",
5657
"@babel/core": "^7.12.10",
5758
"@compodoc/compodoc": "^1.1.11",
5859
"@datorama/akita-ng-router-store": "^7.0.0",
@@ -65,8 +66,9 @@
6566
"@types/jasmine": "~3.6.0",
6667
"@types/jasminewd2": "~2.0.3",
6768
"@types/node": "^14.14.14",
68-
"@typescript-eslint/eslint-plugin": "5.11.0",
69-
"@typescript-eslint/parser": "5.11.0",
69+
"@typescript-eslint/eslint-plugin": "^7.18.0",
70+
"@typescript-eslint/parser": "^7.18.0",
71+
"autoprefixer": "^10.4.21",
7072
"babel-loader": "^8.2.2",
7173
"codelyzer": "^6.0.0",
7274
"eslint": "^8.2.0",
@@ -88,7 +90,7 @@
8890
"tailwindcss": "^3.0.12",
8991
"ts-node": "~9.1.1",
9092
"tslint": "~6.1.0",
91-
"typescript": "~4.8.4"
93+
"typescript": "~5.5.4"
9294
},
9395
"husky": {
9496
"hooks": {

package.json.backup

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
{
2+
"name": "jira-clone-angular-frontend",
3+
"version": "1.0.0",
4+
"scripts": {
5+
"ng": "ng",
6+
"start": "ng serve",
7+
"build": "ng build",
8+
"test": "ng test",
9+
"test-cover": "ng test --code-coverage --source-map=false",
10+
"lint": "ng lint",
11+
"lint:fix": "ng lint --fix=true",
12+
"e2e": "ng e2e",
13+
"docs:json": "compodoc -p ./tsconfig.json -e json -d .",
14+
"docs:html": "npx compodoc -p tsconfig.json src && npx serve documentation",
15+
"storybook": "npm run docs:json && start-storybook -p 6006",
16+
"build-storybook": "STORYBOOK_GA_ID=UA-80363801-4 STORYBOOK_REACT_GA_OPTIONS={} npm run docs:json && build-storybook"
17+
},
18+
"private": true,
19+
"dependencies": {
20+
"@angular/animations": "^15.2.10",
21+
"@angular/cdk": "^15.2.9",
22+
"@angular/common": "^15.2.10",
23+
"@angular/compiler": "^15.2.10",
24+
"@angular/core": "^15.2.10",
25+
"@angular/forms": "^15.2.10",
26+
"@angular/platform-browser": "^15.2.10",
27+
"@angular/platform-browser-dynamic": "^15.2.10",
28+
"@angular/router": "^15.2.10",
29+
"@ant-design/icons-angular": "^15.0.0",
30+
"@datorama/akita": "^7.1.1",
31+
"@datorama/akita-ng-entity-service": "^7.0.0",
32+
"@ngneat/content-loader": "^6.0.0",
33+
"@ngneat/tailwind": "^7.0.3",
34+
"@ngneat/until-destroy": "^8.0.3",
35+
"@sentry/angular": "^9.30.0",
36+
"@sentry/tracing": "^6.18.1",
37+
"date-fns": "^2.14.0",
38+
"karma-coverage": "^2.0.3",
39+
"ng-zorro-antd": "^15.0.0",
40+
"ngx-quill": "^16.1.2",
41+
"quill": "^1.3.7",
42+
"rxjs": "~6.6.3",
43+
"tslib": "^2.0.0",
44+
"zone.js": "~0.11.4"
45+
},
46+
"devDependencies": {
47+
"@angular-builders/custom-webpack": "^15.0.0",
48+
"@angular-devkit/build-angular": "^15.2.11",
49+
"@angular-eslint/builder": "15.2.1",
50+
"@angular-eslint/eslint-plugin": "15.2.1",
51+
"@angular-eslint/eslint-plugin-template": "15.2.1",
52+
"@angular-eslint/schematics": "15.2.1",
53+
"@angular-eslint/template-parser": "15.2.1",
54+
"@angular/cli": "^15.2.11",
55+
"@angular/compiler-cli": "^15.2.10",
56+
"@babel/core": "^7.12.10",
57+
"@compodoc/compodoc": "^1.1.11",
58+
"@datorama/akita-ng-router-store": "^7.0.0",
59+
"@datorama/akita-ngdevtools": "^7.0.0",
60+
"@storybook/addon-actions": "^6.1.11",
61+
"@storybook/addon-essentials": "^6.1.11",
62+
"@storybook/addon-google-analytics": "^6.1.11",
63+
"@storybook/addon-links": "^6.1.11",
64+
"@storybook/angular": "^6.1.11",
65+
"@types/jasmine": "~3.6.0",
66+
"@types/jasminewd2": "~2.0.3",
67+
"@types/node": "^14.14.14",
68+
"@typescript-eslint/eslint-plugin": "5.11.0",
69+
"@typescript-eslint/parser": "5.11.0",
70+
"babel-loader": "^8.2.2",
71+
"codelyzer": "^6.0.0",
72+
"eslint": "^8.2.0",
73+
"husky": "^5.0.9",
74+
"jasmine-core": "~4.0.1",
75+
"jasmine-spec-reporter": "~6.0.0",
76+
"karma": "~6.3.16",
77+
"karma-chrome-launcher": "~3.1.0",
78+
"karma-coverage-istanbul-reporter": "~3.0.2",
79+
"karma-jasmine": "~4.0.0",
80+
"karma-jasmine-html-reporter": "^1.5.0",
81+
"lint-staged": "^10.5.4",
82+
"nz-tslint-rules": "^0.901.2",
83+
"postcss-import": "^14.0.2",
84+
"postcss-loader": "^6.2.1",
85+
"postcss-scss": "^4.0.3",
86+
"protractor": "~7.0.0",
87+
"react-is": "^17.0.1",
88+
"tailwindcss": "^3.0.12",
89+
"ts-node": "~9.1.1",
90+
"tslint": "~6.1.0",
91+
"typescript": "~4.8.4"
92+
},
93+
"husky": {
94+
"hooks": {
95+
"pre-commit": "lint-staged"
96+
}
97+
},
98+
"lint-staged": {
99+
"*.js": "npm run lint:fix"
100+
}
101+
}

src/app/project/components/issues/issue-card/issue-card.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class IssueCardComponent implements OnChanges, OnInit {
4242
nzWidth: 1040,
4343
nzClosable: false,
4444
nzFooter: null,
45-
nzComponentParams: {
45+
nzData: {
4646
issue$: this._projectQuery.issueById$(issueId)
4747
}
4848
});

src/app/project/components/issues/issue-delete-modal/issue-delete-modal.component.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, EventEmitter } from '@angular/core';
1+
import { Component, EventEmitter, OnInit } from '@angular/core';
22
import { NzModalRef } from 'ng-zorro-antd/modal';
33
import { DeleteIssueModel } from '@trungk18/interface/ui-model/delete-issue-model';
44

@@ -7,12 +7,28 @@ import { DeleteIssueModel } from '@trungk18/interface/ui-model/delete-issue-mode
77
templateUrl: './issue-delete-modal.component.html',
88
styleUrls: ['./issue-delete-modal.component.scss']
99
})
10-
export class IssueDeleteModalComponent {
10+
export class IssueDeleteModalComponent implements OnInit {
1111
issueId: string;
1212

1313
onDelete = new EventEmitter<DeleteIssueModel>();
1414

15-
constructor(private _modalRef: NzModalRef) {}
15+
constructor(
16+
private _modalRef: NzModalRef
17+
) {}
18+
19+
ngOnInit() {
20+
// Get data from the new ng-zorro modal data
21+
const config = this._modalRef.getConfig();
22+
console.log('Delete modal config:', config);
23+
if (config.nzData?.issueId) {
24+
this.issueId = config.nzData.issueId;
25+
console.log('Issue ID set from nzData:', this.issueId);
26+
}
27+
if (config.nzData?.onDelete) {
28+
this.onDelete = config.nzData.onDelete;
29+
console.log('onDelete callback set from nzData');
30+
}
31+
}
1632

1733
deleteIssue() {
1834
this.onDelete.emit(new DeleteIssueModel(this.issueId, this._modalRef));

src/app/project/components/issues/issue-detail/issue-detail.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class IssueDetailComponent{
2828
nzStyle: {
2929
top: '140px'
3030
},
31-
nzComponentParams: {
31+
nzData: {
3232
issueId: this.issue.id,
3333
onDelete: this.onDelete
3434
}

src/app/project/components/issues/issue-modal/issue-modal.component.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, Input } from '@angular/core';
1+
import { Component, Input, OnInit } from '@angular/core';
22
import { Router } from '@angular/router';
33
import { JIssue } from '@trungk18/interface/issue';
44
import { ProjectService } from '@trungk18/project/state/project/project.service';
@@ -11,7 +11,7 @@ import { DeleteIssueModel } from '@trungk18/interface/ui-model/delete-issue-mode
1111
templateUrl: './issue-modal.component.html',
1212
styleUrls: ['./issue-modal.component.scss']
1313
})
14-
export class IssueModalComponent {
14+
export class IssueModalComponent implements OnInit {
1515
@Input() issue$: Observable<JIssue>;
1616

1717
constructor(
@@ -20,6 +20,18 @@ export class IssueModalComponent {
2020
private _projectService: ProjectService
2121
) {}
2222

23+
ngOnInit() {
24+
// Get data from the new ng-zorro modal data
25+
const config = this._modal.getConfig();
26+
console.log('Modal config:', config);
27+
if (config.nzData?.issue$) {
28+
this.issue$ = config.nzData.issue$;
29+
console.log('Issue observable set from nzData:', this.issue$);
30+
} else {
31+
console.log('No issue$ found in modal data');
32+
}
33+
}
34+
2335
closeModal() {
2436
this._modal.close();
2537
}

src/app/project/components/navigation/navbar-left/navbar-left.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<p class="mb-2">This is a <strong>simplified</strong> Jira clone built with Angular, Akita and ng-zorro</p>
9393
<p class="mb-2">Thanks a bunch for stopping by and supporting me!</p>
9494
<p class="mb-3">Reach out to me via <a class="font-semibold"
95-
href="email:trungk18@gmail.com">trungk18@gmail.com</a></p>
95+
href="email:trungk18&#64;gmail.com">trungk18&#64;gmail.com</a></p>
9696
<a href="https://trungk18.com/"
9797
target="_blank">
9898
<j-button className="btn-primary">Visit My Blog</j-button>

src/app/project/components/search/search-drawer/search-drawer.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export class SearchDrawerComponent implements OnInit {
5757
nzWidth: 1040,
5858
nzClosable: false,
5959
nzFooter: null,
60-
nzComponentParams: {
60+
nzData: {
6161
issue$: this._projectQuery.issueById$(issue.id)
6262
}
6363
});

src/styles.scss

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
@import 'ng-zorro-antd/style/index.min.css';
2-
@import 'ng-zorro-antd/tooltip/style/index.min.css';
3-
@import 'ng-zorro-antd/spin/style/index.min.css';
4-
@import 'ng-zorro-antd/modal/style/index.min.css';
5-
@import 'ng-zorro-antd/dropdown/style/index.min.css';
6-
@import 'ng-zorro-antd/select/style/index.min.css';
7-
@import 'ng-zorro-antd/drawer/style/index.min.css';
8-
@import 'ng-zorro-antd/notification/style/index.min.css';
9-
@import 'ng-zorro-antd/popover/style/index.min.css';
1+
@import 'ng-zorro-antd/ng-zorro-antd.min.css';
102

113
@import 'tailwindcss/base';
124
@import 'tailwindcss/components';

0 commit comments

Comments
 (0)