Merge pull request #1 from alextselegidis/develop

Develop
tm8544 · Apr 15, 2024 · b1eb76a · b1eb76a
2 parents e7a757e + 5b2ce2e
commit b1eb76a
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/application/controllers/Login.php b/application/controllers/Login.php
@@ -40,6 +40,11 @@ public function __construct()
      */
     public function index()
     {
+        if (session('user_id')) {
+            redirect('calendar');
+            return;
+        }
+
         html_vars([
             'page_title' => lang('login'),
             'base_url' => config('base_url'),

diff --git a/application/views/emails/appointment_deleted_email.php b/application/views/emails/appointment_deleted_email.php
@@ -81,6 +81,17 @@
                 </td>
             </tr>
 
+            <?php if (!empty($appointment['status'])): ?>
+                <tr>
+                    <td class="label" style="padding: 3px;font-weight: bold;">
+                        <?= lang('status') ?>
+                    </td>
+                    <td style="padding: 3px;">
+                        <?= e($appointment['status']) ?>
+                    </td>
+                </tr>
+            <?php endif; ?>
+
             <tr>
                 <td class="label" style="padding: 3px;font-weight: bold;">
                     <?= lang('description') ?>

diff --git a/application/views/emails/appointment_saved_email.php b/application/views/emails/appointment_saved_email.php
@@ -85,6 +85,17 @@
                 </td>
             </tr>
 
+            <?php if (!empty($appointment['status'])): ?>
+            <tr>
+                <td class="label" style="padding: 3px;font-weight: bold;">
+                    <?= lang('status') ?>
+                </td>
+                <td style="padding: 3px;">
+                    <?= e($appointment['status']) ?>
+                </td>
+            </tr>
+            <?php endif; ?>
+
             <tr>
                 <td class="label" style="padding: 3px;font-weight: bold;">
                     <?= lang('description') ?>

diff --git a/application/views/pages/login.php b/application/views/pages/login.php
@@ -18,14 +18,18 @@
         <label for="username" class="form-label">
             <?= lang('username') ?>
         </label>
-        <input type="text" id="username" placeholder="<?= lang('enter_username_here') ?>" class="form-control"/>
+        <input type="text" id="username" placeholder="<?= lang(
+            'enter_username_here',
+        ) ?>" class="form-control" required/>
     </div>
 
     <div class="mb-5">
         <label for="password" class="form-label">
             <?= lang('password') ?>
         </label>
-        <input type="password" id="password" placeholder="<?= lang('enter_password_here') ?>" class="form-control"/>
+        <input type="password" id="password" placeholder="<?= lang(
+            'enter_password_here',
+        ) ?>" class="form-control" required/>
     </div>
 
     <div class="d-flex justify-content-between align-items-center mb-5">

diff --git a/assets/js/pages/login.js b/assets/js/pages/login.js
@@ -32,6 +32,10 @@ App.Pages.Login = (function () {
         const username = $username.val();
         const password = $password.val();
 
+        if (!username || !password) {
+            return;
+        }
+
         const $alert = $('.alert');
 
         $alert.addClass('d-none');