diff --git a/backend/.env.example b/backend/.env.example index e0150aa9..01066b0d 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -2,6 +2,7 @@ APP_NAME=KIKI APP_ENV=local APP_KEY= APP_DEBUG=true +SITE_URL=http://127.0.0.2 APP_URL=http://127.0.0.1 LOG_CHANNEL=stack diff --git a/backend/.env.release b/backend/.env.release index 75997a32..a73a171d 100644 --- a/backend/.env.release +++ b/backend/.env.release @@ -2,7 +2,8 @@ APP_NAME=KIKI APP_ENV=local APP_KEY= APP_DEBUG=false -APP_URL=https://kikikan.jp +SITE_URL=https://kikikan.jp +APP_URL=https://kikikan.xyz LOG_CHANNEL=stack LOG_LEVEL=debug diff --git a/backend/config/app.php b/backend/config/app.php index 6d06893e..bf94a445 100644 --- a/backend/config/app.php +++ b/backend/config/app.php @@ -52,7 +52,8 @@ return [ | */ - 'url' => env('APP_URL', 'http://127.0.0.1'), + 'url' => env('APP_URL', 'https://kikikan.xyz'), + 'site_url' => env('SITE_URL', 'https://kikikan.jp'), 'asset_url' => env('ASSET_URL', null), diff --git a/backend/resources/views/emails/fathers/registration/temporary.blade.php b/backend/resources/views/emails/fathers/registration/temporary.blade.php index fda656d2..4d51bb14 100644 --- a/backend/resources/views/emails/fathers/registration/temporary.blade.php +++ b/backend/resources/views/emails/fathers/registration/temporary.blade.php @@ -15,6 +15,6 @@ URLの有効期限を過ぎると、再登録が必要になりますので、 KIKI運営事務局 56@zotman.jp -{{ url('/') }}/ +{{ config('app.site_url') }} ■□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□□■ diff --git a/backend/resources/views/p_account/index.blade.php b/backend/resources/views/p_account/index.blade.php index 8178784c..aa75ca04 100644 --- a/backend/resources/views/p_account/index.blade.php +++ b/backend/resources/views/p_account/index.blade.php @@ -7,6 +7,7 @@ break; } } + $sitelink = config('app.site_url'); $invitelink = url('/c-account/register-temporary?father_id='.request()->session()->get('fathers')['id']); @endphp @section('content') @@ -15,6 +16,7 @@ + @endsection diff --git a/backend/resources/views/sms/children/password.blade.php b/backend/resources/views/sms/children/password.blade.php index c886ec2d..2a1fff0a 100644 --- a/backend/resources/views/sms/children/password.blade.php +++ b/backend/resources/views/sms/children/password.blade.php @@ -4,4 +4,4 @@ KIKIをご利用頂きありがとうございます。 有効期限は8時間以内です。 -{{ url('/').'/c-account/forgot-password/reset/'.$token }} \ No newline at end of file +{{ url('/c-account/forgot-password/reset/'.$token) }} \ No newline at end of file diff --git a/backend/resources/views/sms/children/register/main.blade.php b/backend/resources/views/sms/children/register/main.blade.php index 469e026c..d699a2c5 100644 --- a/backend/resources/views/sms/children/register/main.blade.php +++ b/backend/resources/views/sms/children/register/main.blade.php @@ -2,7 +2,7 @@ KIKI招致システムの本登録が完了しました。 ▼ログイン情報 ログインURL -{{ url('/').'/c-account/login' }} +{{ url('/c-account/login') }} ID {{ $tel }} diff --git a/backend/resources/views/sms/children/register/temporary.blade.php b/backend/resources/views/sms/children/register/temporary.blade.php index 6ae1854e..c3b85597 100644 --- a/backend/resources/views/sms/children/register/temporary.blade.php +++ b/backend/resources/views/sms/children/register/temporary.blade.php @@ -1,6 +1,6 @@ KIKIより本登録URLが届きました。 ▼本登録URLはこちら -{{ url('/').'/c-account/register/'.$token }} +{{ url('/c-account/register/'.$token) }} KIKI承知システムを使って「聞いてない!」「言ってない!」などの問題を解決しよう。 diff --git a/backend/resources/views/sms/fathers/approval.blade.php b/backend/resources/views/sms/fathers/approval.blade.php index d26f4eca..60269885 100644 --- a/backend/resources/views/sms/fathers/approval.blade.php +++ b/backend/resources/views/sms/fathers/approval.blade.php @@ -1,3 +1,3 @@ 未承知のミーティングがあります。 以下より確認してください。 -{{ url('/').'/c-account/meeting/detail/'.$meeting_id }} \ No newline at end of file +{{ url('/c-account/meeting/detail/'.$meeting_id) }} \ No newline at end of file diff --git a/backend/resources/views/vendor/mail/html/header.blade.php b/backend/resources/views/vendor/mail/html/header.blade.php index e8614832..1d80ac05 100755 --- a/backend/resources/views/vendor/mail/html/header.blade.php +++ b/backend/resources/views/vendor/mail/html/header.blade.php @@ -1,7 +1,7 @@ - +