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

Merged
merged 3 commits into from
Jul 15, 2023
Merged

Conversation

khlystou
Copy link
Contributor

Настройка стартового маршрута.
Для настройки нужно указать в ENV файле название нужного роута
MOONSHINE_INDEX_ROUTE="moonshine.example"

@@ -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
Collaborator

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
Collaborator

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.

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

@@ -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
Collaborator

Choose a reason for hiding this comment

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

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

@@ -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
Collaborator

Choose a reason for hiding this comment

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

ну ты понял)

@@ -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
Collaborator

Choose a reason for hiding this comment

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

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

@lee-to lee-to merged commit c895ad1 into moonshine-software:1.5.x Jul 15, 2023
3 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants