diff --git a/apps/tuxbot_gnous_eu/apps.py b/apps/tuxbot_gnous_eu/apps.py index d2090fa..83d5ca1 100644 --- a/apps/tuxbot_gnous_eu/apps.py +++ b/apps/tuxbot_gnous_eu/apps.py @@ -1,5 +1,10 @@ from django.apps import AppConfig +from suit.apps import DjangoSuitConfig class GnousEuConfig(AppConfig): name = 'apps.tuxbot_gnous_eu' + + +class SuitConfig(DjangoSuitConfig): + layout = 'vertical' diff --git a/apps/tuxbot_gnous_eu/static/images/tux.ico b/apps/tuxbot_gnous_eu/static/images/favicon.ico similarity index 100% rename from apps/tuxbot_gnous_eu/static/images/tux.ico rename to apps/tuxbot_gnous_eu/static/images/favicon.ico diff --git a/apps/tuxbot_gnous_eu/views.py b/apps/tuxbot_gnous_eu/views.py index 638f7db..1809412 100644 --- a/apps/tuxbot_gnous_eu/views.py +++ b/apps/tuxbot_gnous_eu/views.py @@ -59,7 +59,7 @@ class UsersView: @staticmethod def edit(request: WSGIRequest, *args, **kwargs) -> HttpResponse: try: - data_user = Users.objects.get(user_id=args[0]) + data_user = Users.objects.get(user_id=kwargs.get('user_id')) except Users.DoesNotExist: return HttpResponseNotFound("Question does not exist") diff --git a/manage.py b/manage.py index e2d99c2..4d7be14 100755 --- a/manage.py +++ b/manage.py @@ -5,7 +5,7 @@ import sys def main(): - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'gnousEU.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tuxWeb.settings') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/requirements.txt b/requirements.txt index 8019ee0..d8e9d28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,11 +3,12 @@ bleach==3.1.0 certifi==2019.11.28 chardet==3.0.4 Django==3.0.2 -django-grappelli==2.13.3 django-markdownify==0.8.0 +django-suit==2.0a1 idna==2.8 Markdown==3.1.1 mysqlclient==1.4.6 +oauthlib==3.1.0 pytz==2019.3 requests==2.22.0 six==1.14.0 diff --git a/gnousEU/__init__.py b/tuxWeb/__init__.py similarity index 100% rename from gnousEU/__init__.py rename to tuxWeb/__init__.py diff --git a/gnousEU/asgi.py b/tuxWeb/asgi.py similarity index 82% rename from gnousEU/asgi.py rename to tuxWeb/asgi.py index 204d860..51a134f 100644 --- a/gnousEU/asgi.py +++ b/tuxWeb/asgi.py @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'gnousEU.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tuxWeb.settings') application = get_asgi_application() diff --git a/gnousEU/settings.py b/tuxWeb/settings.py similarity index 96% rename from gnousEU/settings.py rename to tuxWeb/settings.py index d7a1ffb..e00ebf1 100644 --- a/gnousEU/settings.py +++ b/tuxWeb/settings.py @@ -36,13 +36,13 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', - 'grappelli', - 'django.contrib.admin', - 'markdownify', 'apps.tuxbot_gnous_eu', 'apps.tuxbot_gnous_eu.templatetags', + + 'apps.tuxbot_gnous_eu.apps.SuitConfig', + 'django.contrib.admin', ] MIDDLEWARE = [ @@ -55,7 +55,7 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'gnousEU.urls' +ROOT_URLCONF = 'tuxWeb.urls' TEMPLATES = [ { @@ -74,7 +74,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'gnousEU.wsgi.application' +WSGI_APPLICATION = 'tuxWeb.wsgi.application' # Database # https://docs.djangoproject.com/en/3.0/ref/settings/#databases diff --git a/gnousEU/urls.py b/tuxWeb/urls.py similarity index 86% rename from gnousEU/urls.py rename to tuxWeb/urls.py index e8e1e68..0861939 100644 --- a/gnousEU/urls.py +++ b/tuxWeb/urls.py @@ -17,8 +17,7 @@ from django.contrib import admin from django.urls import path, include urlpatterns = [ - path('grappelli/', include('grappelli.urls')), # grappelli URLS - path('admin/', admin.site.urls), # admin site + path('admin/', admin.site.urls), path('', include('apps.tuxbot_gnous_eu.urls', namespace='tuxbot_gnous_eu')), ] diff --git a/gnousEU/wsgi.py b/tuxWeb/wsgi.py similarity index 82% rename from gnousEU/wsgi.py rename to tuxWeb/wsgi.py index b294457..c9d198e 100644 --- a/gnousEU/wsgi.py +++ b/tuxWeb/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'gnousEU.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tuxWeb.settings') application = get_wsgi_application()