Skip to content

Commit ff5e7b1

Browse files
authored
Merge pull request #29 from kbase/payoff
merge payoff branch back into mother ship master.
2 parents a16a0c5 + a2c4c68 commit ff5e7b1

File tree

287 files changed

+124730
-3155
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+124730
-3155
lines changed

.eslintrc.yml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ env:
22
browser: true
33
amd: true
44
es6: true
5-
extends: 'eslint:recommended'
5+
extends: "eslint:recommended"
66
rules:
77
strict:
88
- error
@@ -22,5 +22,28 @@ rules:
2222
no-console:
2323
- error
2424
- allow:
25-
- warn
26-
- error
25+
- warn
26+
- error
27+
# stylistic
28+
no-trailing-spaces:
29+
- error
30+
space-before-function-paren:
31+
- error
32+
- anonymous: always
33+
named: never
34+
asyncArrow: always
35+
space-in-parens:
36+
- error
37+
- never
38+
func-call-spacing:
39+
- error
40+
- never
41+
keyword-spacing:
42+
- error
43+
- before: true
44+
after: true
45+
no-fallthrough:
46+
- error
47+
- commentPattern: fallthrough
48+
prefer-const:
49+
- error

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
/nbproject/
2-
.DS_Store
2+
.DS_Store
3+
node_modules/
4+
bower_components/
5+

.vscode/formatter.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@
3535
"indent_char": " ",
3636
"indent_character": " "
3737
}
38-
}
38+
}

.vscode/settings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"prettier.arrowParens": "always",
3+
"prettier.eslintIntegration": true,
4+
"prettier.printWidth": 120,
5+
"prettier.singleQuote": true,
6+
"prettier.tabWidth": 4,
7+
"editor.detectIndentation": false
8+
}

bower.json

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
11
{
22
"name": "kbase-ui-plugin-dashboard",
33
"description": "A primary view (panel) for the KBase UI to provide a user with a summary of their Narratives, relationships, and status",
4-
"keywords": [
5-
"kbase", "widget"
6-
],
7-
"author": [
8-
9-
],
4+
"keywords": ["kbase", "widget"],
5+
"author": ["[email protected]"],
106
"moduleType": "kbase-ui-plugin",
117
"main": "src/plugin/config.yml",
12-
"ignore": [
13-
".gitignore"
14-
],
8+
"ignore": [".gitignore"],
159
"repository": {
1610
"type": "git",
1711
"url": "git://github.com/kbase/kbase-ui-plugin-dashboard"
1812
},
1913
"dependencies": {
20-
"bluebird": "^3.0.0",
21-
"bootstrap": "^3.3.0",
14+
"bluebird": "^3.5.3",
15+
"bootstrap": "^3.4.1",
2216
"nunjucks": "^3.0.0",
23-
"jquery": "^2.1.0",
17+
"jquery": "^2.2.4",
2418
"kbase-service-clients-js": "^3.3.5",
25-
"kbase-common-js": "^2.7.2"
19+
"kbase-common-js": "^2.18.1",
20+
"kbase-common-es6": "^0.10.14"
2621
},
2722
"devDependencies": {},
2823
"license": "SEE LICENSE IN LICENSE.md"
29-
}
24+
}

build/Gruntfile.js

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*eslint-env node*/
2+
module.exports = function (grunt) {
3+
'use strict';
4+
5+
grunt.initConfig({
6+
pkg: grunt.file.readJSON('package.json'),
7+
copy: {
8+
vega: {
9+
expand: true,
10+
flatten: true,
11+
src: 'node_modules/vega-lib/build/vega.js',
12+
dest: '../src/plugin/iframe_root/js/vendor/vega'
13+
},
14+
d3: {
15+
expand: true,
16+
flatten: true,
17+
src: 'node_modules/d3/dist/d3.js',
18+
dest: '../src/plugin/iframe_root/js/vendor/d3'
19+
},
20+
dagre: {
21+
expand: true,
22+
flatten: true,
23+
src: 'node_modules/dagre/dist/dagre.js',
24+
dest: '../src/plugin/iframe_root/js/vendor/dagre'
25+
},
26+
'dagre-d3': {
27+
expand: true,
28+
flatten: true,
29+
src: 'node_modules/dagre-d3/dist/dagre-d3.js',
30+
dest: '../src/plugin/iframe_root/js/vendor/dagre-d3'
31+
},
32+
'pure-uuid': {
33+
expand: true,
34+
flatten: true,
35+
src: 'node_modules/pure-uuid/uuid',
36+
dest: '../src/plugin/iframe_root/js/vendor/pure-uuid'
37+
}
38+
}
39+
});
40+
41+
grunt.loadNpmTasks('grunt-contrib-copy');
42+
43+
};

build/README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Build Tools and Configuration
2+
3+
These are here (for now) because they are used for the embedded iframe. We don't want integration with kbase-ui to see these.
4+
5+
## Building
6+
7+
By hand:
8+
9+
```
10+
cd build
11+
npm install
12+
./node_modules/.bin/bower-installer
13+
./node_modules/.bin/grunt copy
14+
```

build/bower.json

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"name": "kbase-ui-plugin-dashboard-internal",
3+
"description": "Just the internal iframe app",
4+
"keywords": ["kbase", "widget"],
5+
"author": ["[email protected]"],
6+
"install": {
7+
"path": "../src/plugin/iframe_root/modules/vendor",
8+
"sources": {
9+
"bootstrap": [
10+
{ "bower_components/bootstrap/dist/css/bootstrap.css": "css/bootstrap.css" },
11+
{ "bower_components/bootstrap/dist/css/bootstrap-theme.css": "css/bootstrap-theme.css" },
12+
{ "bower_components/bootstrap/dist/fonts/**": "fonts/" },
13+
{ "bower_components/bootstrap/dist/js/bootstrap.js": "bootstrap.js" }
14+
],
15+
"kbase-common-es6": "bower_components/kbase-common-es6/src/**",
16+
"kbase-common-js": "bower_components/kbase-common-js/dist/kb_common/**",
17+
"kbase-service-clients-js": "bower_components/kbase-service-clients-js/dist/kb_service/**",
18+
"font-awesome": [
19+
{ "bower_components/font-awesome/css/font-awesome.css": "css/font-awesome.css" },
20+
{ "bower_components/font-awesome/fonts/**": "fonts/" }
21+
],
22+
"pure-uuid": "bower_components/pure-uuid/uuid.js"
23+
}
24+
},
25+
"dependencies": {
26+
"bluebird": "3.5.3",
27+
"bootstrap": "3.4.1",
28+
"nunjucks": "^3.0.0",
29+
"jquery": "^2.1.0",
30+
"kbase-service-clients-js": "^3.3.5",
31+
"requirejs": "2.3.6",
32+
"require-css": "0.1.10",
33+
"kbase-common-js": "2.18.1",
34+
"kbase-common-es6": "0.10.15",
35+
"js-yaml": "3.12.1",
36+
"requirejs-text": "2.0.15",
37+
"requirejs-yaml": "eapearson/requirejs-yaml#1.0.5",
38+
"pure-uuid": "eapearson/pure-uuid#1.1.1",
39+
"kbase-service-clients-js": "3.3.5",
40+
"nunjucks": "3.1.2",
41+
"spark-md5": "3.0.0",
42+
"font-awesome": "4.7.0",
43+
"datatables-bootstrap3-plugin": "eapearson/datatables-bootstrap3-plugin#1.0.1",
44+
"datatables": "1.10.19",
45+
"file-saver": "1.3.4"
46+
},
47+
48+
"resolutions": {
49+
"file-saver": "1.3.4"
50+
},
51+
"license": "SEE LICENSE IN ../LICENSE"
52+
}

0 commit comments

Comments
 (0)