add event generation to atom_gen.py

Reviewed-on: eline/decentrala-website-static-new#5

.gitignore

@@ -1 +1,5 @@
 venv/
+poster.html
+poster.pdf
+atom_blog.xml
+atom_events.xml

atom_gen.py

@@ -0,0 +1,73 @@
+#! /usr/bin/python3
+
+# needs lowdown and feegden installed
+# feedgen can be installed with pip
+# also expects that *.md files are in blog/ directory
+
+from feedgen.feed import FeedGenerator
+import datetime
+import subprocess
+import os
+
+blogs_dir = os.fsencode("blog")
+
+def blogposts_list_gen():
+    output_list = []
+    for file in os.listdir(blogs_dir):
+        filename = os.fsdecode(file)
+        if filename.endswith(".md"):
+            full_path = "blog/" + filename
+
+            author = subprocess.run("lowdown -X author " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+            title = subprocess.run("lowdown -X title " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+            time = subprocess.run("lowdown -X time " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+            content_html = subprocess.run("lowdown " + full_path, capture_output=True, shell=True, text=True).stdout.strip()
+
+            output_list.append([author, title, time, content_html, full_path])
+    return output_list
+
+def events_list_gen():
+    output_list = []
+    events_file = open("dogadjaji.csv", "r")
+    for line in events_file.readlines():
+            date, time, location, title = line.split(", ")
+            author = "Decentrala"
+            content_html = f"Event is taking place at {location} on {date} at {time}. For more information see the forum at https://forum.dmz.rs"
+
+            output_list.append([author, title, content_html])
+    events_file.close()
+    return output_list
+
+def feedgen(blogs, events):
+    fg_blog = FeedGenerator()
+    fg_blog.id('http://dmz.rs/')
+    fg_blog.title('Decentrala Blog')
+    fg_blog.author( {'name':'Decentrala','email':'dmz@dmz.rs'} )
+    fg_blog.link( href='https://dmz.rs/atom_blog.xml', rel='self' )
+
+    fg_events = FeedGenerator()
+    fg_events.id('http://dmz.rs/')
+    fg_events.title('Decentrala Blog')
+    fg_events.author( {'name':'Decentrala','email':'dmz@dmz.rs'} )
+    fg_events.link( href='https://dmz.rs/atom_events.xml', rel='self' )
+
+    for post in blogs:
+        fe_blogs = fg_blog.add_entry()
+        fe_blogs.id("https://dmz.rs/" + post[4][:-3] + ".html")
+        fe_blogs.author({'name': post[0]})
+        fe_blogs.title(post[1])
+        fe_blogs.updated(post[2])
+        fe_blogs.content(content=post[3], type='html')
+
+    for event in events:
+        fe_events = fg_events.add_entry()
+        fe_events.id("https://dmz.rs/pages/events.html")
+        fe_events.author({'name': event[0]})
+        fe_events.title(event[1])
+        fe_events.updated(datetime.datetime.now(datetime.timezone.utc))
+        fe_events.content(content=event[2], type='html')
+
+    fg_blog.atom_file('atom_blog.xml')
+    fg_events.atom_file('atom_events.xml')
+
+feedgen(blogposts_list_gen(), events_list_gen())

blogs/Lorem Ipsum.html

@@ -1,43 +0,0 @@
-<h1>Nulla possent lacrimas huius</h1>
-<h2>Fratres quoque</h2>
-<p>Lorem markdownum pariter: lata per tuae quo salus rorant septemfluus mecum
-  summisque feres potes Ulixes. Aeacus Tritonida reicere non convocat pariter
-  neque arma refovet quoque stabunt in. Velamina inrita, silvestribus, ut sarcina
-  memori, bellaque dummodo.</p>
-<p>Factis dixit macies coissent! Nactasque molliter quam in memorant velamine;
-  praemia mundi <em>illo</em> Achille <strong>de</strong>.</p>
-<h2>Velut Procrin</h2>
-<p>Vobis <a href="http://www.palmae.net/aquis-inmota.html">grave</a> fessos ita Belides; poena
-  hora oculis celebrandaque audita guttur ad custodia exprobravit. Pacis monuere
-  et crimen loquor <em>contigit quae</em>! Nondum iudex, auro moratur rogaberis manet.
-  Faciem in dolor adusque, sum soror pectoris in reppulit superest caesis, Hebrum
-  e natura sonabunt. Incensaque An monitae, in animoque vulnerat terra cavo
-  torquet qui humili perque, cristis alii fruitur adacto.</p>
-<ul>
-  <li>Est velavit idem</li>
-  <li>Naupliades tenebant instanti ense iactura ut nutantem</li>
-  <li>Miserarum corpore habet</li>
-</ul>
-<h2>Ad utque sic Charybdis iamque sequenti genitore</h2>
-<p>Hesperien arida. Tibi caelo clavigeram saxoque capillos doleamne faveas testes
-  senex <strong>rudente lacrimis</strong> insula Cnosiacaeque? Dant ablato adulterium gemino,
-  pluvialibus una, dependent iactura illum redit atque dixi pondera. Eumque
-  sanguis errare, formasque parabat volubilibus satis creaverat dextera Iuppiter
-  te sero, est. Opem duceret quam tum pollentibus ramumque tauri; at Saturnia
-  erigitur imitamine ferens adunca delapsaque viminis, terras.</p>
-<h2>Denique ostendit femina tamen</h2>
-<p>Telum in ab utque ut et mihi <strong>auras Midan</strong> meo genus membra comites ne. Orbis
-  via necis. Romana deus, sub frangunt furor crepuscula equorum Teleboasque templa
-  virgineumque belua obsita est. Fragorem Somnus; ducebas placido oscula.</p>
-<blockquote>
-  <p>Inmota manifesta producit, inquit verbisque fluctus iamque, quo fuerat ipse
-    nostra, iussit <strong>nec tenebat</strong>. Pars procul, pietate crinales meus <em>totiens</em>
-    haustus frondes, per sedebat. Domum vincite.</p>
-</blockquote>
-<h2>De curaque quoque reddat numina quae veniam</h2>
-<p>Fessus iacit tantum elimat a medios vinoque finita adspergine liquerat munere
-  vultibus Atridae pecus positoque reluxit. Veniebat videtur laesae quod vacca,
-  lolium neu Perseus fraude nominibus contraria.</p>
-<p>Parat <strong>ferus</strong> in actis terebrata animaeque <strong>quoque</strong>, deos et morte agitantem
-  ore. Proelia casus Gryneus. Quis mihi <em>ille cur</em> Assyrius per siquis, ille
-  Hecabe Arethusa, erigite perfectis.</p>

blogs/Lorem Ipsum.md

@@ -1,53 +0,0 @@
-# Nulla possent lacrimas huius
-
-## Fratres quoque
-
-Lorem markdownum pariter: lata per tuae quo salus rorant septemfluus mecum
-summisque feres potes Ulixes. Aeacus Tritonida reicere non convocat pariter
-neque arma refovet quoque stabunt in. Velamina inrita, silvestribus, ut sarcina
-memori, bellaque dummodo.
-
-Factis dixit macies coissent! Nactasque molliter quam in memorant velamine;
-praemia mundi *illo* Achille **de**.
-
-## Velut Procrin
-
-Vobis [grave](http://www.palmae.net/aquis-inmota.html) fessos ita Belides; poena
-hora oculis celebrandaque audita guttur ad custodia exprobravit. Pacis monuere
-et crimen loquor *contigit quae*! Nondum iudex, auro moratur rogaberis manet.
-Faciem in dolor adusque, sum soror pectoris in reppulit superest caesis, Hebrum
-e natura sonabunt. Incensaque An monitae, in animoque vulnerat terra cavo
-torquet qui humili perque, cristis alii fruitur adacto.
-
-- Est velavit idem
-- Naupliades tenebant instanti ense iactura ut nutantem
-- Miserarum corpore habet
-
-## Ad utque sic Charybdis iamque sequenti genitore
-
-Hesperien arida. Tibi caelo clavigeram saxoque capillos doleamne faveas testes
-senex **rudente lacrimis** insula Cnosiacaeque? Dant ablato adulterium gemino,
-pluvialibus una, dependent iactura illum redit atque dixi pondera. Eumque
-sanguis errare, formasque parabat volubilibus satis creaverat dextera Iuppiter
-te sero, est. Opem duceret quam tum pollentibus ramumque tauri; at Saturnia
-erigitur imitamine ferens adunca delapsaque viminis, terras.
-
-## Denique ostendit femina tamen
-
-Telum in ab utque ut et mihi **auras Midan** meo genus membra comites ne. Orbis
-via necis. Romana deus, sub frangunt furor crepuscula equorum Teleboasque templa
-virgineumque belua obsita est. Fragorem Somnus; ducebas placido oscula.
-
-> Inmota manifesta producit, inquit verbisque fluctus iamque, quo fuerat ipse
-> nostra, iussit **nec tenebat**. Pars procul, pietate crinales meus *totiens*
-> haustus frondes, per sedebat. Domum vincite.
-
-## De curaque quoque reddat numina quae veniam
-
-Fessus iacit tantum elimat a medios vinoque finita adspergine liquerat munere
-vultibus Atridae pecus positoque reluxit. Veniebat videtur laesae quod vacca,
-lolium neu Perseus fraude nominibus contraria.
-
-Parat **ferus** in actis terebrata animaeque **quoque**, deos et morte agitantem
-ore. Proelia casus Gryneus. Quis mihi *ille cur* Assyrius per siquis, ille
-Hecabe Arethusa, erigite perfectis.

img/strelica-closed.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="40"
+   height="40"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <g
+     id="layer1">
+    <path
+       id="path1336"
+       style="fill:#181715;stroke-width:0.504542;fill-opacity:1"
+       d="M 10 0 L 8.8911133 0.57714844 L 8.8862305 0.58544922 L 0.96435547 4.2792969 A 10 10 0 0 0 1.574707 5.3740234 L 7.6362305 2.5473633 L 4.1142578 8.0756836 A 10 10 0 0 0 5.1674805 8.7485352 L 8.6904297 3.21875 L 8.6904297 9.9086914 A 10 10 0 0 0 9.9404297 9.9975586 L 9.9404297 1.2568359 L 9.9453125 1.2490234 L 10 0 z " />
+  </g>
+</svg>

img/strelica-opened.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="40"
+   height="40"
+   viewBox="0 0 10 10"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <g
+     id="layer1">
+    <path
+       id="path1336"
+       style="fill:#181715;fill-opacity:1;stroke-width:0.504542"
+       d="M 5 0.0029296875 L 4.375 1.0859375 L 4.375 1.0952148 L 0.35400391 7.4072266 A 8.75 8.75 0 0 0 1.4614258 7.9956055 L 4.375 3.4213867 L 4.375 8.7265625 A 8.75 8.75 0 0 0 5 8.75 A 8.75 8.75 0 0 0 5.625 8.7265625 L 5.625 3.4213867 L 8.5390625 7.9956055 A 8.75 8.75 0 0 0 9.6464844 7.4072266 L 5.625 1.0952148 L 5.625 1.0859375 L 5 0.0029296875 z " />
+  </g>
+</svg>

index.html

@@ -4,6 +4,7 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="stylesheet" href="/styles/reset.css">
   <link rel="stylesheet" href="/styles/style.css">
   <link rel="stylesheet" href="/styles/home.css">
   <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
@@ -13,63 +14,54 @@
 
 <body>
   <header>
-    <a class="logo" href="/index.html">Decentrala</a>
+    <a id="logo" href="/index.html">Decentrala</a>
     <span>
-      <button id="theme-switcher">turn the lights off</button>
+      <button id="theme-switcher"></button>
       <a class="account" href="/pages/account.html">Nalog</a>
     </span>
   </header>
   <div id="main">
-    <h1>Dobrodosli!</h1>
+    <h1>Dobrodošao!</h1>
     <p>
-      Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog sirenja znanja.
+      Mi smo <em>Decentrala</em> - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja.
-      Zvuci interesantno? Evo jos nekih stvari o nama:
+      Zvuči interesantno? Evo još nekih stvari o nama:
     </p>
     <dl>
       <dt>Znanje:</dt>
-      <dd>Sve nase radionice su besplatne i otvorene za sve zainteresovane, a ako imate nesto sto zelite da
+      <dd>Sve naše radionice su besplatne i otvorene za sve zainteresovane.
-        podelite, najavite se na nasem <a href="https://forum.dmz.rs">Forumu</a> i odrzite radionicu kod nas!</dd>
+        Ako želiš nešto da podeliš najavi se na našem <a href="https://forum.dmz.rs">Forumu</a> i održi radionicu kod nas!</dd>
       <dt>Akcije:</dt>
-      <dd>Povremeno organizujemo razlicite akcije, hakatone, crypto-partije, izlozbe i slicne dogadjaje otvorene za sve
+      <dd>Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve zainteresovane. </dd>
-        zainteresovane. </dd>
       <dt>Servisi:</dt>
-      <dd>Na nasim serverima pokrecemo neke servise (email, git, wiki i druge) koji su otvoreni za sve i koje mozes
+      <dd>Na našim serverima pokrećemo razne servise (email, git, wiki i druge) koji su otvoreni za sve i koji se mogu koristiti sa ili bez našeg naloga.</dd>
-        koristiti sa ili bez naseg naloga.</dd>
-      <dt>Ljudi:</dt>
-      <dd>Lorem ipsum dolor sit amet.</dd>
     </dl>
     <p>
-      Ako si procitao sve i i dalje si zainteresovan, mozes da napravis <a href="/pages/account.html">nalog</a> na nasem
+      Ako si i dalje zainteresovan, možeš napraviti <a href="/pages/account.html">nalog</a> na našem serveru koji će ti omogućiti korišćenje svih naših <a href="/pages/services.html">servisa</a>.
-      serveru koji ce
+      Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših <a href="/pages/events.html">događaja</a>, i tu nas upoznati!
-      ti omoguciti da koristis sve nase <a href="/pages/services.html">servise</a>, a ako prvo hoces da vidis kako to
-      sve izgleda u realnosti, mozes da dodjes na neki od nasih <a href="/pages/events.html">dogadjaja</a>, i tamo nas
-      upoznas!
     </p>
     <img id="mesh" src="/img/mesh-light.svg">
   </div>
   <footer>
     <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </div>
     <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
     <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </span>
     <span class="copyleft">
+      <span class="links">
         <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
             alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
+        <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+        <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
             alt="SourceCode"></a>
         <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
+      </span>
       <span>Decentrala &copy; 2023</span>
     </span>
   </footer>

pages/account.html

@@ -15,35 +15,38 @@
   <header>
     <a class="logo" href="/index.html">Decentrala</a>
     <span>
-      <button id="theme-switcher">turn the lights off</button>
+      <button id="theme-switcher"></button>
       <a class="account" href="/pages/account.html">Nalog</a>
     </span>
   </header>
   <div id="main">
-    Ova stranica je trenutno u izradi...
+    <p> Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server i ostale servise koji podrzavaju LDAP login. <p>
+    <p> Za vise o XMPP pogledajte <a href="https://wiki.dmz.rs/en/tutorial/conversations">tutorial</a>. <p>
+    <p> Za primer podesavanja na <a href="https://thunderbird.org">Thundebird</a> mail klijentu mozete pogledati <a href="/img/mailsettings.png">sliku</a>. <p>
+
+    <p><a href="/account/register/">Registruj se</a><p>
+    <p><a href="/account/unregister/">Izbrisi nalog</a><p>
+    <p><a href="/account/changepassword/">Promeni lozinku</a><p>
+
     <img id="mesh" src="/img/mesh-light.svg">
   </div>
   <footer>
     <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </div>
     <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
     <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </span>
     <span class="copyleft">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
           alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
+      <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
           alt="SourceCode"></a>
       <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
       <span>Decentrala &copy; 2023</span>

pages/blog.html

@@ -15,7 +15,7 @@
   <header>
     <a class="logo" href="/index.html">Decentrala</a>
     <span>
-      <button id="theme-switcher">turn the lights off</button>
+      <button id="theme-switcher"></button>
       <a class="account" href="/pages/account.html">Nalog</a>
     </span>
   </header>
@@ -25,25 +25,21 @@
   </div>
   <footer>
     <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </div>
     <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
     <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </span>
     <span class="copyleft">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
           alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
+      <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
           alt="SourceCode"></a>
       <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
       <span>Decentrala &copy; 2023</span>

pages/contact.html

@@ -15,40 +15,36 @@
   <header>
     <a class="logo" href="/index.html">Decentrala</a>
     <span>
-      <button id="theme-switcher">turn the lights off</button>
+      <button id="theme-switcher"></button>
       <a class="account" href="/pages/account.html">Nalog</a>
     </span>
   </header>
   <div id="main">
     <h1>Kontakt</h1>
-    <p>Mozes nam poslati mail na <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se mozes pridruziti nasem <a
+    <p>Možeš nam poslati mail na <a href="mailto:dmz@dmz.rs">dmz@dmz.rs</a> ili se mozes pridružiti našem <a
         href="https://forum.dmz.rs">Forumu</a>.</p>
-    <p>Takodje smo i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
+    <p>Takođe smo i na <a href="https://balkan.fedive.rs/@decentrala">Fediversu!</a></p>
     <p style="position: relative; top: 5rem;">U slucaju da nadjete <em>bug</em> na sajtu, bili bismo jako zahvalni
       ako bi mogli da nam ga prijavite (npr. putem emaila).</p>
     <img id="mesh" src="/img/mesh-light.svg">
   </div>
   <footer>
     <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </div>
     <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
     <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </span>
     <span class="copyleft">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
           alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
+      <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
           alt="SourceCode"></a>
       <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
       <span>Decentrala &copy; 2023</span>

pages/events.html

@@ -15,7 +15,7 @@
   <header>
     <a class="logo" href="/index.html">Decentrala</a>
     <span>
-      <button id="theme-switcher">turn the lights off</button>
+      <button id="theme-switcher"></button>
       <a class="account" href="/pages/account.html">Nalog</a>
     </span>
   </header>
@@ -74,24 +74,20 @@
   <footer>
     <div id="sections-menu">
       <a href="/pages/events.html">Dogadjaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </div>
     <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
     <span class="sections">
       <a href="/pages/events.html">Dogadjaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </span>
     <span class="copyleft">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
           alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
+      <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
           alt="SourceCode"></a>
       <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
       <span>Decentrala &copy; 2023</span>

pages/projects.html

@@ -15,7 +15,7 @@
   <header>
     <a class="logo" href="/index.html">Decentrala</a>
     <span>
-      <button id="theme-switcher">turn the lights off</button>
+      <button id="theme-switcher"></button>
       <a class="account" href="/pages/account.html">Nalog</a>
     </span>
   </header>
@@ -25,25 +25,21 @@
   </div>
   <footer>
     <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </div>
     <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
     <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </span>
     <span class="copyleft">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
           alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
+      <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
           alt="SourceCode"></a>
       <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
       <span>Decentrala &copy; 2023</span>

pages/services.html

@@ -15,7 +15,7 @@
   <header>
     <a class="logo" href="/index.html">Decentrala</a>
     <span>
-      <button id="theme-switcher">turn the lights off</button>
+      <button id="theme-switcher"></button>
       <a class="account" href="/pages/account.html">Nalog</a>
     </span>
   </header>
@@ -28,7 +28,7 @@
       </tr>
       <tr>
         <td><a href="">Email</a></td>
-        <td>Email nalog koji mozes koristiti putem naseg <a href="/index.html">mail web interfejsa</a> ili na bilo kom
+        <td>Email nalog koji mozes koristiti putem na bilo kom
           email
           klijentu generalne namene, na primer <a href="https://www.thunderbird.net/">Thunderbird-u</a>. Bolji od
           Gmail-a. </td>
@@ -58,6 +58,21 @@
             href="/pages/projects.html">projekte</a> kao i
           ostale <a href="/pages/events.html">dogadjaje</a>. </td>
       </tr>
+      <tr>
+        <td><a href="https://search.dmz.rs/">Search</a></td>
+        <td><a href="https://github.com/hnhx/librex/">LibreX</a> instanca koju koristimo da pretrazujemo Internet. Bolji od Google-a.
+          </td>
+      </tr>
+      <tr>
+        <td><a href="https://pastebin.dmz.rs/">Pastebin</a></td>
+        <td><a href="https://privatebin.info/">PrivateBin</a> instanca koju koristimo za brzo deljenje tekstualnih fajlova
+          </td>
+      </tr>
+      <tr>
+        <td><a href="ssh://soft.dmz.rs:2222/">Soft Serve</a></td>
+        <td><a href="https://github.com/charmbracelet/soft-serve">Soft Serve</a> instanca koju koristimo kao zamenu za Gitea koja radi potpuno iz terminala
+          </td>
+      </tr>
     </table>
     <p>Ovo su neki od servisa koje trenutno odrzavamo na nasim serverima. Da bi koristio ove servise, <em>mozes</em> se
       registrujes za svaki servis posebno, ali mozes i da da napravis <a href="/pages/account.html">nalog</a> na nasem
@@ -66,25 +81,21 @@
   </div>
   <footer>
     <div id="sections-menu">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
       <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
-      <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </div>
     <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
     <span class="sections">
-      <a href="/pages/events.html">Dogadjaji</a>
+      <a href="/pages/events.html">Događaji</a>
-      <a href="/pages/projects.html">Projekti</a>
-      <a href="/pages/blog.html">Blog</a>
       <a href="/pages/services.html">Servisi</a>
       <a href="/pages/contact.html">Kontakt</a>
     </span>
     <span class="copyleft">
       <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
           alt="CreativeCommons"></a>
-      <a href=""><img src="/img/w-light.svg" alt="Webring"></a>
+      <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
-      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+      <a href="https://gitea.dmz.rs/Decentrala/website"><img src="/img/git-light.svg"
           alt="SourceCode"></a>
       <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
       <span>Decentrala &copy; 2023</span>

pages/webring.html

@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="stylesheet" href="/styles/style.css">
+  <link rel="stylesheet" href="/styles/projects.css">
+  <link rel="shortcut icon" href="/img/favicon.ico" type="image/x-icon">
+  <script src="/scripts/main.js" defer></script>
+  <title>Decentrala - Projekti</title>
+</head>
+
+<body>
+  <header>
+    <a class="logo" href="/index.html">Decentrala</a>
+    <span>
+      <button id="theme-switcher"></button>
+      <a class="account" href="/pages/account.html">Nalog</a>
+    </span>
+  </header>
+  <div id="main">
+    <list>
+    <li> <a href="https://tilde.zone/explore">Tilde Zone</a> </li>
+    </list>
+  </div>
+  <footer>
+    <div id="sections-menu">
+      <a href="/pages/events.html">Događaji</a>
+      <a href="/pages/services.html">Servisi</a>
+      <a href="/pages/contact.html">Kontakt</a>
+    </div>
+    <button id="sections-button" opened="false"><img src="/img/strelica-closed-light.svg" alt="OpenMenu"></button>
+    <span class="sections">
+      <a href="/pages/events.html">Događaji</a>
+      <a href="/pages/services.html">Servisi</a>
+      <a href="/pages/contact.html">Kontakt</a>
+    </span>
+    <span class="copyleft">
+      <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="/img/cc-light.svg"
+          alt="CreativeCommons"></a>
+      <a href="/pages/webring.html"><img src="/img/w-light.svg" alt="Webring"></a>
+      <a href="https://gitea.dmz.rs/eline/decentrala-website-static-new"><img src="/img/git-light.svg"
+          alt="SourceCode"></a>
+      <a href="https://balkan.fedive.rs/@decentrala"><img src="/img/mastodon-light.svg" alt="Mastodon"></a>
+      <span>Decentrala &copy; 2023</span>
+    </span>
+  </footer>
+</body>
+
+</html>

poster.py

@@ -5,8 +5,9 @@ from dateutil import relativedelta
 EVENTS_CSV_PATH = "dogadjaji.csv"
 CURRENT_TIME = dt.date.today()
 NEXT_MONTH = CURRENT_TIME + relativedelta.relativedelta(months=1, day=1)
-DAYS_OF_WEEK_SR = ("PON", "UTO", "SRE", "CET", "PET", "SUB", "NED")
+DAYS_OF_WEEK_SR = ("PON", "UTO", "SRE", "ČET", "PET", "SUB", "NED")
-MONTHS_SR = ("Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul", "Avgust", "Septembar", "Oktobar", "Novembar", "Decembar")
+MONTHS_SR = ("Januar", "Februar", "Mart", "April", "Maj", "Jun", "Jul", "Avgust",\
+            "Septembar", "Oktobar", "Novembar", "Decembar")
 
 def load_events(csv_path:str) -> list[dict]:
     events = []
@@ -20,11 +21,9 @@ def load_events(csv_path:str) -> list[dict]:
             event_title = event[3]
             current_event = {"date":event_date_parsed,
                              "time":event_time,
-                             "title":event_title}
+                             "title":event_title.strip()}
-            
             if event_date_parsed >= NEXT_MONTH:
                 events.append(current_event)
-        
         return events
 
 def render_table(events:list[dict])-> str:
@@ -33,17 +32,22 @@ def render_table(events:list[dict])-> str:
         date = DAYS_OF_WEEK_SR[event["date"].weekday()]
         day = event["date"].day
         title = event["title"]
-        html += f"<tr><td>{date}</td><td>{day}.</td><td>{title}</td></tr>\n"
+        html += f"\t\t\t<tr> <td>{date}</td> <td>{day}.</td> <td>{title}</td> </tr>\n"
     return html
 
 def render_page(table: str) -> str:
-    head = "<head><link rel=\"stylesheet\" href=\"styles/poster.css\"><head>"
+    head = "<head>\n\t<meta charset=\"UTF-8\">\n\t<link rel=\"stylesheet\"\
+href=\"styles/poster.css\">\n<head>"
     header = "<h1>DECENTRALA</h1>"
     subheader = f"<h2>Plan za {MONTHS_SR[NEXT_MONTH.month - 1]}</h2>"
     link = "<div id=link>dmz.rs</div>"
-    p1 = "<p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov u <strong>Kraljice Marije 47</strong>.</p>"
+    p1 = "<p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov\
-    p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah pored menjačnice. DC Krov je na poslednjem spratu.</p>"
+u <strong>Kraljice Marije 47</strong>.</p>"
-    return f"<html>{head}<body><main>{header}{subheader}<table>{table}</table>{p1}{p2}{link}</main></body></html>"
+    p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\
+pored menjačnice. DC Krov je na poslednjem spratu.</p>"
+    return f"<html>\n{head}\n<body>\n\t<main>\n\t\t{header}\n\t\t{subheader}\
+\n\t\t<table>\n{table}\t\t</table>\n\t\t{p1}\n\t\t{p2}\n\t\t{link}\n\t</main>\
+\n</body>\n</html>"
     
 def main():
     events = load_events(EVENTS_CSV_PATH)
@@ -53,6 +57,5 @@ def main():
     f.write(page)
     f.close()
 
-
 if __name__ == "__main__":
     main()

prep.py

@@ -48,7 +48,7 @@ def is_past_event(event):
 
 def load_events():
     events = []
-    with open("dogadjaji.txt", "rt") as file:
+    with open("dogadjaji.csv", "rt") as file:
         file.readline()
         for event in file.readlines():
             event = event.strip()
@@ -57,7 +57,7 @@ def load_events():
     return events
 
 def write_events(events):
-    with open("dogadjaji.txt", "wt") as file:
+    with open("dogadjaji.csv", "wt") as file:
         file.write("datum, vreme, lokacija, tema\n")
         for event in events:
             file.write(event+"\n")
@@ -100,7 +100,7 @@ for event in future_events:
 
 events.append(end)
 
-with open("pages/dogadjaji.html","rt") as file:
+with open("pages/events.html","rt") as file:
     html = file.readlines()
 
 new_html = []
@@ -126,5 +126,5 @@ while i<len(html):
         i+=1
 
 
-with open("pages/dogadjaji.html","wt") as file:
+with open("pages/events.html","wt") as file:
     file.writelines(new_html)

scripts/main.js

@@ -22,7 +22,7 @@ if (theme !== null) {
 }
 
 theme_switcher.addEventListener("click", () => {
-  if (theme_switcher.textContent.indexOf("off") !== -1) {
+  if (theme_switcher.getAttribute("title").indexOf("off") !== -1) {
     changeToDarkTheme();
   } else {
     changeToLightTheme();
@@ -30,7 +30,7 @@ theme_switcher.addEventListener("click", () => {
 });
 
 function changeToDarkTheme() {
-  theme_switcher.textContent = "turn the light on";
+  theme_switcher.setAttribute("title", "turn the light on");
   document.documentElement.style.setProperty("--border", "var(--dark-border)");
   document.documentElement.style.setProperty("--text", "var(--dark-text)");
   document.documentElement.style.setProperty("--bg", "var(--dark-bg)");
@@ -41,7 +41,7 @@ function changeToDarkTheme() {
 }
 
 function changeToLightTheme() {
-  theme_switcher.textContent = "turn the light off";
+  theme_switcher.setAttribute("title", "turn the light off");
   document.documentElement.style.setProperty("--border", "var(--light-border)");
   document.documentElement.style.setProperty("--text", "var(--light-text)");
   document.documentElement.style.setProperty("--bg", "var(--light-bg)");
@@ -84,12 +84,10 @@ window.addEventListener("resize", () => {
   }
 });
 
-main.addEventListener("click", (event) => {
+main.addEventListener("click", () => {
   if (sections_button.getAttribute("opened") === "true") {
     closeMenu();
   }
 });
 
-DEBUG;
+
-console.log(window.innerWidth);
-console.log(window.innerHeight);

styles/poster.css

@@ -40,7 +40,6 @@ h2 {
     font-size: 2rem;
 }
 
-
 p {
     font-size: 1.5rem;
 }

styles/reset.css

@@ -0,0 +1,149 @@
+/* Copyright (c) 2023 Luka Ivanovic */
+/* https://github.com/luka-hash/css-reset */
+/* This code is licensed under MIT licence */
+
+*,
+*::before,
+*::after {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+html,
+body {
+  width: 100%;
+  height: 100%;
+}
+
+a,
+article,
+audio,
+blockquote,
+body,
+canvas,
+caption,
+code,
+dd,
+del,
+details,
+div,
+dl,
+dt,
+em,
+fieldset,
+figcaption,
+figure,
+footer,
+form,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+header,
+hgroup,
+html,
+iframe,
+img,
+ins,
+kbd,
+label,
+legend,
+li,
+mark,
+menu,
+nav,
+ol,
+output,
+p,
+pre,
+s,
+section,
+small,
+span,
+strong,
+sub,
+summary,
+sup,
+table,
+tbody,
+td,
+tfoot,
+th,
+thead,
+time,
+tr,
+ul,
+video {
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+
+article,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+
+body {
+  line-height: 1.5;
+  -webkit-font-smoothing: antialiased;
+}
+
+ol,
+ul {
+  list-style: none;
+}
+
+blockquote {
+  quotes: none;
+}
+
+blockquote::before,
+blockquote::after {
+  content: '';
+  content: none;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+img,
+picture,
+video,
+canvas,
+svg {
+  display: block;
+  max-width: 100%;
+}
+
+input,
+button,
+textarea,
+select {
+  font: inherit;
+}
+
+p,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  overflow-wrap: break-word;
+  hyphens: auto;
+}

styles/style.css

@@ -5,9 +5,7 @@
   --dark-text: #ffffff;
   --dark-bg: #181715;
   --dark-border: #ffffff;
-
   --hightlight: #72dec2;
-
   --border: var(--light-border);
   --text: var(--light-text);
   --bg: var(--light-bg);
@@ -34,10 +32,12 @@ body {
 
 body {
   display: grid;
-  grid-template-columns: 1fr;
+  grid-template:
-  grid-template-rows: 5rem 1fr 5rem;
+    "header" 10vh
-  grid-column-gap: 0px;
+    "main" 1fr
-  grid-row-gap: 0px;
+    "footer" 10vh
+    / 1fr;
+  gap: 0;
   font-family: 'Iosevka';
 }
 
@@ -50,17 +50,17 @@ footer {
 }
 
 header {
-  grid-area: 1 / 1 / 2 / 2;
+  grid-area: "header";
   border-bottom: 2px solid var(--border);
 }
 
 footer {
-  grid-area: 3 / 1 / 4 / 2;
+  grid-area: "footer";
   border-top: 2px solid var(--border);
 }
 
 #main {
-  grid-area: 2 / 1 / 3 / 2;
+  grid-area: "main";
   padding: 3rem 3rem 3rem 3rem;
   font-size: 1.3rem;
   line-height: 2rem;
@@ -85,11 +85,25 @@ a:focus {
   text-decoration: line-through var(--text);
 }
 
-.logo {
+#logo {
-  font-size: 3rem;
+  font-size: 2.5rem;
   font-weight: bold;
+  font-variant: small-caps;
 }
 
+#theme-switcher {
+  border: 3px solid var(--border);
+  width: 1.5rem;
+  height: 1.5rem;
+  border-radius: 3rem;
+  margin-left: auto;
+  background: linear-gradient(90deg, var(--border) 0%, var(--border) 50%, var(--bg) 51%, var(--bg) 100%);
+}
+
+#theme-switcher:hover {
+  border-color: var(--hightlight);
+  background: linear-gradient(90deg, var(--hightlight) 0%, var(--hightlight) 50%, var(--bg) 51%, var(--bg) 100%);
+}
 .account,
 .sections,
 #sections-menu {
@@ -98,27 +112,14 @@ a:focus {
 
 #mesh {
   position: absolute;
-  bottom: 5rem;
+  bottom: 10vh;
   right: 0;
   user-select: none;
   pointer-events: none;
 }
 
-@media screen and (max-height: 860px),
+.links {
-screen and (max-width: 1500px) {
+  display: flex;
-  #mesh {
-    display: none;
-  }
-}
-
-@media screen and (max-width: 1160px) {
-  .sections {
-    display: none;
-  }
-
-  #sections-button {
-    display: block !important;
-  }
 }
 
 #sections-button {
@@ -133,15 +134,13 @@ screen and (max-width: 1500px) {
   border: 2px solid var(--border);
   background-color: var(--bg);
   position: absolute;
-  bottom: calc(5rem - 2px);
+  bottom: calc(10vh - 2px);
-  left: 0;
+  left: calc(0px - 2px);
   align-items: center;
   padding: 2rem 3rem;
   display: none;
 }
 
-
-
 .copyleft a,
 .sections a {
   margin: 0 1rem 0 0;
@@ -165,4 +164,37 @@ button {
   background: var(--bg);
   color: var(--text);
   margin: 0 2rem 0 0;
+  cursor: pointer;
+}
+
+@media screen and (max-height: 860px),
+screen and (max-width: 1500px) {
+  #mesh {
+    display: none;
+  }
+}
+
+@media screen and (max-width: 1160px) {
+  .sections {
+    display: none;
+  }
+
+  #sections-button {
+    display: block !important;
+  }
+}
+
+@media screen and (max-width: 540px) {
+  #logo {
+    font-size: 2.2rem;
+  }
+
+  .links {
+    display: none;
+  }
+
+  header,
+  footer {
+    padding: 0 1rem;
+  }
 }