updates

Author: lazehang

app/Http/Controllers/AdminController.php

@@ -9,6 +9,7 @@
 use App\Vaccancy;
 use App\User;
 use App\Role;
+use App\Booking;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Http\Requests;
@@ -22,10 +23,10 @@ class AdminController extends Controller
     function index()
     {
         $vaccancy = Vaccancy::get()->count();
-        $room = Room::get()->count();
+        $room = Booking::get()->count();
         $seat = Vaccancy::all()->sum('seats');
         $student = Student::get()->count();
-    	return view('front.admin.index', ['vaccancy' => $vaccancy, 'room' => $room, 'seat' => $seat, 'student' => $student]);
+    	return view('front.admin.index', ['vaccancy' => $vaccancy, 'booking' => $room, 'seat' => $seat, 'student' => $student]);
     }
 
     function register_std(){

app/Http/Controllers/Auth/RegisterController.php

@@ -68,7 +68,8 @@ protected function create(array $data)
             'email' => $data['email'],
             'password' => bcrypt($data['password']),
         ]);
-            $user->roles()->attach(Role::where('name', 'Admin')->first());
+        
+        $user->roles()->attach(Role::where('name', 'Admin')->first());
         Auth::user();
     }
 }

app/Http/Controllers/SiteController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Account;
+use App\User;
 use App\Student;
 use Carbon\Carbon;
 use Faker\Provider\DateTime;
@@ -25,6 +26,7 @@ function index(){
 
     	return view('front.user.index',['vaccancies' => $vaccancies , 'homes' => $homes ]);
     }
+
     function account(){
         $id = Auth::user()->user_id;
         $acc = Student::where('user_id', $id)->first();

app/Http/Controllers/VaccancyController.php

@@ -27,7 +27,7 @@ function post( Requests\CreateVaccancy $request){
         $type = $request['type'];
         $vaccancy = Vaccancy::where('type', $type)->first();
 
-        if(count($vaccancy) > 0)
+        if(isset($vaccancy))
         {
             $old = $vaccancy->seats;
             $seats = $request['seats'];

database/migrations/2017_04_29_104003_create_accounts_table.php

@@ -18,7 +18,7 @@ public function up()
             $table->integer('std_id')->unsigned();
             $table->integer('room_id')->unsigned();
             $table->timestamp('deadline');
-            $table->timestamps()->default('current_timestamp');
+            $table->timestamps();
             $table->foreign('std_id')->references('std_id')->on('students');
             $table->foreign('room_id')->references('room_id')->on('rooms');
         });

database/seeds/RoleTableSeeder.php

@@ -12,7 +12,7 @@ class RoleTableSeeder extends Seeder
      */
     public function run()
     {
-       $role_user = new Role;
+        $role_user = new Role;
         $role_user->name ='Admin';
         $role_user->slug = 'Admin';
         $role_user->save();
@@ -22,6 +22,9 @@ public function run()
         $role_admin->slug = 'User';
         $role_admin->save();
 
-
+        $role_admin = new Role;
+        $role_admin->name ='Super';
+        $role_admin->slug = 'Super';
+        $role_admin->save();
     }
 }

public/assets/css/custom.css

@@ -1,5 +1,5 @@
 /*custom css */
-
+@import url('https://fonts.googleapis.com/css?family=Gloria+Hallelujah|Roboto');
 .overlay{
     background: -webkit-linear-gradient(top, rgba(72,76,97,0) 0%, rgba(72,76,97,0.8) 75%);
     background: linear-gradient(to bottom, rgba(72,76,97,0) 0%, rgba(72,76,97,0.8) 75%);
@@ -117,6 +117,16 @@ textarea:hover::focus:-ms-placeholder {
     background-color: #666 !important;
     height: 100%;
 }
+
+.nav-lg {
+       padding: 10px;
+       background: rgb(22, 30, 48);
+}
 .content {
     margin-top:4% !important;
+}
+
+a.navbar-brand {
+    font-family: 'Gloria Hallelujah', cursive;
+    font-size: 24px;
 }