diff --git a/App/Controllers/Api.php b/App/Controllers/Api.php index a37b3eb..aa41890 100644 --- a/App/Controllers/Api.php +++ b/App/Controllers/Api.php @@ -14,9 +14,7 @@ class Api public function posts() { $get = []; $get['count'] = 0; - $get['data'] = $this->model->showJoin([ - ['pengumuman.status', '=', 1] - ]); + $get['data'] = $this->model->showJoin(); if (array_key_exists(0, $get['data']) == false) { $temp_data = $get['data']; diff --git a/App/Models/Post.php b/App/Models/Post.php index 03a8d0d..737a37b 100644 --- a/App/Models/Post.php +++ b/App/Models/Post.php @@ -122,7 +122,7 @@ class Post extends \Core\Model try { $db = static::connectDB(); - $sql = "SELECT pengumuman.id, kategori.background, kategori.foreground, pengumuman.valid_at, pengumuman.expired_at, pengumuman.creator, pengumuman.editor, pengumuman.content, pengumuman.status FROM pengumuman INNER JOIN kategori ON pengumuman.category=kategori.id"; + $sql = "SELECT pengumuman.id, kategori.category, kategori.background, kategori.foreground, pengumuman.valid_at, pengumuman.expired_at, pengumuman.creator, pengumuman.editor, pengumuman.content, pengumuman.status FROM pengumuman INNER JOIN kategori ON pengumuman.category=kategori.id"; if ($conditions) { $sql .= " WHERE"; diff --git a/App/Views/Data/mithril.html b/App/Views/Data/mithril.html index 627836a..ea8186b 100644 --- a/App/Views/Data/mithril.html +++ b/App/Views/Data/mithril.html @@ -3,41 +3,76 @@ {% block title %}Mithril{% endblock %} {% block body %} -
+
+
+
+
+
+
+ Semua +
+
+ Aktif +
+ +
+ Nonaktif +
+
+
+
+
+
+
+ {% endblock %} diff --git a/App/Views/base.html b/App/Views/base.html index 0481b1e..cc8899f 100644 --- a/App/Views/base.html +++ b/App/Views/base.html @@ -120,6 +120,8 @@ .card footer { position: absolute; bottom: 0; + padding-left: 0; + padding-bottom: 0; } .card-wrapper { @@ -147,11 +149,6 @@ background-color: rgba(17, 17, 17, .05); } - .card footer { - padding-left: 0; - padding-bottom: 0; - } - .fitty > p { margin: 0; }