Skip to content

Commit

Permalink
Replaced spaces with tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
Nakama3942 committed Dec 8, 2023
1 parent 5a9ae28 commit cf3bda0
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 122 deletions.
114 changes: 57 additions & 57 deletions index.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,74 +8,74 @@

@app.route('/')
def home():
post_files = get_posts('posts', 5)
post_contents = [load_post_metadata(file) for file in post_files]
return render_template('index.html', post_contents=post_contents)
post_files = get_posts('posts', 5)
post_contents = [load_post_metadata(file) for file in post_files]
return render_template('index.html', post_contents=post_contents)

@app.route('/diary')
def diary():
post_files = get_posts('posts', 0)
post_contents = [load_post_metadata(file) for file in post_files]
return render_template('diary.html', post_contents=post_contents)
post_files = get_posts('posts', 0)
post_contents = [load_post_metadata(file) for file in post_files]
return render_template('diary.html', post_contents=post_contents)

def get_posts(posts_directory, num_posts):
post_files = [f for f in os.listdir(posts_directory) if os.path.isfile(os.path.join(posts_directory, f))]
post_files.sort(key=lambda x: os.path.getmtime(os.path.join(posts_directory, x)), reverse=True)
if num_posts:
return post_files[:num_posts]
else:
return post_files
post_files = [f for f in os.listdir(posts_directory) if os.path.isfile(os.path.join(posts_directory, f))]
post_files.sort(key=lambda x: os.path.getmtime(os.path.join(posts_directory, x)), reverse=True)
if num_posts:
return post_files[:num_posts]
else:
return post_files

def load_post_metadata(post_content):
post_content = 'posts/' + str(post_content)
# print(post_content)
if os.path.exists(post_content):
with open(post_content, 'r', encoding='utf-8') as file:
metadata_block = [next(file) for _ in range(4)]
metadata_list = []
# print(str(metadata_block))
if metadata_block:
for metadata in metadata_block:
metadata_list.append(yaml.safe_load(metadata))
# Convert the 'datetime' string to a datetime object
if 'datetime' in metadata_list[2]:
metadata_list[2]['datetime'] = datetime.strptime(metadata_list[2]['datetime'], '%Y-%m-%d %I:%M %p')
print(str(metadata_list))
return metadata_list
else:
return {"title": "Invalid post format"}
else:
return "Post not found"
post_content = 'posts/' + str(post_content)
# print(post_content)
if os.path.exists(post_content):
with open(post_content, 'r', encoding='utf-8') as file:
metadata_block = [next(file) for _ in range(4)]
metadata_list = []
# print(str(metadata_block))
if metadata_block:
for metadata in metadata_block:
metadata_list.append(yaml.safe_load(metadata))
# Convert the 'datetime' string to a datetime object
if 'datetime' in metadata_list[2]:
metadata_list[2]['datetime'] = datetime.strptime(metadata_list[2]['datetime'], '%Y-%m-%d %I:%M %p')
print(str(metadata_list))
return metadata_list
else:
return {"title": "Invalid post format"}
else:
return "Post not found"

@app.route('/posts/<post_id>')
def post(post_id):
# Ваш код для загрузки и отображения полного содержания поста
post_content = load_post_content(post_id)
return render_template('post.html', post_content=post_content)
# Ваш код для загрузки и отображения полного содержания поста
post_content = load_post_content(post_id)
return render_template('post.html', post_content=post_content)

def load_post_content(file_name):
file_name = 'posts/' + str(file_name)
# print(file_name)
if os.path.exists(file_name):
with open(file_name, 'r', encoding='utf-8') as file:
metadata_block = [next(file) for _ in range(4)]
content = file.read()
content_list = []
# print(str(metadata_block))
# print(str(content))
if metadata_block and content:
for metadata in metadata_block:
content_list.append(yaml.safe_load(metadata))
# Convert the 'datetime' string to a datetime object
if 'datetime' in content_list[2]:
content_list[2]['datetime'] = datetime.strptime(content_list[2]['datetime'], '%Y-%m-%d %I:%M %p')
content_list.append({'post': yaml.safe_load(markdown2.markdown(content))})
# print(str(content_list))
return content_list
else:
return {"title": "Invalid post format"}
else:
return "Post not found"
file_name = 'posts/' + str(file_name)
# print(file_name)
if os.path.exists(file_name):
with open(file_name, 'r', encoding='utf-8') as file:
metadata_block = [next(file) for _ in range(4)]
content = file.read()
content_list = []
# print(str(metadata_block))
# print(str(content))
if metadata_block and content:
for metadata in metadata_block:
content_list.append(yaml.safe_load(metadata))
# Convert the 'datetime' string to a datetime object
if 'datetime' in content_list[2]:
content_list[2]['datetime'] = datetime.strptime(content_list[2]['datetime'], '%Y-%m-%d %I:%M %p')
content_list.append({'post': yaml.safe_load(markdown2.markdown(content))})
# print(str(content_list))
return content_list
else:
return {"title": "Invalid post format"}
else:
return "Post not found"

if __name__ == '__main__':
app.run(debug=True)
app.run(debug=True)
42 changes: 21 additions & 21 deletions template/diary.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@
</head>
<body>

<header>
<h1>Калиновський Валентин<br>Мій Особистий Блог</h1>
</header>
<header>
<h1>Калиновський Валентин<br>Мій Особистий Блог</h1>
</header>

<nav>
<a href="/">Головна</a>
<nav>
<a href="/">Головна</a>
<!-- <a href="#">Проекти</a>-->
<!-- <a href="#">Документації</a>-->
<a href="/diary">Щоденник</a>
<a href="/diary">Щоденник</a>
<!-- <a href="#">Контакти</a>-->
</nav>
</nav>

<main>
{% for metadata in post_contents %}
<article>
<a href="{{ url_for('post', post_id=metadata[0]['name']) }}">
<h2>{{ metadata[1]['title'] }}</h2>
</a>
<p>{{ metadata[3]['description'] }}</p>
<p>Дата публікації: {{ metadata[2]['datetime'].strftime('%Y-%m-%d %I:%M %p') }}</p>
</article>
{% endfor %}
</main>
<main>
{% for metadata in post_contents %}
<article>
<a href="{{ url_for('post', post_id=metadata[0]['name']) }}">
<h2>{{ metadata[1]['title'] }}</h2>
</a>
<p>{{ metadata[3]['description'] }}</p>
<p>Дата публікації: {{ metadata[2]['datetime'].strftime('%Y-%m-%d %I:%M %p') }}</p>
</article>
{% endfor %}
</main>

<footer>
<p>&copy; 2023 Калиновський Валентин</p>
</footer>
<footer>
<p>&copy; 2023 Калиновський Валентин</p>
</footer>

</body>
</html>
64 changes: 32 additions & 32 deletions template/index.html
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
<!DOCTYPE html>
<html lang="uk">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Мій особистий блог</title>
<link rel="stylesheet" href="resources/style/style.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Мій особистий блог</title>
<link rel="stylesheet" href="resources/style/style.css">
</head>
<body>

<header>
<h1>Калиновський Валентин<br>Мій Особистий Блог</h1>
</header>
<header>
<h1>Калиновський Валентин<br>Мій Особистий Блог</h1>
</header>

<nav>
<a href="/">Головна</a>
<nav>
<a href="/">Головна</a>
<!-- <a href="#">Проекти</a>-->
<!-- <a href="#">Документації</a>-->
<a href="/diary">Щоденник</a>
<a href="/diary">Щоденник</a>
<!-- <a href="#">Контакти</a>-->
</nav>
</nav>

<main> <!-- Про себе -->
<article>
<h2>Про себе</h2>
<p>Програміст</p>
<img src="../resources/images/Me.jpg" alt="Моя фотография" width="300px">
</article>
</main>
<main> <!-- Про себе -->
<article>
<h2>Про себе</h2>
<p>Програміст</p>
<img src="../resources/images/Me.jpg" alt="Моя фотография" width="300px">
</article>
</main>

<main>
{% for metadata in post_contents %}
<article>
<a href="{{ url_for('post', post_id=metadata[0]['name']) }}">
<h2>{{ metadata[1]['title'] }}</h2>
</a>
<p>{{ metadata[3]['description'] }}</p>
<p>Дата публікації: {{ metadata[2]['datetime'].strftime('%Y-%m-%d %I:%M %p') }}</p>
</article>
{% endfor %}
</main>
<main>
{% for metadata in post_contents %}
<article>
<a href="{{ url_for('post', post_id=metadata[0]['name']) }}">
<h2>{{ metadata[1]['title'] }}</h2>
</a>
<p>{{ metadata[3]['description'] }}</p>
<p>Дата публікації: {{ metadata[2]['datetime'].strftime('%Y-%m-%d %I:%M %p') }}</p>
</article>
{% endfor %}
</main>

<footer>
<p>&copy; 2023 Калиновський Валентин</p>
</footer>
<footer>
<p>&copy; 2023 Калиновський Валентин</p>
</footer>

</body>
</html>
24 changes: 12 additions & 12 deletions template/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@
</head>
<body>

<header>
<h1>Калиновський Валентин<br>Мій Особистий Блог</h1>
</header>
<header>
<h1>Калиновський Валентин<br>Мій Особистий Блог</h1>
</header>

<nav>
<a href="/">Головна</a>
<nav>
<a href="/">Головна</a>
<!-- <a href="#">Проекти</a>-->
<!-- <a href="#">Документації</a>-->
<a href="/diary">Щоденник</a>
<a href="/diary">Щоденник</a>
<!-- <a href="#">Контакти</a>-->
</nav>
</nav>

<main>
<main>
<article>
<p>{{ post_content[3]['description'] }}</p>
<p>Дата публікації: {{ post_content[2]['datetime'].strftime('%Y-%m-%d %I:%M %p') }}</p>
<hr>
<p>{{ post_content[4]['post']|safe }}</p>
</article>
</main>
</main>

<footer>
<p>&copy; 2023 Калиновський Валентин</p>
</footer>
<footer>
<p>&copy; 2023 Калиновський Валентин</p>
</footer>

</body>
</html>

0 comments on commit cf3bda0

Please sign in to comment.