From 1faf0f65f93d17a3bc3c7fe23cba056a376e151f Mon Sep 17 00:00:00 2001 From: Muhammad Equilibrie Fajria <104043362+MuhLibri@users.noreply.github.com> Date: Tue, 31 Oct 2023 21:11:45 +0700 Subject: [PATCH] add subscribe status --- public/css/curators.css | 26 +++++++++++++++++++++++++- src/controllers/CuratorsController.php | 3 ++- src/views/curators/index.php | 4 ++++ src/views/curators/show.php | 7 +++++-- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/public/css/curators.css b/public/css/curators.css index 622e1cc..bc176df 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 fe55a87..a513969 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 deaddc8..894a08c 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 499d6d3..3f13d8f 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; -- GitLab