so-manager/so-manager-dev.com
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'お知らせ画面修正' (#67) from main_watanabe into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 25s
Details
Deploy preview (main_watanabe) / deploy (push) Successful in 13s
Details

Browse Source 
Reviewed-on: #67
This commit is contained in:
y.watanabe 2026-02-05 17:26:06 +09:00
commit d0b3a6c979
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/mypage/index.blade.php
View File

@ -238,15 +238,15 @@
</div>
<div id="my-information" class="card border-success">
<div class="card-header border-success text-success">
<h5 class="card-title">{{ $user_name }}さんへのお知らせ
<a href="{{ url('/user_information') }}" class="badge badge-secondary badge-pill float-right">お知らせ一覧を見る</a>
<h5 class="card-title">{{ $user_name }}さんへのxお知らせ
<a href="{{ route('user_information.index', ['management_code' => request()->route('management_code')]) }}" class="badge badge-secondary badge-pill float-right">お知らせ一覧を見る</a>
</h5>
</div>
<ul class="info-slider_1-1">
@if($information)
<li>
<span class="small" style="margin-right: 1em;">{{ $information->entry_date }}</span>
{{ $information->user_information_history }}
{{ str($information->user_information_history)->before("\n") }}
</li>
@else
<li class="text-center">お知らせはありません。</li>

4
resources/views/user_information/history.blade.php
View File

@ -17,7 +17,7 @@
</div>
<div class="col-12 col-lg-7 mb10">
<p class="h5 font-weight-normal">
{{ $information->user_information_history }}
{!! nl2br(e($information->user_information_history)) !!}
</p>
</div>
@empty
@ -30,7 +30,7 @@
{{ $informations->links('partials.paging') }}
</div>
<div class="col-12 col-md-6 offset-0 offset-md-3 mt-4 mb50">
<a href="{{ url('mypage') }}" class="btn btn-lg btn-block btn-outline-success">マイページへ戻る</a>
<a href="{{ route('mypage', ['management_code' => request()->route('management_code')]) }}" class="btn btn-lg btn-block btn-outline-success">マイページへ戻る</a>
</div>
</section>
</main>

6
resources/views/user_information/index.blade.php
View File

@ -17,7 +17,7 @@
</div>
<div class="col-12 col-lg-7 mb10">
<p class="h5 font-weight-normal">
{{ $information->user_information_history }}
{!! nl2br(e($information->user_information_history)) !!}
</p>
</div>
@empty
@ -27,10 +27,10 @@
@endforelse
<div class="col-12 col-md-5 offset-md-1 mt10">
<a href="{{ url('mypage') }}" class="btn btn-lg btn-block btn-outline-success">マイページへ戻る</a>
<a href="{{ route('mypage', ['management_code' => request()->route('management_code')]) }}" class="btn btn-lg btn-block btn-outline-success">マイページへ戻る</a>
</div>
<div class="col-12 col-md-5 mt10">
<a href="{{ url('user_information/history') }}" class="btn btn-lg btn-block btn-outline-success">過去のお知らせ</a>
<a href="{{ route('user_information.history', ['management_code' => request()->route('management_code')]) }}" class="btn btn-lg btn-block btn-outline-success">過去のお知らせ</a>
</div>
</div>
</section>