Skip to content

Commit

Permalink
Merge pull request #29 from kbase/payoff
Browse files Browse the repository at this point in the history
merge payoff branch back into mother ship master.
  • Loading branch information
eapearson authored Jul 10, 2019
2 parents a16a0c5 + a2c4c68 commit ff5e7b1
Show file tree
Hide file tree
Showing 287 changed files with 124,730 additions and 3,155 deletions.
29 changes: 26 additions & 3 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ env:
browser: true
amd: true
es6: true
extends: 'eslint:recommended'
extends: "eslint:recommended"
rules:
strict:
- error
Expand All @@ -22,5 +22,28 @@ rules:
no-console:
- error
- allow:
- warn
- error
- warn
- error
# stylistic
no-trailing-spaces:
- error
space-before-function-paren:
- error
- anonymous: always
named: never
asyncArrow: always
space-in-parens:
- error
- never
func-call-spacing:
- error
- never
keyword-spacing:
- error
- before: true
after: true
no-fallthrough:
- error
- commentPattern: fallthrough
prefer-const:
- error
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
/nbproject/
.DS_Store
.DS_Store
node_modules/
bower_components/

2 changes: 1 addition & 1 deletion .vscode/formatter.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
"indent_char": " ",
"indent_character": " "
}
}
}
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"prettier.arrowParens": "always",
"prettier.eslintIntegration": true,
"prettier.printWidth": 120,
"prettier.singleQuote": true,
"prettier.tabWidth": 4,
"editor.detectIndentation": false
}
23 changes: 9 additions & 14 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
{
"name": "kbase-ui-plugin-dashboard",
"description": "A primary view (panel) for the KBase UI to provide a user with a summary of their Narratives, relationships, and status",
"keywords": [
"kbase", "widget"
],
"author": [
"[email protected]"
],
"keywords": ["kbase", "widget"],
"author": ["[email protected]"],
"moduleType": "kbase-ui-plugin",
"main": "src/plugin/config.yml",
"ignore": [
".gitignore"
],
"ignore": [".gitignore"],
"repository": {
"type": "git",
"url": "git://github.com/kbase/kbase-ui-plugin-dashboard"
},
"dependencies": {
"bluebird": "^3.0.0",
"bootstrap": "^3.3.0",
"bluebird": "^3.5.3",
"bootstrap": "^3.4.1",
"nunjucks": "^3.0.0",
"jquery": "^2.1.0",
"jquery": "^2.2.4",
"kbase-service-clients-js": "^3.3.5",
"kbase-common-js": "^2.7.2"
"kbase-common-js": "^2.18.1",
"kbase-common-es6": "^0.10.14"
},
"devDependencies": {},
"license": "SEE LICENSE IN LICENSE.md"
}
}
43 changes: 43 additions & 0 deletions build/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*eslint-env node*/
module.exports = function (grunt) {
'use strict';

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
copy: {
vega: {
expand: true,
flatten: true,
src: 'node_modules/vega-lib/build/vega.js',
dest: '../src/plugin/iframe_root/js/vendor/vega'
},
d3: {
expand: true,
flatten: true,
src: 'node_modules/d3/dist/d3.js',
dest: '../src/plugin/iframe_root/js/vendor/d3'
},
dagre: {
expand: true,
flatten: true,
src: 'node_modules/dagre/dist/dagre.js',
dest: '../src/plugin/iframe_root/js/vendor/dagre'
},
'dagre-d3': {
expand: true,
flatten: true,
src: 'node_modules/dagre-d3/dist/dagre-d3.js',
dest: '../src/plugin/iframe_root/js/vendor/dagre-d3'
},
'pure-uuid': {
expand: true,
flatten: true,
src: 'node_modules/pure-uuid/uuid',
dest: '../src/plugin/iframe_root/js/vendor/pure-uuid'
}
}
});

grunt.loadNpmTasks('grunt-contrib-copy');

};
14 changes: 14 additions & 0 deletions build/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Build Tools and Configuration

These are here (for now) because they are used for the embedded iframe. We don't want integration with kbase-ui to see these.

## Building

By hand:

```
cd build
npm install
./node_modules/.bin/bower-installer
./node_modules/.bin/grunt copy
```
52 changes: 52 additions & 0 deletions build/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"name": "kbase-ui-plugin-dashboard-internal",
"description": "Just the internal iframe app",
"keywords": ["kbase", "widget"],
"author": ["[email protected]"],
"install": {
"path": "../src/plugin/iframe_root/modules/vendor",
"sources": {
"bootstrap": [
{ "bower_components/bootstrap/dist/css/bootstrap.css": "css/bootstrap.css" },
{ "bower_components/bootstrap/dist/css/bootstrap-theme.css": "css/bootstrap-theme.css" },
{ "bower_components/bootstrap/dist/fonts/**": "fonts/" },
{ "bower_components/bootstrap/dist/js/bootstrap.js": "bootstrap.js" }
],
"kbase-common-es6": "bower_components/kbase-common-es6/src/**",
"kbase-common-js": "bower_components/kbase-common-js/dist/kb_common/**",
"kbase-service-clients-js": "bower_components/kbase-service-clients-js/dist/kb_service/**",
"font-awesome": [
{ "bower_components/font-awesome/css/font-awesome.css": "css/font-awesome.css" },
{ "bower_components/font-awesome/fonts/**": "fonts/" }
],
"pure-uuid": "bower_components/pure-uuid/uuid.js"
}
},
"dependencies": {
"bluebird": "3.5.3",
"bootstrap": "3.4.1",
"nunjucks": "^3.0.0",
"jquery": "^2.1.0",
"kbase-service-clients-js": "^3.3.5",
"requirejs": "2.3.6",
"require-css": "0.1.10",
"kbase-common-js": "2.18.1",
"kbase-common-es6": "0.10.15",
"js-yaml": "3.12.1",
"requirejs-text": "2.0.15",
"requirejs-yaml": "eapearson/requirejs-yaml#1.0.5",
"pure-uuid": "eapearson/pure-uuid#1.1.1",
"kbase-service-clients-js": "3.3.5",
"nunjucks": "3.1.2",
"spark-md5": "3.0.0",
"font-awesome": "4.7.0",
"datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1",
"datatables": "1.10.19",
"file-saver": "1.3.4"
},

"resolutions": {
"file-saver": "1.3.4"
},
"license": "SEE LICENSE IN ../LICENSE"
}
Loading

0 comments on commit ff5e7b1

Please sign in to comment.