From 8f23db5735d3a95bca82864452f40ec9113148b8 Mon Sep 17 00:00:00 2001
From: Artemii Shutov <107578601+Yemetry@users.noreply.github.com>
Date: Thu, 21 Mar 2024 00:25:02 +0500
Subject: [PATCH] =?UTF-8?q?[feature]=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=BB=201=202=203=204=205=206?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/author/__init__.py                        |  0
 src/author/admin.py                           | 25 ++++++++++
 src/author/apps.py                            | 11 +++++
 src/author/context_processors.py              |  9 ++++
 src/author/migrations/0001_initial.py         | 49 +++++++++++++++++++
 src/author/migrations/__init__.py             |  0
 src/author/models.py                          | 19 +++++++
 .../0002_job_detailed_description.py          | 24 +++++++++
 src/jobs/models.py                            | 13 +++++
 src/jobs/templates/jobs/job_detail.html       |  6 ++-
 src/jobs/templates/jobs/job_list.html         | 10 ++--
 src/jobs/urls.py                              |  7 +++
 src/jobs/views.py                             |  6 ++-
 src/portfolio/settings.py                     |  2 +
 src/portfolio/templates/base.html             |  6 +--
 src/portfolio/urls.py                         |  1 +
 16 files changed, 178 insertions(+), 10 deletions(-)
 create mode 100644 src/author/__init__.py
 create mode 100644 src/author/admin.py
 create mode 100644 src/author/apps.py
 create mode 100644 src/author/context_processors.py
 create mode 100644 src/author/migrations/0001_initial.py
 create mode 100644 src/author/migrations/__init__.py
 create mode 100644 src/author/models.py
 create mode 100644 src/jobs/migrations/0002_job_detailed_description.py
 create mode 100644 src/jobs/urls.py

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..9e73a08
--- /dev/null
+++ b/src/author/admin.py
@@ -0,0 +1,25 @@
+
+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/migrations/0001_initial.py b/src/author/migrations/0001_initial.py
new file mode 100644
index 0000000..1360315
--- /dev/null
+++ b/src/author/migrations/0001_initial.py
@@ -0,0 +1,49 @@
+# Generated by Django 4.1.13 on 2024-03-20 15:57
+
+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="Время обновления записи"
+                    ),
+                ),
+                ("resume_url", models.URLField(verbose_name="Ссылка на резюме")),
+                ("github_url", models.URLField(verbose_name="Ссылка GitHub")),
+                (
+                    "email",
+                    models.EmailField(max_length=254, verbose_name="Email автора"),
+                ),
+            ],
+            options={
+                "verbose_name": "Информация об авторе",
+                "verbose_name_plural": "Информация об авторе",
+            },
+        ),
+    ]
diff --git a/src/author/migrations/__init__.py b/src/author/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
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/migrations/0002_job_detailed_description.py b/src/jobs/migrations/0002_job_detailed_description.py
new file mode 100644
index 0000000..972bb2b
--- /dev/null
+++ b/src/jobs/migrations/0002_job_detailed_description.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.1.13 on 2024-03-20 13:51
+
+import ckeditor_uploader.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("jobs", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="job",
+            name="detailed_description",
+            field=ckeditor_uploader.fields.RichTextUploadingField(
+                default="",
+                help_text="Подробное описание выполненной работы",
+                verbose_name="Подробное описание",
+            ),
+            preserve_default=False,
+        ),
+    ]
diff --git a/src/jobs/models.py b/src/jobs/models.py
index a5525d1..305ccb2 100644
--- a/src/jobs/models.py
+++ b/src/jobs/models.py
@@ -2,6 +2,7 @@
 Модели для приложения "Jobs" (выполненные работы).
 """
 
+from ckeditor_uploader.fields import RichTextUploadingField
 from django.db import models
 
 from base.models import TimeStampMixin
@@ -23,9 +24,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[:100] + "..."
\ 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 @@ <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="{{ job.description }}"></p>
+        <p>{{ job.detailed_description|safe }}</p>
+        <a href="{% url 'jobs' %}" class="btn btn-light" role="button">На главную</a>
     </div>
 
 {% endblock %}
diff --git a/src/jobs/templates/jobs/job_list.html b/src/jobs/templates/jobs/job_list.html
index 5765bc2..0375235 100644
--- a/src/jobs/templates/jobs/job_list.html
+++ b/src/jobs/templates/jobs/job_list.html
@@ -7,10 +7,10 @@
     <section class="py-5 text-center container">
         <div class="row py-lg-5">
           <div class="col-lg-6 col-md-8 mx-auto">
-            <p class="fw-light h1">Привет!</p>
-            <p class="lead text-muted">Меня зовут Иван Иванов. <br />Я профессионально занимаюсь разработкой на Python.</p>
+
+            <p class="lead text-muted">Меня зовут Шутов Артемий. <br />Я профессионально занимаюсь разработкой на JavaScript.</p>
             <p>
-                <img src="{% static 'images/my_photo.jpeg' %}" height="300" alt="Иван Иванов"/>
+                <img src="{% static 'images/my_photo.jpeg' %}" height="300" alt="Шутов Артемий"/>
             </p>
             <p>
               <a href="mailto:username(att)somemailserver(dott)com" class="btn btn-primary my-2">Написать мне</a>
@@ -33,10 +33,10 @@
                                  alt="job image"/>
 
                         <div class="card-body">
-                            <p class="card-text">{{ job.description }}</p>
+                            <p class="card-text">{{ 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>
diff --git a/src/jobs/urls.py b/src/jobs/urls.py
new file mode 100644
index 0000000..5d079dd
--- /dev/null
+++ b/src/jobs/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+from jobs.views import IndexJobsListView, IndexJobDetailView
+
+urlpatterns = [
+    path("", IndexJobsListView.as_view(), name='jobs'),
+    path("<int:pk>/", IndexJobDetailView.as_view(), name='job')
+]
\ No newline at end of file
diff --git a/src/jobs/views.py b/src/jobs/views.py
index 17fb444..bea0f93 100644
--- a/src/jobs/views.py
+++ b/src/jobs/views.py
@@ -1,7 +1,11 @@
-from django.views.generic import ListView
+from django.views.generic import ListView, DetailView
 
 from jobs.models import Job
 
 
 class IndexJobsListView(ListView):
     model = Job
+
+
+class IndexJobDetailView(DetailView):
+    model = Job
\ No newline at end of file
diff --git a/src/portfolio/settings.py b/src/portfolio/settings.py
index dbe6dbd..d114fe1 100644
--- a/src/portfolio/settings.py
+++ b/src/portfolio/settings.py
@@ -44,6 +44,7 @@
     "django.contrib.staticfiles",
     # созданные приложения
     "jobs.apps.JobsConfig",
+    "author.apps.AuthorConfig",
     "blog.apps.BlogConfig",
     # установленные приложения
     "ckeditor",
@@ -73,6 +74,7 @@
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
+                "author.context_processors.author"
             ],
         },
     },
diff --git a/src/portfolio/templates/base.html b/src/portfolio/templates/base.html
index 42b2f67..21cc687 100644
--- a/src/portfolio/templates/base.html
+++ b/src/portfolio/templates/base.html
@@ -36,9 +36,9 @@ <h4 class="text-white">Обо мне</h4>
         <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>
+            <li><a href="{{ author.resume_url }}" class="text-white">Резюме</a></li>
+            <li><a href="{{ author.github_url }}" target="_blank" class="text-white">GitHub</a></li>
+            <li><a href="mailto:{{ author.email }}" class="text-white">Email</a></li>
           </ul>
         </div>
       </div>
diff --git a/src/portfolio/urls.py b/src/portfolio/urls.py
index 11ab691..64a5ab5 100644
--- a/src/portfolio/urls.py
+++ b/src/portfolio/urls.py
@@ -28,6 +28,7 @@
     path("admin/", admin.site.urls),
     path("ckeditor/", include("ckeditor_uploader.urls")),
     path("", IndexJobsListView.as_view(), name="home"),
+    path("job/", include("jobs.urls")),
     path("blog/", include("blog.urls")),
 ]
 urlpatterns.extend(static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT))