niklas.ortmann/webprogrammierung
0
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev auf main #68

Open
niklas.ortmann wants to merge 1044 commits from devNachCSRF into main
pull from: devNachCSRF
merge into: niklas.ortmann:main
Conversation 0 Commits 1044 Files Changed 106
+73 -229
7 changed files with 73 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5c4a1d1d91 - Show all commits
404.php
+35
View File
@@ -0,0 +1,35 @@
<!--
Seite: 404 Seite nicht gefunden
Funktion: Wenn eine Seite nicht gefunden wurde oder noch fehlt,dann wird hierauf verwiesen.
-->
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta name="description" content="EduForge">
<meta name="author" content="Niklas Ortmann">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="icon" type="image/x-icon" href="images/logos/logo_icon.ico">
<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="css/navbar.css">
<title>EduForge</title>
</head>
<body>
<main>
<h1>404 - Seite nicht vorhanden</h1>
</main>
<footer style="position:fixed;bottom:0;width:100%;background:#fff;text-align:center;">
<a href="legal/impressum.php">Impressum</a>
<a href="legal/datenschutz.php">Datenschutz</a>
<a href="legal/nutzungsbedingungen.php">Nutzungsbedingungen</a>
</footer>
</body>
</html>
README.md
+4 -1
View File
@@ -7,4 +7,7 @@ Abgabe zu Aufgabenblatt 1
Hinweise:
index.html wurde zu einer index.php umbenannt.
webhook.php bitte ignorieren. Diese dient nur als zukünftige Automatisierung des Repo-Pulls (s. https://docs.gitea.com/usage/webhooks)
webhook.php bitte ignorieren. Diese dient nur als zukünftige Automatisierung des Repo-Pulls (s. https://docs.gitea.com/usage/webhooks)
Beim Verwenden der Navbar-Links bitte Folgendes beachten: nur die Links Physik, Mathe, Informatik fürhen auf eine andere Seite.
Die anderen Links sind erstmal Platzhalter, dessen dynamischer Inhalt später mit PHP in die index.php eingefügt wird.
content/informatik.php
+2 -50
View File
@@ -1,46 +1,7 @@
<!--
<!--
Seite: Informatik
Inhalt: Eine Übersicht über alle Beiträge zum Fach
-->
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta name="description" content="EduForge">
<meta name="author" content="Niklas Ortmann">
<link rel="stylesheet" href="../css/main.css" />
<title>EduForge</title>
</head>
<body>
<nav style="background:#808080; height: 60px;">
<div style="float:left; text-align: center;">
<a href="../index.php">
<img src="../images/logos/logo.png" alt="" style="height: 44px;">
</a>
|
<a href = "informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
|
<a href = "mathe.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Mathe</b></a>
|
<a href = "physik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Physik</b></a>
|
<a href = "profile.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
|
</div>
<div style="float:right; text-align: center;">
<?php
include_once '../includes/search.php';
?>
|
<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
</div>
</nav>
<main>
<h1>Informatik</h1>
@@ -57,13 +18,4 @@
<div>
<a href="../articles/datenschutz.php">Datenschutz vs. Datensicherheit</a>
</div>
</main>
<footer style="position:fixed;bottom:0;width:100%;background:#fff;text-align:center;">
<a href="../legal/impressum.php">Impressum</a>
<a href="../legal/datenschutz.php">Datenschutz</a>
<a href="../legal/nutzungsbedingungen.php">Nutzungsbedingungen</a>
</footer>
</body>
</html>
</main>
content/mathe.php
+1 -50
View File
@@ -2,47 +2,7 @@
Seite: Mathe
Inhalt: Eine Übersicht über alle Beiträge zum Fach
-->
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta name="description" content="EduForge">
<meta name="author" content="Niklas Ortmann">
<link rel="stylesheet" href="../css/main.css" />
<title>EduForge</title>
</head>
<body>
<nav style="background:#808080; height: 60px;">
<div style="float:left; text-align: center;">
<a href="../index.php">
<img src="../images/logos/logo.png" alt="" style="height: 44px;">
</a>
|
<a href = "informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
|
<a href = "mathe.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Mathe</b></a>
|
<a href = "physik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Physik</b></a>
|
<a href = "profile.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
|
</div>
<div style="float:right; text-align: center;">
<?php
include_once '../includes/search.php';
?>
|
<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
</div>
</nav>
<main>
<h1>Mathe</h1>
<p>
@@ -58,13 +18,4 @@
<div>
<a href="../articles/pythagoras.php">Satz des Pythagoras</a>
</div>
</main>
<footer style="position:fixed;bottom:0;width:100%;background:#fff;text-align:center;">
<a href="../legal/impressum.php">Impressum</a>
<a href="../legal/datenschutz.php">Datenschutz</a>
<a href="../legal/nutzungsbedingungen.php">Nutzungsbedingungen</a>
</footer>
</body>
</html>
</main>
content/physik.php
+1 -49
View File
@@ -2,45 +2,6 @@
Seite: Physik
Inhalt: Eine Übersicht über alle Beiträge zum Fach
-->
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta name="description" content="EduForge">
<meta name="author" content="Niklas Ortmann">
<link rel="stylesheet" href="../css/main.css" />
<title>EduForge</title>
</head>
<body>
<nav style="background:#808080; height: 60px;">
<div style="float:left; text-align: center;">
<a href="../index.php">
<img src="../images/logos/logo.png" alt="" style="height: 44px;">
</a>
|
<a href = "informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
|
<a href = "mathe.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Mathe</b></a>
|
<a href = "physik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Physik</b></a>
|
<a href = "profile.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
|
</div>
<div style="float:right; text-align: center;">
<?php
include_once '../includes/search.php';
?>
|
<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
</div>
</nav>
<main>
<h1>Physik</h1>
@@ -59,13 +20,4 @@
<a href="../articles/tunneleffekt.php">Der Tunneleffekt</a>
</div>
</main>
<footer style="position:fixed;bottom:0;width:100%;background:#fff;text-align:center;">
<a href="../legal/impressum.php">Impressum</a>
<a href="../legal/datenschutz.php">Datenschutz</a>
<a href="../legal/nutzungsbedingungen.php">Nutzungsbedingungen</a>
</footer>
</body>
</html>
</main>
content/profile.php
+2 -51
View File
@@ -2,48 +2,8 @@
Seite: Profil
Inhalt: Das eigene Profil, wenn man angemeldet ist. Dort hat man die Möglichkeit seine Angaben zu ändern.
-->
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="utf-8">
<meta name="description" content="EduForge">
<meta name="author" content="Niklas Ortmann">
<link rel="stylesheet" href="../css/main.css" />
<title>EduForge</title>
</head>
<body>
<nav style="background:#808080; height: 60px;">
<div style="float:left; text-align: center;">
<a href="../index.php">
<img src="../images/logos/logo.png" alt="" style="height: 44px;">
</a>
|
<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
|
<a href = "../content/mathe.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Mathe</b></a>
|
<a href = "../content/physik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Physik</b></a>
|
<a href = "../content/profile.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Dein Profil</b></a>
|
</div>
<div style="float:right; text-align: center;">
<?php
include_once '../includes/search.php';
?>
|
<a href = "../auth/login.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Anmelden </a>
<a href = "../auth/register.php" style = "background-color: #f44336; color: white; padding: 4px 20px; text-align: center; text-decoration: none; display: inline-block;"> Registrieren </a>
</div>
</nav>
<main>
<hr>
<hr>
<div>
<div>
<h1>Benutzerdaten ändern</h1>
@@ -72,13 +32,4 @@
</div>
</div>
</div>
</main>
<footer style="position:fixed;bottom:0;width:100%;background:#fff;text-align:center;">
<a href="../legal/impressum.php">Impressum</a>
<a href="../legal/datenschutz.php">Datenschutz</a>
<a href="../legal/nutzungsbedingungen.php">Nutzungsbedingungen</a>
</footer>
</body>
</html>
</main>
includes/navbar.php
+28 -28
View File
@@ -16,8 +16,8 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
<ul id="mobile-nav" class="nav__mobile-menu">
<li><a href="auth/login.php">Anmelden</a></li>
<li><a href="content/mathe.php">Mathe</a></li>
<li><a href="content/physik.php">Physik</a></li>
<li><a href="404.php">Mathe</a></li>
<li><a href="404.php">Physik</a></li>
</ul>
<!-- normale Navbar (Desktop) -->
@@ -25,47 +25,47 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
<div class="nav__item nav__dropdown">
<button class="nav__dropdown-toggle">Sprachen</button>
<div class="nav__dropdown-menu">
<a href="content/deutsch.php">Deutsch</a>
<a href="content/englisch.php">Englisch</a>
<a href="content/franzoesisch.php">Französisch</a>
<a href="content/latein.php">Latein</a>
<a href="content/literatur.php">Literatur</a>
<a href="404.php">Deutsch</a>
<a href="404.php">Englisch</a>
<a href="404.php">Französisch</a>
<a href="404.php">Latein</a>
<a href="404.php">Literatur</a>
</div>
</div>
<div class="nav__item nav__dropdown">
<button class="nav__dropdown-toggle">MINT</button>
<div class="nav__dropdown-menu">
<a href="content/mathematik.php">Mathematik</a>
<a href="content/biologie.php">Biologie</a>
<a href="content/chemie.php">Chemie</a>
<a href="content/physik.php">Physik</a>
<a href="content/informatik.php">Informatik</a>
<a href="content/astronomie.php">Astronomie</a>
<a href="404.php">Mathematik</a>
<a href="404.php">Biologie</a>
<a href="404.php">Chemie</a>
<a href="404.php">Physik</a>
<a href="404.php">Informatik</a>
<a href="404.php">Astronomie</a>
</div>
</div>
<div class="nav__item nav__dropdown">
<button class="nav__dropdown-toggle">Gesellschaft & Werte</button>
<div class="nav__dropdown-menu">
<a href="content/geschichte.php">Geschichte</a>
<a href="content/erdkunde.php">Erdkunde</a>
<a href="content/sozialkunde.php">Sozialkunde</a>
<a href="content/wirtschaftskunde.php">Wirtschaftskunde</a>
<a href="content/religion.php">Religion</a>
<a href="content/ethik.php">Ethikunterricht</a>
<a href="content/philosophie.php">Philosophie</a>
<a href="content/psychologie.php">Psychologie</a>
<a href="content/kunst.php">Kunst</a>
<a href="content/musik.php">Musik</a>
<a href="content/theater.php">Theater</a>
<a href="404.php">Geschichte</a>
<a href="404.php">Erdkunde</a>
<a href="404.php">Sozialkunde</a>
<a href="404.php">Wirtschaftskunde</a>
<a href="404.php">Religion</a>
<a href="404.php">Ethikunterricht</a>
<a href="404.php">Philosophie</a>
<a href="404.php">Psychologie</a>
<a href="404.php">Kunst</a>
<a href="404.php">Musik</a>
<a href="404.php">Theater</a>
</div>
</div>
<div class="nav__item nav__dropdown">
<button class="nav__dropdown-toggle">Technik & Praxis</button>
<div class="nav__dropdown-menu">
<a href="content/technik.php">Technik</a>
<a href="content/werken.php">Werken</a>
<a href="content/hauswirtschaft.php">Hauswirtschaft</a>
<a href="content/sport.php">Sport</a>
<a href="404.php">Technik</a>
<a href="404.php">Werken</a>
<a href="404.php">Hauswirtschaft</a>
<a href="404.php">Sport</a>
</div>
</div>
</div>