Skip to content

Commit

Permalink
Merge pull request #215 from kreuzerk/develop
Browse files Browse the repository at this point in the history
Release 4.1.2
  • Loading branch information
nivekcode authored Sep 10, 2018
2 parents d064805 + 367bc15 commit c1762f0
Show file tree
Hide file tree
Showing 54 changed files with 6,786 additions and 7,217 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required
language: node_js

node_js:
- "6"
- "8"
os:
- linux
addons:
Expand All @@ -20,8 +20,8 @@ install:
- npm install
script:
- npm run lint
- npm run package
- npm run test-coverage
- npm run build-lib
- npm run test-lib-coverage
after_success:
- npm run report-coverage
before_deploy:
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ I'm really glad you're reading this, because this means that you are interested
1. After you have forked and cloned the repo run a npm install
2. Navigate to the root folder (the folder where the package.json is located)
3. type npm run start - this command opens the test page on localhost:4200
4. type npm run test to run the tests
4. type npm run test-lib to run the tests

## Folder structure
The app has two main folders:
1. **lib:** this folder contains the actual library code. This is also the folder that will then be delivered via npm to the consumer of the library. Notice that this folder also contains the unit tests for the library.
2. **test:** this folder contains a test page where we test our own library. It uses the library like a consumer would. Notice that this page will not be delivered via npm but it will be deployed on primeng-advanced-growl.firebaseapp.com with each release.
1. **projects/primeng-advanced-growl:** this folder contains the actual library code. This is also the folder that will then be delivered via npm to the consumer of the library. Notice that this folder also contains the unit tests for the library.
2. **src:** this folder contains a test page where we test our own library. It uses the library like a consumer would. Notice that this page will not be delivered via npm but it will be deployed on primeng-advanced-growl.firebaseapp.com with each release.

## How to make a clean pull request

Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![codecov](https://codecov.io/gh/kreuzerk/primeNG-advanced-growl/branch/master/graph/badge.svg)](https://codecov.io/gh/kreuzerk/primeNG-advanced-growl)
[![Greenkeeper badge](https://badges.greenkeeper.io/kreuzerk/primeNG-advanced-growl.svg)](https://greenkeeper.io/)
[![npm](https://img.shields.io/npm/dt/primeng-advanced-growl.svg)]()
[![angular5](https://img.shields.io/badge/angular%205%20ready-true-green.svg)]()
[![angular6](https://img.shields.io/badge/angular%206%20ready-true-green.svg)]()
[![gitter](https://img.shields.io/gitter/room/primeNG-advanced-growl/nw.js.svg)]()

<!-- START doctoc generated TOC please keep comment here to allow auto update -->
Expand All @@ -17,7 +17,7 @@
- [What is the AdvGrowlModule offering?](#what-is-the-advgrowlmodule-offering)
- [How do you use PrimeNGAdvancedGrowl?](#how-do-you-use-primengadvancedgrowl)
- [installation](#installation)
- [Angular 5](#angular-5)
- [Angular 6](#angular-6)
- [AdvGrowlComponent](#advgrowlcomponent)
- [Input](#input)
- [Output](#output)
Expand Down Expand Up @@ -83,8 +83,8 @@ import {AdvGrowlModule} from 'primeng-advanced-growl';
...
```

### Angular 5
Please notice that only versions 3.x are Angular 5 compatible.
### Angular 6
Please notice that only versions 4.x are Angular 6 compatible.

### AdvGrowlComponent
The AdvGrowlModule exports a component named AdvGrowlComponent. You need to include this component
Expand Down Expand Up @@ -152,10 +152,10 @@ the message content and a message title. If you wish you can also add additional
are emitted when you click on a message. All of the methods below will use the lifetime you specified on the component via
the life input property.

- createSuccessMessage(messageContent: string, summary: string, additionalProperties?: any): void
- createInfoMessage(messageContent: string, summary: string, additionalProperties?: any): void
- createWarningMessage(messageContent: string, summary: string, additionalProperties?: any): void
- createErrorMessage(messageContent: string, summary: string, additionalProperties?: any): void
- createSuccessMessage(messageContent: string, summary: string, additionalProperties?: any): AdvPrimeMessage
- createInfoMessage(messageContent: string, summary: string, additionalProperties?: any): AdvPrimeMessage
- createWarningMessage(messageContent: string, summary: string, additionalProperties?: any): AdvPrimeMessage
- createErrorMessage(messageContent: string, summary: string, additionalProperties?: any): AdvPrimeMessage

If you want to create messages that have another lifetime than the one you provided via the life input property you can
use the Timed message service methods. Those methods are similar to the methods above but they accept an additional
Expand Down
171 changes: 171 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"primeng-advanced-growl-app": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/primeng-advanced-growl-app",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css",
"src/bootstrap/style/bootswatch-sketchy.css",
"node_modules/primeicons/primeicons.css",
"node_modules/primeng/resources/primeng.css",
"node_modules/primeng/resources/themes/omega/theme.scss"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "primeng-advanced-growl-app:build"
},
"configurations": {
"production": {
"browserTarget": "primeng-advanced-growl-app:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "primeng-advanced-growl-app:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
],
"scripts": [],
"assets": [
"src/favicon.ico",
"src/assets"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"primeng-advanced-growl-app-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "primeng-advanced-growl-app:serve"
},
"configurations": {
"production": {
"devServerTarget": "primeng-advanced-growl-app:serve:production"
}
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"primeng-advanced-growl": {
"root": "projects/primeng-advanced-growl",
"sourceRoot": "projects/primeng-advanced-growl/src",
"projectType": "library",
"prefix": "adv",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "projects/primeng-advanced-growl/tsconfig.lib.json",
"project": "projects/primeng-advanced-growl/ng-package.json"
},
"configurations": {
"production": {
"project": "projects/primeng-advanced-growl/ng-package.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/primeng-advanced-growl/src/test.ts",
"tsConfig": "projects/primeng-advanced-growl/tsconfig.spec.json",
"karmaConfig": "projects/primeng-advanced-growl/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/primeng-advanced-growl/tsconfig.lib.json",
"projects/primeng-advanced-growl/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "primeng-advanced-growl-app"
}
14 changes: 14 additions & 0 deletions e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { AppPage } from './app.po';

describe('workspace-project App', () => {
let page: AppPage;

beforeEach(() => {
page = new AppPage();
});

it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to primeng-advanced-growl-app!');
});
});
11 changes: 11 additions & 0 deletions e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { browser, by, element } from 'protractor';

export class AppPage {
navigateTo() {
return browser.get('/');
}

getParagraphText() {
return element(by.css('app-root h1')).getText();
}
}
13 changes: 13 additions & 0 deletions e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}
33 changes: 0 additions & 33 deletions karma.conf.js

This file was deleted.

10 changes: 0 additions & 10 deletions ng-package.json

This file was deleted.

Loading

0 comments on commit c1762f0

Please sign in to comment.