Skip to content

Commit

Permalink
Merge pull request #9 from damingerdai/develop
Browse files Browse the repository at this point in the history
some change
  • Loading branch information
damingerdai authored Feb 7, 2019
2 parents b74a29e + 001ad0c commit 24f26f4
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 39 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2018 creativeLabs Łukasz Holeczek.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
47 changes: 21 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
# DamingCoreUi

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.2.

## Development server

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.

## Code scaffolding

Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.

## Build

Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.

## Running unit tests

Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

## Running end-to-end tests

Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).

## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
![](https://img.shields.io/github/last-commit/damingerdai/daming-core-ui.svg?style=flat)
![](https://img.shields.io/github/issues/detail/u/damingerdai/daming-core-ui/1.svg?style=flat)
![](https://img.shields.io/github/license/damingerdai/daming-core-ui.svg?style=flat)

# 说明
该项目基于[Core UI](https://coreui.io/)[angular2](https://coreui.io/angular)版二次开发。
其功能与core ui基本一致,存在部分改动:
1. 改造项目结构,使用angular官方推荐的项目结构
2. 添加toastr组件(该相似组件仅在Core UI收费版提供,免费版不提供)

# 下一步计划
1. toaster组件添加使用angular2-toaster
2. 修复dashboard组件中的bug
```
ERROR Error: No value accessor for form control with unspecified
```
3. 添加国际化的支持
4. 添加针对我个人的说明介绍(争取)

# 体验
[Github Page](https://damingerdai.github.io/daming-core-ui)
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^7.2.3",
"@angular/common": "~7.2.0",
"@angular/compiler": "~7.2.0",
"@angular/core": "~7.2.0",
"@angular/forms": "~7.2.0",
"@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0",
"@angular/animations": "^7.2.4",
"@angular/common": "~7.2.4",
"@angular/compiler": "~7.2.4",
"@angular/core": "~7.2.4",
"@angular/forms": "~7.2.4",
"@angular/platform-browser": "~7.2.4",
"@angular/platform-browser-dynamic": "~7.2.4",
"@angular/router": "~7.2.4",
"@coreui/angular": "^2.2.3",
"@coreui/coreui": "^2.1.6",
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
Expand All @@ -35,16 +35,16 @@
"ngx-bootstrap": "^3.1.4",
"ngx-perfect-scrollbar": "^7.2.0",
"ngx-toastr": "^9.1.1",
"rxjs": "~6.3.3",
"rxjs": "~6.4.0",
"simple-line-icons": "^2.4.1",
"tslib": "^1.9.0",
"zone.js": "~0.8.26"
"zone.js": "~0.8.29"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.12.0",
"@angular/cli": "~7.2.2",
"@angular/compiler-cli": "~7.2.0",
"@angular/language-service": "~7.2.0",
"@angular/cli": "~7.3.0",
"@angular/compiler-cli": "~7.2.4",
"@angular/language-service": "~7.2.4",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
Expand Down

0 comments on commit 24f26f4

Please sign in to comment.