Decentrala/website
14
1
Fork 10
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

New logo, 404 page, and many fixes #9

Merged
hugo merged 7 commits from hugo/website2:logo into v3.0 2023-08-06 14:31:24 +00:00
Conversation 0 Commits 7 Files Changed 19 +67 -26
15 changed files with 67 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 857d0b4663 - Show all commits

BIN
img/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 66 KiB

17
img/logo-dark.svg Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="20"
height="20"
viewBox="0 0 5.2916667 5.2916666"
version="1.1"
id="svg1"
xml:space="preserve"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs1" /><g
id="layer1"><path
id="path2"
style="fill:#ffffff;fill-opacity:1;stroke-width:0.352999;stroke-linejoin:round"
d="M 2.6434889,0.17372798 A 0.49603044,0.49603044 0 0 0 2.1474722,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,1.1657897 0.49603044,0.49603044 0 0 0 2.9134465,1.0850992 L 4.2150262,2.3807419 A 0.49603044,0.49603044 0 0 0 4.1463813,2.5645005 H 3.1320271 A 0.49603044,0.49603044 0 0 0 2.6434889,2.1505729 0.49603044,0.49603044 0 0 0 2.1604593,2.5645005 H 1.1507581 A 0.49603044,0.49603044 0 0 0 0.66221981,2.1505729 0.49603044,0.49603044 0 0 0 0.16620324,2.646618 0.49603044,0.49603044 0 0 0 0.66221981,3.1426345 0.49603044,0.49603044 0 0 0 1.145021,2.7301914 h 1.0156952 a 0.49603044,0.49603044 0 0 0 0.3724833,0.3949749 l -0.00122,1.0183782 A 0.49603044,0.49603044 0 0 0 2.1474801,4.6219219 0.49603044,0.49603044 0 0 0 2.6434968,5.1179387 0.49603044,0.49603044 0 0 0 3.1395417,4.6219219 0.49603044,0.49603044 0 0 0 3.036274,4.3197964 L 4.326465,3.0364841 A 0.49603044,0.49603044 0 0 0 4.6294466,3.1426345 0.49603044,0.49603044 0 0 0 5.1254634,2.646618 0.49603044,0.49603044 0 0 0 4.6294466,2.1505729 0.49603044,0.49603044 0 0 0 4.3258658,2.257323 L 3.0354385,0.97286893 A 0.49603044,0.49603044 0 0 0 3.1395339,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,0.17372798 Z M 3.1262902,2.7301914 h 1.0203475 a 0.49603044,0.49603044 0 0 0 0.068759,0.1830162 L 2.9144742,4.2072235 A 0.49603044,0.49603044 0 0 0 2.6976917,4.1289593 l 0.0012,-0.9950873 A 0.49603044,0.49603044 0 0 0 3.1262902,2.7301914 Z" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

17
img/logo-light.svg Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="20"
height="20"
viewBox="0 0 5.2916667 5.2916666"
version="1.1"
id="svg1"
xml:space="preserve"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs1" /><g
id="layer1"><path
id="path2"
style="fill:#000000;fill-opacity:1;stroke-width:0.352999;stroke-linejoin:round"
d="M 2.6434889,0.17372798 A 0.49603044,0.49603044 0 0 0 2.1474722,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,1.1657897 0.49603044,0.49603044 0 0 0 2.9134465,1.0850992 L 4.2150262,2.3807419 A 0.49603044,0.49603044 0 0 0 4.1463813,2.5645005 H 3.1320271 A 0.49603044,0.49603044 0 0 0 2.6434889,2.1505729 0.49603044,0.49603044 0 0 0 2.1604593,2.5645005 H 1.1507581 A 0.49603044,0.49603044 0 0 0 0.66221981,2.1505729 0.49603044,0.49603044 0 0 0 0.16620324,2.646618 0.49603044,0.49603044 0 0 0 0.66221981,3.1426345 0.49603044,0.49603044 0 0 0 1.145021,2.7301914 h 1.0156952 a 0.49603044,0.49603044 0 0 0 0.3724833,0.3949749 l -0.00122,1.0183782 A 0.49603044,0.49603044 0 0 0 2.1474801,4.6219219 0.49603044,0.49603044 0 0 0 2.6434968,5.1179387 0.49603044,0.49603044 0 0 0 3.1395417,4.6219219 0.49603044,0.49603044 0 0 0 3.036274,4.3197964 L 4.326465,3.0364841 A 0.49603044,0.49603044 0 0 0 4.6294466,3.1426345 0.49603044,0.49603044 0 0 0 5.1254634,2.646618 0.49603044,0.49603044 0 0 0 4.6294466,2.1505729 0.49603044,0.49603044 0 0 0 4.3258658,2.257323 L 3.0354385,0.97286893 A 0.49603044,0.49603044 0 0 0 3.1395339,0.66974458 0.49603044,0.49603044 0 0 0 2.6434889,0.17372798 Z M 3.1262902,2.7301914 h 1.0203475 a 0.49603044,0.49603044 0 0 0 0.068759,0.1830162 L 2.9144742,4.2072235 A 0.49603044,0.49603044 0 0 0 2.6976917,4.1289593 l 0.0012,-0.9950873 A 0.49603044,0.49603044 0 0 0 3.1262902,2.7301914 Z" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

2
index.html
View File

@ -14,7 +14,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher"></button> <button id="theme-switcher"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

2
pages/account.html
View File

@ -13,7 +13,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

2
pages/blog.html
View File

@ -13,7 +13,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

2
pages/contact.html
View File

@ -13,7 +13,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

2
pages/events.html
View File

@ -13,7 +13,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

2
pages/projects.html
View File

@ -13,7 +13,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

2
pages/services.html
View File

@ -13,7 +13,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

2
pages/webring.html
View File

@ -13,7 +13,7 @@
<body> <body>
<header> <header>
<a id="logo" href="/index.html">Decentrala</a> <a id="logo" href="/index.html"><img src="/img/logo-light.svg" alt="Logo"> Decentrala</a>
<button id="theme-switcher" title="turn light off"></button> <button id="theme-switcher" title="turn light off"></button>
<a class="account" href="/pages/account.html">Nalog</a> <a class="account" href="/pages/account.html">Nalog</a>
</header> </header>

10
poster.html
View File

@ -1,9 +1 @@
<html><head><link rel="stylesheet" href="styles/poster.css"><head><body><main><h1>DECENTRALA</h1><h2>Plan za Avgust</h2><table><tr><td>UTO</td><td>1.</td><td> Tehno veče</td></tr> <html><head><meta charset="UTF-8"><link rel="stylesheet"href="styles/poster.css"><head><body><main><h1>DECENTRALA</h1><h2>Plan za Septembar</h2><table></table><p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krovu <strong>Kraljice Marije 47</strong>.</p><p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmahpored menjačnice. DC Krov je na poslednjem spratu.</p><div id=link><img src="/img/logo-light.svg"> dmz.rs</div></main></body></html>
<tr><td>PON</td><td>7.</td><td> Linux ricing</td></tr>
<tr><td>UTO</td><td>8.</td><td> Lambda račun</td></tr>
<tr><td>PON</td><td>14.</td><td> Linux distro diskusija</td></tr>
<tr><td>UTO</td><td>15.</td><td> Pirati 777 mora</td></tr>
<tr><td>PON</td><td>21.</td><td> Python vežbe</td></tr>
<tr><td>UTO</td><td>22.</td><td> Autentifikacija na internetu</td></tr>
<tr><td>PON</td><td>28.</td><td> Kviz</td></tr>
</table><p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov u <strong>Kraljice Marije 47</strong>.</p><p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah pored menjačnice. DC Krov je na poslednjem spratu.</p><div id=link>dmz.rs</div></main></body></html>

12
poster.py
View File

@ -36,18 +36,18 @@ def render_table(events:list[dict])-> str:
return html return html
def render_page(table: str) -> str: def render_page(table: str) -> str:
head = "<head>\n\t<meta charset=\"UTF-8\">\n\t<link rel=\"stylesheet\"\ head = "<head><meta charset=\"UTF-8\"><link rel=\"stylesheet\"\
href=\"styles/poster.css\">\n<head>" href=\"styles/poster.css\"><head>"
header = "<h1>DECENTRALA</h1>" header = "<h1>DECENTRALA</h1>"
subheader = f"<h2>Plan za {MONTHS_SR[NEXT_MONTH.month - 1]}</h2>" subheader = f"<h2>Plan za {MONTHS_SR[NEXT_MONTH.month - 1]}</h2>"
link = "<div id=link>dmz.rs</div>" link = "<div id=link><img src=\"/img/logo-light.svg\"> dmz.rs</div>"
p1 = "<p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov\ p1 = "<p>Radionice počinju u <strong>19h</strong> u Društvenom centru Krov\
u <strong>Kraljice Marije 47</strong>.</p>" u <strong>Kraljice Marije 47</strong>.</p>"
p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\ p2 = "<p>Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\
pored menjačnice. DC Krov je na poslednjem spratu.</p>" 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}\ footer = f"{p1}{p2}{link}"
\n\t\t<table>\n{table}\t\t</table>\n\t\t{p1}\n\t\t{p2}\n\t\t{link}\n\t</main>\ return f"<html>{head}<body><main>{header}{subheader}\
\n</body>\n</html>" <table>{table}</table>{footer}</main></body></html>"
def main(): def main():
events = load_events(EVENTS_CSV_PATH) events = load_events(EVENTS_CSV_PATH)

12
styles/poster.css
View File

@ -62,7 +62,15 @@ td:nth-child(2) {
} }
#link { #link {
margin-top: 8rem; margin-top: 4rem;
text-align: right;
font-size: 3rem; font-size: 3rem;
width: fit-content;
float: right;
display: flex;
flex-direction: column;
align-items: center;
}
#link img {
width: 4rem;
} }

7
styles/style.css
View File

@ -86,11 +86,18 @@ a:focus {
} }
#logo { #logo {
display: flex;
flex-direction: row;
gap: 0.5rem;
font-size: 2.5rem; font-size: 2.5rem;
font-weight: bold; font-weight: bold;
font-variant: small-caps; font-variant: small-caps;
} }
#logo img {
width: 3rem;
}
#theme-switcher { #theme-switcher {
border: 3px solid var(--border); border: 3px solid var(--border);
width: 1.5rem; width: 1.5rem;