From 71b7f60aeb7597965532e45362f489b9b5c60cac Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Tue, 22 Feb 2022 01:26:15 -0500
Subject: [PATCH] Reworked Admin Settings Menu, moved items to their own side
 nav and removed settings from the main side nav and moved it to the user drop
 down on the top nav

---
 admin_side_nav.php          | 100 +++++++++++++++++++++++++++++++++---
 api_keys.php                |   2 +-
 categories.php              |   2 +-
 companies.php               |   2 +-
 custom_links.php            |   2 +-
 inc_all_admin.php           |  12 +++++
 settings-alerts.php         |   4 +-
 settings-backup.php         |   4 +-
 settings-defaults.php       |   4 +-
 settings-general.php        |   4 +-
 settings-invoice.php        |   4 +-
 settings-mail.php           |   4 +-
 settings-online-payment.php |   4 +-
 settings-quote.php          |   4 +-
 settings-ticket.php         |   4 +-
 settings-update.php         |   4 +-
 side_nav.php                |  72 --------------------------
 taxes.php                   |   2 +-
 top_nav.php                 |   5 ++
 user_logs.php               |   2 +-
 users.php                   |   2 +-
 21 files changed, 126 insertions(+), 117 deletions(-)
 create mode 100644 inc_all_admin.php

diff --git a/admin_side_nav.php b/admin_side_nav.php
index 549e8ae4..e711e14b 100644
--- a/admin_side_nav.php
+++ b/admin_side_nav.php
@@ -36,47 +36,131 @@
       </div>
 
       <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
+        
+        <li class="nav-item">
+          <a href="dashboard_financial.php" class="nav-link">
+            <i class="nav-icon fas fa-arrow-left"></i>
+            <p>Back</p> | 
+            <p><strong>Admin Nav</strong></p>
+          </a>
+        </li>
+
         <li class="nav-header mt-3">SETTINGS</li>
         
         <li class="nav-item">
           <a href="settings-general.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-general.php") { echo "active"; } ?>">
-            <i class="far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-cog"></i>
             <p>General</p>
-          </a>
+          </a> 
         </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-mail.php") { echo "active"; } ?>" 
+            href="settings-mail.php">
+            <i class="nav-icon far fa-envelope"></i>
+            <p>Mail</p>
+          </a> 
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-defaults.php") { echo "active"; } ?>" 
+            href="settings-defaults.php">
+            <i class="nav-icon far fa-cog"></i>
+            <p>Defaults</p>
+          </a> 
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-invoice.php") { echo "active"; } ?>" 
+            href="settings-invoice.php">
+            <i class="nav-icon far fa-file"></i>
+            <p>Invoice</p>
+          </a> 
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-quote.php") { echo "active"; } ?>" 
+            href="settings-quote.php">
+            <i class="nav-icon far fa-file"></i>
+            <p>Quote</p>
+          </a> 
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-ticket.php") { echo "active"; } ?>" 
+            href="settings-ticket.php">
+            <i class="nav-icon far fa-tag"></i>
+            <p>Ticket</p>
+          </a> 
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-alerts.php") { echo "active"; } ?>" 
+            href="settings-alerts.php">
+            <i class="nav-icon far fa-bell"></i>
+            <p>Alerts</p>
+          </a> 
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-online-payment.php") { echo "active"; } ?>" 
+            href="settings-online-payment.php">
+            <i class="nav-icon far fa-credit-card"></i>
+            <p>Online Payment</p>
+          </a> 
+        </li>
+       
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-update.php") { echo "active"; } ?>" 
+            href="settings-update.php">
+            <i class="nav-icon far fa-wrench"></i>
+            <p>Update</p>
+          </a> 
+        </li>
+
+        <li class="nav-item">
+          <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-backup.php") { echo "active"; } ?>" 
+            href="settings-backup.php">
+            <i class="nav-icon far fa-database"></i>
+            <p>Backup</p>
+          </a> 
+        </li>
+
+        <li class="nav-header mt-3">MORE SETTINGS</li>
+
         <li class="nav-item">
           <a href="categories.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "categories.php") { echo "active"; } ?>">
-            <i class="far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-circle nav-icon"></i>
             <p>Categories</p>
           </a>
         </li>
         <li class="nav-item">
           <a href="custom_links.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "custom_links.php") { echo "active"; } ?>">
-            <i class="far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-circle nav-icon"></i>
             <p>Custom Links</p>
           </a>
         </li>
         <li class="nav-item">
           <a href="taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "taxes.php") { echo "active"; } ?>">
-            <i class="far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-circle nav-icon"></i>
             <p>Taxes</p>
           </a>
         </li>
         <li class="nav-item">
           <a href="users.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "users.php") { echo "active"; } ?>">
-            <i class="far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-circle nav-icon"></i>
             <p>Users</p>
           </a>
         </li>
         <li class="nav-item">
           <a href="companies.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "companies.php") { echo "active"; } ?>">
-            <i class="far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-circle nav-icon"></i>
             <p>Companies</p>
           </a>
         </li>
         <li class="nav-item">
           <a href="logs.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "active"; } ?>">
-            <i class="far fa-circle nav-icon"></i>
+            <i class="nav-icon far fa-circle nav-icon"></i>
             <p>Logs</p>
           </a>
         </li>
diff --git a/api_keys.php b/api_keys.php
index 55306989..efbfbec4 100644
--- a/api_keys.php
+++ b/api_keys.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php");
+<?php include("inc_all_admin.php");
 
   //Paging
   if(isset($_GET['p'])){
diff --git a/categories.php b/categories.php
index 147d5ffc..27e14ea8 100644
--- a/categories.php
+++ b/categories.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php"); 
+<?php include("inc_all_admin.php"); 
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/companies.php b/companies.php
index 21342611..eeaab81a 100644
--- a/companies.php
+++ b/companies.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php");
+<?php include("inc_all_admin.php");
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/custom_links.php b/custom_links.php
index 89e61633..dbbe09a6 100644
--- a/custom_links.php
+++ b/custom_links.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php"); 
+<?php include("inc_all_admin.php"); 
 
 //Paging
 if(isset($_GET['p'])){
diff --git a/inc_all_admin.php b/inc_all_admin.php
new file mode 100644
index 00000000..cbe2fce1
--- /dev/null
+++ b/inc_all_admin.php
@@ -0,0 +1,12 @@
+<?php 
+
+include("config.php");
+include_once("functions.php");
+include("check_login.php");
+include("header.php");
+include("top_nav.php");
+include("admin_side_nav.php");
+include("inc_wrapper.php");
+include("inc_alert_feedback.php");
+
+?>
\ No newline at end of file
diff --git a/settings-alerts.php b/settings-alerts.php
index 02365211..2fa1877e 100644
--- a/settings-alerts.php
+++ b/settings-alerts.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-backup.php b/settings-backup.php
index 8c6ab8d1..bb93ebbd 100644
--- a/settings-backup.php
+++ b/settings-backup.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-defaults.php b/settings-defaults.php
index c06c3417..0469f142 100644
--- a/settings-defaults.php
+++ b/settings-defaults.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-general.php b/settings-general.php
index db8c9cc6..5ec9fb57 100644
--- a/settings-general.php
+++ b/settings-general.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-invoice.php b/settings-invoice.php
index 2bab41cc..68fed1b6 100644
--- a/settings-invoice.php
+++ b/settings-invoice.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-mail.php b/settings-mail.php
index 0488fa31..b2ec6565 100644
--- a/settings-mail.php
+++ b/settings-mail.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-online-payment.php b/settings-online-payment.php
index 2a37f94d..2ebca423 100644
--- a/settings-online-payment.php
+++ b/settings-online-payment.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="alert alert-warning">
   Work in Progress
diff --git a/settings-quote.php b/settings-quote.php
index d00c6a0f..4be6adea 100644
--- a/settings-quote.php
+++ b/settings-quote.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-ticket.php b/settings-ticket.php
index 6958b569..5b8b2bf4 100644
--- a/settings-ticket.php
+++ b/settings-ticket.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <div class="card card-dark">
   <div class="card-header">
diff --git a/settings-update.php b/settings-update.php
index 492196bd..1e6c1669 100644
--- a/settings-update.php
+++ b/settings-update.php
@@ -1,6 +1,4 @@
-<?php include("inc_all.php"); ?>
-
-<?php include("settings-nav.php"); ?>
+<?php include("inc_all_admin.php"); ?>
 
 <?php
 
diff --git a/side_nav.php b/side_nav.php
index 9f74b96d..c426b88d 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -214,78 +214,6 @@
 
         <?php } ?>
 
-        <?php if($session_user_role > 2){ ?>
-
-        <li class="nav-header mt-3">SETTINGS</li>
-        
-        <li class="nav-item has-treeview <?php if(basename($_SERVER["PHP_SELF"]) == "settings-general.php" OR basename($_SERVER["PHP_SELF"]) == "categories.php" OR basename($_SERVER["PHP_SELF"]) == "tags.php" OR basename($_SERVER["PHP_SELF"]) == "custom_links.php" OR basename($_SERVER["PHP_SELF"]) == "taxes.php" OR basename($_SERVER["PHP_SELF"]) == "users.php" OR basename($_SERVER["PHP_SELF"]) == "companies.php" OR basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "menu-open"; } ?>">
-          <a href="#" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-general.php" OR basename($_SERVER["PHP_SELF"]) == "categories.php" OR basename($_SERVER["PHP_SELF"]) == "tags.php" OR basename($_SERVER["PHP_SELF"]) == "custom_links.php" OR basename($_SERVER["PHP_SELF"]) == "taxes.php" OR basename($_SERVER["PHP_SELF"]) == "users.php" OR basename($_SERVER["PHP_SELF"]) == "companies.php" OR basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-cog"></i>
-            <p>
-              Settings
-              <i class="right fas fa-angle-left"></i>
-            </p>
-          </a>
-          <ul class="nav nav-treeview">
-            <li class="nav-item">
-              <a href="settings-general.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-general.php") { echo "active"; } ?>">
-                <i class="far fa-circle nav-icon"></i>
-                <p>General</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="categories.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "categories.php") { echo "active"; } ?>">
-                <i class="far fa-circle nav-icon"></i>
-                <p>Categories</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="tags.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "tags.php") { echo "active"; } ?>">
-                <i class="fa fa-tag nav-icon"></i>
-                <p>Tags</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="custom_links.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "custom_links.php") { echo "active"; } ?>">
-                <i class="far fa-circle nav-icon"></i>
-                <p>Custom Links</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "taxes.php") { echo "active"; } ?>">
-                <i class="far fa-circle nav-icon"></i>
-                <p>Taxes</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="users.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "users.php") { echo "active"; } ?>">
-                <i class="far fa-user nav-icon"></i>
-                <p>Users</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="api_keys.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "api_keys.php") { echo "active"; } ?>">
-                <i class="fas fa-key nav-icon"></i>
-                <p>API Keys</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="companies.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "companies.php") { echo "active"; } ?>">
-                <i class="far fa-building nav-icon"></i>
-                <p>Companies</p>
-              </a>
-            </li>
-            <li class="nav-item">
-              <a href="logs.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "logs.php") { echo "active"; } ?>">
-                <i class="far fa-eye nav-icon"></i>
-                <p>Audit Logs</p>
-              </a>
-            </li>
-          </ul>
-        </li>
-
-        <?php } ?>
-
         <?php
         
         $sql = mysqli_query($mysqli,"SELECT * FROM custom_links WHERE company_id = $session_company_id");
diff --git a/taxes.php b/taxes.php
index d54c31f7..bb9c1f1f 100644
--- a/taxes.php
+++ b/taxes.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php"); 
+<?php include("inc_all_admin.php"); 
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
diff --git a/top_nav.php b/top_nav.php
index 295f1009..f45b0caf 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -46,6 +46,11 @@
         <!-- Menu Footer-->
         <li class="user-footer">
           <a href="settings-user.php" class="btn btn-default btn-flat">Profile</a>
+          <?php if($session_user_role > 2){ ?>
+
+          <a href="settings-general.php" class="btn btn-dark btn-flat ml-4">Admin</a>
+
+          <?php } ?>
           <a href="post.php?logout" class="btn btn-default btn-flat float-right">Sign out</a>
         </li>
       </ul>
diff --git a/user_logs.php b/user_logs.php
index 2d680ef1..1610d07a 100644
--- a/user_logs.php
+++ b/user_logs.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php");
+<?php include("inc_all_admin.php");
   
   //Rebuild URL
 
diff --git a/users.php b/users.php
index e0c0ee3c..9af2c4cc 100644
--- a/users.php
+++ b/users.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php");
+<?php include("inc_all_admin.php");
 
   //Paging
   if(isset($_GET['p'])){