Merge pull request coreui#10 from damingerdai/develop

Develop

Author: damingerdai

README.md

@@ -8,9 +8,10 @@
 其功能与core ui基本一致，存在部分改动：
 1.  改造项目结构，使用angular官方推荐的项目结构
 2.  添加toastr组件(该相似组件仅在Core UI收费版提供，免费版不提供)
+3.  添加首屏渲染
 
 # 下一步计划
-1. toaster组件添加使用angular2-toaster
+1. toaster组件添加使用angular2-toaster(已经完成)
 2. 修复dashboard组件中的bug
 ```
 ERROR Error: No value accessor for form control with unspecified

src/app/routes/notifications/toastr/toastr.component.html

@@ -28,6 +28,34 @@
       </div>
     </div>
     <!--/.col-->
+    <div class="col-lg-12">
+      <toaster-container [toasterconfig]="config"></toaster-container>
+      <div class="card">
+        <div class="card-header">
+          <i class="fa fa-align-justify"></i>Angular2-Toaster
+          <div class="card-header-actions">
+            <a href="https://github.com/stabzs/Angular2-Toaster" class="card-header-action" target="_blank">doc</a>
+          </div>
+        </div>
+        <div class="card-body">
+          <!-- <button type="button" class="btn btn-primary mr-1" (click)="showPrimary2()">
+            Try primary
+          </button> -->
+          <button type="button" class="btn btn-success mr-1" (click)="showSuccess2()">
+            Try success
+          </button>
+          <button type="button" class="btn btn-warning mr-1" (click)="showWarn2()">
+            Try warning
+          </button>
+          <button type="button" class="btn btn-danger mr-1" (click)="showDanger2()">
+            Try danger
+          </button>
+          <button type="button" class="btn btn-info mr-1" (click)="showInfo2()">
+            Try info
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
   <!--/.row-->
 </div>

src/app/routes/notifications/toastr/toastr.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ToastrService } from 'ngx-toastr';
-import { ToasterService } from 'angular2-toaster';
+import { ToasterService, ToasterConfig } from 'angular2-toaster';
 
 @Component({
   selector: 'app-toastr',
@@ -9,6 +9,13 @@ import { ToasterService } from 'angular2-toaster';
 })
 export class ToastrComponent implements OnInit {
 
+  config: ToasterConfig =
+    new ToasterConfig({
+      showCloseButton: true,
+      tapToDismiss: false,
+      timeout: 0
+    });
+
   constructor(
     private toastr: ToastrService,
     private toasterService: ToasterService
@@ -38,6 +45,52 @@ export class ToastrComponent implements OnInit {
     this.toastr.info('Hello world!', 'Toastr fun!');
   }
 
+  showPrimary2() {
+    // this.toasterService.pop('primary', 'Hello world!', 'Toastr fun!');
+    this.toasterService.pop({
+      type: 'primary',
+      title: 'Hello world!',
+      body: 'Toastr fun!',
+      timeout: 10000
+    });
+  }
+
+  showSuccess2() {
+    this.toasterService.pop({
+      type: 'success',
+      title: 'Hello world!',
+      body: 'Toastr fun!',
+      timeout: 10000
+    });
+  }
+
+  showWarn2() {
+    this.toasterService.pop({
+      type: 'warning',
+      title: 'Hello world!',
+      body: 'Toastr fun!',
+      timeout: 10000
+    });
+  }
+
+  showDanger2() {
+    this.toasterService.pop({
+      type: 'error',
+      title: 'Hello world!',
+      body: 'Toastr fun!',
+      timeout: 10000
+    });
+  }
+
+  showInfo2() {
+    this.toasterService.pop({
+      type: 'info',
+      title: 'Hello world!',
+      body: 'Toastr fun!',
+      timeout: 10000
+    });
+  }
+
   ngOnInit() {
   }
 

tools/yarn/check-yarn.js

@@ -9,6 +9,6 @@
 'use strict';
 
 if (process.env.npm_execpath.indexOf('yarn') === -1) {
-  throw new Error(
-      'Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/');
+  // throw new Error(
+  //     'Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/');
 }