This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch merge-portals in repository https://gitbox.apache.org/repos/asf/airavata-portals.git
commit fee22c01913b436bcac938d00d655f2bac380021 Merge: 6fc12a616 461df4e5a Author: Aarushi Bisht <[email protected]> AuthorDate: Tue Jun 9 14:14:36 2020 -0400 Merge pull request #7 from aarushiibisht/master Top banner, side navigation bar and refactored apps .../js/containers/Storage.vue | 121 ++++++++++++++--- .../js/containers/StorageResources.vue | 70 ++++++++++ .../js/entry-view-resources.js | 34 +++++ .../js/entry-view-storage.js | 10 +- .../{storage.html => container-header.html} | 9 +- .../apps/workspace/templates/resources.html | 6 + airavata_mft/apps/workspace/templates/storage.html | 11 +- airavata_mft/apps/workspace/urls.py | 5 +- airavata_mft/apps/workspace/views.py | 20 ++- airavata_mft/apps/workspace/vue.config.js | 5 +- airavata_mft/static/base.css | 1 - airavata_mft/static/common/vue.config.js | 2 +- airavata_mft/static/images/airavata-logo.png | Bin 0 -> 5510 bytes airavata_mft/templates/base.html | 150 ++++++++++++++++++++- airavata_mft/urls.py | 7 +- 15 files changed, 396 insertions(+), 55 deletions(-)
