hugo/website2
2
0
Fork 0
forked from Decentrala/website
Code Pull Requests Activity

Compare commits

base: hugo:e17f94e214da307a40f08538cc03853ee2940f92
Branches Tags
hugo:master
hugo:poster
hugo:v3.0
hugo:markdown
hugo:v4.0
hugo:v2.0
Decentrala:master
Decentrala:fix/fix-dont-commit-events-page-html
Decentrala:requirements
Decentrala:Makefiles
Decentrala:feat/statute-link-on-navbar
Decentrala:v3.0
Decentrala:poster
Decentrala:markdown
Decentrala:v4.0
Decentrala:v2.0
...
compare: hugo:e118b49e8e8e79130824033cfb75ad595856aa65
Branches Tags
hugo:master
hugo:poster
hugo:v3.0
hugo:markdown
hugo:v4.0
hugo:v2.0
Decentrala:master
Decentrala:fix/fix-dont-commit-events-page-html
Decentrala:requirements
Decentrala:Makefiles
Decentrala:feat/statute-link-on-navbar
Decentrala:v3.0
Decentrala:poster
Decentrala:markdown
Decentrala:v4.0
Decentrala:v2.0

6 Commits
e17f94e214 ... e118b49e8e

Author SHA1 Message Date
Hugo
e118b49e8e Add some links 2024-07-28 22:05:39 +02:00
hugo
8ae1c229c2 Merge pull request 'add an ability to add links to events' (#24) from mkevac/website:master into master 
Reviewed-on: Decentrala/website#24
 2024-07-28 19:53:01 +00:00
Marko Kevac
4d843a1254 add an ability to add links to events 2024-07-25 20:47:34 +02:00
fram3d
a60280756a
update events 2024-07-13 11:32:54 +02:00
Hugo
ce0aecea04 fix 2024-07-07 18:24:03 +02:00
fram3d
7887c7bb17
add gig to events 2024-07-07 13:13:51 +02:00
2 changed files with 21 additions and 11 deletions
Show Stats Expand all files Collapse all files

19
dogadjaji.csv
View File

@ -1,4 +1,4 @@
datum, vreme, lokacija, tema, tip, datum, vreme, lokacija, tema, tip, link
20-12-2022, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u računarske mreže, , 20-12-2022, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u računarske mreže, ,
03-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon žurka, hack, 03-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hackathon žurka, hack,
16-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Privatnost na internetu, workshop, 16-01-2023, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Privatnost na internetu, workshop,
@ -121,7 +121,7 @@ datum, vreme, lokacija, tema, tip,
19-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u PCB, , 19-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Uvod u PCB, ,
25-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop, 25-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Arduino, workshop,
26-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, (La)TeX, lecture, 26-03-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, (La)TeX, lecture,
01-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, La Jetée, movie, 01-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, La Jetée (1962), movie, https://en.wikipedia.org/wiki/La_Jet%C3%A9e
01-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (ideološki), meeting, 01-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (ideološki), meeting,
02-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, 02-04-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
02-04-2024, 21:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (strateški), meeting, 02-04-2024, 21:00, DC Krov https://www.openstreetmap.org/node/10594728522, Decentrala sastanak (strateški), meeting,
@ -137,14 +137,14 @@ datum, vreme, lokacija, tema, tip,
30-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radna grupa Konferencija, meeting, 30-04-2024, 20:00, DC Krov https://www.openstreetmap.org/node/10594728522, Radna grupa Konferencija, meeting,
06-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (proxmox instalacija), workshop, 06-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (proxmox instalacija), workshop,
07-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Free software vs open source, lecture, 07-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Free software vs open source, lecture,
13-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Alphaville (1965), movie, 13-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Alphaville (1965), movie, https://en.wikipedia.org/wiki/Alphaville_(film)
14-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, 14-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
20-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ssl cronjob scp), lecture, 20-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ssl cronjob scp), lecture,
21-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton (radna akcija), hack, 21-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton (radna akcija), hack,
27-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #3, lecture, 27-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #3, lecture,
28-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija, meeting, 28-05-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna revizija, meeting,
02-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ejabberd/xmpp server), workshop, 02-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ejabberd/xmpp server), workshop,
03-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pi (1998), movie, 03-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Pi (1998), movie, https://en.wikipedia.org/wiki/Pi_(film)
04-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack, 04-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hardverski hakaton, hack,
09-06-2024, 14:00, DC Krov https://www.openstreetmap.org/node/10594728522, Game Jam, hack, 09-06-2024, 14:00, DC Krov https://www.openstreetmap.org/node/10594728522, Game Jam, hack,
10-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Obrada prirodnih jezika kroz Python, lecture, 10-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Obrada prirodnih jezika kroz Python, lecture,
@ -153,7 +153,7 @@ datum, vreme, lokacija, tema, tip,
18-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Softverski hakaton, hack, 18-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Softverski hakaton, hack,
24-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #4, lecture, 24-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Home-made SoC #4, lecture,
25-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna bleja i revizija, meeting, 25-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Mesečna bleja i revizija, meeting,
29-06-2024, 20:00, Dunavski park https://osm.org/go/xf3SLRlmR-, Uticaj tehnologije na prirodu, discussion, 29-06-2024, 20:00, Dunavski park https://osm.org/go/xf3SLRlmR-, Uticaj tehnologije na prirodu, discussion, https://forum.dmz.rs/t/uticaj-tehnologije-na-prirodu/616
30-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ldap server/nalozi korisnika), workshop, 30-06-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Sysadmin obuka (ldap server/nalozi korisnika), workshop,
01-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, 1984 (1956), movie 01-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, 1984 (1956), movie
02-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Open-source SoC, lecture, 02-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Open-source SoC, lecture,
@ -161,7 +161,8 @@ datum, vreme, lokacija, tema, tip,
08-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting, 08-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Lightning talks, lighting,
09-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton, hack, 09-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Hakaton, hack,
12-07-2024, 15:00, KC Gnezdo https://osm.org/go/xftd8rbl2, Uticaj tehnologije na kulturu, lecture, 12-07-2024, 15:00, KC Gnezdo https://osm.org/go/xftd8rbl2, Uticaj tehnologije na kulturu, lecture,
14-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Napadi na vestacku inteligenciju, lecture discussion 14-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, Napadi na veštačku inteligenciju, lecture discussion
29-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OnionShare, lecture 29-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, OnionShare, lecture, https://forum.dmz.rs/t/plan-za-jul-2024/612/17?u=mkevac
30-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #1, workshop 30-07-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, CryptoPals #1, workshop, https://forum.dmz.rs/t/cryptopals-u-decentrali/620
15-09-2024, 12:00, KC Magacin https://www.openstreetmap.org/node/1226456745#map=19/44.81314/20.45378, Dekonferencija, conference, 15-08-2024, 19:00, DC Krov https://www.openstreetmap.org/node/10594728522, GETÖSEFÖHN, music
15-09-2024, 12:00, KC Magacin https://www.openstreetmap.org/node/1226456745#map=19/44.81314/20.45378, Dekonferencija, conference, https://dmz.rs/deconference

Can't render this file because it has a wrong number of fields in line 30.

13
prep.py
View File

@ -14,6 +14,7 @@ TYPES_DICT = {
"movie": ("film", "movie"), "movie": ("film", "movie"),
"meeting": ("sastanak", "meeting"), "meeting": ("sastanak", "meeting"),
"conference": ("konferencija", "conference"), "conference": ("konferencija", "conference"),
"music": ("svirka", "gig"),
} }
def load_events(csv_path:str) -> list[dict]: def load_events(csv_path:str) -> list[dict]:
@ -28,11 +29,16 @@ def load_events(csv_path:str) -> list[dict]:
event_location = event[2] event_location = event[2]
event_title = event[3] event_title = event[3]
types = event[4].split() types = event[4].split()
try:
link = event[5]
except IndexError:
link = ""
current_event = {"date":event_date_parsed, current_event = {"date":event_date_parsed,
"time":event_time, "time":event_time,
"location": event_location, "location": event_location,
"title":event_title.strip(), "title":event_title.strip(),
"types": types } "types": types,
"link": link}
events.append(current_event) events.append(current_event)
return events return events
@ -46,7 +52,10 @@ def build_html(events: list[dict], dayNames: list[str], typesNames: dict) -> str
time = event["time"]+"h" time = event["time"]+"h"
event_html = [] event_html = []
event_html.append(f"<div class='date'>{date} {time}</div>") event_html.append(f"<div class='date'>{date} {time}</div>")
event_html.append(f"<div class='title'>{title}</div>") if event["link"] != "":
event_html.append(f"<div class='title'><a href=\"{event['link']}\">{title}</a></div>")
else:
event_html.append(f"<div class='title'>{title}</div>")
if "https://" in location: if "https://" in location:
place,link = location.split("https://") place,link = location.split("https://")
event_html.append(f"<div class='place'><a href=\"https://{link}\">@{place.strip()}</a></div>") event_html.append(f"<div class='place'><a href=\"https://{link}\">@{place.strip()}</a></div>")