diff --git a/src/__init__.py b/src/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/author/__init__.py b/src/author/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/author/admin.py b/src/author/admin.py new file mode 100644 index 0000000..b0e16ee --- /dev/null +++ b/src/author/admin.py @@ -0,0 +1,24 @@ +from django.contrib import admin +from author.models import Author + + +@admin.register(Author) +class AuthorAdmin(admin.ModelAdmin): + list_display = ( + "resume_url", + "github_url", + "email", + "created_at", + "updated_at", + ) + + search_fields = ( + "github_url", + "resume_url", + "email", + ) + + list_filter = ( + "created_at", + "updated_at", + ) \ No newline at end of file diff --git a/src/author/apps.py b/src/author/apps.py new file mode 100644 index 0000000..9606d38 --- /dev/null +++ b/src/author/apps.py @@ -0,0 +1,11 @@ +from django.apps import AppConfig + + +class AuthorConfig(AppConfig): + """ + Конфигурация приложения. + """ + + default_auto_field = "django.db.models.BigAutoField" + name = "author" + verbose_name = "Автор" \ No newline at end of file diff --git a/src/author/context_processors.py b/src/author/context_processors.py new file mode 100644 index 0000000..2f0a2da --- /dev/null +++ b/src/author/context_processors.py @@ -0,0 +1,9 @@ +from django.http import HttpRequest +from author.models import Author + + +def author(request: HttpRequest) -> dict: + """ + Контекстный процессор для информации об авторе + """ + return {"author": Author.objects.last()} \ No newline at end of file diff --git a/src/author/models.py b/src/author/models.py new file mode 100644 index 0000000..0a23d86 --- /dev/null +++ b/src/author/models.py @@ -0,0 +1,19 @@ +from django.db import models +from base.models import TimeStampMixin + + +class Author(TimeStampMixin): + """ + Модель для хранения данных об авторе + """ + + resume_url = models.URLField(verbose_name="Ссылка на резюме") + github_url = models.URLField(verbose_name="Ссылка GitHub") + email = models.EmailField(verbose_name="Email автора") + + class Meta: + verbose_name = "Информация об авторе" + verbose_name_plural = "Информация об авторе" + + def __str__(self) -> str: + return f'Объект "автор" (id={self.pk})' \ No newline at end of file diff --git a/src/jobs/models.py b/src/jobs/models.py index a5525d1..8eb28d6 100644 --- a/src/jobs/models.py +++ b/src/jobs/models.py @@ -3,7 +3,7 @@ """ from django.db import models - +from ckeditor_uploader.fields import RichTextUploadingField from base.models import TimeStampMixin @@ -23,9 +23,21 @@ class Job(TimeStampMixin): help_text="Краткое описание выполненной работы", ) + detailed_description = RichTextUploadingField( + verbose_name="Подробное описание", + help_text="Подробное описание выполненной работы", + ) + class Meta: verbose_name = "Выполненная работа" verbose_name_plural = "Выполненные работы" def __str__(self) -> str: return f'Объект "Выполненная работа" (id={self.pk})' + + def summary(self) -> str: + """ + Краткое представление подробного описания работы. + :return: + """ + return self.detailed_description[:60] + "..." \ No newline at end of file diff --git a/src/jobs/templates/jobs/job_detail.html b/src/jobs/templates/jobs/job_detail.html index 6b40e3f..3a50298 100644 --- a/src/jobs/templates/jobs/job_detail.html +++ b/src/jobs/templates/jobs/job_detail.html @@ -7,7 +7,11 @@
{{ blog.pub_date }}
{{ blog.content }}
- Вернуться в блог +{{ job.pub_date }}
+{{ job.detailed_description|safe }}
+ На главную {% endblock %} diff --git a/src/jobs/templates/jobs/job_list.html b/src/jobs/templates/jobs/job_list.html index 5765bc2..cdae3d3 100644 --- a/src/jobs/templates/jobs/job_list.html +++ b/src/jobs/templates/jobs/job_list.html @@ -8,9 +8,9 @@Привет!
-Меня зовут Иван Иванов.
Я профессионально занимаюсь разработкой на Python.
Меня зовут Думкин Никита.
Я профессионально занимаюсь разработкой на TypeScript и Vue3.js.
-
+
Написать мне @@ -33,10 +33,10 @@ alt="job image"/>
{{ job.description }}
+{{ job.summary|safe }}
diff --git a/src/jobs/urls.py b/src/jobs/urls.py new file mode 100644 index 0000000..8fb2f60 --- /dev/null +++ b/src/jobs/urls.py @@ -0,0 +1,9 @@ +from django.urls import path +from jobs.views import IndexJobDetailView + + +urlpatterns = [ + path("