Updated Google Avatar, Admin Features, All Pages with small changes, Filters in Publications Page
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Department;
|
||||
use App\Models\Role;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Yajra\DataTables\Facades\DataTables;
|
||||
@@ -22,7 +23,8 @@ class UserController extends Controller
|
||||
public function index()
|
||||
{
|
||||
$departments = Department::all();
|
||||
return view('pages.users.index', compact('departments'));
|
||||
$roles = Role::all();
|
||||
return view('pages.users.index', compact('departments', 'roles'));
|
||||
}
|
||||
|
||||
public function getUsersData(Request $request)
|
||||
@@ -87,7 +89,11 @@ class UserController extends Controller
|
||||
'email' => 'required|email|unique:users',
|
||||
'password' => 'required|string|min:8',
|
||||
'role_id' => 'required|exists:roles,id',
|
||||
'department_id' => 'nullable|exists:departments,id',
|
||||
'department_id' => 'required|exists:departments,id',
|
||||
'mobile_no' => 'nullable|string|max:15',
|
||||
'extension' => 'nullable|string|max:10',
|
||||
'orcid_id' => 'nullable|string|max:19|unique:users',
|
||||
'scopus_id' => 'nullable|string|max:20|unique:users',
|
||||
]);
|
||||
|
||||
$user = User::create([
|
||||
@@ -96,9 +102,13 @@ class UserController extends Controller
|
||||
'password' => bcrypt($request->password),
|
||||
'role_id' => $request->role_id,
|
||||
'department_id' => $request->department_id,
|
||||
'mobile_no' => $request->mobile_no,
|
||||
'extension' => $request->extension,
|
||||
'orcid_id' => $request->orcid_id,
|
||||
'scopus_id' => $request->scopus_id,
|
||||
]);
|
||||
|
||||
return $user;
|
||||
return response()->json($user, 201);
|
||||
}
|
||||
|
||||
public function show(User $user)
|
||||
|
||||
Reference in New Issue
Block a user