Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 23:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

material removed, angular updated to b16

Browse source
This commit is contained in:
nixa 2016-05-11 12:55:46 +03:00
parent f375f936d8
commit a1e49ecc9b
8 changed files with 55 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bower.json
View file

@ -1,15 +1,13 @@
{
"name": "angular2-webpack-starter",
"description": "Angular 2 admin template.",
"main": "",
"authors": [
"Patrick Stapleton <patrick@angularclass.com>"
],
"name": "angular2-blur-admin",
"version": "0.0.1",
"description": "Angular 2 Blur Admin template.",
"author": "akveo",
"homepage": "",
"license": "MIT",
"moduleType": [
"es6"
],
"homepage": "",
"private": true,
"ignore": [
"**/.*",

98
package.json
View file

@ -1,62 +1,14 @@
{
"name": "angular2-webpack-starter",
"version": "5.0.4",
"description": "Angular 2 admin template.",
"author": "Patrick Stapleton <patrick@angularclass.com>",
"homepage": "https://github.com/angularclass/angular2-webpack-starter",
"name": "angular2-blur-admin",
"version": "0.0.1",
"description": "Angular 2 Blur Admin template.",
"author": "akveo",
"homepage": "",
"license": "MIT",
"scripts": {
"rimraf": "rimraf",
"tslint": "tslint",
"typedoc": "typedoc",
"typings": "typings",
"webpack": "webpack",
"webpack-dev-server": "webpack-dev-server",
"webdriver-manager": "webdriver-manager",
"clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage dist",
"clean:dist": "npm run rimraf -- dist",
"preclean:install": "npm run clean",
"clean:install": "npm set progress=false && npm install",
"preclean:start": "npm run clean",
"clean:start": "npm start",
"watch": "npm run watch:dev",
"watch:dev": "npm run build:dev -- --watch",
"watch:dev:hmr": "npm run watch:dev -- --hot",
"watch:prod": "npm run build:prod -- --watch",
"build": "npm run build:dev",
"prebuild:dev": "npm run clean:dist",
"build:dev": "webpack --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached",
"prebuild:prod": "npm run clean:dist",
"build:prod": "webpack --config config/webpack.prod.js --progress --profile --colors --display-error-details --display-cached --bail",
"server": "npm run server:dev",
"server:dev": "webpack-dev-server --config config/webpack.dev.js --inline --progress --profile --colors --watch --display-error-details --display-cached --content-base src/",
"server:dev:hmr": "npm run server:dev -- --hot",
"server:prod": "http-server dist --cors",
"webdriver:update": "npm run webdriver-manager update",
"webdriver:start": "npm run webdriver-manager start",
"lint": "npm run tslint 'src/**/*.ts'",
"docs": "npm run typedoc -- --options typedoc.json --exclude '**/*.spec.ts' ./src/",
"start": "npm run server:dev",
"start:hmr": "npm run server:dev:hmr",
"postinstall": "npm run typings -- install && bower install",
"preversion": "npm run build",
"version": "npm run build",
"postversion": "git push && git push --tags"
},
"dependencies": {
"@angular2-material/button": "2.0.0-alpha.2",
"@angular2-material/card": "2.0.0-alpha.2",
"@angular2-material/checkbox": "2.0.0-alpha.2",
"@angular2-material/core": "2.0.0-alpha.2",
"@angular2-material/input": "2.0.0-alpha.2",
"@angular2-material/list": "2.0.0-alpha.2",
"@angular2-material/progress-circle": "2.0.0-alpha.2",
"@angular2-material/radio": "2.0.0-alpha.2",
"@angular2-material/sidenav": "2.0.0-alpha.2",
"@angular2-material/toolbar": "2.0.0-alpha.2",
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",
"angular2": "2.0.0-beta.15",
"angular2": "2.0.0-beta.16",
"bootstrap": "^4.0.0-alpha.2",
"bootstrap-loader": "^1.0.8",
"chartist": "^0.9.7",
@ -116,6 +68,44 @@
"webpack-md5-hash": "^0.0.5",
"webpack-merge": "^0.8.4"
},
"scripts": {
"rimraf": "rimraf",
"tslint": "tslint",
"typedoc": "typedoc",
"typings": "typings",
"webpack": "webpack",
"webpack-dev-server": "webpack-dev-server",
"webdriver-manager": "webdriver-manager",
"clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage dist",
"clean:dist": "npm run rimraf -- dist",
"preclean:install": "npm run clean",
"clean:install": "npm set progress=false && npm install",
"preclean:start": "npm run clean",
"clean:start": "npm start",
"watch": "npm run watch:dev",
"watch:dev": "npm run build:dev -- --watch",
"watch:dev:hmr": "npm run watch:dev -- --hot",
"watch:prod": "npm run build:prod -- --watch",
"build": "npm run build:dev",
"prebuild:dev": "npm run clean:dist",
"build:dev": "webpack --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached",
"prebuild:prod": "npm run clean:dist",
"build:prod": "webpack --config config/webpack.prod.js --progress --profile --colors --display-error-details --display-cached --bail",
"server": "npm run server:dev",
"server:dev": "webpack-dev-server --config config/webpack.dev.js --inline --progress --profile --colors --watch --display-error-details --display-cached --content-base src/",
"server:dev:hmr": "npm run server:dev -- --hot",
"server:prod": "http-server dist --cors",
"webdriver:update": "npm run webdriver-manager update",
"webdriver:start": "npm run webdriver-manager start",
"lint": "npm run tslint 'src/**/*.ts'",
"docs": "npm run typedoc -- --options typedoc.json --exclude '**/*.spec.ts' ./src/",
"start": "npm run server:dev",
"start:hmr": "npm run server:dev:hmr",
"postinstall": "npm run typings -- install && bower install",
"preversion": "npm run build",
"version": "npm run build",
"postversion": "git push && git push --tags"
},
"repository": {
"type": "git",
"url": "https://github.com/angularclass/angular2-webpack-starter.git"

2
src/app/theme/pipes/appPicture/appPicture.pipe.ts
View file

@ -4,7 +4,7 @@ import {layoutPaths} from '../../../theme';
@Pipe({name: 'appPicture'})
export class AppPicturePipe implements PipeTransform {
transform(input:string, args:any[]):string {
transform(input:string):string {
return layoutPaths.images.root + input;
}
}

3
src/app/theme/pipes/profilePicture/profilePicture.pipe.ts
View file

@ -4,8 +4,7 @@ import {layoutPaths} from '../../../theme';
@Pipe({name: 'profilePicture'})
export class ProfilePicturePipe implements PipeTransform {
transform(input:string, args:string[]):string {
let ext = args[0] || 'png';
transform(input:string, ext = 'png'):string {
return layoutPaths.images.profile + input + '.' + ext;
}
}

37
src/platform/browser/angular2-material2/index.ts
View file

@ -1,37 +0,0 @@
import {MdButton, MdAnchor} from '@angular2-material/button';
import {MD_CARD_DIRECTIVES} from '@angular2-material/card';
import {MdCheckbox} from '@angular2-material/checkbox';
import {MD_SIDENAV_DIRECTIVES} from '@angular2-material/sidenav';
import {MD_INPUT_DIRECTIVES} from '@angular2-material/input';
import {MD_LIST_DIRECTIVES} from '@angular2-material/list';
import {MdRadioGroup, MdRadioButton, MdRadioDispatcher} from '@angular2-material/radio';
import {MdSpinner, MdProgressCircle} from '@angular2-material/progress-circle';
import {MdToolbar} from '@angular2-material/toolbar';
/*
* we are grouping the module so we only need to manage the imports in one location
*/
export const MATERIAL_PIPES = [
];
export const MATERIAL_DIRECTIVES = [
...MD_SIDENAV_DIRECTIVES,
...[
MdAnchor,
MdButton,
MdToolbar,
MdCheckbox,
MdRadioButton,
MdSpinner,
MdProgressCircle
],
...MD_INPUT_DIRECTIVES,
...MD_LIST_DIRECTIVES,
...MD_CARD_DIRECTIVES
];
export const MATERIAL_PROVIDERS = [
MdRadioDispatcher
];

7
src/platform/browser/directives.ts
View file

@ -7,14 +7,9 @@ import {provide, PLATFORM_DIRECTIVES} from 'angular2/core';
// Angular 2 Router
import {ROUTER_DIRECTIVES} from 'angular2/router';
// Angular 2 Material 2
// TODO(gdi2290): replace with @angular2-material/all
import {MATERIAL_DIRECTIVES} from './angular2-material2';
// application_directives: directives that are global through out the application
export const APPLICATION_DIRECTIVES = [
...ROUTER_DIRECTIVES,
...MATERIAL_DIRECTIVES
...ROUTER_DIRECTIVES
];
export const DIRECTIVES = [

7
src/platform/browser/providers.ts
View file

@ -11,11 +11,9 @@ import {FORM_PROVIDERS} from 'angular2/common';
// Angular 2 Http
import {HTTP_PROVIDERS} from 'angular2/http';
// Angular 2 Router
import {ROUTER_PROVIDERS, LocationStrategy, PathLocationStrategy} from 'angular2/router';
import {ROUTER_PROVIDERS} from 'angular2/router';
// Angular 2 Material
// TODO(gdi2290): replace with @angular2-material/all
import {MATERIAL_PROVIDERS} from './angular2-material2';
import {LocationStrategy, PathLocationStrategy} from 'angular2/platform/common'
/*
* Application Providers/Directives/Pipes
@ -24,7 +22,6 @@ import {MATERIAL_PROVIDERS} from './angular2-material2';
export const APPLICATION_PROVIDERS = [
...FORM_PROVIDERS,
...HTTP_PROVIDERS,
...MATERIAL_PROVIDERS,
...ROUTER_PROVIDERS,
provide(LocationStrategy, { useClass: PathLocationStrategy })
];

12
src/vendor.ts
View file

@ -16,22 +16,12 @@ import 'rxjs/add/operator/map';
import 'rxjs/add/operator/mergeMap';
// Web dependencies
// TODO: make sure this is a correct place
import 'jquery';
import 'bootstrap-loader';
import 'font-awesome-sass-loader';
// Angular 2 Material 2
// TODO(gdi2290): uncomment when material is fixed
// import '@angular2-material/sidenav';
// import '@angular2-material/toolbar';
// import '@angular2-material/button';
// import '@angular2-material/checkbox';
// import '@angular2-material/radio';
// import '@angular2-material/progress-circle';
// import '@angular2-material/card';
// look in platform/directives and platform/providers
if ('production' === ENV) {
// Production