diff --git a/app/Http/Controllers/CaseBuilder/CaseBuilderController.php b/app/Http/Controllers/CaseBuilder/CaseBuilderController.php index ddbe189..9414418 100644 --- a/app/Http/Controllers/CaseBuilder/CaseBuilderController.php +++ b/app/Http/Controllers/CaseBuilder/CaseBuilderController.php @@ -7,5 +7,8 @@ use App\Http\Controllers\Controller; class CaseBuilderController extends Controller { - // + public function index(Request $request) + { + return view('casebuilder.index'); + } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/Home/HomeController.php similarity index 70% rename from app/Http/Controllers/HomeController.php rename to app/Http/Controllers/Home/HomeController.php index a3af7dd..c77106b 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/Home/HomeController.php @@ -1,8 +1,9 @@ middleware('auth'); + // $this->middleware('auth'); } /** @@ -23,6 +24,6 @@ class HomeController extends Controller */ public function index() { - return view('home'); + return view('home.index'); } } diff --git a/app/Http/Controllers/Receiver/ReceiverController.php b/app/Http/Controllers/Receiver/ReceiverController.php index cdb3881..7192219 100644 --- a/app/Http/Controllers/Receiver/ReceiverController.php +++ b/app/Http/Controllers/Receiver/ReceiverController.php @@ -9,11 +9,23 @@ use App\Receiver; class ReceiverController extends Controller { - public function loginPage() + public function index(Request $request) { - return view('receiver.login'); + return view('receiver.index'); } + public function manager(Request $request) + { + // code... + } + + public function about(Request $request) + { + // code... + } + + // ************************************************************************* + public function loginProcess() { $input = request()->all(); @@ -37,7 +49,7 @@ class ReceiverController extends Controller //驗證通過，巷資料庫查詢使用者是否存在 $User = Receiver::where('email',$input['email'])->firstOrFail(); $isPasswordCorrect = $input['password'] == $User->password; - if(!$isPasswordCorrect){ + if(!$isPasswordCorrect){ //failed -> 導向至登入畫面(附帶錯誤訊息) $error_msg = [ 'msg'=>['密碼錯誤'] diff --git a/resources/views/home.blade.php b/resources/views/casebuilder/index.blade.php similarity index 95% rename from resources/views/home.blade.php rename to resources/views/casebuilder/index.blade.php index 05dfca9..a76d2d2 100644 --- a/resources/views/home.blade.php +++ b/resources/views/casebuilder/index.blade.php @@ -1,5 +1,7 @@ @extends('layouts.app') +@section('title','KOL管理') + @section('content')
diff --git a/resources/views/components/validationErrorMsg.blade.php b/resources/views/components/validationErrorMsg.blade.php deleted file mode 100644 index 898543a..0000000 --- a/resources/views/components/validationErrorMsg.blade.php +++ /dev/null @@ -1,10 +0,0 @@ - - \ No newline at end of file diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php index 379a0a7..9ec67b4 100644 --- a/resources/views/home/index.blade.php +++ b/resources/views/home/index.blade.php @@ -1,8 +1,8 @@ -@extends('layout.app') +@extends('layouts.app') -@section('title','部落客媒合系統') +@section('title', config('app.name', 'Laravel')) @section('content') -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php deleted file mode 100644 index d6f42b6..0000000 --- a/resources/views/layout/app.blade.php +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - @yield('title') - - - -
- -
- @yield('content') -
-
- - - \ No newline at end of file diff --git a/resources/views/layout/login.blade.php b/resources/views/layout/login.blade.php deleted file mode 100644 index cc17a77..0000000 --- a/resources/views/layout/login.blade.php +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @yield('title') - - - -
- -
- @yield('content') -
-
- - - \ No newline at end of file diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php deleted file mode 100644 index cfc586c..0000000 --- a/resources/views/layout/navbar.blade.php +++ /dev/null @@ -1,22 +0,0 @@ - \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6dba26c..f544c03 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -8,7 +8,7 @@ - {{ config('app.name', 'Laravel') }} + @yield('title') @@ -25,7 +25,7 @@
diff --git a/resources/views/layouts/partials/auth-navbar-item.blade.php b/resources/views/layouts/partials/auth-navbar-item.blade.php new file mode 100644 index 0000000..85066c9 --- /dev/null +++ b/resources/views/layouts/partials/auth-navbar-item.blade.php @@ -0,0 +1,36 @@ + +@guest +
  • + {{ __('Login') }} +
    • +
  • + {{ __('Register') }} +
    • +
  • + KOL登入(current) +
    • +
  • + 品牌/代理商登入 +
    • +
  • + 後台登入 +
    • +@else +
  • + + +
    + + {{ __('Logout') }} + + + +
    +
    • +@endguest diff --git a/resources/views/receiver/index.blade.php b/resources/views/receiver/index.blade.php new file mode 100644 index 0000000..a76d2d2 --- /dev/null +++ b/resources/views/receiver/index.blade.php @@ -0,0 +1,25 @@ +@extends('layouts.app') + +@section('title','KOL管理') + +@section('content') +
    +
    +
    +
    +
    Dashboard
    + +
    + @if (session('status')) + + @endif + + You are logged in! +
    +
    +
    +
    +
    +@endsection diff --git a/resources/views/receiver/login.blade.php b/resources/views/receiver/login.blade.php deleted file mode 100644 index 97d51f5..0000000 --- a/resources/views/receiver/login.blade.php +++ /dev/null @@ -1,21 +0,0 @@ -@extends('layout.login') - -@section('title','KOL登入') - -@section('content') - -@include('components.validationErrorMsg') -
    -
    - - -
    -
    - - -
    - - - {!! csrf_field() !!} -
    -@endsection \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 94b2a57..d9ef34f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -11,37 +11,38 @@ | */ -/* Route::get('/', function () { - return view('welcome'); -}); */ +// Route::get('/', function () { +// return view('welcome'); +// }); -//首頁url -Route::get('/', 'HomeController@index'); +// 首頁url +Route::get('/', 'HomeController@index')->name('home'); -// //管理者相關url +// 登入相關的 +Auth::routes(); + +// 接案者相關url +Route::group(['prefix' => 'receiver'], function () { + Route::get('/', 'Receiver\ReceiverController@index'); + // Route::get('/login', 'Receiver\ReceiverController@loginPage'); + // Route::post('/login', 'Receiver\ReceiverController@loginProcess'); + // Route::get('/logout','Receiver\ReceiverController@logout'); + // Route::get('/register', ''); + // Route::post('/register', ''); +}); + +//發案者相關url +Route::group(['prefix' => 'casebuilder'], function () { + Route::get('/', 'CaseBuilder\CaseBuilderController@index'); + // Route::get('/login', ''); + // Route::post('/login', ''); + // Route::get('/register', ''); + // Route::post('/register', ''); +}); + +// 管理者相關url // Route::group(['prefix' => 'admin'], function () { // Route::get('/login', ''); // Route::post('/login', ''); // Route::get('/dashbord', ''); // }); -// -//接案者相關url -Route::group(['prefix' => 'receiver'], function () { - Route::get('/login', 'Receiver\ReceiverController@loginPage'); - Route::post('/login', 'Receiver\ReceiverController@loginProcess'); - Route::get('/logout','Receiver\ReceiverController@logout'); - // Route::get('/register', ''); - // Route::post('/register', ''); -}); -// -// //發案者相關url -// Route::group(['prefix' => 'casebuilder'], function () { -// Route::get('/login', ''); -// Route::post('/login', ''); -// Route::get('/register', ''); -// Route::post('/register', ''); -// }); - -Auth::routes(); - -Route::get('/home', 'HomeController@index')->name('home');