Skip to content

Commit 5b76c09

Browse files
phoenixcoded20ct-dixit
phoenixcoded20
and
ct-dixit
authored
angular 18 update complete (#12)
* angular 18 update complete * Update package.json --------- Co-authored-by: Dikshit Moradiya <dixit.moradia@phoenixcoded.co>
1 parent e087ab4 commit 5b76c09

59 files changed

Lines changed: 60244 additions & 4657 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎angular.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"budgets": [
3434
{
3535
"type": "initial",
36-
"maximumWarning": "1mb",
37-
"maximumError": "1mb"
36+
"maximumWarning": "1.2mb",
37+
"maximumError": "1.2mb"
3838
},
3939
{
4040
"type": "anyComponentStyle",

‎package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "berry-free-angular-admin-template",
3-
"version": "3.0.0",
3+
"version": "4.0.0",
44
"author": "CodedThemes",
55
"license": "MIT",
66
"scripts": {
@@ -12,37 +12,37 @@
1212
"test": "ng test"
1313
},
1414
"dependencies": {
15-
"@angular/animations": "^17.1.0",
16-
"@angular/cdk": "^17.1.0",
17-
"@angular/common": "^17.1.0",
18-
"@angular/compiler": "^17.1.0",
19-
"@angular/core": "^17.1.0",
20-
"@angular/forms": "^17.1.0",
21-
"@angular/platform-browser": "^17.1.0",
22-
"@angular/platform-browser-dynamic": "^17.1.0",
23-
"@angular/router": "^17.1.0",
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",
2424
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
2525
"@popperjs/core": "^2.11.8",
26-
"apexcharts": "^3.45.1",
27-
"bootstrap": "^5.3.2",
28-
"ng-apexcharts": "^1.8.0",
26+
"apexcharts": "^3.49.0",
27+
"bootstrap": "^5.3.3",
28+
"ng-apexcharts": "^1.10.0",
2929
"ngx-scrollbar": "^13.0.3",
3030
"rxjs": "~7.8.1",
3131
"tslib": "^2.6.2",
32-
"zone.js": "~0.14.3"
32+
"zone.js": "~0.14.4"
3333
},
3434
"devDependencies": {
35-
"@angular-devkit/build-angular": "^17.1.0",
36-
"@angular/cli": "~17.1.0",
37-
"@angular/compiler-cli": "^17.1.0",
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",
3838
"@types/jasmine": "~5.1.4",
39-
"jasmine-core": "~5.1.1",
40-
"karma": "~6.4.2",
39+
"jasmine-core": "~5.1.2",
40+
"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.4",
46-
"typescript": "~5.2.2"
45+
"prettier": "3.2.5",
46+
"typescript": "5.4"
4747
}
4848
}

‎src/app/app-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export class BerryConfig {
22
static isCollapse_menu: boolean = false;
3-
static fontFamily: string = 'Roboto'; // Roboto, poppins, inter
3+
static font_family: string = 'Roboto'; // Roboto, poppins, inter
44
}

‎src/app/app-routing.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const routes: Routes = [
1515
},
1616
{
1717
path: 'default',
18-
loadComponent: () => import('./demo/default/default.component')
18+
loadComponent: () => import('./demo/default/default.component').then((c) => c.DefaultComponent)
1919
},
2020
{
2121
path: 'typography',

‎src/app/demo/default/bajaj-chart/bajaj-chart.component.html‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<apx-chart
2+
[series]="chartOptions.series"
3+
[chart]="chartOptions.chart"
4+
[dataLabels]="chartOptions.dataLabels"
5+
[plotOptions]="chartOptions.plotOptions"
6+
[responsive]="chartOptions.responsive"
7+
[colors]="chartOptions.colors"
8+
[tooltip]="chartOptions.tooltip"
9+
[stroke]="chartOptions.stroke"
10+
></apx-chart>

‎src/app/demo/default/bajaj-chart/bajaj-chart.component.scss‎

Whitespace-only changes.

‎src/app/demo/default/bajaj-chart/bajaj-chart.component.ts‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
// angular import
2+
import { Component, ViewChild } from '@angular/core';
3+
4+
// project import
5+
import { SharedModule } from 'src/app/theme/shared/shared.module';
6+
7+
// third party
8+
import {
9+
NgApexchartsModule,
10+
ApexChart,
11+
ChartComponent,
12+
ApexDataLabels,
13+
ApexAxisChartSeries,
14+
ApexTooltip,
15+
ApexPlotOptions,
16+
ApexResponsive,
17+
ApexStroke
18+
} from 'ng-apexcharts';
19+
20+
export type ChartOptions = {
21+
series: ApexAxisChartSeries;
22+
chart: ApexChart;
23+
dataLabels: ApexDataLabels;
24+
plotOptions: ApexPlotOptions;
25+
responsive: ApexResponsive[];
26+
colors: string[];
27+
stroke: ApexStroke;
28+
tooltip: ApexTooltip;
29+
};
30+
31+
@Component({
32+
selector: 'app-bajaj-chart',
33+
standalone: true,
34+
imports: [SharedModule, NgApexchartsModule],
35+
templateUrl: './bajaj-chart.component.html',
36+
styleUrl: './bajaj-chart.component.scss'
37+
})
38+
export class BajajChartComponent {
39+
// public props
40+
@ViewChild('chart') chart!: ChartComponent;
41+
chartOptions!: Partial<ChartOptions>;
42+
43+
// constructor
44+
constructor() {
45+
this.chartOptions = {
46+
chart: {
47+
type: 'area',
48+
height: 95,
49+
stacked: true,
50+
sparkline: {
51+
enabled: true
52+
},
53+
background: 'transparent'
54+
},
55+
stroke: {
56+
curve: 'smooth',
57+
width: 1
58+
},
59+
series: [
60+
{
61+
data: [0, 15, 10, 50, 30, 40, 25]
62+
}
63+
],
64+
tooltip: {
65+
theme: 'light',
66+
fixed: {
67+
enabled: false
68+
},
69+
x: {
70+
show: false
71+
},
72+
y: {
73+
title: {
74+
formatter: () => 'Ticket '
75+
}
76+
},
77+
marker: {
78+
show: false
79+
}
80+
},
81+
colors: ['#673ab7']
82+
};
83+
}
84+
}

‎src/app/demo/default/bar-chart/bar-chart.component.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<div class="card">
2+
<div class="card-body">
3+
<div class="row mb-3 align-items-center">
4+
<div class="col">
5+
<div class="text-sm">Total Growth</div>
6+
<h3 class="mt-2 f-w-600">$2,324.00</h3>
7+
</div>
8+
<div class="col-auto">
9+
<select class="form-select p-r-35" title="Select">
10+
<option>Today</option>
11+
<option selected>Month</option>
12+
<option>Year</option>
13+
</select>
14+
</div>
15+
</div>
16+
<apx-chart
17+
[series]="chartOptions.series"
18+
[chart]="chartOptions.chart"
19+
[dataLabels]="chartOptions.dataLabels"
20+
[plotOptions]="chartOptions.plotOptions"
21+
[responsive]="chartOptions.responsive"
22+
[xaxis]="chartOptions.xaxis"
23+
[colors]="chartOptions.colors"
24+
[tooltip]="chartOptions.tooltip"
25+
></apx-chart>
26+
</div>
27+
</div>

‎src/app/demo/default/bar-chart/bar-chart.component.scss‎

Whitespace-only changes.

‎src/app/demo/default/bar-chart/bar-chart.component.ts‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
// angular import
2+
import { Component, ViewChild } from '@angular/core';
3+
4+
// project import
5+
import { SharedModule } from 'src/app/theme/shared/shared.module';
6+
7+
// third party
8+
import {
9+
NgApexchartsModule,
10+
ApexChart,
11+
ChartComponent,
12+
ApexDataLabels,
13+
ApexAxisChartSeries,
14+
ApexXAxis,
15+
ApexYAxis,
16+
ApexTooltip,
17+
ApexPlotOptions,
18+
ApexResponsive
19+
} from 'ng-apexcharts';
20+
21+
export type ChartOptions = {
22+
series: ApexAxisChartSeries;
23+
chart: ApexChart;
24+
dataLabels: ApexDataLabels;
25+
plotOptions: ApexPlotOptions;
26+
responsive: ApexResponsive[];
27+
xaxis: ApexXAxis;
28+
colors: string[];
29+
yaxis: ApexYAxis;
30+
tooltip: ApexTooltip;
31+
};
32+
33+
@Component({
34+
selector: 'app-bar-chart',
35+
standalone: true,
36+
imports: [NgApexchartsModule, SharedModule],
37+
templateUrl: './bar-chart.component.html',
38+
styleUrl: './bar-chart.component.scss'
39+
})
40+
export class BarChartComponent {
41+
// public props
42+
@ViewChild('chart') chart!: ChartComponent;
43+
chartOptions!: Partial<ChartOptions>;
44+
45+
// Constructor
46+
constructor() {
47+
this.chartOptions = {
48+
series: [
49+
{
50+
name: 'Investment',
51+
data: [35, 125, 35, 35, 35, 80, 35, 20, 35, 45, 15, 75]
52+
},
53+
{
54+
name: 'Loss',
55+
data: [35, 15, 15, 35, 65, 40, 80, 25, 15, 85, 25, 75]
56+
},
57+
{
58+
name: 'Profit',
59+
data: [35, 145, 35, 35, 20, 105, 100, 10, 65, 45, 30, 10]
60+
},
61+
{
62+
name: 'Maintenance',
63+
data: [0, 0, 75, 0, 0, 115, 0, 0, 0, 0, 150, 0]
64+
}
65+
],
66+
dataLabels: {
67+
enabled: false
68+
},
69+
chart: {
70+
type: 'bar',
71+
height: 480,
72+
stacked: true,
73+
toolbar: {
74+
show: true
75+
},
76+
background: 'transparent'
77+
},
78+
colors: ['#d3eafd', '#2196f3', '#673ab7', '#ede7f6'],
79+
responsive: [
80+
{
81+
breakpoint: 480,
82+
options: {
83+
legend: {
84+
position: 'bottom',
85+
offsetX: -10,
86+
offsetY: 0
87+
}
88+
}
89+
}
90+
],
91+
plotOptions: {
92+
bar: {
93+
horizontal: false,
94+
columnWidth: '50%'
95+
}
96+
},
97+
xaxis: {
98+
type: 'category',
99+
categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
100+
},
101+
tooltip: {
102+
theme: 'light'
103+
}
104+
};
105+
}
106+
}

0 commit comments

Comments
 (0)