feat: 加入歷史日誌

flamelin · Dec 4, 2016 · 717744f · 717744f
1 parent 6c0bf42
commit 717744f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 deletions.
diff --git a/app/Http/Controllers/LogsController.php b/app/Http/Controllers/LogsController.php
@@ -16,7 +16,8 @@ class LogsController extends Controller {
 	 * @return \Illuminate\Http\Response
 	 */
 	public function index() {
-		//
+		$logs = Log::whereUserId(auth::user()->id)->orderBy('id', 'desc')->paginate(20);
+        return view('logs.index', compact('logs'));
 	}
 
 	/**

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -43,7 +43,8 @@
                 <div class="collapse navbar-collapse" id="app-navbar-collapse">
                     <!-- Left Side Of Navbar -->
                     <ul class="nav navbar-nav">
-                        &nbsp;
+                        <li><a href="{{ url('/log/create') }}">新增</a></li>
+                        <li><a href="{{ url('/log') }}">歷史日誌</a></li>
                     </ul>
 
                     <!-- Right Side Of Navbar -->

diff --git a/resources/views/logs/index.blade.php b/resources/views/logs/index.blade.php
@@ -0,0 +1,40 @@
+@extends('layouts.app')
+@section('content')
+
+    <div class="container col-md-8 col-md-offset-2">
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <h4>歷史日誌</h4>
+            </div>
+            @if ($logs->isEmpty())
+                <p> There is no log.</p>
+            @else
+                <table class="table">
+                    <thead>
+                    <tr>
+                        <th>ID</th>
+                        <th>日期</th>
+                        <th>完成</th>
+                        <th>明日</th>
+
+                    </tr>
+                    </thead>
+                    <tbody>
+                    @foreach($logs as $log)
+                        <tr>
+                            <td>{{ $log->id }}</td>
+                            <td>{{ $log->date }}</td>
+                            <td>{!! nl2br($log->done) !!}</td>
+                            <td>{!! nl2br($log->future) !!}</td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+                <div class="text-center">
+                    {{ $logs->links() }}
+                </div>
+            @endif
+        </div>
+    </div>
+
+@endsection
diff --git a/routes/web.php b/routes/web.php
@@ -1,8 +1,7 @@
 <?php
 
-Route::resource('log', 'LogsController');
-
 Route::group(array('middleware' => 'auth'), function () {
+    Route::resource('log', 'LogsController');
     Route::get('/', 'LogsController@create');
 });