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 3AECB200D1C for ; Sun, 15 Oct 2017 21:38:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 397891609D1; Sun, 15 Oct 2017 19:38:55 +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 3BA7D160BE7 for ; Sun, 15 Oct 2017 21:38:54 +0200 (CEST) Received: (qmail 37141 invoked by uid 500); 15 Oct 2017 19:38:53 -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 37113 invoked by uid 99); 15 Oct 2017 19:38:53 -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; Sun, 15 Oct 2017 19:38:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C64B1DFBC7; Sun, 15 Oct 2017 19:38:52 +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: Sun, 15 Oct 2017 19:38:54 -0000 Message-Id: In-Reply-To: <556d8d4c5cbb4fa7b377d4a6ce077d7a@git.apache.org> References: <556d8d4c5cbb4fa7b377d4a6ce077d7a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/8] airavata-django-portal git commit: AIRAVATA-2537 Introduce service for loading projects archived-at: Sun, 15 Oct 2017 19:38:55 -0000 AIRAVATA-2537 Introduce service for loading projects 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/4df20b6e Tree: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/tree/4df20b6e Diff: http://git-wip-us.apache.org/repos/asf/airavata-django-portal/diff/4df20b6e Branch: refs/heads/master Commit: 4df20b6e16ac7b6a517b66e00640092e8ae0b592 Parents: 30e9ce3 Author: Marcus Christie Authored: Sun Oct 15 12:09:56 2017 -0400 Committer: Marcus Christie Committed: Sun Oct 15 12:09:56 2017 -0400 ---------------------------------------------------------------------- .../js/entry-project-list.js | 2 +- .../js/services/ProjectService.js | 55 ++++++++++++++++++++ .../js/views/ProjectListContainer.vue | 28 ++++++++-- 3 files changed, 80 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/4df20b6e/django_airavata/apps/workspace/static/django_airavata_workspace/js/entry-project-list.js ---------------------------------------------------------------------- diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/entry-project-list.js b/django_airavata/apps/workspace/static/django_airavata_workspace/js/entry-project-list.js index e130aea..784b7cc 100644 --- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/entry-project-list.js +++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/entry-project-list.js @@ -5,7 +5,7 @@ new Vue({ el: '#project-list', template: '', data: { - projects: null + projectsData: null }, components: { ProjectListContainer http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/4df20b6e/django_airavata/apps/workspace/static/django_airavata_workspace/js/services/ProjectService.js ---------------------------------------------------------------------- diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/services/ProjectService.js b/django_airavata/apps/workspace/static/django_airavata_workspace/js/services/ProjectService.js new file mode 100644 index 0000000..4d51c59 --- /dev/null +++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/services/ProjectService.js @@ -0,0 +1,55 @@ + +import Project from '../models/Project' + +class ProjectService { + list(data = {}) { + if (data && data.results) { + let projects = data.results.map(result => new Project(result)); + this.next = data.next; + this.previous = data.previous; + return Promise.resolve({ + projects: projects, + next: this.next, + previous: this.previous + }); + } else { + return fetch('/api/projects', { + credentials: 'include' + }) + .then(response => response.json()) + .then(json => { + this.next = json.next; + this.previous = json.previous; + let projects = json.results.map(project => new Project(project)); + return { + projects: projects, + next: this.next, + previous: this.previous + } + }); + } + } + + listNext() { + // TODO + } + + listPrevious() { + // TODO + } + + create() { + // TODO + } + + update() { + // TODO + } + + get() { + // TODO + } +} + +// Export as a singleton +export default new ProjectService(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/4df20b6e/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue ---------------------------------------------------------------------- diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue index 271dd5d..b384a00 100644 --- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue +++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/views/ProjectListContainer.vue @@ -11,17 +11,18 @@