Dashboard completed + minor design tweaks

HE-Arc · Dec 18, 2024 · a2ca903 · a2ca903
1 parent 346c1ba
commit a2ca903
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 39 deletions.
diff --git a/timeliner/app/Http/Controllers/TimelineController.php b/timeliner/app/Http/Controllers/TimelineController.php
@@ -11,6 +11,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 use Illuminate\View\View;
+use Illuminate\Support\Facades\DB;
 
 use function Psy\debug;
 
@@ -22,11 +23,6 @@ public function index()
         return view('index', ['timelines' => $timelines]);
     }
 
-    public function timelinelist()
-    {
-        return view('timeline.timelinelist');
-    }
-
     public function show($id)
     {
         $timeline = Timeline::findOrFail($id);
@@ -37,8 +33,6 @@ public function show($id)
                 ->with('milestones')
                 ->get();
 
-            Log::info('nodes: '.$nodes->count());
-
             $comments = Comment::where('timeline_id', '=', $timeline->id)
                 ->with('user')
                 ->get();
@@ -56,6 +50,21 @@ public function show($id)
             ->withErrors(["You don't have access."]);
     }
 
+    public function showDashboard()
+    {
+        $user = Auth::user();
+
+        $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]);
+
+        return view('dashboard',['timelines' => $timelines]);
+    }
+
     public function create()
     {
         return view('timeline.create');

diff --git a/timeliner/app/Models/User.php b/timeliner/app/Models/User.php
@@ -44,4 +44,9 @@ protected function casts(): array
             'password' => 'hashed',
         ];
     }
+
+    public function ownerships()
+    {
+        return $this->hasMany(Ownership::class, 'id', 'id');
+    }
 }
diff --git a/timeliner/resources/js/createformfunctions.js b/timeliner/resources/js/createformfunctions.js
@@ -95,7 +95,7 @@ if (nodeCreateButton) {
     let row_id = "node-" + ni;
     let ms_table_id = "ms-table-" + ni;
     tr_node_form.setAttribute("id", row_id);
-    tr_node_form.setAttribute("class", "form-row mt-3");
+    tr_node_form.setAttribute("class", "form-row mt-3 border-4 border-blue-100 rounded-md p-2");
     tr_milestone_table.setAttribute("id", ms_table_id);
     tr_milestone_table.setAttribute("class", "form-group col-9");
 

diff --git a/timeliner/resources/views/dashboard.blade.php b/timeliner/resources/views/dashboard.blade.php
@@ -13,5 +13,21 @@
                 </div>
             </div>
         </div>
+
+    <br>
+
+        <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
+            <div class="bg-white dark:bg-gray-800 overflow-hidden shadow-sm sm:rounded-lg">
+                <div class="p-6 text-gray-900 dark:text-gray-100">
+                    <h2>Your timelines</h2>
+
+                    @if ($timelines)
+                        @include("timeline.partials.timelinelist", $timelines)
+                    @else
+                        You did not create any timelines yet
+                    @endif
+                </div>
+            </div>
+        </div>
     </div>
 </x-app-layout>
diff --git a/timeliner/resources/views/timeline/partials/nodecreate.blade.php b/timeliner/resources/views/timeline/partials/nodecreate.blade.php
@@ -2,7 +2,8 @@
 @csrf
     <div class="form-group ">
 
-        <button id="node-create-button" type="button" class="btn btn-primary mt-3 bi bi-node-plus"> Add Node</button>
+
+        <h3>Nodes</h3>
 
         <div class="col-12">
             <table>
@@ -82,5 +83,8 @@
                     </table>
                 </div>
             </table>
+
+            <button id="node-create-button" type="button" class="btn btn-primary mt-3 bi bi-node-plus"> Add Node</button>
+
         </div>
     </div>
diff --git a/timeliner/resources/views/timeline/partials/nodeedit.blade.php b/timeliner/resources/views/timeline/partials/nodeedit.blade.php
@@ -1,6 +1,8 @@
     <div class="form-group ">
-        <button id="node-create-button" type="button" class="btn btn-primary mt-3 bi bi-node-plus"> Add Node</button>
-        <div class="col-12">
+       <div class="col-12">
+
+        <h3>Nodes</h3>
+
             <table>
                 <div id="node-list">
                     <table>
@@ -19,7 +21,7 @@
                                 window.nodeMilestoneCounts = @json($nodeMilestoneCounts);
                             </script>
                             @foreach ($currentNodes as $nodeIndex => $node)
-                                <tr id="node-{{ $nodeIndex }}" class="form-row mt-3" data-index="{{ $nodeIndex }}">
+                                <tr id="node-{{ $nodeIndex }}" class="form-row mt-3 border-4 border-blue-100 rounded-md p-2" data-index="{{ $nodeIndex }}">
                                     <td>
                                         <label for="nodeTitle-{{ $nodeIndex }}">Description</label>
                                     </td>
@@ -78,5 +80,7 @@
                     </table>
                 </div>
             </table>
+            <button id="node-create-button" type="button" class="btn btn-primary mt-3 bi bi-node-plus"> Add Node</button>
+
         </div>
     </div>
diff --git a/timeliner/resources/views/timeline/timeline.blade.php b/timeliner/resources/views/timeline/timeline.blade.php
@@ -28,31 +28,34 @@
                         <input type="range" id="timelineSlider" min="30" max="200" value="100" step="1">
                         <span id="timelineWidthValue">100</span>
                     </div>
+                </div>
+            </div>
 
+            <br>
 
-                    <!-- Comments to this timeline section -->
-                    <div>
-                        <h2>Comments</h2>
-
-                        <!-- Add comment to this timeline section -->
-                        <button class="btn btn-primary bi bi-plus-lg toggle-button" data-target="addComment"> Add comment</button>
-
-                        <form id="addComment" class ="hidden" action="{{ route("comment.store") }}" method="POST">
-                            @csrf
-                            <input type="hidden" name="timeline_id" value="{{ $timeline->id }}">
-                            <input type="hidden" name="user_id" value="{{ Auth::id() }}">
-                            <div class="form-group">
-                                <label for="inputComment">New comment</label>
-                                <textarea name="comment" rows="5" class="form-control" id="inputComment">{{ old('comment') }}</textarea>
-                            </div>
-                            <button type="submit" class="btn btn-primary bi bi-plus-lg"> Add</button>
-                        </form>
-
-                        <!-- Show comments to this timeline section -->
-                        @foreach ($comments as $comment)
-                            @include("timeline.partials.comment", ["comment"=>$comment])
-                        @endforeach
-                    </div>
+            <div class="bg-white dark:bg-gray-800 overflow-hidden shadow-sm sm:rounded-lg">
+                <!-- Comments to this timeline section -->
+                <div class="p-6 text-gray-900 dark:text-gray-100">
+                    <h2>Comments</h2>
+
+                    <!-- Add comment to this timeline section -->
+                    <button class="btn btn-primary bi bi-plus-lg toggle-button" data-target="addComment"> Post comment</button>
+
+                    <form id="addComment" class ="hidden" action="{{ route("comment.store") }}" method="POST">
+                        @csrf
+                        <input type="hidden" name="timeline_id" value="{{ $timeline->id }}">
+                        <input type="hidden" name="user_id" value="{{ Auth::id() }}">
+                        <div class="form-group">
+                            <label for="inputComment">New comment</label>
+                            <textarea name="comment" rows="5" class="form-control" id="inputComment">{{ old('comment') }}</textarea>
+                        </div>
+                        <button type="submit" class="btn btn-primary bi bi-plus-lg"> Add</button>
+                    </form>
+
+                    <!-- Show comments to this timeline section -->
+                    @foreach ($comments as $comment)
+                        @include("timeline.partials.comment", ["comment"=>$comment])
+                    @endforeach
                 </div>
             </div>
         </div>

diff --git a/timeliner/routes/web.php b/timeliner/routes/web.php
@@ -11,9 +11,7 @@
     return view('about');
 })->name('about');
 
-Route::get('/dashboard', function () {
-    return view('dashboard');
-})->middleware(['auth', 'verified'])->name('dashboard');
+Route::get('/dashboard', [TimelineController::class, 'showDashboard'])->middleware(['auth', 'verified'])->name('dashboard');
 
 
 
@@ -35,4 +33,4 @@
 
 Route::post('comment', [CommentController::class, 'store'])->middleware(['auth', 'verified'])->name('comment.store');
 Route::delete('comment/{comment}', [CommentController::class, 'destroy'])->middleware(['auth', 'verified'])->name('comment.destroy');
-Route::put('comment/{comment}', [CommentController::class, 'update'])->middleware(['auth', 'verified'])->name('comment.update');
+Route::put('comment/{comment}', [CommentController::class, 'update'])->middleware(['auth', 'verified'])->name('comment.update');