Skip to content

Commit b2c3558

Browse files
authored
package upgrade done (#10) (#11)
* package upgrade done (#10) * yml file update
1 parent cd31bbc commit b2c3558

File tree

16 files changed

+2154
-2140
lines changed

16 files changed

+2154
-2140
lines changed

.github/workflows/prod.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
- name: 🚚 Get latest code
2323
uses: actions/checkout@v3
2424

25-
- name: Use Node.js 18
25+
- name: Use Node.js 20
2626
uses: actions/setup-node@v3
2727
with:
28-
node-version: '18'
28+
node-version: '20.x'
2929

3030
- name: 🔨 Build Project
3131
run: |
32-
npm i --legacy-peer-deps
33-
npm run build-prod
32+
yarn
33+
yarn build-prod
3434
- name: 📂 Deploy to Server
3535
uses: easingthemes/ssh-deploy@main
3636
env:

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"trailingComma": "none",
66
"tabWidth": 2,
77
"useTabs": false,
8-
"htmlWhitespaceSensitivity": "strict",
8+
"htmlWhitespaceSensitivity": "ignore",
99
"bracketSameLine": false
1010
}

package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mantis-free-angular-admin-template",
3-
"version": "4.0.0",
3+
"version": "4.1.0",
44
"author": "CodedThemes",
55
"license": "MIT",
66
"scripts": {
@@ -15,47 +15,47 @@
1515
},
1616
"private": false,
1717
"dependencies": {
18-
"@angular/animations": "^18.0.0-next.3",
19-
"@angular/cdk": "^18.0.0-next.3",
20-
"@angular/common": "^18.0.0-next.3",
21-
"@angular/compiler": "^18.0.0-next.3",
22-
"@angular/core": "^18.0.0-next.3",
23-
"@angular/forms": "^18.0.0-next.3",
24-
"@angular/platform-browser": "^18.0.0-next.3",
25-
"@angular/platform-browser-dynamic": "^18.0.0-next.3",
26-
"@angular/router": "^18.0.0-next.3",
27-
"@ant-design/icons-angular": "^17.0.0",
28-
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
18+
"@angular/animations": "^18.0.5",
19+
"@angular/cdk": "^18.0.5",
20+
"@angular/common": "^18.0.5",
21+
"@angular/compiler": "^18.0.5",
22+
"@angular/core": "^18.0.5",
23+
"@angular/forms": "^18.0.5",
24+
"@angular/platform-browser": "^18.0.5",
25+
"@angular/platform-browser-dynamic": "^18.0.5",
26+
"@angular/router": "^18.0.5",
27+
"@ant-design/icons-angular": "^18.0.0",
28+
"@ng-bootstrap/ng-bootstrap": "^17.0.0",
2929
"@popperjs/core": "^2.11.8",
30-
"apexcharts": "^3.45.2",
31-
"bootstrap": "^5.3.2",
32-
"ng-apexcharts": "^1.8.0",
33-
"ngx-scrollbar": "^13.0.3",
30+
"apexcharts": "^3.49.2",
31+
"bootstrap": "^5.3.3",
32+
"ng-apexcharts": "^1.11.0",
33+
"ngx-scrollbar": "^15.0.1",
3434
"rxjs": "~7.8.1",
35-
"tslib": "^2.6.2",
36-
"zone.js": "~0.14.4"
35+
"tslib": "^2.6.3",
36+
"zone.js": "~0.14.7"
3737
},
3838
"devDependencies": {
39-
"@angular-devkit/build-angular": "^18.0.0-next.3",
40-
"@angular-eslint/builder": "17.3.0",
41-
"@angular-eslint/eslint-plugin": "17.3.0",
42-
"@angular-eslint/eslint-plugin-template": "17.3.0",
43-
"@angular-eslint/schematics": "17.3.0",
44-
"@angular-eslint/template-parser": "17.3.0",
45-
"@angular/cli": "~18.0.0-next.3",
46-
"@angular/compiler-cli": "^18.0.0-next.3",
39+
"@angular-devkit/build-angular": "^18.0.6",
40+
"@angular-eslint/builder": "18.0.1",
41+
"@angular-eslint/eslint-plugin": "18.0.1",
42+
"@angular-eslint/eslint-plugin-template": "18.0.1",
43+
"@angular-eslint/schematics": "18.0.1",
44+
"@angular-eslint/template-parser": "18.0.1",
45+
"@angular/cli": "~18.0.6",
46+
"@angular/compiler-cli": "^18.0.5",
4747
"@types/jasmine": "~5.1.4",
48-
"@types/node": "^20.12.7",
49-
"@typescript-eslint/eslint-plugin": "7.7.1",
50-
"@typescript-eslint/parser": "7.7.1",
51-
"eslint": "^8.56.0",
48+
"@types/node": "^20.14.9",
49+
"@typescript-eslint/eslint-plugin": "7.14.1",
50+
"@typescript-eslint/parser": "7.14.1",
51+
"eslint": "^9.5.0",
5252
"jasmine-core": "~5.1.2",
5353
"karma": "~6.4.3",
5454
"karma-chrome-launcher": "~3.2.0",
5555
"karma-coverage": "~2.2.1",
5656
"karma-jasmine": "~5.1.0",
5757
"karma-jasmine-html-reporter": "~2.1.0",
58-
"prettier": "3.2.5",
58+
"prettier": "3.3.2",
5959
"typescript": "5.4"
6060
}
6161
}

src/app/demo/authentication/login/login.component.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h5 class="text-secondary f-w-400"><a href="javascript:">Forgot Password?</a></h
3737
<div class="d-grid">
3838
<button type="button" class="btn mt-2 btn-light-primary bg-light text-muted">
3939
<img src="{{ item.image }}" alt="google img" />
40-
<span class="d-none d-sm-inline-block"> {{ item.name }}</span>
40+
<span class="d-none d-sm-inline-block">{{ item.name }}</span>
4141
</button>
4242
</div>
4343
</div>
@@ -47,7 +47,10 @@ <h5 class="text-secondary f-w-400"><a href="javascript:">Forgot Password?</a></h
4747
</div>
4848
<div class="auth-footer row">
4949
<div class="col my-1">
50-
<p class="m-0">Copyright © <a href="https://codedthemes.com/" target="_blank">CodedThemes</a></p>
50+
<p class="m-0">
51+
Copyright ©
52+
<a href="https://codedthemes.com/" target="_blank">CodedThemes</a>
53+
</p>
5154
</div>
5255
<div class="col-auto my-1">
5356
<ul class="list-inline footer-link mb-0">

src/app/demo/authentication/register/register.component.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,12 @@ <h3 class="mb-0"><b>Sign up</b></h3>
3636
<label class="form-label" for="password">Password</label>
3737
<input type="password" class="form-control" id="password" placeholder="Password" />
3838
</div>
39-
<p class="mt-4 text-sm text-muted"
40-
>By Signing up, you agree to our <a href="javascript:" class="text-primary"> Terms of Service </a> and
41-
<a href="javascript:" class="text-primary"> Privacy Policy</a></p
42-
>
39+
<p class="mt-4 text-sm text-muted">
40+
By Signing up, you agree to our
41+
<a href="javascript:" class="text-primary">Terms of Service</a>
42+
and
43+
<a href="javascript:" class="text-primary">Privacy Policy</a>
44+
</p>
4345
<div class="d-grid mt-3">
4446
<button type="button" class="btn btn-primary">Create Account</button>
4547
</div>
@@ -52,7 +54,7 @@ <h3 class="mb-0"><b>Sign up</b></h3>
5254
<div class="d-grid">
5355
<button type="button" class="btn mt-2 btn-light-primary bg-light text-muted">
5456
<img src="{{ item.image }}" alt="google img" />
55-
<span class="d-none d-sm-inline-block"> {{ item.name }}</span>
57+
<span class="d-none d-sm-inline-block">{{ item.name }}</span>
5658
</button>
5759
</div>
5860
</div>
@@ -63,7 +65,10 @@ <h3 class="mb-0"><b>Sign up</b></h3>
6365
<div class="auth-footer row">
6466
<!-- <div class=""> -->
6567
<div class="col my-1">
66-
<p class="m-0">Copyright © <a href="https://codedthemes.com/" target="_blank">CodedThemes</a></p>
68+
<p class="m-0">
69+
Copyright ©
70+
<a href="https://codedthemes.com/" target="_blank">CodedThemes</a>
71+
</p>
6772
</div>
6873
<div class="col-auto my-1">
6974
<ul class="list-inline footer-link mb-0">

src/app/demo/default/dashboard/analytics-chart/analytics-chart.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ <h5 class="mb-3">Analytics Report</h5>
22
<div class="card">
33
<div class="list-group list-group-flush">
44
<a href="javascript:" class="list-group-item list-group-item-action d-flex align-items-center justify-content-between">
5-
Company Finance Growth<span class="h5 mb-0">+45.14%</span>
5+
Company Finance Growth
6+
<span class="h5 mb-0">+45.14%</span>
67
</a>
78
<a href="javascript:" class="list-group-item list-group-item-action d-flex align-items-center justify-content-between">
8-
Company Expenses Ratio<span class="h5 mb-0">0.58%</span>
9+
Company Expenses Ratio
10+
<span class="h5 mb-0">0.58%</span>
911
</a>
1012
</div>
1113
<div class="card-body px-2">

src/app/demo/default/dashboard/dashboard.component.html

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ <h4 class="mb-3">
77
{{ analytic.amount }}
88
<span class="badge {{ analytic.background }} border {{ analytic.border }} ">
99
<i antIcon type="{{ analytic.icon }}" theme="outline"></i>
10-
{{ analytic.percentage }}</span
11-
>
10+
{{ analytic.percentage }}
11+
</span>
1212
</h4>
1313
<p class="mb-0 text-muted text-sm">
14-
You made an extra <span class="{{ analytic.color }}">{{ analytic.number }}</span> this year
14+
You made an extra
15+
<span class="{{ analytic.color }}">{{ analytic.number }}</span>
16+
this year
1517
</p>
1618
</app-card>
1719
</div>
@@ -40,13 +42,16 @@ <h5 class="mb-3">Recent Orders</h5>
4042
<tbody>
4143
@for (order of recentOrder; track order) {
4244
<tr>
43-
<td
44-
><a href="javascript:" class="text-muted">{{ order.id }}</a></td
45-
>
45+
<td>
46+
<a href="javascript:" class="text-muted">{{ order.id }}</a>
47+
</td>
4648
<td>{{ order.name }}</td>
47-
<td
48-
><span class="d-block"><i class="badge-circle {{ order.status_type }} f-10 m-r-5"></i>{{ order.status }}</span></td
49-
>
49+
<td>
50+
<span class="d-block">
51+
<i class="badge-circle {{ order.status_type }} f-10 m-r-5"></i>
52+
{{ order.status }}
53+
</span>
54+
</td>
5055
<td class="text-end">{{ order.quantity }}</td>
5156
<td class="text-end">{{ order.amount }}</td>
5257
</tr>

src/app/demo/ui-component/typography/typography.component.html

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ <h1 class="display-6">Display 6</h1>
3434
<app-card cardTitle="Inline Text Elements">
3535
<p class="lead m-t-0">Your title goes here</p>
3636
You can use the mark tag to
37-
<mark>highlight</mark> text.
37+
<mark>highlight</mark>
38+
text.
3839
<br />
3940
<del>This line of text is meant to be treated as deleted text.</del>
4041
<br />
@@ -47,13 +48,13 @@ <h1 class="display-6">Display 6</h1>
4748
</div>
4849
<div class="col-md-6">
4950
<app-card cardTitle="Contextual Text Colors">
50-
<p class="text-muted mb-1"> Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh. </p>
51-
<p class="text-primary mb-1"> Nullam id dolor id nibh ultricies vehicula ut id elit. </p>
52-
<p class="text-success mb-1"> Duis mollis, est non commodo luctus, nisi erat porttitor ligula. </p>
53-
<p class="text-info mb-1"> Maecenas sed diam eget risus varius blandit sit amet non magna. </p>
54-
<p class="text-warning mb-1"> Etiam porta sem malesuada magna mollis euismod. </p>
55-
<p class="text-danger mb-1"> Donec ullamcorper nulla non metus auctor fringilla. </p>
56-
<p class="text-dark mb-1"> Nullam id dolor id nibh ultricies vehicula ut id elit. </p>
51+
<p class="text-muted mb-1">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
52+
<p class="text-primary mb-1">Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
53+
<p class="text-success mb-1">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
54+
<p class="text-info mb-1">Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
55+
<p class="text-warning mb-1">Etiam porta sem malesuada magna mollis euismod.</p>
56+
<p class="text-danger mb-1">Donec ullamcorper nulla non metus auctor fringilla.</p>
57+
<p class="text-dark mb-1">Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
5758
</app-card>
5859
</div>
5960
<div class="col-md-6 col-lg-4">
@@ -126,28 +127,38 @@ <h5>Inline</h5>
126127
<app-card cardTitle="Blockquotes">
127128
<p class="text-muted m-b-30">Your awesome text goes here.</p>
128129
<blockquote class="blockquote">
129-
<p class="mb-2"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. </p>
130-
<footer class="blockquote-footer"> Someone famous in <cite title="Source Title">Source Title</cite> </footer>
130+
<p class="mb-2">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
131+
<footer class="blockquote-footer">
132+
Someone famous in
133+
<cite title="Source Title">Source Title</cite>
134+
</footer>
131135
</blockquote>
132-
<p class="text-muted m-b-15 m-t-20"> Add <code>.text-end</code> for a blockquote with right-aligned content. </p>
136+
<p class="text-muted m-b-15 m-t-20">
137+
Add
138+
<code>.text-end</code>
139+
for a blockquote with right-aligned content.
140+
</p>
133141
<blockquote class="blockquote text-end">
134-
<p class="mb-2"> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. </p>
135-
<footer class="blockquote-footer"> Someone famous in <cite title="Source Title">Source Title</cite> </footer>
142+
<p class="mb-2">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
143+
<footer class="blockquote-footer">
144+
Someone famous in
145+
<cite title="Source Title">Source Title</cite>
146+
</footer>
136147
</blockquote>
137148
</app-card>
138149
</div>
139150
<div class="col-md-6">
140151
<app-card cardTitle="Horizontal Description">
141152
<dl class="dl-horizontal row">
142153
<dt class="col-sm-3">Description lists</dt>
143-
<dd class="col-sm-9"> A description list is perfect for defining terms. </dd>
154+
<dd class="col-sm-9">A description list is perfect for defining terms.</dd>
144155

145156
<dt class="col-sm-3">Euismod</dt>
146-
<dd class="col-sm-9"> Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit. </dd>
147-
<dd class="col-sm-9"> Donec id elit non mi porta gravida at eget metus. </dd>
157+
<dd class="col-sm-9">Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.</dd>
158+
<dd class="col-sm-9">Donec id elit non mi porta gravida at eget metus.</dd>
148159

149160
<dt class="col-sm-3">Malesuada porta</dt>
150-
<dd class="col-sm-9"> Etiam porta sem malesuada magna mollis euismod. </dd>
161+
<dd class="col-sm-9">Etiam porta sem malesuada magna mollis euismod.</dd>
151162

152163
<dt class="col-sm-3 text-truncate">Truncated term is truncated</dt>
153164
<dd class="col-sm-9">

src/app/theme/layouts/admin-layout/admin-layout.component.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@
2020
</div>
2121
</div>
2222
</div>
23+
<div class="pc-menu-overlay" (click)="closeMenu()" (keydown)="handleKeyDown($event)" tabindex="0"></div>
2324
</div>
2425
<footer class="pc-footer">
2526
<div class="footer-wrapper container-fluid">
2627
<div class="row">
2728
<div class="col my-1">
28-
<p class="m-0"> Copyright &copy; <a href="https://codedthemes.com" target="_blank">CodedThemes</a> </p>
29+
<p class="m-0">
30+
Copyright &copy;
31+
<a href="https://codedthemes.com" target="_blank">CodedThemes</a>
32+
</p>
2933
</div>
3034
<div class="col-auto my-1">
3135
<ul class="list-inline footer-link mb-0">

src/app/theme/layouts/admin-layout/admin-layout.component.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,20 @@ export class AdminComponent {
3030
} else {
3131
this.navCollapsedMob = !this.navCollapsedMob;
3232
}
33+
if (document.querySelector('app-navigation.pc-sidebar')?.classList.contains('navbar-collapsed')) {
34+
document.querySelector('app-navigation.pc-sidebar')?.classList.remove('navbar-collapsed');
35+
}
36+
}
37+
38+
handleKeyDown(event: KeyboardEvent): void {
39+
if (event.key === 'Escape') {
40+
this.closeMenu();
41+
}
42+
}
43+
44+
closeMenu() {
45+
if (document.querySelector('app-navigation.pc-sidebar')?.classList.contains('mob-open')) {
46+
document.querySelector('app-navigation.pc-sidebar')?.classList.remove('mob-open');
47+
}
3348
}
3449
}

0 commit comments

Comments
 (0)