Re-organizaton and photos

+ Added homepage.md
- Moved recent posts to the homepage
+ Information to sidebar
+ Images to the sidebar
+ Images to the homepage

diff --git a/blog.py b/blog.py
index 27b5b0772f5144f265e4e4d7ee9487d9c25c0c38..f8bcf570930cde57d1b6cd1e398e086ad823d910 100755 (executable)
--- a/blog.py
+++ b/blog.py
@@ -7,6 +7,8 @@ from os.path import getmtime
 from markdown.extensions.toc import TocExtension
 import re
 import mmap
+import time
+from git import Repo
 
 app = Flask(__name__)
 md = markdown.Markdown(extensions = ['meta', 'tables', 'footnotes', TocExtension(title = "Table of contents")])
@@ -44,7 +46,7 @@ class Page():
 
                template_string = open(f"{blog_path}/templates/{self.template}", "r").read()
 
-               recent = get_recent(10)
+               history = get_history(6)
                with open(f"{blog_path}/templates/sidebar.md", "r") as f:
                        sidebar = md.convert(f.read())
 
@@ -56,7 +58,7 @@ class Page():
                        keywords = format_keywords,
                        content = self.content,
                        filename = self.filename,
-                       recent = recent,
+                       history = history,
                        sidebar = sidebar
                        )
 
@@ -91,11 +93,22 @@ def get_metadata(file_name: str):
 
        return title, abstract, keywords
 
+def get_history(n):
+       repo = Repo.init(blog_path)
+       commits = list(repo.iter_commits("main", max_count=n))
+       commits_string = ""
+       for c in commits:
+               time_string = time.strftime("%d %b %Y", time.gmtime(c.committed_date))
+               link = f"https://git.ozva.co.uk/?p=blog;a=commit;h={c.hexsha}"
+               commits_string += f"<a href='{link}'><b>&#9921; {time_string}</b></a> <em>{c.message}</em><br>"
+
+       return "<p>" + commits_string + "</p>"
+
 def get_recent(n):
        modification_times = {file_name: getmtime(f"{blog_path}/pages/{file_name}") for file_name in listdir(f"{blog_path}/pages")}
        pages = sorted(modification_times.items(), key=lambda x: x[1])[:n]
 
-       content = "<ul>"
+       content = "<h3>Recent Posts</h3><ul>"
 
        for page in pages:
                title, abstract, keywords = get_metadata(page[0])
@@ -111,11 +124,15 @@ def get_recent(n):
 
 @app.route("/")
 def homepage():
+       with open(f"{blog_path}/templates/homepage.md", "r") as f:
+               homepage = md.convert(f.read())
+
        page = Page(
                title = "Home",
                abstract = "Blog and portfolio of Will Greenwood.",
                keywords = [],
                date = "",
+               content = homepage + get_recent(10),
                template = "page.html"
                )
        return page.make()

diff --git a/media/homepage/challah.jpg b/media/homepage/challah.jpg
new file mode 100644 (file)
index 0000000..e7caee7
Binary files /dev/null and b/media/homepage/challah.jpg differ

diff --git a/media/homepage/fruit.jpg b/media/homepage/fruit.jpg
new file mode 100644 (file)
index 0000000..44f5ddb
Binary files /dev/null and b/media/homepage/fruit.jpg differ

diff --git a/media/sidebar/iiw1.jpeg b/media/sidebar/iiw1.jpeg
new file mode 100644 (file)
index 0000000..fcf9a51
Binary files /dev/null and b/media/sidebar/iiw1.jpeg differ

diff --git a/media/sidebar/iiw2.jpeg b/media/sidebar/iiw2.jpeg
new file mode 100644 (file)
index 0000000..51b4e9c
Binary files /dev/null and b/media/sidebar/iiw2.jpeg differ

diff --git a/templates/homepage.md b/templates/homepage.md
new file mode 100644 (file)
index 0000000..66e4275
--- /dev/null
+++ b/templates/homepage.md
@@ -0,0 +1,4 @@
+# Hello this is the homepage
+
+![image](/homepage/challah.jpg "The world has already ended.")
+![image](/homepage/fruit.jpg "Follow Teeth.")

diff --git a/templates/page.html b/templates/page.html
index 49260b31c6a539d88447ab880cb4e7293e2aedc4..37ddcafec8c9cf7741d95835d33463db1fabc62e 100644 (file)
--- a/templates/page.html
+++ b/templates/page.html
@@ -18,9 +18,9 @@
                        </search>
                        <div id="extra">
                                <hr>
+                               <h3>History:</h3>
+                               {{history|safe}}
                                {{sidebar|safe}}
-                               <h3>Recent posts:</h3>
-                               {{recent|safe}}
                        </div>
                </nav><main>
                        <h1 class='mainTitle'>{{title}}</h1>
@@ -34,7 +34,7 @@
                        <p>Keywords: <em>{{keywords|safe}}<br><a href="/categories">See more keywords...</a></em><br></p>
                        {% endif %}
                        {% if filename %}
-                       <p><em><a href="https://git.ozva.co.uk/?p=blog;a=history;f=pages/{{filename|safe}}.md">See page history...</a></em></p>
+                       <p><a href="https://git.ozva.co.uk/?p=blog;a=history;f=pages/{{filename|safe}}.md">&#9921; <em>See page history...</em></a></p>
                        {% endif %}
                        <hr>
                        <div>

diff --git a/templates/sidebar.md b/templates/sidebar.md
index 6ac349bf5169f4089346311bf06b74745612a2f5..34e3b3cdc7a246cd9300df756fe04322175ed751 100644 (file)
--- a/templates/sidebar.md
+++ b/templates/sidebar.md
@@ -1,3 +1,8 @@
-### Welcome to the blog
+*The structure of this site comes from the inherent structure of a Git repo. Links begining with &#9921; go to the Git site: <https://git.ozva.co.uk/> hosted on the [OzVa](https://www.ozva.co.uk) servers. Check both out to see some of my current projects.
 
-It's me Will
+![image](/sidebar/iiw1.jpg "The world has already ended.")
+![image](/sidebar/iiw2.jpg "Follow Teeth.")
+
+### About
+
+My name is Will Greenwood, Radio producer. You can find my up-to-date CV [here](https://data.ozva.co.uk/cv.pdf). For examples of my work, see my [Soundcloud](https://soundcloud.com/will-greenwood-896086623) or check out the radio station I built: [XMDV Radio.](https://xmdv.ozva.co.uk). Additionally, see my contribution to OzVa on [their website.](https://www.ozva.co.uk)