You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/04/20 01:48:11 UTC
[airavata-django-portal] branch master updated (0ad3bd1 -> 0f89c5d)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 0ad3bd1 Integrating Group Resource Profile dashboard
new 2d8d617 Adding `npm run watch` script
new 0f89c5d Get API methods to route for GroupResourceProfileViewSet
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
django_airavata/apps/admin/package-lock.json | 57 ++++++++++++++++++++++
django_airavata/apps/admin/package.json | 4 +-
.../static/django_airavata_admin/build/build.js | 1 +
django_airavata/apps/api/views.py | 2 +-
4 files changed, 62 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata-django-portal] 02/02: Get API methods to route for
GroupResourceProfileViewSet
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 0f89c5d515f9ed4a9ca96d284a2327b835163971
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Apr 19 21:47:37 2018 -0400
Get API methods to route for GroupResourceProfileViewSet
---
django_airavata/apps/api/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/django_airavata/apps/api/views.py b/django_airavata/apps/api/views.py
index 9b926c0..5e4f3d1 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -849,7 +849,7 @@ class UserProfileViewSet(mixins.ListModelMixin, GenericAPIBackedViewSet):
self.authz_token, self.gateway_id, 0, -1)
-class GroupResourceProfileViewSet(GenericAPIBackedViewSet):
+class GroupResourceProfileViewSet(APIBackedViewSet):
serializer_class = serializers.GroupResourceProfileSerializer
def get_list(self):
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.
[airavata-django-portal] 01/02: Adding `npm run watch` script
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 2d8d6175d2c92f0356a4684eb19477979b3e9899
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Apr 19 21:37:15 2018 -0400
Adding `npm run watch` script
---
django_airavata/apps/admin/package-lock.json | 57 ++++++++++++++++++++++
django_airavata/apps/admin/package.json | 4 +-
.../static/django_airavata_admin/build/build.js | 1 +
3 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/django_airavata/apps/admin/package-lock.json b/django_airavata/apps/admin/package-lock.json
index 97b421e..851f380 100644
--- a/django_airavata/apps/admin/package-lock.json
+++ b/django_airavata/apps/admin/package-lock.json
@@ -1700,6 +1700,27 @@
"sha.js": "2.4.8"
}
},
+ "cross-env": {
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.4.tgz",
+ "integrity": "sha512-Mx8mw6JWhfpYoEk7PGvHxJMLQwQHORAs8+2bX+C1lGQ4h3GkDb1zbzC2Nw85YH9ZQMlO0BHZxMacgrfPmMFxbg==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "5.1.0",
+ "is-windows": "1.0.2"
+ }
+ },
+ "cross-spawn": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+ "dev": true,
+ "requires": {
+ "lru-cache": "4.1.1",
+ "shebang-command": "1.2.0",
+ "which": "1.3.0"
+ }
+ },
"crypto-browserify": {
"version": "3.11.1",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
@@ -11908,6 +11929,12 @@
"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
"dev": true
},
+ "is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+ "dev": true
+ },
"is-wsl": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
@@ -11920,6 +11947,12 @@
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "dev": true
+ },
"isobject": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
@@ -15411,6 +15444,21 @@
"inherits": "2.0.3"
}
},
+ "shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+ "dev": true,
+ "requires": {
+ "shebang-regex": "1.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+ "dev": true
+ },
"shelljs": {
"version": "0.7.8",
"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
@@ -16326,6 +16374,15 @@
"integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=",
"dev": true
},
+ "which": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+ "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+ "dev": true,
+ "requires": {
+ "isexe": "2.0.0"
+ }
+ },
"which-module": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
diff --git a/django_airavata/apps/admin/package.json b/django_airavata/apps/admin/package.json
index 2dedec4..855481b 100644
--- a/django_airavata/apps/admin/package.json
+++ b/django_airavata/apps/admin/package.json
@@ -7,7 +7,8 @@
"scripts": {
"dev": "node static/django_airavata_admin/build/dev-server.js",
"start": "node static/django_airavata_admin/build/dev-server.js",
- "build": "node static/django_airavata_admin/build/build.js"
+ "build": "node static/django_airavata_admin/build/build.js",
+ "watch": "cross-env WEBPACK_WATCH=true node static/django_airavata_admin/build/build.js"
},
"dependencies": {
"django-airavata-api": "file:../api",
@@ -30,6 +31,7 @@
"chalk": "^2.0.1",
"connect-history-api-fallback": "^1.3.0",
"copy-webpack-plugin": "^4.0.1",
+ "cross-env": "^5.1.4",
"css-loader": "^0.28.0",
"cssnano": "^3.10.0",
"eventsource-polyfill": "^0.9.6",
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/build/build.js b/django_airavata/apps/admin/static/django_airavata_admin/build/build.js
index 6b8add1..893f676 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/build/build.js
+++ b/django_airavata/apps/admin/static/django_airavata_admin/build/build.js
@@ -9,6 +9,7 @@ var chalk = require('chalk')
var webpack = require('webpack')
var config = require('../config')
var webpackConfig = require('./webpack.prod.conf')
+webpackConfig.watch = process.env.WEBPACK_WATCH === "true"
var spinner = ora('building for production...')
spinner.start()
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.