From d9bce23822117d03b1630f002d3ee0491ac83d4b Mon Sep 17 00:00:00 2001
From: Geo Halkiadakis <gchalkiadakis@sklavenitis.co.gr>
Date: Thu, 20 Apr 2023 17:10:06 +0300
Subject: hashing passwords; compatibility with dotNet

---
 public/app/routes/backend.php          |  14 ++-
 public/app/views/admin/admin-menu.php  |  10 +--
 public/app/views/admin/edit_lesson.php | 152 +++++++++++++++++++++++++++++++++
 public/app/views/admin/new_lesson.php  | 144 -------------------------------
 public/app/views/admin/skeleton.php    |  28 ++++--
 5 files changed, 189 insertions(+), 159 deletions(-)
 create mode 100644 public/app/views/admin/edit_lesson.php
 delete mode 100644 public/app/views/admin/new_lesson.php

(limited to 'public/app')

diff --git a/public/app/routes/backend.php b/public/app/routes/backend.php
index 5356407..88bf4b8 100644
--- a/public/app/routes/backend.php
+++ b/public/app/routes/backend.php
@@ -88,11 +88,21 @@ Route::add('/admin/api/privileges', function () {
 
 // new lesson
 // -----------------------------------------------------------------------------
-Route::add('/admin/new_lesson', function () {
+Route::add('/admin/edit_lesson', function () {
     Auth::allowRoles([1, 2, 3]);    // allow few admin-panel roles
     Render::view('admin/skeleton', [
         'title' => 'Νέο Μάθημα',
-        'action' => 'new_lesson'
+        'action' => 'edit_lesson',
     ]);
 });
 
+// new lesson
+// -----------------------------------------------------------------------------
+Route::add('/admin/edit_lesson/([0-9]*)', function ($id) {
+    Auth::allowRoles([1, 2, 3]);    // allow few admin-panel roles
+    Render::view('admin/skeleton', [
+        'title' => 'Νέο Μάθημα',
+        'action' => 'edit_lesson',
+        'id' => intval($id)
+    ]);
+});
diff --git a/public/app/views/admin/admin-menu.php b/public/app/views/admin/admin-menu.php
index d7e7b09..a06d2eb 100644
--- a/public/app/views/admin/admin-menu.php
+++ b/public/app/views/admin/admin-menu.php
@@ -4,26 +4,26 @@
  * 
  * imported variables:
  * ---
- * @param $action (string) : array of articles
+ * @param $action (string): array of articles
+ * @param $id (int): id of entity (when editing entity) | 0: new entity
  * 
  * example call:
  * ---
  * Render::template("sections/admin_panel.php",[
  *      'action' => 'posts',
+ *      'id' => 4
  * ])
  * -----------------------------------------------------------------------------
  */
 
-
 $admin_options = [
-    'new_lesson' => 'Νέο Μάθημα',
+    'edit_lesson' => 'Νέο Μάθημα',
     'lessons' => 'Μαθήματα',
     'categories' => 'Κατηγορίες',
     'pages' => 'Σελίδες',
     'privileges' => 'Πρόσβαση',
     'users' => 'Χρήστες'
 ];
-
 ?>
 
 <div class="top-bar">
@@ -32,7 +32,7 @@ $admin_options = [
 
     <?php foreach($admin_options as $opt => $label) : ?>
 
-        <?php if ($opt == $action) : ?>
+        <?php if (($opt == $action) & (!$id)) : ?> 
             <span class="btn btn-primary selected"><?=$label?></span>
 
         <?php else : ?>
diff --git a/public/app/views/admin/edit_lesson.php b/public/app/views/admin/edit_lesson.php
new file mode 100644
index 0000000..30dd42f
--- /dev/null
+++ b/public/app/views/admin/edit_lesson.php
@@ -0,0 +1,152 @@
+<?php 
+    // some labels (if editing new or existing record)
+    // --- -- -- - - -
+    if ($id == 0) {
+        $action_title = "Δημιουργία Μαθήματος";
+        $action_button = "Δημιουργία";
+
+    } else {
+        $action_title = "Επεξεργασία Μαθήματος";
+        $action_button = "Αποθήκευση Αλλαγών";
+    }
+?>
+
+<!-- title bar -->
+<div class="title-bar">
+    <div><h5><?=$action_title?></h5></div>
+    <div>
+        <button type="button" class="btn pull-right"
+            data-toggle="modal" data-target="#editorModal" data-action="preview">
+            <i class="fas fa-search"></i> &nbsp; Προεπισκόπηση
+        </button>
+    </div>
+</div>
+
+<!-- manage -->
+<div class="manage edit-post">
+    <form>
+        <div class="row">
+
+        
+            <div class="col col-8">
+        
+                <!-- id (hidden) -->
+                <input type="hidden" name="id" value="0"><!-- action = (0) ? 'new' : 'edit' -->
+
+                <!--
+                <div class="row form-group">
+                    <input type="date" name="date" value="" readonly="">
+                </div>
+                -->
+
+                <div class="row form-group">
+                    <label class="control-label col-sm-12" for="title">Τίτλος</label>
+                    <div class="col-sm-12">
+                        <input class="form-control form-control-sm" type="text" name="title" value="" required="">
+                    </div>
+                </div>
+
+                <div class="row form-group">
+                    <label class="control-label col-sm-12" for="category_id">Κατηγορία</label>
+                    <div class="col-sm-12">
+                        <select class="form-control form-control-sm" id="category_id" name="category_id" required></select>
+                    </div>
+                </div>
+
+                <!-- Post body -->
+                <div class="row form-group">
+                    <label class="control-label col-sm-12" for="body">Κείμενο</label>
+                    <div class="col-sm-12">
+                        <textarea class="form-control form-control-sm" type="text" name="body" value="" required=""></textarea>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="col">
+
+                <div class="row form-group">
+                <label class="control-label col-sm-12" for="status">Κατάσταση</label>
+                    <div class="col-sm-12">
+                        <select class="form-control form-control-sm form-select form-select-sm" name="status" onchange="this.dataset.chosen = this.value;">
+                            <option value="0">Αδημοσίευτο</option>
+                            <option value="one">ΔΗΜΟΣΙΕΥΜΕΝΟ</option>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="row form-group">
+                    <label class="control-label col-sm-12" for="privilege_id">Επίπεδο Πρόσβασης</label>
+                    <div class="col-sm-12">
+                        <select class="form-control form-control-sm form-select form-select-sm" name="privilege_id">
+                            <option>one</option>
+                            <option>two</option>
+                            <option>three</option>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="row form-group">
+                    <label class="control-label col-sm-12" for="intro">Σύντομη Περιγραφή</label>
+                    <div class="col-sm-12">
+                        <textarea class="form-control form-control-sm" type="text" name="intro" value=""></textarea>
+                    </div>
+                </div>
+
+                <div class="row form-group">
+                    <label class="control-label col-sm-12" for="media">Αρχεία</label>
+                    <div class="col-sm-12 post-media">
+
+                        <!-- Button trigger modal -->
+                        <button type="button" class="btn btn-sm btn-success pull-right over-bar"
+                            data-toggle="modal" data-target="#editorModal" data-action="upload_file">
+                            <i class="fas fa-plus"></i> &nbsp; Προσθήκη
+                        </button>
+
+                        <ul id="files_list">
+                        </ul>
+
+                    </div>
+                </div>
+
+                <?php if ($id != 0) : ?>
+                <div class="row form-group">
+                    <label class="control-label col-sm-12">Πληροφορίες</label>
+                    <div class="col-sm-12" id="post-info">
+                    </div>
+                </div>
+                <?php endif; ?>
+
+            </div>
+
+        </div>
+
+        <div class="row">
+
+            <div class="col">
+                <hr/>
+                <!-- close | submit buttons -->
+
+                <div class="form-actions row justify-content-md-center">
+
+                    <div class="col-3">
+                        <button type="button" id="go-back" class="btn btn-light col-sm-12">
+                            Επιστροφή
+                        </button>
+                    </div>
+
+                    <div class="col-4">
+                        <button class="btn btn-primary col-sm-12" type="submit">
+                        <?=$action_button?>
+                        </button>
+                    </div>
+
+                </div>
+
+            </div>
+
+        </form>
+
+    </div>
+</div><!-- /manage -->
+                
diff --git a/public/app/views/admin/new_lesson.php b/public/app/views/admin/new_lesson.php
deleted file mode 100644
index c48fc82..0000000
--- a/public/app/views/admin/new_lesson.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php 
-// if no (lesson-)id is specified, then id=0 (new lesson)
-if (!isset($id)) $id=0;
-?>
-
-<!-- title bar -->
-<div class="title-bar">
-    <div><h5>Επεξεργασία Μαθήματος</h5></div>
-    <div>
-        <button type="button" class="btn pull-right"
-            data-toggle="modal" data-target="#editorModal" data-action="preview">
-            <i class="fas fa-search"></i> &nbsp; Προεπισκόπηση
-        </button>
-    </div>
-</div>
-
-<!-- manage -->
-<div class="manage edit-post">
-    <form>
-        <div class="row">
-
-        
-            <div class="col col-8">
-        
-                <!-- id (hidden) -->
-                <input type="hidden" name="id" value="0"><!-- action = (0) ? 'new' : 'edit' -->
-
-                <!--
-                <div class="row form-group">
-                    <input type="date" name="date" value="" readonly="">
-                </div>
-                -->
-
-                <div class="row form-group">
-                    <label class="control-label col-sm-12" for="title">Τίτλος</label>
-                    <div class="col-sm-12">
-                        <input class="form-control form-control-sm" type="text" name="title" value="" required="">
-                    </div>
-                </div>
-
-                <div class="row form-group">
-                    <label class="control-label col-sm-12" for="category_id">Κατηγορία</label>
-                    <div class="col-sm-12">
-                        <select class="form-control form-control-sm" id="category_id" name="category_id" required></select>
-                    </div>
-                </div>
-
-                <!-- Post body -->
-                <div class="row form-group">
-                    <label class="control-label col-sm-12" for="body">Κείμενο</label>
-                    <div class="col-sm-12">
-                        <textarea class="form-control form-control-sm" type="text" name="body" value="" required=""></textarea>
-                    </div>
-                </div>
-
-            </div>
-
-            <div class="col">
-
-                <div class="row form-group">
-                <label class="control-label col-sm-12" for="status">Κατάσταση</label>
-                    <div class="col-sm-12">
-                        <select class="form-control form-control-sm form-select form-select-sm" name="status" onchange="this.dataset.chosen = this.value;">
-                            <option value="0">Αδημοσίευτο</option>
-                            <option value="one">ΔΗΜΟΣΙΕΥΜΕΝΟ</option>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="row form-group">
-                    <label class="control-label col-sm-12" for="privilege_id">Επίπεδο Πρόσβασης</label>
-                    <div class="col-sm-12">
-                        <select class="form-control form-control-sm form-select form-select-sm" name="privilege_id">
-                            <option>one</option>
-                            <option>two</option>
-                            <option>three</option>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="row form-group">
-                    <label class="control-label col-sm-12" for="intro">Σύντομη Περιγραφή</label>
-                    <div class="col-sm-12">
-                        <textarea class="form-control form-control-sm" type="text" name="intro" value=""></textarea>
-                    </div>
-                </div>
-
-                <div class="row form-group">
-                    <label class="control-label col-sm-12" for="media">Αρχεία</label>
-                    <div class="col-sm-12 post-media">
-
-                        <!-- Button trigger modal -->
-                        <button type="button" class="btn btn-sm btn-success pull-right over-bar"
-                            data-toggle="modal" data-target="#editorModal" data-action="upload_file">
-                            <i class="fas fa-plus"></i> &nbsp; Προσθήκη
-                        </button>
-
-                        <ul id="files_list">
-                        </ul>
-
-                    </div>
-                </div>
-
-                <?php if ($id != 0) : ?>
-                <div class="row form-group">
-                    <label class="control-label col-sm-12">Πληροφορίες</label>
-                    <div class="col-sm-12" id="post-info">
-                    </div>
-                </div>
-                <?php endif; ?>
-
-            </div>
-
-        </div>
-
-        <div class="row">
-
-            <div class="col">
-                <hr/>
-                <!-- close | submit buttons -->
-
-                <div class="form-actions row justify-content-md-center">
-
-                    <div class="col-3">
-                        <button type="button" id="go-back" class="btn btn-light col-sm-12">
-                            Επιστροφή
-                        </button>
-                    </div>
-
-                    <div class="col-4">
-                        <button class="btn btn-primary col-sm-12" type="submit">
-                            Καταχώριση
-                        </button>
-                    </div>
-
-                </div>
-
-            </div>
-
-        </form>
-
-    </div>
-</div><!-- /manage -->
-                
diff --git a/public/app/views/admin/skeleton.php b/public/app/views/admin/skeleton.php
index fea346f..927bd2d 100644
--- a/public/app/views/admin/skeleton.php
+++ b/public/app/views/admin/skeleton.php
@@ -7,7 +7,9 @@
 
     <?php   // header includes
         ////////////////////////////////////////////////////////////////////////
-        Render::view('components/header_includes', ['administration' => true]);
+        Render::view('components/header_includes',  ////////////////////////////
+            ['administration' => true]
+        );
     ?>
 
 
@@ -17,16 +19,26 @@
     <div class="classroom admin-container">
 
         <?php 
-            Render::view('admin/admin-menu',[
-                'action' => $action
-            ])
-        ?>
-       
-        <?php 
-            Render::view("admin/{$action}");
+            // sometimes an ID (int) is needed
+            // ex. editing a page or a lesson we need page-ID or lesson-ID
+            // --- -- -- - - -
+            if (!isset($id)) $id=0;
+
+            // render menu
+            ////////////////////////////////////////////////////////////////////
+            Render::view('admin/admin-menu',[       ////////////////////////////
+                'action' => $action,
+                'id' => $id
+            ]);
+        
+            // render main content
+            ////////////////////////////////////////////////////////////////////
+            Render::view("admin/{$action}",[ 'id' => $id ]);    ////////////////
         ?>
     </div>
 
+    <!-- js admin script -->
+    <script>var entity_id = <?= $id ?>;</script>
     <script src="/assets/js/admin/<?= $action ?>.js"></script>
 
 </body>
-- 
cgit v1.2.3