diff --git a/.gitignore b/.gitignore index b6e4761..b97131e 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,5 @@ dmypy.json # Pyre type checker .pyre/ + +.idea/ diff --git a/dnd_db_site/settings.py b/dnd_db_site/settings.py index ced426e..137d9c9 100644 --- a/dnd_db_site/settings.py +++ b/dnd_db_site/settings.py @@ -32,6 +32,8 @@ ALLOWED_HOSTS = [env('HOST_1')] # Application definition INSTALLED_APPS = [ + 'helloworld', + 'faerun_calendar', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/dnd_db_site/urls.py b/dnd_db_site/urls.py index b32ea59..562e786 100644 --- a/dnd_db_site/urls.py +++ b/dnd_db_site/urls.py @@ -19,4 +19,5 @@ from django.urls import include, path urlpatterns = [ path('admin/', admin.site.urls), path('', include('helloworld.urls')), + path('calendar/', include('faerun_calendar.urls')), ] diff --git a/faerun_calendar/.views.py.swp b/faerun_calendar/.views.py.swp new file mode 100644 index 0000000..6d2178a Binary files /dev/null and b/faerun_calendar/.views.py.swp differ diff --git a/faerun_calendar/__init__.py b/faerun_calendar/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/faerun_calendar/admin.py b/faerun_calendar/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/faerun_calendar/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/faerun_calendar/apps.py b/faerun_calendar/apps.py new file mode 100644 index 0000000..5ba9dd7 --- /dev/null +++ b/faerun_calendar/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class FaerunCalendarConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'faerun_calendar' diff --git a/faerun_calendar/migrations/__init__.py b/faerun_calendar/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/faerun_calendar/models.py b/faerun_calendar/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/faerun_calendar/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/faerun_calendar/templates/faerun_calendar/calendar.html b/faerun_calendar/templates/faerun_calendar/calendar.html new file mode 100644 index 0000000..75e0f95 --- /dev/null +++ b/faerun_calendar/templates/faerun_calendar/calendar.html @@ -0,0 +1,22 @@ +{% include 'faerun_calendar/month.html' with title="Хаммер" subtitle="Глубокозимье" %} +{% include 'faerun_calendar/month.html' with title="Зимний солнцеворот" subtitle="Мертвозимье" oneday=1 %} +{% include 'faerun_calendar/month.html' with title="Альтурик" subtitle="Коготь зимы" %} +{% include 'faerun_calendar/month.html' with title="Чез" subtitle="Коготь закатов" %} +{% include 'faerun_calendar/month.html' with title="Тарсак" subtitle="Коготь бурь" %} +{% include 'faerun_calendar/month.html' with title="Зеленотравье" oneday=1 %} + +{% include 'faerun_calendar/month.html' with title="Миртул" subtitle="Таяние" %} +{% include 'faerun_calendar/month.html' with title="Кайторн" subtitle="Время цветов" %} +{% include 'faerun_calendar/month.html' with title="Флеймрул" subtitle="Разгар лета" %} +{% include 'faerun_calendar/month.html' with title="Летний солнцеворот" oneday=1 %} +{% include 'faerun_calendar/month.html' with title="Шильдмит*" oneday=1 %} +{% include 'faerun_calendar/month.html' with title="Элесис" subtitle="Солнцестояние" %} + +{% include 'faerun_calendar/month.html' with title="Элейнт" subtitle="Увядание" %} +{% include 'faerun_calendar/month.html' with title="Праздник урожая" oneday=1 %} +{% include 'faerun_calendar/month.html' with title="Марпенот" subtitle="Листопад" %} +{% include 'faerun_calendar/month.html' with title="Уктар" subtitle="Перегной" %} +{% include 'faerun_calendar/month.html' with title="Пир луны" oneday=1 %} +{% include 'faerun_calendar/month.html' with title="Найтал" subtitle="Спячка" %} + + diff --git a/faerun_calendar/templates/faerun_calendar/index.html b/faerun_calendar/templates/faerun_calendar/index.html new file mode 100644 index 0000000..b977875 --- /dev/null +++ b/faerun_calendar/templates/faerun_calendar/index.html @@ -0,0 +1,23 @@ + + + + + Calendar + + + +

Календарь

+ {% extends 'faerun_calendar/calendar.html' %} + + diff --git a/faerun_calendar/templates/faerun_calendar/month.html b/faerun_calendar/templates/faerun_calendar/month.html new file mode 100644 index 0000000..39ac52f --- /dev/null +++ b/faerun_calendar/templates/faerun_calendar/month.html @@ -0,0 +1,48 @@ + + + + + {% if subtitle %} + + + + {% endif %} + {% if oneday != 1 %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% endif %} +
{{title}}
{{subtitle}}
12345678910
11121314151617181920
21222324252627282930
\ No newline at end of file diff --git a/faerun_calendar/tests.py b/faerun_calendar/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/faerun_calendar/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/faerun_calendar/urls.py b/faerun_calendar/urls.py new file mode 100644 index 0000000..4c9189f --- /dev/null +++ b/faerun_calendar/urls.py @@ -0,0 +1,8 @@ +from django.urls import path + +from . import views + +urlpatterns = [ + path('', views.index, name='index'), +] + diff --git a/faerun_calendar/views.py b/faerun_calendar/views.py new file mode 100644 index 0000000..fe52267 --- /dev/null +++ b/faerun_calendar/views.py @@ -0,0 +1,7 @@ +from django.http import HttpResponse +from django.shortcuts import render + +def index(request): + return render(request, 'faerun_calendar/index.html') +# return HttpResponse('

Calendar

') +