diff --git a/backend/.env.example b/backend/.env.example index 2fb79d46..f8686cd1 100644 --- a/backend/.env.example +++ b/backend/.env.example @@ -31,7 +31,7 @@ MAIL_MAILER=smtp MAIL_HOST=mail28.conoha.ne.jp MAIL_PORT=587 MAIL_USERNAME="info@kikikan.xyz" -MAIL_PASSWORD="*44(2HBddVEX" +MAIL_PASSWORD="#3khK(6&z*aZ$DWfgfz|" MAIL_ENCRYPTION=tls MAIL_FROM_ADDRESS="info@kikikan.xyz" MAIL_FROM_NAME="${APP_NAME}" diff --git a/backend/.env.release b/backend/.env.release index 0c466da6..f0985e6f 100644 --- a/backend/.env.release +++ b/backend/.env.release @@ -31,7 +31,7 @@ MAIL_MAILER=smtp MAIL_HOST=mail28.conoha.ne.jp MAIL_PORT=587 MAIL_USERNAME="info@kikikan.xyz" -MAIL_PASSWORD="*44(2HBddVEX" +MAIL_PASSWORD="#3khK(6&z*aZ$DWfgfz|" MAIL_ENCRYPTION=tls MAIL_FROM_ADDRESS="info@kikikan.xyz" MAIL_FROM_NAME="${APP_NAME}" diff --git a/backend/app/Mail/ChildrenMainRegistrationMail.php b/backend/app/Mail/ChildrenMainRegistrationMail.php index 4134629d..7eea156f 100644 --- a/backend/app/Mail/ChildrenMainRegistrationMail.php +++ b/backend/app/Mail/ChildrenMainRegistrationMail.php @@ -11,7 +11,7 @@ class ChildrenMainRegistrationMail extends Mailable { use Queueable, SerializesModels; public function build () { - return $this->subject('本登録が完了しました。')->text('emails.children.registration.main', [ + return $this->subject('【KIKIシステム】本登録が完了しました。')->text('emails.children.registration.main', [ 'url' => '/c-account/login', ]); } diff --git a/backend/app/Mail/FathersApprovalMail.php b/backend/app/Mail/FathersApprovalMail.php index b2619949..60c60e4d 100644 --- a/backend/app/Mail/FathersApprovalMail.php +++ b/backend/app/Mail/FathersApprovalMail.php @@ -18,7 +18,7 @@ class FathersApprovalMail extends Mailable { } public function build () { - return $this->subject('KIKI運営事務局からのお知らせ')->text('emails.fathers.approval', [ + return $this->subject('【KIKIシステム】KIKI運営事務局からのお知らせ')->text('emails.fathers.approval', [ 'father' => $this->father, 'url' => '/c-account/meeting/detail/'.$this->meeting_id, ]); diff --git a/backend/app/Mail/FathersRegistrationMainMail.php b/backend/app/Mail/FathersRegistrationMainMail.php index 8dd4b757..21354a58 100644 --- a/backend/app/Mail/FathersRegistrationMainMail.php +++ b/backend/app/Mail/FathersRegistrationMainMail.php @@ -11,7 +11,7 @@ class FathersRegistrationMainMail extends Mailable { use Queueable, SerializesModels; public function build () { - return $this->subject('本登録が完了しました。')->text('emails.fathers.registration.main', [ + return $this->subject('【KIKIシステム】本登録が完了しました。')->text('emails.fathers.registration.main', [ 'url' => '/p-account/login', ]); } diff --git a/backend/app/Mail/FathersRegistrationTemporaryMail.php b/backend/app/Mail/FathersRegistrationTemporaryMail.php index 6b8b121c..eb85971a 100644 --- a/backend/app/Mail/FathersRegistrationTemporaryMail.php +++ b/backend/app/Mail/FathersRegistrationTemporaryMail.php @@ -16,7 +16,7 @@ class FathersRegistrationTemporaryMail extends Mailable { } public function build () { - return $this->subject('【KIKI】会員登録のご案内')->text('emails.fathers.registration.temporary', [ + return $this->subject('【KIKIシステム】会員登録のご案内')->text('emails.fathers.registration.temporary', [ 'url' => '/p-account/register/'.$this->token, ]); } diff --git a/backend/app/Mail/MeetingEditNotification.php b/backend/app/Mail/MeetingEditNotification.php index 2104c051..1d5e6222 100644 --- a/backend/app/Mail/MeetingEditNotification.php +++ b/backend/app/Mail/MeetingEditNotification.php @@ -18,7 +18,7 @@ class MeetingEditNotification extends Mailable { } public function build () { - return $this->subject('KIKI運営事務局からのお知らせ')->text('emails.fathers.meetingedit', [ + return $this->subject('【KIKIシステム】KIKI運営事務局からのお知らせ')->text('emails.fathers.meetingedit', [ 'father' => $this->father, 'url' => '/c-account/meeting/detail/'.$this->meeting_id, ]); diff --git a/backend/resources/js/component/register/complete.jsx b/backend/resources/js/component/register/complete.jsx index b9f95269..73c315ed 100644 --- a/backend/resources/js/component/register/complete.jsx +++ b/backend/resources/js/component/register/complete.jsx @@ -9,7 +9,7 @@ const SignUpComplete = () => { const { pathname, state } = useLocation(); const [_success, setSuccess] = useState(state); - + const gotoLogin = () => { var url; if(pathname.includes('c-account')) url = '/c-account/login'; @@ -27,7 +27,7 @@ const SignUpComplete = () => { ログイン画面より、ログインを行ってください。
-