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.

Sign up for GitHub

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: Configure start route #387

Merged
merged 3 commits into from
Jul 15, 2023
Merged

feat: Configure start route #387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7be2a5
feat: Configure start route
khlystou Jul 14, 2023
e02fda4
fix: Add defoult route
khlystou Jul 14, 2023
3e5890a
fix: Add defoult route
khlystou Jul 14, 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
1 change: 1 addition & 0 deletions config/moonshine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

'route' => [
'prefix' => env('MOONSHINE_ROUTE_PREFIX', 'moonshine'),
'index_route' => env('MOONSHINE_INDEX_ROUTE', 'moonshine.index'),
'middleware' => ['moonshine'],
'custom_page_slug' => 'custom_page',
'notFoundHandler' => MoonShineNotFoundException::class,
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Controllers/AuthenticateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AuthenticateController extends BaseController
public function login(): View|RedirectResponse
{
if (MoonShineAuth::guard()->check()) {
return to_route('moonshine.index');
return to_route(config('moonshine.route.index_route'));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

те кто обновится, у них не будет в конфиге этого параметра, после чего поймают ошибку ведь будет null
надо вот так

return to_route(config('moonshine.route.index_route', 'moonshine.index'));

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В конфиге же, в функции env('label', 'detault'), второй параметр указан. Не бцдет NULL. Там указвно 'moonshine.index'.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

function env($key, $default = null) { return Env::get($key, $default); }

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Он возьмет те конфиги которые лежат в config/moonshine.php не который в пакете и там параметра у большинства не будет, они то закешированы у большинства

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ну логично. Будет минутка - исправлю.

}

return view('moonshine::auth.login');
Expand All @@ -31,7 +31,7 @@ public function authenticate(LoginFormRequest $request): RedirectResponse
$request->authenticate();

return redirect()
->intended(route('moonshine.index'));
->intended(route(config('moonshine.route.index_route')));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тоже самое и здесь

}

public function logout(Request $request): RedirectResponse
Expand Down
2 changes: 1 addition & 1 deletion src/Http/Controllers/SocialiteController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function callback(string $driver): RedirectResponse
MoonShineAuth::guard()
->loginUsingId($account->moonshine_user_id);

return to_route('moonshine.index');
return to_route(config('moonshine.route.index_route'));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ну ты понял)

}

private function bindAccount(
Expand Down