From 776662c24b9c66776f8de730986f34c0a1a2bb67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E5=9B=BD=E5=AE=BE?= Date: Thu, 7 Feb 2019 20:52:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?build(license):=20=E4=BD=BF=E7=94=A8MIT?= =?UTF-8?q?=E5=BC=80=E6=BA=90=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..0e8afdb --- /dev/null +++ b/LICENSE @@ -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. From 19c84ed4e7b6e30c0639bf41247f259e9672418d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E5=9B=BD=E5=AE=BE?= Date: Thu, 7 Feb 2019 20:53:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?doc(readme):=20=E6=B7=BB=E5=8A=A0=E5=BE=BD?= =?UTF-8?q?=E7=AB=A0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index bbcdb21..bc32da4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # DamingCoreUi +![](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) This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.2. From a4c0e90cc970e49a38bbb6f7e83f1f91e1a533c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E5=9B=BD=E5=AE=BE?= Date: Thu, 7 Feb 2019 21:01:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?build(all):=20=E5=8D=87=E7=BA=A7=E5=88=B0an?= =?UTF-8?q?uglar7.2.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 7aa8cd0..d085174 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", From 4a4e0c931c1f01fd912180dcf2df83b96c853e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E5=9B=BD=E5=AE=BE?= Date: Thu, 7 Feb 2019 21:15:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?doc(readme):=20=E9=87=8D=E5=86=99readme?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index bc32da4..6a7349c 100644 --- a/README.md +++ b/README.md @@ -3,28 +3,20 @@ ![](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) -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). +# 说明 +该项目基于![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) From 001ad0c2f6aab657f468d4524ec69607010ff1cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E5=9B=BD=E5=AE=BE?= Date: Thu, 7 Feb 2019 21:19:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(doc):=20=E4=BF=AE=E5=A4=8D=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a7349c..7d01b47 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ![](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](https://coreui.io/)的[angular2](https://coreui.io/angular)版二次开发。 其功能与core ui基本一致,存在部分改动: 1. 改造项目结构,使用angular官方推荐的项目结构 2. 添加toastr组件(该相似组件仅在Core UI收费版提供,免费版不提供) @@ -19,4 +19,4 @@ ERROR Error: No value accessor for form control with unspecified 4. 添加针对我个人的说明介绍(争取) # 体验 -![Github Page](https://damingerdai.github.io/daming-core-ui) +[Github Page](https://damingerdai.github.io/daming-core-ui)