http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/package.json ---------------------------------------------------------------------- diff --git a/django_airavata/package.json b/django_airavata/package.json index c44a0c2..458f63a 100644 --- a/django_airavata/package.json +++ b/django_airavata/package.json @@ -11,6 +11,7 @@ "build": "cross-env NODE_ENV=production webpack --progress --hide-modules" }, "dependencies": { + "django-airavata-api": "file:apps/api", "vue": "^2.3.3" }, "devDependencies": {
http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/static/common/js/components/Pager.vue ---------------------------------------------------------------------- diff --git a/django_airavata/static/common/js/components/Pager.vue b/django_airavata/static/common/js/components/Pager.vue index b3289c0..4069822 100644 --- a/django_airavata/static/common/js/components/Pager.vue +++ b/django_airavata/static/common/js/components/Pager.vue @@ -13,8 +13,12 @@ </template> <script> +import { utils } from 'django-airavata-api'; export default { + props: { + paginator: utils.PaginationIterator, + }, props: ['paginator'], name: 'pager', methods: { http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/static/common/js/index.js ---------------------------------------------------------------------- diff --git a/django_airavata/static/common/js/index.js b/django_airavata/static/common/js/index.js index 8b74f3d..2d808f1 100644 --- a/django_airavata/static/common/js/index.js +++ b/django_airavata/static/common/js/index.js @@ -1,23 +1,5 @@ import Pager from './components/Pager.vue' -import Project from './models/Project' - -import ProjectService from './services/ProjectService' - -import PaginationIterator from './utils/PaginationIterator' - exports.components = { Pager: Pager } - -exports.models = { - Project: Project -} - -exports.services = { - ProjectService: ProjectService -} - -exports.utils = { - PaginationIterator: PaginationIterator -} http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/static/common/js/models/BaseModel.js ---------------------------------------------------------------------- diff --git a/django_airavata/static/common/js/models/BaseModel.js b/django_airavata/static/common/js/models/BaseModel.js deleted file mode 100644 index e61a1bc..0000000 --- a/django_airavata/static/common/js/models/BaseModel.js +++ /dev/null @@ -1,6 +0,0 @@ - -export default class BaseModel { - constructor(data = {}) { - Object.assign(this, data); - } -} http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/static/common/js/models/Project.js ---------------------------------------------------------------------- diff --git a/django_airavata/static/common/js/models/Project.js b/django_airavata/static/common/js/models/Project.js deleted file mode 100644 index 04b2ad4..0000000 --- a/django_airavata/static/common/js/models/Project.js +++ /dev/null @@ -1,7 +0,0 @@ -import BaseModel from './BaseModel'; - -export default class Project extends BaseModel { - constructor(data = {}) { - super(data); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/static/common/js/services/ProjectService.js ---------------------------------------------------------------------- diff --git a/django_airavata/static/common/js/services/ProjectService.js b/django_airavata/static/common/js/services/ProjectService.js deleted file mode 100644 index 3712181..0000000 --- a/django_airavata/static/common/js/services/ProjectService.js +++ /dev/null @@ -1,32 +0,0 @@ - -import Project from '../models/Project' -import PaginationIterator from '../utils/PaginationIterator' - -class ProjectService { - list(data = {}) { - if (data && data.results) { - return Promise.resolve(new PaginationIterator(data, Project)); - } else { - return fetch('/api/projects', { - credentials: 'include' - }) - .then(response => response.json()) - .then(json => new PaginationIterator(json, Project)); - } - } - - 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/bb8eb5bf/django_airavata/static/common/js/utils/PaginationIterator.js ---------------------------------------------------------------------- diff --git a/django_airavata/static/common/js/utils/PaginationIterator.js b/django_airavata/static/common/js/utils/PaginationIterator.js deleted file mode 100644 index d27855b..0000000 --- a/django_airavata/static/common/js/utils/PaginationIterator.js +++ /dev/null @@ -1,45 +0,0 @@ - -export default class PaginationIterator { - - constructor(pagedResponse, resultType = null) { - this.resultType = resultType; - this.processResponse(pagedResponse); - } - - next() { - return fetch(this._next, { - credentials: 'include' - }) - .then(response => response.json()) - .then(json => this.processResponse(json)); - } - - hasNext() { - return this._next != null; - } - - previous() { - return fetch(this._previous, { - credentials: 'include' - }) - .then(response => response.json()) - .then(json => this.processResponse(json)); - } - - hasPrevious() { - return this._previous != null; - } - - processResponse(pagedResponse) { - this._next = pagedResponse.next; - this._previous = pagedResponse.previous; - if (this.resultType) { - this.results = pagedResponse.results.map(result => new this.resultType(result)); - } else { - this.results = pagedResponse.results; - } - this.offset = pagedResponse.offset; - this.limit = pagedResponse.limit; - return this; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/webpack.config.js ---------------------------------------------------------------------- diff --git a/django_airavata/webpack.config.js b/django_airavata/webpack.config.js index 9c1c644..065bbe4 100644 --- a/django_airavata/webpack.config.js +++ b/django_airavata/webpack.config.js @@ -59,14 +59,7 @@ module.exports = { 'vue$': 'vue/dist/vue.esm.js' } }, - devServer: { - historyApiFallback: true, - noInfo: true - }, - performance: { - hints: false - }, - devtool: '#eval-source-map' + externals: ['vue'], } if (process.env.NODE_ENV === 'production') {
