From c354dfa763355b5d618a1ba0ba4b9bf56db27b71 Mon Sep 17 00:00:00 2001 From: TimothyMee Date: Wed, 21 Feb 2018 08:46:24 +0100 Subject: [PATCH] Some refactoring to accomodate new updates --- app/Console/Commands/InstallRms.php | 12 +- app/Http/Controllers/AuthController.php | 4 +- app/Http/Controllers/ResultController.php | 5 +- app/Http/Controllers/StudentController.php | 9 +- app/Http/Controllers/UserTypeController.php | 82 +++ app/Result.php | 12 + app/User.php | 4 +- app/UserType.php | 49 ++ app/parent.php | 10 + config/auth.php | 2 +- config/default.php | 9 +- .../2014_10_12_000000_create_users_table.php | 2 +- ..._15_131540_add_staff_id_to_roles_table.php | 34 -- ...le.php => 2018_02_20_164756_user_type.php} | 14 +- public/js/app.js | 526 +++++++++++------- resources/assets/js/app.js | 6 +- .../assets/js/components/ExampleComponent.vue | 13 + .../CreateType.vue} | 12 +- .../ViewRoles.vue => user_type/ViewTypes.vue} | 34 +- .../assets/js/components/users/CreateUser.vue | 16 +- resources/views/auth/login.blade.php | 10 +- resources/views/layouts/app.blade.php | 2 +- .../{roles => user_type}/index.blade.php | 4 +- resources/views/welcome.blade.php | 11 +- routes/web.php | 34 +- 25 files changed, 615 insertions(+), 301 deletions(-) create mode 100644 app/Http/Controllers/UserTypeController.php create mode 100644 app/UserType.php create mode 100644 app/parent.php delete mode 100644 database/migrations/2018_01_15_131540_add_staff_id_to_roles_table.php rename database/migrations/{2018_01_14_122057_create_roles_table.php => 2018_02_20_164756_user_type.php} (71%) rename resources/assets/js/components/{roles/CreateRole.vue => user_type/CreateType.vue} (86%) rename resources/assets/js/components/{roles/ViewRoles.vue => user_type/ViewTypes.vue} (75%) rename resources/views/{roles => user_type}/index.blade.php (83%) diff --git a/app/Console/Commands/InstallRms.php b/app/Console/Commands/InstallRms.php index 64b911a..795d040 100644 --- a/app/Console/Commands/InstallRms.php +++ b/app/Console/Commands/InstallRms.php @@ -3,7 +3,7 @@ namespace App\Console\Commands; use App\User; -use App\Role; +use App\UserType; use App\Department; use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; @@ -42,7 +42,7 @@ public function __construct() public function handle() { DB::transaction(function () { - $this->setRole(); + $this->setUserTypes(); $this->setDepartment(); $this->setDefaultUsers(); }); @@ -64,11 +64,11 @@ public function setDefaultUsers() return $user->createNew(config('default.superadmin')); } - public function setRole() + public function setUserTypes() { - $role = new Role(); - foreach (config('default.roles') as $defaultRole) { - $role->createNew($defaultRole); + $userType = new UserType(); + foreach (config('default.user_type') as $defaultRole) { + $userType->createNew($defaultRole); } return ; } diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 095ab77..8a9df19 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Mockery\Exception; class AuthController extends Controller { @@ -16,7 +17,7 @@ public function postLogin(Request $request) { $data = $request->all(); try{ - if (auth()->attempt(['identification_no' => $data['identification_no'], 'password' => $data['password'], 'is_active' => true])) { + if (auth()->attempt(['email' => $data['email'], 'password' => $data['password'], 'is_active' => true])) { return redirect()->intended(route('home')); } return redirect()->back()->with('error', 'Identification No and Password Combination Incorrect')->withInput(); @@ -32,4 +33,5 @@ public function logout() auth()->logout(); return redirect()->route('login'); } + } diff --git a/app/Http/Controllers/ResultController.php b/app/Http/Controllers/ResultController.php index 06bdd72..6a86164 100644 --- a/app/Http/Controllers/ResultController.php +++ b/app/Http/Controllers/ResultController.php @@ -140,11 +140,12 @@ public function updateStatus(Request $request, Result $resultObject) { try { - + $result = $resultObject->updateResultStatus($request->all()); + return apiSuccess($result); } catch (\Exception $e) { - + return apiFailure($e); } } } diff --git a/app/Http/Controllers/StudentController.php b/app/Http/Controllers/StudentController.php index 9d8973b..c925a72 100644 --- a/app/Http/Controllers/StudentController.php +++ b/app/Http/Controllers/StudentController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Student; +use App\User; use Illuminate\Http\Request; class StudentController extends Controller @@ -13,7 +14,7 @@ public function index() { return view('students.index'); } - public function add(Request $request, Student $student) + public function add(Request $request, User $user) { /*$this->validate()*/ @@ -28,7 +29,7 @@ public function add(Request $request, Student $student) } } - public function edit(Request $request, Student $student) + public function edit(Request $request, User $user) { /*$this->validate()*/ @@ -43,7 +44,7 @@ public function edit(Request $request, Student $student) } } - public function delete(Request $request, Student $student) + public function delete(Request $request, User $user) { try { @@ -56,7 +57,7 @@ public function delete(Request $request, Student $student) } } - public function viewStudent(Request $request, Student $student) + public function viewStudent(Request $request, User $user) { try { diff --git a/app/Http/Controllers/UserTypeController.php b/app/Http/Controllers/UserTypeController.php new file mode 100644 index 0000000..056325b --- /dev/null +++ b/app/Http/Controllers/UserTypeController.php @@ -0,0 +1,82 @@ +createNew($request->all()); + return apiSuccess($result); + } + catch (\Exception $e) + { + return apiFailure($e); + } + } + + + public function delete(Request $request, UserType $userType) + { + try + { + $result = $userType->deleteRole($request->all()); + return apiSuccess($result); + } + catch (\Exception $e) + { + return apiFailure($e); + } + } + + public function viewRoles(UserType $userType) + { + try + { + $result = $userType->viewAll(); + return apiSuccess($result); + } + catch (\Exception $e) + { + return apiFailure($e); + } + } + + public function viewRole(Request $request, UserType $userType) + { + try + { + $result = $userType->view($request->all()); + return apiSuccess($result); + } + catch (\Exception $e) + { + return apiFailure($e); + } + } + + public function edit(Request $request, UserType $userType) + { + try + { + $result = $userType->updateRole($request->all()); + return apiSuccess($result); + } + catch (\Exception $e) + { + return apiFailure($e); + } + } +} diff --git a/app/Result.php b/app/Result.php index ce7afda..bde044f 100644 --- a/app/Result.php +++ b/app/Result.php @@ -53,6 +53,18 @@ public function updateResult($data) ]); } + public function updateResultStatus($data) + { + $data['staff_id'] = auth()->id(); + return $this->where('student_id', $data['student_id']) + ->where('semester', $data['semester']) + ->where('year', $data['year']) + ->update([ + 'status' => $data['status'], + 'staff_id' => $data['staff_id'] + ]); + } + public function viewAll() { $result = $this->all(); diff --git a/app/User.php b/app/User.php index 3e5d207..8f94766 100644 --- a/app/User.php +++ b/app/User.php @@ -16,7 +16,7 @@ class User extends Authenticatable */ protected $fillable = [ 'firstname', 'middlename', 'lastname', 'tel_no', 'email', 'password', - 'identification_no', 'department_id', 'role_id', 'staff_id', 'is_active' + 'identification_no', 'department_id', 'user_type', 'staff_id', 'is_active' ]; /** @@ -71,7 +71,7 @@ public function updateUser($data) 'email' => $data['email'], 'identification_no' => $data['identification_no'], 'department_id' => $data['department_id'], - 'role_id' => $data['role_id'], + 'user_type' => $data['user_type'], 'staff_id' => $data['staff_id'] ] ); diff --git a/app/UserType.php b/app/UserType.php new file mode 100644 index 0000000..64a1597 --- /dev/null +++ b/app/UserType.php @@ -0,0 +1,49 @@ +id(); + return $this->create($data); + } + + public function deleteRole($data) + { + return $this->delete($data); + } + + public function view(Array $requests) + { + foreach ($requests as $request) + { + $results[] = $this->where('id', $request)->get(); + } + + return $results; + } + + public function viewAll() + { + $result = $this->all(); + return $result; + } + + public function updateRole($data) + { + $data['staff_id'] = auth()->id(); + return $this->where('id', $data['id']) + ->update([ + 'name' => $data['name'], + 'description' => $data['description'], + 'staff_id' => $data['staff_id'] + ]); + } +} diff --git a/app/parent.php b/app/parent.php new file mode 100644 index 0000000..b15bbd8 --- /dev/null +++ b/app/parent.php @@ -0,0 +1,10 @@ + 'timothy33.tf@gmail.com', 'tel_no' => '07088775522', 'department_id' => 1, - 'role_id' => 1, + 'user_type' => 1, 'staff_id' => 1, ], - 'roles' => [ - ['name' => 'SuperAdmin', 'description' => 'Has all rights to any part of the system', 'staff_id' => 1, ] + 'user_type' => [ + ['name' => 'SuperAdmin', 'description' => 'Has all rights to any part of the system', 'staff_id' => 1, ], + ['name' => 'Admin', 'description' => 'Has rights to create,delete and update all except admins', 'staff_id' => 1, ], + ['name' => 'Student', 'description' => 'The main subject of the Application', 'staff_id' => 1, ], + ['name' => 'Parent', 'description' => 'Parent of the Student', 'staff_id' => 1, ], ], 'department' => [ diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 2c7f5a4..92c835f 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -23,7 +23,7 @@ public function up() $table->string('identification_no')->unique(); $table->string('password'); $table->integer('department_id'); - $table->integer('role_id'); + $table->integer('user_type'); $table->integer('staff_id'); $table->boolean('is_active')->default(true); $table->rememberToken(); diff --git a/database/migrations/2018_01_15_131540_add_staff_id_to_roles_table.php b/database/migrations/2018_01_15_131540_add_staff_id_to_roles_table.php deleted file mode 100644 index be9ecdd..0000000 --- a/database/migrations/2018_01_15_131540_add_staff_id_to_roles_table.php +++ /dev/null @@ -1,34 +0,0 @@ -integer('staff_id'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // - Schema::table('roles', function (Blueprint $table) { - $table->dropColumn('staff_id'); - }); - } -} diff --git a/database/migrations/2018_01_14_122057_create_roles_table.php b/database/migrations/2018_02_20_164756_user_type.php similarity index 71% rename from database/migrations/2018_01_14_122057_create_roles_table.php rename to database/migrations/2018_02_20_164756_user_type.php index 1f50367..262917c 100644 --- a/database/migrations/2018_01_14_122057_create_roles_table.php +++ b/database/migrations/2018_02_20_164756_user_type.php @@ -4,7 +4,7 @@ use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class CreateRolesTable extends Migration +class UserType extends Migration { /** * Run the migrations. @@ -13,10 +13,12 @@ class CreateRolesTable extends Migration */ public function up() { - Schema::create('roles', function (Blueprint $table) { + // + Schema::create('user_types', function (Blueprint $table) { $table->increments('id'); $table->string('name'); $table->string('description'); + $table->integer('staff_id'); $table->timestamps(); }); } @@ -28,6 +30,12 @@ public function up() */ public function down() { - Schema::dropIfExists('roles'); + // + Schema::dropIfExists('user_types'); } + + + + + } diff --git a/public/js/app.js b/public/js/app.js index 457f5e2..3c732c5 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -11889,7 +11889,7 @@ module.exports = Vue$3; /***/ (function(module, exports, __webpack_require__) { __webpack_require__(12); -module.exports = __webpack_require__(96); +module.exports = __webpack_require__(99); /***/ }), @@ -11925,30 +11925,30 @@ Vue.component('switches', __WEBPACK_IMPORTED_MODULE_0_vue_switches___default.a); * or customize the JavaScript scaffolding to fit your unique needs. */ -/**/ +Vue.component('example-component', __webpack_require__(48)); -Vue.component('view-users', __webpack_require__(48)); -Vue.component('add-user', __webpack_require__(51)); -Vue.component('change-password', __webpack_require__(54)); +Vue.component('view-users', __webpack_require__(51)); +Vue.component('add-user', __webpack_require__(54)); +Vue.component('change-password', __webpack_require__(57)); -Vue.component('view-students', __webpack_require__(57)); -Vue.component('add-students', __webpack_require__(60)); +Vue.component('view-students', __webpack_require__(60)); +Vue.component('add-students', __webpack_require__(63)); -Vue.component('view-departments', __webpack_require__(63)); -Vue.component('add-department', __webpack_require__(66)); +Vue.component('view-departments', __webpack_require__(66)); +Vue.component('add-department', __webpack_require__(69)); -Vue.component('view-roles', __webpack_require__(69)); -Vue.component('add-role', __webpack_require__(72)); +Vue.component('view-types', __webpack_require__(72)); +Vue.component('add-type', __webpack_require__(75)); -Vue.component('view-courses', __webpack_require__(75)); -Vue.component('add-course', __webpack_require__(78)); +Vue.component('view-courses', __webpack_require__(78)); +Vue.component('add-course', __webpack_require__(81)); -Vue.component('view-registration', __webpack_require__(81)); -Vue.component('new-registration', __webpack_require__(84)); +Vue.component('view-registration', __webpack_require__(84)); +Vue.component('new-registration', __webpack_require__(87)); -Vue.component('create-result', __webpack_require__(87)); -Vue.component('view-result', __webpack_require__(90)); -Vue.component('edit-result', __webpack_require__(93)); +Vue.component('create-result', __webpack_require__(90)); +Vue.component('view-result', __webpack_require__(93)); +Vue.component('edit-result', __webpack_require__(96)); var app = new Vue({ el: '#app' @@ -44653,6 +44653,146 @@ var Component = normalizeComponent( __vue_scopeId__, __vue_module_identifier__ ) +Component.options.__file = "resources/assets/js/components/ExampleComponent.vue" + +/* hot reload */ +if (false) {(function () { + var hotAPI = require("vue-hot-reload-api") + hotAPI.install(require("vue"), false) + if (!hotAPI.compatible) return + module.hot.accept() + if (!module.hot.data) { + hotAPI.createRecord("data-v-7168fb6a", Component.options) + } else { + hotAPI.reload("data-v-7168fb6a", Component.options) + } + module.hot.dispose(function (data) { + disposed = true + }) +})()} + +module.exports = Component.exports + + +/***/ }), +/* 49 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// + +/* harmony default export */ __webpack_exports__["default"] = ({ + mounted: function mounted() { + console.log('Component mounted.'); + }, + + + methods: { + api1: function api1() { + axios.get('api1').then(function (response) { + console.log('api call 1'); + }); + } + } +}); + +/***/ }), +/* 50 */ +/***/ (function(module, exports, __webpack_require__) { + +var render = function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", [ + _c("div", { staticClass: "row" }, [ + _c("div", { staticClass: "col-md-8 col-md-offset-2" }, [ + _c("div", { staticClass: "panel panel-default" }, [ + _c("div", { staticClass: "panel-heading" }, [ + _vm._v("Example Component") + ]), + _vm._v(" "), + _c("div", { staticClass: "panel-body" }, [ + _vm._v( + "\n I'm an example component!\n " + ) + ]), + _vm._v(" "), + _c("form", { attrs: { action: "" } }, [ + _c( + "button", + { + on: { + click: function($event) { + $event.preventDefault() + _vm.api1($event) + } + } + }, + [_vm._v("Api 1")] + ) + ]) + ]) + ]) + ]) + ]) +} +var staticRenderFns = [] +render._withStripped = true +module.exports = { render: render, staticRenderFns: staticRenderFns } +if (false) { + module.hot.accept() + if (module.hot.data) { + require("vue-hot-reload-api") .rerender("data-v-7168fb6a", module.exports) + } +} + +/***/ }), +/* 51 */ +/***/ (function(module, exports, __webpack_require__) { + +var disposed = false +var normalizeComponent = __webpack_require__(0) +/* script */ +var __vue_script__ = __webpack_require__(52) +/* template */ +var __vue_template__ = __webpack_require__(53) +/* template functional */ +var __vue_template_functional__ = false +/* styles */ +var __vue_styles__ = null +/* scopeId */ +var __vue_scopeId__ = null +/* moduleIdentifier (server only) */ +var __vue_module_identifier__ = null +var Component = normalizeComponent( + __vue_script__, + __vue_template__, + __vue_template_functional__, + __vue_styles__, + __vue_scopeId__, + __vue_module_identifier__ +) Component.options.__file = "resources/assets/js/components/users/ViewUsers.vue" /* hot reload */ @@ -44675,7 +44815,7 @@ module.exports = Component.exports /***/ }), -/* 49 */ +/* 52 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -44795,7 +44935,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 50 */ +/* 53 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -45184,15 +45324,15 @@ if (false) { } /***/ }), -/* 51 */ +/* 54 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(52) +var __vue_script__ = __webpack_require__(55) /* template */ -var __vue_template__ = __webpack_require__(53) +var __vue_template__ = __webpack_require__(56) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -45231,7 +45371,7 @@ module.exports = Component.exports /***/ }), -/* 52 */ +/* 55 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -45303,7 +45443,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); return { user: {}, departments: '', - roles: '' + userTypes: '' }; }, mounted: function mounted() { @@ -45326,10 +45466,10 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); fetchRoles: function fetchRoles() { var _this2 = this; - axios.get('/role/view').then(function (response) { + axios.get('/UserType/view').then(function (response) { var _response = response.data; if (_response.status === 0) { - _this2.roles = _response.data; + _this2.userTypes = _response.data; } else {} }); }, @@ -45351,7 +45491,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 53 */ +/* 56 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -45567,55 +45707,59 @@ var render = function() { ]) ]), _vm._v(" "), - _c("div", { staticClass: "form-group" }, [ - _c("label", {}, [_vm._v("Role:")]), - _vm._v(" "), - _vm.roles.length - ? _c( - "select", - { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.user.role_id, - expression: "user.role_id" - } - ], - staticClass: "form-control form-control-xs", - attrs: { name: "", id: "" }, - on: { - change: function($event) { - var $$selectedVal = Array.prototype.filter - .call($event.target.options, function(o) { - return o.selected - }) - .map(function(o) { - var val = "_value" in o ? o._value : o.value - return val - }) - _vm.$set( - _vm.user, - "role_id", - $event.target.multiple - ? $$selectedVal - : $$selectedVal[0] - ) + _c( + "div", + { staticClass: "form-group", staticStyle: { "margin-left": "30px" } }, + [ + _c("label", {}, [_vm._v("User Types:")]), + _vm._v(" "), + _vm.userTypes.length + ? _c( + "select", + { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.user.user_type, + expression: "user.user_type" + } + ], + staticClass: "form-control form-control-xs", + attrs: { name: "", id: "" }, + on: { + change: function($event) { + var $$selectedVal = Array.prototype.filter + .call($event.target.options, function(o) { + return o.selected + }) + .map(function(o) { + var val = "_value" in o ? o._value : o.value + return val + }) + _vm.$set( + _vm.user, + "user_type", + $event.target.multiple + ? $$selectedVal + : $$selectedVal[0] + ) + } } - } - }, - _vm._l(_vm.roles, function(role) { - return _c("option", { domProps: { value: role.id } }, [ - _vm._v(_vm._s(role.name)) - ]) - }) - ) - : _c("span", { staticStyle: { color: "red" } }, [ - _vm._v( - "\n No Existing Role... Please Create a Role First\n " + }, + _vm._l(_vm.userTypes, function(userType) { + return _c("option", { domProps: { value: userType.id } }, [ + _vm._v(_vm._s(userType.name)) + ]) + }) ) - ]) - ]), + : _c("span", { staticStyle: { color: "red" } }, [ + _vm._v( + "\n No Existing Role... Please Create a User Type First\n " + ) + ]) + ] + ), _vm._v(" "), _c("div", { staticClass: "form-group" }, [ _c("br"), @@ -45664,15 +45808,15 @@ if (false) { } /***/ }), -/* 54 */ +/* 57 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(55) +var __vue_script__ = __webpack_require__(58) /* template */ -var __vue_template__ = __webpack_require__(56) +var __vue_template__ = __webpack_require__(59) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -45711,7 +45855,7 @@ module.exports = Component.exports /***/ }), -/* 55 */ +/* 58 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -45793,7 +45937,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 56 */ +/* 59 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -45934,15 +46078,15 @@ if (false) { } /***/ }), -/* 57 */ +/* 60 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(58) +var __vue_script__ = __webpack_require__(61) /* template */ -var __vue_template__ = __webpack_require__(59) +var __vue_template__ = __webpack_require__(62) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -45981,7 +46125,7 @@ module.exports = Component.exports /***/ }), -/* 58 */ +/* 61 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -46098,7 +46242,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 59 */ +/* 62 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -46481,15 +46625,15 @@ if (false) { } /***/ }), -/* 60 */ +/* 63 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(61) +var __vue_script__ = __webpack_require__(64) /* template */ -var __vue_template__ = __webpack_require__(62) +var __vue_template__ = __webpack_require__(65) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -46528,7 +46672,7 @@ module.exports = Component.exports /***/ }), -/* 61 */ +/* 64 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -46632,7 +46776,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 62 */ +/* 65 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -46895,15 +47039,15 @@ if (false) { } /***/ }), -/* 63 */ +/* 66 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(64) +var __vue_script__ = __webpack_require__(67) /* template */ -var __vue_template__ = __webpack_require__(65) +var __vue_template__ = __webpack_require__(68) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -46942,7 +47086,7 @@ module.exports = Component.exports /***/ }), -/* 64 */ +/* 67 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -47043,7 +47187,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 65 */ +/* 68 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -47290,15 +47434,15 @@ if (false) { } /***/ }), -/* 66 */ +/* 69 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(67) +var __vue_script__ = __webpack_require__(70) /* template */ -var __vue_template__ = __webpack_require__(68) +var __vue_template__ = __webpack_require__(71) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -47337,7 +47481,7 @@ module.exports = Component.exports /***/ }), -/* 67 */ +/* 70 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -47398,7 +47542,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 68 */ +/* 71 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -47516,15 +47660,15 @@ if (false) { } /***/ }), -/* 69 */ +/* 72 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(70) +var __vue_script__ = __webpack_require__(73) /* template */ -var __vue_template__ = __webpack_require__(71) +var __vue_template__ = __webpack_require__(74) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -47541,7 +47685,7 @@ var Component = normalizeComponent( __vue_scopeId__, __vue_module_identifier__ ) -Component.options.__file = "resources/assets/js/components/roles/ViewRoles.vue" +Component.options.__file = "resources/assets/js/components/user_type/ViewTypes.vue" /* hot reload */ if (false) {(function () { @@ -47550,9 +47694,9 @@ if (false) {(function () { if (!hotAPI.compatible) return module.hot.accept() if (!module.hot.data) { - hotAPI.createRecord("data-v-44f8ee5f", Component.options) + hotAPI.createRecord("data-v-2986c768", Component.options) } else { - hotAPI.reload("data-v-44f8ee5f", Component.options) + hotAPI.reload("data-v-2986c768", Component.options) } module.hot.dispose(function (data) { disposed = true @@ -47563,7 +47707,7 @@ module.exports = Component.exports /***/ }), -/* 70 */ +/* 73 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -47624,7 +47768,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony default export */ __webpack_exports__["default"] = ({ data: function data() { return { - roles: '', + UserTypes: '', enabled: false }; }, @@ -47634,26 +47778,26 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); fetchRole: function fetchRole() { var _this = this; - axios.get('/role/view').then(function (response) { + axios.get('/UserType/view').then(function (response) { var _response = response.data; if (_response.status === 0) { - _this.roles = _response.data; + _this.UserTypes = _response.data; } }); }, - update: function update(role) { + update: function update(UserType) { var _this2 = this; - axios.post('/role/edit', role).then(function (response) { + axios.post('/UserType/edit', UserType).then(function (response) { var _response = response.data; if (_response.status === 0) { _this2.fetchRole(); - _this2.$notify({ type: 'success', text: 'Role update successful', speed: 400 }); + _this2.$notify({ type: 'success', text: 'User Type update successful', speed: 400 }); } else { - _this2.$notify({ type: 'error', text: 'Updating Role. unsuccessfully. Try again later', speed: 400 }); + _this2.$notify({ type: 'error', text: 'Updating User Type. unsuccessfully. Try again later', speed: 400 }); } }).catch(function (error) { - _this2.$notify({ type: 'error', text: 'Updating Role. unsuccessfully. Try again later', speed: 400 }); + _this2.$notify({ type: 'error', text: 'Updating User Type. unsuccessfully. Try again later', speed: 400 }); }); } }, @@ -47664,7 +47808,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 71 */ +/* 74 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -47682,13 +47826,13 @@ var render = function() { [ _vm._m(0), _vm._v(" "), - _vm._l(_vm.roles, function(role, index) { + _vm._l(_vm.UserTypes, function(UserType, index) { return _c("tr", [ _c("td", [_vm._v(_vm._s(++index))]), _vm._v(" "), - _c("td", [_vm._v(_vm._s(role.name))]), + _c("td", [_vm._v(_vm._s(UserType.name))]), _vm._v(" "), - _c("td", [_vm._v(_vm._s(role.description))]), + _c("td", [_vm._v(_vm._s(UserType.description))]), _vm._v(" "), _c("td", {}, [ _c( @@ -47696,7 +47840,7 @@ var render = function() { { attrs: { "data-toggle": "modal", - "data-target": "#" + role.id + "data-target": "#" + UserType.id } }, [_vm._v("...")] @@ -47708,7 +47852,7 @@ var render = function() { { staticClass: "modal fade", attrs: { - id: role.id, + id: UserType.id, tabindex: "-1", role: "dialog", "aria-labelledby": "myModalLabel" @@ -47733,7 +47877,7 @@ var render = function() { staticClass: "modal-title", attrs: { id: "myModalLabel" } }, - [_vm._v("Roles")] + [_vm._v("User Types")] ), _vm._v(" "), _c( @@ -47770,19 +47914,23 @@ var render = function() { { name: "model", rawName: "v-model", - value: role.name, - expression: "role.name" + value: UserType.name, + expression: "UserType.name" } ], staticClass: "form-control", attrs: { type: "text", disabled: !_vm.enabled }, - domProps: { value: role.name }, + domProps: { value: UserType.name }, on: { input: function($event) { if ($event.target.composing) { return } - _vm.$set(role, "name", $event.target.value) + _vm.$set( + UserType, + "name", + $event.target.value + ) } } }) @@ -47798,20 +47946,20 @@ var render = function() { { name: "model", rawName: "v-model", - value: role.description, - expression: "role.description" + value: UserType.description, + expression: "UserType.description" } ], staticClass: "form-control", attrs: { type: "text", disabled: !_vm.enabled }, - domProps: { value: role.description }, + domProps: { value: UserType.description }, on: { input: function($event) { if ($event.target.composing) { return } _vm.$set( - role, + UserType, "description", $event.target.value ) @@ -47843,7 +47991,7 @@ var render = function() { attrs: { type: "button", disabled: !_vm.enabled }, on: { click: function($event) { - _vm.update(role) + _vm.update(UserType) } } }, @@ -47902,20 +48050,20 @@ module.exports = { render: render, staticRenderFns: staticRenderFns } if (false) { module.hot.accept() if (module.hot.data) { - require("vue-hot-reload-api") .rerender("data-v-44f8ee5f", module.exports) + require("vue-hot-reload-api") .rerender("data-v-2986c768", module.exports) } } /***/ }), -/* 72 */ +/* 75 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(73) +var __vue_script__ = __webpack_require__(76) /* template */ -var __vue_template__ = __webpack_require__(74) +var __vue_template__ = __webpack_require__(77) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -47932,7 +48080,7 @@ var Component = normalizeComponent( __vue_scopeId__, __vue_module_identifier__ ) -Component.options.__file = "resources/assets/js/components/roles/CreateRole.vue" +Component.options.__file = "resources/assets/js/components/user_type/CreateType.vue" /* hot reload */ if (false) {(function () { @@ -47941,9 +48089,9 @@ if (false) {(function () { if (!hotAPI.compatible) return module.hot.accept() if (!module.hot.data) { - hotAPI.createRecord("data-v-4fcba25b", Component.options) + hotAPI.createRecord("data-v-06cdd30e", Component.options) } else { - hotAPI.reload("data-v-4fcba25b", Component.options) + hotAPI.reload("data-v-06cdd30e", Component.options) } module.hot.dispose(function (data) { disposed = true @@ -47954,7 +48102,7 @@ module.exports = Component.exports /***/ }), -/* 73 */ +/* 76 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -47988,7 +48136,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /* harmony default export */ __webpack_exports__["default"] = ({ data: function data() { return { - role: {} + user_type: {} }; }, mounted: function mounted() {}, @@ -47998,7 +48146,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); create: function create() { var _this = this; - axios.post('/role/add', this.role).then(function (response) { + axios.post('/UserType/add', this.user_type).then(function (response) { var _response = response.data; if (_response.status === 0) { _this.$notify({ type: 'success', text: 'Creation of role.. successfully', speed: 400 }); @@ -48013,7 +48161,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 74 */ +/* 77 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -48029,26 +48177,26 @@ var render = function() { _c("form", { attrs: { action: "" } }, [ _c("div", { staticClass: "row" }, [ _c("div", { staticClass: "form-group" }, [ - _c("label", { attrs: { for: "" } }, [_vm._v("Role's Name:")]), + _c("label", { attrs: { for: "" } }, [_vm._v("User Type:")]), _vm._v(" "), _c("input", { directives: [ { name: "model", rawName: "v-model", - value: _vm.role.name, - expression: "role.name" + value: _vm.user_type.name, + expression: "user_type.name" } ], staticClass: "form-control form-control-xs", attrs: { type: "text" }, - domProps: { value: _vm.role.name }, + domProps: { value: _vm.user_type.name }, on: { input: function($event) { if ($event.target.composing) { return } - _vm.$set(_vm.role, "name", $event.target.value) + _vm.$set(_vm.user_type, "name", $event.target.value) } } }) @@ -48062,19 +48210,19 @@ var render = function() { { name: "model", rawName: "v-model", - value: _vm.role.description, - expression: "role.description" + value: _vm.user_type.description, + expression: "user_type.description" } ], staticClass: "form-control form-control-xs", attrs: { name: "", id: "", cols: "30", rows: "10" }, - domProps: { value: _vm.role.description }, + domProps: { value: _vm.user_type.description }, on: { input: function($event) { if ($event.target.composing) { return } - _vm.$set(_vm.role, "description", $event.target.value) + _vm.$set(_vm.user_type, "description", $event.target.value) } } }) @@ -48105,7 +48253,7 @@ var render = function() { on: { click: function($event) { $event.preventDefault() - _vm.role = {} + _vm.user_type = {} } } }, @@ -48124,20 +48272,20 @@ module.exports = { render: render, staticRenderFns: staticRenderFns } if (false) { module.hot.accept() if (module.hot.data) { - require("vue-hot-reload-api") .rerender("data-v-4fcba25b", module.exports) + require("vue-hot-reload-api") .rerender("data-v-06cdd30e", module.exports) } } /***/ }), -/* 75 */ +/* 78 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(76) +var __vue_script__ = __webpack_require__(79) /* template */ -var __vue_template__ = __webpack_require__(77) +var __vue_template__ = __webpack_require__(80) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -48176,7 +48324,7 @@ module.exports = Component.exports /***/ }), -/* 76 */ +/* 79 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -48284,7 +48432,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 77 */ +/* 80 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -48567,15 +48715,15 @@ if (false) { } /***/ }), -/* 78 */ +/* 81 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(79) +var __vue_script__ = __webpack_require__(82) /* template */ -var __vue_template__ = __webpack_require__(80) +var __vue_template__ = __webpack_require__(83) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -48614,7 +48762,7 @@ module.exports = Component.exports /***/ }), -/* 79 */ +/* 82 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -48676,7 +48824,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 80 */ +/* 83 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -48815,15 +48963,15 @@ if (false) { } /***/ }), -/* 81 */ +/* 84 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(82) +var __vue_script__ = __webpack_require__(85) /* template */ -var __vue_template__ = __webpack_require__(83) +var __vue_template__ = __webpack_require__(86) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -48862,7 +49010,7 @@ module.exports = Component.exports /***/ }), -/* 82 */ +/* 85 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49049,7 +49197,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 83 */ +/* 86 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -49393,15 +49541,15 @@ if (false) { } /***/ }), -/* 84 */ +/* 87 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(85) +var __vue_script__ = __webpack_require__(88) /* template */ -var __vue_template__ = __webpack_require__(86) +var __vue_template__ = __webpack_require__(89) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -49440,7 +49588,7 @@ module.exports = Component.exports /***/ }), -/* 85 */ +/* 88 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -49583,7 +49731,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 86 */ +/* 89 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -49896,15 +50044,15 @@ if (false) { } /***/ }), -/* 87 */ +/* 90 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(88) +var __vue_script__ = __webpack_require__(91) /* template */ -var __vue_template__ = __webpack_require__(89) +var __vue_template__ = __webpack_require__(92) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -49943,7 +50091,7 @@ module.exports = Component.exports /***/ }), -/* 88 */ +/* 91 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50138,7 +50286,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 89 */ +/* 92 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -50441,15 +50589,15 @@ if (false) { } /***/ }), -/* 90 */ +/* 93 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(91) +var __vue_script__ = __webpack_require__(94) /* template */ -var __vue_template__ = __webpack_require__(92) +var __vue_template__ = __webpack_require__(95) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -50488,7 +50636,7 @@ module.exports = Component.exports /***/ }), -/* 91 */ +/* 94 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -50767,7 +50915,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 92 */ +/* 95 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -51031,15 +51179,15 @@ if (false) { } /***/ }), -/* 93 */ +/* 96 */ /***/ (function(module, exports, __webpack_require__) { var disposed = false var normalizeComponent = __webpack_require__(0) /* script */ -var __vue_script__ = __webpack_require__(94) +var __vue_script__ = __webpack_require__(97) /* template */ -var __vue_template__ = __webpack_require__(95) +var __vue_template__ = __webpack_require__(98) /* template functional */ var __vue_template_functional__ = false /* styles */ @@ -51078,7 +51226,7 @@ module.exports = Component.exports /***/ }), -/* 94 */ +/* 97 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -51261,7 +51409,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); }); /***/ }), -/* 95 */ +/* 98 */ /***/ (function(module, exports, __webpack_require__) { var render = function() { @@ -51579,7 +51727,7 @@ if (false) { } /***/ }), -/* 96 */ +/* 99 */ /***/ (function(module, exports) { // removed by extract-text-webpack-plugin diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 2701850..24206a1 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -21,7 +21,7 @@ Vue.component('switches', Switches); * or customize the JavaScript scaffolding to fit your unique needs. */ -/**/ +Vue.component('example-component', require('./components/ExampleComponent.vue')); Vue.component('view-users', require('./components/users/ViewUsers.vue')); Vue.component('add-user', require('./components/users/CreateUser.vue')); @@ -33,8 +33,8 @@ Vue.component('add-students', require('./components/students/CreateStudents.vue' Vue.component('view-departments', require('./components/departments/ViewDepartments.vue')); Vue.component('add-department', require('./components/departments/CreateDepartment.vue')); -Vue.component('view-roles', require('./components/roles/ViewRoles.vue')); -Vue.component('add-role', require('./components/roles/CreateRole.vue')); +Vue.component('view-types', require('./components/user_type/ViewTypes.vue')); +Vue.component('add-type', require('./components/user_type/CreateType.vue')); Vue.component('view-courses', require('./components/courses/ViewCourses.vue')); Vue.component('add-course', require('./components/courses/CreateCourse.vue')); diff --git a/resources/assets/js/components/ExampleComponent.vue b/resources/assets/js/components/ExampleComponent.vue index 8938aab..9ba1e9b 100644 --- a/resources/assets/js/components/ExampleComponent.vue +++ b/resources/assets/js/components/ExampleComponent.vue @@ -8,6 +8,10 @@
I'm an example component!
+ +
+ +
@@ -18,6 +22,15 @@ export default { mounted() { console.log('Component mounted.') + }, + + methods: { + api1(){ + axios.get('api1') + .then(response => { + console.log('api call 1'); + }) + } } } diff --git a/resources/assets/js/components/roles/CreateRole.vue b/resources/assets/js/components/user_type/CreateType.vue similarity index 86% rename from resources/assets/js/components/roles/CreateRole.vue rename to resources/assets/js/components/user_type/CreateType.vue index 4458e1e..f60a6b5 100644 --- a/resources/assets/js/components/roles/CreateRole.vue +++ b/resources/assets/js/components/user_type/CreateType.vue @@ -4,19 +4,19 @@
- - + +
- +

- +
@@ -27,7 +27,7 @@ export default { data() { return { - role:{} + user_type:{} } }, @@ -37,7 +37,7 @@ methods: { create(){ - axios.post('/role/add', this.role) + axios.post('/UserType/add', this.user_type) .then(response => { var _response = response.data; if (_response.status === 0){ diff --git a/resources/assets/js/components/roles/ViewRoles.vue b/resources/assets/js/components/user_type/ViewTypes.vue similarity index 75% rename from resources/assets/js/components/roles/ViewRoles.vue rename to resources/assets/js/components/user_type/ViewTypes.vue index 9f126d2..1ff6ac4 100644 --- a/resources/assets/js/components/roles/ViewRoles.vue +++ b/resources/assets/js/components/user_type/ViewTypes.vue @@ -9,18 +9,18 @@
...
- + {{++index}} - {{role.name}} - {{role.description}} - ... + {{UserType.name}} + {{UserType.description}} + ... - -
- - + - No Existing Role... Please Create a Role First + No Existing Role... Please Create a User Type First
@@ -65,7 +65,7 @@ return { user: {}, departments:'', - roles: '' + userTypes: '' } }, @@ -90,12 +90,12 @@ }, fetchRoles(){ - axios.get('/role/view') + axios.get('/UserType/view') .then(response => { var _response = response.data; if(_response.status === 0) { - this.roles = _response.data; + this.userTypes = _response.data; } else{ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 8587ae2..977695d 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -29,15 +29,15 @@
{{ csrf_field() }} -
- +
+
- + - @if ($errors->has('identification_no')) + @if ($errors->has('email')) - {{ $errors->first('identification_no') }} + {{ $errors->first('email') }} @endif
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 0f3cd3a..f657753 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -102,7 +102,7 @@ Users diff --git a/resources/views/roles/index.blade.php b/resources/views/user_type/index.blade.php similarity index 83% rename from resources/views/roles/index.blade.php rename to resources/views/user_type/index.blade.php index 454fac6..04dfc22 100644 --- a/resources/views/roles/index.blade.php +++ b/resources/views/user_type/index.blade.php @@ -7,12 +7,12 @@
- +
- +
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 670b001..36f031f 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -65,7 +65,7 @@ -
+ {{--
@if (Route::has('login'))
@auth @@ -90,12 +90,13 @@ GitHub
-
- -
+
-
+
--}} +
+ +
diff --git a/routes/web.php b/routes/web.php index b12d838..c689ef8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,12 +14,14 @@ /*Route::get('/', function () { return view('welcome'); }); - Auth::routes(); - Route::get('/home', 'HomeController@index')->name('home');*/ +Route::get('/', function (){ + return redirect()->route('login'); +}); + Route::get('login', 'AuthController@login')->name('login'); Route::get('logout', 'AuthController@logout')->name('logout'); Route::post('login', 'AuthController@postLogin')->name('auth.login'); @@ -64,12 +66,12 @@ }); }); - Route::group(['prefix' => 'role'], function(){ - Route::post('add', 'RoleController@add'); - Route::post('edit', 'RoleController@edit'); - Route::get('view', 'RoleController@viewRoles'); - Route::post('view', 'RoleController@viewRole'); - Route::get('index', 'RoleController@index')->name('role.index'); + Route::group(['prefix' => 'UserType'], function(){ + Route::post('add', 'UserTypeController@add'); + Route::post('edit', 'UserTypeController@edit'); + Route::get('view', 'UserTypeController@viewRoles'); + Route::post('view', 'UserTypeController@viewRole'); + Route::get('index', 'UserTypeController@index')->name('UserType.index'); }); Route::group(['prefix' => 'student'], function(){ @@ -103,3 +105,19 @@ return view('welcome'); })->name('home');*/ }); + + +/*Admin Routes*/ + + +Route::group(['middleware' => 'auth'], function (){ + + Route::group(['prefix' => 'admin'], function (){ + + Route::get('home', function (){ + return 'Admin'; + }); + }); + +}); +