From 3e7d0c04e3c66de3b29c049bdc5c386cdadd8fde Mon Sep 17 00:00:00 2001 From: Hugo Date: Mon, 7 Aug 2023 13:29:42 +0200 Subject: [PATCH] Reorganize project. Page builder. Support for EN --- .gitignore | 6 +- README.md | 28 ++++- atom_gen.py | 4 +- build_pages.py | 33 ++++++ index.html | 58 ----------- nginx.dev.conf | 23 ++++ pages/account.html | 47 --------- pages/contact.html | 46 -------- pages/events.html | 98 ------------------ pages/services.html | 96 ----------------- pages/sr/account.html | 7 ++ pages/sr/blog.html | 2 + pages/sr/contact.html | 5 + pages/sr/events.html | 59 +++++++++++ pages/sr/index.html | 23 ++++ pages/sr/projects.html | 1 + pages/sr/services.html | 60 +++++++++++ pages/sr/webring.html | 3 + pages/webring.html | 41 -------- styles/projects.css => site/.gitignore | 0 404.html => site/404.html | 0 {font => site/font}/Facade-Sud.woff | Bin {font => site/font}/JetBrainsMono-Regular.ttf | Bin {font => site/font}/iosevka-regular.woff | Bin {img => site/img}/cc-dark.svg | 0 {img => site/img}/cc-light.svg | 0 {img => site/img}/favicon.ico | Bin {img => site/img}/git-dark.svg | 0 {img => site/img}/git-light.svg | 0 {img => site/img}/logo-dark.svg | 0 {img => site/img}/logo-light.svg | 0 {img => site/img}/mailsettings.png | Bin {img => site/img}/mastodon-dark.svg | 0 {img => site/img}/mastodon-light.svg | 0 {img => site/img}/mesh-dark.svg | 0 {img => site/img}/mesh-light.svg | 0 {img => site/img}/srce-dark.svg | 0 {img => site/img}/srce-light.svg | 0 {img => site/img}/strelica-closed-dark.svg | 0 {img => site/img}/strelica-closed-light.svg | 0 {img => site/img}/strelica-closed.svg | 0 {img => site/img}/strelica-opened-dark.svg | 0 {img => site/img}/strelica-opened-light.svg | 0 {img => site/img}/strelica-opened.svg | 0 {img => site/img}/w-dark.svg | 0 {img => site/img}/w-light.svg | 0 {img => site/img}/www-dark.svg | 0 {img => site/img}/www-light.svg | 0 {scripts => site/scripts}/main.js | 0 {styles => site/styles}/404.css | 0 {styles => site/styles}/account.css | 0 {styles => site/styles}/blog.css | 0 {styles => site/styles}/contact.css | 0 {styles => site/styles}/events.css | 0 {styles => site/styles}/home.css | 0 {styles => site/styles}/poster.css | 0 site/styles/projects.css | 0 {styles => site/styles}/reset.css | 0 {styles => site/styles}/services.css | 0 {styles => site/styles}/style.css | 0 pages/blog.html => template/page-en.html | 25 ++--- pages/projects.html => template/page-sr.html | 27 +++-- 62 files changed, 272 insertions(+), 420 deletions(-) create mode 100644 build_pages.py delete mode 100644 index.html create mode 100644 nginx.dev.conf delete mode 100644 pages/account.html delete mode 100644 pages/contact.html delete mode 100644 pages/events.html delete mode 100644 pages/services.html create mode 100644 pages/sr/account.html create mode 100644 pages/sr/blog.html create mode 100644 pages/sr/contact.html create mode 100644 pages/sr/events.html create mode 100644 pages/sr/index.html create mode 100644 pages/sr/projects.html create mode 100644 pages/sr/services.html create mode 100644 pages/sr/webring.html delete mode 100644 pages/webring.html rename styles/projects.css => site/.gitignore (100%) rename 404.html => site/404.html (100%) rename {font => site/font}/Facade-Sud.woff (100%) rename {font => site/font}/JetBrainsMono-Regular.ttf (100%) rename {font => site/font}/iosevka-regular.woff (100%) rename {img => site/img}/cc-dark.svg (100%) rename {img => site/img}/cc-light.svg (100%) rename {img => site/img}/favicon.ico (100%) rename {img => site/img}/git-dark.svg (100%) rename {img => site/img}/git-light.svg (100%) rename {img => site/img}/logo-dark.svg (100%) rename {img => site/img}/logo-light.svg (100%) rename {img => site/img}/mailsettings.png (100%) rename {img => site/img}/mastodon-dark.svg (100%) rename {img => site/img}/mastodon-light.svg (100%) rename {img => site/img}/mesh-dark.svg (100%) rename {img => site/img}/mesh-light.svg (100%) rename {img => site/img}/srce-dark.svg (100%) rename {img => site/img}/srce-light.svg (100%) rename {img => site/img}/strelica-closed-dark.svg (100%) rename {img => site/img}/strelica-closed-light.svg (100%) rename {img => site/img}/strelica-closed.svg (100%) rename {img => site/img}/strelica-opened-dark.svg (100%) rename {img => site/img}/strelica-opened-light.svg (100%) rename {img => site/img}/strelica-opened.svg (100%) rename {img => site/img}/w-dark.svg (100%) rename {img => site/img}/w-light.svg (100%) rename {img => site/img}/www-dark.svg (100%) rename {img => site/img}/www-light.svg (100%) rename {scripts => site/scripts}/main.js (100%) rename {styles => site/styles}/404.css (100%) rename {styles => site/styles}/account.css (100%) rename {styles => site/styles}/blog.css (100%) rename {styles => site/styles}/contact.css (100%) rename {styles => site/styles}/events.css (100%) rename {styles => site/styles}/home.css (100%) rename {styles => site/styles}/poster.css (100%) create mode 100644 site/styles/projects.css rename {styles => site/styles}/reset.css (100%) rename {styles => site/styles}/services.css (100%) rename {styles => site/styles}/style.css (100%) rename pages/blog.html => template/page-en.html (59%) rename pages/projects.html => template/page-sr.html (58%) diff --git a/.gitignore b/.gitignore index 6cf32f8..3b4153b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ venv/ +site/atom_blog.xml +site/atom_events.xml poster.html poster.pdf -atom_blog.xml -atom_events.xml +http.access.log +http.error.log diff --git a/README.md b/README.md index 8f7dab5..b70f4f5 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,35 @@ Redisign of dmz.rs . +## Build site + +Run + +``` +python atom_gen.py +python prep.py +python build_pages.py +``` + +Complete website will be contained in `site/`. You can copy this to server. + +## Development server + +To start a development server, first build site, then run (possibly with `sudo`) + +``` +nginx -p . -c nginx.dev.conf +``` + +To stop it: + +``` +nginx -p . -s stop +``` + ## TODO: -- [ ] create page builder +- [x] create page builder - [ ] create blogging system - [ ] create xmpp bot that connects to events section. - [ ] webring system diff --git a/atom_gen.py b/atom_gen.py index a9bf126..e9e0828 100755 --- a/atom_gen.py +++ b/atom_gen.py @@ -67,7 +67,7 @@ def feedgen(blogs, events): 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') + fg_blog.atom_file('site/atom_blog.xml') + fg_events.atom_file('site/atom_events.xml') feedgen(blogposts_list_gen(), events_list_gen()) diff --git a/build_pages.py b/build_pages.py new file mode 100644 index 0000000..d82a109 --- /dev/null +++ b/build_pages.py @@ -0,0 +1,33 @@ +import os + +PAGES = [ + {'name': 'index', 'titleSR': 'Početna', 'titleEN': 'Home', 'style': 'home'}, + {'name': 'account', 'titleSR': 'Nalog', 'titleEN': 'Account', 'style': 'account'}, + {'name': 'contact', 'titleSR': 'Kontakt', 'titleEN': 'Contact', 'style': 'contact'}, + {'name': 'events', 'titleSR': 'Događaji', 'titleEN': 'Events', 'style': 'events'}, + {'name': 'services', 'titleSR': 'Servisi', 'titleEN': 'Services', 'style': 'services'}, + {'name': 'webring', 'titleSR': 'Webring', 'titleEN': 'Webring', 'style': ''}, +] + +def buildPage(pageTitle: str, pageHtml: str, pageStyle: str, template: str) -> str: + template = template.replace('', pageTitle) + style = '' if not pageStyle else f'' + template = template.replace('', style) + template = template.replace('', pageHtml) + return template + +def main(): + os.makedirs('site/en/', exist_ok=True) + with open('template/page-en.html') as fTempEN, open('template/page-sr.html') as fTempSR: + templateSR = fTempSR.read() + templateEN = fTempEN.read() + for page in PAGES: + with open(f'pages/sr/{page["name"]}.html') as f: + pageHtml = f.read() + html = buildPage(page['titleSR'], pageHtml, page['style'], templateSR) + f = open(f'site/{page["name"]}.html', 'w') + f.write(html) + f.close() + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/index.html b/index.html deleted file mode 100644 index 1cbced3..0000000 --- a/index.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - Decentrala - - - -
- - - -
-
-

Dobrodošao!

-

- Mi smo Decentrala - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja. - Zvuči interesantno? Evo još nekih stvari o nama: -

-
-
Znanje:
-
Sve naše radionice su besplatne i otvorene za sve zainteresovane. - Ako želiš nešto da podeliš najavi se na našem Forumu i održi radionicu kod nas!
-
Akcije:
-
Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve zainteresovane.
-
Servisi:
-
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.
-
-

- Ako si i dalje zainteresovan, možeš napraviti nalog na našem serveru koji će ti omogućiti korišćenje svih naših servisa. - Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših događaja, i tu nas upoznati! -

- -
- - - - diff --git a/nginx.dev.conf b/nginx.dev.conf new file mode 100644 index 0000000..5a18f78 --- /dev/null +++ b/nginx.dev.conf @@ -0,0 +1,23 @@ +# Start nginx in this directory with `nginx -p . -c nginx.conf` +# Stop nginx with `nginx -p . -s stop` +events {} + +http { + # edit this for your system + include /etc/nginx/mime.types; + + server { + listen 9001; + access_log http.access.log; + error_log http.error.log; + + root site/; + + error_page 404 /404.html; + location / { + autoindex off; + default_type "text/html"; + try_files $uri $uri.html /$uri/index.html /index.html; + } + } +} \ No newline at end of file diff --git a/pages/account.html b/pages/account.html deleted file mode 100644 index 39ae4e9..0000000 --- a/pages/account.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - Decentrala - Nalog - - - -
- - - -
-
-

Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server i ostale servise koji podrzavaju LDAP login.

-

Za vise o XMPP pogledajte tutorial.

-

Za primer podesavanja na Thundebird mail klijentu mozete pogledati sliku.

- -

Registruj se

-

Izbrisi nalog

-

Promeni lozinku

- - -

- - - - diff --git a/pages/contact.html b/pages/contact.html deleted file mode 100644 index 6b8194b..0000000 --- a/pages/contact.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - Decentrala - Kontakt - - - -
- - - -
-
-

Kontakt

-

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

-

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 deleted file mode 100644 index 8b10420..0000000 --- a/pages/events.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - Decentrala - Dogadjaji - - - -
- - - -
-
-

Događaji

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DatumVremeMestoTema
Ponedeljak, 7. Avgust 2023. 19:00h DC Krov Linux ricing
Utorak, 8. Avgust 2023. 19:00h DC Krov Lambda račun
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/services.html b/pages/services.html deleted file mode 100644 index 6661818..0000000 --- a/pages/services.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - Decentrala - Servisi - - - -
- - - -
-
-

Servisi

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ServisOpis
EmailEmail nalog koji možeš koristiti sa bilo kojim email - klijentom generalne namene (na primer Thunderbird-u).
ForumForum na kom obično organizujemo naše događaje. -
ChatOdržavamo sopstveni XMPP server, na kojem možeš napraviti nalog. - Ako već poseduješ nalog možeš nas naći u grupi decentrala@conference.dmz.rs. -
GitGitea instanca na kojoj držimo kod kao i ostale resurse za naše - projekte, dogadjaje, kao i projekte naših prijatelja. - Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a. -
WikiWiki.js instanca koju koristimo da dokumentujemo naše - projekte kao i - ostale događaje. -
SearchLibreX instanca koju koristimo za pretraživanje Interneta. - Bolji od Google-a. -
PastebinPrivateBin instanca koju koristimo za brzo deljenje tekstualnih fajlova -
Soft ServeSoft Serve instanca koju koristimo kao zamenu za Gitea servis. - Soft Serve radi potpuno iz terminala -
-

Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, možes se - registovati na svaki servis posebno, a možeš i napraviti jedinstveni nalog na nasem - serveru i koristiti sve servise sa istim nalogom.

- -
- - - - diff --git a/pages/sr/account.html b/pages/sr/account.html new file mode 100644 index 0000000..96d464d --- /dev/null +++ b/pages/sr/account.html @@ -0,0 +1,7 @@ +

Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server i ostale servise koji podrzavaju LDAP login.

+

Za vise o XMPP pogledajte tutorial.

+

Za primer podesavanja na Thundebird mail klijentu mozete pogledati sliku.

+ +

Registruj se

+

Izbrisi nalog

+

Promeni lozinku

diff --git a/pages/sr/blog.html b/pages/sr/blog.html new file mode 100644 index 0000000..75b936d --- /dev/null +++ b/pages/sr/blog.html @@ -0,0 +1,2 @@ +Ova stranica je trenutno u izradi... + \ No newline at end of file diff --git a/pages/sr/contact.html b/pages/sr/contact.html new file mode 100644 index 0000000..524ea7c --- /dev/null +++ b/pages/sr/contact.html @@ -0,0 +1,5 @@ +

Kontakt

+

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

+

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/sr/events.html b/pages/sr/events.html new file mode 100644 index 0000000..2b9f4f3 --- /dev/null +++ b/pages/sr/events.html @@ -0,0 +1,59 @@ +

Događaji

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DatumVremeMestoTema
Ponedeljak, 7. Avgust 2023. 19:00h DC Krov Linux ricing
Utorak, 8. Avgust 2023. 19:00h DC Krov Lambda račun
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
\ No newline at end of file diff --git a/pages/sr/index.html b/pages/sr/index.html new file mode 100644 index 0000000..e28c2a5 --- /dev/null +++ b/pages/sr/index.html @@ -0,0 +1,23 @@ +

Dobrodošao!

+

+ Mi smo Decentrala - grupa entuzijasta okupljena oko ideja decentralizacije i slobodnog širenja znanja. + Zvuči interesantno? Evo još nekih stvari o nama: +

+
+
Znanje:
+
Sve naše radionice su besplatne i otvorene za sve zainteresovane. + Ako želiš nešto da podeliš najavi se na našem Forumu i održi radionicu kod nas! +
+
Akcije:
+
Povremeno organizujemo različite akcije, hakatone, crypto-partije, izložbe i slične događaje otvorene za sve + zainteresovane.
+
Servisi:
+
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.
+
+

+ Ako si i dalje zainteresovan, možeš napraviti nalog na našem serveru koji će ti + omogućiti korišćenje svih naših servisa. + Ako želiš prvo da vidiš kako to sve izgleda u realnosti, možeš doći na neki od naših događaja, i tu nas upoznati! +

\ No newline at end of file diff --git a/pages/sr/projects.html b/pages/sr/projects.html new file mode 100644 index 0000000..2feb200 --- /dev/null +++ b/pages/sr/projects.html @@ -0,0 +1 @@ +Ova stranica je trenutno u izradi... diff --git a/pages/sr/services.html b/pages/sr/services.html new file mode 100644 index 0000000..47513e0 --- /dev/null +++ b/pages/sr/services.html @@ -0,0 +1,60 @@ +

Servisi

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ServisOpis
EmailEmail nalog koji možeš koristiti sa bilo kojim email + klijentom generalne namene (na primer Thunderbird-u).
ForumForum na kom obično organizujemo naše događaje. +
ChatOdržavamo sopstveni XMPP server, na kojem možeš napraviti nalog. + Ako već poseduješ nalog možeš nas naći u grupi decentrala@conference.dmz.rs. +
GitGitea instanca na kojoj držimo kod kao i ostale resurse za naše + projekte, dogadjaje, kao i projekte naših + prijatelja. + Ovo može biti dom tvog sledećeg projekta. Bolji od Github-a. +
WikiWiki.js instanca koju koristimo da dokumentujemo naše + projekte kao i + ostale događaje. +
SearchLibreX instanca koju koristimo za pretraživanje Interneta. + Bolji od Google-a. +
PastebinPrivateBin instanca koju koristimo za brzo deljenje tekstualnih fajlova +
Soft ServeSoft Serve instanca koju koristimo kao zamenu za Gitea + servis. + Soft Serve radi potpuno iz terminala +
+

Ovo su neki od servisa koje trenutno održavamo na našim serverima. Da bi koristio ove servise, možes se + registovati na svaki servis posebno, a možeš i napraviti jedinstveni nalog na nasem + serveru i koristiti sve servise sa istim nalogom.

\ No newline at end of file diff --git a/pages/sr/webring.html b/pages/sr/webring.html new file mode 100644 index 0000000..03913f9 --- /dev/null +++ b/pages/sr/webring.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/pages/webring.html b/pages/webring.html deleted file mode 100644 index 89b1f7e..0000000 --- a/pages/webring.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - Decentrala - Projekti - - - -
- - - -
-
- -
- - - - diff --git a/styles/projects.css b/site/.gitignore similarity index 100% rename from styles/projects.css rename to site/.gitignore diff --git a/404.html b/site/404.html similarity index 100% rename from 404.html rename to site/404.html diff --git a/font/Facade-Sud.woff b/site/font/Facade-Sud.woff similarity index 100% rename from font/Facade-Sud.woff rename to site/font/Facade-Sud.woff diff --git a/font/JetBrainsMono-Regular.ttf b/site/font/JetBrainsMono-Regular.ttf similarity index 100% rename from font/JetBrainsMono-Regular.ttf rename to site/font/JetBrainsMono-Regular.ttf diff --git a/font/iosevka-regular.woff b/site/font/iosevka-regular.woff similarity index 100% rename from font/iosevka-regular.woff rename to site/font/iosevka-regular.woff diff --git a/img/cc-dark.svg b/site/img/cc-dark.svg similarity index 100% rename from img/cc-dark.svg rename to site/img/cc-dark.svg diff --git a/img/cc-light.svg b/site/img/cc-light.svg similarity index 100% rename from img/cc-light.svg rename to site/img/cc-light.svg diff --git a/img/favicon.ico b/site/img/favicon.ico similarity index 100% rename from img/favicon.ico rename to site/img/favicon.ico diff --git a/img/git-dark.svg b/site/img/git-dark.svg similarity index 100% rename from img/git-dark.svg rename to site/img/git-dark.svg diff --git a/img/git-light.svg b/site/img/git-light.svg similarity index 100% rename from img/git-light.svg rename to site/img/git-light.svg diff --git a/img/logo-dark.svg b/site/img/logo-dark.svg similarity index 100% rename from img/logo-dark.svg rename to site/img/logo-dark.svg diff --git a/img/logo-light.svg b/site/img/logo-light.svg similarity index 100% rename from img/logo-light.svg rename to site/img/logo-light.svg diff --git a/img/mailsettings.png b/site/img/mailsettings.png similarity index 100% rename from img/mailsettings.png rename to site/img/mailsettings.png diff --git a/img/mastodon-dark.svg b/site/img/mastodon-dark.svg similarity index 100% rename from img/mastodon-dark.svg rename to site/img/mastodon-dark.svg diff --git a/img/mastodon-light.svg b/site/img/mastodon-light.svg similarity index 100% rename from img/mastodon-light.svg rename to site/img/mastodon-light.svg diff --git a/img/mesh-dark.svg b/site/img/mesh-dark.svg similarity index 100% rename from img/mesh-dark.svg rename to site/img/mesh-dark.svg diff --git a/img/mesh-light.svg b/site/img/mesh-light.svg similarity index 100% rename from img/mesh-light.svg rename to site/img/mesh-light.svg diff --git a/img/srce-dark.svg b/site/img/srce-dark.svg similarity index 100% rename from img/srce-dark.svg rename to site/img/srce-dark.svg diff --git a/img/srce-light.svg b/site/img/srce-light.svg similarity index 100% rename from img/srce-light.svg rename to site/img/srce-light.svg diff --git a/img/strelica-closed-dark.svg b/site/img/strelica-closed-dark.svg similarity index 100% rename from img/strelica-closed-dark.svg rename to site/img/strelica-closed-dark.svg diff --git a/img/strelica-closed-light.svg b/site/img/strelica-closed-light.svg similarity index 100% rename from img/strelica-closed-light.svg rename to site/img/strelica-closed-light.svg diff --git a/img/strelica-closed.svg b/site/img/strelica-closed.svg similarity index 100% rename from img/strelica-closed.svg rename to site/img/strelica-closed.svg diff --git a/img/strelica-opened-dark.svg b/site/img/strelica-opened-dark.svg similarity index 100% rename from img/strelica-opened-dark.svg rename to site/img/strelica-opened-dark.svg diff --git a/img/strelica-opened-light.svg b/site/img/strelica-opened-light.svg similarity index 100% rename from img/strelica-opened-light.svg rename to site/img/strelica-opened-light.svg diff --git a/img/strelica-opened.svg b/site/img/strelica-opened.svg similarity index 100% rename from img/strelica-opened.svg rename to site/img/strelica-opened.svg diff --git a/img/w-dark.svg b/site/img/w-dark.svg similarity index 100% rename from img/w-dark.svg rename to site/img/w-dark.svg diff --git a/img/w-light.svg b/site/img/w-light.svg similarity index 100% rename from img/w-light.svg rename to site/img/w-light.svg diff --git a/img/www-dark.svg b/site/img/www-dark.svg similarity index 100% rename from img/www-dark.svg rename to site/img/www-dark.svg diff --git a/img/www-light.svg b/site/img/www-light.svg similarity index 100% rename from img/www-light.svg rename to site/img/www-light.svg diff --git a/scripts/main.js b/site/scripts/main.js similarity index 100% rename from scripts/main.js rename to site/scripts/main.js diff --git a/styles/404.css b/site/styles/404.css similarity index 100% rename from styles/404.css rename to site/styles/404.css diff --git a/styles/account.css b/site/styles/account.css similarity index 100% rename from styles/account.css rename to site/styles/account.css diff --git a/styles/blog.css b/site/styles/blog.css similarity index 100% rename from styles/blog.css rename to site/styles/blog.css diff --git a/styles/contact.css b/site/styles/contact.css similarity index 100% rename from styles/contact.css rename to site/styles/contact.css diff --git a/styles/events.css b/site/styles/events.css similarity index 100% rename from styles/events.css rename to site/styles/events.css diff --git a/styles/home.css b/site/styles/home.css similarity index 100% rename from styles/home.css rename to site/styles/home.css diff --git a/styles/poster.css b/site/styles/poster.css similarity index 100% rename from styles/poster.css rename to site/styles/poster.css diff --git a/site/styles/projects.css b/site/styles/projects.css new file mode 100644 index 0000000..e69de29 diff --git a/styles/reset.css b/site/styles/reset.css similarity index 100% rename from styles/reset.css rename to site/styles/reset.css diff --git a/styles/services.css b/site/styles/services.css similarity index 100% rename from styles/services.css rename to site/styles/services.css diff --git a/styles/style.css b/site/styles/style.css similarity index 100% rename from styles/style.css rename to site/styles/style.css diff --git a/pages/blog.html b/template/page-en.html similarity index 59% rename from pages/blog.html rename to template/page-en.html index c1bf956..843fb18 100644 --- a/pages/blog.html +++ b/template/page-en.html @@ -1,40 +1,37 @@ - + - + - Decentrala - Blog + <!--TITLE--> Decentrala -
- - - + + +
- Ova stranica je trenutno u izradi... - +
- diff --git a/pages/projects.html b/template/page-sr.html similarity index 58% rename from pages/projects.html rename to template/page-sr.html index 4598b87..1105d58 100644 --- a/pages/projects.html +++ b/template/page-sr.html @@ -1,40 +1,37 @@ - - + + - + - Decentrala - Projekti + <!--TITLE--> Decentrala -
- - - + + +
- Ova stranica je trenutno u izradi... - +
-