Skip to content

Commit

Permalink
feat: upgrade to angular9, upgrade to nebular 5.0, add material theme…
Browse files Browse the repository at this point in the history
… (#5694)

* chore: update README for extra theme (#5466)

* fix(tinymce): set absolute path for skin url (#5491)

* feat: add calendar with week numbers example (#5515)

* chore(readme): update bundles section text

* fix(forms): add missing forms module import (#5530)

* feat: update Nebular to 4.4.0 (#5533)

* chore(readme): update bundles image (#5565)

* chore: add bundles black friday deal (#5569)

* chore(readme): update black friday 2019 image (#5570)

* chore(readme): remove bundles discounts image (#5574)

* chore(readme): update bundles image (#5575)

* feat(seo): add canonical tag (#5578)

* chore(analytics): add proper analytics tracking URLs (#5604)

* feat: Material theme

* feat: upgrade to Angular 9 and Nebular 5 (#5628)

BREAKING CHANGE:
Angular updated to version 9.
Nebular updated to version 5.
`@agm/core` replaced with `@angular/google-maps`.
`ng2-completer` replaced with `@akveo/ng2-completer`, read details [here](akveo/ng2-smart-table#1140 (comment)).

* Upgrade to the latest minor version of Angular

* Upgrade to the latest major version of Angular

* Upgrade to nebular 5 beta, remove "angular-tree-component" package

* Remove packages uncompatible with Ivy

* Fix post-upgrade errors

* Replace @agm/core with @angular/google-maps

* Fix search-map component using @angular/google-maps

* Move material theme files from @nebular

* Add missing images and change fg text color of dark material theme to bright white

* Implement ripple effect for material themes

* Add material style overrides

* Add ripple effects to controls across application

* Configure material theme, add material button and input examples

* Add toggle button example

* Fix lint warnings

* Add material menu icon for material themes

* Fix lint warnings for styles

* Set menu font-weight to normal for material themes

* Add "hover" and "active" styles for material menu

* Update material styles

* Override input styles for material themes

* Override select styles for material themes

* Hide rounded inputs for material themes

* Update material styles

* Remove non-material themes

* Revert "Remove non-material themes"

This reverts commit c2e3194.

* Fix actions color

* Fix lint warnings

* Fix scrollbar for "traffic" card

* Fix scroll for "user activity" card

* Revert "Fix scroll for "user activity" card"

This reverts commit 4d793b1.

* Revert "Fix scrollbar for "traffic" card"

This reverts commit b00da0d.

* Fix scroll for nb-list inside nb-card

* chore(readme): add material theme description

* Remove unused angular2-toaster package

* chore(readme): add material theme images

* chore(readme): update text

* Upgrade to @nebular 5 release

* feat: update ng2-smart-table to 1.6

* chore(readme): add info about material theme branch

* fix: put Material theme in front of others

Otherwise Material theme style override Nebular

* refactor(material): remove options list border radius

* refactor: material input new look

* fix(form-inputs): show material inputs
* feat(material): change inputs style

* refactor: improve observable layout change sharing

* feat: add safe delayed event of layout change

* fix: replace change layout with safe change

* fix: limit front card width to prevent map overflow before repaint

* build: starter-kit clean up

* feat: upgrade to angular 9

Co-authored-by: David Henley <henleydr@gmail.com>
Co-authored-by: Sergey Andrievskiy <yggg@users.noreply.github.com>
Co-authored-by: Leon Lafayette <me@le0n.io>
Co-authored-by: Vladimir Lugovsky <lugovsky.v@gmail.com>
Co-authored-by: Sergey Andrievskiy <s.andrievskiy@akveo.com>
Co-authored-by: Evgeny Lupanov <elupanov@users.noreply.github.com>
Co-authored-by: eugene-sinitsyn <e.sinitsyn.s@akveo.com>
Co-authored-by: Evgeny Lupanov <e.lupanov@akveo.com>
Co-authored-by: sashaqred <sashaqred@ya.ru>
Co-authored-by: Dmitry Nehaychik <4dmitr@gmail.com>
Co-authored-by: Maksim Karatkevich <m.karatkevich@akveo.com>
  • Loading branch information
12 people authored May 22, 2020
1 parent 4e13928 commit f91a5ef
Show file tree
Hide file tree
Showing 27 changed files with 18,310 additions and 13,456 deletions.
20 changes: 12 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,42 @@

[Who uses ngx-admin?](https://github.com/akveo/ngx-admin/issues/1645)| [Documentation](https://akveo.github.io/ngx-admin/?utm_source=github&utm_medium=ngx_admin_readme&utm_campaign=themes) | [Installation Guidelines](https://akveo.github.io/ngx-admin/docs/getting-started/what-is-ngxadmin?utm_source=github&utm_medium=ngx_admin_readme&utm_campaign=themes)

# Admin template based on Angular 8+ and <a href="https://github.com/akveo/nebular">Nebular</a>
# Admin template based on Angular 9+ and <a href="https://github.com/akveo/nebular">Nebular</a>
<a target="_blank" href="http://akveo.com/ngx-admin/pages/dashboard?theme=corporate&utm_source=github&utm_medium=ngx_admin_readme&utm_campaign=main_pic"><img src="https://i.imgur.com/mFdqvgG.png"/></a>

### Backend Integration Bundles
Easy way to integrate ngx-admin with backend (.NET, Node.js, Java etc.).

<a target="_blank" href="https://hubs.ly/H0qwC1L0">
<a target="_blank" href="https://hubs.ly/H0n4ZxC0">
<img src="https://i.imgur.com/Ywbs8cl.png"/>
</a>

[Checkout our Store](https://hubs.ly/H0qwC2Q0) for ready to use Backend Bundles.

### With 6 stunning visual themes

### With 3 stunning visual themes

#### Material Dark
<a target="_blank" href="https://hubs.ly/H0nxM3b0"><img src="https://i.imgur.com/csP0aZ9.png"/></a>

#### Material Light
<a target="_blank" href="https://hubs.ly/H0nxNmv0"><img src="https://i.imgur.com/J5Rmgn4.png"/></a>

#### Default
<a target="_blank" href="http://akveo.com/ngx-admin/pages/dashboard?theme=default&utm_source=github&utm_medium=ngx_admin_readme&utm_campaign=themes"><img src="https://i.imgur.com/Kn3xDKQ.png"/></a>
<a target="_blank" href="https://hubs.ly/H0n4Tgv0"><img src="https://i.imgur.com/Kn3xDKQ.png"/></a>

#### Dark
<a target="_blank" href="http://akveo.com/ngx-admin/pages/dashboard?theme=dark&utm_source=github&utm_medium=ngx_admin_readme&utm_campaign=themes"><img src="https://i.imgur.com/FAn5iXY.png"/></a>
<a target="_blank" href="https://hubs.ly/H0n4Th20"><img src="https://i.imgur.com/FAn5iXY.png"/></a>

#### Cosmic
<a target="_blank" href="http://akveo.com/ngx-admin/pages/dashboard?theme=cosmic&utm_source=github&utm_medium=ngx_admin_readme&utm_campaign=themes"><img src="https://i.imgur.com/iJu2YDF.png"/></a>
<a target="_blank" href="https://hubs.ly/H0n4Tj80"><img src="https://i.imgur.com/iJu2YDF.png"/></a>

#### Corporate
<a target="_blank" href="http://akveo.com/ngx-admin/pages/dashboard?theme=corporate&utm_source=github&utm_medium=ngx_admin_readme&utm_campaign=themes"><img src="https://i.imgur.com/GpUt6NW.png"/></a>
<a target="_blank" href="https://hubs.ly/H0n4TDQ0"><img src="https://i.imgur.com/GpUt6NW.png"/></a>

### What's included:

- Angular 8+ & Typescript
- Angular 9+ & Typescript
- Bootstrap 4+ & SCSS
- Responsive layout
- RTL support
Expand Down
56 changes: 49 additions & 7 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"preserveSymlinks": true,
"rebaseRootRelativeCssUrls": true,
"outputPath": "dist",
Expand All @@ -21,24 +22,45 @@
"assets": [
"src/assets",
"src/favicon.ico",
"src/favicon.png"
"src/favicon.png",
{
"glob": "**/*",
"input": "node_modules/leaflet/dist/images",
"output": "/assets/img/markers"
}
],
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.css",
"node_modules/typeface-exo/index.css",
"node_modules/roboto-fontface/css/roboto/roboto-fontface.css",
"node_modules/ionicons/scss/ionicons.scss",
"node_modules/@fortawesome/fontawesome-free/css/all.css",
"node_modules/socicon/css/socicon.css",
"node_modules/nebular-icons/scss/nebular-icons.scss",
"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
"node_modules/leaflet/dist/leaflet.css",
"src/app/@theme/styles/styles.scss"
],
"scripts": [
"node_modules/pace-js/pace.min.js"
"node_modules/pace-js/pace.min.js",
"node_modules/tinymce/tinymce.min.js",
"node_modules/tinymce/themes/modern/theme.min.js",
"node_modules/tinymce/plugins/link/plugin.min.js",
"node_modules/tinymce/plugins/paste/plugin.min.js",
"node_modules/tinymce/plugins/table/plugin.min.js",
"node_modules/echarts/dist/echarts.min.js",
"node_modules/echarts/dist/extension/bmap.min.js",
"node_modules/chart.js/dist/Chart.min.js"
]
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand Down Expand Up @@ -82,13 +104,22 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [
"node_modules/pace-js/pace.min.js"
"node_modules/pace-js/pace.min.js",
"node_modules/tinymce/tinymce.min.js",
"node_modules/tinymce/themes/modern/theme.min.js",
"node_modules/tinymce/plugins/link/plugin.min.js",
"node_modules/tinymce/plugins/paste/plugin.min.js",
"node_modules/tinymce/plugins/table/plugin.min.js",
"node_modules/echarts/dist/echarts.min.js",
"node_modules/echarts/dist/extension/bmap.min.js",
"node_modules/chart.js/dist/Chart.min.js"
],
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.css",
"node_modules/typeface-exo/index.css",
"node_modules/roboto-fontface/css/roboto/roboto-fontface.css",
"node_modules/ionicons/scss/ionicons.scss",
"node_modules/font-awesome/scss/font-awesome.scss",
"node_modules/socicon/css/socicon.css",
"node_modules/nebular-icons/scss/nebular-icons.scss",
"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
Expand All @@ -97,7 +128,12 @@
"assets": [
"src/assets",
"src/favicon.ico",
"src/favicon.png"
"src/favicon.png",
{
"glob": "**/*",
"input": "node_modules/leaflet/dist/images",
"output": "/assets/img/markers"
}
]
}
},
Expand Down Expand Up @@ -141,8 +177,14 @@
"defaultProject": "ngx-admin-demo",
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
"prefix": "ngx",
"style": "scss"
},
"@schematics/angular:directive": {}
"@schematics/angular:directive": {
"prefix": "ngx"
}
},
"cli": {
"analytics": "25084c8e-7e3c-4955-91c5-66ed595e9666"
}
}
}
Loading

0 comments on commit f91a5ef

Please sign in to comment.