Skip to content

Commit

Permalink
Merge pull request #1 from primefaces/master
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
Spaction authored Jan 10, 2021
2 parents ea9596b + 66e91e0 commit 84808f0
Show file tree
Hide file tree
Showing 1,485 changed files with 254,579 additions and 105,654 deletions.
14 changes: 14 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries

# You can see what browsers were selected by your queries by running:
# npx browserslist

last 1 Chrome version
last 1 Firefox version
last 2 Edge major versions
last 2 Safari major versions
last 2 iOS major versions
Firefox ESR
IE 11
14 changes: 6 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,16 @@ npm-debug.log
testem.log
/typings

# themes
/src/assets/components/themes/**/*.css
/src/assets/components/themes/**/*.map
!/src/assets/components/themes/bootstrap/theme.css
!/src/assets/components/themes/nova-*/theme.css
!/src/assets/components/themes/luna-*/theme.css
!/src/assets/components/themes/rhea/theme.css

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db

# Themes
src/assets/components/themes/soho-light/
src/assets/components/themes/soho-dark/
src/assets/components/themes/mira/
src/assets/components/themes/nano/
32 changes: 15 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
language: node_js
sudo: required
node_js:
- node

before_script:
- "sudo chown root /opt/google/chrome/chrome-sandbox"
- "sudo chmod 4755 /opt/google/chrome/chrome-sandbox"
dist: bionic

before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
services:
- xvfb # required for headless testing

script: # the build step
- node_modules/.bin/ng test --watch=false
node_js:
- lts/* # use lts version of node

addons:
chrome: stable

cache:
yarn: true
directories:
- ./node_modules
- ./.chrome/chromium
- npm

install:
- npm set progress=false
- npm install

script:
- ./node_modules/.bin/ng test --watch=false # run the test
1,330 changes: 1,327 additions & 3 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2019 PrimeTek
Copyright (c) 2016-2020 PrimeTek

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
60 changes: 3 additions & 57 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,64 +1,10 @@

[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Join the chat at https://gitter.im/primefaces/primeng](https://badges.gitter.im/primefaces/primeng.svg)](https://gitter.im/primefaces/primeng?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![npm version](https://badge.fury.io/js/primeng.svg)](https://badge.fury.io/js/primeng)
[![Build Status](https://travis-ci.org/primefaces/primeng.svg?branch=master)](https://travis-ci.org/primefaces/primeng)

# PrimeNG
[![PrimeNG Hero](https://www.primefaces.org/wp-content/uploads/2020/08/primeng-release-x-fix-2.jpg)](https://www.primefaces.org/primeng)

UI Components for Angular
### Website

See [PrimeNG homepage](http://www.primefaces.org/primeng) for live showcase and documentation.

[![PrimeNG Logo](https://www.primefaces.org/wp-content/uploads/2018/05/primeng-sidebar.svg "PrimeNG")](https://www.primefaces.org/primeng)

PrimeNG is a collection of rich UI components for Angular. All widgets are open source and free to use under MIT License. PrimeNG is developed by [PrimeTek Informatics](http://www.primetek.com.tr), a vendor with years of expertise in developing open source UI solutions. For project news and updates, please follow us on [twitter](https://twitter.com/prime_ng) and visit our [blog](https://www.primefaces.org/blog).

- **80+ Components:** The most complete set of native widgets featuring 80+
easy to use components for all your UI requirements.

- **Open Source:** Hosted at GitHub, all widgets are open source and free to use under MIT license. Feel the power of open source.

- **Productivity:** Allocate your valuable time on business logic rather than dealing with the complex user interface requirements.

- **Themes:** Don't get tied up in just one look&feel. Choose from a variety of options including material and flat design.

- **Templates:** Professionally designed highly customizable native Angular CLI application templates to get started in no time.

- **Mobile:** Enhanced mobile user experience with touch optimized responsive design elements.

---

#### Download

PrimeNG is available at NPM, if you have an existing application run the following command to download it to your project.

```
npm install primeng --save
npm install primeicons --save
```

#### Angular CLI Integration

Add PrimeNG and PrimeIcons as a dependencies.

```
"dependencies": {
//...
"primeng": "^7.0.0",
"primeicons": "^1.0.0"
},
```

Configure required styles at the styles section, example below uses the Nova Light theme.

```
"styles": [
"node_modules/primeng/resources/themes/nova-light/theme.css",
"node_modules/primeng/resources/primeng.min.css",
"node_modules/primeicons/primeicons.css",
//...
],
```

That is all, you may now import PrimeNG components, for a working example visit the [PrimeNG CLI QuickStart sample](https://github.com/primefaces/primeng-quickstart-cli) at GitHub.
Visit the [PrimeNG Website](https://www.primefaces.org/primeng/) for general information, demos and documentation.
39 changes: 13 additions & 26 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"project": "src/app/components/ng-package.json",
"tsConfig": "src/app/components/tsconfig.lib.json"
}
}
}
}
},
"primeng": {
Expand All @@ -35,27 +35,16 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
"src/favicon.png",
"src/assets",
"src/upload.php"
],
"styles": [
"node_modules/@fullcalendar/core/main.min.css",
"node_modules/@fullcalendar/daygrid/main.min.css",
"node_modules/@fullcalendar/timegrid/main.min.css",
"node_modules/quill/dist/quill.snow.css",
"node_modules/primeicons/primeicons.css",
"node_modules/primeflex/primeflex.css",
"node_modules/font-awesome/css/font-awesome.min.css",
"src/styles.scss"
],
"scripts": [
"./node_modules/moment/moment.js",
"./node_modules/@fullcalendar/core/main.js",
"./node_modules/@fullcalendar/daygrid/main.js",
"./node_modules/@fullcalendar/timegrid/main.js",
"./node_modules/@fullcalendar/interaction/main.js",
"./node_modules/prismjs/prism.js",
"./node_modules/prismjs/components/prism-typescript.js"
]
Expand All @@ -71,19 +60,17 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
}
}
},
Expand Down Expand Up @@ -111,15 +98,15 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"styles": [
"src/styles.scss"
],
"scripts": [],
"assets": [
"src/favicon.png",
"src/assets",
"src/upload.php"
]
],
"styles": [
"src/styles.scss"
],
"scripts": []
}
},
"lint": {
Expand Down
12 changes: 0 additions & 12 deletions browserslist

This file was deleted.

23 changes: 11 additions & 12 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es2018",
"types": [
"jasmine",
"node"
]
}
}
23 changes: 17 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var gulp = require('gulp'),
rename = require('gulp-rename'),
del = require('del'),
flatten = require('gulp-flatten');

gulp.task('build-css', function() {
gulp.src([
'src/app/components/common/common.css',
Expand All @@ -19,19 +19,28 @@ gulp.task('build-css', function() {
gulp.task('build-css-prod', function() {
gulp.src([
'src/app/components/common/common.css',
'src/app/components/**/*.css'
'src/app/components/badge/badge.css',
'src/app/components/button/button.css',
'src/app/components/checkbox/checkbox.css',
'src/app/components/colorpicker/colorpicker-images.css',
'src/app/components/inputtext/inputtext.css',
'src/app/components/inputtextarea/inputtextarea.css',
'src/app/components/password/password.css',
'src/app/components/radiobutton/radiobutton.css',
'src/app/components/ripple/ripple.css',
'src/app/components/tooltip/tooltip.css'
])
.pipe(concat('primeng.css'))
.pipe(gulp.dest('dist/resources'))
.pipe(uglifycss({"uglyComments": true}))
.pipe(rename('primeng.min.css'))
.pipe(gulp.dest('dist/resources'));
.pipe(gulp.dest('dist/resources'));
});

gulp.task('copy-component-css', function () {
gulp.src([
'src/app/components/**/*.css',
'src/app/components/**/images/*.png',
'src/app/components/**/images/*.png',
'src/app/components/**/images/*.gif'
])
.pipe(gulp.dest('dist/resources/components'));
Expand All @@ -44,7 +53,10 @@ gulp.task('images', function() {
});

gulp.task('themes', function() {
return gulp.src(['src/assets/components/themes/**/*'])
return gulp.src(['src/assets/components/themes/**/*',
'!src/assets/components/themes/soho-*/**/*',
'!src/assets/components/themes/mira/**/*',
'!src/assets/components/themes/nano/**/*'])
.pipe(gulp.dest('dist/resources/themes'));
});

Expand All @@ -62,4 +74,3 @@ gulp.task('readme', function() {
//Building project with run sequence
gulp.task('build-assets', ['clean','copy-component-css', 'build-css-prod', 'images', 'themes', 'readme']);


Loading

0 comments on commit 84808f0

Please sign in to comment.