Conflict fix + design tweaks

HE-Arc · Dec 18, 2024 · e3c77c6 · e3c77c6
1 parent f2bfb05
commit e3c77c6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/timeliner/app/Http/Controllers/TimelineController.php b/timeliner/app/Http/Controllers/TimelineController.php
@@ -64,17 +64,11 @@ public function show($id)
 
     public function showDashboard()
     {
-        $user = Auth::user();
+        $timelines =  $this->timelinesWithOwnership();
 
-        $timelines =  DB::select("
-            SELECT timelines.*
-            FROM timelines
-            JOIN ownerships
-            ON CAST(SUBSTR(ownerships.id, 1, LENGTH(ownerships.id) - LENGTH(?)) AS INTEGER) = timelines.id
-            WHERE CAST(SUBSTR(ownerships.id, -LENGTH(?)) AS INTEGER) = ?
-        ", [$user->id, $user->id, $user->id]);
+        $timelinesWithOwnership = $this->timelinesWithOwnership();
 
-        return view('dashboard',['timelines' => $timelines]);
+        return view('dashboard',['timelines' => $timelines, 'timelinesWithOwnership' => $timelinesWithOwnership]);
     }
 
     public function create()

diff --git a/timeliner/resources/views/dashboard.blade.php b/timeliner/resources/views/dashboard.blade.php
@@ -11,9 +11,6 @@
                 <div class="p-6 text-gray-900 dark:text-gray-100">
                     {{ __("You're logged in!") }}
                 </div>
-                <div class="p-6 text-gray-900 dark:text-gray-100">
-                    @include("timeline.partials.timelinelist", $timelines)
-                </div>
             </div>
         </div>
 

diff --git a/timeliner/resources/views/timeline/create.blade.php b/timeliner/resources/views/timeline/create.blade.php
@@ -34,7 +34,7 @@
                                 </div>
 
                             </div>
-                            <div id="node-creation-form" class="form-group col-12">
+                            <div id="node-creation-form" class="form-group col-12 border-2 border-grey-200 rounded-md p-2">
                                 @include('timeline.partials.nodecreate')
                             </div>
 

diff --git a/timeliner/resources/views/timeline/edit.blade.php b/timeliner/resources/views/timeline/edit.blade.php
@@ -32,7 +32,7 @@
                                 </div>
 
                             </div>
-                            <div id="node-edit-form" class="form-group col-12">
+                            <div id="node-edit-form" class="form-group col-12  border-2 border-grey-200 rounded-md p-2">
                                 @include('timeline.partials.nodeedit', ['nodes' => $nodes])
                             </div>
 
@@ -54,4 +54,4 @@
             </div>
         </div>
     </form>
-</x-app-layout>
+</x-app-layout>
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,7 @@ @@
                                     </div>
                                 </div>
-                                <div id="node-creation-form" class="form-group col-12">
+                                <div id="node-creation-form" class="form-group col-12 border-2 border-grey-200 rounded-md p-2">
                                     @include('timeline.partials.nodecreate')
                                 </div>
@@ Expand Down @@