forked from Decentrala/website
[Gobal] added flake8 and did format
This commit is contained in:
@@ -0,0 +1,15 @@
|
|||||||
|
# AGENTS.md
|
||||||
|
|
||||||
|
## Core Workflow
|
||||||
|
|
||||||
|
- **Setup**: `make prep` (creates `.venv` and installs `requirements.txt`)
|
||||||
|
- **Build**: `make build` (runs `atom_gen.py`, `prep.py`, and `build_pages.py`)
|
||||||
|
- **Events**: Update `dogadjaji.csv` then run `make events` (updates pages and generates images via `image_poster.py`)
|
||||||
|
- **Development**: `make dev` (starts Nginx using `nginx.dev.conf`) and `make stop` to terminate.
|
||||||
|
|
||||||
|
## Technical Details
|
||||||
|
|
||||||
|
- **Environment**: Uses a local virtual environment in `.venv`. Always use `./.venv/bin/python` or ensure the venv is activated.
|
||||||
|
- **Output**: The generated website is stored in the `site/` directory.
|
||||||
|
- **Data**: Events are driven by `dogadjaji.csv`.
|
||||||
|
- **Web Server**: Uses Nginx for the development server.
|
||||||
+27
-15
@@ -29,28 +29,35 @@ PAGES = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
env = Environment(loader=FileSystemLoader('template'))
|
env = Environment(loader=FileSystemLoader("template"))
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
os.makedirs('site/en/', exist_ok=True)
|
os.makedirs("site/en/", exist_ok=True)
|
||||||
for page in PAGES:
|
for page in PAGES:
|
||||||
# Build SR Page
|
# Build SR Page
|
||||||
with open(f'pages/sr/{page["name"]}.html') as f:
|
with open(f'pages/sr/{page["name"]}.html') as f:
|
||||||
page_content = "<div class='cover-wrap'><img src='/img/students_bug.jpg' alt='Studenti su nasli bug' /></div>"
|
page_content = "<div class='cover-wrap'><img src='/img/students_bug.jpg' alt='Studenti su nasli bug' /></div>"
|
||||||
page_content += f.read()
|
page_content += f.read()
|
||||||
|
|
||||||
sr_html = env.get_template('page-sr.html').render(
|
sr_html = env.get_template("page-sr.html").render(
|
||||||
title=page['titleSR'],
|
title=page["titleSR"],
|
||||||
content=page_content,
|
content=page_content,
|
||||||
extra_styles=f'<link rel="stylesheet" href="/styles/{page["style"]}.css">' if page['style'] else '',
|
extra_styles=(
|
||||||
|
f'<link rel="stylesheet" href="/styles/{page["style"]}.css">'
|
||||||
|
if page["style"]
|
||||||
|
else ""
|
||||||
|
),
|
||||||
lang="sr",
|
lang="sr",
|
||||||
sr_link=f"/en/{page['name']}",
|
sr_link=f"/en/{page['name']}",
|
||||||
current_path=f"/{page['name']}" if page['name'] != 'index' else "/"
|
current_path=f"/{page['name']}" if page["name"] != "index" else "/",
|
||||||
)
|
)
|
||||||
|
|
||||||
sr_filename = "index.html" if page['name'] == 'index' else f"{page['name']}.html"
|
sr_filename = (
|
||||||
with open(f'site/{sr_filename}', 'w') as f:
|
"index.html" if page["name"] == "index" else f"{page['name']}.html"
|
||||||
|
)
|
||||||
|
with open(f"site/{sr_filename}", "w") as f:
|
||||||
f.write(sr_html)
|
f.write(sr_html)
|
||||||
|
|
||||||
# Build EN Page
|
# Build EN Page
|
||||||
@@ -58,20 +65,25 @@ def main():
|
|||||||
page_content = "<div class='cover-wrap'><img src='/img/students_bug.jpg' alt='Students found the bug' /></div>"
|
page_content = "<div class='cover-wrap'><img src='/img/students_bug.jpg' alt='Students found the bug' /></div>"
|
||||||
page_content += f.read()
|
page_content += f.read()
|
||||||
|
|
||||||
en_html = env.get_template('page-en.html').render(
|
en_html = env.get_template("page-en.html").render(
|
||||||
title=page['titleEN'],
|
title=page["titleEN"],
|
||||||
content=page_content,
|
content=page_content,
|
||||||
extra_styles=f'<link rel="stylesheet" href="/styles/{page["style"]}.css">' if page['style'] else '',
|
extra_styles=(
|
||||||
|
f'<link rel="stylesheet" href="/styles/{page["style"]}.css">'
|
||||||
|
if page["style"]
|
||||||
|
else ""
|
||||||
|
),
|
||||||
lang="en",
|
lang="en",
|
||||||
sr_link=f"/{page['name']}",
|
sr_link=f"/{page['name']}",
|
||||||
current_path=f"/en/{page['name']}" if page['name'] != 'index' else "/en/"
|
current_path=f"/en/{page['name']}" if page["name"] != "index" else "/en/",
|
||||||
)
|
)
|
||||||
|
|
||||||
en_filename = "index.html" if page['name'] == 'index' else f"{page['name']}.html"
|
en_filename = (
|
||||||
with open(f'site/en/{en_filename}', 'w') as f:
|
"index.html" if page["name"] == "index" else f"{page['name']}.html"
|
||||||
|
)
|
||||||
|
with open(f"site/en/{en_filename}", "w") as f:
|
||||||
f.write(en_html)
|
f.write(en_html)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
Jednostavno koriscenje naseg softwera se takodje racuna kao doprinos, posto
|
Jednostavno koriscenje naseg softwera se takodje racuna kao doprinos, posto
|
||||||
bi se time pridruzili decentralizaciji.
|
bi se time pridruzili decentralizaciji.
|
||||||
</p>
|
</p>
|
||||||
<p>Takođe primamo donacije u bitcoin na adresi:</p>
|
<p>Takođe primamo donacije u bitcoinu na adresi:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Bitcoin: <i>bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</i></li>
|
<li>Bitcoin: <i>bc1qjhsfgq79wuzzv32yml9zglwzf9qcwfj3atuy74</i></li>
|
||||||
<!--
|
<!--
|
||||||
|
|||||||
@@ -25,9 +25,10 @@ TYPES_DICT = {
|
|||||||
"party": ("zabava", "entertainment"),
|
"party": ("zabava", "entertainment"),
|
||||||
}
|
}
|
||||||
|
|
||||||
env = Environment(loader=FileSystemLoader('template'))
|
env = Environment(loader=FileSystemLoader("template"))
|
||||||
|
|
||||||
def load_events(csv_path:str) -> list[dict]:
|
|
||||||
|
def load_events(csv_path: str) -> list[dict]:
|
||||||
events = []
|
events = []
|
||||||
with open(csv_path, encoding="utf-8") as csv_file:
|
with open(csv_path, encoding="utf-8") as csv_file:
|
||||||
csv_reader = csv.DictReader(csv_file, skipinitialspace=True)
|
csv_reader = csv.DictReader(csv_file, skipinitialspace=True)
|
||||||
@@ -50,6 +51,7 @@ def load_events(csv_path:str) -> list[dict]:
|
|||||||
events.append(current_event)
|
events.append(current_event)
|
||||||
return events
|
return events
|
||||||
|
|
||||||
|
|
||||||
def build_ical(events: list[dict]) -> str:
|
def build_ical(events: list[dict]) -> str:
|
||||||
today = datetime.today().now()
|
today = datetime.today().now()
|
||||||
events_ical = ""
|
events_ical = ""
|
||||||
@@ -64,7 +66,16 @@ def build_ical(events: list[dict]) -> str:
|
|||||||
|
|
||||||
uid = str(date.month).zfill(2) + str(date.day).zfill(2) + time[:2]
|
uid = str(date.month).zfill(2) + str(date.day).zfill(2) + time[:2]
|
||||||
date_str = str(date.year) + str(date.month).zfill(2) + str(date.day).zfill(2)
|
date_str = str(date.year) + str(date.month).zfill(2) + str(date.day).zfill(2)
|
||||||
created = str(today.year) + str(today.month).zfill(2) + str(today.day).zfill(2) + "T" + str(today.hour).zfill(2) + str(today.minute).zfill(2) + str(today.second).zfill(2) + "Z"
|
created = (
|
||||||
|
str(today.year)
|
||||||
|
+ str(today.month).zfill(2)
|
||||||
|
+ str(today.day).zfill(2)
|
||||||
|
+ "T"
|
||||||
|
+ str(today.hour).zfill(2)
|
||||||
|
+ str(today.minute).zfill(2)
|
||||||
|
+ str(today.second).zfill(2)
|
||||||
|
+ "Z"
|
||||||
|
)
|
||||||
date_str = date_str + "T" + time.replace(":", "") + "00"
|
date_str = date_str + "T" + time.replace(":", "") + "00"
|
||||||
|
|
||||||
event_template_str = env.get_template("event.ical").render(
|
event_template_str = env.get_template("event.ical").render(
|
||||||
@@ -73,7 +84,15 @@ def build_ical(events: list[dict]) -> str:
|
|||||||
DATE=date_str,
|
DATE=date_str,
|
||||||
TITLE=title,
|
TITLE=title,
|
||||||
URL=url,
|
URL=url,
|
||||||
LOCATION="DC Krov\\, Kraljice Marije 47\\, 6\\, Beograd\\, Serbia" if location.startswith("DC Krov") else ("Matematički fakultet\\, Svetog Nikole 39\\, Beograd\\, Serbia" if location.startswith("Matematički fakultet (Učionica 153)") else location)
|
LOCATION=(
|
||||||
|
"DC Krov\\, Kraljice Marije 47\\, 6\\, Beograd\\, Serbia"
|
||||||
|
if location.startswith("DC Krov")
|
||||||
|
else (
|
||||||
|
"Matematički fakultet\\, Svetog Nikole 39\\, Beograd\\, Serbia"
|
||||||
|
if location.startswith("Matematički fakultet (Učionica 153)")
|
||||||
|
else location
|
||||||
|
)
|
||||||
|
),
|
||||||
)
|
)
|
||||||
events_ical += event_template_str
|
events_ical += event_template_str
|
||||||
|
|
||||||
@@ -81,27 +100,34 @@ def build_ical(events: list[dict]) -> str:
|
|||||||
events_ical += file.read()
|
events_ical += file.read()
|
||||||
return events_ical
|
return events_ical
|
||||||
|
|
||||||
|
|
||||||
def render_page(template_name, output_path, context):
|
def render_page(template_name, output_path, context):
|
||||||
template = env.get_template(template_name)
|
template = env.get_template(template_name)
|
||||||
with open(output_path, "w") as file:
|
with open(output_path, "w") as file:
|
||||||
file.write(template.render(context))
|
file.write(template.render(context))
|
||||||
|
|
||||||
|
|
||||||
# Main execution
|
# Main execution
|
||||||
events = sorted(load_events("dogadjaji.csv"), key=lambda e: e["date"])
|
events = sorted(load_events("dogadjaji.csv"), key=lambda e: e["date"])
|
||||||
today = datetime.today().date()
|
today = datetime.today().date()
|
||||||
|
|
||||||
past_events = sorted([e for e in events if e["date"] <= today], key=lambda e: e["date"], reverse=True)
|
past_events = sorted(
|
||||||
new_events = [e for e in events if e["date"] >= today]
|
[e for e in events if e["date"] <= today], key=lambda e: e["date"], reverse=True
|
||||||
|
)
|
||||||
|
new_events = [e for e in events if e["date"] >= today]
|
||||||
|
|
||||||
sr_types = {k: v[0] for k, v in TYPES_DICT.items()}
|
sr_types = {k: v[0] for k, v in TYPES_DICT.items()}
|
||||||
en_types = {k: v[1] for k, v in TYPES_DICT.items()}
|
en_types = {k: v[1] for k, v in TYPES_DICT.items()}
|
||||||
|
|
||||||
# Build Serbian Pages
|
# Build Serbian Pages
|
||||||
render_page("events-sr.html", "pages/sr/events.html", {
|
render_page(
|
||||||
"lang": "sr",
|
"events-sr.html",
|
||||||
"title": "Događaji",
|
"pages/sr/events.html",
|
||||||
"sr_link": "/events_archive",
|
{
|
||||||
"events_html": env.from_string("""
|
"lang": "sr",
|
||||||
|
"title": "Događaji",
|
||||||
|
"sr_link": "/events_archive",
|
||||||
|
"events_html": env.from_string("""
|
||||||
{% for event in events %}
|
{% for event in events %}
|
||||||
<div class='event'>
|
<div class='event'>
|
||||||
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
||||||
@@ -125,14 +151,18 @@ render_page("events-sr.html", "pages/sr/events.html", {
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
""").render(events=new_events, types_names=sr_types)
|
""").render(events=new_events, types_names=sr_types),
|
||||||
})
|
},
|
||||||
|
)
|
||||||
|
|
||||||
render_page("events-en.html", "pages/en/events.html", {
|
render_page(
|
||||||
"lang": "en",
|
"events-en.html",
|
||||||
"title": "Events",
|
"pages/en/events.html",
|
||||||
"sr_link": "/events_archive",
|
{
|
||||||
"events_html": env.from_string("""
|
"lang": "en",
|
||||||
|
"title": "Events",
|
||||||
|
"sr_link": "/events_archive",
|
||||||
|
"events_html": env.from_string("""
|
||||||
{% for event in events %}
|
{% for event in events %}
|
||||||
<div class='event'>
|
<div class='event'>
|
||||||
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
||||||
@@ -156,15 +186,19 @@ render_page("events-en.html", "pages/en/events.html", {
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
""").render(events=new_events, types_names=en_types)
|
""").render(events=new_events, types_names=en_types),
|
||||||
})
|
},
|
||||||
|
)
|
||||||
|
|
||||||
# Build Archive Pages
|
# Build Archive Pages
|
||||||
render_page("events_archive-sr.html", "pages/sr/events_archive.html", {
|
render_page(
|
||||||
"lang": "sr",
|
"events_archive-sr.html",
|
||||||
"title": "Arhiva događaja",
|
"pages/sr/events_archive.html",
|
||||||
"sr_link": "/events",
|
{
|
||||||
"events_html": env.from_string("""
|
"lang": "sr",
|
||||||
|
"title": "Arhiva događaja",
|
||||||
|
"sr_link": "/events",
|
||||||
|
"events_html": env.from_string("""
|
||||||
{% for event in events %}
|
{% for event in events %}
|
||||||
<div class='event'>
|
<div class='event'>
|
||||||
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
||||||
@@ -188,14 +222,18 @@ render_page("events_archive-sr.html", "pages/sr/events_archive.html", {
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
""").render(events=past_events, types_names=sr_types)
|
""").render(events=past_events, types_names=sr_types),
|
||||||
})
|
},
|
||||||
|
)
|
||||||
|
|
||||||
render_page("events_archive-en.html", "pages/en/events_archive.html", {
|
render_page(
|
||||||
"lang": "en",
|
"events_archive-en.html",
|
||||||
"title": "Events archive",
|
"pages/en/events_archive.html",
|
||||||
"sr_link": "/en/events",
|
{
|
||||||
"events_html": env.from_string("""
|
"lang": "en",
|
||||||
|
"title": "Events archive",
|
||||||
|
"sr_link": "/en/events",
|
||||||
|
"events_html": env.from_string("""
|
||||||
{% for event in events %}
|
{% for event in events %}
|
||||||
<div class='event'>
|
<div class='event'>
|
||||||
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
<div class='date'>{{ event.date.strftime('%a, %d. %b. %Y') }}, {{ event.time }}h</div>
|
||||||
@@ -219,8 +257,9 @@ render_page("events_archive-en.html", "pages/en/events_archive.html", {
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
""").render(events=past_events, types_names=en_types)
|
""").render(events=past_events, types_names=en_types),
|
||||||
})
|
},
|
||||||
|
)
|
||||||
|
|
||||||
# Build ical
|
# Build ical
|
||||||
with open("site/events.ical", "w") as file:
|
with open("site/events.ical", "w") as file:
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
[tool.black]
|
||||||
|
line-length = 88
|
||||||
|
target-version = ['py312']
|
||||||
|
|
||||||
|
[tool.flake8]
|
||||||
|
max-line-length = 88
|
||||||
|
extend-ignore = "E203"
|
||||||
|
exclude = ".venv"
|
||||||
+6
-4
@@ -1,7 +1,9 @@
|
|||||||
cairosvg
|
cairosvg
|
||||||
markdown
|
black
|
||||||
freetype-py
|
|
||||||
python-dateutil
|
|
||||||
feedgen
|
feedgen
|
||||||
pillow
|
flake8
|
||||||
|
freetype-py
|
||||||
jinja2
|
jinja2
|
||||||
|
markdown
|
||||||
|
pillow
|
||||||
|
python-dateutil
|
||||||
|
|||||||
Reference in New Issue
Block a user