Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: navbar blade components #1776

Merged
merged 29 commits into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c44a8b6
feat: navbar blade components
luchaos Aug 17, 2023
fde4f68
Show search input on small screens
luchaos Aug 18, 2023
41a3870
PHPStan fixes
luchaos Aug 18, 2023
aa5e2af
Fix carousel buttons
luchaos Aug 18, 2023
7b4ecc8
Address feedback
luchaos Aug 18, 2023
6bb3605
Adjust search input width for small screens (375px viewport target)
luchaos Aug 18, 2023
32c6f86
Fix news carousel render order
luchaos Aug 18, 2023
08c46f7
Add title and cursor modifier to points variants
luchaos Aug 18, 2023
49c74b1
Remove fixed height from navbar
luchaos Aug 18, 2023
3436d98
Merge branch 'master' into blade-navbar
luchaos Aug 18, 2023
bc38e40
Merge branch 'master' into blade-navbar
luchaos Aug 24, 2023
71d6afc
Merge branch 'master' into blade-navbar
luchaos Aug 25, 2023
e8439ae
Merge branch 'master' into blade-navbar
luchaos Aug 27, 2023
b2a7f98
fix deptrac dependency
luchaos Aug 27, 2023
ef11590
Change icons
luchaos Aug 27, 2023
1e2bde2
Remove redundant elements from the user top card
luchaos Aug 27, 2023
6a39feb
Introduce divider color for better control over contrast
luchaos Aug 27, 2023
ce38b52
Revert root ability to moderators
luchaos Aug 27, 2023
1890088
Merge commit '5c920e0299f67c41d0a7db9b75b6d9ffd5efcf7f' into blade-na…
luchaos Aug 27, 2023
0bef2f8
Merge branch 'master' into blade-navbar
luchaos Aug 27, 2023
5457dd7
Merge branch 'master' into blade-navbar
luchaos Aug 27, 2023
86ce8de
Merge branch 'master' into blade-navbar
luchaos Aug 28, 2023
3943e06
Merge branch 'master' into blade-navbar
luchaos Aug 28, 2023
d119b22
Address feedback
luchaos Aug 28, 2023
ead647c
Forum Verification
luchaos Aug 28, 2023
7e0a069
Merge branch 'master' into blade-navbar
luchaos Sep 1, 2023
bb8e793
Address feedback
luchaos Sep 1, 2023
95e8a2f
Address feedback
luchaos Sep 1, 2023
c870674
Move dropdown-item styles
luchaos Sep 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/Community/AuthServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace App\Community;

use App\Community\Models\AchievementComment;
use App\Community\Models\AchievementSetClaim;
use App\Community\Models\Comment;
use App\Community\Models\Forum;
use App\Community\Models\ForumCategory;
Expand All @@ -19,6 +20,7 @@
use App\Community\Models\UserActivityLegacy;
use App\Community\Models\UserComment;
use App\Community\Policies\AchievementCommentPolicy;
use App\Community\Policies\AchievementSetClaimPolicy;
use App\Community\Policies\CommentPolicy;
use App\Community\Policies\ForumCategoryPolicy;
use App\Community\Policies\ForumPolicy;
Expand All @@ -38,6 +40,7 @@ class AuthServiceProvider extends ServiceProvider
{
protected $policies = [
AchievementComment::class => AchievementCommentPolicy::class,
AchievementSetClaim::class => AchievementSetClaimPolicy::class,
Comment::class => CommentPolicy::class,
Forum::class => ForumPolicy::class,
ForumCategory::class => ForumCategoryPolicy::class,
Expand Down
50 changes: 50 additions & 0 deletions app/Community/Policies/AchievementSetClaimPolicy.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php

declare(strict_types=1);

namespace App\Community\Policies;

use App\Community\Models\AchievementSetClaim;
use App\Site\Enums\Permissions;
use App\Site\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;

class AchievementSetClaimPolicy
{
use HandlesAuthorization;

public function manage(User $user): bool
{
return $user->getAttribute('Permissions') >= Permissions::JuniorDeveloper;
}

public function view(User $user, AchievementSetClaim $achievementSetClaim): bool
{
return false;
}

public function create(User $user): bool
{
return false;
}

public function update(User $user, AchievementSetClaim $achievementSetClaim): bool
{
return false;
}

public function delete(User $user, AchievementSetClaim $achievementSetClaim): bool
{
return false;
}

public function restore(User $user, AchievementSetClaim $achievementSetClaim): bool
{
return false;
}

public function forceDelete(User $user, AchievementSetClaim $achievementSetClaim): bool
{
return false;
}
}
8 changes: 5 additions & 3 deletions app/Community/Policies/ForumPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace App\Community\Policies;

use App\Community\Models\Forum;
use App\Site\Enums\Permissions;
use App\Site\Models\Role;
use App\Site\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
Expand All @@ -15,9 +16,10 @@ class ForumPolicy

public function manage(User $user): bool
{
return $user->hasAnyRole([
Role::FORUM_MANAGER,
]);
return $user->getAttribute('Permissions') >= Permissions::Moderator;
// return $user->hasAnyRole([
// Role::FORUM_MANAGER,
// ]);
}

public function viewAny(?User $user): bool
Expand Down
12 changes: 7 additions & 5 deletions app/Community/Policies/NewsPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace App\Community\Policies;

use App\Community\Models\News;
use App\Site\Enums\Permissions;
use App\Site\Models\Role;
use App\Site\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
Expand All @@ -15,11 +16,12 @@ class NewsPolicy

public function manage(User $user): bool
{
return $user->hasAnyRole([
// Role::ADMINISTRATOR,
Role::MODERATOR,
Role::NEWS_MANAGER,
]);
return $user->getAttribute('Permissions') >= Permissions::Developer;
// return $user->hasAnyRole([
// // Role::ADMINISTRATOR,
// Role::MODERATOR,
// Role::NEWS_MANAGER,
// ]);
}

public function viewAny(?User $user): bool
Expand Down
6 changes: 6 additions & 0 deletions app/Community/Policies/TriggerTicketPolicy.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@
namespace App\Community\Policies;

use App\Community\Models\TriggerTicket;
use App\Site\Enums\Permissions;
use App\Site\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;

class TriggerTicketPolicy
{
use HandlesAuthorization;

public function manage(User $user): bool
{
return $user->getAttribute('Permissions') >= Permissions::JuniorDeveloper;
}

public function view(User $user, TriggerTicket $achievementTicket): bool
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion app/Community/RouteServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ protected function mapWebRoutes(): void

// Route::resource('forum', ForumController::class)->only('create', 'store', 'edit', 'update');

// // Route::get('posts/clearing', [ForumCommentController::class, 'clearing'])->name('forum-topic-comments.clearing');
// // Route::get('posts/verify', [ForumCommentController::class, 'verify'])->name('forum-topic-comments.verify');
// });

/*
Expand Down
Loading
Loading