Merge pull request #18 from Smaragda2/Articles

Articles
Smaragda2 · Aug 30, 2023 · 18bec26 · 18bec26
2 parents 56053a1 + 1589e57
commit 18bec26
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 57 deletions.
diff --git a/admin/articles/allArticles.php b/admin/articles/allArticles.php
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container" style="width:100%;">
 <h2><b>Όλα τα Άρθρα</b></h2>
 
 <?php
@@ -16,20 +16,20 @@
 		print<<<END
         <div class="row" style="width:95%">
           <div class="col">
-            <label for="title">*Τίτλος</label>
+            <label for="title">Τίτλος</label>
             <input type="text" id="title" name="title" value="$articleTitle" readonly/>
           </div>
         </div>
         <div class="row" style="width:95%">
           <div class="col">
-            <label for="smallDescription">*Περιγραφή Άρθρου</label>
-            <textarea type="smallDescription" id="smallDescription" name="smallDescription" value="$smallDescription" rows="3" readonly">  </textarea>
+            <label for="smallDescription">Περιγραφή Άρθρου</label>
+            <textarea type="smallDescription" id="smallDescription" name="smallDescription" rows="3" readonly">$smallDescription</textarea>
           </div>
         </div>
         <div class="row" style="width:95%">
           <div class="col">
-            <label for="body">*Κείμενο Άρθρου</label>
-            <textarea type="body" id="body" name="body" value="$body" rows="7" readonly>  </textarea>
+            <label for="body">Κείμενο Άρθρου</label>
+            <textarea type="body" id="body" name="body" rows="7" readonly>$body</textarea>
           </div>
         </div>
         <br>

diff --git a/admin/articles/deleteArticle.php b/admin/articles/deleteArticle.php
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container" style="width:100%;">
 <h2><b>Διαγραφή Άρθρων</b></h2>
 
 <?php
@@ -29,13 +29,13 @@
         <div class="row" style="width:95%">
           <div class="col">
             <label for="smallDescription">*Περιγραφή Άρθρου</label>
-            <textarea type="smallDescription" id="smallDescription" name="smallDescription" value="$smallDescription" rows="3" readonly">  </textarea>
+            <textarea type="smallDescription" id="smallDescription" name="smallDescription" value="$smallDescription" rows="3" readonly">$smallDescription</textarea>
           </div>
         </div>
         <div class="row" style="width:95%">
           <div class="col">
             <label for="body">*Κείμενο Άρθρου</label>
-            <textarea type="body" id="body" name="body" value="$body" rows="7" readonly>  </textarea>
+            <textarea type="body" id="body" name="body" value="$body" rows="7" readonly>$body</textarea>
           </div>
         </div>
 

diff --git a/admin/articles/handleArticles.php b/admin/articles/handleArticles.php
@@ -27,9 +27,8 @@
 	if(isset($_POST['deleteSubmit'])){
 		$id = $_POST['id'];
 
-		$deleteArticle = "Update Product set isDeleted=true where id = ?";
-		$stmt = $mysqli->prepare($deleteArticle );
-		$stmt->bind_param('i', $id);
+		$deleteArticle = "Update Article set isDeleted=true where id = ".$id;
+		$stmt = $mysqli->prepare($deleteArticle);
 		$status = $stmt->execute();
 
 		if($status === false) {

diff --git a/admin/articles/newArticle.php b/admin/articles/newArticle.php
@@ -1,7 +1,7 @@
 <script>
 
 	function CheckRequired(){
-		var allEmpty = false;
+		var allFilled = false;
     var fieldExceedsMaxValue = false;
 
    var title = $("#title").val();
@@ -14,24 +14,27 @@ function CheckRequired(){
 
     var errorsMsg = "";
 
-		if(empty(title) && empty(description) && empty(body)){
-	        allEmpty = true;
+		if(title?.length == 0 || description?.length == 0 || body?.length == 0){
+	        allFilled = false;
 		}else{
-	        allEmpty = false;
+	        allFilled = true;
 		}
 
 
-    if (strlen(title) > titleMaxChars) {
+    if (title?.length > titleMaxChars) {
       errorsMsg = "Ο Τίτλος δεν μπορεί να ξεπερνάει τους " + titleMaxChars + " χαρακτήρες!\n";
+      fieldExceedsMaxValue = true;
     }
-    if (strlen(description) > descriptionMaxChars) {
+    if (description?.length > descriptionMaxChars) {
       errorsMsg += "Η Περιγραφή δεν μπορεί να ξεπερνάει τους " + descriptionMaxChars + " χαρακτήρες!\n";
+      fieldExceedsMaxValue = true;
     }
-    if (strlen(body) > bodyMaxChars) {
+    if (body?.length > bodyMaxChars) {
       errorsMsg += "Ο Κείμενο του Άρθρου δεν μπορεί να ξεπερνάει τους " + bodyMaxChars + " χαρακτήρες!\n";
+      fieldExceedsMaxValue = true;
     }
 
-		if(allEmpty){
+		if(!allFilled){
 			document.getElementById("errors").innerText = "Παρακαλώ συμπληρώστε όλα τα πεδία με αστερίσκο (*).";
 			$("#addSubmit").attr('disabled', true);
 			$("#addSubmit").attr('style','background-color:gray');
@@ -48,8 +51,9 @@ function CheckRequired(){
 
 </script>
 
-<div class="container">
+<div class="container" style="width:100%;">
   <h2><b>Προσθήκη Άρθρου</b></h2>
+  <h4 style="color: red;"><b>*Τα Emojis δεν υποστηρίζονται!</b></h4>
   <?php
   		print<<<END
   			<form action="?p=handleArticles" method="POST" enctype="multipart/form-data" class="needs-validation" style="width:100%" onload="CheckRequired();" novalidate>
@@ -62,13 +66,13 @@ function CheckRequired(){
           <div class="row" style="width:95%">
             <div class="col">
               <label for="smallDescription">*Περιγραφή Άρθρου</label>
-              <textarea type="smallDescription" id="smallDescription" name="smallDescription" value="Τι θα δει ο χρήστης πριν ανοίξει το Άρθρο" rows="3" onkeyup="CheckRequired();">  </textarea>
+              <textarea type="smallDescription" id="smallDescription" name="smallDescription" value="Τι θα δει ο χρήστης πριν ανοίξει το Άρθρο" rows="3" onkeyup="CheckRequired();"></textarea>
             </div>
           </div>
           <div class="row" style="width:95%">
             <div class="col">
               <label for="body">*Κείμενο Άρθρου</label>
-              <textarea type="body" id="body" name="body" value="Το κείμενο του άρθρου" rows="7" onkeyup="CheckRequired();">  </textarea>
+              <textarea type="body" id="body" name="body" value="Το κείμενο του άρθρου" rows="7" onkeyup="CheckRequired();"></textarea>
             </div>
           </div>
 

diff --git a/admin/index.php b/admin/index.php
@@ -61,20 +61,21 @@
 								<li><a href="?p=createAppointment">Δημιουργία Ραντεβού</a></li>
 							</ul>
 						</li>
-						<li>
-							<a href="#"><i class="fa fa-gear"> Ρυθμίσεις</i></a>
-							<ul>
-								<li><a href="?p=TimeslotSettings">Ημέρες και Ώρες Ραντεβού</a></li>
-							</ul>
-						</li>
 						<li>
 							<a href="#">Άρθρα</a>
 							<ul>
+								<li><a href="?p=Articles">Όλα τα Άρθρα</a></li>
 								<li><a href="?p=newArticle">Προσθήκη Νέου Άρθρου</a></li>
 								<li><hr></li>
 								<li><a href="?p=deleteArticle">Διαγραφή Άρθρου</a></li>
 							</ul>
 						</li>
+						<li>
+							<a href="#"><i class="fa fa-gear"> Ρυθμίσεις</i></a>
+							<ul>
+								<li><a href="?p=TimeslotSettings">Ημέρες και Ώρες Ραντεβού</a></li>
+							</ul>
+						</li>
 						<li>
 						<?php
 							if($_SESSION['admin'] == 'ok'){

diff --git a/articles/article.php b/articles/article.php
@@ -1,20 +1,22 @@
 <?php
  	$mysqli = $_SESSION['dbconnect'];
- 	$getArticles = "SELECT * FROM Article where id=?";
+ 	$getArticles = "SELECT id, title, body FROM Article where id=".$_POST['id'];
 	$stmt = $mysqli->prepare($getArticles);
-  $stmt->bind_param("i", $_POST['id']);
 	$stmt->execute();
 	$results = $stmt->get_result();
 
  	$row = $results->fetch_row();
 
-	$id = $row['id'];
-	$articleTitle = $row['title'];
-	$body = $row['body'];
-?>
-<div class="Container">
-  <div class="jumbotron row" style="width:100%;">
-    <p class="articlesTitle"><?php $articleTitle ?></p>
-    <p class="articleBody"><?php $body ?></p>
+	$id = $row[0];
+	$articleTitle = $row[1];
+	$body = $row[2];
+
+  print<<<END
+  <div class="Container" style="width:100%;">
+    <p style="width: 100%;"><b>Τίτλος Άρθρου:</b> $articleTitle</p>
+    <div class="jumbotron" style="width:100%;">
+      <p class="articleBody col">$body</p>
+    </div>
   </div>
-</div>
+END;
+?>
diff --git a/articles/articles.php b/articles/articles.php
@@ -1,4 +1,4 @@
-<div class="Container">
+<div class="Container" style="width:100%;">
 <?php
  	$mysqli = $_SESSION['dbconnect'];
  	$getArticles = "SELECT * FROM Article where isDeleted=false";
@@ -11,24 +11,19 @@
 		$articleTitle = $row['title'];
 		$smallDescription = $row['smallDescription'];
 
-  print<<<END
-  <div class="jumbotron row" style="width:100%;">
-    <p class="articlesTitle">$articleTitle</p>
-    <p class="articleDescription">$smallDescription</p>
-    <form action="?p=Article" method="POST" enctype="multipart/form-data" class="needs-validation" style="width:100%" novalidate>
-      <input type="hidden" id="id" name="id" value="$id"/>
-      <input type="submit" name="Submit" value="Διάβασε το Άρθρο"/>
-    </form>
-  </div>
-END;
-  }
-
-  if ($result->num_rows == 0) {
     print<<<END
-    <div class="jumbotron row" style="width:100%;">
-      <p>Δεν βρέθηκε κάποιο Άρθρο.</p>
+    <p style="width: 100%;"><b>Τίτλος Άρθρου:</b> $articleTitle</p>
+    <div class="jumbotron " style="width:100%;">
+      <div class="col">$smallDescription</div>
+      <br>
+      <form action="?p=Article" method="POST" enctype="multipart/form-data" class="needs-validation" style="width:100%" novalidate>
+        <input type="hidden" id="id" name="id" value="$id"/>
+        <input type="submit" name="Submit" value="Διάβασε το Άρθρο"/>
+      </form>
     </div>
-  END;
+    <hr>
+    <br>
+END;
   }
 ?>
 </div>
diff --git a/assets/css/main.css b/assets/css/main.css
@@ -184,6 +184,12 @@ select, textarea {
 		padding: 1em 0 1em 2em;
 	}
 
+/* Articles */
+	.articleBody {
+		white-space: pre-wrap;
+    text-align: left;
+	}
+
 /* Container */
 
 	.container {