Skip to content

Endversion #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Endversion #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions anfisa_for_friends/ice_cream/migrations/blogicum1/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
adres = 'pages/about/'
Empty file added anfisa_for_friends/ice_cream/migrations/blogicum1/blogicum
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions anfisa_for_friends/ice_cream/migrations/blogicum1/category.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
adres = 'category/<slug:category_slug>/'
1 change: 1 addition & 0 deletions anfisa_for_friends/ice_cream/migrations/blogicum1/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
adres = 'posts/<int:id>/'
1 change: 1 addition & 0 deletions anfisa_for_friends/ice_cream/migrations/blogicum1/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
adres = '"'
1 change: 1 addition & 0 deletions anfisa_for_friends/ice_cream/migrations/blogicum1/rules.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
adres = 'pages/rules/'
0 html_templates/img/image-holder.png → ...r_friends/static_dev/img/image-holder.png
View file
Open in desktop
File renamed without changes
0 html_templates/js/bootstrap.min.js → ...or_friends/static_dev/js/bootstrap.min.js
View file
Open in desktop
File renamed without changes.
0 html_templates/js/jquery-3.2.1.slim.min.js → ...ds/static_dev/js/jquery-3.2.1.slim.min.js
View file
Open in desktop
File renamed without changes.
8 changes: 7 additions & 1 deletion anfisa_for_friends/templates/about/description.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,11 @@
Анфиса для друзей. Описание проекта
{% endblock %}
{% block content %}
<!-- Начало блока content -->
<h1>Описание проекта</h1>
{% endblock %}
<p>Анфиса для друзей - это проект,
который поможет вам легко и
быстро находить интересные места в вашем городе,
а также делиться с друзьями своими открытиями.</p>
<!-- Конец блока content -->
{% endblock %}
32 changes: 19 additions & 13 deletions anfisa_for_friends/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
{% load static %}
<!DOCTYPE html>
<html lang="ru">
<head>
<link rel="icon" href="{% static 'img/fav/fav.ico' %}" type="image">
<!DOCTYPE html>
<html lang="ru">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="img/fav/fav.ico" type="image">
<link rel="stylesheet" href="css/bootstrap.min.css">
<title>
{% block title %}{% endblock %}
</title>
<link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}">
{% block title %}
{% endblock %}
</title>
</head>
<body>
{% include "includes/header.html" %}
<main>
{% block content %}
{% endblock %}
</main>
{% include "includes/footer.html" %}
{% include 'header.html' %}

{% block content %}
{% endblock %}

{% include 'footer.html' %}

<script src="js/jquery-3.2.1.slim.min.js"></script>
<script src="js/bootstrap.min.js"></script>
</body>
</html>
5 changes: 4 additions & 1 deletion anfisa_for_friends/templates/homepage/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
Анфиса для друзей. Главная
{% endblock %}
{% block content %}
<!-- Начало блока content -->
<h1>Главная страница</h1>
{% endblock %}
<p>Добро пожаловать на главную страницу проекта Анфиса для друзей!</p>
<!-- Конец блока content -->
{% endblock %}
13 changes: 7 additions & 6 deletions anfisa_for_friends/templates/ice_cream/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{% extends "base.html" %}
{% block title %}
Анфиса для друзей. Подробное описание мороженого
Анфиса для друзей. Подробное описание места
{% endblock %}
{% block content %}
<h1>Подробное описание мороженого</h1>
<h3>{{ ice_cream.title }}</h3>
<p>{{ ice_cream.description }}</p>
{% endblock %}

<!-- Начало блока content -->
<h1>Подробное описание места</h1>
<h3>{{ place.title }}</h3>
<p>{{ place.description }}</p>
<!-- Конец блока content -->
{% endblock %}
14 changes: 8 additions & 6 deletions anfisa_for_friends/templates/ice_cream/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{% extends "base.html" %}
{% block title %}
Анфиса для друзей. Каталог мороженого
Анфиса для друзей. Каталог мест
{% endblock %}
{% block content %}
<h1>Каталог мороженого</h1>
<!-- Начало блока content -->
<h1>Каталог мест</h1>
<ul>
{% for ice_cream in ice_cream_list %}
{% for place in place_list %}
<li>
<h3>{{ ice_cream.title }}</h3>
<p>{{ ice_cream.description|truncatewords:10 }}</p>
<a href="{% url 'ice_cream:ice_cream_detail' ice_cream.id %}">подробнее</a>
<h3>{{ place.title }}</h3>
<p>{{ place.description|truncatewords:10 }}</p>
<a href="{% url 'places:place_detail' place.id %}">подробнее</a>
</li>
{% if not forloop.last %}
<hr>
{% endif %}
{% endfor %}
</ul>
<!-- Конец блока content -->
{% endblock %}
6 changes: 3 additions & 3 deletions anfisa_for_friends/templates/includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<footer>
<p>Копирайт, год создания</p>
</footer>
<footer class="border-top text-center py-3">
<p>© 2022 «MyKit Corp»</p>
</footer>
50 changes: 37 additions & 13 deletions anfisa_for_friends/templates/includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,41 @@
{% load static %}
<header>
<img src="{% static 'img/logo.png' %}" height="50" alt="">
<nav>
<ul>
<li>
<a href="{% url 'homepage:index' %}">Главная</a>
</li>
<li>
<a href="{% url 'ice_cream:ice_cream_list' %}">Каталог мороженого</a>
</li>
<li>
<a href="{% url 'about:description' %}">О проекте</a>
</li>
</ul>
<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top shadow-sm">
<div class="container">
<div
class="navbar-toggler"
type="button"
data-toggle="collapse"
data-target="#navbarNav"
aria-controls="navbarNav"
aria-expanded="false"
aria-label="Toggle navigation"
>
<span class="navbar-toggler-icon"></span>
</div>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link" href="index.html">
Главная
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="ice_cream_list.html">
Каталог мороженого
</a>
</li>
<li class="nav-item">
<!-- Добавлен класс active -->
<a class="nav-link active" href="about.html">
О проекте
</a>
</li>
</ul>
</div>
<a class="navbar-brand" href="index.html">
<img src="img/logo.png" height="50" class="d-inline-block align-top" alt="">
</a>
</div>
</nav>
</header>
Empty file added blogicum/blog/__init__.py
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions blogicum/blog/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
6 changes: 6 additions & 0 deletions blogicum/blog/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class BlogConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'blog'
Empty file added blogicum/blog/forms.py
View file
Open in desktop
Empty file.
Empty file added blogicum/blog/migrations/__init__.py
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions blogicum/blog/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from django.db import models
3 changes: 3 additions & 0 deletions blogicum/blog/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
11 changes: 11 additions & 0 deletions blogicum/blog/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from django.urls import path

from . import views

app_name = 'blog'

urlpatterns = [
path('', views.index, name='index'),
path('posts/<int:pk>/', views.post_detail, name='post_detail'),
path("category/<slug:category_slug>/", views.category_posts, name='category_posts'),
]
62 changes: 62 additions & 0 deletions blogicum/blog/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
from django.shortcuts import render

posts = [
{
'id': 0,
'location': 'Остров отчаянья',
'date': '30 сентября 1659 года',
'category': 'travel',
'text': '''Наш корабль, застигнутый в открытом море
страшным штормом, потерпел крушение.
Весь экипаж, кроме меня, утонул; я же,
несчастный Робинзон Крузо, был выброшен
полумёртвым на берег этого проклятого острова,
который назвал островом Отчаяния.''',
},
{
'id': 1,
'location': 'Остров отчаянья',
'date': '1 октября 1659 года',
'category': 'not-my-day',
'text': '''Проснувшись поутру, я увидел, что наш корабль сняло
с мели приливом и пригнало гораздо ближе к берегу.
Это подало мне надежду, что, когда ветер стихнет,
мне удастся добраться до корабля и запастись едой и
другими необходимыми вещами. Я немного приободрился,
хотя печаль о погибших товарищах не покидала меня.
Мне всё думалось, что, останься мы на корабле, мы
непременно спаслись бы. Теперь из его обломков мы могли бы
построить баркас, на котором и выбрались бы из этого
гиблого места.''',
},
{
'id': 2,
'location': 'Остров отчаянья',
'date': '25 октября 1659 года',
'category': 'not-my-day',
'text': '''Всю ночь и весь день шёл дождь и дул сильный
порывистый ветер. 25 октября. Корабль за ночь разбило
в щепки; на том месте, где он стоял, торчат какие-то
жалкие обломки, да и те видны только во время отлива.
Весь этот день я хлопотал около вещей: укрывал и
укутывал их, чтобы не испортились от дождя.''',
},
]


def index(request):
templates = 'blog/index.html'
context = {'posts': posts}
return render(request, templates, context)


def post_detail(request, pk):
templates = 'blog/detail.html'
context = {'post': posts[pk]}
return render(request, templates, context)


def category_posts(request, category_slug):
templates = 'blog/category.html'
context = {'slug': category_slug}
return render(request, templates, context)
Empty file added blogicum/blogicum/__init__.py
View file
Open in desktop
Empty file.
16 changes: 16 additions & 0 deletions blogicum/blogicum/asgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"""
ASGI config for blogicum project.
It exposes the ASGI callable as a module-level variable named ``application``.
For more information on this file, see
https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/
"""

import os

from django.core.asgi import get_asgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'blogicum.settings')

application = get_asgi_application()
Loading