add readme

convert markdown to html
remove markdown guff
2023-07-08 00:24:22 +02:00 · 2023-07-08 00:17:35 +02:00 · 2023-07-07 23:59:11 +02:00 · 2023-07-07 00:00:19 +02:00 · 2023-06-13 17:17:34 +02:00 · 2023-05-05 17:36:40 +02:00
44 changed files with 274 additions and 55 deletions
@@ -0,0 +1 @@
+public
@@ -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
@@ -0,0 +1,12 @@
+This repo builds the website `dmz.rs`.
+
+## Dependencies
+
+- `make`
+- `pandoc`
+
+## Usage
+
+`make`
+
+The output will appear in the `public` directory.
@@ -1,24 +0,0 @@
-<!doctype html>
-<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>
-			</div>
-			<main>
-				<h2>Chat</h2>
-				<p> Za koriscenje XMPP (Jabber) mozete koristiti <a target="blank" href="https://gajim.org/">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> <a href="/account/register/"> Registruj XMPP nalog na dmz.rs domenu </a> <p>
-				<p> <a href="/account/unregister/"> Izbrisi XMPP nalog </a> <p>
-				<p> <a href="/account/changepassword/"> Promeni lozinku </a> <p>
-				<p> Mozete nas naci u XMPP grupi <a href="xmpp:decentrala@conference.dmz.rs?join"> decentrala@conference.dmz.rs </a> <p>
-				<p> Ako ste napravili XMPP nalog na dmz.rs serveru mozete koristi i email adresu na dmz.rs domenu. Za primer podesavanja na <a href="https://www.thunderbird.net/">Thundebird<a/a> mail klijentu mozete pogledati <a href="/mailsettings.png">sliku</a>. <p>
-			</main>
-		</div>
-	</body>
-</html>
@@ -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)
+
@@ -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)
+
@@ -0,0 +1,6 @@
+
+			</main>
+		</div>
+	</body>
+</html>
+
@@ -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
+
@@ -1,23 +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<a id="d" href="/index.html">▮</a></h1>
-			</div>
-			<main>
-				<ul class="nav">
-					<li><a href="#">Dogadjaji</a></li>
-					<li><a href="https://forum.dmz.rs">Forum</a></li>
-					<li><a href="./chat.html">Chat</a></li>
-				</ul>
-			</main>
-		</div>
-	</body>
-</html>
@@ -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)
@@ -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
+
@@ -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
+
@@ -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.
+
@@ -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)
+
@@ -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>
+
@@ -0,0 +1 @@
+2f069ecf-a1fc-4aaf-924c-de17efcde7a8
@@ -1,47 +1,90 @@
+@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-family: jetbrains-mono;
+	font-size: 3vw;
 }

 .container {
 	margin: 2rem auto;
-	margin-left: 2%;
-	
+	margin-left: 2vw;
+	margin-right: 1vw;
 }

 .header {
 	display: flex;
 	justify-content: center;
 	margin: 0 auto;
-	font: 12vw "Monospace", sans-serif;
+	font-family: facade;
+	font-size: 12vw;
 	color: #24ea26;
 }

 #d {
-	font: 18vw "Monospace", sans-serif;
+	float: right;
+	margin-right: 6vw;
+	margin-left: 1vw;
+	margin-bottom: 2vw;
+	background-color: #24ea26;
 }

 main  {
-
 	color: #24ea26;
 }

+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 {
-	text-decoration: none;
+	font-family: sligoil;
+	text-decoration: underline;
 	color: #24ea26;

 }
+
 a:visited {
 	text-decoration: none;
 }
+
 a:active {
 	text-decoration: none;
 }
+
 a:hover {
 	text-decoration: none;
 }

 main ul li {
-	font-size: 2rem;
+	font-size: 3vw;
 }

 main ul li:hover {
@@ -57,3 +100,25 @@ main ul li:before{
 	padding-right: 5px;	
 	color: #24ea26;
 }
+
+.back ul li {
+	text-align: right;
+	clear: both;
+}
+
+.back ul li:before {
+	content: "<";
+	padding-right: 5px;	
+	color: #24ea26;
+}
+
+#onama p {
+	font-size: 2vw;
+}
+
+.box {
+	float: left;
+	width: 25vw;
+	text-align: center;
+	padding: 1vw;
+}
Author	SHA1	Message	Date
andonome	fd90371b1a	add readme	2023-07-08 00:24:22 +02:00
andonome	65b5d1bd44	convert markdown to html	2023-07-08 00:17:35 +02:00
andonome	bb691259bb	remove markdown guff	2023-07-07 23:59:11 +02:00
andonome	b5434ff46f	convert site to markdown	2023-07-07 00:00:19 +02:00
fram3d	4be1d0e579	add services and events	2023-06-13 17:17:34 +02:00
fram3d	6af847150c	add servisi.html	2023-05-05 17:36:40 +02:00
fram3d	e93c1ea05e	rename saznaj vise to o nama	2023-01-12 21:32:33 +01:00
fram3d	d5a06ed5eb	add favico	2023-01-12 20:23:46 +01:00
fram3d	0e89645131	change title to lowercase	2023-01-12 20:18:36 +01:00
fram3d	5668ee1078	change logo to uppercase and remove box	2023-01-12 20:11:05 +01:00
fram3d	3071fb2ed8	add kontakt.html and saznajvise.html	2023-01-12 20:04:31 +01:00
fram3d	c258c4c94d	fix link in forum	2023-01-12 18:33:26 +01:00
fram3d	ca10ef8df3	change from old fonts to new	2023-01-12 18:28:53 +01:00
fram3d	0a9fb5ce14	add fonts	2023-01-12 18:15:20 +01:00
fram3d	1fd4a19440	Merge pull request 'Folder za slike i <a> tagovi' (#1 ) from arhetip/decentrala-website-static:master into master Reviewed-on: fram3d/decentrala-website-static#1	2023-01-06 02:54:50 +00:00
arhetip	bccd742744	Popravlje los <a> tag	2023-01-05 19:42:00 +01:00
arhetip	61691f710e	Prebacio sliku u folder za slike, dodao da svi linkovi budu podvuceni da bi ljudi znali da moze da se klikne na to	2023-01-05 19:38:16 +01:00
fram3d	fc13f84a11	change rectangle in logo to div	2023-01-05 13:19:31 +01:00
fram3d	4fff39d09a	make whole row for back bottun selectable	2023-01-05 07:50:36 +01:00
fram3d	481e448500	add back button	2023-01-05 07:40:19 +01:00
fram3d	94c075f4dc	add leading greater-than sign to dogadjaji.html	2023-01-05 07:17:55 +01:00
fram3d	c826b277ee	fix fonts in main.css	2023-01-05 07:13:33 +01:00
fram3d	c13cbe8955	make whole row in menu clickable	2023-01-05 03:07:20 +01:00
fram3d	b32f92e70b	add nalog.html	2023-01-04 08:43:32 +01:00
fram3d	950802a7d7	add what is decentrala to index.html	2023-01-04 08:29:26 +01:00
fram3d	6efb640e83	add mailsettings.png	2023-01-04 08:22:18 +01:00
fram3d	bded1e156a	add dogadjaji.html and forum.html and update chat.html	2023-01-04 08:20:10 +01:00