initial stage of register

Ivan Li · Ivan Li · commit 243be1155705 · 2016-06-01T22:23:10.000+10:00
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
@@ -76,7 +76,7 @@ protected function create(array $data)
             'confirmation_code' => $confirmationCode,
         ]);
 
-        Mail::send('email.verify', array("confirmation_code"=>$confirmationCode), function($message){
+        Mail::send('emails.auth.verify', array("confirmation_code"=>$confirmationCode), function($message){
             $message->to(Input::get('email'), Input::get('name'))
                 ->subject('Welcome to ICL Knowledge Base');
         });
diff --git a/app/Http/Controllers/RoutingController.php b/app/Http/Controllers/RoutingController.php
@@ -20,4 +20,9 @@ function login()
     {
         return view('login');
     }
+
+    function registerSuccess()
+    {
+        return view('login');
+    }
 }
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -13,4 +13,10 @@
 Route::group(['middleware' => ['web']], function () {
     Route::get('/', 'RoutingController@home');
     Route::get('login', 'RoutingController@login');
+    Route::post('login', 'Auth\AuthController@postLogin');
+    Route::post('register', 'Auth\AuthController@postRegister');
+    Route::group(['prefix' => 'register'], function(){
+        Route::get('/', 'RoutingController@registerSuccess');
+        Route::get('verify/{confirmation_code}', 'Auth\AuthController@verify');
+    });
 });
diff --git a/app/Permission.php b/app/Permission.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Ivan
+ * Date: 1/06/2016
+ * Time: 10:07 PM
+ */
+
+namespace App;
+
+
+use Zizaco\Entrust\EntrustPermission;
+
+class Permission extends EntrustPermission
+{
+
+}
diff --git a/app/Role.php b/app/Role.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Ivan
+ * Date: 1/06/2016
+ * Time: 10:06 PM
+ */
+
+namespace App;
+
+
+use Zizaco\Entrust\Middleware\EntrustRole;
+
+class Role extends EntrustRole
+{
+
+}
diff --git a/app/User.php b/app/User.php
@@ -3,9 +3,11 @@
 namespace App;
 
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Zizaco\Entrust\Traits\EntrustUserTrait;
 
 class User extends Authenticatable
 {
+    use EntrustUserTrait;
     /**
      * The attributes that are mass assignable.
      *
@@ -21,6 +23,6 @@ class User extends Authenticatable
      * @var array
      */
     protected $hidden = [
-        'password', 'remember_token',
+        'password', 'remember_token', 'confirmation_code',
     ];
 }
diff --git a/config/mail.php b/config/mail.php
@@ -55,7 +55,7 @@
     |
     */
 
-    'from' => ['address' => null, 'name' => null],
+    'from' => ['address' => env('MAIL_FROM_ADDRESS'), 'name' => env('MAIL_FROM_NAME')],
 
     /*
     |--------------------------------------------------------------------------
diff --git a/resources/views/emails/auth/verify.blade.php b/resources/views/emails/auth/verify.blade.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Ivan
+ * Date: 1/06/2016
+ * Time: 9:54 PM
+ */
+?>
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+    <meta charset="utf-8">
+</head>
+<body>
+    <h2>Welcome to ICL Knowledge Base</h2>
+
+    <div>
+        Thanks for joining us. Please follow the link below to verify your email address
+        <a href="{{ url('register/verify/' . $confirmation_code) }}" target="_blank">{{ url('register/verify/' . $confirmation_code) }}</a>.<br/>
+    </div>
+</body>
+</html>
+
diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php
@@ -25,24 +25,25 @@
 <body id="skin-cloth">
     <section id="login">
         <header>
-            <h1>ICL Knowledge Base</h1>
+            <h1><a href="{{url('/')}}">ICL Knowledge Base</a></h1>
             <p class="login-paragraph">Welcome to ICL Knowledge Base. For better browsing experience, please login to discover more features of this site.</p>
         </header>
 
         <div class="clearfix"></div>
 
         <!-- Login -->
-        <form class="box tile animated active" id="box-login">
+        <form class="box tile animated active" id="box-login" action="{{url('login')}}" method="post">
+            {!! csrf_field() !!}
             <h2 class="m-t-0 m-b-15">Login</h2>
-            <input type="text" class="login-control m-b-10" placeholder="Email Address">
-            <input type="password" class="login-control" placeholder="Password">
+            <input type="text" name="email" class="login-control m-b-10" placeholder="Email Address">
+            <input type="password" name="password" class="login-control" placeholder="Password">
             <div class="checkbox m-b-20">
                 <label>
                     <input type="checkbox">
                     Remember Me
                 </label>
             </div>
-            <button class="btn btn-sm m-r-5">Sign In</button>
+            <button class="btn btn-sm m-r-5" type="submit">Sign In</button>
 
             <small>
                 <a class="box-switcher" data-switch="box-register" href="#">Don't have an Account?</a> or
@@ -51,15 +52,15 @@
         </form>
 
         <!-- Register -->
-        <form class="box animated tile" id="box-register">
+        <form class="box animated tile" id="box-register" action="{{url('register')}}" method="post">
+            {!! csrf_field() !!}
             <h2 class="m-t-0 m-b-15">Register</h2>
-            <input type="text" class="login-control m-b-10" placeholder="Full Name">
-            <input type="text" class="login-control m-b-10" placeholder="Username">
-            <input type="email" class="login-control m-b-10" placeholder="Email Address">
-            <input type="password" class="login-control m-b-10" placeholder="Password">
-            <input type="password" class="login-control m-b-20" placeholder="Confirm Password">
+            <input type="text" name="name" class="login-control m-b-10" placeholder="Full Name">
+            <input type="email" name="email" class="login-control m-b-10" placeholder="Email Address">
+            <input type="password" name="password" class="login-control m-b-10" placeholder="Password">
+            <input type="password" name="password_confirmation" class="login-control m-b-20" placeholder="Confirm Password">
 
-            <button class="btn btn-sm m-r-5">Register</button>
+            <button class="btn btn-sm m-r-5" type="submit">Register</button>
 
             <small><a class="box-switcher" data-switch="box-login" href="#">Already have an Account?</a></small>
         </form>

Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,9 @@ function login()`
`20`	`20`	`{`
`21`	`21`	`return view('login');`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ function registerSuccess()`
	`25`	`+ {`
	`26`	`+ return view('login');`
	`27`	`+ }`
`23`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,11 @@`
`3`	`3`	`namespace App;`
`4`	`4`
`5`	`5`	`use Illuminate\Foundation\Auth\User as Authenticatable;`
	`6`	`+use Zizaco\Entrust\Traits\EntrustUserTrait;`
`6`	`7`
`7`	`8`	`class User extends Authenticatable`
`8`	`9`	`{`
	`10`	`+ use EntrustUserTrait;`
`9`	`11`	`/**`
`10`	`12`	`* The attributes that are mass assignable.`
`11`	`13`	`*`
`@@ -21,6 +23,6 @@ class User extends Authenticatable`
`21`	`23`	`* @var array`
`22`	`24`	`*/`
`23`	`25`	`protected $hidden = [`
`24`		`- 'password', 'remember_token',`
	`26`	`+ 'password', 'remember_token', 'confirmation_code',`
`25`	`27`	`];`
`26`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`\|`
`56`	`56`	`*/`
`57`	`57`
`58`		`- 'from' => ['address' => null, 'name' => null],`
	`58`	`+ 'from' => ['address' => env('MAIL_FROM_ADDRESS'), 'name' => env('MAIL_FROM_NAME')],`
`59`	`59`
`60`	`60`	`/*`
`61`	`61`	`\|--------------------------------------------------------------------------`