From 0d51e9db6b9f18c8c0bc459fd10d5af55d26f3b2 Mon Sep 17 00:00:00 2001
From: "Tom K.H. Lin" <3011850@gmail.com>
Date: Sun, 29 Jul 2018 17:25:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=99=BB=E5=85=A5?=
 =?UTF-8?q?=E7=95=AB=E9=9D=A2=E8=A3=BD=E4=BD=9C=E3=80=81=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4=E5=8F=8A=E6=96=B0=E5=A2=9Ereceiver=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin.php                                 | 42 +++++++++++++++++++
 app/Http/Controllers/ReceiverController.php   | 13 ++++++
 app/Providers/AppServiceProvider.php          |  3 +-
 .../2018_07_29_083103_create_admin_table.php  | 36 ++++++++++++++++
 database/seeds/DatabaseSeeder.php             |  2 +-
 resources/views/home/index.blade.php          |  2 +
 resources/views/layout/app.blade.php          |  7 ++--
 resources/views/layout/login.blade.php        | 24 +++++++++++
 resources/views/receiver/login.blade.php      | 18 ++++++++
 routes/web.php                                | 14 +++----
 10 files changed, 148 insertions(+), 13 deletions(-)
 create mode 100644 app/Admin.php
 create mode 100644 app/Http/Controllers/ReceiverController.php
 create mode 100644 database/migrations/2018_07_29_083103_create_admin_table.php
 create mode 100644 resources/views/layout/login.blade.php
 create mode 100644 resources/views/receiver/login.blade.php

diff --git a/app/Admin.php b/app/Admin.php
new file mode 100644
index 0000000..6af41a4
--- /dev/null
+++ b/app/Admin.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Created by Reliese Model.
+ * Date: Sun, 29 Jul 2018 08:54:26 +0000.
+ */
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model as Eloquent;
+
+/**
+ * Class Admin
+ * 
+ * @property string $ID
+ * @property string $password
+ * @property string $name
+ * @property string $nick_name
+ * @property string $phone_number
+ * @property \Carbon\Carbon $created_at
+ * @property \Carbon\Carbon $updated_at
+ *
+ * @package App
+ */
+class Admin extends Eloquent
+{
+	protected $connection = 'mysql';
+	protected $table = 'admin';
+	protected $primaryKey = 'ID';
+	public $incrementing = false;
+
+	protected $hidden = [
+		'password'
+	];
+
+	protected $fillable = [
+		'password',
+		'name',
+		'nick_name',
+		'phone_number'
+	];
+}
diff --git a/app/Http/Controllers/ReceiverController.php b/app/Http/Controllers/ReceiverController.php
new file mode 100644
index 0000000..4a07231
--- /dev/null
+++ b/app/Http/Controllers/ReceiverController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class ReceiverController extends Controller
+{
+    public function login()
+    {
+        return view('receiver.login');
+    }
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index f734a2e..397c666 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Schema;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -13,7 +14,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Schema::defaultStringLength(191);
     }
 
     /**
diff --git a/database/migrations/2018_07_29_083103_create_admin_table.php b/database/migrations/2018_07_29_083103_create_admin_table.php
new file mode 100644
index 0000000..29d7f1d
--- /dev/null
+++ b/database/migrations/2018_07_29_083103_create_admin_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateAdminTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('admin', function (Blueprint $table) {
+            $table->string('ID');
+            $table->string('password');
+            $table->string('name');
+            $table->string('nick_name');
+            $table->string('phone_number');
+            $table->primary('ID');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('admin');
+    }
+}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 91cb6d1..66c5a8c 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -11,6 +11,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // $this->call(UsersTableSeeder::class);
+       
     }
 }
diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php
index c6c56ac..379a0a7 100644
--- a/resources/views/home/index.blade.php
+++ b/resources/views/home/index.blade.php
@@ -1,5 +1,7 @@
 @extends('layout.app')
 
+@section('title','部落客媒合系統')
+
 @section('content')
     <button class="btn btn-primary">我想成為KOL</button>
     <button class="btn btn-primary">我想成為品牌/代理商</button>
diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php
index 5af9832..cc93126 100644
--- a/resources/views/layout/app.blade.php
+++ b/resources/views/layout/app.blade.php
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>部落客媒合系統</title>
+    <title>@yield('title')</title>
     <link rel="stylesheet" href="/css/app.css">
 </head>
 <body>
@@ -13,12 +13,11 @@
             <a class="navbar-brand" href="#">部落客媒合系統</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
-            </button>
-                
+            </button>  
             <div class="collapse navbar-collapse" id="navbarSupportedContent">
                 <ul class="navbar-nav ml-auto">
                     <li class="nav-item active">
-                        <a class="nav-link" href="#">KOL登入<span class="sr-only">(current)</span></a>
+                        <a class="nav-link" href="/receiver/login">KOL登入<span class="sr-only">(current)</span></a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="#">品牌/代理商登入</a>
diff --git a/resources/views/layout/login.blade.php b/resources/views/layout/login.blade.php
new file mode 100644
index 0000000..b1bde93
--- /dev/null
+++ b/resources/views/layout/login.blade.php
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>@yield('title')</title>
+    <link rel="stylesheet" href="/css/app.css">
+</head>
+<body>
+    <div class="container">
+        <nav class="navbar navbar-expand-lg navbar-light bg-light">
+            <a class="navbar-brand" href="#">部落客媒合系統</a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+        </nav>
+        <div class="mt-3">
+                @yield('content')
+        </div>
+    </div>
+    <script src="/js/app.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/receiver/login.blade.php b/resources/views/receiver/login.blade.php
new file mode 100644
index 0000000..fc69655
--- /dev/null
+++ b/resources/views/receiver/login.blade.php
@@ -0,0 +1,18 @@
+@extends('layout.login')
+
+@section('title','KOL登入')
+
+@section('content')
+<form action="" method="POST">
+    <div class="form-group">
+        <label for="InputEmail1">帳號</label>
+        <input type="email" name="ID" class="form-control" id="InputEmail1" aria-describedby="emailHelp" placeholder="請輸入電子郵件地址">
+    </div>
+    <div class="form-group">
+        <label for="InputPassword1">密碼</label>
+        <input type="password" name="password" class="form-control" id="InputPassword1" placeholder="請輸入密碼">
+    </div>
+    <button type="submit" class="btn btn-primary btn-lg">登入</button>
+    <input type="button" class="btn btn-default btn-lg" value="取消">
+</form>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 5b0c25d..33fe84a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -25,13 +25,13 @@ Route::get('/', 'HomeController@index');
 //     Route::get('/dashbord', '');
 // });
 //
-// //接案者相關url
-// Route::group(['prefix' => 'receiver'], function () {
-//     Route::get('/login', '');
-//     Route::post('/login', '');
-//     Route::get('/register', '');
-//     Route::post('/register', '');
-// });
+//接案者相關url
+Route::group(['prefix' => 'receiver'], function () {
+    Route::get('/login', 'ReceiverController@login');
+    //Route::post('/login', '');
+    // Route::get('/register', '');
+    // Route::post('/register', '');
+});
 //
 // //發案者相關url
 // Route::group(['prefix' => 'casebuilder'], function () {

From 552154f6298616666a1309b783b5350d6fb6e93c Mon Sep 17 00:00:00 2001
From: "Tom K.H. Lin" <3011850@gmail.com>
Date: Mon, 30 Jul 2018 20:19:12 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=8E=A5=E6=A1=88=E8=80=85=E7=9A=84?=
 =?UTF-8?q?=E7=99=BB=E5=85=A5=E8=BA=AB=E4=BB=BD=E9=A9=97=E8=AD=89=E5=B0=9A?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=89=E7=99=BB=E5=85=A5=E7=95=AB=E9=9D=A2=E8=83=BDrun?=
 =?UTF-8?q?=E8=80=8C=E5=B7=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Exceptions/UserNotFoundException.php    | 10 ++++++++
 app/Http/Controllers/ReceiverController.php | 28 ++++++++++++++++++++-
 resources/views/layout/app.blade.php        | 16 ++----------
 resources/views/layout/login.blade.php      |  2 +-
 resources/views/layout/navbar.blade.php     | 22 ++++++++++++++++
 routes/web.php                              |  4 +--
 6 files changed, 64 insertions(+), 18 deletions(-)
 create mode 100644 app/Exceptions/UserNotFoundException.php
 create mode 100644 resources/views/layout/navbar.blade.php

diff --git a/app/Exceptions/UserNotFoundException.php b/app/Exceptions/UserNotFoundException.php
new file mode 100644
index 0000000..a54353b
--- /dev/null
+++ b/app/Exceptions/UserNotFoundException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class UserNotFoundException extends Exception
+{
+    //
+}
diff --git a/app/Http/Controllers/ReceiverController.php b/app/Http/Controllers/ReceiverController.php
index 4a07231..5d76087 100644
--- a/app/Http/Controllers/ReceiverController.php
+++ b/app/Http/Controllers/ReceiverController.php
@@ -3,11 +3,37 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use App\Receiver;
 
 class ReceiverController extends Controller
 {
-    public function login()
+    public function loginPage()
     {
         return view('receiver.login');
     }
+
+    public function loginProcess()
+    {
+        $input = $request->all();
+
+        //輸入資料驗證
+        $rules = [
+            'email'=>[
+                'required',
+                'email',
+            ],
+            'password'=>[
+                'required',
+                'min:6'
+            ],
+        ];
+        $validate = Validator::make($input,$rules);
+        if($validate->fails()){
+            return redirect('/receiver/loginPage')
+                ->withErrors($validate)->withInput();
+        }
+        //驗證通過，巷資料庫查詢使用者是否存在
+        //Pass->紀錄session
+        //failed -> 導向至登入畫面(附帶錯誤訊息)
+    }
 }
diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php
index cc93126..d6f42b6 100644
--- a/resources/views/layout/app.blade.php
+++ b/resources/views/layout/app.blade.php
@@ -10,23 +10,11 @@
 <body>
     <div class="container">
         <nav class="navbar navbar-expand-lg navbar-light bg-light">
-            <a class="navbar-brand" href="#">部落客媒合系統</a>
+            <a class="navbar-brand" href="/">部落客媒合系統</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>  
-            <div class="collapse navbar-collapse" id="navbarSupportedContent">
-                <ul class="navbar-nav ml-auto">
-                    <li class="nav-item active">
-                        <a class="nav-link" href="/receiver/login">KOL登入<span class="sr-only">(current)</span></a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">品牌/代理商登入</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="#">後台登入</a>
-                    </li>
-                </ul>
-            </div>
+            @include('layout.navbar')
         </nav>
         <div class="mt-3">
                 @yield('content')
diff --git a/resources/views/layout/login.blade.php b/resources/views/layout/login.blade.php
index b1bde93..cc17a77 100644
--- a/resources/views/layout/login.blade.php
+++ b/resources/views/layout/login.blade.php
@@ -10,7 +10,7 @@
 <body>
     <div class="container">
         <nav class="navbar navbar-expand-lg navbar-light bg-light">
-            <a class="navbar-brand" href="#">部落客媒合系統</a>
+            <a class="navbar-brand" href="/">部落客媒合系統</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php
new file mode 100644
index 0000000..867d9a3
--- /dev/null
+++ b/resources/views/layout/navbar.blade.php
@@ -0,0 +1,22 @@
+<div class="collapse navbar-collapse" id="navbarSupportedContent">
+    <ul class="navbar-nav ml-auto">
+        @if(session()->has('receiver_id'))
+            <li class="nav-item">
+                <span>{{$UserName}}，您好</span>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/receiver/logout">登出</a>
+            </li>
+        @else
+            <li class="nav-item active">
+                <a class="nav-link" href="/receiver/login">KOL登入<span class="sr-only">(current)</span></a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="#">品牌/代理商登入</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="#">後台登入</a>
+            </li>
+        @endif
+    </ul>
+</div>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 33fe84a..0485957 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -27,8 +27,8 @@ Route::get('/', 'HomeController@index');
 //
 //接案者相關url
 Route::group(['prefix' => 'receiver'], function () {
-    Route::get('/login', 'ReceiverController@login');
-    //Route::post('/login', '');
+    Route::get('/login', 'ReceiverController@loginPage');
+    //Route::post('/login', 'ReceiverController@loginProcess');
     // Route::get('/register', '');
     // Route::post('/register', '');
 });

From 7e9bbe282a3770fe18e5328398097f48a3d959c0 Mon Sep 17 00:00:00 2001
From: "Tom K.H. Lin" <3011850@gmail.com>
Date: Tue, 31 Jul 2018 19:24:54 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=A5=E6=A1=88?=
 =?UTF-8?q?=E8=80=85=E7=99=BB=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ReceiverController.php   | 24 +++++++++++++++----
 .../components/validationErrorMsg.blade.php   | 10 ++++++++
 resources/views/layout/navbar.blade.php       |  5 +---
 resources/views/receiver/login.blade.php      |  7 ++++--
 routes/web.php                                |  2 +-
 5 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 resources/views/components/validationErrorMsg.blade.php

diff --git a/app/Http/Controllers/ReceiverController.php b/app/Http/Controllers/ReceiverController.php
index 5d76087..a4691b9 100644
--- a/app/Http/Controllers/ReceiverController.php
+++ b/app/Http/Controllers/ReceiverController.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use Validator;
 use App\Receiver;
 
 class ReceiverController extends Controller
@@ -14,7 +14,7 @@ class ReceiverController extends Controller
 
     public function loginProcess()
     {
-        $input = $request->all();
+        $input = request()->all();
 
         //輸入資料驗證
         $rules = [
@@ -29,11 +29,27 @@ class ReceiverController extends Controller
         ];
         $validate = Validator::make($input,$rules);
         if($validate->fails()){
-            return redirect('/receiver/loginPage')
+            return redirect('/receiver/login')
                 ->withErrors($validate)->withInput();
         }
         //驗證通過，巷資料庫查詢使用者是否存在
+        $User = Receiver::where('email',$input['email'])->firstOrFail();
+        $isPasswordCorrect = $input['password'] == $User->password;
+        if(!$isPasswordCorrect){ 
+            //failed -> 導向至登入畫面(附帶錯誤訊息)
+            $error_msg = [
+                'msg'=>['密碼錯誤']
+            ];
+            return redirect('/receiver/login')->withErrors($error_msg)
+                    ->withInput();
+        }
         //Pass->紀錄session
-        //failed -> 導向至登入畫面(附帶錯誤訊息)
+       /*  $record = [
+            'user_id'=>$User->RID,
+            'role_id'=>'Receiver'
+        ]; */
+        //session()->put($record);
+        session()->put('user_id',$User->RID);
+        return redirect('/');
     }
 }
diff --git a/resources/views/components/validationErrorMsg.blade.php b/resources/views/components/validationErrorMsg.blade.php
new file mode 100644
index 0000000..898543a
--- /dev/null
+++ b/resources/views/components/validationErrorMsg.blade.php
@@ -0,0 +1,10 @@
+
+<div class=" alert alert-danger" role="alert">
+    <ul>
+        @if($errors AND count($errors))
+            @foreach($errors->all() as $err)
+                <li>{{$err}}</li>
+            @endForeach
+        @endif
+    </ul>
+</div>
\ No newline at end of file
diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php
index 867d9a3..9674d5d 100644
--- a/resources/views/layout/navbar.blade.php
+++ b/resources/views/layout/navbar.blade.php
@@ -1,9 +1,6 @@
 <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav ml-auto">
-        @if(session()->has('receiver_id'))
-            <li class="nav-item">
-                <span>{{$UserName}}，您好</span>
-            </li>
+        @if(session()->has('user_id'))
             <li class="nav-item">
                 <a class="nav-link" href="/receiver/logout">登出</a>
             </li>
diff --git a/resources/views/receiver/login.blade.php b/resources/views/receiver/login.blade.php
index fc69655..97d51f5 100644
--- a/resources/views/receiver/login.blade.php
+++ b/resources/views/receiver/login.blade.php
@@ -3,16 +3,19 @@
 @section('title','KOL登入')
 
 @section('content')
+
+@include('components.validationErrorMsg')
 <form action="" method="POST">
     <div class="form-group">
         <label for="InputEmail1">帳號</label>
-        <input type="email" name="ID" class="form-control" id="InputEmail1" aria-describedby="emailHelp" placeholder="請輸入電子郵件地址">
+    <input type="email" name="email" value="{{old('email')}}" class="form-control" id="InputEmail1" aria-describedby="emailHelp" placeholder="請輸入電子郵件地址">
     </div>
     <div class="form-group">
         <label for="InputPassword1">密碼</label>
-        <input type="password" name="password" class="form-control" id="InputPassword1" placeholder="請輸入密碼">
+    <input type="password" name="password" value="{{old('password')}}" class="form-control" id="InputPassword1" placeholder="請輸入密碼">
     </div>
     <button type="submit" class="btn btn-primary btn-lg">登入</button>
     <input type="button" class="btn btn-default btn-lg" value="取消">
+    {!! csrf_field() !!}
 </form>
 @endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 0485957..ec8912f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -28,7 +28,7 @@ Route::get('/', 'HomeController@index');
 //接案者相關url
 Route::group(['prefix' => 'receiver'], function () {
     Route::get('/login', 'ReceiverController@loginPage');
-    //Route::post('/login', 'ReceiverController@loginProcess');
+    Route::post('/login', 'ReceiverController@loginProcess');
     // Route::get('/register', '');
     // Route::post('/register', '');
 });

From 4ca70a056217513a1c79b4dd7be205b090721e08 Mon Sep 17 00:00:00 2001
From: "Tom K.H. Lin" <3011850@gmail.com>
Date: Wed, 1 Aug 2018 20:03:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=A5=E6=A1=88?=
 =?UTF-8?q?=E8=80=85=E7=9A=84=E7=99=BB=E5=87=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ReceiverController.php | 10 ++++++++++
 resources/views/layout/navbar.blade.php     |  3 +++
 routes/web.php                              |  1 +
 3 files changed, 14 insertions(+)

diff --git a/app/Http/Controllers/ReceiverController.php b/app/Http/Controllers/ReceiverController.php
index a4691b9..a145e0e 100644
--- a/app/Http/Controllers/ReceiverController.php
+++ b/app/Http/Controllers/ReceiverController.php
@@ -49,7 +49,17 @@ class ReceiverController extends Controller
             'role_id'=>'Receiver'
         ]; */
         //session()->put($record);
+        // $binds = [
+        //    'name'=>$User->nickname
+        // ];
+       // $name = $User->nickname;
         session()->put('user_id',$User->RID);
         return redirect('/');
     }
+
+    public function logout()
+    {
+        session()->forget('user_id');
+        return redirect('/');
+    }
 }
diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php
index 9674d5d..cfc586c 100644
--- a/resources/views/layout/navbar.blade.php
+++ b/resources/views/layout/navbar.blade.php
@@ -1,6 +1,9 @@
 <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav ml-auto">
         @if(session()->has('user_id'))
+            <li class="nav-item">
+                <a class="nav-link" href="#">{{session()->get('user_id')}},您好</a>
+            </li>
             <li class="nav-item">
                 <a class="nav-link" href="/receiver/logout">登出</a>
             </li>
diff --git a/routes/web.php b/routes/web.php
index ec8912f..ef3f84d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,6 +29,7 @@ Route::get('/', 'HomeController@index');
 Route::group(['prefix' => 'receiver'], function () {
     Route::get('/login', 'ReceiverController@loginPage');
     Route::post('/login', 'ReceiverController@loginProcess');
+    Route::get('/logout','ReceiverController@logout');
     // Route::get('/register', '');
     // Route::post('/register', '');
 });