From e29fa92544bb725bae714f4f1d7f9656d44e29e1 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 9 Nov 2022 18:19:48 -0500
Subject: [PATCH] Moved accounts to settings page as its not accessed much and
 is a much better place for it, moved some settings menus around

---
 accounts.php          |  2 +-
 settings_side_nav.php | 49 ++++++++++++++++++++++++-------------------
 side_nav.php          |  6 ------
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/accounts.php b/accounts.php
index 30b6bcca..691a6002 100644
--- a/accounts.php
+++ b/accounts.php
@@ -1,4 +1,4 @@
-<?php include("inc_all.php");
+<?php include("inc_all_settings.php");
 
 if(!empty($_GET['sb'])){
   $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
diff --git a/settings_side_nav.php b/settings_side_nav.php
index 037caed5..fcd30989 100644
--- a/settings_side_nav.php
+++ b/settings_side_nav.php
@@ -30,6 +30,34 @@
           </a>
         </li>
 
+        <li class="nav-item">
+          <a href="accounts.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "accounts.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-piggy-bank"></i>
+            <p>Accounts</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="settings_taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_taxes.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-balance-scale"></i>
+            <p>Taxes</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="nav-icon fas fa-list"></i>
+            <p>Categories</p>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="settings_tags.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_tags.php") { echo "active"; } ?>">
+            <i class="nav-icon fas fa-tag"></i>
+            <p>Tags</p>
+          </a>
+        </li>
+
         <li class="nav-item">
           <a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_api.php") { echo "active"; } ?>"
              href="settings_api.php">
@@ -89,27 +117,6 @@
           </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="nav-icon fas fa-list"></i>
-            <p>Categories</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="settings_taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_taxes.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-balance-scale"></i>
-            <p>Taxes</p>
-          </a>
-        </li>
-
-        <li class="nav-item">
-          <a href="settings_tags.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_tags.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-tag"></i>
-            <p>Tags</p>
-          </a>
-        </li>
-
         <?php } ?>
 
         <?php if($config_module_enable_ticketing){ ?>
diff --git a/side_nav.php b/side_nav.php
index 6b674fd6..c5f68c5b 100644
--- a/side_nav.php
+++ b/side_nav.php
@@ -156,12 +156,6 @@
             <p>Trips</p>
           </a>
         </li>
-        <li class="nav-item">
-          <a href="accounts.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "accounts.php") { echo "active"; } ?>">
-            <i class="nav-icon fas fa-piggy-bank"></i>
-            <p>Accounts</p>
-          </a>
-        </li>
         <li class="nav-item">
           <a href="transfers.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "transfers.php") { echo "active"; } ?>">
             <i class="nav-icon fas fa-exchange-alt"></i>