Merge pull request 'Add link to a statute in the navbar' (#29) from feat/statute-link-on-navbar into master

Reviewed-on: Decentrala/website#29
Reviewed-by: coja <coja@dmz.rs>

.gitignore

@@ -12,3 +12,5 @@ http.access.log
 http.error.log
 events.ical
 .vscode/
+events.html
+events_archive.html

Makefile

@@ -1,21 +0,0 @@
-VENV = venv
-PYTHON = $(VENV)/bin/python3
-PIP = $(VENV)/bin/pip
-POSTERS = poster_light.png poster_dark.png
-
-output: $(POSTERS)
-
-poster_%.png: image_poster.py $(VENV)/bin/activate
-	$(PYTHON) $< 2>/dev/null
-
-
-$(VENV)/bin/activate: requirements.txt
-	python3 -m venv $(VENV)
-	echo '*' > $(VENV)/.gitignore
-	$(PIP) install -r requirements.txt
-
-
-clean:
-	$(RM) -r __pycache__
-	$(RM) -r $(VENV)
-	$(RM) *.png

build_pages.py

@@ -29,13 +29,15 @@ def main():
         templateEN = fTempEN.read()
         for page in PAGES:
             with open(f'pages/sr/{page["name"]}.html') as f:
-                pageHtml = f.read()
+                pageHtml = "<div><img src='/img/students_bug.jpg' alt='Studenti su nasli bug' /></div>"
+                pageHtml += f.read()
                 html = buildPage(page['name'], page['titleSR'], pageHtml, page['style'], templateSR)
                 f = open(f'site/{page["name"]}.html', 'w')
                 f.write(html)
                 f.close()
             with open(f'pages/en/{page["name"]}.html') as f:
-                pageHtml = f.read()
+                pageHtml = "<div><img src='/img/students_bug.jpg' alt='Students found the bug' /></div>"
+                pageHtml += f.read()
                 html = buildPage(page['name'], page['titleEN'], pageHtml, page['style'], templateEN)
                 f = open(f'site/en/{page["name"]}.html', 'w')
                 f.write(html)

dogadjaji.csv

@@ -198,15 +198,39 @@ datum, vreme, lokacija, tema, tip, link
 29-10-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radionica lemljenja, workshop, https://forum.dmz.rs/t/lemljenje/777/1
 30-10-2024, 18:00, Matematički fakultet (Učionica 251) https://www.openstreetmap.org/node/12291697569, Linux install day, workshop, https://forum.dmz.rs/t/linux-install-day/803
 4-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
-5-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, SYSTEMD - da/ne/zašto ne i alternative, lecture, https://forum.dmz.rs/t/plan-za-novembar-2024/785/4?u=wingaxe
+5-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, SYSTEMD - da/ne/zašto ne i alternative, lecture, https://forum.dmz.rs/t/plan-za-novembar-2024/785/4
 11-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
-12-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Don’t be afraid of pointers, lecture, https://forum.dmz.rs/t/ne-boj-se-pointera-dont-be-afraid-of-pointers-predavanje/807
+12-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Dont be afraid of pointers, lecture, https://forum.dmz.rs/t/ne-boj-se-pointera-dont-be-afraid-of-pointers-predavanje/807
 13-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, Makefiles (en), lecture,
 18-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to Security Auditing, lecture,
 19-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, LAN party, party, https://forum.dmz.rs/t/lan-party/126
 20-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, 30 reasons to use Zig, lecture, https://forum.dmz.rs/t/intro-to-zig-or-30-reasons-you-should-start-using-zig/696
 25-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski Hackaton, hack, https://wiki.dmz.rs/en/decentrala/dogadjaji/hakaton
 26-11-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Tiny Keyboards Explained - 28 keys are enough, lecture,
-27-11-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #1: Osnove, lecture,
-04-12-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #2: SDF renderovanje, lecture,
-11-12-2024, 18:00, Matematički fakultet (N251) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #3: Kompleksna analiza, lecture,
+27-11-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #1: Osnove, lecture,
+02-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, https://wiki.dmz.rs/decentrala/dogadjaji/lightningtalks
+03-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
+04-12-2024, 18:00, Matematički fakultet (Učionica 153) https://www.openstreetmap.org/node/12291697569, OpenGL šejderi #2: SDF renderovanje, lecture,
+09-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Ne treba nam (toliko) Javascript, lecture,
+10-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Creating Interactive Fiction with TADS (en), lecture,
+11-12-2024, 18:00, DC Krov https://www.openstreetmap.org/node/10594728522, OpenGL šejderi #3: Kompleksna analiza, lecture,
+16-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Softverski hakaton, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
+17-12-2024, 18:00, DC Krov https://www.openstreetmap.org/node/10594728522, Verifiable Computing Project - Truly Open Source Hardware (en), lecture, https://forum.dmz.rs/t/plan-za-decembar-2024/815/29
+17-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack, https://forum.dmz.rs/t/hardware-hackathon-novembar/832
+18-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Git basics (en), lecture,
+23-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Osnove Elektrotehnike (OET), lecture,
+24-12-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Praznicno-novogodisnji izazov u kodiranju 2024, hack,
+13-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+14-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardware hackathon, hack, https://wiki.dmz.rs/decentrala/dogadjaji/hakaton
+20-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Parser combinators (Haskel introduction hard way), lecture,
+21-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin vežbe, workshop, https://wiki.dmz.rs/en/sysadmin
+27-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Svet van linuxa, lecture,
+28-01-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OpenStreetMap editovanje, meeting, https://osmcal.org/event/3355/
+03-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Gaming audio, lecture,
+04-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Guitar pedals, lecture workshop,
+10-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
+11-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, TIC-80 gamejam, hack, https://forum.dmz.rs/t/tic-80-game-jam/946
+17-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin radionica, workshop,
+18-02-2025, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Tumbleweed board game implementation (Rust/MCTS/GGEZ), lecture,
+24-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Idejno-politička diskusija, discussion,
+25-02-2025, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Intro to 3d printing, lecture,

pages/en/events.html

@@ -1,3 +0,0 @@
-<h1>Events</h1>
-<p>Following list contains all forthcoming events. Held events are listed in <a href="/en/events_archive">archive</a>.</p><br>
-<p>We also provide <a href="https://dmz.rs/events.ical">ical file</a></p><br>

pages/sr/events.html

@@ -1,4 +0,0 @@
-<h1>Događaji</h1>
-<p>Naredna lista sadrži sve predstojeće događaje. Za listu održanih događaja pogledaj <a href="/events_archive">arhivu</a>.</p><br>
-<p>Događaje možeš učitati i sa <a href="https://dmz.rs/events.ical">ical</a> datotekom.</p><br>
-

prep.py

@@ -107,6 +107,13 @@ def build_ical(events: list[dict]) -> str:
         event_template = event_template.replace("<!--DATE-->", date)
         event_template = event_template.replace("<!--TITLE-->", title)
         event_template = event_template.replace("<!--URL-->", url)
+        if location.startswith("DC Krov"):
+            event_template = event_template.replace("<!--LOCATION-->", "DC Krov\\, Kraljice Marije 47\\, 6\\, Beograd\\, Serbia")
+        elif location.startswith("Matematički fakultet (Učionica 153)"):
+            event_template = event_template.replace("<!--LOCATION-->", "Matematički fakultet\\, Svetog Nikole 39\\, Beograd\\, Serbia")
+        else:
+            event_template = event_template.replace("<!--LOCATION-->", "")
+
 
         events_ical += event_template
     # Footer
@@ -134,7 +141,7 @@ for key, value_pair in TYPES_DICT.items():
 
 # Build Serbian Events page
 new_events_html = build_html(new_events, DAYS_SR, sr_types)
-with open("pages/sr/events.html", "r") as file:
+with open("template/events-sr.html", "r") as file:
     page_template = ([line for line in file])
 
 with open("pages/sr/events.html", "w") as file:
@@ -142,7 +149,7 @@ with open("pages/sr/events.html", "w") as file:
 
 # Build English Events page
 new_events_html = build_html(new_events, DAYS_EN, en_types)
-with open("pages/en/events.html", "r") as file:
+with open("template/events-en.html", "r") as file:
     page_template = ([line for line in file])
 
 with open("pages/en/events.html", "w") as file:
@@ -150,7 +157,7 @@ with open("pages/en/events.html", "w") as file:
 
 # Build Serbian Archive page
 past_events_html = build_html(past_events, DAYS_SR, sr_types)
-with open("pages/sr/events_archive.html", "r") as file:
+with open("template/events_archive-sr.html", "r") as file:
     page_template = ([line for line in file])
 
 with open("pages/sr/events_archive.html", "w") as file:
@@ -158,7 +165,7 @@ with open("pages/sr/events_archive.html", "w") as file:
 
 # Build English Archive page
 past_events_html = build_html(past_events, DAYS_EN, en_types)
-with open("pages/en/events_archive.html", "r") as file:
+with open("template/events_archive-en.html", "r") as file:
     page_template = ([line for line in file])
 
 with open("pages/en/events_archive.html", "w") as file:

requirements.txt

@@ -1,4 +0,0 @@
-cairosvg
-markdown
-freetype-py
-python-dateutil

template/event.ical

@@ -6,7 +6,7 @@ DTSTART;TZID=Europe/Belgrade:<!--DATE-->
 DTEND;TZID=Europe/Belgrade:<!--DATE-->
 GEO:+44.805613;+20.479234
 LAST-MODIFIED:<!--CREATED-->
-LOCATION:DC Krov\, Kraljice Marije 47\, 6\, Beograd\, Serbia
+LOCATION:<!--LOCATION-->
 STATUS:CONFIRMED
 SUMMARY:<!--TITLE-->
 URL;TYPE=URI:<!--URL-->

template/events-en.html

@@ -0,0 +1,8 @@
+<h1>Events</h1>
+<p>
+  Following list contains all forthcoming events. Held events are listed in
+  <a href="/en/events_archive">archive</a>.
+</p>
+<br />
+<p>We also provide <a href="https://dmz.rs/events.ical">ical file</a></p>
+<br />

template/events-sr.html

@@ -0,0 +1,11 @@
+<h1>Događaji</h1>
+<p>
+  Naredna lista sadrži sve predstojeće događaje. Za listu održanih događaja
+  pogledaj <a href="/events_archive">arhivu</a>.
+</p>
+<br />
+<p>
+  Događaje možeš učitati i sa
+  <a href="https://dmz.rs/events.ical">ical</a> datotekom.
+</p>
+<br />

template/page-en.html

@@ -52,6 +52,7 @@
     <nav>
       <a href="/en/events">Events</a>
       <a href="/en/services">Services</a>
+      <a href="/en/statute">Statute</a>
       <a href="/en/about">About</a>
       <a href="/en/account">Account</a>
       <a href="/en/donations">Donations</a>

template/page-sr.html

@@ -52,6 +52,7 @@
     <nav>
       <a href="/events">Događaji</a>
       <a href="/services">Servisi</a>
+      <a href="/statute">Statut</a>
       <a href="/about">O nama</a>
       <a class="account" href="/account">Nalog</a>
       <a href="/donations">Donacije</a>