diff --git a/README.md b/README.md index de7add6..d6747b0 100644 --- a/README.md +++ b/README.md @@ -6,67 +6,4 @@ This repository will be automagically pulled by the web server each time somethi * `content/` → `*/common/content/` (everything else acessible by the web server) * `default.html` → `lostcave.ddnss.de/index.html` (http redirect) * `admin.php` → `admin.strassenkind.ip/index.php` (future management page, maybe for services, available sites, users, etc?) - * `strassenkind.php` `strassenkind.ip/index.php` (future status page) - - -Arbeit vom 06.01.2020 - -``` -Login-Funktionalität -Administrationsseiten - Webmaster’s Program - Moderation - Reports etc von Usern, Posts, etc - Theming (Logowechsel) - MotD, Gepinnte Posts auf der Startseite, Themenvorschläge - Thread- / Gruppenverwaltung - Server-Wartung - Bugreports - Status - Administrative Eingriffe - -Hauptfunktionen - Startseite - Newsfeed - Hot topics / Trending - Browse public forums - Forum-Funktionalität (Reddit style) -(o) Anonym (UID) / Nickname umschaltbar - DMs, Befreundungssystem - Random Chat zum Kennenlernen von Leuten - Gruppen- und Thread management - -(o) PDF shredder - - -Regeln - - -Mögliche Default-Channels - Memezz - Spam - F!ck1&g School! - Allgemeines Allgemeinforum -(o) Mit Altersnachweis: NSFW / NSFS -``` - -# Roadmap -Grober Zeitplan -* 2020-01-10 Entwurf fertig -* 2020-02-14 Implementierung -* intensives Testen / Debuggen -* Dokumentation nebenbei -* 2020-03-06 Einsatzbereit - -Entwicklungsziele -* 2020-01-12 Server-Wartung / Administration -* 2020-01-13 Startseite / Home page / Login / Newsfeed -* 2020-01-13 Registrierung -* 2020-01-17 Account management / Kontakte / User groups -* 2020-01-20 DMs -* 2020-01-24 Channels / Threads / Foren / Rollen-Management (generelle / öffentliche Channels; private Channels; Gruppenchannels) -* 2020-01-27 Forum / Thread / Channel / Chat management -* 2020-01-31 Profilseiten -* 2020-02-03 User home page (Benachrichtigungen, Profil, etc) -* 2020-02-07 Report-Funktionen -* To be continued \ No newline at end of file + * `strassenkind.php` → `strassenkind.ip/index.php` (future status page) diff --git a/admin_stuff/index.php b/admin_stuff/index.php new file mode 100644 index 0000000..f3dfc0a --- /dev/null +++ b/admin_stuff/index.php @@ -0,0 +1,41 @@ + + + + + + + + + + Status Page + + +
+

Website Name

+

+ Motto here +

+
+ +
+ Status + Link 2 + Link 3 +
+ +
+ 
$command

";
+                echo shell_exec($command);
+                echo"
\n"; + echo '
'; + } ?> + + + diff --git a/admin_stuff/lm4e_style.css b/admin_stuff/lm4e_style.css new file mode 100644 index 0000000..e2fa81b --- /dev/null +++ b/admin_stuff/lm4e_style.css @@ -0,0 +1,172 @@ +body { + background-color: #B6BDBD; + font-family: sans; + font-size: 12pt; + color: #000000; +} +h1, h2, h3, h4, h5, h6 { + font-family: times; +} +h3, h4, h5, h6 { + font-weight: normal; +} +p { + margin-left: 10px; + margin-top: 0px; +} +p.tiny{ + font-size: 5pt;} + +li { + margin-bottom: 1em; +} + +/* code blocks */ +pre { + margin-left: 20px; + margin-right: 20px; + margin-top: 0px; + background-color: white; + border-style: solid; + border-color: #888A85; + border-width: 1px; + font-size: 11pt; + font-family: monospace; +} + +pre.commandLine { + background-color: #2E3436; + color: #C3F097; +} + +span.structure { + color: #FCAF3E; + font-weight: bold; +} +span.primitive { + color: #729FCF; + font-weight: bold; +} +span.className { + color: #8AE234; + font-weight: bold; +} + +span.type { + color: #729FCF; +} +span.value { + color: #C17D11; +} +span.function { + color: #75507B; +} +span.name { + color: #8AE234; +} +span.comment { + color: #888A85; +} +/* in-line code block */ +span.codeBlockInText{ + background-color: white; + border-color: black; + border-style: solid; + border-width: 1px; + font-size: 11pt; + font-family: monospace; + padding-left: 5px; + padding-right: 5px; +} + + +a { + text-decoration: none; +} +a:link { + color: #90BA45; +} +a:hover { + color: #FF2A00; +} +a:visited { + color: #FCAF3E; +} + +ul { + margin-top: 0px; +} + +table { + position: absolute; + top: 0px; + left: 0px; + border-collapse: collapse; + width: 100%; +} + +td { + vertical-align: top; + margin: 0px; +} +td.left { +} +td.right{ +} +td.content { + background-color: #F2F0FF; +} +td.comment { + background-color: #D7DBD7; + font-style: italic; + font-size: 10pt; +} +td.comment p { + border-left-style: solid; + border-left-width: 3px; + margin-left: 3px; +} +p.explanation { + border-left-color: #8ED424; +} +p.general { + border-left-color: #888A85; +} +p.warning { + border-left-color: #EF2929; +} +td.spacer { + height: 120px; +} +@media only screen and (min-width: 1000px) { + td.left { + border-right-style: solid; + border-right-width: 1px; + } + td.right { + border-left-style: solid; + border-left-width: 1px; + } + td.content { + width: 800px; + } + td.comment { + width: 200px; + } +} + +@media only screen and (max-width: 999px) { + td.left{ + width: 0px; + } + td.right{ + width: 0px; + } + td.content { + width: 80%; + } + td.comment { + width: 20%; + } +} + diff --git a/admin_stuff/lm4e_template.css b/admin_stuff/lm4e_template.css new file mode 100644 index 0000000..be16d6e --- /dev/null +++ b/admin_stuff/lm4e_template.css @@ -0,0 +1,53 @@ + + + + + + Tab text + + + + + + + + + + + + +
+ +

Put some joke referring to the site’s contents

+

Head line

+

Disclaimer: This is a template file. Do not use unedited. +

+

+ Some text here. +

+ This is an in-line code block. + 		+

+ You will find some comments in this column:

+

+ General comments are gray.

+

+ Explanations are green and

+

+ warnings are red.

+ 		+
+ + + diff --git a/admin_stuff/nalquas_style.css b/admin_stuff/nalquas_style.css new file mode 100644 index 0000000..23812a6 --- /dev/null +++ b/admin_stuff/nalquas_style.css @@ -0,0 +1,203 @@ +/* ================== STYLING ================= */ + +* { + box-sizing: border-box; +} + +/* Body styling */ +body { + font-family: sans; + font-size: 12pt; + color: black; + background: #bdbdbd; + margin: 0; +} + +h1, h2, h3, h4, h5, h6 { + font-family: times; +} +h3, h4, h5, h6 { + font-weight: normal; +} + +p { + margin-top: 0px; +} +p.tiny { + font-size: 5pt; +} + +li { + margin-bottom: 1em; +} + +ul { + margin-top: 0px; +} + +pre { + margin-left: 20px; + margin-right: 20px; + margin-top: 0px; + background-color: white; + border-style: solid; + border-color: #888A85; + border-width: 1px; + font-size: 11pt; + font-family: monospace; +} +pre.commandLine { + background-color: #2E3436; + color: #C3F097; +} + +a { + text-decoration: none; +} +a:link { + color: #90BA45; +} +a:hover { + color: #FF2A00; +} +a:visited { + color: #FCAF3E; +} + +span.structure { + color: #FCAF3E; + font-weight: bold; +} +span.primitive { + color: #729FCF; + font-weight: bold; +} +span.className { + color: #8AE234; + font-weight: bold; +} +span.type { + color: #729FCF; +} +span.value { + color: #C17D11; +} +span.function { + color: #75507B; +} +span.name { + color: #8AE234; +} +span.comment { + color: #888A85; +} +/* in-line code block */ +span.codeBlockInText{ + background-color: white; + border-color: black; + border-style: solid; + border-width: 1px; + font-size: 11pt; + font-family: monospace; + padding-left: 5px; + padding-right: 5px; +} + +.disclaimer { + font-size: 8pt; + color: red; +} + +/* TODO The following is broken because we're not using tables anymore. + Find another solution. +*/ +p.explanation { + border-left-color: #8ED424; +} +p.general { + border-left-color: #888A85; +} +p.warning { + border-left-color: #EF2929; +} + +/* ================== LAYOUT ================== */ + +/* Header containing title etc. */ +.header { + text-align: center; + background: #795548; + color: white; + padding: 4px; +} + +/* Navigation bar at top of page */ +.navbar { + display: flex; + background-color: #4b2c20; +} + +/* Styling of navigation bar links */ +.navbar a { + color: white; + padding: 14px 20px; + text-decoration: none; + text-align: center; +} + +/* Change color of navigation bar links on hover */ +.navbar a:hover { + background-color: #a98274; + color: black; +} + +/* Align page elements in a row */ +.row { + display: flex; + flex-wrap: wrap; +} + +/* Sidebar column */ +.side { + flex: 15%; + font-size: 10pt; + font-style: italic; + background-color: #efefef; + padding: 20px; + max-width: 500px; +} + +/* Main column */ +.main { + flex: 40%; + background-color: #ffffff; + padding: 20px; + max-width: 1000px; +} + +/* Spacer */ +.spacer { + flex: auto; +} + +/* Footer */ +.footer { + padding: 20px; + text-align: center; + background: #8d8d8d; +} + +/* Adaptively change layout based on window size */ +@media only screen and (max-width: 1000px) { + .spacer { + display: none; + } + .main, .side { + max-width: none; + } +} +@media only screen and (max-width: 700px) { + .row, .navbar { + flex-direction: column; + } +} diff --git a/admin_stuff/nalquas_template.html b/admin_stuff/nalquas_template.html new file mode 100644 index 0000000..1e67630 --- /dev/null +++ b/admin_stuff/nalquas_template.html @@ -0,0 +1,75 @@ + + + + + + + Tab text + + + +
+

Website Name

+

+ Motto here +

+
+ + +
+ Link 1 + Link 2 + Link 3 +
+ + +
+
+
+

+ Put some joke referring to the site’s contents +

+

Head line

+

+ Disclaimer: This is a template file. Do not use unedited. +

+

+ Some text here. +

+ This is an in-line code block. +
+
+

+ You will find some comments in this column: +

+

+ General comments are gray. +

+

+ Explanations are green and +

+

+ warnings are red. +

+
+
+ + +
+ + +
+

+ Typical footer information
+ This page's layout has been reworked by Nalquas. +

+
+ + diff --git a/admin_stuff/pleazeeatme.html b/admin_stuff/pleazeeatme.html new file mode 100644 index 0000000..9766a59 --- /dev/null +++ b/admin_stuff/pleazeeatme.html @@ -0,0 +1,32 @@ + + + + + + + + + Status Page + + +
+

Website Name

+

+ Motto here +

+
+ +
+ Status + Link 2 + Link 3 +
+ +
+
$command

+hjvdusjmcvgsara nfozcd
+
+
+
+ + diff --git a/admin_stuff/putty.exe b/admin_stuff/putty.exe new file mode 100755 index 0000000..a9b4f49 Binary files /dev/null and b/admin_stuff/putty.exe differ diff --git a/admin_stuff/status.css b/admin_stuff/status.css new file mode 100644 index 0000000..06c5a8b --- /dev/null +++ b/admin_stuff/status.css @@ -0,0 +1,49 @@ +* { + box-sizing: border-box; +} + +body { + font-family: monospace; + font-size: 12pt; + background-color: #0b0b0b; + color: #ff6200; +} + +pre { + margin: 20px; + /*border-style: solid; + border-width: 2px; + border-top: 0px; + border-right: 0px; + border-left: 0px; + border-color: #ff6200;*/ + border-style: none; + background-color: #000000; + color: #ff6200; + font-family: monospace; + font-size: 11pt; + min-width: 500px; + max-width: 500px; +} + +.grid { + display: flex; + flex-direction: row; + /*align-items: center; + justify-content: center;*/ + flex-wrap: wrap; +} + +/* Info panel, only used for status pages */ +.panel { + flex: 50%; + padding: 4px; + padding-bottom: 32px; +} + +/* Adaptively change layout based on window size */ +/*@media only screen and (max-width: 1000px) { + .grid { + flex-direction: column; + } +}*/ diff --git a/admin_stuff/status_commands.txt b/admin_stuff/status_commands.txt new file mode 100644 index 0000000..1fbc6ea --- /dev/null +++ b/admin_stuff/status_commands.txt @@ -0,0 +1,7 @@ +who +df -h +systemctl status apache2.service +systemctl status mysql.service +systemctl status gitea.service +systemctl status sshd +apt list --upgradable diff --git a/commands_ondemand.conf b/commands_ondemand.conf new file mode 100644 index 0000000..55922e4 --- /dev/null +++ b/commands_ondemand.conf @@ -0,0 +1,2 @@ +sync +cat /var/log/apt-get_update_has_run; apt list --upgradable diff --git a/commands_status.conf b/commands_status.conf new file mode 100644 index 0000000..6b28666 --- /dev/null +++ b/commands_status.conf @@ -0,0 +1,7 @@ +systemctl status apache2.service +systemctl status sshd.service +systemctl status gitea.service +free +df -h +cat /var/run/reboot-required +who diff --git a/content/forwarding.php b/content/forwarding.php new file mode 100644 index 0000000..cfdfeda --- /dev/null +++ b/content/forwarding.php @@ -0,0 +1,13 @@ + + + + +e-Mail Verification + +Bitte senden sie nun zur Verifikation eine e-Mail mit folgendem Inhalt an \"authentication@lostcave.ddnss.de\":

"; +echo "

Blub Blub $user

"; +?> + \ No newline at end of file diff --git a/content/index.html b/content/index.html new file mode 100644 index 0000000..c9a0cee --- /dev/null +++ b/content/index.html @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/content/login.php b/content/login.php index 3ee6cca..42b23da 100644 --- a/content/login.php +++ b/content/login.php @@ -1,5 +1,5 @@ execute(array('authentication_string' => $authentication_string)); */ + //$result_name_by_auth = $Statement_name_by_auth->execute(array('authentication_string' => $authentication_string)); ?> diff --git a/content/signup.php b/content/signup.php new file mode 100644 index 0000000..735b97a --- /dev/null +++ b/content/signup.php @@ -0,0 +1,20 @@ + + + Sign Up + + + +

Willkommen bei der Registrierung!

+ + + +
+
+

Bitte gib einen Benutzernamen ein: +

Bitte gib eine E-Mail Adresse ein: +

Bitte gib ein Passwort ein: +

Bitte bestätige dein Passwort ein: + +

+ + diff --git a/content/yeet.php b/content/yeet.php new file mode 100644 index 0000000..c579306 --- /dev/null +++ b/content/yeet.php @@ -0,0 +1,16 @@ + + + + + <?php echo $blob + $mulm; ?> + + + " . $hello . "

"; + ?> + + \ No newline at end of file diff --git a/deployment-script.sh b/deployment-script.sh new file mode 100755 index 0000000..790a82f --- /dev/null +++ b/deployment-script.sh @@ -0,0 +1,4 @@ +#!/bin/bash +#do nothing for now. + +echo "Yeee!" diff --git a/index.html b/index.html index 48a6e5f..58c2f06 100644 --- a/index.html +++ b/index.html @@ -11,5 +11,8 @@ +
+ +