mirror of
https://github.com/robonen/education-project.git
synced 2026-03-20 10:54:31 +00:00
Merge branch 'journal' into timetable
# Conflicts: # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/Auth/RegisterController.php # app/Http/Controllers/TimetableController.php # app/Models/SchoolClass.php # app/Models/User.php # composer.lock
This commit is contained in:
@@ -26,6 +26,6 @@ class AuthServiceProvider extends ServiceProvider
|
||||
{
|
||||
$this->registerPolicies();
|
||||
|
||||
Passport::routes();
|
||||
// Passport::routes();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ class RouteServiceProvider extends ServiceProvider
|
||||
$this->configureRateLimiting();
|
||||
|
||||
$this->routes(function () {
|
||||
Route::prefix('/api')
|
||||
Route::prefix('api')
|
||||
->middleware('api')
|
||||
->namespace($this->namespace)
|
||||
->group(base_path('routes/api.php'));
|
||||
@@ -57,7 +57,7 @@ class RouteServiceProvider extends ServiceProvider
|
||||
protected function configureRateLimiting()
|
||||
{
|
||||
RateLimiter::for('api', function (Request $request) {
|
||||
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
|
||||
return Limit::perMinute(100)->by(optional($request->user())->id ?: $request->ip());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user