page navigation fixed

drunkleen · Mar 10, 2024 · 4f92dd1 · 4f92dd1
1 parent fd9b31d
commit 4f92dd1
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 241 deletions.
diff --git a/core/views.py b/core/views.py
@@ -241,7 +241,6 @@ def panel_admin(request) -> HttpResponse:
         context["cpu_percent"] = psutil.cpu_percent(interval=1)
         context["ram_percent"] = psutil.virtual_memory().percent
 
-        print(context)
         return render(request, 'panel/pages/overview.html', context)
     return redirect('panel-user', username=request.user.username)
 

diff --git a/static/panel/js/custom/apps/user-management/roles/list/add.js b/static/panel/js/custom/apps/user-management/roles/list/add.js
@@ -1,66 +1,52 @@
 "use strict";
 
 // Class definition
-var KTUsersAddRole = function () {
+var KTUsersAddUser = function () {
     // Shared variables
-    const element = document.getElementById('kt_modal_add_role');
-    const form = element.querySelector('#kt_modal_add_role_form');
+    const element = document.getElementById('kt_modal_add_user');
+    const form = element.querySelector('#kt_modal_add_user_form');
     const modal = new bootstrap.Modal(element);
 
     // Init add schedule modal
-    var initAddRole = () => {
+    var initAddUser = () => {
 
-        // Init form validation rules. For more info check the FormValidation plugin's official documentation:https://formvalidation.io/
-        var validator = FormValidation.formValidation(
-            form,
-            {
-                fields: {
-                    'role_name': {
-                        validators: {
-                            notEmpty: {
-                                message: 'Role name is required'
-                            }
-                        }
-                    },
-                },
-
-                plugins: {
-                    trigger: new FormValidation.plugins.Trigger(),
-                    bootstrap: new FormValidation.plugins.Bootstrap5({
-                        rowSelector: '.fv-row',
-                        eleInvalidClass: '',
-                        eleValidClass: ''
-                    })
-                }
-            }
-        );
-
-        // Close button handler
-        const closeButton = element.querySelector('[data-kt-roles-modal-action="close"]');
-        closeButton.addEventListener('click', e => {
+        // Cancel button handler
+        const cancelButton = element.querySelector('[data-kt-users-modal-action="cancel"]');
+        cancelButton.addEventListener('click', e => {
             e.preventDefault();
 
             Swal.fire({
-                text: "Are you sure you would like to close?",
+                text: "Are you sure you would like to cancel?",
                 icon: "warning",
                 showCancelButton: true,
                 buttonsStyling: false,
-                confirmButtonText: "Yes, close it!",
+                confirmButtonText: "Yes, cancel it!",
                 cancelButtonText: "No, return",
                 customClass: {
                     confirmButton: "btn btn-primary",
                     cancelButton: "btn btn-active-light"
                 }
             }).then(function (result) {
                 if (result.value) {
-                    modal.hide(); // Hide modal				
-                } 
+                    form.reset(); // Reset form			
+                    modal.hide();	
+                } else if (result.dismiss === 'cancel') {
+                    Swal.fire({
+                        text: "Your form has not been cancelled!.",
+                        icon: "error",
+                        buttonsStyling: false,
+                        confirmButtonText: "Ok, got it!",
+                        customClass: {
+                            confirmButton: "btn btn-primary",
+                        }
+                    });
+                }
             });
         });
 
-        // Cancel button handler
-        const cancelButton = element.querySelector('[data-kt-roles-modal-action="cancel"]');
-        cancelButton.addEventListener('click', e => {
+        // Close button handler
+        const closeButton = element.querySelector('[data-kt-users-modal-action="close"]');
+        closeButton.addEventListener('click', e => {
             e.preventDefault();
 
             Swal.fire({
@@ -76,8 +62,8 @@ var KTUsersAddRole = function () {
                 }
             }).then(function (result) {
                 if (result.value) {
-                    form.reset(); // Reset form	
-                    modal.hide(); // Hide modal				
+                    form.reset(); // Reset form			
+                    modal.hide();	
                 } else if (result.dismiss === 'cancel') {
                     Swal.fire({
                         text: "Your form has not been cancelled!.",
@@ -91,95 +77,17 @@ var KTUsersAddRole = function () {
                 }
             });
         });
-
-         // Submit button handler
-         const submitButton = element.querySelector('[data-kt-roles-modal-action="submit"]');
-         submitButton.addEventListener('click', function (e) {
-             // Prevent default button action
-             e.preventDefault();
-
-             // Validate form before submit
-             if (validator) {
-                 validator.validate().then(function (status) {
-                     console.log('validated!');
-
-                     if (status == 'Valid') {
-                         // Show loading indication
-                         submitButton.setAttribute('data-kt-indicator', 'on');
-
-                         // Disable button to avoid multiple click 
-                         submitButton.disabled = true;
-
-                         // Simulate form submission. For more info check the plugin's official documentation: https://sweetalert2.github.io/
-                         setTimeout(function () {
-                             // Remove loading indication
-                             submitButton.removeAttribute('data-kt-indicator');
-
-                             // Enable button
-                             submitButton.disabled = false;
-
-                             // Show popup confirmation 
-                             Swal.fire({
-                                 text: "Form has been successfully submitted!",
-                                 icon: "success",
-                                 buttonsStyling: false,
-                                 confirmButtonText: "Ok, got it!",
-                                 customClass: {
-                                     confirmButton: "btn btn-primary"
-                                 }
-                             }).then(function (result) {
-                                 if (result.isConfirmed) {
-                                     modal.hide();
-                                 }
-                             });
-
-                             //form.submit(); // Submit form
-                         }, 2000);
-                     } else {
-                         // Show popup warning. For more info check the plugin's official documentation: https://sweetalert2.github.io/
-                         Swal.fire({
-                             text: "Sorry, looks like there are some errors detected, please try again.",
-                             icon: "error",
-                             buttonsStyling: false,
-                             confirmButtonText: "Ok, got it!",
-                             customClass: {
-                                 confirmButton: "btn btn-primary"
-                             }
-                         });
-                     }
-                 });
-             }
-         });
-
-
-    }
-
-    // Select all handler
-    const handleSelectAll = () =>{
-        // Define variables
-        const selectAll = form.querySelector('#kt_roles_select_all');
-        const allCheckboxes = form.querySelectorAll('[type="checkbox"]');
-
-        // Handle check state
-        selectAll.addEventListener('change', e => {
-
-            // Apply check state to all checkboxes
-            allCheckboxes.forEach(c => {
-                c.checked = e.target.checked;
-            });
-        });
     }
 
     return {
         // Public functions
         init: function () {
-            initAddRole();
-            handleSelectAll();
+            initAddUser();
         }
     };
 }();
 
 // On document ready
 KTUtil.onDOMContentLoaded(function () {
-    KTUsersAddRole.init();
+    KTUsersAddUser.init();
 });
diff --git a/static/panel/js/custom/pages/user-profile/general.js b/static/panel/js/custom/pages/user-profile/general.js
@@ -122,7 +122,7 @@ var KTProfileGeneral = function () {
 
             if ( localStorage.getItem('nav-initialized') === "1") {
                 window.scroll({
-                    top: parseInt(profileNav.getAttribute("data-kt-pages-scroll-position")),
+                    top: parseInt(profileNav.getAttribute("data-kt-page-scroll-position")),
                     behavior: 'smooth'
                 });
             }

diff --git a/static/panel/js/scripts.bundle.js b/static/panel/js/scripts.bundle.js
@@ -31,7 +31,7 @@ if (document.readyState === "loading") {
 	KTComponents.init();
  }
 
- // Init pages loader
+ // Init page loader
 window.addEventListener("load", function() {
     KTApp.hidePageLoading();
 });
@@ -649,14 +649,14 @@ var KTApp = function () {
 	}
 
     var showPageLoading = function() {
-        document.body.classList.add('pages-loading');
-        document.body.setAttribute('data-kt-app-pages-loading', "on");
+        document.body.classList.add('page-loading');
+        document.body.setAttribute('data-kt-app-page-loading', "on");
     }
 
     var hidePageLoading = function() {
-        // CSS3 Transitions only after pages load(.pages-loading or .app-pages-loading class added to body tag and remove with JS on pages load)
-        document.body.classList.remove('pages-loading');
-        document.body.removeAttribute('data-kt-app-pages-loading');
+        // CSS3 Transitions only after page load(.page-loading or .app-page-loading class added to body tag and remove with JS on page load)
+        document.body.classList.remove('page-loading');
+        document.body.removeAttribute('data-kt-app-page-loading');
     }
 
     return {
@@ -7443,7 +7443,7 @@ var KTAppLayoutBuilder = function() {
 					);
 
 					setTimeout(function() {
-						location.reload(); // reload pages
+						location.reload(); // reload page
 					}, 1500);
 				},
 				error: function(response) {
@@ -7537,13 +7537,13 @@ var KTAppLayoutBuilder = function() {
 					return;
 
 					toastr.success(
-						"Preview has been successfully reset and the pages will be reloaded.",
+						"Preview has been successfully reset and the page will be reloaded.", 
 						"Reset Preview!", 
 						{timeOut: 0, extendedTimeOut: 0, closeButton: true, closeDuration: 0}
 					);
 
 					setTimeout(function() {
-						location.reload(); // reload pages
+						location.reload(); // reload page
 					}, 1500);
 				},
 				error: function(response) {

diff --git a/static/panel/js/widgets.bundle.js b/static/panel/js/widgets.bundle.js
@@ -17976,7 +17976,7 @@ var KTTimelineWidget1 = function () {
                 group: 'ui',
                 start: moment(now).add(30, 'minutes'),
                 end: moment(now).add(2.5, 'hours'),
-                content: 'Landing pages',
+                content: 'Landing page',
                 progress: "55%",
                 color: 'danger',
                 users: [
@@ -18637,7 +18637,7 @@ var KTTimelineWidget4 = function () {
                 group: 'ui',
                 start: moment(now).add(30, 'minutes'),
                 end: moment(now).add(2.5, 'hours'),
-                content: 'Landing pages',
+                content: 'Landing page',
                 progress: "55%",
                 color: 'danger',
                 users: [