Skip to content

Commit

Permalink
[NIFI-5219] This closes #3. update project name to NiFi Flow Design S…
Browse files Browse the repository at this point in the history
…ystem

Signed-off-by: joewitt <joewitt@apache.org>
  • Loading branch information
scottyaslan authored and joewitt committed May 25, 2018
1 parent c85638d commit b7fcd9f
Show file tree
Hide file tree
Showing 31 changed files with 90 additions and 90 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Thank you for submitting a contribution to Apache NiFi Fluid Design System.
Thank you for submitting a contribution to Apache NiFi Flow Design System.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
Expand All @@ -16,7 +16,7 @@ to ensure the following steps have been taken:
### For code changes:
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] Have you ensured that a full build and that the full suite of unit tests is executed via npm run clean:install at the root nifi-fds folder?
- [ ] Have you written or updated the Apache NiFi Fluid Design System demo application to demonstrate any new functionality, provide examples of usage, and to verify your changes via npm start at the nifi-fds/target folder?
- [ ] Have you written or updated the Apache NiFi Flow Design System demo application to demonstrate any new functionality, provide examples of usage, and to verify your changes via npm start at the nifi-fds/target folder?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-fds?
- [ ] If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-fds?
Expand Down
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = function (grunt) {
},
minifyFds: {
files: [{
'./platform/core/common/styles/css/fluid-design-system.min.css': ['./platform/core/common/styles/fluid-design-system.scss']
'./platform/core/common/styles/css/flow-design-system.min.css': ['./platform/core/common/styles/flow-design-system.scss']
}]
},
minifyFdsDemo: {
Expand All @@ -43,7 +43,7 @@ module.exports = function (grunt) {
fdsStyles: {
files: [{
expand: true,
src: ['./platform/core/common/styles/css/fluid-design-system.min.css'],
src: ['./platform/core/common/styles/css/flow-design-system.min.css'],
dest: './',
ext: '.min.css.gz'
}]
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Apache NiFi Fluid Design System
Apache NiFi Flow Design System
Copyright 2014-2018 The Apache Software Foundation

This product includes software developed at
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Apache NiFi Fluid Design System
# Apache NiFi Flow Design System

The Apache NiFi Fluid Design System module is an atomic reusable platform providing consistent set of UI/UX components for open source friendly web applications to consume. Users can interact with this design system by running the demo-app locally or by visiting: [https://apache.github.io/nifi-fds/](https://apache.github.io/nifi-fds/). This demo application also provides an example of how an Angular application would leverage the nifi-fds NgModule.
The Apache NiFi Flow Design System module is an atomic reusable platform providing consistent set of UI/UX components for open source friendly web applications to consume. Users can interact with this design system by running the demo-app locally or by visiting: [https://apache.github.io/nifi-fds/](https://apache.github.io/nifi-fds/). This demo application also provides an example of how an Angular application would leverage the nifi-fds NgModule.

#### npm

Expand All @@ -12,10 +12,10 @@ npm install nifi-fds

## Setup

Import the **Apache NiFi Fluid Design System** NgModule into your angular application:
Import the **Apache NiFi Flow Design System** NgModule into your angular application:

```javascript
var fdsCore = require('fluid-design-system/core');
var fdsCore = require('flow-design-system/core');
AppModule.prototype = {
constructor: AppModule
};
Expand Down Expand Up @@ -62,7 +62,7 @@ $fds-theme: mat-light-theme($fds-primary, $fds-accent, $fds-warn);
@include fds-theme($fds-theme);
```

The Apache NiFi Fluid Design System UI/UX Platform comes with a base CSS file `node_modules/fluid-design-system/core/common/styles/css/fluid-design-system.min.css` (includes icons) that should be included in the head of your HTML document.
The Apache NiFi Flow Design System UI/UX Platform comes with a base CSS file `node_modules/flow-design-system/core/common/styles/css/flow-design-system.min.css` (includes icons) that should be included in the head of your HTML document.

## Building

Expand Down Expand Up @@ -106,7 +106,7 @@ available URLs.

## Release Managment

For developers with permissions releasing a new version of the NiFi Fluid Design System is simple with [grunt bump](https://github.com/vojtajina/grunt-bump).
For developers with permissions releasing a new version of the NiFi Flow Design System is simple with [grunt bump](https://github.com/vojtajina/grunt-bump).

## Deploying github.io demo

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"test": "./node_modules/protractor/bin/webdriver-manager update --gecko false && karma start karma.conf.js --single-run",
"test:dev": "./node_modules/protractor/bin/webdriver-manager update --gecko false && karma start karma.conf.js"
},
"description": "The Apache NiFi Fluid Design System module is an atomic reusable platform providing consistent set of UI/UX components for open source friendly web applications to consume.",
"module": "./platform/core/fluid-design-system.module.js",
"description": "The Apache NiFi Flow Design System module is an atomic reusable platform providing consistent set of UI/UX components for open source friendly web applications to consume.",
"module": "./platform/core/flow-design-system.module.js",
"keywords": [
"fluid design system",
"flow design system",
"angular",
"material",
"material design",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
</mat-sidenav>
<div id="fds-demo">
<mat-card>
<mat-card-title class="pad-bottom-sm">Apache NiFi Fluid Design System</mat-card-title>
<mat-card-title class="pad-bottom-sm">Apache NiFi Flow Design System</mat-card-title>
<mat-divider></mat-divider>
<mat-card-content class="pad-top-sm">
<p>With the Apache NiFi Fluid Design System module, we get an atomic, reusable component platform for Apache NiFi and Apache NiFi Registry to consume, while collaborating in an open source model. This module packages the <a class="link" href="https://material.angular.io/components" target="_blank">Angular Material</a> module as well as the <a class="link" href="https://teradata.github.io/covalent/#/components" target="_blank">Teradata Covalent</a> module. These modules have been themed to match the FDS color palette.</p>
<p>With the Apache NiFi Flow Design System module, we get an atomic, reusable component platform for Apache NiFi and Apache NiFi Registry to consume, while collaborating in an open source model. This module packages the <a class="link" href="https://material.angular.io/components" target="_blank">Angular Material</a> module as well as the <a class="link" href="https://teradata.github.io/covalent/#/components" target="_blank">Teradata Covalent</a> module. These modules have been themed to match the FDS color palette.</p>
</mat-card-content>
</mat-card>
<mat-card>
Expand All @@ -39,7 +39,7 @@
<pre lang="javascript">
<![CDATA[
var ngCore = require('@angular/core');
var fdsCore = require('fluid-design-system/core');
var fdsCore = require('flow-design-system/core');
// other imports
...
new ngCore.NgModule({
Expand All @@ -55,15 +55,15 @@
<p>HTML:</p>
<pre lang="html">
<![CDATA[
<link href="../node_modules/fluid-design-system/core/common/styles/css/fluid-design-system.css" rel="stylesheet">
<link href="../node_modules/flow-design-system/core/common/styles/css/flow-design-system.css" rel="stylesheet">
]]>
</pre>
<p>Or, if you are using the Angular CLI you will need to add a new entry to the "styles" list in .angular-cli.json.</p>
<p>JSON:</p>
<pre lang="json">
<![CDATA[
"styles": [
"../node_modules/fluid-design-system/core/common/styles/fluid-design-system.scss"
"../node_modules/flow-design-system/core/common/styles/flow-design-system.scss"
]
]]>
</pre>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ var covalentCore = require('@covalent/core');
var ngRouter = require('@angular/router');
var ngMaterial = require('@angular/material');
var fdsAnimations = require('demo-app/fds.animations.js');
var fdsDialogsModule = require('@fluid-design-system/dialogs');
var fdsSnackBarsModule = require('@fluid-design-system/snackbars');
var fdsDialogsModule = require('@flow-design-system/dialogs');
var fdsSnackBarsModule = require('@flow-design-system/snackbars');
var FdsService = require('demo-app/services/fds.service.js');
var FdsDemoDialog = require('demo-app/components/fluid-design-system/dialogs/demo/fds-demo-dialog.js');
var FdsDemoDialog = require('demo-app/components/flow-design-system/dialogs/demo/fds-demo-dialog.js');

var NUMBER_FORMAT = function (v) {
return v;
Expand Down
6 changes: 3 additions & 3 deletions src/demo-app/fds.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

var ngCore = require('@angular/core');
var FdsRoutes = require('demo-app/fds.routes.js');
var fdsCore = require('@fluid-design-system/core');
var fdsCore = require('@flow-design-system/core');
var Fds = require('demo-app/fds.js');
var FdsDemo = require('demo-app/components/fluid-design-system/fds-demo.js');
var FdsDemoDialog = require('demo-app/components/fluid-design-system/dialogs/demo/fds-demo-dialog.js');
var FdsDemo = require('demo-app/components/flow-design-system/fds-demo.js');
var FdsDemoDialog = require('demo-app/components/flow-design-system/dialogs/demo/fds-demo-dialog.js');
var FdsService = require('demo-app/services/fds.service.js');
var ngCommonHttp = require('@angular/common/http');

Expand Down
2 changes: 1 addition & 1 deletion src/demo-app/fds.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

var ngRouter = require('@angular/router');
var FdsDemo = require('demo-app/components/fluid-design-system/fds-demo.js');
var FdsDemo = require('demo-app/components/flow-design-system/fds-demo.js');

var FdsRoutes = new ngRouter.RouterModule.forRoot([{
path: '',
Expand Down
4 changes: 2 additions & 2 deletions src/demo-app/gh-pages.index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<!DOCTYPE html>
<html>
<head>
<title>Apache NiFi Fluid Design System Demo</title>
<title>Apache NiFi Flow Design System Demo</title>
<base href='/nifi-fds/'>
<meta charset='UTF-8'>
<meta name='viewport' content='width=device-width, initial-scale=1'>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/>
<link rel="stylesheet" href="node_modules/@covalent/core/common/platform.css">
<link rel="stylesheet" href='node_modules/nifi-fds/platform/core/common/styles/css/fluid-design-system.min.css'/>
<link rel="stylesheet" href='node_modules/nifi-fds/platform/core/common/styles/css/flow-design-system.min.css'/>
<link rel="stylesheet" href='demo-app/css/fds-demo.min.css'/>
<link rel='stylesheet' href='node_modules/font-awesome/css/font-awesome.css'/>
</head>
Expand Down
4 changes: 2 additions & 2 deletions src/demo-app/gh-pages.package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"scripts": {
"start": "./node_modules/http-server/bin/http-server ."
},
"description": "The Apache NiFi Fluid Design System demo provides users with an example web application that consumes the NgModule and allows users to interact with the UI/UX components.",
"description": "The Apache NiFi Flow Design System demo provides users with an example web application that consumes the NgModule and allows users to interact with the UI/UX components.",
"keywords": [
"fluid design system",
"flow design system",
"angular",
"material",
"material design",
Expand Down
20 changes: 10 additions & 10 deletions src/demo-app/gh-pages.systemjs.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,16 @@
'querystring': 'npm:querystring',
'tslib': 'npm:tslib/tslib.js',

// Fluid Design System
'@fluid-design-system/core': 'npm:nifi-fds/platform/core/fluid-design-system.module.js',
'@fluid-design-system/dialogs': 'npm:nifi-fds/platform/core/dialogs/fds-dialogs.module.js',
'@fluid-design-system/dialog-component': 'npm:nifi-fds/platform/core/dialogs/fds-dialog.component.js',
'@fluid-design-system/dialog-service': 'npm:nifi-fds/platform/core/dialogs/services/dialog.service.js',
'@fluid-design-system/confirm-dialog-component': 'npm:nifi-fds/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js',
'@fluid-design-system/snackbars': 'npm:nifi-fds/platform/core/snackbars/fds-snackbars.module.js',
'@fluid-design-system/snackbar-component': 'npm:nifi-fds/platform/core/snackbars/fds-snackbar.component.js',
'@fluid-design-system/snackbar-service': 'npm:nifi-fds/platform/core/snackbars/services/snackbar.service.js',
'@fluid-design-system/coaster-component': 'npm:nifi-fds/platform/core/snackbars/coaster/coaster.component.js'
// Flow Design System
'@flow-design-system/core': 'npm:nifi-fds/platform/core/flow-design-system.module.js',
'@flow-design-system/dialogs': 'npm:nifi-fds/platform/core/dialogs/fds-dialogs.module.js',
'@flow-design-system/dialog-component': 'npm:nifi-fds/platform/core/dialogs/fds-dialog.component.js',
'@flow-design-system/dialog-service': 'npm:nifi-fds/platform/core/dialogs/services/dialog.service.js',
'@flow-design-system/confirm-dialog-component': 'npm:nifi-fds/platform/core/dialogs/confirm-dialog/confirm-dialog.component.js',
'@flow-design-system/snackbars': 'npm:nifi-fds/platform/core/snackbars/fds-snackbars.module.js',
'@flow-design-system/snackbar-component': 'npm:nifi-fds/platform/core/snackbars/fds-snackbar.component.js',
'@flow-design-system/snackbar-service': 'npm:nifi-fds/platform/core/snackbars/services/snackbar.service.js',
'@flow-design-system/coaster-component': 'npm:nifi-fds/platform/core/snackbars/coaster/coaster.component.js'
},
// packages tells the System loader how to load when no filename and/or no extension
packages: {
Expand Down
4 changes: 2 additions & 2 deletions src/demo-app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
<!DOCTYPE html>
<html>
<head>
<title>Apache NiFi Fluid Design System Demo</title>
<title>Apache NiFi Flow Design System Demo</title>
<base href='/'>
<meta charset='UTF-8'>
<meta name='viewport' content='width=device-width, initial-scale=1'>
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/>
<link rel="stylesheet" href="node_modules/@covalent/core/common/platform.css">
<link rel="stylesheet" href='platform/core/common/styles/css/fluid-design-system.min.css'/>
<link rel="stylesheet" href='platform/core/common/styles/css/flow-design-system.min.css'/>
<link rel="stylesheet" href='demo-app/css/fds-demo.min.css'/>
<link rel='stylesheet' href='node_modules/font-awesome/css/font-awesome.css'/>
</head>
Expand Down
6 changes: 3 additions & 3 deletions src/demo-app/services/fds.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/

var covalentCore = require('@covalent/core');
var fdsDialogsModule = require('@fluid-design-system/dialogs');
var fdsSnackBarsModule = require('@fluid-design-system/snackbars');
var fdsDialogsModule = require('@flow-design-system/dialogs');
var fdsSnackBarsModule = require('@flow-design-system/snackbars');

/**
* FdsService constructor.
Expand All @@ -34,7 +34,7 @@ function FdsService(tdDataTableService, fdsDialogService, fdsSnackBarService) {
this.dataTableService = tdDataTableService;

// General
this.title = "Apache NiFi Fluid Design System Demo";
this.title = "Apache NiFi Flow Design System Demo";
this.inProgress = true;
this.perspective = '';
};
Expand Down
22 changes: 11 additions & 11 deletions src/demo-app/systemjs.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@
'querystring': 'npm:querystring',
'tslib': 'npm:tslib/tslib.js',

// Fluid Design System
'@fluid-design-system/core': 'platform/core/fluid-design-system.module.js',
'@fluid-design-system/dialogs': 'platform/core/dialogs/fds-dialogs.module.js',
'@fluid-design-system/dialog-component': 'platform/core/dialogs/fds-dialog.component.js',
'@fluid-design-system/dialog-service': 'platform/core/dialogs/services/dialog.service.js',
'@fluid-design-system/confirm-dialog-component': 'platform/core/dialogs/confirm-dialog/confirm-dialog.component.js',
'@fluid-design-system/snackbars': 'platform/core/snackbars/fds-snackbars.module.js',
'@fluid-design-system/snackbar-component': 'platform/core/snackbars/fds-snackbar.component.js',
'@fluid-design-system/snackbar-service': 'platform/core/snackbars/services/snackbar.service.js',
'@fluid-design-system/coaster-component': 'platform/core/snackbars/coaster/coaster.component.js',
'@fluid-design-system/common/storage-service': 'platform/core/common/services/fds-storage.service.js'
// Flow Design System
'@flow-design-system/core': 'platform/core/flow-design-system.module.js',
'@flow-design-system/dialogs': 'platform/core/dialogs/fds-dialogs.module.js',
'@flow-design-system/dialog-component': 'platform/core/dialogs/fds-dialog.component.js',
'@flow-design-system/dialog-service': 'platform/core/dialogs/services/dialog.service.js',
'@flow-design-system/confirm-dialog-component': 'platform/core/dialogs/confirm-dialog/confirm-dialog.component.js',
'@flow-design-system/snackbars': 'platform/core/snackbars/fds-snackbars.module.js',
'@flow-design-system/snackbar-component': 'platform/core/snackbars/fds-snackbar.component.js',
'@flow-design-system/snackbar-service': 'platform/core/snackbars/services/snackbar.service.js',
'@flow-design-system/coaster-component': 'platform/core/snackbars/coaster/coaster.component.js',
'@flow-design-system/common/storage-service': 'platform/core/common/services/fds-storage.service.js'
},
// packages tells the System loader how to load when no filename and/or no extension
packages: {
Expand Down
2 changes: 1 addition & 1 deletion src/platform/core/common/fds-common.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

var ngCore = require('@angular/core');
var fdsStorageServiceModule = require('@fluid-design-system/storage-service');
var fdsStorageServiceModule = require('@flow-design-system/storage-service');

/**
* FdsCommonsModule constructor.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

var FdsStorageService = require('@fluid-design-system/common/storage-service');
var FdsStorageService = require('@flow-design-system/common/storage-service');

describe('FdsStorageService isolated unit tests', function () {
var fdsStorage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

var FdsConfirmDialogComponent = require('@fluid-design-system/confirm-dialog-component');
var FdsConfirmDialogComponent = require('@flow-design-system/confirm-dialog-component');

describe('coasterComponent isolated unit tests', function () {
var fdsConfirmDialogComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/core/dialogs/fds-dialogs.component.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

var fdsDialogsComponent = require('@fluid-design-system/dialog-component');
var fdsDialogsComponent = require('@flow-design-system/dialog-component');

describe('FdsDialogComponent isolated unit tests', function () {
var fdsDialogs;
Expand Down
6 changes: 3 additions & 3 deletions src/platform/core/dialogs/fds-dialogs.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ var ngMaterial = require('@angular/material');
var ngFlex = require('@angular/flex-layout');
var ngCommon = require('@angular/common');
var ngForms = require('@angular/forms');
var fdsDialogComponentModule = require('@fluid-design-system/dialog-component');
var fdsDialogServiceModule = require('@fluid-design-system/dialog-service');
var FdsConfirmDialogComponent = require('@fluid-design-system/confirm-dialog-component');
var fdsDialogComponentModule = require('@flow-design-system/dialog-component');
var fdsDialogServiceModule = require('@flow-design-system/dialog-service');
var FdsConfirmDialogComponent = require('@flow-design-system/confirm-dialog-component');

var FDS_DIALOGS = [
fdsDialogComponentModule.FdsDialogComponent,
Expand Down
Loading

0 comments on commit b7fcd9f

Please sign in to comment.