Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C372E200D0E for ; Tue, 26 Sep 2017 18:17:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C1E1F160BCB; Tue, 26 Sep 2017 16:17:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 12CA31609EE for ; Tue, 26 Sep 2017 18:17:12 +0200 (CEST) Received: (qmail 65747 invoked by uid 500); 26 Sep 2017 16:17:12 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 65494 invoked by uid 99); 26 Sep 2017 16:17:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Sep 2017 16:17:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3B6EF5B2F; Tue, 26 Sep 2017 16:17:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Tue, 26 Sep 2017 16:17:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [8/8] airavata-django-portal git commit: AIRAVATA-2534 Setup build for common js and scss archived-at: Tue, 26 Sep 2017 16:17:14 -0000 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 Authored: Tue Sep 26 12:09:45 2017 -0400 Committer: Marcus Christie 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,