cailean/garden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wanders & mod time added

Browse Source
This commit is contained in:
Cailean Finn
2024-06-21 10:40:48 +01:00
parent 951224f0ea
commit e825506bbd
18 changed files with 197 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build.py
View File

@@ -3,6 +3,7 @@ import markdown
import re
from jinja2 import Environment, FileSystemLoader
import yaml
import time
import json
class Website:
@@ -14,7 +15,7 @@ class Website:
self.pages = []
self.tags = []
self.all_images = []
self.about_meta, self.about_content = self.fetch_page('content', 'about.md')
self.about_meta, self.about_content, self.about_modified_time = self.fetch_page('content', 'about.md')
def build(self):
self.fetch_pages()
@@ -30,6 +31,8 @@ class Website:
if page.endswith('.md'):
with open(os.path.join('content/posts', page), 'r', encoding="utf8") as f:
content = f.read()
file_desc = f.fileno()
file_status = os.fstat(file_desc)
parts = content.split('---')
metadata = yaml.safe_load(parts[1])
md_content = ''.join(parts[2:])
@@ -37,7 +40,7 @@ class Website:
md_content = self.format_content(md_content)
html_content = markdown.markdown(md_content)
output_filename = os.path.splitext(page)[0] + '.html'
new_page = Page(metadata, html_content, output_filename)
new_page = Page(metadata, html_content, output_filename, file_status)
self.pages.append(new_page)
def process_page(self):
@@ -55,6 +58,7 @@ class Website:
image=metadata.get('image', ''), # Assuming image is a string
showcase=metadata.get('showcase', []),
credits=metadata.get('credits', []), # Assuming credits is a string
modified_time=page.get_modified_time_readable(),
content=html_content)
with open(os.path.join(self.output_dir_root, filename), 'w', encoding='utf8') as output_file:
output_file.write(html_output)
@@ -73,7 +77,8 @@ class Website:
md_content = ''.join(parts[2:])
md_content = re.sub(r'\(([^)]+)\)\[([^\]]+)\]', r'<a href="\2">\1</a>', md_content)
html_content = markdown.markdown(md_content)
return metadata, html_content
about_modified_time = time.ctime(os.fstat(f.fileno()).st_mtime)
return metadata, html_content, about_modified_time
def create_list(self):
template = self.env.get_template('list.html')
@@ -96,7 +101,8 @@ class Website:
template = self.env.get_template('about.html')
html_output = template.render(
content=self.about_content,
socials=self.about_meta
socials=self.about_meta,
modified_time = self.about_modified_time
)
with open(os.path.join('public', 'about.html'), 'w', encoding='utf8') as output_file:
output_file.write(html_output)
@@ -140,10 +146,11 @@ class Website:
json.dump(page_info_list, f, ensure_ascii=False, indent=4)
class Page:
def __init__(self, metadata, md_content, filename):
def __init__(self, metadata, md_content, filename, last_updated):
self.metadata = metadata
self.content = md_content
self.filename = filename
self.last_updated = last_updated
self.title = self.metadata['title']
self.type = self.metadata['type']
self.year = self.metadata['year']
@@ -186,6 +193,13 @@ class Page:
output = f"Title: {self.title}\nYear: {self.year}\nDate: {self.date}\nTags: {self.tags}\nType: {self.type}"
print(output)
def get_modified_time_readable(self):
if self.last_updated is not None:
last_modified_time = self.last_updated.st_mtime
last_modified_time_readable = time.ctime(last_modified_time)
return last_modified_time_readable
return None
def main():
inst = Website('templates', 'public')
inst.build()

10
public/about.html
View File

@@ -38,6 +38,15 @@
<div>git <a href="https://git.fioruil.ie/" target="_blank">↯</a></div>
</div>
<div id="wanderers-container">
<h4>Wanderers: </h4>
<p id="wander-count"></p>
</div>
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Thu Jun 20 17:36:45 2024</p>
</div>
</div>
</div>
<a><span id="monster">
@@ -48,6 +57,7 @@
</a>
</div>
<script src="js/mob.js"></script>
<script src="js/wander.js"></script>
</div>
</body>

9
public/articles/(o)machine.html
View File

@@ -47,7 +47,7 @@
<div id="showcase-cont">
<div class="showcase">
<p>(2026)</p>
<p>(2022)</p>
<p>Speak It Now Eat It, Revision Performing Arts Festival,</p>
<p>Belfast</p>
</div>
@@ -73,9 +73,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Fri Jun 21 09:27:25 2024</p>
</div>
</div>
</div>

7
public/articles/ai-x-body.html
View File

@@ -46,9 +46,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Thu Jun 20 17:23:18 2024</p>
</div>
</div>
</div>

7
public/articles/beauty-and-the-beep.html
View File

@@ -88,9 +88,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Sat Jun 8 22:14:44 2024</p>
</div>
</div>
</div>

7
public/articles/data.html
View File

@@ -86,9 +86,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Sat Jun 8 23:33:47 2024</p>
</div>
</div>
</div>

7
public/articles/demo.html
View File

@@ -87,9 +87,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Thu Jun 20 18:00:30 2024</p>
</div>
</div>
</div>

7
public/articles/dwelling.html
View File

@@ -79,9 +79,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Sat Jun 8 23:36:42 2024</p>
</div>
</div>
</div>

7
public/articles/electronic-image.html
View File

@@ -82,9 +82,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Sun Jun 9 00:02:18 2024</p>
</div>
</div>
</div>

7
public/articles/latent-mirror.html
View File

@@ -82,9 +82,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Sat Jun 8 23:39:31 2024</p>
</div>
</div>
</div>

7
public/articles/undefined.html
View File

@@ -79,9 +79,12 @@
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
<div id="modified-time">
<h4>Last Modified: </h4>
<p> Sat Jun 8 23:41:06 2024</p>
</div>
</div>
</div>

36
public/css/styles.css
View File

@@ -476,6 +476,42 @@ body {
margin: 0;
}
#modified-time {
display: flex;
flex-direction: row;
flex-wrap: wrap;
gap: 10px;
margin-top: 25px;
}
#modified-time p{
padding: 0;
margin: 0;
}
#modified-time h4{
padding: 0;
margin: 0;
}
#wanderers-container {
display: flex;
flex-direction: row;
flex-wrap: wrap;
gap: 10px;
margin-top: 25px;
}
#wanderers-container p{
padding: 0;
margin: 0;
}
#wanderers-container h4{
padding: 0;
margin: 0;
}

9
public/js/wander.js Normal file
View File

@@ -0,0 +1,9 @@
function GetWanderCount(){
let element = document.getElementById('wander-count')
fetch('../json/counter.json')
.then((response) => response.json())
.then((json) => element.innerHTML = json['count']);
}
GetWanderCount()

33
server.js
View File

@@ -1,6 +1,6 @@
const express = require('express');
const path = require('path');
const fs = require('fs')
const fs = require('fs');
const bodyParser = require('body-parser');
const crypto = require('crypto');
const { exec } = require('child_process');
@@ -8,21 +8,25 @@ require('dotenv').config();
const app = express();
const PORT = process.env.PORT || 3000;
const GITEA_SECRET = process.env.GITEA_SECRET
const GITEA_SECRET = process.env.GITEA_SECRET;
const counterFilePath = path.join(__dirname, 'public/json/counter.json');
function readCounter() {
const data = fs.readFileSync(counterFilePath)
const data = fs.readFileSync(counterFilePath);
return JSON.parse(data).count;
}
function writeCounter(count) {
const data = JSON.stringify({ count: count}, null, 2)
fs.writeFileSync(counterFilePath, data)
const data = JSON.stringify({ count: count }, null, 2);
fs.writeFileSync(counterFilePath, data);
}
// Serve static files from the 'public' directory
app.use(express.static(path.join(__dirname, 'public')));
function IncrementCounter() {
let count = readCounter();
count++;
writeCounter(count);
console.log(count);
}
// Middleware to capture raw body
app.use(bodyParser.json({
@@ -31,14 +35,11 @@ app.use(bodyParser.json({
}
}));
// Custom middleware to handle URLs without .html for specific routes
app.use((req, res, next) => {
const urlPath = req.path.split('?')[0];
const htmlRoutes = ['/about', '/list', '/gallery'];
let count = readCounter()
count++;
writeCounter(count)
console.log(count)
if (htmlRoutes.includes(urlPath)) {
req.url += '.html';
}
@@ -48,25 +49,30 @@ app.use((req, res, next) => {
// Route to serve the index.html file
app.get('/', (req, res) => {
IncrementCounter()
res.sendFile(path.join(__dirname, 'public', 'index.html'));
});
// Routes to serve the HTML files without .html extension
app.get('/about.html', (req, res) => {
IncrementCounter();
res.sendFile(path.join(__dirname, 'public', 'about.html'));
});
app.get('/list.html', (req, res) => {
IncrementCounter();
res.sendFile(path.join(__dirname, 'public', 'list.html'));
});
app.get('/gallery.html', (req, res) => {
IncrementCounter();
res.sendFile(path.join(__dirname, 'public', 'gallery.html'));
});
// Serve articles without .html extension
app.get('/articles/:articleName', (req, res) => {
const articleName = req.params.articleName;
IncrementCounter();
res.sendFile(path.join(__dirname, 'public/articles', `${articleName}.html`));
});
@@ -85,7 +91,7 @@ app.post('/api', (req, res) => {
const bufferSignature = Buffer.from(signature, 'hex');
const bufferDigest = Buffer.from(digest, 'hex');
console.log(bufferSignature.length, bufferDigest.length)
console.log(bufferSignature.length, bufferDigest.length);
if (bufferSignature.length === bufferDigest.length && crypto.timingSafeEqual(bufferSignature, bufferDigest)) {
// Secret is valid, update the repository
@@ -110,6 +116,9 @@ app.use((err, req, res, next) => {
res.status(500).send('Something broke!');
});
// Serve static files from the 'public' directory
app.use(express.static(path.join(__dirname, 'public')));
// Start the server
app.listen(PORT, (err) => {
if (err) {

5
templates/_modified.html Normal file
View File

@@ -0,0 +1,5 @@
<div id="modified-time">
<h4>Last Modified: </h4>
<p> {{ modified_time }}</p>
</div>

4
templates/_wanderers.html Normal file
View File

@@ -0,0 +1,4 @@
<div id="wanderers-container">
<h4>Wanderers: </h4>
<p id="wander-count"></p>
</div>

3
templates/about.html
View File

@@ -13,6 +13,8 @@
<div>{{ key }} <a href="{{ value }}" target="_blank">↯</a></div>
{% endfor %}
</div>
{% include '_wanderers.html' %}
{% include '_modified.html' %}
</div>
</div>
<a><span id="monster">
@@ -23,4 +25,5 @@
</a>
</div>
<script src="js/mob.js"></script>
<script src="js/wander.js"></script>
{% endblock %}

5
templates/article.html
View File

@@ -57,9 +57,8 @@
</div>
{% endif %}
<div id="sleeping-mario">
<img src="/images/website/mario-sleep-up.gif">
</div>
{% include '_modified.html' %}
</div>
</div>
{% endblock %}