here we go again

ArkTZ · Jul 12, 2022 · 599a840 · 599a840
1 parent 18c377d
commit 599a840
Show file tree

Hide file tree

Showing 32 changed files with 150 additions and 30 deletions.
diff --git a/personal_blog/blog/__pycache__/admin.cpython-310.pyc b/personal_blog/blog/__pycache__/admin.cpython-310.pyc
diff --git a/personal_blog/blog/__pycache__/models.cpython-310.pyc b/personal_blog/blog/__pycache__/models.cpython-310.pyc
diff --git a/personal_blog/blog/__pycache__/urls.cpython-310.pyc b/personal_blog/blog/__pycache__/urls.cpython-310.pyc
diff --git a/personal_blog/blog/__pycache__/views.cpython-310.pyc b/personal_blog/blog/__pycache__/views.cpython-310.pyc
diff --git a/personal_blog/blog/admin.py b/personal_blog/blog/admin.py
@@ -1,3 +1,6 @@
 from django.contrib import admin
 
-# Register your models here.
+from django.contrib import admin
+from .models import Blog
+
+admin.site.register(Blog)
diff --git a/personal_blog/blog/migrations/0001_initial.py b/personal_blog/blog/migrations/0001_initial.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.0.5 on 2022-06-14 03:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Project',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('description', models.TextField()),
+                ('date', models.DateField()),
+            ],
+        ),
+    ]
diff --git a/personal_blog/blog/migrations/0002_rename_project_blog.py b/personal_blog/blog/migrations/0002_rename_project_blog.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.0.5 on 2022-06-14 03:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Project',
+            new_name='Blog',
+        ),
+    ]
diff --git a/personal_blog/blog/migrations/__pycache__/0001_initial.cpython-310.pyc b/personal_blog/blog/migrations/__pycache__/0001_initial.cpython-310.pyc
diff --git a/personal_blog/blog/migrations/__pycache__/0002_rename_project_blog.cpython-310.pyc b/personal_blog/blog/migrations/__pycache__/0002_rename_project_blog.cpython-310.pyc
diff --git a/personal_blog/blog/models.py b/personal_blog/blog/models.py
@@ -1,3 +1,9 @@
 from django.db import models
 
-# Create your models here.
+class Blog(models.Model):
+    title = models.CharField(max_length=200)
+    description = models.TextField()
+    date = models.DateField()
+
+    def __str__(self):
+        return self.title
diff --git a/personal_blog/blog/templates/blog/all_blogs.html b/personal_blog/blog/templates/blog/all_blogs.html
@@ -0,0 +1,16 @@
+{% extends 'portfolio/base.html' %}
+
+{% block content %}
+
+<h1>Blog</h1>
+
+<h2>Temirlan has written {{ blogs.count }} blog{{blogs.count|pluralize}}</h2>
+{% for blog in blogs %}
+
+<a href="{% url 'blog:detail' blog.id %}"><h2>{{ blog.title }}</h2></a>
+<h5>{{ blog.date|date:'M d Y'|upper }}</h5>
+<p>{{ blog.description|striptags|truncatechars:100 }}</p>
+
+
+{% endfor %}
+{% endblock %}
diff --git a/personal_blog/blog/templates/blog/detail.html b/personal_blog/blog/templates/blog/detail.html
@@ -1,10 +1,12 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>$Title$</title>
-</head>
-<body>
-$END$
-</body>
-</html>
+{% extends 'portfolio/base.html' %}
+
+{% block content %}
+
+
+    <h1>{{ blog.title}}</h1>
+    <h2> --{{ blog.date|date:'F jS Y'}}--</h2>
+
+
+    {{ blog.description|safe}}
+
+{% endblock %}
diff --git a/personal_blog/blog/urls.py b/personal_blog/blog/urls.py
@@ -0,0 +1,9 @@
+from django.urls import path
+from . import views
+
+app_name = 'blog'
+
+urlpatterns = [
+    path('', views.all_blogs, name='all_blogs'),
+    path('<int:blog_id>/', views.detail, name='detail'),
+]
diff --git a/personal_blog/blog/views.py b/personal_blog/blog/views.py
@@ -1,3 +1,14 @@
-from django.shortcuts import render
+from django.shortcuts import render, get_object_or_404
+from .models import Blog
 
-# Create your views here.
+
+
+def all_blogs(request):
+    blogs_count = Blog.objects.count
+    blogs = Blog.objects.order_by('-date')[:5]
+    return render(request, 'blog/all_blogs.html', {'blogs': blogs})
+
+
+def detail(request, blog_id):
+    blog = get_object_or_404(Blog, pk=blog_id)
+    return render(request, 'blog/detail.html', {'blog':blog})
diff --git a/personal_blog/db.sqlite3 b/personal_blog/db.sqlite3
diff --git a/personal_blog/media/portfolio/images/b3a632a5547d22c553075514add449db.jpg b/personal_blog/media/portfolio/images/b3a632a5547d22c553075514add449db.jpg
diff --git a/personal_blog/media/portfolio/images/Без_названия.jpg b/personal_blog/media/portfolio/images/Без_названия.jpg
diff --git a/personal_blog/media/portfolio/images/Без_названия_txyYo2r.jpg b/personal_blog/media/portfolio/images/Без_названия_txyYo2r.jpg
diff --git a/personal_blog/personal_blog/__pycache__/settings.cpython-310.pyc b/personal_blog/personal_blog/__pycache__/settings.cpython-310.pyc
diff --git a/personal_blog/personal_blog/__pycache__/urls.cpython-310.pyc b/personal_blog/personal_blog/__pycache__/urls.cpython-310.pyc
diff --git a/personal_blog/personal_blog/settings.py b/personal_blog/personal_blog/settings.py
@@ -9,7 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/4.0/ref/settings/
 """
-
+import os.path
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -119,6 +119,9 @@
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
 STATIC_URL = 'static/'
+MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

diff --git a/personal_blog/personal_blog/urls.py b/personal_blog/personal_blog/urls.py
@@ -14,8 +14,15 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
+from django.conf.urls.static import static
+from django.conf import settings
+from portfolio import views
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('', views.home, name='home' ),
+    path('blog/', include('blog.urls')),
 ]
+
+urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/personal_blog/portfolio/__pycache__/admin.cpython-310.pyc b/personal_blog/portfolio/__pycache__/admin.cpython-310.pyc
diff --git a/personal_blog/portfolio/__pycache__/models.cpython-310.pyc b/personal_blog/portfolio/__pycache__/models.cpython-310.pyc
diff --git a/personal_blog/portfolio/__pycache__/views.cpython-310.pyc b/personal_blog/portfolio/__pycache__/views.cpython-310.pyc
diff --git a/personal_blog/portfolio/admin.py b/personal_blog/portfolio/admin.py
@@ -1,3 +1,4 @@
 from django.contrib import admin
+from .models import Project
 
-# Register your models here.
+admin.site.register(Project)
diff --git a/personal_blog/portfolio/images/b3a632a5547d22c553075514add449db.jpg b/personal_blog/portfolio/images/b3a632a5547d22c553075514add449db.jpg
diff --git a/personal_blog/portfolio/models.py b/personal_blog/portfolio/models.py
@@ -4,4 +4,7 @@ class Project(models.Model):
     title = models.CharField(max_length=100)
     description = models.CharField(max_length=250)
     image = models.ImageField(upload_to='portfolio/images/')
-    url = models.URLField(blank=True)
+    url = models.URLField(blank=True)
+
+    def __str__(self):
+        return self.title
diff --git a/personal_blog/portfolio/static/portfolio/b3a632a5547d22c553075514add449db.jpg b/personal_blog/portfolio/static/portfolio/b3a632a5547d22c553075514add449db.jpg
diff --git a/personal_blog/portfolio/templates/portfolio/base.html b/personal_blog/portfolio/templates/portfolio/base.html
@@ -19,7 +19,7 @@
           <a class="nav-link active" aria-current="page" href="#">Home</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="#">Link</a>
+          <a class="nav-link" href="#">About</a>
         </li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">

diff --git a/personal_blog/portfolio/templates/portfolio/home.html b/personal_blog/portfolio/templates/portfolio/home.html
@@ -1,10 +1,24 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>$Title$</title>
-</head>
-<body>
-$END$
-</body>
-</html>
+{% extends 'portfolio/base.html' %}
+
+{% block content %}
+
+    <h1>Temirlan's Portfolio</h1>
+
+    {% load static %}
+
+    <img src="{% static 'portfolio/b3a632a5547d22c553075514add449db.jpg' %}">
+
+    {% for project in projects %}
+
+    <h2>{{project.title}}</h2>
+    <p>{{project.description}}</p>
+    <img src="{{ project.image.url }}" height=70 , width=70>
+    {% if project.url %}
+    <br><a href="{{ project.url }}">Link</a>
+    {% endif %}
+
+    {% endfor %}
+    <a a href="{% url 'blog:all_blogs' %}">Blog</a>
+    <br>
+
+{% endblock %}
diff --git a/personal_blog/portfolio/views.py b/personal_blog/portfolio/views.py
@@ -1,3 +1,8 @@
 from django.shortcuts import render
+from .models import Project
 
-# Create your views here.
+
+
+def home(request):
+    projects = Project.objects.all()
+    return render(request, 'portfolio/home.html', {'projects':projects})