Endpoints For the different users in place

TimothyMee · Feb 21, 2018 · 21734bf · 21734bf
1 parent c354dfa
commit 21734bf
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -18,7 +18,19 @@ public function postLogin(Request $request)
         $data = $request->all();
         try{
             if (auth()->attempt(['email' => $data['email'], 'password' => $data['password'], 'is_active' => true])) {
-                return redirect()->intended(route('home'));
+                if (auth()->user()->user_type == 1 || auth()->user()->user_type == 2)
+                {
+                    return redirect()->intended(route('home'));
+                }
+
+                elseif(auth()->user()->user_type == 3)
+                {
+                    return redirect()->intended(route('home'));
+                }
+                elseif(auth()->user()->user_type == 4)
+                {
+                    return 'Parent';
+                }
             }
             return redirect()->back()->with('error', 'Identification No and Password Combination Incorrect')->withInput();
         } catch (\Exception $e)

diff --git a/app/Http/Controllers/StudentController.php b/app/Http/Controllers/StudentController.php
@@ -20,7 +20,7 @@ public function add(Request $request, User $user)
 
         try
         {
-            $result = $student->createNew($request->all());
+            $result = $user->createNew($request->all());
             return apiSuccess($result);
         }
         catch (\Exception $e)
@@ -70,7 +70,7 @@ public function viewStudent(Request $request, User $user)
         }
     }
 
-    public function viewStudents(Student $student)
+    public function viewStudents(User $user)
     {
         try
         {

diff --git a/public/js/app.js b/public/js/app.js
@@ -45748,9 +45748,11 @@ var render = function() {
                     }
                   },
                   _vm._l(_vm.userTypes, function(userType) {
-                    return _c("option", { domProps: { value: userType.id } }, [
-                      _vm._v(_vm._s(userType.name))
-                    ])
+                    return userType.id == 1 || userType.id == 2
+                      ? _c("option", { domProps: { value: userType.id } }, [
+                          _vm._v(_vm._s(userType.name))
+                        ])
+                      : _vm._e()
                   })
                 )
               : _c("span", { staticStyle: { color: "red" } }, [

diff --git a/resources/assets/js/components/users/CreateUser.vue b/resources/assets/js/components/users/CreateUser.vue
@@ -40,7 +40,7 @@
                 <div class="form-group" style="margin-left: 30px;">
                     <label class="">User Types:</label>
                     <select name="" id="" class="form-control form-control-xs" v-model="user.user_type" v-if="userTypes.length">
-                        <option v-for="userType in userTypes" :value=userType.id>{{userType.name}}</option>
+                        <option v-for="userType in userTypes" :value=userType.id v-if="userType.id == 1 || userType.id == 2">{{userType.name}}</option>
                     </select>
                     <span v-else="" style="color:red">
                         No Existing Role... Please Create a User Type First

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -127,21 +127,21 @@
                 </a>
                 <ul class="dropdown-menu">
                     <li><a href="{{route('course.index')}}">Add New Course</a></li>
-                    <li><a href="{{route('course-registration.new')}}">Student's Course Registration</a></li>
-                    <li><a href="{{route('course-registration.edit')}}">Edit Registration</a></li>
+                   {{-- <li><a href="{{route('course-registration.new')}}">Student's Course Registration</a></li>--}}
+                   {{-- <li><a href="{{route('course-registration.edit')}}">Edit Registration</a></li>--}}
                 </ul>
             </li>
 
-            <li class="dropdown">
+            {{--<li class="dropdown">
                 <a class="dropdown-toggle" data-toggle="dropdown" href="#">
                     <i class="tag-color pink"></i>
-                    Students <span class="caret"></span>
+                    Students <span class="caret"></span>--}}{{-- <li><a href="{{route('course-registration.edit')}}">Edit Registration</a></li>--}}{{--
                 </a>
                 <ul class="dropdown-menu">
                     <li><a href="{{route('student.index')}}">Create Students</a></li>
                     <li><a href="{{route('department.index')}}">Create Departments</a></li>
                 </ul>
-            </li>
+            </li>--}}
 
 
 

diff --git a/routes/web.php b/routes/web.php
@@ -101,23 +101,9 @@
     });
 
 
+    Route
     /*Route::get('/', function () {
         return view('welcome');
     })->name('home');*/
 });
 
-
-/*Admin Routes*/
-
-
-Route::group(['middleware' => 'auth'], function (){
-
-    Route::group(['prefix' => 'admin'], function (){
-
-        Route::get('home', function (){
-            return 'Admin';
-        });
-    });
-
-});
-