Merge pull request #12 from Rafin31/manager_module

 Merged

app/Http/Controllers/loginController.php

@@ -1,98 +1,52 @@
 <?php
-
 namespace App\Http\Controllers;
+use App\Models\Meo;
+use Validator;
 
-use Illuminate\Support\Facades\Hash;
-use App\Http\Requests\loginForm;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use App\Models\loginModel;
-use App\Models\usersModel;
-use App\Models\requestsModel;
 
-class loginController extends Controller
+class LoginMeoController extends Controller
 {
  public function index()
  {
- return view("login.login");
- }
- public function logout(Request $req)
- {
- $req->session()->flush();
- return redirect("/login");
+ return view("login.index");
  }
- public function loginVarify(loginForm $req)
- {
- $user_name = $req->user_name;
- $password = bcrypt($req->password);
-
- $user = loginModel::where('user_name', $user_name)
- ->first();
 
- //checking users
- if ($user) {
- //checking account status
- if ($user['account_Status'] == 'pending') {
 
+ public function verify (Request $req)
 
- $req->session()->put('status', true);
- $req->session()->put('user_name', $req->user_name);
- $req->session()->put('user_id', $user['id']);
- $req->session()->put('user_type', $user['user_type']);
- if($user['user_type'] == 'admin'){
- return redirect()->route('user.dashbord'); //admin
- }
-
- elseif($user['user_type'] == 'clients'){
- return redirect()->route('client.index'); //client
+{
+ $validation = Validator::make($req->all(), [
+ 'user_name' => 'required',
+ 'password' => 'required|min:5',
+ ]);
 
- $req->session()->flash('msg', 'Your account is in pending');
- return redirect()->route('login.login');
- } elseif ($user['account_Status'] == 'Block') {
+
+ if ($validation->fails())
+ {
+ return back()
+ ->with ('errors',$validation->errors())
+ ->withInput();
+ }
 
- $req->session()->flash('msg', 'Your account is Blocked');
- return redirect()->route('login.login');
- } else {
+ $user=Meo::where ('user_name',$req->user_name)
+ ->where ('password',$req->password)
+ ->where ('user_type',$req->user_type)
+ ->first();
 
- if (Hash::check($req->password, $user['password'])) {
- if ($user['user_type'] == 'admin') {
- $req->session()->put('status', true);
- $req->session()->put('user_name', $req->user_name);
- $req->session()->put('user_id', $user['id']);
- $req->session()->put('user_type', $user['user_type']);
- return redirect()->route('user.dashbord');
- } elseif ($user['user_type'] == 'clients') {
- // client
- $req->session()->put('status', true);
- $req->session()->put('user_name', $req->user_name);
- $req->session()->put('user_id', $user['id']);
- $req->session()->put('user_type', $user['user_type']);
- return redirect()->route('client.index');
- } elseif ($user['user_type'] == 'bank_manager') {
- //code
- } elseif ($user['user_type'] == 'noney_exchange_officer') {
- //code
- } else {
- $req->session()->flash('msg', 'invaild request');
- return redirect()->route('login.login');
- }
- } else {
- $req->session()->flash('msg', 'invaild User Name or password');
- return redirect()->route('login.login');
- }
+if (count ((array)$user)>0 )
+{
+ $req->session()-> put('name',$req->user_name);
+ $req->session()-> put('user_type',$req->user_type);
+ $req->session()->put('password', $req->password);
+ return redirect ('/homeMeo');
+}
 
- }
- } else {
- $req->session()->flash('msg', 'invaild User Name or password');
- return redirect()->route('login.login');
- }
- }
- public function dashbord()
- {
- return view("user.index");
- }
- public function signUP()
- {
- return view('registration.register');
- }
+else{
+ $req->session()->flash('msg','Name Or Password is Wrong');
+ return redirect('/login/meo');
+}
+}
+
+
 }

app/Http/Middleware/sessionChecker.php

@@ -16,6 +16,7 @@ class sessionChecker
  */
  public function handle(Request $request, Closure $next)
  {
+ if ($request->session()->has('user_name') == true)
  if ($request->session()->has('uname') == true)
  {
  return $next($request);

app/Models/User.php

@@ -2,6 +2,15 @@
 
 namespace App\Models;
 
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class User extends Model
+{
+ use HasFactory;
+ public $timestamps = false;
+
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -40,4 +49,5 @@ class User extends Authenticatable
  protected $casts = [
  'email_verified_at' => 'datetime',
  ];
+
 }

composer.json

@@ -6,6 +6,7 @@
  "license": "MIT",
  "require": {
  "php": "^7.3|^8.0",
+ "barryvdh/laravel-dompdf": "^0.9.0",
  "fideloper/proxy": "^4.4",
  "fruitcake/laravel-cors": "^2.0",
  "guzzlehttp/guzzle": "^7.0.1",