diff --git a/home/templates/home/base/base.html b/home/templates/home/base/base.html new file mode 100644 index 0000000..e54a8d6 --- /dev/null +++ b/home/templates/home/base/base.html @@ -0,0 +1,13 @@ + +{% load static %} + + + {% include 'home/base/head.html' %} + +{% block content %} +{% endblock %} + \ No newline at end of file diff --git a/home/templates/home/base/head.html b/home/templates/home/base/head.html new file mode 100644 index 0000000..736ed17 --- /dev/null +++ b/home/templates/home/base/head.html @@ -0,0 +1,163 @@ +{% load static %} + + + Умный дом под + ключ | Заказать системы умного дома: расчет, установка и подключение оборудования, готовые + комплекты + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/home/templates/home/content/index.html b/home/templates/home/content/index.html new file mode 100644 index 0000000..160252a --- /dev/null +++ b/home/templates/home/content/index.html @@ -0,0 +1,4 @@ +{% extends 'home/base/base.html' %} +{% load static %} +{% block content%} +{% endblock content %} \ No newline at end of file diff --git a/home/urls.py b/home/urls.py new file mode 100644 index 0000000..682751b --- /dev/null +++ b/home/urls.py @@ -0,0 +1,6 @@ +from django.urls import path +from .import views + +urlpatterns = [ + path('', views.home, name='home'), +] \ No newline at end of file diff --git a/home/views.py b/home/views.py index 91ea44a..301c2b1 100644 --- a/home/views.py +++ b/home/views.py @@ -1,3 +1,5 @@ from django.shortcuts import render # Create your views here. +def home(request): + return render(request, 'home/content/index.html',) diff --git a/miroca/settings.py b/miroca/settings.py index d2e1fa1..14e4cf3 100644 --- a/miroca/settings.py +++ b/miroca/settings.py @@ -138,10 +138,10 @@ USE_TZ = True # https://docs.djangoproject.com/en/3.2/howto/static-files/ STATIC_URL = '/static/' -STATIC_ROOT = '/home/c76533/miroca.ru/www/static' +STATIC_ROOT = '/home/c76533/miroca.ru/app/www/static' MEDIA_URL = '/media/' -MEDIA_ROOT = '/home/c76533/miroca.ru/www/media' +MEDIA_ROOT = '/home/c76533/miroca.ru/app/www/media' # Default primary key field type # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field diff --git a/miroca/urls.py b/miroca/urls.py index 569309e..9af4468 100644 --- a/miroca/urls.py +++ b/miroca/urls.py @@ -18,6 +18,8 @@ from django.urls import path, include urlpatterns = [ # path('admin/', admin.site.urls), - path('', include('upanel.urls')), + path('', include('home.urls')), + path('admin/', admin.site.urls), + path('upanel/', include('upanel.urls')), path('api/', include('api.urls')), ] diff --git a/upanel/urls.py b/upanel/urls.py index 2778386..d891e28 100644 --- a/upanel/urls.py +++ b/upanel/urls.py @@ -9,7 +9,7 @@ urlpatterns = [ path('connect/', views.connect, name='connect'), # path('greenhouse/', views.greenhouse, name='greenhouse'), # path('server_smart/', views.server_smart, name='server_smart'), - path('login/', LoginView.as_view(template_name='upanel/login.html'), name='login'), + path('upanel/login/', LoginView.as_view(template_name='upanel/login.html'), name='login'), path('logout/', LoginView.as_view(template_name='upanel/login.html'), name='logout'), path('password_change/', PasswordChangeView.as_view(template_name='upanel/change_password.html'), name='password_change'),