20220826 reCaptcha, bootstrap 3 to 5

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
+
+class ForgotPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset emails and
+    | includes a trait which assists in sending these notifications from
+    | your application to your users. Feel free to explore this trait.
+    |
+    */
+
+    use SendsPasswordResetEmails;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\ValidationException;
+use Redirect;
+use Session;
+
+class LoginController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Login Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles authenticating users for the application and
+    | redirecting them to your home screen. The controller uses a trait
+    | to conveniently provide its functionality to your applications.
+    |
+    */
+
+    use AuthenticatesUsers;
+
+    /**
+     * Where to redirect users after login.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/backend';
+
+    protected $maxAttempts = 5;
+    protected $decayMinutes = 10;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest', ['except' => 'logout']);
+    }
+    
+    protected function validateLogin(Request $request)
+    {
+        $validateRules = [
+            'g-recaptcha-response' => 'required',
+        ];
+
+        $validateMessage = [
+            'g-recaptcha-response.required' => '請點選我不是機器人',
+        ];
+
+        $request->validate($validateRules, $validateMessage);
+
+        $recaptcha = new \ReCaptcha\ReCaptcha('6LfDoKIhAAAAABrav1PgguhuAZCHgJibpDD8tbQZ');
+        $resp = $recaptcha->verify($request->input('g-recaptcha-response'), $request->ip());
+        if (!$resp->isSuccess()) {
+            throw ValidationException::withMessages(['error' => 'recaptcha 驗證失敗']);
+        }
+    }
+}

app/Http/Controllers/Auth/RegisterController.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\User;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Foundation\Auth\RegistersUsers;
+
+class RegisterController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */
+
+    use RegistersUsers;
+
+    /**
+     * Where to redirect users after registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/backend';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     * @param  array  $data
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    protected function validator(array $data)
+    {
+        return Validator::make($data, [
+            'name' => 'required|max:255',
+            'email' => 'required|email|max:255|unique:users',
+            'password' => 'required|min:6|confirmed',
+        ]);
+    }
+
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     * @param  array  $data
+     * @return User
+     */
+    protected function create(array $data)
+    {
+        return User::create([
+            'name' => $data['name'],
+            'email' => $data['email'],
+            'password' => bcrypt($data['password']),
+        ]);
+    }
+}

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Foundation\Auth\ResetsPasswords;
+
+class ResetPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password reset requests
+    | and uses a simple trait to include this behavior. You're free to
+    | explore this trait and override any methods you wish to tweak.
+    |
+    */
+
+    use ResetsPasswords;
+
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/backend';
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
+}

config/app.php

@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'Asia/Taipei',
 
     /*
     |--------------------------------------------------------------------------
@@ -80,7 +80,7 @@ return [
     |
     */
 
-    'locale' => 'en',
+    'locale' => 'zh-TW',
 
     /*
     |--------------------------------------------------------------------------

public/assets/css/bootstrap-override.css

@@ -138,7 +138,6 @@ h4, .h4 {
    font-size: 12px;
    padding: 7px 10px;
    height: auto;
-   margin-top: 3px;
 }
 
 .input-lg {
@@ -165,7 +164,7 @@ h4, .h4 {
    padding: 5px 10px;
 }
 
-.btn-xs {
+.btn-sm {
    padding: 2px 10px;
 }
 
@@ -173,16 +172,16 @@ h4, .h4 {
    padding: 12px 20px;
 }
 
-.btn-default {
+.btn-secondary {
    background: #e4e7ea;
    color: #636e7b;
 }
 
-.btn-default:hover,
-.btn-default:focus,
-.btn-default:active,
-.btn-default.active,
-.open .dropdown-toggle.btn-default {
+.btn-secondary:hover,
+.btn-secondary:focus,
+.btn-secondary:active,
+.btn-secondary.active,
+.open .dropdown-toggle.btn-secondary {
    background: #f7f7f7;
    border-color: #ccc;
    -moz-box-shadow: none;
@@ -228,7 +227,7 @@ h4, .h4 {
    background: #f7f7f7;
 }
 
-.btn-default-alt {
+.btn-secondary-alt {
    border: 2px solid #999;
    color: #999;
    text-transform: uppercase;
@@ -236,9 +235,9 @@ h4, .h4 {
    font-size: 12px;
 }
 
-.btn-default-alt:hover,
-.btn-default-alt:active,
-.btn-default-alt:focus {
+.btn-secondary-alt:hover,
+.btn-secondary-alt:active,
+.btn-secondary-alt:focus {
    border-color: #666;
    color: #666;
 }
@@ -575,10 +574,18 @@ h4, .h4 {
    box-shadow: 0 3px 0 rgba(12,12,12,0.03);
 }
 
+.panel-footer {
+   padding: 10px 15px;
+   background-color: #f5f5f5;
+   border-top: 1px solid #ddd;
+   border-bottom-right-radius: 3px;
+   border-bottom-left-radius: 3px;
+}
+
 .panel-heading,
 .panel-footer {
    background: #fff;
-   border-color: #eee;
+   /*border-color: #eee;*/
 }
 
 .panel-heading {
@@ -1044,6 +1051,18 @@ h4, .h4 {
    color: #fff;
 }
 
+.nav-primary {
+    background: #428BCA;
+ }
+ 
+ .nav-primary > li > a {
+    color: #fff;
+ }
+ 
+ .nav-primary > li > a:hover {
+    color: #1d2939;
+ }
+
 .nav-tabs.nav-justified > li > a {
    border-bottom: 0;
 }
@@ -1308,3 +1327,157 @@ small.media-desc {
    -webkit-box-shadow: none;
    box-shadow: none;
 }
+
+
+
+
+/* add by Yong reference bootstrap3 */
+.btn-group-vertical>.btn-group:after, .btn-group-vertical>.btn-group:before, .btn-toolbar:after, .btn-toolbar:before, .clearfix:after, .clearfix:before, .container-fluid:after, .container-fluid:before, .container:after, .container:before, .dl-horizontal dd:after, .dl-horizontal dd:before, .form-horizontal .form-group:after, .form-horizontal .form-group:before, .modal-footer:after, .modal-footer:before, ._nav:after, ._nav:before, .navbar-collapse:after, .navbar-collapse:before, .navbar-header:after, .navbar-header:before, .navbar:after, .navbar:before, .pager:after, .pager:before, .panel-body:after, .panel-body:before, .row:after, .row:before {
+   display: table;
+   content: " ";
+}
+
+@font-face {
+   font-family: 'Glyphicons Halflings';
+
+   src: url('../fonts/glyphicons-halflings-regular.eot');
+   src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+}
+._glyphicon {
+   position: relative;
+   top: 1px;
+   display: inline-block;
+   font-family: 'Glyphicons Halflings';
+   font-style: normal;
+   font-weight: normal;
+   line-height: 1;
+
+   -webkit-font-smoothing: antialiased;
+   -moz-osx-font-smoothing: grayscale;
+}
+._glyphicon-log-out:before {
+   content: "\e163";
+}
+._glyphicon-search:before {
+   content: "\e003";
+}
+._glyphicon-pencil:before {
+   content: "\270f";
+}
+._glyphicon-calendar:before {
+   content: "\e109";
+}
+._glyphicon-plus:before {
+   content: "\2b";
+}
+._glyphicon-minus:before {
+   content: "\2212";
+}
+._glyphicon-alert:before {
+   content: "\e209";
+}
+._glyphicon-tag:before {
+   content: "\e041";
+}
+._glyphicon-remove:before {
+   content: "\e014";
+}
+._glyphicon-pencil:before {
+   content: "\270f";
+}
+._glyphicon-book:before {
+   content: "\e043";
+}
+._glyphicon-user:before {
+   content: "\e008";
+}
+._glyphicon-log-out:before {
+   content: "\e163";
+}
+._glyphicon-object-align-vertical:before {
+   content: "\e248";
+}
+._glyphicon-bullhorn:before {
+   content: "\e122";
+}
+._glyphicon-list:before {
+   content: "\e056";
+}
+._glyphicon-ok:before {
+   content: "\e013";
+}
+._glyphicon-edit:before {
+   content: "\e065";
+}
+._glyphicon-eye-open:before {
+   content: "\e105";
+}
+._glyphicon-eye-close:before {
+   content: "\e106";
+}
+
+
+
+._nav {
+   padding-left: 0;
+   margin-bottom: 0;
+   list-style: none;
+}
+._nav-pills>li {
+   float: left;
+}
+._nav-stacked>li {
+   float: none;
+}
+._nav>li {
+   position: relative;
+   display: block;
+}
+._nav>li>a {
+   position: relative;
+   display: block;
+   padding: 10px 15px;
+}
+
+
+
+._panel-heading {
+   border-bottom: 1px solid transparent;
+   border-top-left-radius: 3px;
+   border-top-right-radius: 3px;
+}
+
+._panel-primary>._panel-heading {
+   color: #fff;
+   background-color: #337ab7;
+   border-color: #337ab7;
+}
+
+._panel-primary .panel-title, .panel-success .panel-title, .panel-warning .panel-title, .panel-danger .panel-title, .panel-info .panel-title, .panel-dark .panel-title {
+   color: #fff;
+}
+
+._form-group {
+   margin-bottom: 15px;
+}
+
+a {
+   color: #337ab7;
+   text-decoration: none;
+}
+
+._btn-info {
+   color: #fff;
+   background-color: #5bc0de;
+   border-color: #46b8da;
+}
+
+._btn-warning {
+   color: #fff;
+   background-color: #f0ad4e;
+   border-color: #eea236;
+}
+
+._fz-12 {
+   font-size: 12px;
+}

resources/views/admin/uc/foot.blade.php

@@ -1,4 +1,8 @@
-<script src="{{url('assets/js/bootstrap.min.js')}}"></script>
++@if (request('v') == 3)
++    <script src="{{url('assets/js/bootstrap.min.v3.js')}}"></script>
++@else
++    <script src="{{url('assets/js/bootstrap.bundle.min.v5.js')}}"></script>
++@endif
 <script src="{{url('assets/js/modernizr.min.js')}}"></script>
 <script src="{{url('assets/js/jquery.sparkline.min.js')}}"></script>
 <script src="{{url('assets/js/toggles.min.js')}}"></script>

resources/views/admin/uc/head.blade.php

@@ -3,7 +3,9 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 <link rel="shortcut icon" href="{{url('assets/images/favicon.png')}}" type="image/png" />
 <title>{{ env('APP_NAME') }}</title>
-<link rel="Stylesheet" type="text/css" href="{{url('assets/css/style.default.css')}}"/>
+
+<link rel="Stylesheet" type="text/css" href="{{ asset('assets/css/style.default.v5.css') }}"/>  
+
 <!--<link rel="Stylesheet" type="text/css" href="{{url('assets/css/style.darkknight.css')}}"/>-->
 <script src="{{url('assets/js/jquery-1.11.1.min.js')}}"></script>
 <script src="{{url('assets/js/jquery-migrate-1.2.1.min.js')}}"></script>

resources/views/admin/uc/leftmenu.blade.php

@@ -14,15 +14,15 @@
 				</div>
 			</div>
 		</div>
-        <h5 class="sidebartitle">Navigation</h5>
-		<ul id="navLeftMenu" class="nav nav-pills nav-stacked nav-bracket">
+        <h5 class="sidebartitle mt-2">Navigation</h5>
+		<ul id="navLeftMenu" class="_nav _nav-pills _nav-stacked nav-bracket">
 			<!-- 選單區段 -->
-			<li class='nav-link' id="Dashboard"><a href='{{ url('backend/') }}' class="dashboard"><i class='fa fa-dashboard'></i><span>DashBoard</span></a></li>
+			<li class='' id="Dashboard"><a href='{{ url('backend/') }}' class="dashboard text-decoration-none"><i class='fa fa-dashboard'></i><span>Dashboard</span></a></li>
             @foreach($leftmenu as $data)
-                <li class='nav-parent'><a href='' class='parent-name'><i class='{{ $data->icon }}'></i><span>{{ $data->menuname }}</span></a><ul class='children'>
+                <li class='nav-parent'><a href='' class='parent-name text-decoration-none'><i class='{{ $data->icon }}'></i><span>{{ $data->menuname }}</span></a><ul class='children'>
                 @for($i = 0; $i< count(explode(",",$data->submenuname)); $i++)
                     <li id='{{ str_replace("/", "_", explode(",",$data->submenulink)[$i]) }}' data-level='two'>
-                        <a href='{{ url('backend/'.explode(",",$data->submenulink)[$i]) }}'>
+                        <a class="text-decoration-none" href='{{ url('backend/'.explode(",",$data->submenulink)[$i]) }}'>
                             <i class='fa fa-caret-right'></i>
                             <span>{{ explode(",",$data->submenuname)[$i] }}</span>
                         </a>
@@ -33,4 +33,4 @@
 		</ul>
 	</div>
 	<!-- leftpanelinner -->
-</div>
+</div>

resources/views/auth/login.blade.php

@@ -4,6 +4,16 @@
 		@include('admin.uc.head')
 	</head>
 	<body class="signin">
+	@if ($errors->any())
+		<div class="alert alert-danger">
+			<ul>
+				@foreach ($errors->all() as $error)
+					<li>{{ $error }}</li>
+				@endforeach
+			</ul>
+		</div>
+	@endif
+
 		<section>
 			<div class="signinpanel">
 				<div class="row">
@@ -17,13 +27,15 @@
 							<label class="error" for="email"></label>
 							<input id="qpassword" name="password" placeholder="Password" class="form-control pword" maxlength="20" type="password" />
 							<label class="error" for="password"></label>
+							<br>
+							<div>
+								<div id="recaptcha" class="g-recaptcha" data-sitekey="6LfvggUgAAAAALUwCxdJd372UNW3xrMrVfgNJEOF"></div>
+							</div>
 							<input id="btnSignIn" name="btnSignIn" value="Login" class="btn btn-block btn-success" type="submit" onclick="submitForm();" />
 						</form>
 					</div>
 					<div class="col-md-3"></div>
-					<!-- col-sm-5 -->
 				</div>
-				<!-- row -->
 				<div class="signup-footer">
 					<div class="pull-left">
 						<?php echo env('COPY_RIGHT')?>
@@ -33,10 +45,10 @@
 					</div>
 				</div>
 			</div>
-			<!-- signin -->
 		</section>
 		@include('admin.uc.foot')
 		<!-- 表單JS -->
+		<script src="https://www.google.com/recaptcha/api.js" async defer></script>
 		<script>
 			//逐個偵錯
 			$(function () {