ren807
diff --git a/‎app/Http/Controllers/PostController.php‎
Lines changed: 4 additions & 4 deletions b/‎app/Http/Controllers/PostController.php‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎app/Services/PostService.php‎
Lines changed: 10 additions & 5 deletions b/‎app/Services/PostService.php‎
Lines changed: 10 additions & 5 deletions
diff --git a/‎resources/views/posts/index.blade.php‎
Lines changed: 32 additions & 9 deletions b/‎resources/views/posts/index.blade.php‎
Lines changed: 32 additions & 9 deletions
@@ -26,13 +26,13 @@ public function index(Request $request)
  $favorites = $this->post->getFavorites($this->userId);
  $pagerInfo = $this->post->getPagerInfo();
 
- $posts = [
- 'shopData' => $shopData,
+ $data = [
+ 'shopData'  => $shopData,
  'favorites' => $favorites,
- 'pagerInfo' => $pagerInfo,
+ 'pagerInfo' => $pagerInfo
  ];
 
- return View('posts.index', ['posts' => $posts]);
+ return View('posts.index', $data);
  }
 
  public function create()
 
@@ -35,10 +35,12 @@ public function convShopData(): array
  $tags = $this->getAllTags();
 
  // View用にタグを変換
- foreach ($shopInfo as $si) {
- $si->tags = $this->convTagsData($si->tags, $tags);
+ foreach ($shopInfo as &$si) {
+ $si['tags'] = $this->convTagsData($si['tags'], $tags);
  }
 
+ unset($si);
+
  return $shopInfo;
  }
 
@@ -93,14 +95,17 @@ public function getShopInfo(): array
  $sql = 'SELECT posts.id, posts.shopname, posts.tags, deleted_flg,'.PHP_EOL;
  $sql .= 'ROUND(AVG(rating)::numeric, 1) AS avg_rating, MAX(image_url) AS image_url'.PHP_EOL;
  $sql .= 'FROM posts'.PHP_EOL;
- $sql .= ' INNER JOIN ratings'.PHP_EOL;
+ $sql .= ' LEFT JOIN ratings'.PHP_EOL;
  $sql .= ' ON posts.id = ratings.post_id'.PHP_EOL;
- $sql .= ' INNER JOIN images'.PHP_EOL;
+ $sql .= ' LEFT JOIN images'.PHP_EOL;
  $sql .= ' ON posts.id = images.post_id'.PHP_EOL;
  $sql .= 'GROUP BY posts.id, posts.shopname, posts.tags, posts.deleted_flg'.PHP_EOL;
  $sql .= 'ORDER BY avg_rating DESC'.PHP_EOL;
 
- return $this->pager(DB::select($sql));
+ $result = DB::select($sql);
+ $convArray = array_map(fn($row) => (array) $row, $result); // 配列内のオブジェクトを配列に変換
+
+ return $this->pager($convArray);
  }
 
  /**
 
@@ -38,6 +38,22 @@
  margin: 0 auto;
  }
 
+ .create-shop-content {
+ text-align: center; 
+ margin-bottom: 20px;
+ }
+
+ .create-shop-content a {
+ display: inline-block;
+ background-color: #28a745;
+ color: white;
+ padding: 10px 20px;
+ border-radius: 5px;
+ text-decoration: none;
+ font-weight: bold;
+ transition: background-color 0.3s;
+ }
+
  .post {
  display: flex;
  align-items: center;
@@ -120,19 +136,26 @@
 <body>
  <div class="container">
  <h1>投稿一覧</h1>
- @foreach ($posts['shopData'] as $post)
+ <div class="create-shop-content">
+ <a href="{{ route('create') }}">
+ ＋ 新しい店舗を追加
+ </a>
+ </div>
+ @foreach ($shopData as $post)
  <div class="post">
- @if($post->image_url)
- <img src="{{ $post->image_url }}" alt="画像">
+ @if(!is_null($post['image_url']))
+ <div><img src="{{ $post['image_url'] }}" alt="画像"></div>
+ @elseif(is_null($post['image_url']))
+ <div><img src="https://picsum.photos/200/300" alt="画像"></div>
  @endif
  <div class="post-content">
- <h2><a href="{{ route('show', ['id' => $post->id]) }}">{{ $post->shopname }}</a></h2>
- <p>評価: <strong>{{ number_format($post->avg_rating, 1) }}</strong> ⭐</p>
+ <h2><a href="{{ route('show', ['id' => $post['id']]) }}">{{ $post['shopname'] }}</a></h2>
+ <p>評価: <strong>{{ number_format($post['avg_rating'], 1) }}</strong> ⭐</p>
 
  <!-- タグ表示 -->
- @if (!empty($post->tags))
+ @if (!empty($post['tags']))
  <div class="tags">
- @foreach ($post->tags as $tag)
+ @foreach ($post['tags'] as $tag)
  <span class="tag">{{ $tag['name'] }}</span>
  @endforeach
  </div>
@@ -146,8 +169,8 @@
 
  <!-- ページネーション -->
  <div class="pagination">
- @for ($i = 1; $i <= $posts['pagerInfo']['maxPage']; $i++)
- @if ($i == $posts['pagerInfo']['nowPage'])
+ @for ($i = 1; $i <= $pagerInfo['maxPage']; $i++)
+ @if ($i == $pagerInfo['nowPage'])
  <span class="active">{{ $i }}</span>
  @else
  <a href="?page_id={{ $i }}">{{ $i }}</a>