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 2017/09/26 16:17:18 UTC
[8/8] airavata-django-portal git commit: AIRAVATA-2534 Setup build
for common js and scss
AIRAVATA-2534 Setup build for common js and scss
No common JS for now. The common scss is the code provided by Levi:
https://codepen.io/levimcg/pen/KvNPNz
Project: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/commit/840789b5
Tree: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/tree/840789b5
Diff: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/diff/840789b5
Branch: refs/heads/master
Commit: 840789b5ffe67d19493e305d57992d2dfdc67632
Parents: 3042564
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue Sep 26 12:09:45 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue Sep 26 12:11:08 2017 -0400
----------------------------------------------------------------------
.gitignore | 1 +
.../apps/workspace/package-lock.json | 2 +-
django_airavata/package-lock.json | 7897 ++++++++++++++++++
django_airavata/package.json | 30 +
django_airavata/static/common/js/index.js | 0
django_airavata/static/common/scss/main.scss | 208 +
django_airavata/static/css/app.css | 1 -
django_airavata/static/css/app.css.map | 1 -
django_airavata/static/css/base.css | 30 -
django_airavata/static/css/main.css | 210 -
django_airavata/static/css/main.css.map | 7 -
django_airavata/static/js/app.js | 2 -
django_airavata/static/js/app.js.map | 1 -
django_airavata/static/js/manifest.js | 2 -
django_airavata/static/js/manifest.js.map | 1 -
django_airavata/static/js/vendor.js | 12 -
django_airavata/static/js/vendor.js.map | 1 -
django_airavata/templates/base.html | 2 +-
django_airavata/webpack.config.js | 91 +
19 files changed, 8229 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/840789b5/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8b08366..f41d61c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ db.sqlite3
settings_local.py
.DS_Store
node_modules
+dist/
http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/840789b5/django_airavata/apps/workspace/package-lock.json
----------------------------------------------------------------------
diff --git a/django_airavata/apps/workspace/package-lock.json b/django_airavata/apps/workspace/package-lock.json
index 0b1ea16..07d2363 100644
--- a/django_airavata/apps/workspace/package-lock.json
+++ b/django_airavata/apps/workspace/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "workspace",
+ "name": "django-airavata-workspace-views",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,