diff --git a/404.html b/404.html new file mode 100644 index 0000000..964ddae --- /dev/null +++ b/404.html @@ -0,0 +1,19 @@ + + + + + + + + + + 404 + + +
+ Logo +

Requested resource was not found

+

Go back to Homepage

+
+ + diff --git a/README.md b/README.md index 1718614..8f7dab5 100644 --- a/README.md +++ b/README.md @@ -2,27 +2,13 @@ Redisign of dmz.rs . -# STILL NOT COMPLETED +## TODO: -### TODO: +- [ ] create page builder +- [ ] create blogging system +- [ ] create xmpp bot that connects to events section. +- [ ] webring system + - [x] make page + - [ ] populate page +- [ ] make english version (localisation) -- [x] create themes switcher - - [x] "demo" - - [x] propagate to all pages - - [x] store theme to localStorage - - [x] read "user agent" for default theme - - [x] invert images and icons -- update projects section -- create blogging system -- create xmpp bot that connects to events section. -- [ ] make responsive - - create menus for smaller screens - - [x] created one menu - - this might be enough - - [x] adjust the mesh depending on the screen size - - no mesh on small screens - - tweak other random issues with layout -- make webring system -- make english version (localisation) - - diff --git a/img/favicon.ico b/img/favicon.ico index 41ff898..02254af 100644 Binary files a/img/favicon.ico and b/img/favicon.ico differ diff --git a/img/logo-dark.svg b/img/logo-dark.svg new file mode 100644 index 0000000..cb953c9 --- /dev/null +++ b/img/logo-dark.svg @@ -0,0 +1,17 @@ + + + + diff --git a/img/logo-light.svg b/img/logo-light.svg new file mode 100644 index 0000000..06d41e5 --- /dev/null +++ b/img/logo-light.svg @@ -0,0 +1,17 @@ + + + + diff --git a/index.html b/index.html index dbdd7fc..1cbced3 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
- + Nalog
@@ -40,24 +40,17 @@ diff --git a/pages/account.html b/pages/account.html index 7f35ca9..39ae4e9 100644 --- a/pages/account.html +++ b/pages/account.html @@ -13,7 +13,7 @@
- + Nalog
@@ -29,23 +29,16 @@ diff --git a/pages/blog.html b/pages/blog.html index a1bd3ba..c1bf956 100644 --- a/pages/blog.html +++ b/pages/blog.html @@ -13,7 +13,7 @@
- + Nalog
@@ -22,23 +22,16 @@ diff --git a/pages/contact.html b/pages/contact.html index b6f2c76..6b8194b 100644 --- a/pages/contact.html +++ b/pages/contact.html @@ -13,37 +13,31 @@
- + Nalog

Kontakt

-

Možeš nam poslati mail na dmz@dmz.rs ili se mozes pridružiti našem Možeš nam poslati mejl na adresu dmz@dmz.rs ili se možeš pridružiti našem Forumu.

-

Takođe smo i na Fediversu!

-

U slucaju da nadjete bug na sajtu, bili bismo jako zahvalni - ako bi mogli da nam ga prijavite (npr. putem emaila).

+

Takođe smo dostupni i na Fediversu!

+
+

U slučaju da si pronašao bug na sajtu, bili bismo ti jako zahvalni + ako bi nam ga prijavio/prijalvila.

diff --git a/pages/events.html b/pages/events.html index eec0831..8b10420 100644 --- a/pages/events.html +++ b/pages/events.html @@ -13,7 +13,7 @@
- + Nalog
@@ -21,72 +21,75 @@

Događaji

- + - - - - - - - - - - - - - - - - - - - - + - - + + - + - - + + - - - - + + + + - -
Datum Vreme Mesto Tema
Petak, 5. Maj 2023. 15:30h Cvijeta Zuzoric ULUS izlozba (Q&A)
Subota, 6. Maj 2023. 12:00h Cvijeta Zuzoric ULUS izlozba (Q&A)
Nedelja, 7. Maj 2023. 16:00h Cvijeta Zuzoric ULUS izlozba (diskusija)
Ponedeljak, 8. Maj 2023. Ponedeljak, 7. Avgust 2023. 19:00h DC Krov Linux install day DC Krov Linux ricing
Utorak, 9. Maj 2023. Utorak, 8. Avgust 2023. 19:00h DC Krov Cryptoparty - Uvod u privatnost DC Krov Lambda račun
Cetvrtak, 11. Maj 2023. 18:00h Polyhedra Uvod u racunarske mreze Ponedeljak, 14. Avgust 2023. 19:00h DC Krov Linux distro diskusija
+ + Utorak, 15. Avgust 2023. + 19:00h + DC Krov + Pirati 777 mora + + + Ponedeljak, 21. Avgust 2023. + 19:00h + DC Krov + Python vežbe + + + Utorak, 22. Avgust 2023. + 19:00h + DC Krov + Autentifikacija na internetu + + + Ponedeljak, 28. Avgust 2023. + 19:00h + DC Krov + Podesavanje Mail servera + + + Utorak, 29. Avgust 2023. + 19:00h + DC Krov + Prevodjenje wiki-a + + diff --git a/pages/projects.html b/pages/projects.html index 9ca6a8c..4598b87 100644 --- a/pages/projects.html +++ b/pages/projects.html @@ -13,7 +13,7 @@
- + Nalog
@@ -22,23 +22,16 @@ diff --git a/pages/services.html b/pages/services.html index c5a0e5e..6661818 100644 --- a/pages/services.html +++ b/pages/services.html @@ -13,7 +13,7 @@
- + Nalog
@@ -78,23 +78,16 @@ diff --git a/pages/webring.html b/pages/webring.html index 664df9f..89b1f7e 100644 --- a/pages/webring.html +++ b/pages/webring.html @@ -13,33 +13,26 @@
- + Nalog
- -
  • Tilde Zone
    • -     +
    diff --git a/poster.html b/poster.html index 857c8ee..a594fd2 100644 --- a/poster.html +++ b/poster.html @@ -1,9 +1 @@ -

    DECENTRALA

    Plan za Avgust

    - - - - - - - -
    UTO1. Tehno veče
    PON7. Linux ricing
    UTO8. Lambda račun
    PON14. Linux distro diskusija
    UTO15. Pirati 777 mora
    PON21. Python vežbe
    UTO22. Autentifikacija na internetu
    PON28. Kviz

    Radionice počinju u 19h u Društvenom centru Krov u Kraljice Marije 47.

    Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah pored menjačnice. DC Krov je na poslednjem spratu.

    \ No newline at end of file +

    DECENTRALA

    Plan za Septembar

    Radionice počinju u 19h u Društvenom centru Krovu Kraljice Marije 47.

    Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmahpored menjačnice. DC Krov je na poslednjem spratu.

    \ No newline at end of file diff --git a/poster.py b/poster.py index d56404e..5572b11 100644 --- a/poster.py +++ b/poster.py @@ -36,18 +36,18 @@ def render_table(events:list[dict])-> str: return html def render_page(table: str) -> str: - head = "\n\t\n\t\n" + head = "" header = "

    DECENTRALA

    " subheader = f"

    Plan za {MONTHS_SR[NEXT_MONTH.month - 1]}

    " - link = "" + link = "" p1 = "

    Radionice počinju u 19h u Društvenom centru Krov\ u Kraljice Marije 47.

    " p2 = "

    Ulaz u zgradu je u prolazu pored Štark prodavnice slatkiša, odmah\ pored menjačnice. DC Krov je na poslednjem spratu.

    " - return f"\n{head}\n\n\t
    \n\t\t{header}\n\t\t{subheader}\ -\n\t\t\n{table}\t\t
    \n\t\t{p1}\n\t\t{p2}\n\t\t{link}\n\t
    \ -\n\n" + footer = f"{p1}{p2}{link}" + return f"{head}
    {header}{subheader}\ +{table}
    {footer}
    " def main(): events = load_events(EVENTS_CSV_PATH) diff --git a/scripts/main.js b/scripts/main.js index 8ba3f80..bad0f13 100644 --- a/scripts/main.js +++ b/scripts/main.js @@ -1,7 +1,7 @@ const theme_switcher = document.getElementById("theme-switcher"); const imgs = document.getElementsByTagName("img"); const sections_button = document.getElementById("sections-button"); -const sections_menu = document.getElementById("sections-menu"); +const sections_menu = document.getElementsByTagName("nav")[0]; const main = document.getElementsByTagName("main")[0]; let theme = window.localStorage.getItem("theme"); @@ -31,7 +31,7 @@ theme_switcher.addEventListener("click", () => { }); function changeToDarkTheme() { - theme_switcher.setAttribute("title", "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)"); @@ -42,7 +42,7 @@ function changeToDarkTheme() { } function changeToLightTheme() { - theme_switcher.setAttribute("title", "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)"); diff --git a/styles/404.css b/styles/404.css new file mode 100644 index 0000000..5f54899 --- /dev/null +++ b/styles/404.css @@ -0,0 +1,12 @@ +main { + max-width: fit-content; + display: flex; + flex-direction: column; + align-items: center; + gap: 1rem; + margin: 0 auto; +} + +main img { + width: min(70vw, 15rem); +} \ No newline at end of file diff --git a/styles/poster.css b/styles/poster.css index 3444f0a..22878ac 100644 --- a/styles/poster.css +++ b/styles/poster.css @@ -62,7 +62,15 @@ td:nth-child(2) { } #link { - margin-top: 8rem; - text-align: right; + margin-top: 4rem; font-size: 3rem; -} \ No newline at end of file + width: fit-content; + float: right; + display: flex; + flex-direction: column; + align-items: center; +} + +#link img { + width: 4rem; +} diff --git a/styles/style.css b/styles/style.css index 43e9c58..dfae114 100644 --- a/styles/style.css +++ b/styles/style.css @@ -86,11 +86,18 @@ a:focus { } #logo { + display: flex; + flex-direction: row; + gap: 0.5rem; font-size: 2.5rem; font-weight: bold; font-variant: small-caps; } +#logo img { + width: 3rem; +} + #theme-switcher { border: 3px solid var(--border); width: 1.5rem; @@ -105,9 +112,7 @@ a:focus { background: linear-gradient(90deg, var(--hightlight) 0%, var(--hightlight) 50%, var(--bg) 51%, var(--bg) 100%); } -.account, -.sections, -#sections-menu { +.account { font-size: 2rem; } @@ -124,35 +129,24 @@ a:focus { gap: 2rem; } -.links > a:hover{ - background-color: var(--bg); +.links > a { + border-radius: 100%; +} + +.links > a > img { + display: block; } #sections-button { display: none; } -#sections-menu a { - margin-bottom: 1rem; -} - -#sections-menu { - border: 2px solid var(--border); - background-color: var(--bg); - position: absolute; - bottom: calc(4rem - 2px); - left: calc(0px - 2px); - align-items: center; - padding: 2rem 3rem; - display: none; -} - -.sections, #sections-menu { +nav { font-variant: small-caps; -} - -.sections a { - margin: 0 1rem 0 0; + display: flex; + flex-direction: row; + gap: 2rem; + font-size: 2rem; } button { @@ -173,7 +167,17 @@ screen and (max-width: 1500px) { } @media screen and (max-width: 1160px) { - .sections { + nav { + flex-direction: column; + border: 2px solid var(--border); + border-bottom: 0; + border-left: 0; + background-color: var(--bg); + position: absolute; + bottom: calc(4rem); + left: 0; + align-items: center; + padding: 2rem 3rem; display: none; }