Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:

steps:
- name: 🚚 Get latest code
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js 20
uses: actions/setup-node@v2-beta
- name: Use Node.js 22
uses: actions/setup-node@v4
with:
node-version: '20.x'
node-version: '22'

- name: 🔨 Build Project
run: |
Expand All @@ -38,7 +38,8 @@ jobs:
SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }}
# ARGS: "-rltgoDzvO --delete"
SOURCE: 'dist/'
REMOTE_HOST: 192.34.62.123
REMOTE_USER: berry
TARGET: public_html/angular/free
REMOTE_HOST: 145.79.3.173
REMOTE_USER: u965251139
REMOTE_PORT: "65002"
TARGET: domains/berrydashboard.com/public_html/angular/free
EXCLUDE: '/node_modules/'
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"tabWidth": 2,
"useTabs": false,
"htmlWhitespaceSensitivity": "ignore",
"bracketSameLine": false
"bracketSameLine": false,
"endOfLine": "lf"
}
86 changes: 50 additions & 36 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,46 +1,60 @@
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import js from '@eslint/js';
import { FlatCompat } from '@eslint/eslintrc';

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [{
ignores: ["projects/**/*"],
}, ...compat.extends(
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates",
).map(config => ({
...config,
files: ["**/*.ts"],
})), {
files: ["**/*.ts"],
export default [
{
ignores: ['projects/**/*']
},
...compat
.extends(
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@angular-eslint/recommended',
'plugin:@angular-eslint/template/process-inline-templates'
)
.map((config) => ({
...config,
files: ['**/*.ts']
})),
{
files: ['**/*.ts'],

rules: {
"@angular-eslint/directive-selector": ["error", {
type: "attribute",
prefix: "app",
style: "camelCase",
}],
'@angular-eslint/directive-selector': [
'error',
{
type: 'attribute',
prefix: 'app',
style: 'camelCase'
}
],

"@angular-eslint/component-selector": ["error", {
type: "element",
prefix: "app",
style: "kebab-case",
}],
},
}, ...compat.extends("plugin:@angular-eslint/template/recommended").map(config => ({
'@angular-eslint/component-selector': [
'error',
{
type: 'element',
prefix: 'app',
style: 'kebab-case'
}
]
}
},
...compat.extends('plugin:@angular-eslint/template/recommended').map((config) => ({
...config,
files: ["**/*.html"],
})), {
files: ["**/*.html"],
rules: {},
}];
files: ['**/*.html']
})),
{
files: ['**/*.html'],
rules: {}
}
];
54 changes: 29 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "berry-free-angular-admin-template",
"version": "5.1.0",
"version": "5.2.0",
"author": "CodedThemes",
"license": "MIT",
"private": false,
Expand All @@ -16,36 +16,40 @@
"prettier": "prettier --write ./src"
},
"dependencies": {
"@angular/animations": "20.0.0-next.8",
"@angular/cdk": "19.2.17",
"@angular/common": "20.0.0-next.8",
"@angular/compiler": "20.0.0-next.8",
"@angular/core": "20.0.0-next.8",
"@angular/forms": "20.0.0-next.8",
"@angular/platform-browser": "20.0.0-next.8",
"@angular/platform-browser-dynamic": "20.0.0-next.8",
"@angular/router": "20.0.0-next.8",
"@ng-bootstrap/ng-bootstrap": "18.0.0",
"@angular/animations": "20.0.5",
"@angular/cdk": "20.0.4",
"@angular/common": "20.0.5",
"@angular/compiler": "20.0.5",
"@angular/core": "20.0.5",
"@angular/forms": "20.0.5",
"@angular/platform-browser": "20.0.5",
"@angular/platform-browser-dynamic": "20.0.5",
"@angular/router": "20.0.5",
"@ng-bootstrap/ng-bootstrap": "19.0.0",
"@popperjs/core": "2.11.8",
"apexcharts": "4.7.0",
"bootstrap": "5.3.6",
"ng-apexcharts": "1.15.0",
"bootstrap": "5.3.7",
"ng-apexcharts": "1.16.0",
"ngx-scrollbar": "18.0.0",
"rxjs": "~7.8.2",
"tslib": "2.8.1",
"zone.js": "~0.15.0"
"zone.js": "~0.15.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "20.0.0-next.8",
"@angular/cli": "20.0.0-next.8",
"@angular/compiler-cli": "20.0.0-next.8",
"@angular-devkit/build-angular": "20.0.4",
"@angular-eslint/builder": "20.1.1",
"@angular-eslint/eslint-plugin": "20.1.1",
"@angular-eslint/eslint-plugin-template": "20.1.1",
"@angular-eslint/schematics": "20.1.1",
"@angular-eslint/template-parser": "20.1.1",
"@angular/cli": "20.0.4",
"@angular/compiler-cli": "20.0.5",
"@eslint/eslintrc": "3.3.1",
"@eslint/js": "9.27.0",
"@types/jasmine": "5.1.8",
"angular-eslint": "19.4.0",
"eslint": "9.27.0",
"prettier": "3.5.3",
"typescript": "5.8.3",
"typescript-eslint": "8.30.1"
"@eslint/js": "9.29.0",
"@typescript-eslint/eslint-plugin": "8.35.0",
"@typescript-eslint/parser": "8.35.0",
"eslint": "9.29.0",
"prettier": "3.6.1",
"typescript": "5.8.3"
}
}
}
14 changes: 9 additions & 5 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ const routes: Routes = [
},
{
path: 'typography',
loadComponent: () => import('./demo/elements/typography/typography.component')
loadComponent: () => import('./demo/elements/typography/typography.component').then((c) => c.TypographyComponent)
},
{
path: 'color',
loadComponent: () => import('./demo/elements/element-color/element-color.component')
loadComponent: () => import('./demo/elements/element-color/element-color.component').then((c) => c.ElementColorComponent)
},
{
path: 'sample-page',
loadComponent: () => import('./demo/other/sample-page/sample-page.component')
loadComponent: () => import('./demo/other/sample-page/sample-page.component').then((c) => c.SamplePageComponent)
}
]
},
Expand All @@ -36,8 +36,12 @@ const routes: Routes = [
component: GuestComponent,
children: [
{
path: 'guest',
loadChildren: () => import('./demo/pages/authentication/authentication.module').then((m) => m.AuthenticationModule)
path: 'login',
loadComponent: () => import('./demo/pages/authentication/login/login.component').then((c) => c.LoginComponent)
},
{
path: 'register',
loadComponent: () => import('./demo/pages/authentication/register/register.component').then((c) => c.RegisterComponent)
}
]
}
Expand Down
1 change: 1 addition & 0 deletions src/app/app.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This file is intentionally left empty to allow customers to add custom CSS if needed.
3 changes: 3 additions & 0 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
// Angular import
import { Component } from '@angular/core';
import { RouterOutlet } from '@angular/router';

// project import
import { SpinnerComponent } from './theme/shared/components/spinner/spinner.component';

@Component({
Expand Down
2 changes: 1 addition & 1 deletion src/app/demo/admin-panel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:

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.

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

## Included in the Pro Version:

Expand Down
2 changes: 1 addition & 1 deletion src/app/demo/application/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:

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.

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

## Included in the Pro Version:

Expand Down
2 changes: 1 addition & 1 deletion src/app/demo/chart-maps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:

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.

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

## Included in the Pro Version:

Expand Down
3 changes: 1 addition & 2 deletions src/app/demo/dashboard/default/default.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Angular Import
import { Component } from '@angular/core';
import { CommonModule } from '@angular/common';

// project import
import { SharedModule } from 'src/app/theme/shared/shared.module';
Expand All @@ -10,7 +9,7 @@ import { ChartDataMonthComponent } from 'src/app/theme/shared/components/apexcha

@Component({
selector: 'app-default',
imports: [CommonModule, BajajChartComponent, BarChartComponent, ChartDataMonthComponent, SharedModule],
imports: [BajajChartComponent, BarChartComponent, ChartDataMonthComponent, SharedModule],
templateUrl: './default.component.html',
styleUrls: ['./default.component.scss']
})
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This file is intentionally left empty to allow customers to add custom CSS if needed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ import { Component } from '@angular/core';
templateUrl: './element-color.component.html',
styleUrls: ['./element-color.component.scss']
})
export default class ElementColorComponent {}
export class ElementColorComponent {}
1 change: 1 addition & 0 deletions src/app/demo/elements/typography/typography.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This file is intentionally left empty to allow customers to add custom CSS if needed.
2 changes: 1 addition & 1 deletion src/app/demo/elements/typography/typography.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ import { Component } from '@angular/core';
templateUrl: './typography.component.html',
styleUrls: ['./typography.component.scss']
})
export default class TypographyComponent {}
export class TypographyComponent {}
2 changes: 1 addition & 1 deletion src/app/demo/forms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:

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.

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

## Included in the Pro Version:

Expand Down
2 changes: 1 addition & 1 deletion src/app/demo/layout/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please continue reading below to explore the features of the Pro version:

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.

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

## Included in the Pro Version:

Expand Down
1 change: 1 addition & 0 deletions src/app/demo/other/sample-page/sample-page.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This file is intentionally left empty to allow customers to add custom CSS if needed.
3 changes: 1 addition & 2 deletions src/app/demo/other/sample-page/sample-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import { Component } from '@angular/core';

// project import

import { CardComponent } from '../../../theme/shared/components/card/card.component';

@Component({
Expand All @@ -11,4 +10,4 @@ import { CardComponent } from '../../../theme/shared/components/card/card.compon
templateUrl: './sample-page.component.html',
styleUrls: ['./sample-page.component.scss']
})
export default class SamplePageComponent {}
export class SamplePageComponent {}
24 changes: 0 additions & 24 deletions src/app/demo/pages/authentication/authentication-routing.module.ts

This file was deleted.

10 changes: 0 additions & 10 deletions src/app/demo/pages/authentication/authentication.module.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h5 class="text-secondary">
</div>
<hr />
<h5 class="d-flex justify-content-center">
<a [routerLink]="['/guest/register']">Don't have an account?</a>
<a [routerLink]="['/register']">Don't have an account?</a>
</h5>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// This file is intentionally left empty to allow customers to add custom CSS if needed.
2 changes: 1 addition & 1 deletion src/app/demo/pages/authentication/login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ import { RouterModule } from '@angular/router';
templateUrl: './login.component.html',
styleUrls: ['./login.component.scss']
})
export default class LoginComponent {}
export class LoginComponent {}
Loading