From cc389eb179b6a9366855886cfb9930bd71a0b9a8 Mon Sep 17 00:00:00 2001
From: Matthias Grief <matthias.grief@alumni.fh-aachen.de>
Date: Tue, 19 Nov 2024 22:24:37 +0100
Subject: [PATCH] =?UTF-8?q?Einr=C3=BCckungen=20und=20Zeilenumbr=C3=BCche?=
 =?UTF-8?q?=20vereinheitlicht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webseite/assets/css/subject.css  | 11 ++--
 webseite/assets/css/topic.css    |  1 -
 webseite/classes/SubjectData.php |  2 +-
 webseite/classes/TopicData.php   |  2 +-
 webseite/classes/Util.php        |  2 +-
 webseite/subject.php             |  6 ++-
 webseite/topic.php               | 89 +++++++++++++++++---------------
 7 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/webseite/assets/css/subject.css b/webseite/assets/css/subject.css
index fb4faa0..de96c61 100644
--- a/webseite/assets/css/subject.css
+++ b/webseite/assets/css/subject.css
@@ -209,7 +209,7 @@ body {
     align-items: center;
     justify-content: center;
     gap: 0.5rem;
-    transform: translateY(0);  /* Set initial transform state */
+    transform: translateY(0); /* Set initial transform state */
 }
 
 .download-btn:hover {
@@ -240,6 +240,7 @@ body {
     .search-container {
         width: 100%;
     }
+
     .menu-toggle {
         display: flex !important;
     }
@@ -298,8 +299,12 @@ body {
 
 /* Add floating animation for icons */
 @keyframes float {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-10px); }
+    0%, 100% {
+        transform: translateY(0);
+    }
+    50% {
+        transform: translateY(-10px);
+    }
 }
 
 .theme-toggle:hover {
diff --git a/webseite/assets/css/topic.css b/webseite/assets/css/topic.css
index 307638b..4721a8f 100644
--- a/webseite/assets/css/topic.css
+++ b/webseite/assets/css/topic.css
@@ -1,4 +1,3 @@
-
 /* Corporate Design Colors */
 :root {
     --primary-color: #5265A0; /* HSGG Blau */
diff --git a/webseite/classes/SubjectData.php b/webseite/classes/SubjectData.php
index 7e2cfa0..87c9db0 100644
--- a/webseite/classes/SubjectData.php
+++ b/webseite/classes/SubjectData.php
@@ -84,7 +84,7 @@ class SubjectData
         $subjectDirectory = "config/subjects/$subjectId";
         $filename = "$subjectDirectory/properties.json";
         $data = Util::parseJsonFromFile($filename);
-        if(!isset($data)) {
+        if (!isset($data)) {
             return null;
         }
 
diff --git a/webseite/classes/TopicData.php b/webseite/classes/TopicData.php
index 42b983d..66bbac4 100644
--- a/webseite/classes/TopicData.php
+++ b/webseite/classes/TopicData.php
@@ -90,7 +90,7 @@ class TopicData
         $topicsDirectory = "config/subjects/$subjectId/topics";
         $topicDataDirectory = "$topicsDirectory/$topicId";
         $data = Util::parseJsonFromFile("$topicDataDirectory/properties.json");
-        if(!isset($data)) {
+        if (!isset($data)) {
             return null;
         }
 
diff --git a/webseite/classes/Util.php b/webseite/classes/Util.php
index 0df7596..e83349f 100644
--- a/webseite/classes/Util.php
+++ b/webseite/classes/Util.php
@@ -41,7 +41,7 @@ class Util
     static function parseJsonFromFile(string $filename): mixed
     {
         $content = self::readFileContent($filename);
-        if(!isset($content)) {
+        if (!isset($content)) {
             return null;
         }
         return json_decode($content);
diff --git a/webseite/subject.php b/webseite/subject.php
index 7a0fb8e..36929e5 100644
--- a/webseite/subject.php
+++ b/webseite/subject.php
@@ -51,7 +51,8 @@ $topics = $subjectData->topics;
     <button class="menu-toggle h-12 w-12 border-2 p-1 hover:border-[<?php echo($subjectData->color); ?>]">
         <i class="fas fa-bars"></i>
     </button>
-    <input type="text" class="search-box p-3 border-2 w-full focus:border-[<?php echo($subjectData->color); ?>]" id="searchInput" placeholder="Suche nach Themen, Übungen oder Hilfe..."
+    <input type="text" class="search-box p-3 border-2 w-full focus:border-[<?php echo($subjectData->color); ?>]"
+           id="searchInput" placeholder="Suche nach Themen, Übungen oder Hilfe..."
            oninput="handleSearch()">
 </div>
 
@@ -108,7 +109,8 @@ $topics = $subjectData->topics;
 
                             <a onclick="event.stopPropagation();"
                                href="<?php echo("config/subjects/$subjectData->id/topics/$topicData->id/$fileName") ?>"
-                               target="_blank" download class="download-btn border-2 border-[<?php echo($subjectData->color); ?>]">
+                               target="_blank" download
+                               class="download-btn border-2 border-[<?php echo($subjectData->color); ?>]">
                                 <i class="fas fa-file-pdf"></i>
                                 <?php echo($fileName); ?>
                             </a>
diff --git a/webseite/topic.php b/webseite/topic.php
index beebe79..d2197d3 100644
--- a/webseite/topic.php
+++ b/webseite/topic.php
@@ -61,58 +61,61 @@ if (!isset($topicData)) {
 <!-- Main Content -->
 <main class="main-content">
     <div class="max-w-7xl mt-5">
-    <div class="mt-16"></div>
+        <div class="mt-16"></div>
 
-    <div class="related-topics bg-gray-100 p-4 rounded-lg">
-        <h4>Verwandte Themen:</h4>
-        <ul class="flex flex-wrap gap-2">
-            <?php
-            foreach ($topicData->relatedTopics as $relatedTopicName) {
-                $relatedTopic = $subjectData->topics[$relatedTopicName];
-                if (!isset($relatedTopic)) {
-                    continue;
-                }
-                ?>
-                <li onclick="event.stopPropagation();" class="border-[<?php echo($subjectData->color); ?>] border-2">
-                    <a href='<?php echo("topic.php?subject=$subjectData->id&topic=$relatedTopic->id") ?>' class="block">
-                        <?php echo($relatedTopic->displayName); ?>
-                    </a>
-                </li>
+        <div class="related-topics bg-gray-100 p-4 rounded-lg">
+            <h4>Verwandte Themen:</h4>
+            <ul class="flex flex-wrap gap-2">
                 <?php
-            }
-            ?>
-        </ul>
-    </div>
-
-    <div class="content-card mt-[8px]">
-        <h1 class="content-title"><?php echo($topicData->displayName); ?></h1>
-        <p class="content-text">
-            <?php echo($topicData->description); ?>
-        </p>
-        <p class="content-text article-section">
-            <?php echo($topicData->article); ?>
-        </p>
-
-        <div class="exercise-section bg-gray-100">
-            <h3 style="margin-bottom: 1rem;" class="text-[var(--primary-color)]">Übungen herunterladen:</h3>
-            <div style="display: flex; flex-wrap: wrap; gap: 0.5rem;">
-                <?php
-                foreach ($topicData->files as $fileName) {
+                foreach ($topicData->relatedTopics as $relatedTopicName) {
+                    $relatedTopic = $subjectData->topics[$relatedTopicName];
+                    if (!isset($relatedTopic)) {
+                        continue;
+                    }
                     ?>
-
-                    <a href='<?php echo("config/subjects/$subjectData->id/topics/$topicData->id/$fileName") ?>'
-                       target="_blank" download class="download-btn border-[<?php echo($subjectData->color); ?>] border-2">
-                        <i class="fas fa-file-pdf"></i>
-                        <?php echo($fileName); ?>
-                    </a>
-
+                    <li onclick="event.stopPropagation();"
+                        class="border-[<?php echo($subjectData->color); ?>] border-2">
+                        <a href='<?php echo("topic.php?subject=$subjectData->id&topic=$relatedTopic->id") ?>'
+                           class="block">
+                            <?php echo($relatedTopic->displayName); ?>
+                        </a>
+                    </li>
                     <?php
                 }
                 ?>
+            </ul>
+        </div>
+
+        <div class="content-card mt-[8px]">
+            <h1 class="content-title"><?php echo($topicData->displayName); ?></h1>
+            <p class="content-text">
+                <?php echo($topicData->description); ?>
+            </p>
+            <p class="content-text article-section">
+                <?php echo($topicData->article); ?>
+            </p>
+
+            <div class="exercise-section bg-gray-100">
+                <h3 style="margin-bottom: 1rem;" class="text-[var(--primary-color)]">Übungen herunterladen:</h3>
+                <div style="display: flex; flex-wrap: wrap; gap: 0.5rem;">
+                    <?php
+                    foreach ($topicData->files as $fileName) {
+                        ?>
+
+                        <a href='<?php echo("config/subjects/$subjectData->id/topics/$topicData->id/$fileName") ?>'
+                           target="_blank" download
+                           class="download-btn border-[<?php echo($subjectData->color); ?>] border-2">
+                            <i class="fas fa-file-pdf"></i>
+                            <?php echo($fileName); ?>
+                        </a>
+
+                        <?php
+                    }
+                    ?>
+                </div>
             </div>
         </div>
     </div>
-    </div>
 </main>
 
 <footer class="sticky top-[100vh] lg:ms-[280px] w-full lg:w-auto bg-white/80 backdrop-blur-lg shadow-sm p-5">