diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 137371e..c1f18a4 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -22,18 +22,18 @@ jobs: - name: 🚚 Get latest code uses: actions/checkout@v2 - - name: Use Node.js 18 + - name: Use Node.js 20 uses: actions/setup-node@v2-beta with: - node-version: '18' + node-version: '20.x' - name: 🔨 Build Project run: | - npm i --legacy-peer-deps - npm run build-prod + yarn + yarn build-prod - name: 📂 Deploy to Server - uses: easingthemes/ssh-deploy@v2.1.5 + uses: easingthemes/ssh-deploy@main env: SSH_PRIVATE_KEY: ${{ secrets.SERVER_SSH_KEY }} # ARGS: "-rltgoDzvO --delete" diff --git a/.prettierrc b/.prettierrc index dbd0dce..d29b0e5 100644 --- a/.prettierrc +++ b/.prettierrc @@ -5,6 +5,6 @@ "trailingComma": "none", "tabWidth": 2, "useTabs": false, - "htmlWhitespaceSensitivity": "strict", + "htmlWhitespaceSensitivity": "ignore", "bracketSameLine": false } diff --git a/README.md b/README.md index 870e55c..e1a227d 100644 --- a/README.md +++ b/README.md @@ -12,17 +12,17 @@ Berry is a free angular admin dashboard template built with Angular and latest B [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. -| [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) | -| ----------------------------------------------------- | :---------------------------------------------------------------------------------------- | -| **9** Demo pages | **45+** demo pages | -| - | ✓ Multi-language | -| - | ✓ Dark/Light Mode 🌓 | -| - | ✓ TypeScript version | -| - | ✓ Design files (Figma) | -| - | ✓ 6+ color Options | -| - | ✓ RTL | -| - | ✓ JWT authentications | -| - | ✓ [More components](https://berrydashboard.io/angular/default/basic/alert) | +| [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) | +| ----------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| **9** Demo pages | **45+** demo pages | +| - | ✓ Multi-language | +| - | ✓ Dark/Light Mode 🌓 | +| - | ✓ TypeScript version | +| - | ✓ Design files (Figma) | +| - | ✓ 6+ color Options | +| - | ✓ RTL | +| - | ✓ JWT authentications | +| - | ✓ [More components](https://berrydashboard.io/angular/default/basic/alert) | ## Why Berry? diff --git a/package.json b/package.json index b2a7f00..2801f3c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "berry-free-angular-admin-template", - "version": "4.0.0", + "version": "4.1.0", "author": "CodedThemes", "license": "MIT", "scripts": { @@ -12,29 +12,29 @@ "test": "ng test" }, "dependencies": { - "@angular/animations": "^18.0.0-next.3", - "@angular/cdk": "^17.3.6", - "@angular/common": "^18.0.0-next.3", - "@angular/compiler": "^18.0.0-next.3", - "@angular/core": "^18.0.0-next.3", - "@angular/forms": "^18.0.0-next.3", - "@angular/platform-browser": "^18.0.0-next.3", - "@angular/platform-browser-dynamic": "^18.0.0-next.3", - "@angular/router": "^18.0.0-next.3", - "@ng-bootstrap/ng-bootstrap": "^16.0.0", + "@angular/animations": "^18.0.5", + "@angular/cdk": "^18.0.5", + "@angular/common": "^18.0.5", + "@angular/compiler": "^18.0.5", + "@angular/core": "^18.0.5", + "@angular/forms": "^18.0.5", + "@angular/platform-browser": "^18.0.5", + "@angular/platform-browser-dynamic": "^18.0.5", + "@angular/router": "^18.0.5", + "@ng-bootstrap/ng-bootstrap": "^17.0.0", "@popperjs/core": "^2.11.8", - "apexcharts": "^3.49.0", + "apexcharts": "^3.49.2", "bootstrap": "^5.3.3", - "ng-apexcharts": "^1.10.0", - "ngx-scrollbar": "^13.0.3", + "ng-apexcharts": "^1.11.0", + "ngx-scrollbar": "^15.0.1", "rxjs": "~7.8.1", - "tslib": "^2.6.2", - "zone.js": "~0.14.4" + "tslib": "^2.6.3", + "zone.js": "~0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "^18.0.0-next.3", - "@angular/cli": "~18.0.0-next.3", - "@angular/compiler-cli": "^18.0.0-next.3", + "@angular-devkit/build-angular": "^18.0.6", + "@angular/cli": "~18.0.6", + "@angular/compiler-cli": "^18.0.5", "@types/jasmine": "~5.1.4", "jasmine-core": "~5.1.2", "karma": "~6.4.3", @@ -42,7 +42,7 @@ "karma-coverage": "~2.2.1", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.1.0", - "prettier": "3.2.5", + "prettier": "3.3.2", "typescript": "5.4" } } diff --git a/src/app/demo/default/chart-data-month/chart-data-month.component.html b/src/app/demo/default/chart-data-month/chart-data-month.component.html index 69e0f0a..1669665 100644 --- a/src/app/demo/default/chart-data-month/chart-data-month.component.html +++ b/src/app/demo/default/chart-data-month/chart-data-month.component.html @@ -6,18 +6,21 @@
-
Month
-
Year
+
+ Month +
+
+ Year +
- ${{ amount }} + + ${{ amount }} + +

C/W Last Year

diff --git a/src/app/demo/default/default.component.html b/src/app/demo/default/default.component.html index 3661210..a1e6f4a 100644 --- a/src/app/demo/default/default.component.html +++ b/src/app/demo/default/default.component.html @@ -22,7 +22,10 @@
- $500.00 + + $500.00 + +

Total Earning

@@ -75,7 +78,7 @@

$203k

Popular Stocks

-
+
@@ -101,10 +104,10 @@
{{ list.name }}

- {{ list.invest - }} + {{ list.invest }} + + +

@@ -112,7 +115,10 @@

}
- View all + + View all + +
diff --git a/src/app/demo/elements/element-color/element-color.component.html b/src/app/demo/elements/element-color/element-color.component.html index 6c65d09..00edf75 100644 --- a/src/app/demo/elements/element-color/element-color.component.html +++ b/src/app/demo/elements/element-color/element-color.component.html @@ -50,15 +50,15 @@

Text Color
text-blue-900
-
text-purple-100
-
text-purple-200
-
text-purple-300
-
text-purple-400
-
text-purple-500
-
text-purple-600
-
text-purple-700
-
text-purple-800
-
text-purple-900
+
text-purple-100
+
text-purple-200
+
text-purple-300
+
text-purple-400
+
text-purple-500
+
text-purple-600
+
text-purple-700
+
text-purple-800
+
text-purple-900
diff --git a/src/app/demo/elements/typography/typography.component.html b/src/app/demo/elements/typography/typography.component.html index 5079731..dfe5834 100644 --- a/src/app/demo/elements/typography/typography.component.html +++ b/src/app/demo/elements/typography/typography.component.html @@ -4,10 +4,11 @@
Headings
-

.h1 through .h6 classes are also available, for when you want to match the font styling of a heading - but cannot use the associated HTML element.

+

+ .h1 + through .h6 classes are also available, for when you want to match the font styling of a heading but cannot use the associated + HTML element. +

h1. Heading

@@ -47,7 +48,8 @@
Inline Text Elements

Your title goes here

You can use the mark tag to - highlight text. + highlight + text.
This line of text is meant to be treated as deleted text.
@@ -65,13 +67,13 @@
Inline Text Elements
Contextual Text Colors
-

Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.

-

Nullam id dolor id nibh ultricies vehicula ut id elit.

-

Duis mollis, est non commodo luctus, nisi erat porttitor ligula.

-

Maecenas sed diam eget risus varius blandit sit amet non magna.

-

Etiam porta sem malesuada magna mollis euismod.

-

Donec ullamcorper nulla non metus auctor fringilla.

-

Nullam id dolor id nibh ultricies vehicula ut id elit.

+

Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.

+

Nullam id dolor id nibh ultricies vehicula ut id elit.

+

Duis mollis, est non commodo luctus, nisi erat porttitor ligula.

+

Maecenas sed diam eget risus varius blandit sit amet non magna.

+

Etiam porta sem malesuada magna mollis euismod.

+

Donec ullamcorper nulla non metus auctor fringilla.

+

Nullam id dolor id nibh ultricies vehicula ut id elit.

@@ -86,8 +88,8 @@
Unordered
  • Consectetur adipiscing elit
  • Integer molestie lorem at massa
  • Facilisis in pretium nisl aliquet
  • -
  • Nulla volutpat aliquam velit +
  • + Nulla volutpat aliquam velit