clean-up navbar and login flow

SolidRusT · Aug 11, 2021 · 98eb0c7 · 98eb0c7
1 parent 2ce9a1f
commit 98eb0c7
Show file tree

Hide file tree

Showing 8 changed files with 363 additions and 20 deletions.
diff --git 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
+        }
+      ]
     }
   ]
 }
diff --git 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>
diff --git 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'); ?>
+<?php header('Refresh: 1; URL=/index'); ?>
+<?php include('footer_simple.php'); ?>
diff --git 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'); ?>
+<?php include('footer_simple.php'); ?>
diff --git a/web/footer_simple.php 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>