Skip to content

Commit 07f4301

Browse files
maksim-karatkevichDavid HenleyygggLeon Lafayettelugovsky
authored
feat: upgrade to angular9, upgrade to nebular 5.0, add material theme (akveo#5694)
* chore: update README for extra theme (akveo#5466) * fix(tinymce): set absolute path for skin url (akveo#5491) * feat: add calendar with week numbers example (akveo#5515) * chore(readme): update bundles section text * fix(forms): add missing forms module import (akveo#5530) * feat: update Nebular to 4.4.0 (akveo#5533) * chore(readme): update bundles image (akveo#5565) * chore: add bundles black friday deal (akveo#5569) * chore(readme): update black friday 2019 image (akveo#5570) * chore(readme): remove bundles discounts image (akveo#5574) * chore(readme): update bundles image (akveo#5575) * feat(seo): add canonical tag (akveo#5578) * chore(analytics): add proper analytics tracking URLs (akveo#5604) * feat: Material theme * feat: upgrade to Angular 9 and Nebular 5 (akveo#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>
1 parent 9b560a0 commit 07f4301

27 files changed

Lines changed: 18310 additions & 13456 deletions

README.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,42 @@
22

33
[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)
44

5-
# Admin template based on Angular 8+ and <a href="https://github.com/akveo/nebular">Nebular</a>
5+
# Admin template based on Angular 9+ and <a href="https://github.com/akveo/nebular">Nebular</a>
66
<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>
77

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

11-
<a target="_blank" href="https://hubs.ly/H0qwC1L0">
11+
<a target="_blank" href="https://hubs.ly/H0n4ZxC0">
1212
<img src="https://i.imgur.com/Ywbs8cl.png"/>
1313
</a>
1414

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

17+
### With 6 stunning visual themes
1718

18-
### With 3 stunning visual themes
1919

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

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

2226
#### Default
23-
<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>
27+
<a target="_blank" href="https://hubs.ly/H0n4Tgv0"><img src="https://i.imgur.com/Kn3xDKQ.png"/></a>
2428

2529
#### Dark
26-
<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>
30+
<a target="_blank" href="https://hubs.ly/H0n4Th20"><img src="https://i.imgur.com/FAn5iXY.png"/></a>
2731

2832
#### Cosmic
29-
<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>
33+
<a target="_blank" href="https://hubs.ly/H0n4Tj80"><img src="https://i.imgur.com/iJu2YDF.png"/></a>
3034

3135
#### Corporate
32-
<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>
36+
<a target="_blank" href="https://hubs.ly/H0n4TDQ0"><img src="https://i.imgur.com/GpUt6NW.png"/></a>
3337

3438
### What's included:
3539

36-
- Angular 8+ & Typescript
40+
- Angular 9+ & Typescript
3741
- Bootstrap 4+ & SCSS
3842
- Responsive layout
3943
- RTL support

angular.json

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"build": {
1212
"builder": "@angular-devkit/build-angular:browser",
1313
"options": {
14+
"aot": true,
1415
"preserveSymlinks": true,
1516
"rebaseRootRelativeCssUrls": true,
1617
"outputPath": "dist",
@@ -21,24 +22,45 @@
2122
"assets": [
2223
"src/assets",
2324
"src/favicon.ico",
24-
"src/favicon.png"
25+
"src/favicon.png",
26+
{
27+
"glob": "**/*",
28+
"input": "node_modules/leaflet/dist/images",
29+
"output": "/assets/img/markers"
30+
}
2531
],
2632
"styles": [
2733
"node_modules/bootstrap/dist/css/bootstrap.css",
2834
"node_modules/typeface-exo/index.css",
2935
"node_modules/roboto-fontface/css/roboto/roboto-fontface.css",
3036
"node_modules/ionicons/scss/ionicons.scss",
37+
"node_modules/@fortawesome/fontawesome-free/css/all.css",
3138
"node_modules/socicon/css/socicon.css",
3239
"node_modules/nebular-icons/scss/nebular-icons.scss",
3340
"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
41+
"node_modules/leaflet/dist/leaflet.css",
3442
"src/app/@theme/styles/styles.scss"
3543
],
3644
"scripts": [
37-
"node_modules/pace-js/pace.min.js"
45+
"node_modules/pace-js/pace.min.js",
46+
"node_modules/tinymce/tinymce.min.js",
47+
"node_modules/tinymce/themes/modern/theme.min.js",
48+
"node_modules/tinymce/plugins/link/plugin.min.js",
49+
"node_modules/tinymce/plugins/paste/plugin.min.js",
50+
"node_modules/tinymce/plugins/table/plugin.min.js",
51+
"node_modules/echarts/dist/echarts.min.js",
52+
"node_modules/echarts/dist/extension/bmap.min.js",
53+
"node_modules/chart.js/dist/Chart.min.js"
3854
]
3955
},
4056
"configurations": {
4157
"production": {
58+
"budgets": [
59+
{
60+
"type": "anyComponentStyle",
61+
"maximumWarning": "6kb"
62+
}
63+
],
4264
"optimization": true,
4365
"outputHashing": "all",
4466
"sourceMap": false,
@@ -82,13 +104,22 @@
82104
"polyfills": "src/polyfills.ts",
83105
"tsConfig": "src/tsconfig.spec.json",
84106
"scripts": [
85-
"node_modules/pace-js/pace.min.js"
107+
"node_modules/pace-js/pace.min.js",
108+
"node_modules/tinymce/tinymce.min.js",
109+
"node_modules/tinymce/themes/modern/theme.min.js",
110+
"node_modules/tinymce/plugins/link/plugin.min.js",
111+
"node_modules/tinymce/plugins/paste/plugin.min.js",
112+
"node_modules/tinymce/plugins/table/plugin.min.js",
113+
"node_modules/echarts/dist/echarts.min.js",
114+
"node_modules/echarts/dist/extension/bmap.min.js",
115+
"node_modules/chart.js/dist/Chart.min.js"
86116
],
87117
"styles": [
88118
"node_modules/bootstrap/dist/css/bootstrap.css",
89119
"node_modules/typeface-exo/index.css",
90120
"node_modules/roboto-fontface/css/roboto/roboto-fontface.css",
91121
"node_modules/ionicons/scss/ionicons.scss",
122+
"node_modules/font-awesome/scss/font-awesome.scss",
92123
"node_modules/socicon/css/socicon.css",
93124
"node_modules/nebular-icons/scss/nebular-icons.scss",
94125
"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
@@ -97,7 +128,12 @@
97128
"assets": [
98129
"src/assets",
99130
"src/favicon.ico",
100-
"src/favicon.png"
131+
"src/favicon.png",
132+
{
133+
"glob": "**/*",
134+
"input": "node_modules/leaflet/dist/images",
135+
"output": "/assets/img/markers"
136+
}
101137
]
102138
}
103139
},
@@ -141,8 +177,14 @@
141177
"defaultProject": "ngx-admin-demo",
142178
"schematics": {
143179
"@schematics/angular:component": {
144-
"styleext": "scss"
180+
"prefix": "ngx",
181+
"style": "scss"
145182
},
146-
"@schematics/angular:directive": {}
183+
"@schematics/angular:directive": {
184+
"prefix": "ngx"
185+
}
186+
},
187+
"cli": {
188+
"analytics": "25084c8e-7e3c-4955-91c5-66ed595e9666"
147189
}
148-
}
190+
}

0 commit comments

Comments
 (0)