diff --git a/app/Http/Controllers/WeaponSkinController.php b/app/Http/Controllers/WeaponSkinController.php index aa58a95..8561252 100644 --- a/app/Http/Controllers/WeaponSkinController.php +++ b/app/Http/Controllers/WeaponSkinController.php @@ -21,11 +21,35 @@ public function index() // Group skins by weapon types dynamically $weaponTypes = []; foreach ($skins as $skin) { - $weaponType = explode('_', $skin['weapon_name'])[1]; // Extract weapon type + if(in_array($skin['weapon_defindex'], [ + 500, + 503, + 505, + 506, + 507, + 508, + 509, + 512, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 525, + 526 + ])) { + $weaponType = 'knife'; + } else { + $weaponType = explode('_', $skin['weapon_name'])[1]; // Extract weapon type + } if (!isset($weaponTypes[$weaponType])) { $weaponTypes[$weaponType] = []; } - // Mark skin as applied if it exists in appliedSkins $skin['is_applied'] = $appliedSkins->contains(function ($value) use ($skin) { return $value->weapon_defindex == $skin['weapon_defindex'] && $value->weapon_paint_id == $skin['paint']; @@ -51,6 +75,30 @@ public function load($type) $appliedSkins = DB::table('wp_player_skins')->where('steamid', Auth::user()?->steam_id)->get(); $filteredSkins = array_filter($skins, function($skin) use ($type) { + if($type == 'knife' && in_array($skin['weapon_defindex'], [ + 500, + 503, + 505, + 506, + 507, + 508, + 509, + 512, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 525, + 526 + ])){ + return true; + } return str_contains(strtolower($skin['weapon_name']), strtolower($type)); }); @@ -82,6 +130,37 @@ public function applySkin(Request $request) return response()->json(['errors' => $validator->errors()], 422); } $validated = $validator->validated(); + if(in_array($validated['weapon_defindex'], [ + 500, + 503, + 505, + 506, + 507, + 508, + 509, + 512, + 514, + 515, + 516, + 517, + 518, + 519, + 520, + 521, + 522, + 523, + 525, + 526 + ])){ + DB::table('wp_player_knife')->updateOrInsert( + [ + 'steamid' => $validated['steamid'], + ], + [ + 'knife' => $request->input('weapon_name'), + ] + ); + } DB::table('wp_player_skins')->updateOrInsert( [ 'steamid' => $validated['steamid'], @@ -126,7 +205,11 @@ public function gloves() $gloves = json_decode(File::get(resource_path('json/gloves.json')), true); // Fetch applied gloves from the database - $appliedGloves = DB::table('wp_player_gloves')->where('steamid', Auth::user()?->steam_id)->get(); + $appliedGloves = DB::table('wp_player_skins') + ->where('steamid', Auth::user()?->steam_id) + ->pluck('weapon_paint_id') + ->toArray(); + // Group gloves by paint name prefix $gloveTypes = []; foreach ($gloves as $glove) { @@ -136,12 +219,11 @@ public function gloves() } // Mark glove as applied if it exists in appliedGloves - $glove['is_applied'] = $appliedGloves->contains(function ($value) use ($glove) { - return $value->weapon_defindex == $glove['weapon_defindex']; - }); + $glove['is_applied'] = in_array($glove['paint'], $appliedGloves); $gloveTypes[$paintPrefix][] = $glove; } + // Sort applied gloves to be first in each category foreach ($gloveTypes as $type => $gloves) { usort($gloves, function($a, $b) { @@ -152,20 +234,24 @@ public function gloves() return view('weapons.gloves', compact('gloveTypes')); } + public function loadGloves($type) { $gloves = json_decode(File::get(resource_path('json/gloves.json')), true); - $appliedGloves = DB::table('wp_player_gloves')->where('steamid', Auth::user()?->steam_id)->get(); + $appliedGloves = DB::table('wp_player_skins') + ->where('steamid', Auth::user()?->steam_id) + ->pluck('weapon_paint_id') + ->toArray(); + $filteredGloves = array_filter($gloves, function($glove) use ($type) { return str_contains(strtolower($glove['paint_name']), strtolower($type)); }); // Mark glove as applied if it exists in appliedGloves foreach ($filteredGloves as &$glove) { - $glove['is_applied'] = $appliedGloves->contains(function ($value) use ($glove) { - return $value->weapon_defindex == $glove['weapon_defindex']; - }); + $glove['is_applied'] = in_array($glove['paint'], $appliedGloves); } + // Sort applied gloves to be first usort($filteredGloves, function($a, $b) { return $b['is_applied'] - $a['is_applied']; @@ -174,6 +260,7 @@ public function loadGloves($type) return view('weapons.partials.gloves-types', ['gloves' => $filteredGloves]); } + public function music() { $music = json_decode(File::get(resource_path('json/music.json')), true); @@ -231,6 +318,10 @@ public function applyGlove(Request $request) $validator = Validator::make($request->all(), [ 'steamid' => 'required|string', 'weapon_defindex' => 'required|integer', + 'weapon_paint_id' => 'required|integer', + 'wearSelect' => 'required|numeric', + 'wear' => 'nullable|numeric', + 'seed' => 'nullable|integer', ]); if ($validator->fails()) { @@ -240,6 +331,7 @@ public function applyGlove(Request $request) $validated = $validator->validated(); try { + // Update or insert in wp_player_gloves table DB::table('wp_player_gloves')->updateOrInsert( [ 'steamid' => $validated['steamid'], @@ -249,6 +341,19 @@ public function applyGlove(Request $request) ] ); + // Update or insert in wp_player_skins table + DB::table('wp_player_skins')->updateOrInsert( + [ + 'steamid' => $validated['steamid'], + 'weapon_defindex' => $validated['weapon_defindex'], + ], + [ + 'weapon_paint_id' => $validated['weapon_paint_id'], + 'weapon_wear' => $validated['wearSelect'], + 'weapon_seed' => $validated['seed'] ?? 0, + ] + ); + return response()->json(['success' => 'Glove skin applied successfully!']); } catch (\Exception $e) { return response()->json(['error' => 'An unexpected error occurred.'], 500); @@ -274,25 +379,6 @@ public function applyMusic(Request $request) return response()->json(['success' => 'Music applied successfully!']); } - public function applyKnife(Request $request) - { - $validated = $request->validate([ - 'steamid' => 'required|string', - 'weapon_name' => 'required|string', - ]); - - DB::table('wp_player_knife')->updateOrInsert( - [ - 'steamid' => $validated['steamid'], - ], - [ - 'knife' => $validated['weapon_name'], - ] - ); - - return response()->json(['success' => 'Knife applied successfully!']); - } - } diff --git a/config/app.php b/config/app.php index 80117a7..b3078b5 100644 --- a/config/app.php +++ b/config/app.php @@ -9,7 +9,7 @@ | Application Version |-------------------------------------------------------------------------- */ - 'version' => '3.0', + 'version' => '3.1', /* |-------------------------------------------------------------------------- | Application Name diff --git a/resources/views/components/navbar/style-vertical-menu.blade.php b/resources/views/components/navbar/style-vertical-menu.blade.php index f122711..a068c26 100644 --- a/resources/views/components/navbar/style-vertical-menu.blade.php +++ b/resources/views/components/navbar/style-vertical-menu.blade.php @@ -24,7 +24,7 @@
  • + - - + + + +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    + @@ -107,12 +134,14 @@ const gloveImage = card.find('img').attr('src'); const gloveName = card.find('b').text(); const weaponDefIndex = $(this).data('weapon-defindex'); - const paint = $(this).data('paint-id'); + const weaponPaintId = $(this).data('paint-id'); + const weaponName = $(this).data('weapon-name'); // Set the image source and name $('#selectedGloveImage').attr('src', gloveImage); $('#selectedGloveName').text(gloveName); $('#weapon_defindex').val(weaponDefIndex); - $('#paint_id').val(paint); + $('#weapon_paint_id').val(weaponPaintId); + $('#weapon_name').val(weaponName); // Show the apply glove modal $('#applyGloveModal').modal('show'); }); @@ -129,7 +158,7 @@ }).then(response => response.json()).then(data => { if (data.success) { $('.glove_active').html(''); - $('#glove_'+$('#paint_id').val()).html('Active'); + $('#glove_'+$('#weapon_paint_id').val()).html('Active'); Snackbar.show({ text: 'Skin Applied Successfully.', actionTextColor: '#fff', @@ -169,11 +198,16 @@ $('#glovePreviewModal').modal('show'); }); }); - - - - + function validateSeed(input) { + if (!/^\d*$/.test(input.value)) { + input.value = input.value.replace(/[^\d]/g, ''); + } + } + function updateWearValue(value) { + $('#wear').val(value); + } + diff --git a/resources/views/weapons/skins.blade.php b/resources/views/weapons/skins.blade.php index 284b01c..e4f7623 100644 --- a/resources/views/weapons/skins.blade.php +++ b/resources/views/weapons/skins.blade.php @@ -155,13 +155,6 @@ $('#weapon_paint_id').val(weaponPaintId); $('#weapon_name').val(weaponName); - // Show or hide non-knife options - if (weaponName.includes('weapon_knife')) { - $('#non-knife-options').hide(); - } else { - $('#non-knife-options').show(); - } - // Show the apply skin modal $('#applySkinModal').modal('show'); }); @@ -171,12 +164,7 @@ const formData = new FormData(document.getElementById('applySkinForm')); const weaponCategory = $('#weapon_category').val(); let route; - - if ($('#weapon_name').val().includes('weapon_knife')) { - route = '{!! env('VITE_SITE_DIR') !!}/weapons/knives/apply'; - } else { - route = '{!! env('VITE_SITE_DIR') !!}/weapons/skins/apply'; - } + route = '{!! env('VITE_SITE_DIR') !!}/weapons/skins/apply'; fetch(route, { method: 'POST', @@ -242,19 +230,15 @@ function updateWearValue(value) { @else -