Updated Nov 23 2024

jerrylovescheese · Nov 23, 2024 · 31460f1 · 31460f1
1 parent 5978856
commit 31460f1
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 65 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/venv/
+/venv/
+/build/
diff --git a/app.py b/app.py
@@ -1,5 +1,7 @@
+import os
 from flask import Flask, render_template
 from flask_frozen import Freezer
+from markupsafe import Markup
 
 app = Flask(__name__)
 freezer = Freezer(app)
@@ -10,6 +12,30 @@ def index():
     return render_template('index.html')
 
 
+@app.route("/blog")
+def blog():
+    posts = []
+    for filename in os.listdir("posts"):
+        if filename.endswith(".html"):
+            with open(os.path.join("posts", filename)) as f:
+                content = f.read()
+                title = os.path.splitext(filename)[0].replace("-", " ").title()
+                posts.append({"title": title, "content": Markup(content)})
+    return render_template("blog.html", posts=posts)
+
+
+@app.route("/blog/<post_slug>")
+def post(post_slug):
+    post_file = f"posts/{post_slug}.html"
+    if os.path.exists(post_file):
+        with open(post_file) as f:
+            content = Markup(f.read())
+            title = post_slug.replace("-", " ").title()
+            return render_template("post.html", title=title, content=content)
+    else:
+        return "Post not found", 404
+
+
 if __name__ == '__main__':
     freezer.freeze()
 

diff --git a/freeze.py b/freeze.py
@@ -1,7 +1,7 @@
-from app import app  # Import your Flask app from app.py
 from flask_frozen import Freezer
+from app import app
 
 freezer = Freezer(app)
 
-if __name__ == '__main__':
-    freezer.freeze()  # This will generate the static files
+if __name__ == "__main__":
+    freezer.freeze()
diff --git a/posts/my-first-post.html b/posts/my-first-post.html
@@ -0,0 +1,2 @@
+<h1>My First Post</h1>
+<p id="dev-cal-2">This is the content of my first blog post. It's awesome!</p>
diff --git a/static/.DS_Store b/static/.DS_Store
diff --git a/static/css/style.css b/static/css/style.css
@@ -468,6 +468,17 @@ nav {
     padding: 0 3px;
 }
 
+h1,
+h2,
+footer {
+    margin-left: 30px;
+    font-family: 'Inter', 'Source Han Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+}
+
+main {
+    margin-top: 70px;
+}
+
 /* media queries */
 
 @media (prefers-color-scheme: dark) {

diff --git a/static/fonts/SourceHanSansCN-Bold-min.woff2 b/static/fonts/SourceHanSansCN-Bold-min.woff2
diff --git a/static/fonts/SourceHanSansCN-Regular-min.woff2 b/static/fonts/SourceHanSansCN-Regular-min.woff2
diff --git a/templates/blog.html b/templates/blog.html
@@ -0,0 +1,16 @@
+{% extends "layout.html" %}
+
+{% block content %}
+<h1>Welcome to My Blog</h1>
+
+<div class="blog-posts">
+  {% for post in posts %}
+    <article class="blog-post">
+      <h2>{{ post.title }}</h2>
+      <div class="post-content">
+        {{ post.content | safe }}
+      </div>
+    </article>
+  {% endfor %}
+</div>
+{% endblock %}
diff --git a/templates/index.html b/templates/index.html
@@ -1,8 +1,10 @@
 {% extends "layout.html" %}
 
-{% block title %}Home - My Frozen Flask App{% endblock %}
+{% block title %}Jerry's blog...{% endblock %}
 
 {% block content %}
-<h2>Welcome to the Homepage!</h2>
-<p>This is the content specific to the homepage.</p>
+<h2>Jerry's blog</h2>
+<p id="dev-cal-2">This is the content specific to the homepage.</p>
+<p id="dev-cal-2">This is the content specific to the homepage.</p>
+<p id="dev-cal-2">This is the content specific to the homepage.</p>
 {% endblock %}
diff --git a/templates/layout.html b/templates/layout.html
@@ -28,6 +28,8 @@
     </script>
     <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
     <link rel="stylesheet" href="{{ url_for('static', filename='fontawesome/css/all.css') }}">
+    <link rel="preconnect" href="https://rsms.me/">
+    <link rel="stylesheet" href="https://rsms.me/inter/inter.css">
 </head>
 
 <body>
@@ -38,65 +40,9 @@
         </a>
         <div class="b-item-1"><span id="titleDisplay"></span></div>
         <div id="attic-items">
-            <div class="b-item-2">things I love</div>
+            <div class="b-item-2">publications</div>
             <div class="b-item">
-                <a href="./apple.html">Apple</a>
-            </div>
-            <div class="b-item">
-                <a href="./friends.html">Friends</a>
-            </div>
-            <div class="b-item">
-                <a href="./music.html">Music</a>
-            </div>
-            <div class="b-item">
-                <a href="./taylorswift.html">Swiftie</a>
-            </div>
-            <div class="b-item-2">festivity</div>
-            <div class="b-item">
-                <a href="./christmas.html">Christmas</a>
-            </div>
-            <div class="b-item">
-                <a href="./homemade_giftcard.html">Homemade Giftcard</a>
-            </div>
-            <div class="b-item-2">other stuff</div>
-            <div class="b-item">
-                <a href="./aluminum_studio.html">About</a>
-            </div>
-            <div class="b-item">
-                <a href="https://blog.jerryly.top">
-                    Blog&emsp13;&emsp13;
-                    <i class="fa-solid fa-arrow-up-right-from-square"></i>
-                </a>
-            </div>
-            <div class="b-item">
-                <a href="./classical_ch_sh.html">Classical Chinese for Senior High</a>
-            </div>
-            <div class="b-item">
-                <a href="./classical_ch.html">Classical Chinese for Junior High</a>
-            </div>
-            <div class="b-item">
-                <a href="./clock.html">Clock</a>
-            </div>
-            <div class="b-item">
-                <a href="./contact.html">Contact</a>
-            </div>
-            <div class="b-item">
-                <a href="./develop.html">Develop</a>
-            </div>
-            <div class="b-item">
-                <a href="./flashback.html">Rainbow Room</a>
-            </div>
-            <div class="b-item">
-                <a href="./gallery.html">Gallery</a>
-            </div>
-            <div class="b-item">
-                <a href="./noticeboard.html">Noticeboard</a>
-            </div>
-            <div class="b-item">
-                <a href="./search.html">Search (deprecated)</a>
-            </div>
-            <div class="b-item">
-                <a href="./survey.html">Survey</a>
+                <a href="{{ url_for('blog') }}">Blog</a>
             </div>
         </div>
     </header>

diff --git a/templates/post.html b/templates/post.html
@@ -0,0 +1,15 @@
+{% extends "layout.html" %}
+
+{% block title %}
+{{ title }} - My Blog
+{% endblock %}
+
+{% block content %}
+<h1>{{ title }}</h1>
+
+<div class="post-content">
+    {{ content | safe }}
+</div>
+
+<a href="{{ url_for('blog') }}">Back to Blog</a>
+{% endblock %}