Skip to content

Commit

Permalink
Minor fixes for subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
@hobsRKM
hobsRKM committed Jun 7, 2024
1 parent c7324c0 commit d4499f6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
22 changes: 11 additions & 11 deletions resources/views/components/menu/vertical-menu.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
@endif
<div class="shadow-bottom"></div>
<ul class="list-unstyled menu-categories">
<li class="menu {{ Request::is('/') ? 'active' : '' }}">
<li class="menu {{ Route::currentRouteName() == 'home' ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/" aria-expanded="false" class="dropdown-toggle">
<div class="">
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-home"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"></path><polyline points="9 22 9 12 15 12 15 22"></polyline></svg>
Expand All @@ -70,7 +70,7 @@
<div class="heading"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minus"><line x1="5" y1="12" x2="19" y2="12"></line></svg><span>SERVER</span></div>
</li>

<li class="menu {{ Request::is('list/bans') ? 'active' : '' }}">
<li class="menu {{ Request::is('*list/bans*') ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/list/bans" aria-expanded="false" class="dropdown-toggle">
<div class="">
<i class="fas fa-ban fa-fw me-3"></i>
Expand All @@ -79,7 +79,7 @@
</a>
</li>

<li class="menu {{ Request::is('list/mutes') ? 'active' : '' }}">
<li class="menu {{ Request::is('*list/mutes*') ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/list/mutes" aria-expanded="false" class="dropdown-toggle">
<div class="">
<i class="fas fa-microphone-alt-slash fa-fw me-3"></i> <span>{{ __('dashboard.mutes') }}</span>
Expand All @@ -90,7 +90,7 @@
<div class="heading"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minus"><line x1="5" y1="12" x2="19" y2="12"></line></svg><span>Weapon Paints</span></div>
</li>
@if(env('SKINS') == 'Enabled')
<li class="menu {{ Request::is('weapons/skins') || Request::is('gloves/skins') || Request::is('agents/skins') || Request::is('music/kits') ? "active" : "" }}">
<li class="menu {{ Request::is('*weapons/skins*') || Request::is('*gloves/skins*') || Request::is('*agents/skins*') || Request::is('*music/kits*') ? "active" : "" }}">
<a href="{{getAppSubDirectoryPath()}}/weapons/skins" class="dropdown-toggle">
<div class="">
<i class="fas fa-fire fa-fw me-3"></i><span>Skins</span>
Expand All @@ -103,7 +103,7 @@
</li>

@if(env('RANKS') == 'Enabled')
<li class="menu {{ Request::is('list/ranks') ? "active" : "" }}">
<li class="menu {{ Request::is('*list/ranks*') ? "active" : "" }}">
<a href="{{getAppSubDirectoryPath()}}/list/ranks" class="dropdown-toggle">
<div class="">
<i class="fas fa-trophy fa-fw me-3"></i><span>{{ __('admins.ranks') }}</span>
Expand All @@ -112,7 +112,7 @@
</li>
@endif
@if(env('VIP') == 'Enabled')
<li class="menu {{ Request::is('vip') ? "active" : "" }}">
<li class="menu {{ Request::is('*vip*') ? "active" : "" }}">
<a href="{{getAppSubDirectoryPath()}}/vip" class="dropdown-toggle">
<div class="">
<i class="fas fa-crown fa-fw me-3"></i><span>{{ __('admins.VIP') }}</span>
Expand All @@ -135,7 +135,7 @@
</li>
@endif
@if(PermissionsHelper::hasBanPermission())
<li class="menu {{ Request::is('ban/add') ? 'active' : '' }}">
<li class="menu {{ Request::is('*ban/add*') ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/ban/add" aria-expanded="false" class="dropdown-toggle">
<div class="">
<i class="fas fa-plus fa-fw me-3"></i><span>{{ __('admins.addBans') }}</span>
Expand All @@ -144,7 +144,7 @@
</li>
@endif
@if(PermissionsHelper::hasMutePermission())
<li class="menu {{ Request::is('mute/add') ? 'active' : '' }}">
<li class="menu {{ Request::is('*mute/add*') ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/mute/add" aria-expanded="false" class="dropdown-toggle">
<div class="">
<i class="fas fa-plus fa-fw me-3"></i><span>{{ __('admins.addMute') }}</span>
Expand All @@ -153,14 +153,14 @@
</li>
@endif
@if(PermissionsHelper::isSuperAdmin())
<li class="menu {{ Request::is('list/groups') ? 'active' : '' }}">
<li class="menu {{ Request::is('*list/groups*') ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/list/groups" aria-expanded="false" class="dropdown-toggle">
<div class="">
<i class="fas fa-users fa-fw me-3"></i><span>{{ __('admins.allGroups') }}</span>
</div>
</a>
</li>
<li class="menu {{ Request::is('group/create') ? 'active' : '' }}">
<li class="menu {{ Request::is('*group/create*') ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/group/create" aria-expanded="false" class="dropdown-toggle">
<div class="">
<i class="fas fa-plus fa-fw me-3"></i><span>{{ __('admins.createGroup') }}</span>
Expand All @@ -172,7 +172,7 @@
<li class="menu menu-heading">
<div class="heading"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-minus"><line x1="5" y1="12" x2="19" y2="12"></line></svg><span>{{ __('admins.rcon') }}</span></div>
</li>
<li class="menu {{ Request::is('rcon') ? 'active' : '' }}">
<li class="menu {{ Request::is('*rcon*') ? 'active' : '' }}">
<a href="{{getAppSubDirectoryPath();}}/rcon" aria-expanded="false" class="dropdown-toggle">
<div class=""><i class="fa fa-terminal fa-fw me-3"></i><span>{{ __('admins.rcon') }}</span></div>
</a>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/navbar/style-vertical-menu.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</li>
<li class="nav-item dropdown">
<select id="language-dropdown" class="form-select">
<option {{ app()->getLocale() == 'en' ? 'seRlected' : '' }} value="en" data-image="{{ Vite::asset('resources/images/1x1/us.svg') }}">English</option>
<option {{ app()->getLocale() == 'en' ? 'selected' : '' }} value="en" data-image="{{ Vite::asset('resources/images/1x1/us.svg') }}">English</option>
<option {{ app()->getLocale() == 'de' ? 'selected' : '' }} value="de" data-image="{{ Vite::asset('resources/images/1x1/de.svg') }}">German</option>
<option {{ app()->getLocale() == 'es' ? 'selected' : '' }} value="es" data-image="{{ Vite::asset('resources/images/1x1/es.svg') }}">Spanish</option>
<option {{ app()->getLocale() == 'fr' ? 'selected' : '' }} value="fr" data-image="{{ Vite::asset('resources/images/1x1/fr.svg') }}">French</option>
Expand Down
16 changes: 8 additions & 8 deletions resources/views/weapons/components/weapons-tab.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<ul class="nav nav-tabs" id="weaponTab" role="tablist">
<li class="nav-item">
<button class="nav-link {{ Request::is('weapons/skins') ? 'active' : '' }}" id="weapon-dropdown-tab" data-bs-toggle="modal" data-bs-target="#weaponModal" type="button">
<a href="{{ !Request::is('weapons/skins') ? getAppSubDirectoryPath()."/weapons/skins" : 'javascript:void(0);'}}"><img src="https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/weapon_deagle-962.png" alt="Weapons" width="50" height="50"></a>
@if(Request::is('weapons/skins'))
<button class="nav-link {{ Request::is('*weapons/skins*') ? 'active' : '' }}" id="weapon-dropdown-tab" data-bs-toggle="modal" data-bs-target="#weaponModal" type="button">
<a href="{{ !Request::is('*weapons/skins*') ? getAppSubDirectoryPath()."/weapons/skins" : 'javascript:void(0);'}}"><img src="https://raw.githubusercontent.com/Nereziel/cs2-WeaponPaints/main/website/img/skins/weapon_deagle-962.png" alt="Weapons" width="50" height="50"></a>
@if(Request::is('*weapons/skins*'))
<span class="modal-icon">
<i class="fas fa-chevron-down"></i>
</span>
@endif
</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link {{ Request::is('agents/skins') ? 'active' : '' }}" id="agents-tab-icon" data-bs-toggle="tab" data-bs-target="#agents-tab-pane" type="button" role="tab" aria-controls="agents-tab-pane" aria-selected="{{ Request::is('agents') ? 'true' : 'false' }}">
<button class="nav-link {{ Request::is('*agents/skins*') ? 'active' : '' }}" id="agents-tab-icon" data-bs-toggle="tab" data-bs-target="#agents-tab-pane" type="button" role="tab" aria-controls="agents-tab-pane" aria-selected="{{ Request::is('agents') ? 'true' : 'false' }}">
<a href="{{getAppSubDirectoryPath()}}/agents/skins"><img src="https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/agent-4726.png" alt="Agents" width="50" height="50"></a>
</button>
</li>
<li class="nav-item">
<button class="nav-link {{ Request::is('gloves/skins') ? 'active' : '' }}" id="glove-dropdown-tab" data-bs-toggle="modal" data-bs-target="#gloveModal" type="button">
<a href="{{ !Request::is('gloves/skins') ? getAppSubDirectoryPath()."/gloves/skins" : 'javascript:void(0);'}}"><img src="https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/studded_brokenfang_gloves-10085.png" alt="Gloves" width="50" height="50"></a>
@if(Request::is('gloves/skins'))
<button class="nav-link {{ Request::is('*gloves/skins*') ? 'active' : '' }}" id="glove-dropdown-tab" data-bs-toggle="modal" data-bs-target="#gloveModal" type="button">
<a href="{{ !Request::is('*gloves/skins*') ? getAppSubDirectoryPath()."/gloves/skins" : 'javascript:void(0);'}}"><img src="https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/studded_brokenfang_gloves-10085.png" alt="Gloves" width="50" height="50"></a>
@if(Request::is('*gloves/skins*'))
<span class="modal-icon">
<i class="fas fa-chevron-down"></i>
</span>
@endif
</button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link {{ Request::is('music/kits') ? 'active' : '' }}" id="music-tab-icon" data-bs-toggle="tab" data-bs-target="#music-tab-pane" type="button" role="tab" aria-controls="music-tab-pane" aria-selected="{{ Request::is('music') ? 'true' : 'false' }}">
<button class="nav-link {{ Request::is('*music/kits*') ? 'active' : '' }}" id="music-tab-icon" data-bs-toggle="tab" data-bs-target="#music-tab-pane" type="button" role="tab" aria-controls="music-tab-pane" aria-selected="{{ Request::is('music') ? 'true' : 'false' }}">
<a href="{{getAppSubDirectoryPath()}}/music/kits"><img src="https://raw.githubusercontent.com/daffyyyy/cs2-WeaponPaints/main/website/img/skins/music_kit-3.png" alt="Music" width="50" height="50"></a>
</button>
</li>
Expand Down

0 comments on commit d4499f6

Please sign in to comment.