From 7e62ba392479841b91c609bed077b18846541a66 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Mon, 8 May 2023 15:11:08 +0200 Subject: [PATCH] Work on 08/05/2023 morning --- .idea/workspace.xml | 132 +++++ ci4/app/Controllers/Home.php | 10 +- .../themes/backend/vuexy/login/header.php | 2 +- .../Views/themes/backend/vuexy/main/all.php | 550 ++++++++++++++++++ .../themes/backend/vuexy/main/footer.php | 36 +- .../themes/backend/vuexy/main/header.php | 109 +++- .../Views/themes/backend/vuexy/main/menu.php | 64 +- httpdocs/themes/vuexy/js/pages-auth.js | 4 +- 8 files changed, 874 insertions(+), 33 deletions(-) create mode 100644 .idea/workspace.xml create mode 100644 ci4/app/Views/themes/backend/vuexy/main/all.php diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..b03736c5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + $PROJECT_DIR$/ci4/composer.json + + + + + + + + + + + + + + + + + + + + + + + + + 1682339793915 + + + 1682339938559 + + + 1682420504675 + + + + + + + + + + + + + + file://$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/menu.php + 64 + + + + + \ No newline at end of file diff --git a/ci4/app/Controllers/Home.php b/ci4/app/Controllers/Home.php index 2008c4d6..5c7a6607 100644 --- a/ci4/app/Controllers/Home.php +++ b/ci4/app/Controllers/Home.php @@ -31,7 +31,14 @@ class Home extends BaseController else $salutation = lang("App.dashboard_good_night"); - switch ($session->get('dashboard')): + echo view(getenv('theme.path').'main/all'); + + //echo view(getenv('theme.path').'main/header'); + //echo view(getenv('theme.path').'main/menu'); + //echo view(getenv('theme.path').'form/dashboard/index'); + //echo view(getenv('theme.path').'main/footer'); + + /*switch ($session->get('dashboard')): case 'admin': $data['title'] = [ 'module' => lang("App.dashboard_hello").' '.$name, @@ -148,5 +155,6 @@ class Home extends BaseController echo view(getenv('theme.path').'form/dashboard/index'); echo view(getenv('theme.path').'main/footer'); endswitch; + */ } } diff --git a/ci4/app/Views/themes/backend/vuexy/login/header.php b/ci4/app/Views/themes/backend/vuexy/login/header.php index 6be1d03e..cb484cb1 100644 --- a/ci4/app/Views/themes/backend/vuexy/login/header.php +++ b/ci4/app/Views/themes/backend/vuexy/login/header.php @@ -61,7 +61,7 @@ if (!empty($token) && $tfa == false) { diff --git a/ci4/app/Views/themes/backend/vuexy/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php new file mode 100644 index 00000000..2ecb6a67 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -0,0 +1,550 @@ +get('token') ?? ''; +$tfa = $session->get('tfa') ?? false; +$settings = $session->get('settings'); + +$picture = session()->get('picture'); +$pulse = session()->get('pulse'); +$notification = session()->get('notification'); + +if (!empty($token) && $tfa == false) { + //echo ""; +} +?> + + + + + + + + + <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + */ ?> + + +
+ + + + + + +
+ + +
+

Page 1

+

+ Sample page. +

+
+ + + + + + +
+
+ +
+ +
+ + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ci4/app/Views/themes/backend/vuexy/main/footer.php b/ci4/app/Views/themes/backend/vuexy/main/footer.php index a49232fc..62b70f5c 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/footer.php +++ b/ci4/app/Views/themes/backend/vuexy/main/footer.php @@ -1,5 +1,30 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-

Copyright © Designed by Quixkit & Developed by Eduardo Fiorini - WebGuard v

+

Copyright © TBD - Safekat v

+ - \ No newline at end of file + + diff --git a/ci4/app/Views/themes/backend/vuexy/main/header.php b/ci4/app/Views/themes/backend/vuexy/main/header.php index 52edb1c8..1944335d 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/header.php +++ b/ci4/app/Views/themes/backend/vuexy/main/header.php @@ -1,38 +1,99 @@ get('settings'); +$session = session(); +$token = $session->get('token') ?? ''; +$tfa = $session->get('tfa') ?? false; +$settings = $session->get('settings'); + +// Legacy TODO: check? $picture = session()->get('picture'); $pulse = session()->get('pulse'); $notification = session()->get('notification'); + +if (!empty($token) && $tfa == false) { + echo ""; +} ?> + - + + + - - + + <?= lang("App.dashboard_title") ?> - <?= $settings['title']??'' ?> - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
-
-
-
-
-
-
diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu.php b/ci4/app/Views/themes/backend/vuexy/main/menu.php index 0cb8b2c1..7fe9b430 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/menu.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu.php @@ -1,4 +1,63 @@ + + + + + + +
@@ -263,4 +322,7 @@
  • " aria-expanded="false">
    • -
    \ No newline at end of file +
    + + */ +?> \ No newline at end of file diff --git a/httpdocs/themes/vuexy/js/pages-auth.js b/httpdocs/themes/vuexy/js/pages-auth.js index a99c9688..121876bb 100644 --- a/httpdocs/themes/vuexy/js/pages-auth.js +++ b/httpdocs/themes/vuexy/js/pages-auth.js @@ -49,7 +49,7 @@ document.addEventListener('DOMContentLoaded', function (e) { message: 'Please enter your password' }, stringLength: { - min: 6, + min: 4, message: 'Password must be more than 6 characters' } } @@ -66,7 +66,7 @@ document.addEventListener('DOMContentLoaded', function (e) { message: 'The password and its confirm are not the same' }, stringLength: { - min: 6, + min: 4, message: 'Password must be more than 6 characters' } }