http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/apps/workspace/package.json ---------------------------------------------------------------------- diff --git a/django_airavata/apps/workspace/package.json b/django_airavata/apps/workspace/package.json index fd77e9f..d805bf5 100644 --- a/django_airavata/apps/workspace/package.json +++ b/django_airavata/apps/workspace/package.json @@ -10,6 +10,7 @@ "build": "cross-env NODE_ENV=production webpack --progress --hide-modules" }, "dependencies": { + "django-airavata-api": "file:../api", "django-airavata-common": "file:../..", "moment": "^2.18.1", "vue": "^2.3.3"
http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/apps/workspace/static/django_airavata_workspace/.gitignore ---------------------------------------------------------------------- diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/.gitignore b/django_airavata/apps/workspace/static/django_airavata_workspace/.gitignore deleted file mode 100644 index c795b05..0000000 --- a/django_airavata/apps/workspace/static/django_airavata_workspace/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/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 a3d89d5..6dd58d0 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,7 +11,8 @@ <script> import ProjectList from './ProjectList.vue' -import { components as comps, services } from 'django-airavata-common' +import { services } from 'django-airavata-api' +import { components as comps } from 'django-airavata-common' export default { props: ['initialProjectsData'], http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html ---------------------------------------------------------------------- diff --git a/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html b/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html index ed72bf5..e3bf00a 100644 --- a/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html +++ b/django_airavata/apps/workspace/templates/django_airavata_workspace/projects_list.html @@ -12,5 +12,5 @@ {% block scripts %} -<script src="{% static "django_airavata_workspace/build/main.js" %}"></script> +<script src="{% static "django_airavata_workspace/dist/main.js" %}"></script> {% endblock %} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-django-portal/blob/bb8eb5bf/django_airavata/apps/workspace/webpack.config.js ---------------------------------------------------------------------- diff --git a/django_airavata/apps/workspace/webpack.config.js b/django_airavata/apps/workspace/webpack.config.js index b5e5c1b..4186739 100644 --- a/django_airavata/apps/workspace/webpack.config.js +++ b/django_airavata/apps/workspace/webpack.config.js @@ -4,8 +4,8 @@ var webpack = require('webpack') module.exports = { entry: './static/django_airavata_workspace/js/entry-project-list.js', output: { - path: path.resolve(__dirname, './static/django_airavata_workspace/build/'), - publicPath: '/static/django_airavata_workspace/build/', + path: path.resolve(__dirname, './static/django_airavata_workspace/dist/'), + publicPath: '/static/django_airavata_workspace/dist/', filename: '[name].js' }, module: {
