15 Commits

46 changed files with 243 additions and 140 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
public

22
Makefile Normal file
View File

@@ -0,0 +1,22 @@
output : all
public:
mkdir public
public/static: static
cp -r static public/
public/%.html : %.md
@cp start.html $@
@cat $< | sed 's#.md)#.html)#g' | pandoc -f markdown -t html5 -o- >> $@
@cat end.html >> $@
HTML := $(patsubst %.md,public/%.html,$(wildcard *.md))
all : public $(HTML) public/static
test:
echo $(HTML)
clean :
rm -rf public

12
README.md Normal file
View File

@@ -0,0 +1,12 @@
This repo builds the website `dmz.rs`.
## Dependencies
- `make`
- `pandoc`
## Usage
`make`
The output will appear in the `public` directory.

View File

@@ -1,27 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<h2>Chat</h2>
<p> Za koriscenje XMPP (Jabber) mozete koristiti <a target="blank" href="https://gajim.org/download/">Gajim</a> na racunaru , <a target="blank" href="https://conversations.im/">Conversations</a> na Andoroid-u (ne pravite nalog na conversations.im serveru, mozete na dmz.rs ili nekom drugom) i <a target="blank" href="https://monal-im.org/">Monal</a> na Apple proizvodima. <p>
<p> Mozete nas naci u XMPP grupi <a href="xmpp:decentrala@conference.dmz.rs?join"> decentrala@conference.dmz.rs </a> <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

12
chat.md Normal file
View File

@@ -0,0 +1,12 @@
## Chat
Za koriscenje XMPP (Jabber) mozete koristiti
[Gajim](https://gajim.org/download/){target="blank"} na racunaru ,
[Conversations](https://conversations.im/){target="blank"} na Andoroid-u
(ne pravite nalog na conversations.im serveru, mozete na dmz.rs ili
nekom drugom) i [Monal](https://monal-im.org/){target="blank"} na Apple
proizvodima.
Mozete nas naci u XMPP grupi
[decentrala@conference.dmz.rs](xmpp:decentrala@conference.dmz.rs?join)

View File

@@ -1,26 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<h2>Dogadjaji</h2>
<p> > Svakog utorka u DC Krovu (Beograd, Kraljice Marije 47, zadnji sprat) u 19h radionica Uvod u mreze <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

36
dogadjaji.md Normal file
View File

@@ -0,0 +1,36 @@
# DECENTRALA
## Dogadjaji
\> Ponedeljak (5. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Sifre
(predavanje)
\> Utorak (6. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Genersianje
random podataka (predavanje)
\> Ponedeljak (12. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Uvod u Blender,
3D modelovanje (radionica)
\> Utorak (13. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Cybersecurity
odbrana (predavanje)
\> Ponedeljak (19. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), BASH skripte
(predavanje)
\> Utorak (20. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Cybersecurity
odbrana (predavanje)
\> Ponedeljak (26. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Python vezbe
(radionica)
\> Utorak (27. Jun) u 19h u [DC
Krovu](https://www.openstreetmap.org/node/2937736453), Cybersecurity
odbrana (predavanje)

6
end.html Normal file
View File

@@ -0,0 +1,6 @@
</main>
</div>
</body>
</html>

View File

@@ -1,27 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<h2>Forum</h2>
<p> Forum je na https://forum.dmz.rs <p>
<p> Nalog na forumu nije povezan sa nalogom na xmpp i mail serveru <p>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</div>
</body>
</html>

6
forum.md Normal file
View File

@@ -0,0 +1,6 @@
## Forum
Forum je na [forum.dmz.rs](https://forum.dmz.rs)
Nalog na forumu nije povezan sa nalogom na xmpp i mail serveru

View File

@@ -1,26 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<p id="about"> Decentrala je zajednica okupljena oko decentralizacije tehnologija i sirenja znanja. <p>
<ul class="nav">
<a href="/dogadjaji.html"><li>Dogadjaji</li></a>
<a href="/forum.html"><li>Forum</li></a>
<a href="/chat.html"><li>Chat</li></a>
<a href="/nalog.html"><li>Nalog</li></a>
</ul>
</main>
</div>
</body>
</html>

10
index.md Normal file
View File

@@ -0,0 +1,10 @@
Decentrala je zajednica okupljena oko decentralizacije tehnologija i
sirenja znanja.
- [DOGAĐAJI](dogadjaji.md)
- [FORUM](forum.md)
- [CHAT](chat.md)
- [NALOG](nalog.md)
- [O NAMA](onama.md)
- [SERVISI](servisi.md)
- [KONTAKT](kontakt.md)

9
kontakt.md Normal file
View File

@@ -0,0 +1,9 @@
## Kontakt
Mozete nam poslati email na dmz@dmz.rs
Ili nas kontaktiraje na [forumu](/forum.html) ili [chat
kanalu](/chat.html)
Takodje mozete i doci na neku od dogadjaja i upoznati nas uzivo

View File

@@ -1,32 +0,0 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">Decentrala</h1>
<a id="d" href="/index.html"><div id="d"></div></a>
</div>
<main>
<h2>Nalog</h2>
<p> Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email server. <p>
<p> Za vise o XMPP pogledajte <a href="/chat.html">Chat</a> stranicu. <p>
<p> Za primer podesavanja na <a href="https://www.thunderbird.net/">Thundebird</a> mail klijentu mozete pogledati <a href="/static/img/mailsettings.png">sliku</a>. <p>
<ul class="nav">
<a href="/account/register/"><li>Registruj se</li></a>
<a href="/account/unregister/"><li>Izbrisi nalog</li></a>
<a href="/account/changepassword/"><li>Promeni lozinku</li></a>
</ul>
<div class="back">
<ul class="nav">
<a href="../"><li>Nazad</li></a>
</ul>
</div>
</main>
</body>
</html>

14
nalog.md Normal file
View File

@@ -0,0 +1,14 @@
## Nalog
Ako ste napravili nalog na dmz.rs mozete koristi nas xmpp i email
server.
Za vise o XMPP pogledajte [Chat](/chat.html) stranicu.
Za primer podesavanja na [Thundebird](https://www.thunderbird.net/) mail
klijentu mozete pogledati [sliku](/static/img/mailsettings.png).
- Registruj se
- Izbrisi nalog
- Promeni lozinku

32
onama.md Normal file
View File

@@ -0,0 +1,32 @@
## Sta je Decentrala
Decentrala je zajednica okupljena oko decentralizacije tehnologija i
sirenja znanja.
### Znanje
Svako moze drzati predavanje na bilo koju temu, samo se najavite na
forumu.
Decentrala veruje da svako treba da ima pristup znanju, zbog cega su
predavanja uvek besplatna i bez promocija.
Ako zelite nesto da podelite sa drugima sto ste naucili, prijavite se da
drzite jedno ili vise predavanja!
### Akcija
Organizovanje dogadjaja programiranja ili instalacije servisa koje
pomazu u decentralizaciji Interneta.
Organizujemo hackathone kao posebne dogadjaje na kojima se okupljamo da
radimo na zajednickom cilju.
### Druzenje
Drustvene dogadjaje u cilju socijalizacije.
Ako zelite da se druzite sa ljudima zainteresovanim za ravnopravnost
koriscenja tehnologija, slobodnog softvera, privatnost i bezbednost,
posetite neku od okupljanja Decentrale.

24
servisi.md Normal file
View File

@@ -0,0 +1,24 @@
# DECENTRALA {#decentrala .logo}
## Servisi
[FORUM](https://forum.dmz.rs)
[XMPP](../chat.html)
[GITEA](https://gitea.dmz.rs)
[WIKI](https://wiki.dmz.rs)
[EMAIL](../nalog.html)
[SOFT SERVE](ssh://soft.dmz.rs:2222)
[LibreX](https://search.dmz.rs)
[CGIT](https://git.dmz.rs)
[PrivateBin](https://pastebin.dmz.rs)
[CryptPad](https://cryptpad.dmz.rs)

16
start.html Normal file
View File

@@ -0,0 +1,16 @@
<!doctype html>
<meta charset="UTF-8">
<html>
<head>
<link rel="icon" type="image/x-icon" href="/static/d.png">
<link rel="stylesheet" href="./static/reset.css">
<link rel="stylesheet" href="./static/main.css">
<title>Decentrala</title>
</head>
<body>
<div class="container">
<div class="header">
<h1 class="logo">DECENTRALA</h1>
</div>
<main>

BIN
static/d.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1 @@
2f069ecf-a1fc-4aaf-924c-de17efcde7a8

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,6 +1,23 @@
@font-face {
font-family: Facade;
src: url(fonts/facade/Facade-Sud.woff);
}
@font-face {
font-family: sligoil;
src: url(fonts/sligoil/Sligoil-Micro.woff);
}
@font-face {
font-family: jetbrains-mono;
src: url(fonts/jetbrains-mono/JetBrainsMono-Regular.ttf);
}
body {
background-color: rgb(0, 0, 0);
font: 3vw "Monospace", sans-serif;
font-family: jetbrains-mono;
font-size: 3vw;
}
.container {
@@ -13,7 +30,8 @@ body {
display: flex;
justify-content: center;
margin: 0 auto;
font: 12vw "Monospace", sans-serif;
font-family: facade;
font-size: 12vw;
color: #24ea26;
}
@@ -30,14 +48,24 @@ main {
}
main h2 {
font-family: sligoil;
font-size: 5vw;
}
main h3 {
font-family: sligoil;
font-size: 4vw;
margin: 2rem auto;
margin-left: 2vw;
margin-right: 1vw;
}
#about {
margin-bottom: 2rem;
}
a {
font-family: sligoil;
text-decoration: underline;
color: #24ea26;
@@ -75,6 +103,7 @@ main ul li:before {
.back ul li {
text-align: right;
clear: both;
}
.back ul li:before {
@@ -82,3 +111,14 @@ main ul li:before {
padding-right: 5px;
color: #24ea26;
}
#onama p {
font-size: 2vw;
}
.box {
float: left;
width: 25vw;
text-align: center;
padding: 1vw;
}