Skip to content

Commit 24f26f4

Browse files
authored
Merge pull request coreui#9 from damingerdai/develop
some change
2 parents b74a29e + 001ad0c commit 24f26f4

File tree

3 files changed

+55
-39
lines changed

3 files changed

+55
-39
lines changed

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2018 creativeLabs Łukasz Holeczek.
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

README.md

+21-26
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
# DamingCoreUi
2-
3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.2.
4-
5-
## Development server
6-
7-
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.
8-
9-
## Code scaffolding
10-
11-
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`.
12-
13-
## Build
14-
15-
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.
16-
17-
## Running unit tests
18-
19-
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
20-
21-
## Running end-to-end tests
22-
23-
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
24-
25-
## Further help
26-
27-
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).
2+
![](https://img.shields.io/github/last-commit/damingerdai/daming-core-ui.svg?style=flat)
3+
![](https://img.shields.io/github/issues/detail/u/damingerdai/daming-core-ui/1.svg?style=flat)
4+
![](https://img.shields.io/github/license/damingerdai/daming-core-ui.svg?style=flat)
5+
6+
# 说明
7+
该项目基于[Core UI](https://coreui.io/)[angular2](https://coreui.io/angular)版二次开发。
8+
其功能与core ui基本一致,存在部分改动:
9+
1. 改造项目结构,使用angular官方推荐的项目结构
10+
2. 添加toastr组件(该相似组件仅在Core UI收费版提供,免费版不提供)
11+
12+
# 下一步计划
13+
1. toaster组件添加使用angular2-toaster
14+
2. 修复dashboard组件中的bug
15+
```
16+
ERROR Error: No value accessor for form control with unspecified
17+
```
18+
3. 添加国际化的支持
19+
4. 添加针对我个人的说明介绍(争取)
20+
21+
# 体验
22+
[Github Page](https://damingerdai.github.io/daming-core-ui)

package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
},
1313
"private": true,
1414
"dependencies": {
15-
"@angular/animations": "^7.2.3",
16-
"@angular/common": "~7.2.0",
17-
"@angular/compiler": "~7.2.0",
18-
"@angular/core": "~7.2.0",
19-
"@angular/forms": "~7.2.0",
20-
"@angular/platform-browser": "~7.2.0",
21-
"@angular/platform-browser-dynamic": "~7.2.0",
22-
"@angular/router": "~7.2.0",
15+
"@angular/animations": "^7.2.4",
16+
"@angular/common": "~7.2.4",
17+
"@angular/compiler": "~7.2.4",
18+
"@angular/core": "~7.2.4",
19+
"@angular/forms": "~7.2.4",
20+
"@angular/platform-browser": "~7.2.4",
21+
"@angular/platform-browser-dynamic": "~7.2.4",
22+
"@angular/router": "~7.2.4",
2323
"@coreui/angular": "^2.2.3",
2424
"@coreui/coreui": "^2.1.6",
2525
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
@@ -35,16 +35,16 @@
3535
"ngx-bootstrap": "^3.1.4",
3636
"ngx-perfect-scrollbar": "^7.2.0",
3737
"ngx-toastr": "^9.1.1",
38-
"rxjs": "~6.3.3",
38+
"rxjs": "~6.4.0",
3939
"simple-line-icons": "^2.4.1",
4040
"tslib": "^1.9.0",
41-
"zone.js": "~0.8.26"
41+
"zone.js": "~0.8.29"
4242
},
4343
"devDependencies": {
4444
"@angular-devkit/build-angular": "~0.12.0",
45-
"@angular/cli": "~7.2.2",
46-
"@angular/compiler-cli": "~7.2.0",
47-
"@angular/language-service": "~7.2.0",
45+
"@angular/cli": "~7.3.0",
46+
"@angular/compiler-cli": "~7.2.4",
47+
"@angular/language-service": "~7.2.4",
4848
"@types/jasmine": "~2.8.8",
4949
"@types/jasminewd2": "~2.0.3",
5050
"@types/node": "~8.9.4",

0 commit comments

Comments
 (0)