Skip to content

Commit

Permalink
Code cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
krlmrr committed Dec 28, 2023
1 parent ca4db91 commit b758fc9
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 62 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/DashboardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function index(): Response
'franchises.name as franchise_name',
'franchises.slug as franchise_slug'
)
->get()
->get(),
]);
}
}
8 changes: 6 additions & 2 deletions app/Http/Controllers/DriverController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ public function show(Franchise $franchise, Driver $driver): Response
)
->get();

return Inertia::render('Drivers/Show')
->with(compact('driver', 'points', 'franchise', 'results'));
return Inertia::render('Drivers/Show', [
'driver' => $driver,
'franchise' => $franchise,
'points' => $points,
'results' => $results,
]);
}
}
18 changes: 9 additions & 9 deletions app/Http/Controllers/EventController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use App\Models\Franchise;
use App\Models\Race;
use App\Models\Result;
use App\Models\Track;
use Inertia\Inertia;
use Inertia\Response;

Expand All @@ -20,8 +19,10 @@ public function index(Franchise $franchise): Response
->orderBy('date', 'ASC')
->get();

return Inertia::render('Events/Index')
->with(compact('franchise', 'events'));
return Inertia::render('Events/Index', [
'franchise' => $franchise,
'events' => $events,
]);
}

public function show(Franchise $franchise, Event $event): Response
Expand All @@ -35,11 +36,10 @@ public function show(Franchise $franchise, Event $event): Response
->orderBy('starting_pos', 'ASC')
->get();

return Inertia::render('Events/Show')
->with(compact(
'franchise',
'event',
'results'
));
return Inertia::render('Events/Show', [
'franchise' => $franchise,
'event' => $event,
'results' => $results,
]);
}
}
7 changes: 5 additions & 2 deletions app/Http/Controllers/FantasyTeamController.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ public function show(League $league, FantasyTeam $team): Response
->orderBy('results_sum_points_for_race', 'DESC')
->get();

return Inertia::render('FantasyTeams/Show')
->with(compact('league', 'team', 'drivers'));
return Inertia::render('FantasyTeams/Show', [
'league' => $league,
'team' => $team,
'drivers' => $drivers,
]);
}
}
2 changes: 1 addition & 1 deletion app/Http/Controllers/FaqController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public function index(): Response
{
return Inertia::render('Faq', [
'faqs' => DB::table('faq')
->get()
->get(),
]);
}
}
8 changes: 5 additions & 3 deletions app/Http/Controllers/LeagueController.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class LeagueController extends Controller
public function create(): Response
{
return Inertia::render('Leagues/Create', [
'franchises' => Franchise::all()
'franchises' => Franchise::all(),
]);
}

Expand Down Expand Up @@ -47,7 +47,9 @@ public function show(League $league): Response
->with(['drivers', 'user'])
->get();

return Inertia::render('Leagues/Show')
->with(compact('league', 'fantasyTeams'));
return Inertia::render('Leagues/Show', [
'league' => $league,
'fantasyTeams' => $fantasyTeams,
]);
}
}
6 changes: 0 additions & 6 deletions app/Models/Constructor.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,12 @@

namespace App\Models;

use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;

/**
* @mixin Builder
*
* @property int $id
*/
class Constructor extends Model
{
use HasFactory;
Expand Down
8 changes: 2 additions & 6 deletions app/Models/FantasyTeam.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,23 @@

namespace App\Models;

use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;

/* @mixin Builder
* @property int $id
*/
class FantasyTeam extends Model
{
use HasFactory;

protected $guarded = ['id'];

public function User(): BelongsTo
public function user(): BelongsTo
{
return $this->belongsTo(User::class, 'user_id');
}

public function League(): BelongsTo
public function league(): BelongsTo
{
return $this->belongsTo(League::class, 'league_id')
->with('Franchise');
Expand Down
4 changes: 0 additions & 4 deletions app/Nova/Resource.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ abstract class Resource extends NovaResource
/**
* Build an "index" query for the given resource.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
Expand All @@ -22,7 +21,6 @@ public static function indexQuery(NovaRequest $request, $query)
/**
* Build a Scout search query for the given resource.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @param \Laravel\Scout\Builder $query
* @return \Laravel\Scout\Builder
*/
Expand All @@ -34,7 +32,6 @@ public static function scoutQuery(NovaRequest $request, $query)
/**
* Build a "detail" query for the given resource.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
Expand All @@ -48,7 +45,6 @@ public static function detailQuery(NovaRequest $request, $query)
*
* This query determines which instances of the model may be attached to other resources.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @param \Illuminate\Database\Eloquent\Builder $query
* @return \Illuminate\Database\Eloquent\Builder
*/
Expand Down
5 changes: 0 additions & 5 deletions app/Nova/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ class User extends Resource
/**
* Get the fields displayed by the resource.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @return array
*/
public function fields(NovaRequest $request)
Expand Down Expand Up @@ -68,7 +67,6 @@ public function fields(NovaRequest $request)
/**
* Get the cards available for the request.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @return array
*/
public function cards(NovaRequest $request)
Expand All @@ -79,7 +77,6 @@ public function cards(NovaRequest $request)
/**
* Get the filters available for the resource.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @return array
*/
public function filters(NovaRequest $request)
Expand All @@ -90,7 +87,6 @@ public function filters(NovaRequest $request)
/**
* Get the lenses available for the resource.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @return array
*/
public function lenses(NovaRequest $request)
Expand All @@ -101,7 +97,6 @@ public function lenses(NovaRequest $request)
/**
* Get the actions available for the resource.
*
* @param \Laravel\Nova\Http\Requests\NovaRequest $request
* @return array
*/
public function actions(NovaRequest $request)
Expand Down
46 changes: 23 additions & 23 deletions app/Providers/NovaServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@ public function boot()
parent::boot();
}

/**
* Get the tools that should be listed in the Nova sidebar.
*
* @return array
*/
public function tools()
{
return [];
}

/**
* Register any application services.
*
* @return void
*/
public function register()
{
//
}

/**
* Register the Nova routes.
*
Expand All @@ -26,9 +46,9 @@ public function boot()
protected function routes()
{
Nova::routes()
->withAuthenticationRoutes()
->withPasswordResetRoutes()
->register();
->withAuthenticationRoutes()
->withPasswordResetRoutes()
->register();
}

/**
Expand Down Expand Up @@ -58,24 +78,4 @@ protected function dashboards()
new \App\Nova\Dashboards\Main,
];
}

/**
* Get the tools that should be listed in the Nova sidebar.
*
* @return array
*/
public function tools()
{
return [];
}

/**
* Register any application services.
*
* @return void
*/
public function register()
{
//
}
}

0 comments on commit b758fc9

Please sign in to comment.