diff options
Diffstat (limited to '')
| -rw-r--r-- | config/settings/gcloud_settings.py | 8 | ||||
| -rw-r--r-- | ctrack/static/css/project.css | 4 | ||||
| -rw-r--r-- | ctrack/templates/base.html | 18 |
3 files changed, 14 insertions, 16 deletions
diff --git a/config/settings/gcloud_settings.py b/config/settings/gcloud_settings.py index a057db8..f7ccbc8 100644 --- a/config/settings/gcloud_settings.py +++ b/config/settings/gcloud_settings.py @@ -172,13 +172,17 @@ MIDDLEWARE = [ 'config.middleware.LoginRequiredMiddleware' ] +LOGIN_REDIRECT_URL = "users:redirect" + ROOT_URLCONF = 'config.urls' WSGI_APPLICATION = 'config.wsgi.application' +LOGIN_URL = "/accounts/login" + LOGIN_EXEMPT_URLS = ( - r"account/login", - r"account/logout" + r"^account/login/$", + r"^account/logout/$" ) # Database diff --git a/ctrack/static/css/project.css b/ctrack/static/css/project.css index aa059b8..4f2f954 100644 --- a/ctrack/static/css/project.css +++ b/ctrack/static/css/project.css @@ -9,10 +9,10 @@ color: #b94a48; } .bg-light { - background-color: green; } + border-color: #e1f2f2 ; } body { - padding-top: 70px; } + padding-top: 90px; } .lemon-bar { box-shadow: 0 4px 5px rgba(0, 0, 0, 0.3); } diff --git a/ctrack/templates/base.html b/ctrack/templates/base.html index f91b2f0..be4340a 100644 --- a/ctrack/templates/base.html +++ b/ctrack/templates/base.html @@ -26,15 +26,9 @@ {# <link href="jumbotron.css" rel="stylesheet">#} <!-- This file stores project-specific CSS --> - <link rel="stylesheet" type="text/css" href="{% static "DataTables/datatables.min.css" %}/> - - <link href="{% static 'css/project.css' %}" rel="stylesheet"> + <link rel="stylesheet" type="text/css" href="{% static "DataTables/datatables.min.css" %}"/> + <link rel="stylesheet" type="text/css" href="{% static 'css/project.css' %}"> {% endblock %} - <style> - body { - padding-top: 70px; - } - </style> </head> <body> @@ -110,9 +104,9 @@ {% block javascript %} <!-- Bootstrap JS and its dependencies--> - {# <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"#} - {# integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"#} - {# crossorigin="anonymous"></script>#} + <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" + integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" + crossorigin="anonymous"></script> {# <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"#} {# integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"#} {# crossorigin="anonymous"></script>#} @@ -120,7 +114,7 @@ {# integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"#} {# crossorigin="anonymous"></script>#} - <script src="{% static "js/bootstrap.js" %}"></script> + <script src="{% static "js/bootstrap.bundle.js" %}"></script> <!-- Your stuff: Third-party javascript libraries go here --> |