Merge pull request #76 from fanzru/staging

Bump BE staging to main
fanzru · Jun 15, 2022 · 48f02ca · 48f02ca
2 parents 3d779c7 + 4acaa49
commit 48f02ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/backend/app/Http/Controllers/TikumController.php b/backend/app/Http/Controllers/TikumController.php
@@ -5,6 +5,7 @@
 use App\Models\Tikum;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
 class TikumController extends Controller
 {
@@ -16,7 +17,7 @@ class TikumController extends Controller
     public function index()
     {
         try {
-            $tikum = Tikum::with('user:id,name,created_at,updated_at')->get();
+            $tikum = Tikum::with('user:id,name,created_at,updated_at')->where('waktu_kumpul', '>', DB::raw('NOW()'))->orderByDesc('waktu_kumpul')->get();
             return response($tikum, 200);
         } catch (\Exception $e) {
             return response("Internal Server Error", 500);

diff --git a/mobile/lib/screen/home/components/tikum/mytikum_card.dart b/mobile/lib/screen/home/components/tikum/mytikum_card.dart
@@ -133,7 +133,7 @@ class MyTikumCard extends StatelessWidget {
             ),
             if (tikum.deskripsi != null)
               Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
                   const Text(
                     "Deskripsi",

diff --git a/mobile/lib/screen/home/components/tikum/tikum_card.dart b/mobile/lib/screen/home/components/tikum/tikum_card.dart
@@ -83,7 +83,7 @@ class TikumCard extends StatelessWidget {
             ),
             if (tikum.deskripsi != null)
               Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: [
                   const Text(
                     "Deskripsi",