diff --git a/public/css/curators.css b/public/css/curators.css index 622e1cc2346d78aeb87d09c31b1584dced51ccd4..bc176df6ee3237fbf42bbce0d8f7330e91f13561 100644 --- a/public/css/curators.css +++ b/public/css/curators.css @@ -36,6 +36,7 @@ min-height: 100px; height: auto; gap: 10px; + border-radius: var(--radius-md); } #cc1:hover { @@ -60,10 +61,33 @@ margin-bottom: 50px; } -.btn-group { +.status-section { + width: 50%; + height: 100%; + margin: auto; + display: flex; + justify-content: flex-end; + gap: 8px; +} + +.subscribe-section { width: 70%; + min-width: 50%; height: 100%; margin: auto; + display: flex; + justify-content: flex-end; + gap: 8px; +} + +.inner-subscribe { + display: flex; + flex-direction: column; + justify-content: flex-end; +} + +.status-text { + margin-bottom: 20px; } .btn-subscribe { diff --git a/src/controllers/CuratorsController.php b/src/controllers/CuratorsController.php index fe55a877f73688d405cf452f214d1c60b8365b60..a513969e0a2aebfe44d86ff68d1c148078c73d9c 100644 --- a/src/controllers/CuratorsController.php +++ b/src/controllers/CuratorsController.php @@ -36,7 +36,8 @@ class CuratorsController extends Controller { } public function index() { - $curators = ['curators' => [['id' => 1, 'count' => $this->curatorsService->getSubscriber(1)], ['id' => 2, 'count' => $this->curatorsService->getSubscriber(2)]]]; + $userId = $_SESSION['user_id']; + $curators = ['curators' => [['id' => 1, 'count' => $this->curatorsService->getSubscriber(1), 'status' => $this->curatorsService->getSubscriptionStatus(1, $userId)], ['id' => 2, 'count' => $this->curatorsService->getSubscriber(2), 'status' => $this->curatorsService->getSubscriptionStatus(2, $userId)]]]; $this->render('index', array_merge($curators, ['currentPage' => 1, 'pageSize' => 5])); } diff --git a/src/views/curators/index.php b/src/views/curators/index.php index deaddc82850a0fc4df08ed8ace40a733d1d639f2..894a08c324aa30e208de5721f73fa8e1d88f201a 100644 --- a/src/views/curators/index.php +++ b/src/views/curators/index.php @@ -13,6 +13,7 @@ function curatorList($data) { $name = "Lizaaaa"; $reviewCount = 5; $subscriber = $curator['count']; + $status = $curator['status']; $profileImg = '/assets/users/blank.jpeg'; $html = <<<EOT <a href="/curators/$id" class="curator-container" id="cc1"> @@ -24,6 +25,9 @@ function curatorList($data) { <h6 class="curator-info">$reviewCount review</h6> <h6 class="curator-info">$subscriber subscriber</h6> </div> + <div class="status-section"> + <h5 class="status-text">$status</h5> + </div> </a> EOT; $str = $str . $html; diff --git a/src/views/curators/show.php b/src/views/curators/show.php index 499d6d3e1cdce5503bb5de3ff7fc1309b90bb8ea..3f13d8f6a064ec4696a940512fe947c53be470a6 100644 --- a/src/views/curators/show.php +++ b/src/views/curators/show.php @@ -19,8 +19,11 @@ function showCuratorProfile($data) { <h6 class="curator-info">$reviewCount review</h6> <h6 class="curator-info">$subscriber subscriber</h6> </div> - <div class="btn-group"> - <button type="button" class="btn-subscribe" id="subscribe">$status</button> + <div class="subscribe-section"> + <div class="inner-subscribe"> + <h5 class="status-text">$status</h5> + <button type="button" class="btn-subscribe" id="subscribe">Subscribe</button> + </div> </div> </div> EOT;