Merge pull request #81 from loljoshie/revert-68-main

Revert "Implement cash and live blur update"
loljoshie · Sep 7, 2022 · d20b1cc · d20b1cc
2 parents b3a89b8 + 5b5d059
commit d20b1cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/client/main.lua b/client/main.lua
@@ -55,11 +55,6 @@ end)
 RegisterNetEvent("lj-inventory:client:showBlur", function()
     Wait(50)
     showBlur = not showBlur
-    if not showBlur then
-	TriggerScreenblurFadeOut(400)
-    else
-        TriggerScreenblurFadeIn(400)
-    end
 end)
 
 -- Functions
@@ -353,10 +348,6 @@ end)
 
 RegisterNetEvent('QBCore:Player:SetPlayerData', function(val)
     PlayerData = val
-    SendNUIMessage({
-        action = 'UpdateCash',
-        cash = PlayerData.money['cash']
-    })
 end)
 
 AddEventHandler('onResourceStop', function(name)
@@ -440,7 +431,6 @@ RegisterNetEvent('inventory:client:OpenInventory', function(PlayerAmmo, inventor
             maxweight = Config.MaxInventoryWeight,
             Ammo = PlayerAmmo,
             maxammo = Config.MaximumAmmoValues,
-	    cash = PlayerData.money['cash']
         })
         inInventory = true
     end

diff --git a/html/js/app.js b/html/js/app.js
@@ -2406,11 +2406,6 @@ var requiredItemOpen = false;
         totalWeight = 0;
         totalWeightOther = 0;
 
-        $("#player-cash").html(data.cash.toLocaleString('en-US', {
-            style: 'currency',
-            currency: 'USD',
-            minimumFractionDigits: 0
-        }));
         $(".player-inventory").find(".item-slot").remove();
         $(".ply-hotbar-inventory").find(".item-slot").remove();
         $(".ply-iteminfo-container").css("opacity", "0.0");
@@ -3020,13 +3015,6 @@ var requiredItemOpen = false;
                     );
                     $("#rob-money").data("TargetId", event.data.TargetId);
                     break;
-                case "UpdateCash":
-                    $("#player-cash").html(event.data.cash.toLocaleString('en-US', {
-                        style: 'currency',
-                        currency: 'USD',
-                        minimumFractionDigits: 0
-                    }));
-                    break;
             }
         });
     };

diff --git a/html/ui.html b/html/ui.html
@@ -22,7 +22,7 @@
         <div id="qbcore-inventory">
             <div class="inventory-info">
                 <div class="player-inv-info">
-                    <span id="player-inv-label"><span id='player-cash'>$0</span></span><br>
+                    <span id="player-inv-label">Player</span><br>
                     <!-- <img class="weight-img" src="images/weight.png"> -->
                         <div>
                             <div id="progressbar">
@@ -51,8 +51,8 @@
                 <div class="inv-options">
                     <div class="inv-options-list">
                         <img class="brand-logo" src="./images/lj-symbol.svg"></img>
-                        <input type="number" id="item-amount" class="inv-option-item" min=1 max="10000" placeholder="Amount" pattern="[0-9]" onfocus="this.value=''" placeholder="" oninput="validity.valid||(value='');"></input>
-                        <div class="inv-option-item" id="item-use"><p>Use</p></div>
+                        <input type="number" id="item-amount" class="inv-option-item" min=1 max="10000" placeholder="Amount" pattern="[0-9]" onfocus="this.value=''" placeholder="" oninput="validity.valid||(value='');"></input>                        <div class="inv-option-item" id="item-use"><p>Use</p></div>
+                        <!-- <img class="inv-option-hand" id= "item-use" src="images/hand-1.png"> -->
                         <div class="inv-option-item" id="item-give"><p>Give</p></div>
                         <div class="inv-option-item" id="inv-close"><p>Close</p></div>
                         <div class="combine-option-container">