Skip to content

Commit cefc193

Browse files
ct-dixitct-dixit
authored
package upgrade done (#14) (#15)
* package upgrade done (#14) * version change * yml file update * yml file update as per review change
1 parent b918a85 commit cefc193

20 files changed

Lines changed: 1866 additions & 1775 deletions

File tree

‎.github/workflows/prod.yml‎

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

25-
- name: Use Node.js 18
25+
- name: Use Node.js 20
2626
uses: actions/setup-node@v2-beta
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
3535
- name: 📂 Deploy to Server
36-
uses: easingthemes/ssh-deploy@v2.1.5
36+
uses: easingthemes/ssh-deploy@main
3737
env:
3838
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
3939
# ARGS: "-rltgoDzvO --delete"

‎.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
}

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ Berry is a free angular admin dashboard template built with Angular and latest B
1212

1313
[Pro version](https://berrydashboard.io/angular/default) of Berry Angular Dashboard template contains features like TypeScript, Apps, Authentication Methods (i.e. JWT), Advance Components, Form Plugins, Layouts, Widgets, and many more.
1414

15-
| [Berry Free](https://berrydashboard.io/angular/free/) | [Berry](https://codedthemes.com/item/berry-angular-admin-dashboard-template/?utm_source=free_demo&utm_medium=codedthemes&utm_campaign=button_download_premium) |
16-
| ----------------------------------------------------- | :---------------------------------------------------------------------------------------- |
17-
| **9** Demo pages | **45+** demo pages |
18-
| - | ✓ Multi-language |
19-
| - | ✓ Dark/Light Mode 🌓 |
20-
| - | ✓ TypeScript version |
21-
| - | ✓ Design files (Figma) |
22-
| - | ✓ 6+ color Options |
23-
| - | ✓ RTL |
24-
| - | ✓ JWT authentications |
25-
| - | ✓ [More components](https://berrydashboard.io/angular/default/basic/alert) |
15+
| [Berry Free](https://berrydashboard.io/angular/free/) | [Berry](https://codedthemes.com/item/berry-angular-admin-dashboard-template/?utm_source=free_demo&utm_medium=codedthemes&utm_campaign=button_download_premium) |
16+
| ----------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------- |
17+
| **9** Demo pages | **45+** demo pages |
18+
| - | ✓ Multi-language |
19+
| - | ✓ Dark/Light Mode 🌓 |
20+
| - | ✓ TypeScript version |
21+
| - | ✓ Design files (Figma) |
22+
| - | ✓ 6+ color Options |
23+
| - | ✓ RTL |
24+
| - | ✓ JWT authentications |
25+
| - | ✓ [More components](https://berrydashboard.io/angular/default/basic/alert) |
2626

2727
## Why Berry?
2828

‎package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "berry-free-angular-admin-template",
3-
"version": "4.0.0",
3+
"version": "4.1.0",
44
"author": "CodedThemes",
55
"license": "MIT",
66
"scripts": {
@@ -12,37 +12,37 @@
1212
"test": "ng test"
1313
},
1414
"dependencies": {
15-
"@angular/animations": "^18.0.0-next.3",
16-
"@angular/cdk": "^17.3.6",
17-
"@angular/common": "^18.0.0-next.3",
18-
"@angular/compiler": "^18.0.0-next.3",
19-
"@angular/core": "^18.0.0-next.3",
20-
"@angular/forms": "^18.0.0-next.3",
21-
"@angular/platform-browser": "^18.0.0-next.3",
22-
"@angular/platform-browser-dynamic": "^18.0.0-next.3",
23-
"@angular/router": "^18.0.0-next.3",
24-
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
15+
"@angular/animations": "^18.0.5",
16+
"@angular/cdk": "^18.0.5",
17+
"@angular/common": "^18.0.5",
18+
"@angular/compiler": "^18.0.5",
19+
"@angular/core": "^18.0.5",
20+
"@angular/forms": "^18.0.5",
21+
"@angular/platform-browser": "^18.0.5",
22+
"@angular/platform-browser-dynamic": "^18.0.5",
23+
"@angular/router": "^18.0.5",
24+
"@ng-bootstrap/ng-bootstrap": "^17.0.0",
2525
"@popperjs/core": "^2.11.8",
26-
"apexcharts": "^3.49.0",
26+
"apexcharts": "^3.49.2",
2727
"bootstrap": "^5.3.3",
28-
"ng-apexcharts": "^1.10.0",
29-
"ngx-scrollbar": "^13.0.3",
28+
"ng-apexcharts": "^1.11.0",
29+
"ngx-scrollbar": "^15.0.1",
3030
"rxjs": "~7.8.1",
31-
"tslib": "^2.6.2",
32-
"zone.js": "~0.14.4"
31+
"tslib": "^2.6.3",
32+
"zone.js": "~0.14.7"
3333
},
3434
"devDependencies": {
35-
"@angular-devkit/build-angular": "^18.0.0-next.3",
36-
"@angular/cli": "~18.0.0-next.3",
37-
"@angular/compiler-cli": "^18.0.0-next.3",
35+
"@angular-devkit/build-angular": "^18.0.6",
36+
"@angular/cli": "~18.0.6",
37+
"@angular/compiler-cli": "^18.0.5",
3838
"@types/jasmine": "~5.1.4",
3939
"jasmine-core": "~5.1.2",
4040
"karma": "~6.4.3",
4141
"karma-chrome-launcher": "~3.2.0",
4242
"karma-coverage": "~2.2.1",
4343
"karma-jasmine": "~5.1.0",
4444
"karma-jasmine-html-reporter": "~2.1.0",
45-
"prettier": "3.2.5",
45+
"prettier": "3.3.2",
4646
"typescript": "5.4"
4747
}
4848
}

‎src/app/demo/default/chart-data-month/chart-data-month.component.html‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,21 @@
66
</div>
77
<div class="col-auto">
88
<div class="d-flex align-items-center gap-2 chart-income">
9-
<div class="btn btn-sm text-white" [ngClass]="this.btnActive === 'month' ? 'btn-primary' : ''" (click)="toggleActive('month')"
10-
>Month</div
11-
>
12-
<div class="btn btn-sm text-white" [ngClass]="this.btnActive === 'year' ? 'btn-primary' : ''" (click)="toggleActive('year')"
13-
>Year</div
14-
>
9+
<div class="btn btn-sm text-white" [ngClass]="this.btnActive === 'month' ? 'btn-primary' : ''" (click)="toggleActive('month')">
10+
Month
11+
</div>
12+
<div class="btn btn-sm text-white" [ngClass]="this.btnActive === 'year' ? 'btn-primary' : ''" (click)="toggleActive('year')">
13+
Year
14+
</div>
1515
</div>
1616
</div>
1717
</div>
1818
<div class="row">
1919
<div class="col-6">
20-
<span class="text-white d-block f-34 f-w-500 my-2">${{ amount }} <i class="ti ti-circle-arrow-up-right opacity-50"></i></span>
20+
<span class="text-white d-block f-34 f-w-500 my-2">
21+
${{ amount }}
22+
<i class="ti ti-circle-arrow-up-right opacity-50"></i>
23+
</span>
2124
<p class="mb-0 opacity-50">C/W Last Year</p>
2225
</div>
2326
<div class="col-6">

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
</div>
2323
</div>
2424
</div>
25-
<span class="text-white d-block f-34 f-w-500 my-2">$500.00 <i class="ti ti-circle-arrow-up-right opacity-50"></i></span>
25+
<span class="text-white d-block f-34 f-w-500 my-2">
26+
$500.00
27+
<i class="ti ti-circle-arrow-up-right opacity-50"></i>
28+
</span>
2629
<p class="mb-0 opacity-50">Total Earning</p>
2730
</div>
2831
</div>
@@ -75,7 +78,7 @@ <h4 class="f-w-600 mb-1">$203k</h4>
7578
<div class="col">
7679
<h4>Popular Stocks</h4>
7780
</div>
78-
<div class="col-auto"> </div>
81+
<div class="col-auto"></div>
7982
</div>
8083
<div class="rounded bg-light-secondary overflow-hidden mb-3">
8184
<div class="px-3 pt-3">
@@ -101,18 +104,21 @@ <h5 class="mb-0">{{ list.name }}</h5>
101104
</div>
102105
<div class="col-auto">
103106
<h4 class="mb-0">
104-
{{ list.invest
105-
}}<span class="ms-2 align-top avatar avatar-xxs {{ list.bgColor }}"
106-
><i class="{{ list.icon }} {{ list.color }}"></i
107-
></span>
107+
{{ list.invest }}
108+
<span class="ms-2 align-top avatar avatar-xxs {{ list.bgColor }}">
109+
<i class="{{ list.icon }} {{ list.color }}"></i>
110+
</span>
108111
</h4>
109112
</div>
110113
</div>
111114
</li>
112115
}
113116
</ul>
114117
<div class="text-center">
115-
<a href="javascript:" class="b-b-primary text-primary f-w-500">View all <i class="ti ti-chevron-right"></i></a>
118+
<a href="javascript:" class="b-b-primary text-primary f-w-500">
119+
View all
120+
<i class="ti ti-chevron-right"></i>
121+
</a>
116122
</div>
117123
</div>
118124
</div>

‎src/app/demo/elements/element-color/element-color.component.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ <h5>Text Color</h5>
5050
<div class="p-3 color-block text-blue-900" data-clipboard-text="text-blue-900">text-blue-900</div>
5151
</div>
5252
<div class="col-md-6 mb-3">
53-
<div class="p-3 color-block text-purple-100" data-clipboard-text="text-purple-100">text-purple-100 </div>
54-
<div class="p-3 color-block text-purple-200" data-clipboard-text="text-purple-200">text-purple-200 </div>
55-
<div class="p-3 color-block text-purple-300" data-clipboard-text="text-purple-300">text-purple-300 </div>
56-
<div class="p-3 color-block text-purple-400" data-clipboard-text="text-purple-400">text-purple-400 </div>
57-
<div class="p-3 color-block text-purple-500" data-clipboard-text="text-purple-500">text-purple-500 </div>
58-
<div class="p-3 color-block text-purple-600" data-clipboard-text="text-purple-600">text-purple-600 </div>
59-
<div class="p-3 color-block text-purple-700" data-clipboard-text="text-purple-700">text-purple-700 </div>
60-
<div class="p-3 color-block text-purple-800" data-clipboard-text="text-purple-800">text-purple-800 </div>
61-
<div class="p-3 color-block text-purple-900" data-clipboard-text="text-purple-900">text-purple-900 </div>
53+
<div class="p-3 color-block text-purple-100" data-clipboard-text="text-purple-100">text-purple-100</div>
54+
<div class="p-3 color-block text-purple-200" data-clipboard-text="text-purple-200">text-purple-200</div>
55+
<div class="p-3 color-block text-purple-300" data-clipboard-text="text-purple-300">text-purple-300</div>
56+
<div class="p-3 color-block text-purple-400" data-clipboard-text="text-purple-400">text-purple-400</div>
57+
<div class="p-3 color-block text-purple-500" data-clipboard-text="text-purple-500">text-purple-500</div>
58+
<div class="p-3 color-block text-purple-600" data-clipboard-text="text-purple-600">text-purple-600</div>
59+
<div class="p-3 color-block text-purple-700" data-clipboard-text="text-purple-700">text-purple-700</div>
60+
<div class="p-3 color-block text-purple-800" data-clipboard-text="text-purple-800">text-purple-800</div>
61+
<div class="p-3 color-block text-purple-900" data-clipboard-text="text-purple-900">text-purple-900</div>
6262
</div>
6363
</div>
6464
</div>

‎src/app/demo/elements/typography/typography.component.html‎

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
<div class="card">
55
<div class="card-header">
66
<h5>Headings</h5>
7-
<p
8-
><span class="badges">.h1</span> through .h6 classes are also available, for when you want to match the font styling of a heading
9-
but cannot use the associated HTML element.</p
10-
>
7+
<p>
8+
<span class="badges">.h1</span>
9+
through .h6 classes are also available, for when you want to match the font styling of a heading but cannot use the associated
10+
HTML element.
11+
</p>
1112
</div>
1213
<div class="card-body">
1314
<h1>h1. Heading</h1>
@@ -47,7 +48,8 @@ <h5>Inline Text Elements</h5>
4748
<div class="card-body">
4849
<p class="lead mt-0">Your title goes here</p>
4950
You can use the mark tag to
50-
<mark>highlight</mark> text.
51+
<mark>highlight</mark>
52+
text.
5153
<br />
5254
<del>This line of text is meant to be treated as deleted text.</del>
5355
<br />
@@ -65,13 +67,13 @@ <h5>Inline Text Elements</h5>
6567
<h5>Contextual Text Colors</h5>
6668
</div>
6769
<div class="card-body">
68-
<p class="text-muted mb-1"> Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh. </p>
69-
<p class="text-primary mb-1"> Nullam id dolor id nibh ultricies vehicula ut id elit. </p>
70-
<p class="text-success mb-1"> Duis mollis, est non commodo luctus, nisi erat porttitor ligula. </p>
71-
<p class="text-info mb-1"> Maecenas sed diam eget risus varius blandit sit amet non magna. </p>
72-
<p class="text-warning mb-1"> Etiam porta sem malesuada magna mollis euismod. </p>
73-
<p class="text-danger mb-1"> Donec ullamcorper nulla non metus auctor fringilla. </p>
74-
<p class="text-dark mb-1"> Nullam id dolor id nibh ultricies vehicula ut id elit. </p>
70+
<p class="text-muted mb-1">Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.</p>
71+
<p class="text-primary mb-1">Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
72+
<p class="text-success mb-1">Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
73+
<p class="text-info mb-1">Maecenas sed diam eget risus varius blandit sit amet non magna.</p>
74+
<p class="text-warning mb-1">Etiam porta sem malesuada magna mollis euismod.</p>
75+
<p class="text-danger mb-1">Donec ullamcorper nulla non metus auctor fringilla.</p>
76+
<p class="text-dark mb-1">Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
7577
</div>
7678
</div>
7779
</div>
@@ -86,8 +88,8 @@ <h5>Unordered</h5>
8688
<li>Consectetur adipiscing elit</li>
8789
<li>Integer molestie lorem at massa</li>
8890
<li>Facilisis in pretium nisl aliquet</li>
89-
<li
90-
>Nulla volutpat aliquam velit
91+
<li>
92+
Nulla volutpat aliquam velit
9193
<ul>
9294
<li>Phasellus iaculis neque</li>
9395
<li>Purus sodales ultricies</li>
@@ -113,8 +115,8 @@ <h5>Ordered</h5>
113115
<li>Consectetur adipiscing elit</li>
114116
<li>Integer molestie lorem at massa</li>
115117
<li>Facilisis in pretium nisl aliquet</li>
116-
<li
117-
>Nulla volutpat aliquam velit
118+
<li>
119+
Nulla volutpat aliquam velit
118120
<ul>
119121
<li>Phasellus iaculis neque</li>
120122
<li>Purus sodales ultricies</li>
@@ -137,8 +139,8 @@ <h5>Unstyled</h5>
137139
<div class="card-body">
138140
<ul class="list-unstyled">
139141
<li>Lorem ipsum dolor sit amet</li>
140-
<li
141-
>Integer molestie lorem at massa
142+
<li>
143+
Integer molestie lorem at massa
142144
<ul>
143145
<li>Phasellus iaculis neque</li>
144146
</ul>
@@ -162,15 +164,25 @@ <h5>Inline</h5>
162164
<h5>Blockquotes</h5>
163165
</div>
164166
<div class="card-body">
165-
<p class="text-muted mb-5"> Your awesome text goes here. </p>
167+
<p class="text-muted mb-5">Your awesome text goes here.</p>
166168
<blockquote class="blockquote">
167169
<p class="pb-2">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
168-
<footer class="blockquote-footer">Someone famous in <cite title="Source Title">Source Title</cite></footer>
170+
<footer class="blockquote-footer">
171+
Someone famous in
172+
<cite title="Source Title">Source Title</cite>
173+
</footer>
169174
</blockquote>
170-
<p class="text-mutedmy-3"> Add <code>.text-end</code> for a blockquote with right-aligned content. </p>
175+
<p class="text-mutedmy-3">
176+
Add
177+
<code>.text-end</code>
178+
for a blockquote with right-aligned content.
179+
</p>
171180
<blockquote class="blockquote text-end">
172181
<p class="pb-2">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
173-
<footer class="blockquote-footer">Someone famous in <cite title="Source Title">Source Title</cite></footer>
182+
<footer class="blockquote-footer">
183+
Someone famous in
184+
<cite title="Source Title">Source Title</cite>
185+
</footer>
174186
</blockquote>
175187
</div>
176188
</div>
@@ -193,9 +205,9 @@ <h5>Horizontal Description</h5>
193205
<dd class="col-sm-9">Etiam porta sem malesuada magna mollis euismod.</dd>
194206

195207
<dt class="col-sm-3 text-truncate">Truncated term is truncated</dt>
196-
<dd class="col-sm-9"
197-
>Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</dd
198-
>
208+
<dd class="col-sm-9">
209+
Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
210+
</dd>
199211
</dl>
200212
</div>
201213
</div>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ <h2 class="text-secondary mt-5"><b>Hi, Welcome Back</b></h2>
1616
</div>
1717
<div class="d-grid">
1818
<button type="button" class="btn mt-2 btn-light-primary bg-light text-muted">
19-
<img src="assets/images/authentication/google-icon.svg" />Sign In With Google
19+
<img src="assets/images/authentication/google-icon.svg" />
20+
Sign In With Google
2021
</button>
2122
</div>
2223
<div class="saprator mt-3">
2324
<span>or</span>
2425
</div>
25-
<h5 class="my-4 d-flex justify-content-center"> Sign in with Email address </h5>
26+
<h5 class="my-4 d-flex justify-content-center">Sign in with Email address</h5>
2627
<div class="form-floating mb-3">
2728
<input type="email" class="form-control" id="floatingInput" value="info@codedthemes.com" />
2829
<label for="floatingInput">Email address / Username</label>

0 commit comments

Comments
 (0)