Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/material demo #5805

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
62e6828
feat: demo version additions
yggg Jul 15, 2019
165e64e
feat: docs app
yggg Jul 16, 2019
f8df827
feat: add store link (#5479)
yggg Jul 30, 2019
ae6ae5a
refactor: update google verification (#5494)
yggg Aug 27, 2019
72e39f6
fix(404 page): set correct base href (#5538)
yggg Oct 11, 2019
c046c0d
fix(bundles): hide old price if no discount (#5561)
yggg Nov 14, 2019
d25cc1a
feat(seo): add canonical tag (#5580)
yggg Dec 20, 2019
f3e9bef
chore(docs): replace email with SO and GitHub links (#5583)
yggg Jan 21, 2020
e4c53bf
fix(demo-docs): fix banners in backend bundles section (#5594)
denStrigo Feb 7, 2020
5b81184
feat: update bundles text (#5528)
yggg Feb 7, 2020
8f5eaec
chore(analytics): add proper analytics tracking URLs (#5605)
lugovsky Feb 28, 2020
7107a94
Upgrade to the latest minor version of Angular
Mar 2, 2020
b20df14
Upgrade to the latest major version of Angular
Mar 2, 2020
99e85ac
Upgrade to nebular 5 beta, remove "angular-tree-component" package
Mar 2, 2020
d673c51
Remove packages uncompatible with Ivy
Mar 3, 2020
88020ac
Fix post-upgrade errors
Mar 3, 2020
398c8c2
Replace @agm/core with @angular/google-maps
Mar 3, 2020
1b75ccf
Fix search-map component using @angular/google-maps
Mar 4, 2020
3c662e5
feat: Material theme
yggg Mar 4, 2020
ae6dac1
Merge branch 'upgrade-to-ng9-nebular5' into feat/material-theme
Mar 4, 2020
73fc5c0
Move material theme files from @nebular
Mar 4, 2020
b03633b
Add missing images and change fg text color of dark material theme to…
Mar 4, 2020
690bd32
Implement ripple effect for material themes
Mar 4, 2020
6c81379
Add material style overrides
Mar 5, 2020
7ac5287
Add ripple effects to controls across application
Mar 5, 2020
5880c16
Configure material theme, add material button and input examples
Mar 6, 2020
f9029bb
Add toggle button example
Mar 6, 2020
a0af66a
Fix lint warnings
Mar 6, 2020
0e4cee0
Add material menu icon for material themes
Mar 6, 2020
51a6914
Fix lint warnings for styles
Mar 6, 2020
8be84a2
Set menu font-weight to normal for material themes
Mar 9, 2020
ddd2d7b
Add "hover" and "active" styles for material menu
Mar 9, 2020
e44bea8
Update material styles
Mar 9, 2020
72c0b1e
Override input styles for material themes
Mar 9, 2020
3c80c61
Override select styles for material themes
Mar 9, 2020
6398508
Hide rounded inputs for material themes
Mar 10, 2020
c668b34
Update material styles
Mar 10, 2020
c2e3194
Remove non-material themes
Mar 10, 2020
bff9d52
Revert "Remove non-material themes"
Mar 10, 2020
acd65e6
Fix actions color
Mar 10, 2020
497c7cc
Fix lint warnings
Mar 10, 2020
b00da0d
Fix scrollbar for "traffic" card
Mar 11, 2020
4d793b1
Fix scroll for "user activity" card
Mar 11, 2020
90e282e
Revert "Fix scroll for "user activity" card"
Mar 11, 2020
f3ad21b
Revert "Fix scrollbar for "traffic" card"
Mar 11, 2020
e4d7c5d
Fix scroll for nb-list inside nb-card
Mar 11, 2020
9aa4b9c
Add material themes to themes carousel
Mar 12, 2020
ea600e9
Add "material theme link" component
Mar 12, 2020
af6ba64
Set theme links
Mar 12, 2020
c8b64aa
Add main info component with material theme screenshot to material la…
Mar 12, 2020
9fb7640
Add material theme for material landing page
Mar 12, 2020
d2cb5ce
Update demo links
Mar 12, 2020
47224d8
Remove unused angular2-toaster package
Mar 16, 2020
c56b348
Upgrade to @nebular 5 release
Mar 16, 2020
718f860
fix(landing): change landing content
alexeykurbako Mar 23, 2020
3fe1718
chore(readme): add material theme description
elupanov Mar 24, 2020
3f1e57e
fix(landing): add contact section and fix landing image
alexeykurbako Mar 24, 2020
dd2492f
chore(readme): add material theme images
elupanov Mar 24, 2020
cda2356
chore(readme): update text
elupanov Mar 24, 2020
929406e
feat: update ng2-smart-table to 1.6
elupanov Mar 24, 2020
c4f0d7a
Merge branch 'upgrade-to-ng9-nebular5' into feat/material-theme
elupanov Mar 24, 2020
9c04631
feat(pages): implement starter page with themes
alexeykurbako Mar 25, 2020
87b6f5f
fix(starter-page): responsive layout
alexeykurbako Mar 25, 2020
a5061e7
Merge branch 'feat/material-theme' into feat/material-demo
elupanov Mar 25, 2020
b8a75dc
fix: lint errors
elupanov Mar 25, 2020
de53264
fix: lint errors
elupanov Mar 25, 2020
31b92b7
fix: scss lint errors
elupanov Mar 25, 2020
b395c95
fix: runtime error
elupanov Mar 25, 2020
7ffd5ea
fix(header): ripple effect
elupanov Mar 25, 2020
b177e25
fix(assets): compress images
alexeykurbako Mar 25, 2020
9e86f88
Merge branch 'feat/material-demo' of https://github.com/akveo/ngx-adm…
alexeykurbako Mar 25, 2020
a878bd2
fix(theme): save theme in local storage after theme changing
alexeykurbako Mar 25, 2020
9bfdd43
chore: update dependencies
elupanov Mar 25, 2020
78d6b27
fix(docs): dependency styles
elupanov Mar 25, 2020
7e78207
fix(theme-section): swiper button
elupanov Mar 26, 2020
d9549ea
fix(docs): md files to text conversion
elupanov Mar 26, 2020
188f12f
fix: docs build
elupanov Mar 26, 2020
7de17d4
chore: update gh-page package
elupanov Mar 26, 2020
e3537c4
feat(demo): new text on landing
elupanov Mar 26, 2020
0b687d8
fix(docs): image url
alexeykurbako Mar 26, 2020
2153fa7
Merge branch 'feat/material-demo' of https://github.com/akveo/ngx-adm…
alexeykurbako Mar 26, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# compiled output
/dist
/docs/dist
/tmp
/out-tsc

Expand Down Expand Up @@ -30,7 +31,6 @@
npm-debug.log
testem.log
/typings
/docs

# e2e
/e2e/*.js
Expand Down
28 changes: 25 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,24 @@

[Who uses ngx-admin?](https://github.com/akveo/ngx-admin/issues/1645)| [Documentation](https://hubs.ly/H0n4Sfq0) | [Installation Guidelines](https://hubs.ly/H0n4Svc0)

# Admin template based on Angular 8+ and <a href="https://github.com/akveo/nebular">Nebular</a>
# New! Material theme for ngx-admin

### Material admin theme is based on the most popular Angular dashboard template - [ngx-admin](https://hubs.ly/H0nJG1G0)
### Included: Angular 9+, [Nebular](https://hubs.ly/H0nJG5g0) and [Eva design system](https://hubs.ly/H0nJGdC0). Free for personal and commercial usage.
### Get material ngx-admin integrated with backend technology of your choice. Check out our store.

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

## Key features

- The most popular and trusted Angular open source dashboard template is out there. Used by hundreds of thousands developers worldwide and Fortune 500 companies*.
- Over 40+ Angular Components and 60+ Usage Examples. Kick off your project and save money by using ngx-admin.
- Already using ngx-admin and willing to switch to material theme? Material theme is backward-compatible. Check out the article describing how to do that.
- ngx-admin material works perfectly with Angular Material and Nebular. Take the best from both!



# Admin template based on Angular 9+ and <a href="https://github.com/akveo/nebular">Nebular</a>
<a target="_blank" href="https://hubs.ly/H0n4Sw20"><img src="https://i.imgur.com/mFdqvgG.png"/></a>

### Backend Integration Bundles
Expand All @@ -14,9 +31,14 @@ Easy way to integrate ngx-admin with backend (.NET, Node.js, Java etc.).

[Check out our Store](https://hubs.ly/H0n4Zvy0) for ready to use Backend Bundles.

### With 4 stunning visual themes
### With 6 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="https://hubs.ly/H0n4Tgv0"><img src="https://i.imgur.com/Kn3xDKQ.png"/></a>
Expand All @@ -32,7 +54,7 @@ Easy way to integrate ngx-admin with backend (.NET, Node.js, Java etc.).

### What's included:

- Angular 8+ & Typescript
- Angular 9+ & Typescript
- Bootstrap 4+ & SCSS
- Responsive layout
- RTL support
Expand Down
131 changes: 129 additions & 2 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 @@ -22,6 +23,7 @@
"src/assets",
"src/favicon.ico",
"src/favicon.png",
"src/google46533d2e7a851062.html",
{
"glob": "**/*",
"input": "node_modules/leaflet/dist/images",
Expand All @@ -36,7 +38,6 @@
"node_modules/@fortawesome/fontawesome-free/css/all.css",
"node_modules/socicon/css/socicon.css",
"node_modules/nebular-icons/scss/nebular-icons.scss",
"node_modules/angular-tree-component/dist/angular-tree-component.css",
"node_modules/pace-js/templates/pace-theme-flash.tmpl.css",
"node_modules/leaflet/dist/leaflet.css",
"src/app/@theme/styles/styles.scss"
Expand All @@ -55,6 +56,12 @@
},
"configurations": {
"production": {
"budgets": [
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
Expand Down Expand Up @@ -123,6 +130,7 @@
"src/assets",
"src/favicon.ico",
"src/favicon.png",
"src/google46533d2e7a851062.html",
{
"glob": "**/*",
"input": "node_modules/leaflet/dist/images",
Expand Down Expand Up @@ -166,13 +174,132 @@
}
}
}
},
"docs": {
"root": "",
"sourceRoot": "docs",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "docs/dist",
"index": "docs/index.html",
"main": "docs/main.ts",
"tsConfig": "docs/tsconfig.app.json",
"polyfills": "docs/polyfills.ts",
"assets": [
"docs/assets",
"docs/404.html",
"docs/favicon.png",
"docs/google85b6c09017edfbcb.html"
],
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.css",
"node_modules/nebular-icons/scss/nebular-icons.scss",
"node_modules/swiper/css/swiper.min.css",
"node_modules/highlight.js/styles/dracula.css",
"docs/app/@theme/styles/styles.scss"
]
},
"configurations": {
"production": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"fileReplacements": [
{
"replace": "docs/environments/environment.ts",
"with": "docs/environments/environment.prod.ts"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "docs:build"
},
"configurations": {
"production": {
"browserTarget": "docs:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "docs:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "docs/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "docs/polyfills.ts",
"tsConfig": "docs/tsconfig.spec.json",
"scripts": [
],
"styles": [
"node_modules/nebular-icons/scss/nebular-icons.scss",
"docs/app/@theme/styles/styles.scss"
],
"assets": [
"docs/assets",
"docs/favicon.ico",
"docs/favicon.png",
"docs/google85b6c09017edfbcb.html"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"docs/tsconfig.spec.json",
"docs/tsconfig.app.json"
],
"exclude": []
}
}
}
},
"docs-e2e": {
"root": "",
"sourceRoot": "",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "docs:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"],
"exclude": []
}
}
}
}
},
"defaultProject": "ngx-admin-demo",
"schematics": {
"@schematics/angular:component": {
"prefix": "ngx",
"styleext": "scss"
"style": "scss"
},
"@schematics/angular:directive": {
"prefix": "ngx"
Expand Down
20 changes: 20 additions & 0 deletions docs/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>

<head>
<meta charset="utf-8" />
<title>404</title>

<base href="/ngx-admin/">

<script type="text/javascript" src="assets/ghspa.js"></script>
</head>

<body>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</body>

</html>
40 changes: 40 additions & 0 deletions docs/app/@core/core.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
* @license
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/

import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
import { CommonModule } from '@angular/common';

import { throwIfAlreadyLoaded } from './module-import-guard';
import { DataModule } from './data/data.module';

const PIPES = [
];

const NB_CORE_PROVIDERS = [
...DataModule.forRoot().providers,
];

@NgModule({
imports: [
CommonModule,
],
exports: [...PIPES],
declarations: [...PIPES],
})
export class CoreModule {
constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
throwIfAlreadyLoaded(parentModule, 'CoreModule');
}

static forRoot(): ModuleWithProviders<CoreModule> {
return {
ngModule: CoreModule,
providers: [
...NB_CORE_PROVIDERS,
],
};
}
}
39 changes: 39 additions & 0 deletions docs/app/@core/data/data.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/**
* @license
* Copyright Akveo. All Rights Reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*/

import { NgModule, ModuleWithProviders } from '@angular/core';
import { CommonModule } from '@angular/common';

import { HeaderMenuService } from './service/header-menu.service';
import { ReviewsService } from './service/reviews.service';
import { DescriptionsService } from './service/descriptions.service';
import { BundlesService } from './service/bundles.service';

const SERVICES = [
HeaderMenuService,
ReviewsService,
DescriptionsService,
BundlesService,
];

@NgModule({
imports: [
CommonModule,
],
providers: [
...SERVICES,
],
})
export class DataModule {
static forRoot(): ModuleWithProviders {
return <ModuleWithProviders>{
ngModule: DataModule,
providers: [
...SERVICES,
],
};
}
}
Loading