From 98eb0c7b17dbaa12d72e286f4848b6fde61067b4 Mon Sep 17 00:00:00 2001
From: Shaun Prince <shaun@techfusion.ca>
Date: Tue, 10 Aug 2021 17:57:32 -0700
Subject: [PATCH] clean-up navbar and login flow

---
 defaults/oxide/data/Kits/Kits.json | 303 +++++++++++++++++++++++++++++
 web/_notes/dwsync.xml              |  10 +-
 web/complete.php                   |   9 +-
 web/discord.php                    |   6 +-
 web/footer_simple.php              |   4 +
 web/link.php                       |   7 +-
 web/nav_bar.php                    |   3 +-
 web/nav_bar_simple.php             |  41 ++++
 8 files changed, 363 insertions(+), 20 deletions(-)
 create mode 100644 web/footer_simple.php
 create mode 100644 web/nav_bar_simple.php

diff --git a/defaults/oxide/data/Kits/Kits.json b/defaults/oxide/data/Kits/Kits.json
index 5c1b4232..00b6aaf0 100644
--- a/defaults/oxide/data/Kits/Kits.json
+++ b/defaults/oxide/data/Kits/Kits.json
@@ -4006,6 +4006,309 @@
           "Content": null
         }
       ]
+    },
+    {
+      "Name": "SmokeQc",
+      "Display Name": "SmokeQc Kit",
+      "Color": "#A0A935",
+      "Permission": "Kits.default",
+      "Description": null,
+      "Image": null,
+      "Hide": true,
+      "Amount": 0,
+      "Cooldown": 0.0,
+      "Wipe Block": 0.0,
+      "Building": null,
+      "Items": [
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "tactical.gloves",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "wear",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 4,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "jumpsuit.suit.blue",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "wear",
+          "Condition": 100.0,
+          "Chance": 100,
+          "Position": 1,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "attire.hide.poncho",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 833524594,
+          "Container": "wear",
+          "Condition": 250.0,
+          "Chance": 100,
+          "Position": 6,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "shoes.boots",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 10080,
+          "Container": "wear",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 3,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "mask.bandana",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 2093051075,
+          "Container": "wear",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 2,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "riot.helmet",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 1414953014,
+          "Container": "wear",
+          "Condition": 150.0,
+          "Chance": 100,
+          "Position": 0,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "roadsign.kilt",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 1944165903,
+          "Container": "wear",
+          "Condition": 150.0,
+          "Chance": 100,
+          "Position": 5,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "lowgradefuel",
+          "Amount": 250,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "main",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 23,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "ammo.shotgun",
+          "Amount": 32,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "main",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 18,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "ammo.shotgun.slug",
+          "Amount": 24,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "main",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 19,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "hazmatsuit",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "main",
+          "Condition": 450.0,
+          "Chance": 100,
+          "Position": 17,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "cactusflesh",
+          "Amount": 10,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "main",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 22,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "syringe.medical",
+          "Amount": 5,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "belt",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 2,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "wall.external.high",
+          "Amount": 3,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "belt",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 4,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "shotgun.pump",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 964345579,
+          "Container": "belt",
+          "Condition": 91.5,
+          "Chance": 100,
+          "Position": 1,
+          "Image": null,
+          "Weapon": {
+            "ammoType": "ammo.shotgun.slug",
+            "ammoAmount": 6
+          },
+          "Content": [
+            {
+              "ShortName": "weapon.mod.lasersight",
+              "Condition": 300.0,
+              "Amount": 1
+            }
+          ]
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "shotgun.pump",
+          "Amount": 1,
+          "Blueprint": 0,
+          "SkinID": 10074,
+          "Container": "belt",
+          "Condition": 100.0,
+          "Chance": 100,
+          "Position": 0,
+          "Image": null,
+          "Weapon": {
+            "ammoType": "ammo.shotgun",
+            "ammoAmount": 6
+          },
+          "Content": [
+            {
+              "ShortName": "weapon.mod.flashlight",
+              "Condition": 300.0,
+              "Amount": 1
+            }
+          ]
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "bandage",
+          "Amount": 15,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "belt",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 3,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        },
+        {
+          "Type": "Item",
+          "Command": "",
+          "ShortName": "chicken.cooked",
+          "Amount": 20,
+          "Blueprint": 0,
+          "SkinID": 0,
+          "Container": "belt",
+          "Condition": 0.0,
+          "Chance": 100,
+          "Position": 5,
+          "Image": null,
+          "Weapon": null,
+          "Content": null
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/web/_notes/dwsync.xml b/web/_notes/dwsync.xml
index a76b0654..2cfab49d 100644
--- a/web/_notes/dwsync.xml
+++ b/web/_notes/dwsync.xml
@@ -3,16 +3,18 @@
 <file name="main.conf.php" server="dev.solidrust.net//solidrust.net/" local="132731144620304622" remote="132731396400000000" Dst="2" />
 <file name="functions.php" server="dev.solidrust.net//solidrust.net/" local="132714982512631659" remote="132729687600000000" Dst="2" />
 <file name="index.php" server="dev.solidrust.net//solidrust.net/" local="132731027856964097" remote="132731279400000000" Dst="2" />
-<file name="discord.php" server="dev.solidrust.net//solidrust.net/" local="132729723489274308" remote="132729975000000000" Dst="2" />
-<file name="complete.php" server="dev.solidrust.net//solidrust.net/" local="132729725117783566" remote="132729976800000000" Dst="2" />
+<file name="discord.php" server="dev.solidrust.net//solidrust.net/" local="132731167740006681" remote="132731419200000000" Dst="2" />
+<file name="complete.php" server="dev.solidrust.net//solidrust.net/" local="132731167963586595" remote="132731419800000000" Dst="2" />
 <file name="api.php" server="dev.solidrust.net//solidrust.net/" local="132714982512592619" remote="132729687600000000" Dst="2" />
-<file name="link.php" server="dev.solidrust.net//solidrust.net/" local="132729724183656856" remote="132729975600000000" Dst="2" />
+<file name="link.php" server="dev.solidrust.net//solidrust.net/" local="132731167201517525" remote="132731419200000000" Dst="2" />
 <file name="ohshit.html" server="dev.solidrust.net//solidrust.net/" local="132714982514507071" remote="132729687600000000" Dst="2" />
 <file name="servers.php" server="dev.solidrust.net//solidrust.net/" local="132714982514497282" remote="132729687600000000" Dst="2" />
 <file name="unlink.php" server="dev.solidrust.net//solidrust.net/" local="132714982514526589" remote="132729687600000000" Dst="2" />
-<file name="nav_bar.php" server="dev.solidrust.net//solidrust.net/" local="132731150291158238" remote="132731401800000000" Dst="2" />
+<file name="nav_bar.php" server="dev.solidrust.net//solidrust.net/" local="132731157494836270" remote="132731409000000000" Dst="2" />
 <file name="header.php" server="dev.solidrust.net//solidrust.net/" local="132731096218277790" remote="132731347800000000" Dst="2" />
 <file name="footer.php" server="dev.solidrust.net//solidrust.net/" local="132729608385894239" remote="132729859800000000" Dst="2" />
 <file name="unlink_button.txt" server="dev.solidrust.net//solidrust.net/" local="132729620663291807" remote="132729874200000000" Dst="2" />
+<file name="nav_bar_simple.php" server="dev.solidrust.net//solidrust.net/" local="132731161725527784" remote="132731413200000000" Dst="2" />
 <file name="nav_solo.php" server="dev.solidrust.net//solidrust.net/" local="132731126590094954" remote="132731378400000000" Dst="2" />
+<file name="footer_simple.php" server="dev.solidrust.net//solidrust.net/" local="132731168525165606" remote="132731420400000000" Dst="2" />
 </dwsync>
\ No newline at end of file
diff --git a/web/complete.php b/web/complete.php
index 3d14a8c5..4532587a 100644
--- a/web/complete.php
+++ b/web/complete.php
@@ -1,8 +1,5 @@
-<?php include('nav_bar_simple.php'); ?>
-</div>
-</nav>
-
 <?php
+include('header.php');
     session_start();
     require('main.conf.php');
     if (!isset($_SESSION['steamid'], $_SESSION['user_id'])) header('location: /');
@@ -85,5 +82,5 @@ function getUserIP() {
 				
             </center>
         </div>
-<?php header('Refresh: 3; URL=/index'); ?>
-<?php include('footer.php'); ?>
\ No newline at end of file
+<?php header('Refresh: 1; URL=/index'); ?>
+<?php include('footer_simple.php'); ?>
\ No newline at end of file
diff --git a/web/discord.php b/web/discord.php
index 9693a4bf..25dc1e6f 100644
--- a/web/discord.php
+++ b/web/discord.php
@@ -1,7 +1,5 @@
-<?php include('nav_bar_simple.php'); ?>
-</div>
-</nav>
 <?php
+include('header.php');
     session_start();
     if(!isset($_SESSION['steamid'])) header('location: link');
     if(isset($_SESSION['guilds'])) header('location: complete');
@@ -27,4 +25,4 @@
             <a href="<?php echo url($client_id, $redirect, $scope); ?>" style="font-size:30px; background-color: #444;" class="discordButton"><i class="fab fa-discord" aria-hidden="true"></i> Login with Discord</a>
         </div>
 	
-<?php include('footer.php'); ?>
\ No newline at end of file
+<?php include('footer_simple.php'); ?>
\ No newline at end of file
diff --git a/web/footer_simple.php b/web/footer_simple.php
new file mode 100644
index 00000000..fd84dd81
--- /dev/null
+++ b/web/footer_simple.php
@@ -0,0 +1,4 @@
+<a class="navbar-brand" href="/index">
+<img src="/images/SoldRust_Banner_trans.png" alt="" height="128" class="d-inline-block align-text-top"></a>
+</body>
+</html>
\ No newline at end of file
diff --git a/web/link.php b/web/link.php
index d954ce91..42253807 100644
--- a/web/link.php
+++ b/web/link.php
@@ -1,7 +1,5 @@
-<?php include('nav_bar_simple.php'); ?>
-</div>
-</nav>
 <?php
+include('header.php');
 session_start();
 require 'steamauth/steamauth.php';
 require 'main.conf.php';
@@ -14,7 +12,6 @@
 }
 ?>
 	<link rel="stylesheet" href="css/login.css">
-    <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <script src="https://kit.fontawesome.com/9e14982b30.js" crossorigin="anonymous"></script>
     <div id="logincontent">
         <center>Step 1: Steam Auth (Click Steam Button)</center>
@@ -23,4 +20,4 @@
                 aria-hidden="true"></i> Login with Steam</a>
     </div>
 
-<?php include('footer.php'); ?>
\ No newline at end of file
+<?php include('footer_simple.php'); ?>
\ No newline at end of file
diff --git a/web/nav_bar.php b/web/nav_bar.php
index 89bf70f4..11d8feeb 100644
--- a/web/nav_bar.php
+++ b/web/nav_bar.php
@@ -63,4 +63,5 @@
 				?></span>
             </div>
         </div>
-    </nav>
\ No newline at end of file
+    </nav>
+
diff --git a/web/nav_bar_simple.php b/web/nav_bar_simple.php
new file mode 100644
index 00000000..cb9248b2
--- /dev/null
+++ b/web/nav_bar_simple.php
@@ -0,0 +1,41 @@
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-U1DAWAznBHeqEIlVSCgzq+c9gqGAJn5c/t99JyeKa9xxaYpSvHU5awsuZVVFIhvj" crossorigin="anonymous">
+    </script>
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+        <div class="container-fluid">
+          <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                    <li class="nav-item">
+                        <a class="nav-link active" aria-current="page" href="/index">Home</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="#">Discord</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="#">Store</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="#">Connect</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="#">Apply</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="#">Learn</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="#">Gallery</a>
+                    </li>
+                    <li>
+                        <a class="nav-link" href="#">Help</a>
+                    </li>
+                    <li>
+                        <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Report</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+