From 50f4badfd82293fc2efbd4dfa5285c33efa7d1e0 Mon Sep 17 00:00:00 2001 From: Vasiliy Petrov Date: Mon, 2 May 2022 19:54:33 +0000 Subject: [PATCH 1/2] Update --- adminapp/__init__.py | 0 adminapp/admin.py | 3 ++ adminapp/apps.py | 6 +++ adminapp/models.py | 3 ++ adminapp/urls.py | 10 ++++ adminapp/views.py | 41 +++++++++++++++ autodonate/settings.py | 1 + autodonate/urls.py | 11 ++-- index/views.py | 10 +--- svelte/rollup.config.ts | 7 +-- svelte/src/declarations/admin.ts | 8 +++ svelte/src/declarations/adminpages.ts | 8 +++ svelte/src/declarations/donate.ts | 8 --- svelte/src/declarations/features.ts | 8 --- svelte/src/declarations/hero.ts | 8 --- svelte/src/declarations/lastdonates.ts | 8 --- svelte/src/declarations/navbar.ts | 8 --- svelte/src/pages/Admin.svelte | 19 +++++++ svelte/src/pages/AdminPages.svelte | 5 ++ svelte/src/ui/NavbarAdmin.svelte | 32 ++++++++++++ svelte/src/ui/WidgetCard.svelte | 71 ++++++++++++++++++++++++++ templates/admin/index.html | 8 +++ templates/admin/pages.html | 8 +++ templates/base.html | 2 +- 24 files changed, 233 insertions(+), 60 deletions(-) create mode 100644 adminapp/__init__.py create mode 100644 adminapp/admin.py create mode 100644 adminapp/apps.py create mode 100644 adminapp/models.py create mode 100644 adminapp/urls.py create mode 100644 adminapp/views.py create mode 100644 svelte/src/declarations/admin.ts create mode 100644 svelte/src/declarations/adminpages.ts delete mode 100644 svelte/src/declarations/donate.ts delete mode 100644 svelte/src/declarations/features.ts delete mode 100644 svelte/src/declarations/hero.ts delete mode 100644 svelte/src/declarations/lastdonates.ts delete mode 100644 svelte/src/declarations/navbar.ts create mode 100644 svelte/src/pages/Admin.svelte create mode 100644 svelte/src/pages/AdminPages.svelte create mode 100644 svelte/src/ui/NavbarAdmin.svelte create mode 100644 svelte/src/ui/WidgetCard.svelte create mode 100644 templates/admin/index.html create mode 100644 templates/admin/pages.html diff --git a/adminapp/__init__.py b/adminapp/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/adminapp/admin.py b/adminapp/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/adminapp/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/adminapp/apps.py b/adminapp/apps.py new file mode 100644 index 0000000..6c75898 --- /dev/null +++ b/adminapp/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class AdminappConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'adminapp' diff --git a/adminapp/models.py b/adminapp/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/adminapp/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/adminapp/urls.py b/adminapp/urls.py new file mode 100644 index 0000000..4f95a57 --- /dev/null +++ b/adminapp/urls.py @@ -0,0 +1,10 @@ +"""URL patterns for index app.""" + +from django.urls import path + +from adminapp.views import * + +urlpatterns = [ + path("", index, name="admin-index"), + path("pages/", pages, name="admin-index") +] diff --git a/adminapp/views.py b/adminapp/views.py new file mode 100644 index 0000000..c8998e9 --- /dev/null +++ b/adminapp/views.py @@ -0,0 +1,41 @@ +"""Views module for index app.""" + +from django.http.request import HttpRequest +from django.http.response import HttpResponse +from django.shortcuts import render + + +def index(request: HttpRequest) -> HttpResponse: + """Index view. + + Args: + request: The request object. + + Returns: + response: The response object. + """ + return render( + request, + "admin/index.html", + context={ + "title": "Admin" + }, + ) + + +def pages(request: HttpRequest) -> HttpResponse: + """Pages view. + + Args: + request: The request object. + + Returns: + response: The response object. + """ + return render( + request, + "admin/pages.html", + context={ + "title": "Admin" + }, + ) diff --git a/autodonate/settings.py b/autodonate/settings.py index 9fb969a..d513de9 100644 --- a/autodonate/settings.py +++ b/autodonate/settings.py @@ -58,6 +58,7 @@ "autodonate.lib", "index.apps.IndexConfig", "api.apps.ApiConfig", + "adminapp.apps.AdminappConfig", ] if DEBUG: diff --git a/autodonate/urls.py b/autodonate/urls.py index bb6208b..4247260 100644 --- a/autodonate/urls.py +++ b/autodonate/urls.py @@ -7,7 +7,7 @@ from decouple import config from django.conf import settings from django.conf.urls.static import static -from django.contrib import admin +from django.contrib import admin as django_admin from django.urls import include, path from autodonate.settings import DEBUG @@ -15,7 +15,8 @@ urlpatterns = [ path("", include("index.urls")), path("api/", include("api.urls")), - path(config("DJANGO_ADMIN_URL", default="django-admin/"), admin.site.urls), + path(config("ADMIN_URL", default="admin/"), include("adminapp.urls")), + path(config("DJANGO_ADMIN_URL", default="django-admin/"), django_admin.site.urls), ] if DEBUG: @@ -27,6 +28,6 @@ #: Rename admin panel elements -admin.site.site_title = "autodonate" -admin.site.site_header = "Admin panel" -admin.site.index_title = "autodonate" +django_admin.site.site_title = "autodonate" +django_admin.site.site_header = "Admin panel" +django_admin.site.index_title = "autodonate" diff --git a/index/views.py b/index/views.py index 312505c..095fa40 100644 --- a/index/views.py +++ b/index/views.py @@ -18,14 +18,6 @@ def index(request: HttpRequest) -> HttpResponse: request, "index.html", context={ - "title": "Index", - "props": { - "hero": { - "title": "Лучший сервер", - "subtitle": "Майнкрафт сервер для легенд", - "players": 5, - "ip": "example.com", - } - }, + "title": "Index" }, ) diff --git a/svelte/rollup.config.ts b/svelte/rollup.config.ts index f000042..a5929a4 100644 --- a/svelte/rollup.config.ts +++ b/svelte/rollup.config.ts @@ -91,11 +91,8 @@ function componentExportDetails(componentName: string) { let exportable = []; [ - "Navbar", - "Hero", - "LastDonates", - "Donate", - "Features", + "Admin", + "AdminPages", ].forEach((d) => exportable.push(componentExportDetails(d))); export default exportable; diff --git a/svelte/src/declarations/admin.ts b/svelte/src/declarations/admin.ts new file mode 100644 index 0000000..e8a814c --- /dev/null +++ b/svelte/src/declarations/admin.ts @@ -0,0 +1,8 @@ +import Admin from '../pages/Admin.svelte'; + +const app = new Admin({ + target: document.getElementById("admin-target"), + props: JSON.parse(document.getElementById("admin-props").textContent), +}); + +export default app; diff --git a/svelte/src/declarations/adminpages.ts b/svelte/src/declarations/adminpages.ts new file mode 100644 index 0000000..4bd8fee --- /dev/null +++ b/svelte/src/declarations/adminpages.ts @@ -0,0 +1,8 @@ +import Admin from '../pages/AdminPages.svelte'; + +const app = new Admin({ + target: document.getElementById("adminpages-target"), + props: JSON.parse(document.getElementById("adminpages-props").textContent), +}); + +export default app; diff --git a/svelte/src/declarations/donate.ts b/svelte/src/declarations/donate.ts deleted file mode 100644 index ed07cd1..0000000 --- a/svelte/src/declarations/donate.ts +++ /dev/null @@ -1,8 +0,0 @@ -import Hero from '../ui/Donate.svelte'; - -const app = new Hero({ - target: document.getElementById("donate-target"), - props: JSON.parse(document.getElementById("donate-props").textContent), -}); - -export default app; diff --git a/svelte/src/declarations/features.ts b/svelte/src/declarations/features.ts deleted file mode 100644 index e122758..0000000 --- a/svelte/src/declarations/features.ts +++ /dev/null @@ -1,8 +0,0 @@ -import Hero from '../ui/Features.svelte'; - -const app = new Hero({ - target: document.getElementById("features-target"), - props: JSON.parse(document.getElementById("features-props").textContent), -}); - -export default app; diff --git a/svelte/src/declarations/hero.ts b/svelte/src/declarations/hero.ts deleted file mode 100644 index 0293fd2..0000000 --- a/svelte/src/declarations/hero.ts +++ /dev/null @@ -1,8 +0,0 @@ -import Hero from '../ui/Hero.svelte'; - -const app = new Hero({ - target: document.getElementById("hero-target"), - props: JSON.parse(document.getElementById("hero-props").textContent), -}); - -export default app; diff --git a/svelte/src/declarations/lastdonates.ts b/svelte/src/declarations/lastdonates.ts deleted file mode 100644 index a835b2b..0000000 --- a/svelte/src/declarations/lastdonates.ts +++ /dev/null @@ -1,8 +0,0 @@ -import LastDonates from '../ui/LastDonates.svelte'; - -const app = new LastDonates({ - target: document.getElementById("lastdonates-target"), - props: JSON.parse(document.getElementById("lastdonates-props").textContent), -}); - -export default app; diff --git a/svelte/src/declarations/navbar.ts b/svelte/src/declarations/navbar.ts deleted file mode 100644 index cb42354..0000000 --- a/svelte/src/declarations/navbar.ts +++ /dev/null @@ -1,8 +0,0 @@ -import Navbar from '../ui/Navbar.svelte'; - -const app = new Navbar({ - target: document.getElementById("navbar-target"), - props: JSON.parse(document.getElementById("navbar-props").textContent), -}); - -export default app; diff --git a/svelte/src/pages/Admin.svelte b/svelte/src/pages/Admin.svelte new file mode 100644 index 0000000..089c9ed --- /dev/null +++ b/svelte/src/pages/Admin.svelte @@ -0,0 +1,19 @@ + + + + +
+
+
+ Column +
+
+ Column +
+
+ Column +
+
+
diff --git a/svelte/src/pages/AdminPages.svelte b/svelte/src/pages/AdminPages.svelte new file mode 100644 index 0000000..6562fda --- /dev/null +++ b/svelte/src/pages/AdminPages.svelte @@ -0,0 +1,5 @@ + + + diff --git a/svelte/src/ui/NavbarAdmin.svelte b/svelte/src/ui/NavbarAdmin.svelte new file mode 100644 index 0000000..b2f26ba --- /dev/null +++ b/svelte/src/ui/NavbarAdmin.svelte @@ -0,0 +1,32 @@ + + +
+ + + Admin + +
+ +
\ No newline at end of file diff --git a/svelte/src/ui/WidgetCard.svelte b/svelte/src/ui/WidgetCard.svelte new file mode 100644 index 0000000..08c3ed9 --- /dev/null +++ b/svelte/src/ui/WidgetCard.svelte @@ -0,0 +1,71 @@ + + + + +
+
+
+
Заголовок
+

Текст - рыба, показыающий насколько кофоб крутой.

+ Кофоб крут +
+
+ +
diff --git a/templates/admin/index.html b/templates/admin/index.html new file mode 100644 index 0000000..6cbbd2a --- /dev/null +++ b/templates/admin/index.html @@ -0,0 +1,8 @@ +{% extends 'base.html' %} +{% load svelte %} + +{% block nav %}{% endblock %} + +{% block content %} + {% svelte 'admin' %} +{% endblock %} diff --git a/templates/admin/pages.html b/templates/admin/pages.html new file mode 100644 index 0000000..6bb65a3 --- /dev/null +++ b/templates/admin/pages.html @@ -0,0 +1,8 @@ +{% extends 'base.html' %} +{% load svelte %} + +{% block nav %}{% endblock %} + +{% block content %} + {% svelte 'adminpages' %} +{% endblock %} diff --git a/templates/base.html b/templates/base.html index d227d3f..d6ec2fc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -11,7 +11,7 @@ - {% svelte "navbar" %} + {% block nav %}{% svelte "navbar" %}{% endblock %} {% block content %}Some content{% endblock %} From ecce69e0361e669657271b4a58a6c57c9ab9aa4c Mon Sep 17 00:00:00 2001 From: Vasiliy Petrov Date: Fri, 6 May 2022 02:44:39 +0000 Subject: [PATCH 2/2] Fix tests --- adminapp/__init__.py | 1 + adminapp/admin.py | 2 ++ adminapp/apps.py | 8 ++++++-- adminapp/models.py | 2 ++ adminapp/urls.py | 5 +---- adminapp/views.py | 8 ++------ index/views.py | 4 +--- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/adminapp/__init__.py b/adminapp/__init__.py index e69de29..bf86834 100644 --- a/adminapp/__init__.py +++ b/adminapp/__init__.py @@ -0,0 +1 @@ +"""Admin app.""" diff --git a/adminapp/admin.py b/adminapp/admin.py index 8c38f3f..c44b732 100644 --- a/adminapp/admin.py +++ b/adminapp/admin.py @@ -1,3 +1,5 @@ +"""Admin module for admin app.""" + from django.contrib import admin # Register your models here. diff --git a/adminapp/apps.py b/adminapp/apps.py index 6c75898..3cb5174 100644 --- a/adminapp/apps.py +++ b/adminapp/apps.py @@ -1,6 +1,10 @@ +"""Admin app.""" + from django.apps import AppConfig class AdminappConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'adminapp' + """Admin app config.""" + + default_auto_field = "django.db.models.BigAutoField" + name = "adminapp" diff --git a/adminapp/models.py b/adminapp/models.py index 71a8362..c82f980 100644 --- a/adminapp/models.py +++ b/adminapp/models.py @@ -1,3 +1,5 @@ +"""Models for admin app.""" + from django.db import models # Create your models here. diff --git a/adminapp/urls.py b/adminapp/urls.py index 4f95a57..2cfae33 100644 --- a/adminapp/urls.py +++ b/adminapp/urls.py @@ -4,7 +4,4 @@ from adminapp.views import * -urlpatterns = [ - path("", index, name="admin-index"), - path("pages/", pages, name="admin-index") -] +urlpatterns = [path("", index, name="admin-index"), path("pages/", pages, name="admin-index")] diff --git a/adminapp/views.py b/adminapp/views.py index c8998e9..9ec15a1 100644 --- a/adminapp/views.py +++ b/adminapp/views.py @@ -17,9 +17,7 @@ def index(request: HttpRequest) -> HttpResponse: return render( request, "admin/index.html", - context={ - "title": "Admin" - }, + context={"title": "Admin"}, ) @@ -35,7 +33,5 @@ def pages(request: HttpRequest) -> HttpResponse: return render( request, "admin/pages.html", - context={ - "title": "Admin" - }, + context={"title": "Admin"}, ) diff --git a/index/views.py b/index/views.py index 095fa40..9f614a9 100644 --- a/index/views.py +++ b/index/views.py @@ -17,7 +17,5 @@ def index(request: HttpRequest) -> HttpResponse: return render( request, "index.html", - context={ - "title": "Index" - }, + context={"title": "Index"}, )