yuan/BlogMatch
1
0
Fork 0
forked from kol/BlogMatch
Code Issues Pull Requests Releases Wiki Activity

修改Controller與View的頁面與Router架構

Browse Source
This commit is contained in:
Yuan Chiu 2018-08-05 18:03:00 +08:00
parent b7621addd3
commit 984e851e97
14 changed files with 120 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/CaseBuilder/CaseBuilderController.php
View File

@ -7,5 +7,8 @@ use App\Http\Controllers\Controller;
class CaseBuilderController extends Controller
{
//
public function index(Request $request)
{
return view('casebuilder.index');
}
}

7
app/Http/Controllers/HomeController.php → app/Http/Controllers/Home/HomeController.php
View File

@ -1,8 +1,9 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\Home;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class HomeController extends Controller
{
@ -13,7 +14,7 @@ class HomeController extends Controller
*/
public function __construct()
{
$this->middleware('auth');
// $this->middleware('auth');
}
/**
@ -23,6 +24,6 @@ class HomeController extends Controller
*/
public function index()
{
return view('home');
return view('home.index');
}
}

18
app/Http/Controllers/Receiver/ReceiverController.php
View File

@ -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'=>['密碼錯誤']

2
resources/views/home.blade.php → resources/views/casebuilder/index.blade.php
View File

@ -1,5 +1,7 @@
@extends('layouts.app')
@section('title','KOL管理')
@section('content')
<div class="container">
<div class="row justify-content-center">

10
resources/views/components/validationErrorMsg.blade.php
View File

@ -1,10 +0,0 @@
<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>

6
resources/views/home/index.blade.php
View File

@ -1,8 +1,8 @@
@extends('layout.app')
@extends('layouts.app')
@section('title','部落客媒合系統')
@section('title', config('app.name', 'Laravel'))
@section('content')
<button class="btn btn-primary">我想成為KOL</button>
<button class="btn btn-primary">我想成為品牌/代理商</button>
@endsection
@endsection

25
resources/views/layout/app.blade.php
View File

@ -1,25 +0,0 @@
<!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>
@include('layout.navbar')
</nav>
<div class="mt-3">
@yield('content')
</div>
</div>
<script src="/js/app.js"></script>
</body>
</html>

24
resources/views/layout/login.blade.php
View File

@ -1,24 +0,0 @@
<!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>

22
resources/views/layout/navbar.blade.php
View File

@ -1,22 +0,0 @@
<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>
@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>

32
resources/views/layouts/app.blade.php
View File

@ -8,7 +8,7 @@
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title>
<title>@yield('title')</title>
<!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script>
@ -25,7 +25,7 @@
<nav class="navbar navbar-expand-md navbar-light navbar-laravel">
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}">
{{ config('app.name', 'Laravel') }}
{{ config('app.name', 'BlogMatch') }}
</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>
@ -39,33 +39,7 @@
<!-- Right Side Of Navbar -->
<ul class="navbar-nav ml-auto">
<!-- Authentication Links -->
@guest
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
@endguest
@include('layouts.partials.auth-navbar-item')
</ul>
</div>
</div>

36
resources/views/layouts/partials/auth-navbar-item.blade.php Normal file
View File

@ -0,0 +1,36 @@
<!-- Authentication Links -->
@guest
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
<li class="nav-item">
<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>
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
@endguest

25
resources/views/receiver/index.blade.php Normal file
View File

@ -0,0 +1,25 @@
@extends('layouts.app')
@section('title','KOL管理')
@section('content')
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8">
<div class="card">
<div class="card-header">Dashboard</div>
<div class="card-body">
@if (session('status'))
<div class="alert alert-success" role="alert">
{{ session('status') }}
</div>
@endif
You are logged in!
</div>
</div>
</div>
</div>
</div>
@endsection

21
resources/views/receiver/login.blade.php
View File

@ -1,21 +0,0 @@
@extends('layout.login')
@section('title','KOL登入')
@section('content')
@include('components.validationErrorMsg')
<form action="" method="POST">
<div class="form-group">
<label for="InputEmail1">帳號</label>
<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" 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

55
routes/web.php
View File

@ -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');