This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-custos-portal.git
commit 719cef80f69acae740daa097118b29c91ed70bb4 Author: Shivam Rastogi <[email protected]> AuthorDate: Sun Mar 22 21:20:18 2020 -0400 Renamed the project from custos_admin_portal to custos_portal --- .../custos_admin_portal/apps/auth/apps.py | 6 ------ .../static/common/dist/webpack-stats.json | 1 - custos_admin_portal/custos_admin_portal/views.py | 6 ------ .../custos_portal}/__init__.py | 0 .../custos_portal}/app_config.py | 0 .../custos_portal/apps}/__init__.py | 0 .../custos_portal/apps/admin}/__init__.py | 0 .../custos_portal/apps/admin}/admin.py | 0 .../custos_portal}/apps/admin/apps.py | 10 +++++----- .../apps/admin/migrations}/__init__.py | 0 .../custos_portal/apps/admin}/models.py | 0 .../custos_portal/apps/admin}/tests.py | 0 .../custos_portal}/apps/admin/urls.py | 2 +- .../custos_portal}/apps/admin/views.py | 0 .../custos_portal/apps/auth}/__init__.py | 0 .../custos_portal}/apps/auth/admin.py | 0 custos_portal/custos_portal/apps/auth/apps.py | 6 ++++++ .../custos_portal}/apps/auth/backends.py | 0 .../custos_portal}/apps/auth/forms.py | 0 .../custos_portal}/apps/auth/middleware.py | 0 .../apps/auth/migrations}/__init__.py | 0 .../custos_portal}/apps/auth/models.py | 0 .../custos_portal}/apps/auth/tests.py | 0 .../custos_portal}/apps/auth/urls.py | 2 +- .../custos_portal}/apps/auth/views.py | 4 ++-- .../custos_portal/apps/workspace}/__init__.py | 0 .../custos_portal/apps/workspace}/admin.py | 0 .../custos_portal}/apps/workspace/apps.py | 4 ++-- .../apps/workspace/migrations}/__init__.py | 0 .../custos_portal/apps/workspace}/models.py | 0 .../custos_portal/apps/workspace}/tests.py | 0 .../custos_portal}/apps/workspace/urls.py | 0 .../custos_portal}/apps/workspace/views.py | 0 .../custos_portal}/asgi.py | 4 ++-- .../custos_portal}/context_processors.py | 2 +- .../custos_portal}/settings.py | 22 ++++++++++----------- .../bootstrap-4.0.0-beta/css/bootstrap-grid.css | 0 .../css/bootstrap-grid.css.map | 0 .../css/bootstrap-grid.min.css | 0 .../css/bootstrap-grid.min.css.map | 0 .../bootstrap-4.0.0-beta/css/bootstrap-reboot.css | 0 .../css/bootstrap-reboot.css.map | 0 .../css/bootstrap-reboot.min.css | 0 .../css/bootstrap-reboot.min.css.map | 0 .../static/bootstrap-4.0.0-beta/css/bootstrap.css | 0 .../bootstrap-4.0.0-beta/css/bootstrap.css.map | 0 .../bootstrap-4.0.0-beta/css/bootstrap.min.css | 0 .../bootstrap-4.0.0-beta/css/bootstrap.min.css.map | 0 .../static/bootstrap-4.0.0-beta/js/bootstrap.js | 0 .../bootstrap-4.0.0-beta/js/bootstrap.min.js | 0 .../custos_portal}/static/common/babel.config.js | 0 .../custos_portal}/static/common/dist/app.html | 0 .../custos_portal}/static/common/dist/cms.html | 0 .../static/common/dist/css/app.87141902.css | 0 .../common/dist/css/chunk-vendors.c6325321.css | 0 .../common/dist/fonts/fa-brands-400.067595ad.woff2 | Bin .../common/dist/fonts/fa-brands-400.57dcda6f.eot | Bin .../common/dist/fonts/fa-brands-400.9ec698d1.ttf | Bin .../common/dist/fonts/fa-brands-400.b564da88.woff | Bin .../common/dist/fonts/fa-regular-400.3351f435.eot | Bin .../dist/fonts/fa-regular-400.4165c268.woff2 | Bin .../common/dist/fonts/fa-regular-400.73cf49a2.woff | Bin .../common/dist/fonts/fa-regular-400.a0e3ac82.ttf | Bin .../common/dist/fonts/fa-solid-900.55eb2a60.woff2 | Bin .../common/dist/fonts/fa-solid-900.75f38a15.ttf | Bin .../common/dist/fonts/fa-solid-900.89e02bae.eot | Bin .../common/dist/fonts/fa-solid-900.cdfec5cf.woff | Bin .../common/dist/img/fa-brands-400.9d67fa14.svg | 0 .../common/dist/img/fa-regular-400.5d086178.svg | 0 .../common/dist/img/fa-solid-900.0724bb8b.svg | 0 .../static/common/dist/js/app.03f837a2.js | 0 .../common/dist/js/chunk-vendors.40446d03.js | 0 .../static/common/dist/js/cms.d3439b40.js | 0 .../common/dist/js/list-requests.722b22d1.js | 0 .../common/dist/js/request-new-tenant.d492a7db.js | 0 .../static/common/dist/js/view-request.f6b3592b.js | 0 .../static/common/dist/list-requests.html | 0 .../static/common/dist/request-new-tenant.html | 0 .../static/common/dist/view-request.html | 0 .../static/common/dist/webpack-stats.json | 1 + .../EditTenantRequest.vue | 0 .../ListTenantRequestsContainer.vue | 0 .../ViewTenantRequestContainer.vue | 0 .../entry-admin-edit-tenant-request.js | 0 .../entry-admin-list-new-tenant-requests.js | 0 .../entry-admin-view-tenant-request.js | 0 .../apps/custos_admin_portal_admin/utils/urls.js | 0 .../apps/workspace/ListTenantRequestsContainer.vue | 0 .../apps/workspace/RequestNewTenantContainer.vue | 0 .../apps/workspace/ViewTenantRequestContainer.vue | 0 .../workspace/entry-list-new-tenant-requests.js | 0 .../js/apps/workspace/entry-request-new-tenant.js | 0 .../js/apps/workspace/entry-view-tenant-request.js | 0 .../static/common/js/apps/workspace/utils/urls.js | 0 .../custos_portal}/static/common/js/cms.js | 0 .../static/common/js/components/MainLayout.vue | 0 .../custos_portal}/static/common/js/entry.js | 0 .../custos_portal}/static/common/js/index.js | 0 .../static/common/js/layouts/ListLayout.vue | 0 .../custos_portal}/static/common/js/main.js | 0 .../static/common/js/notifications/Notification.js | 0 .../common/js/notifications/NotificationList.js | 0 .../custos_portal}/static/common/js/utils.js | 0 .../custos_portal}/static/common/package-lock.json | 0 .../custos_portal}/static/common/package.json | 0 .../custos_portal}/static/common/scss/main.scss | 0 .../custos_portal}/static/common/vue.config.js | 6 +++--- .../custos_portal}/static/common/yarn.lock | 0 .../custos_portal}/static/css/draft-colors.css | 0 .../custos_portal}/static/images/airavata-logo.png | Bin .../static/images/cilogon-logo-24x24-b.png | Bin .../custos_portal}/templates/base.html | 0 .../templates/custos_portal}/home.html | 4 ++-- .../templates/custos_portal_admin}/base.html | 0 .../view_tenant_requestview_tenant_request.html | 0 .../templates/custos_portal_auth}/auth_error.html | 0 .../templates/custos_portal_auth}/base.html | 0 .../custos_portal_auth}/callback-error.html | 0 .../custos_portal_auth}/create_account.html | 6 +++--- .../custos_portal_auth}/forgot_password.html | 0 .../templates/custos_portal_auth}/login.html | 0 .../login_username_password.html | 0 .../partials/externals_login_form.html | 4 ++-- .../custos_portal_auth}/partials/form.html | 0 .../custos_portal_auth}/partials/form_field.html | 0 .../custos_portal_auth}/partials/messages.html | 0 .../partials/non_field_errors.html | 0 .../partials/username_password_login_form.html | 0 .../custos_portal_auth}/reset_password.html | 0 .../custos_portal_auth}/verify_email.html | 0 .../custos_portal/templates/workspace}/base.html | 0 .../templates/workspace/list_requests.html | 0 .../templates/workspace/request_new_tenant.html | 0 .../templates/workspace/view_tenant_request.html | 0 .../custos_portal}/urls.py | 8 ++++---- custos_portal/custos_portal/views.py | 6 ++++++ .../custos_portal}/wsgi.py | 4 ++-- {custos_admin_portal => custos_portal}/manage.py | 2 +- 138 files changed, 55 insertions(+), 55 deletions(-) diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/apps.py b/custos_admin_portal/custos_admin_portal/apps/auth/apps.py deleted file mode 100644 index 4b97150..0000000 --- a/custos_admin_portal/custos_admin_portal/apps/auth/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class AuthConfig(AppConfig): - name = 'custos_admin_portal.apps.auth' - label = 'custos_admin_portal_auth' diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/webpack-stats.json b/custos_admin_portal/custos_admin_portal/static/common/dist/webpack-stats.json deleted file mode 100644 index 111ba4b..0000000 --- a/custos_admin_portal/custos_admin_portal/static/common/dist/webpack-stats.json +++ /dev/null @@ -1 +0,0 @@ -{"status":"done","publicPath":"http://localhost:9000/static/common/dist/","chunks":{"admin-edit-request":[{"name":"admin-edit-request.js","publicPath":"http://localhost:9000/static/common/dist/admin-edit-request.js","path":"/home/shivam/Programming/custos_UI/custos_admin_portal/custos_admin_portal/static/common/dist/admin-edit-request.js"},{"name":"admin-edit-request.js.map","publicPath":"http://localhost:9000/static/common/dist/admin-edit-request.js.map","path":"/home/shivam/Programming [...] \ No newline at end of file diff --git a/custos_admin_portal/custos_admin_portal/views.py b/custos_admin_portal/custos_admin_portal/views.py deleted file mode 100644 index dc6b6b4..0000000 --- a/custos_admin_portal/custos_admin_portal/views.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.shortcuts import render - - -def home(request): - return render(request, 'custos_admin_portal/home.html', {}) - diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/migrations/__init__.py b/custos_portal/custos_portal/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/workspace/migrations/__init__.py rename to custos_portal/custos_portal/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/app_config.py b/custos_portal/custos_portal/app_config.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/app_config.py rename to custos_portal/custos_portal/app_config.py diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/__init__.py b/custos_portal/custos_portal/apps/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/workspace/__init__.py rename to custos_portal/custos_portal/apps/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/migrations/__init__.py b/custos_portal/custos_portal/apps/admin/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/migrations/__init__.py rename to custos_portal/custos_portal/apps/admin/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/admin.py b/custos_portal/custos_portal/apps/admin/admin.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/workspace/admin.py rename to custos_portal/custos_portal/apps/admin/admin.py diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/apps.py b/custos_portal/custos_portal/apps/admin/apps.py similarity index 58% rename from custos_admin_portal/custos_admin_portal/apps/admin/apps.py rename to custos_portal/custos_portal/apps/admin/apps.py index 2385180..76b2521 100644 --- a/custos_admin_portal/custos_admin_portal/apps/admin/apps.py +++ b/custos_portal/custos_portal/apps/admin/apps.py @@ -1,12 +1,12 @@ -from custos_admin_portal.app_config import CustosAppConfig +from custos_portal.app_config import CustosAppConfig class AdminConfig(CustosAppConfig): - name = 'custos_admin_portal.apps.admin' - label = 'custos_admin_portal_admin' + name = 'custos_portal.apps.admin' + label = 'custos_portal_admin' verbose_name = 'Admin' app_order = 100 - url_home = 'custos_admin_portal_admin:list_requests' + url_home = 'custos_portal_admin:list_requests' fa_icon_class = 'fa-cog' app_description = """ Configure and share resources with other users. @@ -15,7 +15,7 @@ class AdminConfig(CustosAppConfig): { 'label': 'Application Catalog', 'icon': 'fa fa-list', - 'url': 'custos_admin_portal_admin:list_requests', + 'url': 'custos_portal_admin:list_requests', 'active_prefixes': ['applications', 'list-requests'] } ] \ No newline at end of file diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/__init__.py b/custos_portal/custos_portal/apps/admin/migrations/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/__init__.py rename to custos_portal/custos_portal/apps/admin/migrations/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/models.py b/custos_portal/custos_portal/apps/admin/models.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/workspace/models.py rename to custos_portal/custos_portal/apps/admin/models.py diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/tests.py b/custos_portal/custos_portal/apps/admin/tests.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/workspace/tests.py rename to custos_portal/custos_portal/apps/admin/tests.py diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/urls.py b/custos_portal/custos_portal/apps/admin/urls.py similarity index 91% rename from custos_admin_portal/custos_admin_portal/apps/admin/urls.py rename to custos_portal/custos_portal/apps/admin/urls.py index dc77d80..8c63432 100644 --- a/custos_admin_portal/custos_admin_portal/apps/admin/urls.py +++ b/custos_portal/custos_portal/apps/admin/urls.py @@ -3,7 +3,7 @@ from django.urls import path from . import views -app_name = 'custos_admin_portal_admin' +app_name = 'custos_portal_admin' urlpatterns = [ url(r'^list-requests', views.list_new_tenant_requests, name='list_requests'), url(r'^request/(?P<tenant_request_id>[^/]+)/$', views.view_tenant_request, name="view_tenant_request"), diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/views.py b/custos_portal/custos_portal/apps/admin/views.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/admin/views.py rename to custos_portal/custos_portal/apps/admin/views.py diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/migrations/__init__.py b/custos_portal/custos_portal/apps/auth/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/admin/migrations/__init__.py rename to custos_portal/custos_portal/apps/auth/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/admin.py b/custos_portal/custos_portal/apps/auth/admin.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/admin.py rename to custos_portal/custos_portal/apps/auth/admin.py diff --git a/custos_portal/custos_portal/apps/auth/apps.py b/custos_portal/custos_portal/apps/auth/apps.py new file mode 100644 index 0000000..e7dfe81 --- /dev/null +++ b/custos_portal/custos_portal/apps/auth/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class AuthConfig(AppConfig): + name = 'custos_portal.apps.auth' + label = 'custos_portal_auth' diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/backends.py b/custos_portal/custos_portal/apps/auth/backends.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/backends.py rename to custos_portal/custos_portal/apps/auth/backends.py diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/forms.py b/custos_portal/custos_portal/apps/auth/forms.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/forms.py rename to custos_portal/custos_portal/apps/auth/forms.py diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/middleware.py b/custos_portal/custos_portal/apps/auth/middleware.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/middleware.py rename to custos_portal/custos_portal/apps/auth/middleware.py diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/__init__.py b/custos_portal/custos_portal/apps/auth/migrations/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/admin/__init__.py rename to custos_portal/custos_portal/apps/auth/migrations/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/models.py b/custos_portal/custos_portal/apps/auth/models.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/models.py rename to custos_portal/custos_portal/apps/auth/models.py diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/tests.py b/custos_portal/custos_portal/apps/auth/tests.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/auth/tests.py rename to custos_portal/custos_portal/apps/auth/tests.py diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/urls.py b/custos_portal/custos_portal/apps/auth/urls.py similarity index 89% rename from custos_admin_portal/custos_admin_portal/apps/auth/urls.py rename to custos_portal/custos_portal/apps/auth/urls.py index aab4530..e7f41a8 100644 --- a/custos_admin_portal/custos_admin_portal/apps/auth/urls.py +++ b/custos_portal/custos_portal/apps/auth/urls.py @@ -3,7 +3,7 @@ from django.urls import path from . import views -app_name = 'custos_admin_portal_auth' +app_name = 'custos_portal_auth' urlpatterns = [ path('login/', views.start_login, name='login'), url(r'^redirect_login/(\w+)/$', views.redirect_login, name='redirect_login'), diff --git a/custos_admin_portal/custos_admin_portal/apps/auth/views.py b/custos_portal/custos_portal/apps/auth/views.py similarity index 93% rename from custos_admin_portal/custos_admin_portal/apps/auth/views.py rename to custos_portal/custos_portal/apps/auth/views.py index a2760c4..d949ccb 100644 --- a/custos_admin_portal/custos_admin_portal/apps/auth/views.py +++ b/custos_portal/custos_portal/apps/auth/views.py @@ -6,7 +6,7 @@ from . import forms def start_login(request): - return render(request, 'custos_admin_portal_auth/login.html', { + return render(request, 'custos_portal_auth/login.html', { 'next': request.GET.get('next', None), 'options': settings.AUTHENTICATION_OPTIONS, }) @@ -48,7 +48,7 @@ def create_account(request): form.add_error(None, ValidationError(e.message)) else: form = forms.CreateAccountForm() - return render(request, 'custos_admin_portal_auth/create_account.html', { + return render(request, 'custos_portal_auth/create_account.html', { 'options': settings.AUTHENTICATION_OPTIONS, 'form': form }) diff --git a/custos_admin_portal/custos_admin_portal/apps/__init__.py b/custos_portal/custos_portal/apps/workspace/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/__init__.py rename to custos_portal/custos_portal/apps/workspace/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/admin.py b/custos_portal/custos_portal/apps/workspace/admin.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/admin/admin.py rename to custos_portal/custos_portal/apps/workspace/admin.py diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/apps.py b/custos_portal/custos_portal/apps/workspace/apps.py similarity index 88% rename from custos_admin_portal/custos_admin_portal/apps/workspace/apps.py rename to custos_portal/custos_portal/apps/workspace/apps.py index 4cf73f2..1a35ee5 100644 --- a/custos_admin_portal/custos_admin_portal/apps/workspace/apps.py +++ b/custos_portal/custos_portal/apps/workspace/apps.py @@ -1,8 +1,8 @@ -from custos_admin_portal.app_config import CustosAppConfig +from custos_portal.app_config import CustosAppConfig class WorkspaceConfig(CustosAppConfig): - name = 'custos_admin_portal.apps.workspace' + name = 'custos_portal.apps.workspace' label = 'custos_admin_portal_workspace' verbose_name = 'Workspace' app_order = 0 diff --git a/custos_admin_portal/custos_admin_portal/__init__.py b/custos_portal/custos_portal/apps/workspace/migrations/__init__.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/__init__.py rename to custos_portal/custos_portal/apps/workspace/migrations/__init__.py diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/models.py b/custos_portal/custos_portal/apps/workspace/models.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/admin/models.py rename to custos_portal/custos_portal/apps/workspace/models.py diff --git a/custos_admin_portal/custos_admin_portal/apps/admin/tests.py b/custos_portal/custos_portal/apps/workspace/tests.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/admin/tests.py rename to custos_portal/custos_portal/apps/workspace/tests.py diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/urls.py b/custos_portal/custos_portal/apps/workspace/urls.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/workspace/urls.py rename to custos_portal/custos_portal/apps/workspace/urls.py diff --git a/custos_admin_portal/custos_admin_portal/apps/workspace/views.py b/custos_portal/custos_portal/apps/workspace/views.py similarity index 100% rename from custos_admin_portal/custos_admin_portal/apps/workspace/views.py rename to custos_portal/custos_portal/apps/workspace/views.py diff --git a/custos_admin_portal/custos_admin_portal/asgi.py b/custos_portal/custos_portal/asgi.py similarity index 69% rename from custos_admin_portal/custos_admin_portal/asgi.py rename to custos_portal/custos_portal/asgi.py index 3878349..268915a 100644 --- a/custos_admin_portal/custos_admin_portal/asgi.py +++ b/custos_portal/custos_portal/asgi.py @@ -1,5 +1,5 @@ """ -ASGI config for custos_admin_portal project. +ASGI config for custos_portal project. It exposes the ASGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'custos_admin_portal.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'custos_portal.settings') application = get_asgi_application() diff --git a/custos_admin_portal/custos_admin_portal/context_processors.py b/custos_portal/custos_portal/context_processors.py similarity index 98% rename from custos_admin_portal/custos_admin_portal/context_processors.py rename to custos_portal/custos_portal/context_processors.py index 824ec95..0cbb601 100644 --- a/custos_admin_portal/custos_admin_portal/context_processors.py +++ b/custos_portal/custos_portal/context_processors.py @@ -5,7 +5,7 @@ import re from django.apps import apps from django.conf import settings -from custos_admin_portal.app_config import CustosAppConfig +from custos_portal.app_config import CustosAppConfig logger = logging.getLogger(__name__) diff --git a/custos_admin_portal/custos_admin_portal/settings.py b/custos_portal/custos_portal/settings.py similarity index 85% rename from custos_admin_portal/custos_admin_portal/settings.py rename to custos_portal/custos_portal/settings.py index d248ab9..6e58c9f 100644 --- a/custos_admin_portal/custos_admin_portal/settings.py +++ b/custos_portal/custos_portal/settings.py @@ -1,5 +1,5 @@ """ -Django settings for custos_admin_portal project. +Django settings for custos_portal project. Generated by 'django-admin startproject' using Django 3.0.3. @@ -37,9 +37,9 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'webpack_loader', - 'custos_admin_portal.apps.auth.apps.AuthConfig', - 'custos_admin_portal.apps.workspace.apps.WorkspaceConfig', - 'custos_admin_portal.apps.admin.apps.AdminConfig' + 'custos_portal.apps.auth.apps.AuthConfig', + 'custos_portal.apps.workspace.apps.WorkspaceConfig', + 'custos_portal.apps.admin.apps.AdminConfig' ] MIDDLEWARE = [ @@ -52,12 +52,12 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'custos_admin_portal.urls' +ROOT_URLCONF = 'custos_portal.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, "custos_admin_portal", "templates")], + 'DIRS': [os.path.join(BASE_DIR, "custos_portal", "templates")], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -65,13 +65,13 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - 'custos_admin_portal.context_processors.airavata_app_registry', + 'custos_portal.context_processors.airavata_app_registry', ], }, }, ] -WSGI_APPLICATION = 'custos_admin_portal.wsgi.application' +WSGI_APPLICATION = 'custos_portal.wsgi.application' # Database # https://docs.djangoproject.com/en/3.0/ref/settings/#databases @@ -118,9 +118,9 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.0/howto/static-files/ STATIC_URL = '/static/' -STATICFILES_DIRS = [os.path.join(BASE_DIR, "custos_admin_portal", "static")] +STATICFILES_DIRS = [os.path.join(BASE_DIR, "custos_portal", "static")] -LOGIN_URL = 'custos_admin_portal_auth:login' +LOGIN_URL = 'custos_portal_auth:login' LOGIN_REDIRECT_URL = 'django_airavata_workspace:dashboard' LOGOUT_REDIRECT_URL = '/' @@ -145,7 +145,7 @@ WEBPACK_LOADER = { 'BUNDLE_DIR_NAME': 'common/dist', # must end with slash 'STATS_FILE': os.path.join( BASE_DIR, - 'custos_admin_portal', + 'custos_portal', 'static', 'common', 'dist', diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css.map b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css.map similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css.map rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.css.map diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css.map b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css.map similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css.map rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-grid.min.css.map diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css.map b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css.map similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css.map rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.css.map diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css.map b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css.map similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css.map rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap-reboot.min.css.map diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css.map b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css.map similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css.map rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.css.map diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css.map b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css.map similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css.map rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/css/bootstrap.min.css.map diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/js/bootstrap.js b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/js/bootstrap.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/js/bootstrap.js rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/js/bootstrap.js diff --git a/custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/js/bootstrap.min.js b/custos_portal/custos_portal/static/bootstrap-4.0.0-beta/js/bootstrap.min.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/bootstrap-4.0.0-beta/js/bootstrap.min.js rename to custos_portal/custos_portal/static/bootstrap-4.0.0-beta/js/bootstrap.min.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/babel.config.js b/custos_portal/custos_portal/static/common/babel.config.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/babel.config.js rename to custos_portal/custos_portal/static/common/babel.config.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/app.html b/custos_portal/custos_portal/static/common/dist/app.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/app.html rename to custos_portal/custos_portal/static/common/dist/app.html diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/cms.html b/custos_portal/custos_portal/static/common/dist/cms.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/cms.html rename to custos_portal/custos_portal/static/common/dist/cms.html diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/css/app.87141902.css b/custos_portal/custos_portal/static/common/dist/css/app.87141902.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/css/app.87141902.css rename to custos_portal/custos_portal/static/common/dist/css/app.87141902.css diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/css/chunk-vendors.c6325321.css b/custos_portal/custos_portal/static/common/dist/css/chunk-vendors.c6325321.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/css/chunk-vendors.c6325321.css rename to custos_portal/custos_portal/static/common/dist/css/chunk-vendors.c6325321.css diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.067595ad.woff2 b/custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.067595ad.woff2 similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.067595ad.woff2 rename to custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.067595ad.woff2 diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.57dcda6f.eot b/custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.57dcda6f.eot similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.57dcda6f.eot rename to custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.57dcda6f.eot diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.9ec698d1.ttf b/custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.9ec698d1.ttf similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.9ec698d1.ttf rename to custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.9ec698d1.ttf diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.b564da88.woff b/custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.b564da88.woff similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-brands-400.b564da88.woff rename to custos_portal/custos_portal/static/common/dist/fonts/fa-brands-400.b564da88.woff diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.3351f435.eot b/custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.3351f435.eot similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.3351f435.eot rename to custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.3351f435.eot diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.4165c268.woff2 b/custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.4165c268.woff2 similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.4165c268.woff2 rename to custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.4165c268.woff2 diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.73cf49a2.woff b/custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.73cf49a2.woff similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.73cf49a2.woff rename to custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.73cf49a2.woff diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.a0e3ac82.ttf b/custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.a0e3ac82.ttf similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-regular-400.a0e3ac82.ttf rename to custos_portal/custos_portal/static/common/dist/fonts/fa-regular-400.a0e3ac82.ttf diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.55eb2a60.woff2 b/custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.55eb2a60.woff2 similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.55eb2a60.woff2 rename to custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.55eb2a60.woff2 diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.75f38a15.ttf b/custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.75f38a15.ttf similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.75f38a15.ttf rename to custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.75f38a15.ttf diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.89e02bae.eot b/custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.89e02bae.eot similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.89e02bae.eot rename to custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.89e02bae.eot diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.cdfec5cf.woff b/custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.cdfec5cf.woff similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/fonts/fa-solid-900.cdfec5cf.woff rename to custos_portal/custos_portal/static/common/dist/fonts/fa-solid-900.cdfec5cf.woff diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/img/fa-brands-400.9d67fa14.svg b/custos_portal/custos_portal/static/common/dist/img/fa-brands-400.9d67fa14.svg similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/img/fa-brands-400.9d67fa14.svg rename to custos_portal/custos_portal/static/common/dist/img/fa-brands-400.9d67fa14.svg diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/img/fa-regular-400.5d086178.svg b/custos_portal/custos_portal/static/common/dist/img/fa-regular-400.5d086178.svg similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/img/fa-regular-400.5d086178.svg rename to custos_portal/custos_portal/static/common/dist/img/fa-regular-400.5d086178.svg diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/img/fa-solid-900.0724bb8b.svg b/custos_portal/custos_portal/static/common/dist/img/fa-solid-900.0724bb8b.svg similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/img/fa-solid-900.0724bb8b.svg rename to custos_portal/custos_portal/static/common/dist/img/fa-solid-900.0724bb8b.svg diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/js/app.03f837a2.js b/custos_portal/custos_portal/static/common/dist/js/app.03f837a2.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/js/app.03f837a2.js rename to custos_portal/custos_portal/static/common/dist/js/app.03f837a2.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/js/chunk-vendors.40446d03.js b/custos_portal/custos_portal/static/common/dist/js/chunk-vendors.40446d03.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/js/chunk-vendors.40446d03.js rename to custos_portal/custos_portal/static/common/dist/js/chunk-vendors.40446d03.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/js/cms.d3439b40.js b/custos_portal/custos_portal/static/common/dist/js/cms.d3439b40.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/js/cms.d3439b40.js rename to custos_portal/custos_portal/static/common/dist/js/cms.d3439b40.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/js/list-requests.722b22d1.js b/custos_portal/custos_portal/static/common/dist/js/list-requests.722b22d1.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/js/list-requests.722b22d1.js rename to custos_portal/custos_portal/static/common/dist/js/list-requests.722b22d1.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/js/request-new-tenant.d492a7db.js b/custos_portal/custos_portal/static/common/dist/js/request-new-tenant.d492a7db.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/js/request-new-tenant.d492a7db.js rename to custos_portal/custos_portal/static/common/dist/js/request-new-tenant.d492a7db.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/js/view-request.f6b3592b.js b/custos_portal/custos_portal/static/common/dist/js/view-request.f6b3592b.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/js/view-request.f6b3592b.js rename to custos_portal/custos_portal/static/common/dist/js/view-request.f6b3592b.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/list-requests.html b/custos_portal/custos_portal/static/common/dist/list-requests.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/list-requests.html rename to custos_portal/custos_portal/static/common/dist/list-requests.html diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/request-new-tenant.html b/custos_portal/custos_portal/static/common/dist/request-new-tenant.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/request-new-tenant.html rename to custos_portal/custos_portal/static/common/dist/request-new-tenant.html diff --git a/custos_admin_portal/custos_admin_portal/static/common/dist/view-request.html b/custos_portal/custos_portal/static/common/dist/view-request.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/dist/view-request.html rename to custos_portal/custos_portal/static/common/dist/view-request.html diff --git a/custos_portal/custos_portal/static/common/dist/webpack-stats.json b/custos_portal/custos_portal/static/common/dist/webpack-stats.json new file mode 100644 index 0000000..ecbf6b2 --- /dev/null +++ b/custos_portal/custos_portal/static/common/dist/webpack-stats.json @@ -0,0 +1 @@ +{"status":"done","publicPath":"http://localhost:9000/static/common/dist/","chunks":{"admin-edit-request":[{"name":"admin-edit-request.js","publicPath":"http://localhost:9000/static/common/dist/admin-edit-request.js","path":"/home/shivam/Programming/custos_UI/custos_portal/custos_portal/static/common/dist/admin-edit-request.js"},{"name":"admin-edit-request.js.map","publicPath":"http://localhost:9000/static/common/dist/admin-edit-request.js.map","path":"/home/shivam/Programming/custos_UI/c [...] \ No newline at end of file diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/EditTenantRequest.vue b/custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/EditTenantRequest.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/EditTenantRequest.vue rename to custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/EditTenantRequest.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/ListTenantRequestsContainer.vue b/custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/ListTenantRequestsContainer.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/ListTenantRequestsContainer.vue rename to custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/ListTenantRequestsContainer.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/ViewTenantRequestContainer.vue b/custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/ViewTenantRequestContainer.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/ViewTenantRequestContainer.vue rename to custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/ViewTenantRequestContainer.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-edit-tenant-request.js b/custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-edit-tenant-request.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-edit-tenant-request.js rename to custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-edit-tenant-request.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-list-new-tenant-requests.js b/custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-list-new-tenant-requests.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-list-new-tenant-requests.js rename to custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-list-new-tenant-requests.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-view-tenant-request.js b/custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-view-tenant-request.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-view-tenant-request.js rename to custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/entry-admin-view-tenant-request.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/utils/urls.js b/custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/utils/urls.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/custos_admin_portal_admin/utils/urls.js rename to custos_portal/custos_portal/static/common/js/apps/custos_admin_portal_admin/utils/urls.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/ListTenantRequestsContainer.vue b/custos_portal/custos_portal/static/common/js/apps/workspace/ListTenantRequestsContainer.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/ListTenantRequestsContainer.vue rename to custos_portal/custos_portal/static/common/js/apps/workspace/ListTenantRequestsContainer.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/RequestNewTenantContainer.vue b/custos_portal/custos_portal/static/common/js/apps/workspace/RequestNewTenantContainer.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/RequestNewTenantContainer.vue rename to custos_portal/custos_portal/static/common/js/apps/workspace/RequestNewTenantContainer.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/ViewTenantRequestContainer.vue b/custos_portal/custos_portal/static/common/js/apps/workspace/ViewTenantRequestContainer.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/ViewTenantRequestContainer.vue rename to custos_portal/custos_portal/static/common/js/apps/workspace/ViewTenantRequestContainer.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/entry-list-new-tenant-requests.js b/custos_portal/custos_portal/static/common/js/apps/workspace/entry-list-new-tenant-requests.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/entry-list-new-tenant-requests.js rename to custos_portal/custos_portal/static/common/js/apps/workspace/entry-list-new-tenant-requests.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/entry-request-new-tenant.js b/custos_portal/custos_portal/static/common/js/apps/workspace/entry-request-new-tenant.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/entry-request-new-tenant.js rename to custos_portal/custos_portal/static/common/js/apps/workspace/entry-request-new-tenant.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/entry-view-tenant-request.js b/custos_portal/custos_portal/static/common/js/apps/workspace/entry-view-tenant-request.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/entry-view-tenant-request.js rename to custos_portal/custos_portal/static/common/js/apps/workspace/entry-view-tenant-request.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/utils/urls.js b/custos_portal/custos_portal/static/common/js/apps/workspace/utils/urls.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/apps/workspace/utils/urls.js rename to custos_portal/custos_portal/static/common/js/apps/workspace/utils/urls.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/cms.js b/custos_portal/custos_portal/static/common/js/cms.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/cms.js rename to custos_portal/custos_portal/static/common/js/cms.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/components/MainLayout.vue b/custos_portal/custos_portal/static/common/js/components/MainLayout.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/components/MainLayout.vue rename to custos_portal/custos_portal/static/common/js/components/MainLayout.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/entry.js b/custos_portal/custos_portal/static/common/js/entry.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/entry.js rename to custos_portal/custos_portal/static/common/js/entry.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/index.js b/custos_portal/custos_portal/static/common/js/index.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/index.js rename to custos_portal/custos_portal/static/common/js/index.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/layouts/ListLayout.vue b/custos_portal/custos_portal/static/common/js/layouts/ListLayout.vue similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/layouts/ListLayout.vue rename to custos_portal/custos_portal/static/common/js/layouts/ListLayout.vue diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/main.js b/custos_portal/custos_portal/static/common/js/main.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/main.js rename to custos_portal/custos_portal/static/common/js/main.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/notifications/Notification.js b/custos_portal/custos_portal/static/common/js/notifications/Notification.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/notifications/Notification.js rename to custos_portal/custos_portal/static/common/js/notifications/Notification.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/notifications/NotificationList.js b/custos_portal/custos_portal/static/common/js/notifications/NotificationList.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/notifications/NotificationList.js rename to custos_portal/custos_portal/static/common/js/notifications/NotificationList.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/js/utils.js b/custos_portal/custos_portal/static/common/js/utils.js similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/js/utils.js rename to custos_portal/custos_portal/static/common/js/utils.js diff --git a/custos_admin_portal/custos_admin_portal/static/common/package-lock.json b/custos_portal/custos_portal/static/common/package-lock.json similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/package-lock.json rename to custos_portal/custos_portal/static/common/package-lock.json diff --git a/custos_admin_portal/custos_admin_portal/static/common/package.json b/custos_portal/custos_portal/static/common/package.json similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/package.json rename to custos_portal/custos_portal/static/common/package.json diff --git a/custos_admin_portal/custos_admin_portal/static/common/scss/main.scss b/custos_portal/custos_portal/static/common/scss/main.scss similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/scss/main.scss rename to custos_portal/custos_portal/static/common/scss/main.scss diff --git a/custos_admin_portal/custos_admin_portal/static/common/vue.config.js b/custos_portal/custos_portal/static/common/vue.config.js similarity index 86% rename from custos_admin_portal/custos_admin_portal/static/common/vue.config.js rename to custos_portal/custos_portal/static/common/vue.config.js index bbe120e..21a668d 100755 --- a/custos_admin_portal/custos_admin_portal/static/common/vue.config.js +++ b/custos_portal/custos_portal/static/common/vue.config.js @@ -9,9 +9,9 @@ module.exports = { 'request-new-tenant': "./js/apps/workspace/entry-request-new-tenant", 'list-requests': "./js/apps/workspace/entry-list-new-tenant-requests", 'view-request': "./js/apps/workspace/entry-view-tenant-request", - 'admin-view-request': "./js/apps/custos_admin_portal_admin/entry-admin-view-tenant-request", - 'admin-edit-request': "./js/apps/custos_admin_portal_admin/entry-admin-edit-tenant-request", - 'admin-list-requests': "./js/apps/custos_admin_portal_admin/entry-admin-list-new-tenant-requests" + 'admin-view-request': "./js/apps/custos_portal_admin/entry-admin-view-tenant-request", + 'admin-edit-request': "./js/apps/custos_portal_admin/entry-admin-edit-tenant-request", + 'admin-list-requests': "./js/apps/custos_portal_admin/entry-admin-list-new-tenant-requests" }, css: { loaderOptions: { diff --git a/custos_admin_portal/custos_admin_portal/static/common/yarn.lock b/custos_portal/custos_portal/static/common/yarn.lock similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/common/yarn.lock rename to custos_portal/custos_portal/static/common/yarn.lock diff --git a/custos_admin_portal/custos_admin_portal/static/css/draft-colors.css b/custos_portal/custos_portal/static/css/draft-colors.css similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/css/draft-colors.css rename to custos_portal/custos_portal/static/css/draft-colors.css diff --git a/custos_admin_portal/custos_admin_portal/static/images/airavata-logo.png b/custos_portal/custos_portal/static/images/airavata-logo.png similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/images/airavata-logo.png rename to custos_portal/custos_portal/static/images/airavata-logo.png diff --git a/custos_admin_portal/custos_admin_portal/static/images/cilogon-logo-24x24-b.png b/custos_portal/custos_portal/static/images/cilogon-logo-24x24-b.png similarity index 100% rename from custos_admin_portal/custos_admin_portal/static/images/cilogon-logo-24x24-b.png rename to custos_portal/custos_portal/static/images/cilogon-logo-24x24-b.png diff --git a/custos_admin_portal/custos_admin_portal/templates/base.html b/custos_portal/custos_portal/templates/base.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/base.html rename to custos_portal/custos_portal/templates/base.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal/home.html b/custos_portal/custos_portal/templates/custos_portal/home.html similarity index 92% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal/home.html rename to custos_portal/custos_portal/templates/custos_portal/home.html index 3fa6752..d413ceb 100644 --- a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal/home.html +++ b/custos_portal/custos_portal/templates/custos_portal/home.html @@ -7,8 +7,8 @@ <div class="jumbotron"> <h1>Welcome!</h1> <p>This is the Django based web portal for Custos Admin.</p> - <p><a class="btn btn-primary btn-lg" href="{% url 'custos_admin_portal_auth:login' %}" role="button">Login »</a></p> - <p><a class="btn btn-primary btn-lg" href="{% url 'custos_admin_portal_auth:create_account' %}" role="button">Register</a></p> + <p><a class="btn btn-primary btn-lg" href="{% url 'custos_portal_auth:login' %}" role="button">Login »</a></p> + <p><a class="btn btn-primary btn-lg" href="{% url 'custos_portal_auth:create_account' %}" role="button">Register</a></p> </div> {% if user.is_authenticated %} diff --git a/custos_admin_portal/custos_admin_portal/templates/workspace/base.html b/custos_portal/custos_portal/templates/custos_portal_admin/base.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/workspace/base.html rename to custos_portal/custos_portal/templates/custos_portal_admin/base.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_admin/view_tenant_requestview_tenant_request.html b/custos_portal/custos_portal/templates/custos_portal_admin/view_tenant_requestview_tenant_request.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_admin/view_tenant_requestview_tenant_request.html rename to custos_portal/custos_portal/templates/custos_portal_admin/view_tenant_requestview_tenant_request.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/auth_error.html b/custos_portal/custos_portal/templates/custos_portal_auth/auth_error.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/auth_error.html rename to custos_portal/custos_portal/templates/custos_portal_auth/auth_error.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/base.html b/custos_portal/custos_portal/templates/custos_portal_auth/base.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/base.html rename to custos_portal/custos_portal/templates/custos_portal_auth/base.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/callback-error.html b/custos_portal/custos_portal/templates/custos_portal_auth/callback-error.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/callback-error.html rename to custos_portal/custos_portal/templates/custos_portal_auth/callback-error.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/create_account.html b/custos_portal/custos_portal/templates/custos_portal_auth/create_account.html similarity index 76% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/create_account.html rename to custos_portal/custos_portal/templates/custos_portal_auth/create_account.html index c39f750..d9eb8b1 100644 --- a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/create_account.html +++ b/custos_portal/custos_portal/templates/custos_portal_auth/create_account.html @@ -12,8 +12,8 @@ <div class="card-body"> <h5 class="card-title">Log in with your existing organizational login</h5> {% for external in options.external %} - <a {% if next %} href="{% url 'custos_admin_portal_auth:redirect_login' external.idp_alias %}?next={{ next | urlencode }}" - {% else %} href="{% url 'custos_admin_portal_auth:redirect_login' external.idp_alias %}" {% endif %} class="btn btn-primary btn-block mt-3"> + <a {% if next %} href="{% url 'custos_portal_auth:redirect_login' external.idp_alias %}?next={{ next | urlencode }}" + {% else %} href="{% url 'custos_portal_auth:redirect_login' external.idp_alias %}" {% endif %} class="btn btn-primary btn-block mt-3"> Sign in with {{ external.name }} </a> {% endfor %} @@ -34,7 +34,7 @@ <h5 class="card-title">Create a {{ options.password.name }} account</h5> {% endif %} {% include "./partials/messages.html" %} - {% url 'custos_admin_portal_auth:create_account' as form_url %} + {% url 'custos_portal_auth:create_account' as form_url %} {% include "./partials/form.html" with form=form url=form_url submit_text="Create" %} </div> </div> diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/forgot_password.html b/custos_portal/custos_portal/templates/custos_portal_auth/forgot_password.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/forgot_password.html rename to custos_portal/custos_portal/templates/custos_portal_auth/forgot_password.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/login.html b/custos_portal/custos_portal/templates/custos_portal_auth/login.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/login.html rename to custos_portal/custos_portal/templates/custos_portal_auth/login.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/login_username_password.html b/custos_portal/custos_portal/templates/custos_portal_auth/login_username_password.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/login_username_password.html rename to custos_portal/custos_portal/templates/custos_portal_auth/login_username_password.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/externals_login_form.html b/custos_portal/custos_portal/templates/custos_portal_auth/partials/externals_login_form.html similarity index 72% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/externals_login_form.html rename to custos_portal/custos_portal/templates/custos_portal_auth/partials/externals_login_form.html index e4b09cc..7ea8ceb 100644 --- a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/externals_login_form.html +++ b/custos_portal/custos_portal/templates/custos_portal_auth/partials/externals_login_form.html @@ -6,9 +6,9 @@ {% for external in options.external %} <a {% if next %} - href="{% url 'custos_admin_portal_auth:redirect_login' external.idp_alias %}?next={{ next | urlencode }}" + href="{% url 'custos_portal_auth:redirect_login' external.idp_alias %}?next={{ next | urlencode }}" {% else %} - href="{% url 'custos_admin_portal_auth:redirect_login' external.idp_alias %}" + href="{% url 'custos_portal_auth:redirect_login' external.idp_alias %}" {% endif %} class="btn btn-primary btn-block mt-3"> Sign in with {{ external.name }} diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/form.html b/custos_portal/custos_portal/templates/custos_portal_auth/partials/form.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/form.html rename to custos_portal/custos_portal/templates/custos_portal_auth/partials/form.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/form_field.html b/custos_portal/custos_portal/templates/custos_portal_auth/partials/form_field.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/form_field.html rename to custos_portal/custos_portal/templates/custos_portal_auth/partials/form_field.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/messages.html b/custos_portal/custos_portal/templates/custos_portal_auth/partials/messages.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/messages.html rename to custos_portal/custos_portal/templates/custos_portal_auth/partials/messages.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/non_field_errors.html b/custos_portal/custos_portal/templates/custos_portal_auth/partials/non_field_errors.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/non_field_errors.html rename to custos_portal/custos_portal/templates/custos_portal_auth/partials/non_field_errors.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/username_password_login_form.html b/custos_portal/custos_portal/templates/custos_portal_auth/partials/username_password_login_form.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/partials/username_password_login_form.html rename to custos_portal/custos_portal/templates/custos_portal_auth/partials/username_password_login_form.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/reset_password.html b/custos_portal/custos_portal/templates/custos_portal_auth/reset_password.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/reset_password.html rename to custos_portal/custos_portal/templates/custos_portal_auth/reset_password.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/verify_email.html b/custos_portal/custos_portal/templates/custos_portal_auth/verify_email.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_auth/verify_email.html rename to custos_portal/custos_portal/templates/custos_portal_auth/verify_email.html diff --git a/custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_admin/base.html b/custos_portal/custos_portal/templates/workspace/base.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/custos_admin_portal_admin/base.html rename to custos_portal/custos_portal/templates/workspace/base.html diff --git a/custos_admin_portal/custos_admin_portal/templates/workspace/list_requests.html b/custos_portal/custos_portal/templates/workspace/list_requests.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/workspace/list_requests.html rename to custos_portal/custos_portal/templates/workspace/list_requests.html diff --git a/custos_admin_portal/custos_admin_portal/templates/workspace/request_new_tenant.html b/custos_portal/custos_portal/templates/workspace/request_new_tenant.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/workspace/request_new_tenant.html rename to custos_portal/custos_portal/templates/workspace/request_new_tenant.html diff --git a/custos_admin_portal/custos_admin_portal/templates/workspace/view_tenant_request.html b/custos_portal/custos_portal/templates/workspace/view_tenant_request.html similarity index 100% rename from custos_admin_portal/custos_admin_portal/templates/workspace/view_tenant_request.html rename to custos_portal/custos_portal/templates/workspace/view_tenant_request.html diff --git a/custos_admin_portal/custos_admin_portal/urls.py b/custos_portal/custos_portal/urls.py similarity index 75% rename from custos_admin_portal/custos_admin_portal/urls.py rename to custos_portal/custos_portal/urls.py index dc15830..e57a543 100644 --- a/custos_admin_portal/custos_admin_portal/urls.py +++ b/custos_portal/custos_portal/urls.py @@ -1,4 +1,4 @@ -"""custos_admin_portal URL Configuration +"""custos_portal URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/3.0/topics/http/urls/ @@ -20,9 +20,9 @@ from . import views urlpatterns = [ path('djadmin/', admin.site.urls), - path('admin/', include('custos_admin_portal.apps.admin.urls')), - path('auth/', include('custos_admin_portal.apps.auth.urls')), - path('workspace/', include('custos_admin_portal.apps.workspace.urls')), + path('admin/', include('custos_portal.apps.admin.urls')), + path('auth/', include('custos_portal.apps.auth.urls')), + path('workspace/', include('custos_portal.apps.workspace.urls')), path('', views.home, name='home'), ] diff --git a/custos_portal/custos_portal/views.py b/custos_portal/custos_portal/views.py new file mode 100644 index 0000000..c3a26fa --- /dev/null +++ b/custos_portal/custos_portal/views.py @@ -0,0 +1,6 @@ +from django.shortcuts import render + + +def home(request): + return render(request, 'custos_portal/home.html', {}) + diff --git a/custos_admin_portal/custos_admin_portal/wsgi.py b/custos_portal/custos_portal/wsgi.py similarity index 69% rename from custos_admin_portal/custos_admin_portal/wsgi.py rename to custos_portal/custos_portal/wsgi.py index 42bfdd6..9736079 100644 --- a/custos_admin_portal/custos_admin_portal/wsgi.py +++ b/custos_portal/custos_portal/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for custos_admin_portal project. +WSGI config for custos_portal project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'custos_admin_portal.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'custos_portal.settings') application = get_wsgi_application() diff --git a/custos_admin_portal/manage.py b/custos_portal/manage.py similarity index 86% rename from custos_admin_portal/manage.py rename to custos_portal/manage.py index 0bbadeb..c7f56ae 100755 --- a/custos_admin_portal/manage.py +++ b/custos_portal/manage.py @@ -5,7 +5,7 @@ import sys def main(): - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'custos_admin_portal.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'custos_portal.settings') try: from django.core.management import execute_from_command_line except ImportError as exc:
