Skip to content

Commit 972cf7f

Browse files
ct-dixitct-dixit
authored
package upgrade and angular 20 (#22)
* package upgrade and angular 20 * ip host update * Update prod.yml * prettier rules change and package upgarde
1 parent 103e9ce commit 972cf7f

File tree

67 files changed

+2013
-2179
lines changed

Some content is hidden

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

67 files changed

+2013
-2179
lines changed

‎.github/workflows/prod.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020

2121
steps:
2222
- name: 🚚 Get latest code
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424

25-
- name: Use Node.js 20
26-
uses: actions/setup-node@v2-beta
25+
- name: Use Node.js 22
26+
uses: actions/setup-node@v4
2727
with:
28-
node-version: '20.x'
28+
node-version: '22'
2929

3030
- name: 🔨 Build Project
3131
run: |
@@ -38,7 +38,8 @@ jobs:
3838
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
3939
# ARGS: "-rltgoDzvO --delete"
4040
SOURCE: 'dist/'
41-
REMOTE_HOST: 192.34.62.123
42-
REMOTE_USER: berry
43-
TARGET: public_html/angular/free
41+
REMOTE_HOST: 145.79.3.173
42+
REMOTE_USER: u965251139
43+
REMOTE_PORT: "65002"
44+
TARGET: domains/berrydashboard.com/public_html/angular/free
4445
EXCLUDE: '/node_modules/'

‎.prettierrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"tabWidth": 2,
77
"useTabs": false,
88
"htmlWhitespaceSensitivity": "ignore",
9-
"bracketSameLine": false
9+
"bracketSameLine": false,
10+
"endOfLine": "lf"
1011
}

‎eslint.config.mjs‎

Lines changed: 50 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,60 @@
1-
import path from "node:path";
2-
import { fileURLToPath } from "node:url";
3-
import js from "@eslint/js";
4-
import { FlatCompat } from "@eslint/eslintrc";
1+
import path from 'node:path';
2+
import { fileURLToPath } from 'node:url';
3+
import js from '@eslint/js';
4+
import { FlatCompat } from '@eslint/eslintrc';
55

66
const __filename = fileURLToPath(import.meta.url);
77
const __dirname = path.dirname(__filename);
88
const compat = new FlatCompat({
9-
baseDirectory: __dirname,
10-
recommendedConfig: js.configs.recommended,
11-
allConfig: js.configs.all
9+
baseDirectory: __dirname,
10+
recommendedConfig: js.configs.recommended,
11+
allConfig: js.configs.all
1212
});
1313

14-
export default [{
15-
ignores: ["projects/**/*"],
16-
}, ...compat.extends(
17-
"eslint:recommended",
18-
"plugin:@typescript-eslint/recommended",
19-
"plugin:@angular-eslint/recommended",
20-
"plugin:@angular-eslint/template/process-inline-templates",
21-
).map(config => ({
22-
...config,
23-
files: ["**/*.ts"],
24-
})), {
25-
files: ["**/*.ts"],
14+
export default [
15+
{
16+
ignores: ['projects/**/*']
17+
},
18+
...compat
19+
.extends(
20+
'eslint:recommended',
21+
'plugin:@typescript-eslint/recommended',
22+
'plugin:@angular-eslint/recommended',
23+
'plugin:@angular-eslint/template/process-inline-templates'
24+
)
25+
.map((config) => ({
26+
...config,
27+
files: ['**/*.ts']
28+
})),
29+
{
30+
files: ['**/*.ts'],
2631

2732
rules: {
28-
"@angular-eslint/directive-selector": ["error", {
29-
type: "attribute",
30-
prefix: "app",
31-
style: "camelCase",
32-
}],
33+
'@angular-eslint/directive-selector': [
34+
'error',
35+
{
36+
type: 'attribute',
37+
prefix: 'app',
38+
style: 'camelCase'
39+
}
40+
],
3341

34-
"@angular-eslint/component-selector": ["error", {
35-
type: "element",
36-
prefix: "app",
37-
style: "kebab-case",
38-
}],
39-
},
40-
}, ...compat.extends("plugin:@angular-eslint/template/recommended").map(config => ({
42+
'@angular-eslint/component-selector': [
43+
'error',
44+
{
45+
type: 'element',
46+
prefix: 'app',
47+
style: 'kebab-case'
48+
}
49+
]
50+
}
51+
},
52+
...compat.extends('plugin:@angular-eslint/template/recommended').map((config) => ({
4153
...config,
42-
files: ["**/*.html"],
43-
})), {
44-
files: ["**/*.html"],
45-
rules: {},
46-
}];
54+
files: ['**/*.html']
55+
})),
56+
{
57+
files: ['**/*.html'],
58+
rules: {}
59+
}
60+
];

‎package.json‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "berry-free-angular-admin-template",
3-
"version": "5.1.0",
3+
"version": "5.2.0",
44
"author": "CodedThemes",
55
"license": "MIT",
66
"private": false,
@@ -16,36 +16,40 @@
1616
"prettier": "prettier --write ./src"
1717
},
1818
"dependencies": {
19-
"@angular/animations": "20.0.0-next.8",
20-
"@angular/cdk": "19.2.17",
21-
"@angular/common": "20.0.0-next.8",
22-
"@angular/compiler": "20.0.0-next.8",
23-
"@angular/core": "20.0.0-next.8",
24-
"@angular/forms": "20.0.0-next.8",
25-
"@angular/platform-browser": "20.0.0-next.8",
26-
"@angular/platform-browser-dynamic": "20.0.0-next.8",
27-
"@angular/router": "20.0.0-next.8",
28-
"@ng-bootstrap/ng-bootstrap": "18.0.0",
19+
"@angular/animations": "20.0.5",
20+
"@angular/cdk": "20.0.4",
21+
"@angular/common": "20.0.5",
22+
"@angular/compiler": "20.0.5",
23+
"@angular/core": "20.0.5",
24+
"@angular/forms": "20.0.5",
25+
"@angular/platform-browser": "20.0.5",
26+
"@angular/platform-browser-dynamic": "20.0.5",
27+
"@angular/router": "20.0.5",
28+
"@ng-bootstrap/ng-bootstrap": "19.0.0",
2929
"@popperjs/core": "2.11.8",
3030
"apexcharts": "4.7.0",
31-
"bootstrap": "5.3.6",
32-
"ng-apexcharts": "1.15.0",
31+
"bootstrap": "5.3.7",
32+
"ng-apexcharts": "1.16.0",
3333
"ngx-scrollbar": "18.0.0",
3434
"rxjs": "~7.8.2",
3535
"tslib": "2.8.1",
36-
"zone.js": "~0.15.0"
36+
"zone.js": "~0.15.1"
3737
},
3838
"devDependencies": {
39-
"@angular-devkit/build-angular": "20.0.0-next.8",
40-
"@angular/cli": "20.0.0-next.8",
41-
"@angular/compiler-cli": "20.0.0-next.8",
39+
"@angular-devkit/build-angular": "20.0.4",
40+
"@angular-eslint/builder": "20.1.1",
41+
"@angular-eslint/eslint-plugin": "20.1.1",
42+
"@angular-eslint/eslint-plugin-template": "20.1.1",
43+
"@angular-eslint/schematics": "20.1.1",
44+
"@angular-eslint/template-parser": "20.1.1",
45+
"@angular/cli": "20.0.4",
46+
"@angular/compiler-cli": "20.0.5",
4247
"@eslint/eslintrc": "3.3.1",
43-
"@eslint/js": "9.27.0",
44-
"@types/jasmine": "5.1.8",
45-
"angular-eslint": "19.4.0",
46-
"eslint": "9.27.0",
47-
"prettier": "3.5.3",
48-
"typescript": "5.8.3",
49-
"typescript-eslint": "8.30.1"
48+
"@eslint/js": "9.29.0",
49+
"@typescript-eslint/eslint-plugin": "8.35.0",
50+
"@typescript-eslint/parser": "8.35.0",
51+
"eslint": "9.29.0",
52+
"prettier": "3.6.1",
53+
"typescript": "5.8.3"
5054
}
51-
}
55+
}

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ const routes: Routes = [
1919
},
2020
{
2121
path: 'typography',
22-
loadComponent: () => import('./demo/elements/typography/typography.component')
22+
loadComponent: () => import('./demo/elements/typography/typography.component').then((c) => c.TypographyComponent)
2323
},
2424
{
2525
path: 'color',
26-
loadComponent: () => import('./demo/elements/element-color/element-color.component')
26+
loadComponent: () => import('./demo/elements/element-color/element-color.component').then((c) => c.ElementColorComponent)
2727
},
2828
{
2929
path: 'sample-page',
30-
loadComponent: () => import('./demo/other/sample-page/sample-page.component')
30+
loadComponent: () => import('./demo/other/sample-page/sample-page.component').then((c) => c.SamplePageComponent)
3131
}
3232
]
3333
},
@@ -36,8 +36,12 @@ const routes: Routes = [
3636
component: GuestComponent,
3737
children: [
3838
{
39-
path: 'guest',
40-
loadChildren: () => import('./demo/pages/authentication/authentication.module').then((m) => m.AuthenticationModule)
39+
path: 'login',
40+
loadComponent: () => import('./demo/pages/authentication/login/login.component').then((c) => c.LoginComponent)
41+
},
42+
{
43+
path: 'register',
44+
loadComponent: () => import('./demo/pages/authentication/register/register.component').then((c) => c.RegisterComponent)
4145
}
4246
]
4347
}

‎src/app/app.component.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// This file is intentionally left empty to allow customers to add custom CSS if needed.

‎src/app/app.component.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
// Angular import
12
import { Component } from '@angular/core';
23
import { RouterOutlet } from '@angular/router';
4+
5+
// project import
36
import { SpinnerComponent } from './theme/shared/components/spinner/spinner.component';
47

58
@Component({

‎src/app/demo/admin-panel/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:
66

77
Elevate your project with the Pro Version of the <b>Berry Admin Panel!</b> Built to cater to modern web applications, the Pro version is loaded with advanced features, intuitive design elements, and dynamic tools that ensure seamless functionality.
88

9-
This page (folder) is a sneak peek into the premium features available in <b>version 4.0.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
9+
This page (folder) is a sneak peek into the premium features available in <b>version 4.2.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
1010

1111
## Included in the Pro Version:
1212

‎src/app/demo/application/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:
66

77
Elevate your project with the Pro Version of the <b>Berry Admin Panel!</b> Built to cater to modern web applications, the Pro version is loaded with advanced features, intuitive design elements, and dynamic tools that ensure seamless functionality.
88

9-
This page (folder) is a sneak peek into the premium features available in <b>version 4.0.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
9+
This page (folder) is a sneak peek into the premium features available in <b>version 4.2.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
1010

1111
## Included in the Pro Version:
1212

‎src/app/demo/chart-maps/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:
66

77
Elevate your project with the Pro Version of the <b>Berry Admin Panel!</b> Built to cater to modern web applications, the Pro version is loaded with advanced features, intuitive design elements, and dynamic tools that ensure seamless functionality.
88

9-
This page (folder) is a sneak peek into the premium features available in <b>version 4.0.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
9+
This page (folder) is a sneak peek into the premium features available in <b>version 4.2.0</b>. Upgrade to the Pro version to unlock exclusive pages and components that will take your project to the next level.
1010

1111
## Included in the Pro Version:
1212

0 commit comments

Comments
 (0)