Update project

.env.sample

@@ -3,7 +3,7 @@ DEBUG=True
 # секретный ключ Django (можно сгенерировать, например, на https://djecrety.ir)
 SECRET_KEY=secret_key
 # список хостов/доменов, для которых может работать сайт
-ALLOWED_HOSTS=0.0.0.0,localhost,127.0.0.1
+ALLOWED_HOSTS=0.0.0.0,localhost,127.0.0.1,[::1]
 
 # реквизиты подключения к СУБД PostgreSQL
 # наименование БД

src/author/admin.py

@@ -0,0 +1,21 @@
+from django.contrib import admin
+
+from author.models import Author
+
+
+@admin.register(Author)
+class AuthorAdmin(admin.ModelAdmin):
+    list_display = (
+        "skill_info",
+        "github_info",
+        "email_info",
+        "created_at",
+        "updated_at",
+    )
+
+    search_fields = ("email",)
+
+    list_filter = (
+        "created_at",
+        "updated_at",
+    )

src/author/apps.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class AuthorConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "author"
+    verbose_name = "Автор"

src/author/migrations/0001_initial.py

@@ -0,0 +1,61 @@
+# Generated by Django 4.1.7 on 2023-03-03 17:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Author",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created_at",
+                    models.DateTimeField(
+                        auto_now_add=True, verbose_name="Время создания записи"
+                    ),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(
+                        auto_now=True, verbose_name="Время обновления записи"
+                    ),
+                ),
+                (
+                    "skill_info",
+                    models.URLField(
+                        help_text="Ссылка на резюме", verbose_name="Резюме"
+                    ),
+                ),
+                (
+                    "github_info",
+                    models.URLField(
+                        help_text="Ссылка на github", verbose_name="GitHub"
+                    ),
+                ),
+                (
+                    "email_info",
+                    models.EmailField(
+                        help_text="Email автора", max_length=254, verbose_name="Email"
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Данные об авторе",
+                "verbose_name_plural": "Данные об авторе",
+            },
+        ),
+    ]

src/author/models.py

@@ -0,0 +1,30 @@
+from django.db import models
+
+from base.models import TimeStampMixin
+
+
+class Author(TimeStampMixin):
+    """
+    Модель для хранения данных об авторе.
+    """
+
+    skill_info = models.URLField(
+        verbose_name="Резюме",
+        help_text="Ссылка на резюме",
+    )
+    github_info = models.URLField(
+        verbose_name="GitHub",
+        help_text="Ссылка на github",
+    )
+
+    email_info = models.EmailField(
+        verbose_name="Email",
+        help_text="Email автора",
+    )
+
+    class Meta:
+        verbose_name = "Данные об авторе"
+        verbose_name_plural = "Данные об авторе"
+
+    def __str__(self) -> str:
+        return f'Объект "Автор" (id={self.pk})'

src/author/templates/author/author_detail.html

@@ -0,0 +1,7 @@
+{% block author %}
+    <ul class="list-unstyled">
+        <li><a href="{{ author.skill_info }}" class="text-white">Резюме</a></li>
+        <li><a href="{{ author.github_info }}" target="_blank" class="text-white">GitHub</a></li>
+        <li><a href="mailto:{{ author.email_info }}" class="text-white">Email</a></li>
+    </ul>
+{# endblock %}

src/author/templates/author/author_list.html

@@ -0,0 +1,7 @@
+{% block author %}
+    <ul class="list-unstyled">
+        <li><a href="{{ author.skill_info }}" class="text-white">Резюме</a></li>
+        <li><a href="{{ author.github_info }}" target="_blank" class="text-white">GitHub</a></li>
+        <li><a href="mailto:{{ author.email_info }}" class="text-white">Email</a></li>
+    </ul>
+{% endblock %}

src/author/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

src/author/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+
+from author.views import AuthorListView
+from author.views import AuthorDetailView
+
+urlpatterns = [
+    path("", AuthorListView.as_view(), name="authors"),
+    path("<int:pk>/", AuthorDetailView.as_view(), name="author"),
+]

src/author/views.py

@@ -0,0 +1,12 @@
+from django.views.generic import ListView
+from django.views.generic import DetailView
+
+from author.models import Author
+
+
+class AuthorListView(ListView):
+    model = Author
+
+
+class AuthorDetailView(DetailView):
+    model = Author

src/blog/urls.py

@@ -6,7 +6,4 @@
 urlpatterns = [
     path("", BlogsListView.as_view(), name="blogs"),
     path("<int:pk>/", BlogsDetailView.as_view(), name="blog"),
-    # path('<int:pk>/', views.DetailView.as_view(), name='detail'),
-    # path('<int:pk>/results/', views.ResultsView.as_view(), name='results'),
-    # path('<int:question_id>/vote/', views.vote, name='vote'),
 ]

src/jobs/migrations/0002_job_content.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.1.7 on 2023-03-03 13:48
+
+import ckeditor_uploader.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("jobs", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="job",
+            name="content",
+            field=ckeditor_uploader.fields.RichTextUploadingField(
+                default="", verbose_name="Подробное описание работы"
+            ),
+        ),
+    ]

src/jobs/models.py

@@ -1,7 +1,7 @@
 """
 Модели для приложения "Jobs" (выполненные работы).
 """
-
+from ckeditor_uploader.fields import RichTextUploadingField
 from django.db import models
 
 from base.models import TimeStampMixin
@@ -22,10 +22,22 @@ class Job(TimeStampMixin):
         verbose_name="Описание",
         help_text="Краткое описание выполненной работы",
     )
+    content = RichTextUploadingField(
+        verbose_name="Подробное описание работы", default=""
+    )
 
     class Meta:
         verbose_name = "Выполненная работа"
         verbose_name_plural = "Выполненные работы"
 
     def __str__(self) -> str:
         return f'Объект "Выполненная работа" (id={self.pk})'
+
+    def summary(self) -> str:
+        """
+        Краткое содержание сообщения.
+
+        :return:
+        """
+
+        return self.content[:100] + "..."

src/jobs/templates/jobs/job_detail.html

@@ -3,11 +3,11 @@
 {% block content %}
 
     <div class="container">
-        <h1 class="text-center pt-3 display-4">{{ blog.title }}</h1>
-        <p class="text-center">{{ blog.pub_date }}</p>
-        <p><img src="{{ blog.image.url }}" class="img-fluid" alt="{{ blog.title }}"></p>
-        <p>{{ blog.content }}</p>
-        <a href="{% url 'blogs' %}" class="btn btn-light" role="button">Вернуться в блог</a>
+        <h1 class="text-center pt-3 display-4">{{ job.title }}</h1>
+        <p class="text-center">{{ job.pub_date }}</p>
+        <p><img src="{{ job.image.url }}" class="img-fluid" alt="{{ jod.description }}"></p>
+        <p>{{ job.content|safe }}</p>
+        <a href="/" class="btn btn-light" role="button">Главная</a>
     </div>
 
 {% endblock %}

src/jobs/templates/jobs/job_list.html

@@ -34,9 +34,10 @@
 
                         <div class="card-body">
                             <p class="card-text">{{ job.description }}</p>
+                            <p class="card-text text-muted">{{ job.summary|safe }}</p>
                             <div class="d-flex justify-content-between align-items-center">
                                 <div class="btn-group">
-                                    <a href="#" type="button" class="btn btn-sm btn-outline-secondary">Подробнее</a>
+                                    <a href="{% url 'job' job.id %}" type="button" class="btn btn-sm btn-outline-secondary">Подробнее</a>
                                 </div>
                                 <small class="text-muted"><p>{{ job.created_at|date:"d E Y" }}</p></small>
                             </div>

src/jobs/tests.py

@@ -0,0 +1,35 @@
+from django.test import TestCase
+
+from jobs.models import Job
+
+
+class JobsTestCase(TestCase):
+    """
+    Тестирование функций блога.
+    """
+
+    def setUp(self) -> None:
+        """
+        Настройка перед тестированием.
+
+        :return:
+        """
+
+        Job.objects.create(
+            description="Job №1 description",
+            content="Job №1 content. " * 100,
+            image="Job №1 image path",
+        )
+
+    def test_job_messages_creation(self) -> None:
+        """
+        Тестирование моделей для работ.
+
+        :return:
+        """
+
+        job = Job.objects.get(description="Job №1 description")
+
+        content = "Job №1 content. " * 100
+        self.assertEqual(job.summary(), content[:100] + "...")
+        self.assertEqual(str(job), f'Объект "Выполненная работа" (id={job.pk})')

src/jobs/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+
+from jobs.views import IndexJobsListView
+from jobs.views import JobsDetailView
+
+urlpatterns = [
+    path("", IndexJobsListView.as_view(), name="jobs"),
+    path("<int:pk>/", JobsDetailView.as_view(), name="job"),
+]

src/jobs/views.py

@@ -1,7 +1,12 @@
 from django.views.generic import ListView
+from django.views.generic import DetailView
 
 from jobs.models import Job
 
 
 class IndexJobsListView(ListView):
     model = Job
+
+
+class JobsDetailView(DetailView):
+    model = Job

src/portfolio/settings.py

@@ -45,6 +45,7 @@
     # созданные приложения
     "jobs.apps.JobsConfig",
     "blog.apps.BlogConfig",
+    "author.apps.AuthorConfig",
     # установленные приложения
     "ckeditor",
     "ckeditor_uploader",

src/portfolio/templates/base.html

@@ -34,12 +34,14 @@ <h4 class="text-white">Обо мне</h4>
           </p>
         </div>
         <div class="col-sm-4 offset-md-1 py-4">
-          <h4 class="text-white">Мои контакты</h4>
-          <ul class="list-unstyled">
-            <li><a href="#" class="text-white">Резюме</a></li>
-            <li><a href="https://github.com" target="_blank" class="text-white">GitHub</a></li>
-            <li><a href="mailto:username(att)somemailserver(dott)com" class="text-white">Email</a></li>
-          </ul>
+            <h4 class="text-white">Мои контакты</h4>
+            {% block author %}
+                <ul class="list-unstyled">
+                    <li><a href="{{ author.skill_info }}" class="text-white">Резюме</a></li>
+                    <li><a href="{{ author.github_info }}" target="_blank" class="text-white">GitHub</a></li>
+                    <li><a href="mailto:{{ author.email_info }}" class="text-white">Email</a></li>
+                </ul>
+            {% endblock %}
         </div>
       </div>
     </div>

src/portfolio/urls.py

@@ -27,7 +27,9 @@
 urlpatterns = [
     path("admin/", admin.site.urls),
     path("ckeditor/", include("ckeditor_uploader.urls")),
-    path("", IndexJobsListView.as_view(), name="home"),
     path("blog/", include("blog.urls")),
+    path("", IndexJobsListView.as_view(), name="content"),
+    path("jobs/", include("jobs.urls")),
+    path("author/", include("author.urls")),
 ]
 urlpatterns.extend(static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT))