From 1bd1668d736cc28c6481e412fc05e071f848faab Mon Sep 17 00:00:00 2001 From: Babul Akter Date: Thu, 4 Nov 2021 17:39:30 +0600 Subject: [PATCH] update --- app/Http/Controllers/SuperAdminController.php | 251 ++++++++++++++++++ app/Http/Controllers/admincontroller.php | 27 +- app/Http/Controllers/paymentController.php | 12 + app/Http/Kernel.php | 1 + app/Http/Middleware/AuthSuperAdmin.php | 29 ++ app/Http/Middleware/authAdmin.php | 4 +- app/Models/monthPayment.php | 11 + ..._02_183752_create_month_payments_table.php | 44 +++ resources/views/admin/admintemplate.blade.php | 11 +- resources/views/admin/complain.blade.php | 2 +- resources/views/admin/desboard.blade.php | 63 +++-- resources/views/admin/feedback.blade.php | 2 +- resources/views/admin/payment.blade.php | 65 +++++ resources/views/admin/remove_driver.blade.php | 24 +- .../customer/CustomerPageTemplate.blade.php | 2 +- resources/views/customer/payment.blade.php | 2 +- .../views/driver/driver_tamplate.blade.php | 4 +- .../superadmin/SuperAdminTemplate.blade.php | 203 ++++++++++++++ .../superadmin/SuperAdmin_desboard.blade.php | 125 +++++++++ .../SuperAdmin_driverprofile.blade.php | 75 ++++++ .../superadmin/SuperAdmin_profile.blade.php | 71 +++++ .../SuperAdmin_userProfile.blade.php | 131 +++++++++ .../superadmin/Super_admin_feedback.blade.php | 30 +++ .../superadmin/Super_customer_list.blade.php | 39 +++ .../superadmin/Super_driver_list.blade.php | 37 +++ .../views/superadmin/add_admin.blade.php | 91 +++++++ .../views/superadmin/adminList.blade.php | 35 +++ .../views/superadmin/remove_admin.blade.php | 80 ++++++ .../super_customer_complain.blade.php | 27 ++ .../superadmin_garbage_status.blade.php | 8 + .../superadmin_password_reset.blade.php | 74 ++++++ .../superadmin_update_profile.blade.php | 130 +++++++++ .../superadmin/user_profile_admin.blade.php | 78 ++++++ .../usermanual/customer_feedback.blade.php | 2 +- .../usermanual/login/superadmin.blade.php | 2 +- .../views/usermanual/registration.blade.php | 16 +- routes/web.php | 56 +++- 37 files changed, 1808 insertions(+), 56 deletions(-) create mode 100644 app/Http/Controllers/SuperAdminController.php create mode 100644 app/Http/Middleware/AuthSuperAdmin.php create mode 100644 app/Models/monthPayment.php create mode 100644 database/migrations/2021_11_02_183752_create_month_payments_table.php create mode 100644 resources/views/admin/payment.blade.php create mode 100644 resources/views/superadmin/SuperAdminTemplate.blade.php create mode 100644 resources/views/superadmin/SuperAdmin_desboard.blade.php create mode 100644 resources/views/superadmin/SuperAdmin_driverprofile.blade.php create mode 100644 resources/views/superadmin/SuperAdmin_profile.blade.php create mode 100644 resources/views/superadmin/SuperAdmin_userProfile.blade.php create mode 100644 resources/views/superadmin/Super_admin_feedback.blade.php create mode 100644 resources/views/superadmin/Super_customer_list.blade.php create mode 100644 resources/views/superadmin/Super_driver_list.blade.php create mode 100644 resources/views/superadmin/add_admin.blade.php create mode 100644 resources/views/superadmin/adminList.blade.php create mode 100644 resources/views/superadmin/remove_admin.blade.php create mode 100644 resources/views/superadmin/super_customer_complain.blade.php create mode 100644 resources/views/superadmin/superadmin_garbage_status.blade.php create mode 100644 resources/views/superadmin/superadmin_password_reset.blade.php create mode 100644 resources/views/superadmin/superadmin_update_profile.blade.php create mode 100644 resources/views/superadmin/user_profile_admin.blade.php diff --git a/app/Http/Controllers/SuperAdminController.php b/app/Http/Controllers/SuperAdminController.php new file mode 100644 index 0000000..dcda53d --- /dev/null +++ b/app/Http/Controllers/SuperAdminController.php @@ -0,0 +1,251 @@ +validate([ + + 'email' =>'required |email ', + 'password' =>'required| min:5|max:12' + + ]); + + $userinfo = superadmin:: where('email','=', $request->email)->first(); + + if(!$userinfo){ + return back()->with('fail','we do not recognize your email address'); + } + else{ + if(Hash::check($request->password, $userinfo->password)){ + + $request->session()->put('loggedUser',$userinfo->id); + return redirect('/SuperAdmin_profile'); + } + else{ + return back()->with('fail','incorrect password'); + } + } + + + + + } + + public function SuperAdmin_profile(){ + + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + return view('superadmin.SuperAdmin_profile', $data); + } + + public function Super_customer_list(){ + + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + $customer= customer::orderBy('id')->get(); + return view('superadmin.Super_customer_list', $data)->with('customer', $customer); + } + + public function adminList(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + $admin= admin::orderBy('id')->get(); + return view('superadmin.adminList',$data)->with('admin', $admin); + } + + public function user_profile_admin(Request $email){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + $dt =admin::where('email' , '=', $email->email)->first(); + + return view('superadmin.user_profile_admin',$data)->with('user',$dt); + } + + + public function remove_admin(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + $request = admin::orderBy('id')->get(); + + + return view('superadmin.remove_admin',$data)->with('request',$request); + } + + public function admin_delete(Request $request){ + + $data= admin::where('email','=', $request->email)->first(); + $delete= $data->delete(); + + if($delete){ + return back()->with('success','successfully Removed!!'); + } + else{ + return back()->with('fail','somthing is wrong'); + } + + } + + public function add_admin(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + return view('superadmin.add_admin',$data); + } + + public function AddeAdmin(Request $request){ + $request->validate([ + + 'name' => 'required', + 'email' =>'required |email| unique:drivers', + 'password' =>'required| min:5|max:12' + + ]); + + + $admin = new admin; + + $admin->name= $request->name; + $admin->email= $request->email; + + $admin->password= \Hash::make($request->password); + $admin->cont_no= $request->cont; + + $admin->zone= $request->area; + $admin->rank= $request->rank; + $save = $admin->save(); + + if($save){ + return back()->with('success','successfully Added Admin'); + } + else{ + return back()->with('fail','somthing is wrong'); + } + + + } + + public function Super_driver_list(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + $driver= driver::orderBy('id')->get(); + return view('superadmin.Super_driver_list',$data)->with('driver', $driver); + } + + public function super_customer_complain(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + $fdback = feedback::orderBy('id')->get(); + return view('superadmin.super_customer_complain',$data)->with('fdback', $fdback); + } + + public function Super_admin_feedback(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + $fdback = feedback::orderBy('id')->get(); + return view('superadmin.Super_admin_feedback',$data)->with('fdback', $fdback); + } + + + public function SuperAdmin_desboard(){ + $data= ['loggedUser' =>admin::where('id', '=',session('loggedUser'))->first()]; + $payment = monthPayment::where('id','=','1')->first(); + $customerRequest= customer_request::orderBy('id')->get(); + $recharge= CardRecharge::orderBy('id')->get(); + return view('superadmin.SuperAdmin_desboard',$data)->with(compact([ 'payment' ,'customerRequest' ,'recharge' ])); + } + + + public function superadmin_garbage_status(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + return view('superadmin.superadmin_garbage_status',$data); + } + + + public function superadmin_update_profile(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + return view('superadmin.superadmin_update_profile',$data); + } + + public function superadmin_password_reset(){ + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + return view('superadmin.superadmin_password_reset',$data); + } + + public function SuperAdmin_userProfile( Request $email) + { + + + $dt =customer::where('email' , '=', $email->email)->first(); + + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + + //return view('admin.user_profile',$data)->with('email',$email); + return view('superadmin.SuperAdmin_userProfile',$data)->with('user',$dt); + } + + + public function SuperAdmin_driverprofile( Request $email){ + + $data= ['loggedUser' =>superadmin::where('id', '=',session('loggedUser'))->first()]; + $dt =driver::where('email' , '=', $email->email)->first(); + + return view('superadmin.SuperAdmin_driverprofile',$data)->with('user',$dt); + } + + public function superadmin_password_update(Request $request){ + + $data= superadmin::where('id', '=',session('loggedUser'))->first(); + + $request->validate([ + + 'old' =>'required |min:5|max:12 ', + 'new' =>'required |min:5|max:12 ', + 'confirm' =>'required |min:5|max:12 ' + ]); + + + if(Hash::check($request->old, $data->password)){ + + + if($request->new != $request->confirm){ + return back()->with('fail','password not mathcing'); + } + else{ + + if( $request->new == $request->old) + { + return back()->with('fail','You dont use old password!!!'); + } + + else { + $data->password= \Hash::make($request->new); + + $save= $data->save(); + if($save) return back()->with('success','Password Changed'); + else return back()->with('fail','Something is wrong'); + } + + } + } + else { + return back()->with('fail','incorrect password'); + } + + } + + + +} diff --git a/app/Http/Controllers/admincontroller.php b/app/Http/Controllers/admincontroller.php index 77d414e..f3d40dc 100644 --- a/app/Http/Controllers/admincontroller.php +++ b/app/Http/Controllers/admincontroller.php @@ -6,8 +6,11 @@ use Illuminate\Http\Request; use App\Models\feedback; use App\Models\customer; +use App\Models\CardRecharge; +use App\Models\monthPayment; use App\Models\customer_request; use App\Models\driver; +use App\Models\payment; use App\Models\map; use Illuminate\Support\Facades\Hash; @@ -81,6 +84,18 @@ public function update_formal_info(Request $request){ return back()->with('fail','somthing is wrong'); } + } + public function remove_drivers( Request $request){ + $data= driver::where('email', '=', $request->email)->first(); + + $delete= $data->delete(); + if($delete){ + return back()->with('success','successfully Removed!!'); + } + else{ + return back()->with('fail','somthing is wrong'); + } + } public function update_address(Request $request){ @@ -183,7 +198,10 @@ public function update_profile(){ public function desboard(){ $data= ['loggedUser' =>admin::where('id', '=',session('loggedUser'))->first()]; - return view('admin.desboard',$data); + $payment = monthPayment::where('id','=','1')->first(); + $customerRequest= customer_request::orderBy('id')->get(); + $recharge= CardRecharge::orderBy('id')->get(); + return view('admin.desboard',$data)->with(compact([ 'payment' ,'customerRequest' ,'recharge' ])); } @@ -306,4 +324,11 @@ public function garbage_status(){ return view('admin.garbage_status', $data)->with(compact(['data','location','marker'])); } + + public function checkpayment(){ + $data= ['loggedUser' =>admin::where('id', '=',session('loggedUser'))->first()]; + $dt= payment::orderBy('id')->get(); + + return view('admin.payment',$data)->with('dt',$dt); + } } diff --git a/app/Http/Controllers/paymentController.php b/app/Http/Controllers/paymentController.php index 3bd4096..bb456e2 100644 --- a/app/Http/Controllers/paymentController.php +++ b/app/Http/Controllers/paymentController.php @@ -4,6 +4,7 @@ use App\Models\payment; use App\Models\customer; use App\Models\card; +use App\Models\monthPayment; use Illuminate\Support\Facades\Hash; use Illuminate\Http\Request; @@ -27,6 +28,17 @@ public function payment(Request $request){ $cards->save(); $payment = new payment; + + $tk = monthPayment::where('id','=','1')->first(); + + $td=$request->months; + + + + + $tk->$td= $tk->$td+ $request->amount; + + $tk->save(); $save = $cards->save(); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 89675f9..0e62773 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -57,6 +57,7 @@ class Kernel extends HttpKernel 'AuthCustomer' => \App\Http\Middleware\AuthCustomer::class, 'AuthAdmin' => \App\Http\Middleware\authAdmin::class, 'AuthDriver' => \App\Http\Middleware\AuthDriver::class, + 'AuthSuperAdmin' => \App\Http\Middleware\AuthSuperAdmin::class, 'geust' => \App\Http\Middleware\geust::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, diff --git a/app/Http/Middleware/AuthSuperAdmin.php b/app/Http/Middleware/AuthSuperAdmin.php new file mode 100644 index 0000000..850d06c --- /dev/null +++ b/app/Http/Middleware/AuthSuperAdmin.php @@ -0,0 +1,29 @@ +has('loggedUser') && ($request->path()=='SuperAdmin_profile' || $request->path()=='Super_customer_list' || $request->path()=='adminList' || $request->path()=='remove_admin' || $request->path()=='add_admin' || $request->path()=='Super_driver_list' || $request->path()=='super_customer_complain' || $request->path()=='Super_admin_feedback' || $request->path()=='SuperAdmin_desboard' || $request->path()=='superadmin_garbage_status' || $request->path()=='superadmin_update_profile' || $request->path()=='superadmin_password_reset' || $request->path()=='SuperAdmin_userProfile' || $request->path()=='SuperAdmin_driver_profile')){ + + return redirect('LoginSuperadmin')->with('fail','You must log in'); + } + if(session()->has('loggedUser') && ($request->path()!='SuperAdmin_profile' && $request->path()!='Super_customer_list' && $request->path()!='adminList' && $request->path()!='remove_admin' && $request->path()!='add_admin' && $request->path()!='Super_driver_list' && $request->path()!='super_customer_complain' && $request->path()!='Super_admin_feedback' && $request->path()!='SuperAdmin_desboard' && $request->path()!='superadmin_garbage_status' && $request->path()!='superadmin_update_profile' && $request->path()!='superadmin_password_reset' && $request->path()!='SuperAdmin_userProfile' && $request->path()!='SuperAdmin_driver_profile' )){ + return back(); //SuperAdmin_driver_profile + } + + return $next($request); + } +} diff --git a/app/Http/Middleware/authAdmin.php b/app/Http/Middleware/authAdmin.php index f43a2be..f81bcbf 100644 --- a/app/Http/Middleware/authAdmin.php +++ b/app/Http/Middleware/authAdmin.php @@ -16,11 +16,11 @@ class authAdmin */ public function handle(Request $request, Closure $next) { - if(!session()->has('loggedUser') && ($request->path()=='admin_profile' || $request->path()=='desboard' || $request->path()=='customer_complain' || $request->path()=='admin_feedback' || $request->path()=='admin_notification' || $request->path()=='admin_massage' || $request->path()=='request_pendin' || $request->path()=='card_rechage' || $request->path()=='customers_list' || $request->path()=='driver_list' || $request->path()=='user_profile' || $request->path()=='admin_logout' || $request->path()=='add_customer'|| $request->path()=='remove_customer' || $request->path()=='add_driver'|| $request->path()=='remove_driver' || $request->path()=='card_request' || $request->path()=='update_profile' || $request->path()=='password_reset' || $request->path()=='user_profile_driver' || $request->path()=='customer_select' || $request->path()=='update_driver_info' || $request->path()=='reset_collection' || $request->path()=='garbage_status')){ + if(!session()->has('loggedUser') && ($request->path()=='admin_profile' || $request->path()=='desboard' || $request->path()=='customer_complain' || $request->path()=='admin_feedback' || $request->path()=='admin_notification' || $request->path()=='admin_massage' || $request->path()=='request_pendin' || $request->path()=='card_rechage' || $request->path()=='customers_list' || $request->path()=='driver_list' || $request->path()=='user_profile' || $request->path()=='admin_logout' || $request->path()=='add_customer'|| $request->path()=='remove_customer' || $request->path()=='add_driver'|| $request->path()=='remove_driver' || $request->path()=='card_request' || $request->path()=='update_profile' || $request->path()=='password_reset' || $request->path()=='user_profile_driver' || $request->path()=='customer_select' || $request->path()=='update_driver_info' || $request->path()=='reset_collection' || $request->path()=='garbage_status' || $request->path()=='checkpayment')){ return redirect('LoginAdmin')->with('fail','You must log in'); } - if(session()->has('loggedUser') && ($request->path()!='admin_profile' && $request->path()!='desboard' && $request->path()!='customer_complain' && $request->path()!='admin_feedback' && $request->path()!='admin_notification' && $request->path()!='admin_massage' && $request->path()!='request_pendin' && $request->path()!='card_rechage' && $request->path()!='customers_list' && $request->path()!='driver_list' && $request->path()!='user_profile' && $request->path()!='admin_logout' && $request->path()!='add_customer'&& $request->path()!='remove_customer' && $request->path()!='add_driver'&& $request->path()!='remove_driver' && $request->path()!='card_request' && $request->path()!='update_profile' && $request->path()!='password_reset' && $request->path()!='user_profile_driver' && $request->path()!='customer_select' && $request->path()!='update_driver_info' && $request->path()!='reset_collection' && $request->path()!='garbage_status')){ + if(session()->has('loggedUser') && ($request->path()!='admin_profile' && $request->path()!='desboard' && $request->path()!='customer_complain' && $request->path()!='admin_feedback' && $request->path()!='admin_notification' && $request->path()!='admin_massage' && $request->path()!='request_pendin' && $request->path()!='card_rechage' && $request->path()!='customers_list' && $request->path()!='driver_list' && $request->path()!='user_profile' && $request->path()!='admin_logout' && $request->path()!='add_customer'&& $request->path()!='remove_customer' && $request->path()!='add_driver'&& $request->path()!='remove_driver' && $request->path()!='card_request' && $request->path()!='update_profile' && $request->path()!='password_reset' && $request->path()!='user_profile_driver' && $request->path()!='customer_select' && $request->path()!='update_driver_info' && $request->path()!='reset_collection' && $request->path()!='garbage_status' && $request->path()!='checkpayment')){ return back(); } return $next($request); diff --git a/app/Models/monthPayment.php b/app/Models/monthPayment.php new file mode 100644 index 0000000..8cfbf47 --- /dev/null +++ b/app/Models/monthPayment.php @@ -0,0 +1,11 @@ +id(); + $table->integer('January')->nullable(); + $table->integer('February')->nullable(); + $table->integer('March')->nullable(); + $table->integer('April')->nullable(); + $table->integer('May')->nullable(); + $table->integer('June')->nullable(); + $table->integer('July')->nullable(); + $table->integer('August')->nullable(); + $table->integer('September')->nullable(); + $table->integer('October')->nullable(); + $table->integer('November')->nullable(); + $table->integer('December')->nullable(); + + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('month_payments'); + } +} diff --git a/resources/views/admin/admintemplate.blade.php b/resources/views/admin/admintemplate.blade.php index ea3b025..9f01084 100644 --- a/resources/views/admin/admintemplate.blade.php +++ b/resources/views/admin/admintemplate.blade.php @@ -52,7 +52,7 @@
- Desboard + Deshboard
@@ -64,12 +64,12 @@
- Conplain + Complain
- Request Pending + Customer Request
@@ -125,6 +125,11 @@
+
+ + Check payment +
+
diff --git a/resources/views/admin/complain.blade.php b/resources/views/admin/complain.blade.php index 9d95b9a..ee02ad3 100644 --- a/resources/views/admin/complain.blade.php +++ b/resources/views/admin/complain.blade.php @@ -4,7 +4,7 @@
-

Customer's FeedBack

+

Customer's Complain

@foreach($fdback as $fdback) diff --git a/resources/views/admin/desboard.blade.php b/resources/views/admin/desboard.blade.php index 15080ad..8b4a41b 100644 --- a/resources/views/admin/desboard.blade.php +++ b/resources/views/admin/desboard.blade.php @@ -5,29 +5,46 @@

Dashboard

+ + January + $payment->February+$payment->March + $payment->April+$payment->May + $payment->June+$payment->July + $payment->August+$payment->September + $payment->October+$payment->November + $payment->December; + $var=0; + $r=0; + + ?> + + +
-
+
-

EARNINGS (MONTHLY)

-

20,000

+

EARNINGS (MONTHLY)

+

{{$payment->November}}

-

EARNINGS (ENNUAL)

-

4,00,000

+

EARNINGS (ENNUAL)

+ +

{{$total}}

-

Request Pending

-

1

+

Request Pending

+

{{$var}}

-

Recharge Pending

-

1

+

Recharge Pending

+

{{$r}}

@@ -40,10 +57,10 @@ Earnings Overview
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ Profile +
+ +
+
+ + Deshboard +
+
+ +
+ + Feedback +
+
+ +
+ + Complain +
+
+ + + +
+ + +
+ + + + +
+ +
+ Admin List + Remove Admin + Add Admin +
+
+
+ + + + +
+
+ + +
+
+ + +
+ +
+ +
+ + + 5 + + + + + + + + + 5 + + +
+
+ +
+ + +
+ +
+ Profile + Update Profile + Change Password +
+ LogOut +
+
+
+ + + +
+ + + +
+ + + + +@yield('content') + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/superadmin/SuperAdmin_desboard.blade.php b/resources/views/superadmin/SuperAdmin_desboard.blade.php new file mode 100644 index 0000000..eeb76dd --- /dev/null +++ b/resources/views/superadmin/SuperAdmin_desboard.blade.php @@ -0,0 +1,125 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +

Dashboard

+ + January + $payment->February+$payment->March + $payment->April+$payment->May + $payment->June+$payment->July + $payment->August+$payment->September + $payment->October+$payment->November + $payment->December; + $var=0; + $r=0; + ?> + + + +
+
+
+

EARNINGS (MONTHLY)

+

{{$payment->November}}

+
+
+
+
+

EARNINGS (ENNUAL)

+ +

{{$total}}

+
+
+ + +
+ +
+ +
+
+
+ Earnings Overview +
+ + + +
+ + +
+
+ +
+
+ Monthly Income ratio +
+
+ + + + +
+ +
+
+ +
+ + +
+ + + + + + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/SuperAdmin_driverprofile.blade.php b/resources/views/superadmin/SuperAdmin_driverprofile.blade.php new file mode 100644 index 0000000..0725ecc --- /dev/null +++ b/resources/views/superadmin/SuperAdmin_driverprofile.blade.php @@ -0,0 +1,75 @@ +@extends('superadmin.SuperAdminTemplate') + +@section('content') + +

Driver's Profile

+
+
+
+
+
+
+
+ +
+
+

General Information

+
+
+ +
+ +

Name

+
{{$user->name}}
+
+ +
+
+
+

Email

+
{{$user->email}}
+
+
+

Phone

+
{{$user->cont_no}}
+
+
+

+

+ +
Formal Information
+ + +
+ +

+
+
+

Bus No

+
{{$user->bus_no}}
+
+ +
+
+
+

Area

+
{{$user->area}}
+
+
+

Rank

+
{{$user->rank}}
+
+
+ +
+
+
+
+
+
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/SuperAdmin_profile.blade.php b/resources/views/superadmin/SuperAdmin_profile.blade.php new file mode 100644 index 0000000..1c1b8ed --- /dev/null +++ b/resources/views/superadmin/SuperAdmin_profile.blade.php @@ -0,0 +1,71 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +

Admin's Profile

+
+
+
+
+
+
+
+ +
+
+

General Information

+
+
+ +
+ +

Name

+
{{$loggedUser['name']}}
+
+ +
+
+
+

Email

+
{{$loggedUser['email']}}
+
+
+

Phone

+
{{$loggedUser['cont_no']}}
+
+
+ + + +

Address

+
+
+

Post

+
{{$loggedUser['post']}}
+
+ +
+
+
+

Thana/UZ

+
{{$loggedUser['Thana']}}
+
+
+

District

+
{{$loggedUser['Dist']}}
+
+
+ +
+
+
+
+
+
+
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/SuperAdmin_userProfile.blade.php b/resources/views/superadmin/SuperAdmin_userProfile.blade.php new file mode 100644 index 0000000..08047f7 --- /dev/null +++ b/resources/views/superadmin/SuperAdmin_userProfile.blade.php @@ -0,0 +1,131 @@ +@extends('superadmin.SuperAdminTemplate') + +@section('content') + +

Customer's Profile

+
+
+
+
+
+
+
+ +
+
+

General Information

+
+
+ +
+ +

Name

+
{{$user->name}}
+
+ +
+
+
+

Email

+
{{$user->email}}
+
+
+

Phone

+
{{$user->cont_no}}
+
+
+

Address

+
+
+

Post

+
{{$user->post}}
+
+ +
+
+
+

Thana/UZ

+
{{$user->Thana}}
+
+
+

District

+
{{$user->Dist}}
+
+
+ +
+
+
+
+
+
+
+
+ +

Customer's Location

+
+ +
+ +
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + +
+ + back + +
+ +
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/superadmin/Super_admin_feedback.blade.php b/resources/views/superadmin/Super_admin_feedback.blade.php new file mode 100644 index 0000000..5df8c84 --- /dev/null +++ b/resources/views/superadmin/Super_admin_feedback.blade.php @@ -0,0 +1,30 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + + +
+

Customer's FeedBack

+
+
+ @foreach($fdback as $fdback) + + +
+ 
+     Name: {{ $fdback->username}}                                  Date:     {{$fdback->created_at}}
+ 
+     FeedBack:    {{$fdback->feedback}}  
+     Explain: {{$fdback->discrive}}   
+      
+
+
+
+ + +@endforeach +
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/Super_customer_list.blade.php b/resources/views/superadmin/Super_customer_list.blade.php new file mode 100644 index 0000000..1cfa484 --- /dev/null +++ b/resources/views/superadmin/Super_customer_list.blade.php @@ -0,0 +1,39 @@ +@extends('superadmin.SuperAdminTemplate') + +@section('content') + +
+

Customer List

+
+
+ @foreach($customer as $customer) + + + +
+ +
+

Name : {{$customer->name}}

+

Phone : {{$customer->cont_no}}

+

Member from {{$customer->updated_at}}

+
+ @csrf + + + + +
+ +
+
+ + + + +@endforeach +
+
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/Super_driver_list.blade.php b/resources/views/superadmin/Super_driver_list.blade.php new file mode 100644 index 0000000..6935243 --- /dev/null +++ b/resources/views/superadmin/Super_driver_list.blade.php @@ -0,0 +1,37 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + + +
+

Driver List

+
+
+ @foreach($driver as $driver) + + + +
+ +
+

Name : {{$driver->name}}

+

Phone : {{$driver->cont_no}}

+

Member from {{$driver->updated_at}}

+ +
+ @csrf + + + + +
+ +
+
+ +@endforeach +
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/add_admin.blade.php b/resources/views/superadmin/add_admin.blade.php new file mode 100644 index 0000000..3ff3506 --- /dev/null +++ b/resources/views/superadmin/add_admin.blade.php @@ -0,0 +1,91 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +

Add Admin

+
+
+
+
+ @if(Session::get('success')) +
+ {{ Session::get('success')}} + @endif + + @if(Session::get('fail')) +
+ {{ Session::get('fail')}} + @endif + + @csrf + +
+
+
+
+
+
General Information
+
+
+

Name

+
+
+
+
+

Email

+
+
+
+
+

Onetime Password

+
+
+
+ +
+ +
+ + +
+
+
+ +
+ +
+

Phone

+
+
+
+
+
Formal Info
+
+ +
+
+

Area

+
+
+
+

Rank

+
+
+
+ + +
+ +
+ +
+
+
+
+
+
+ +
+ + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/adminList.blade.php b/resources/views/superadmin/adminList.blade.php new file mode 100644 index 0000000..4935209 --- /dev/null +++ b/resources/views/superadmin/adminList.blade.php @@ -0,0 +1,35 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +
+

Admin List

+
+
+ @foreach($admin as $admin) + + + +
+ +
+

Name : {{$admin->name}}

+

Phone : {{$admin->cont_no}}

+

Member from {{$admin->updated_at}}

+ +
+ @csrf + + + + +
+
+
+ +@endforeach +
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/remove_admin.blade.php b/resources/views/superadmin/remove_admin.blade.php new file mode 100644 index 0000000..6ae1110 --- /dev/null +++ b/resources/views/superadmin/remove_admin.blade.php @@ -0,0 +1,80 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +
+ @if(Session::get('success')) +
+ {{ Session::get('success')}} + @endif + + @if(Session::get('fail')) +
+ {{ Session::get('fail')}} + @endif + +

Admin Remove

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach($request as $request) + + + + + + + + + + + + + + + @endforeach + +
Serial NoGeneral InformationFormal InfoActoin
NameArea Phone NoThanaHome TwonRank
{{$count++}} {{$request->name}} {{$request->zone}} {{$request->cont_no}} {{$request->Thana}} {{$request->Dist}} {{$request->rank}} +
+ @csrf + + + + +
+ +
+
+ + +
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/super_customer_complain.blade.php b/resources/views/superadmin/super_customer_complain.blade.php new file mode 100644 index 0000000..3b89400 --- /dev/null +++ b/resources/views/superadmin/super_customer_complain.blade.php @@ -0,0 +1,27 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +
+

Customer's Complain

+
+
+ @foreach($fdback as $fdback) + + +
+ 
+     Name: {{ $fdback->name}}                                  Date:     {{$fdback->created_at}}
+     
+     Type:    {{$fdback->type}}  
+     Complain: {{$fdback->complain}}   
+     Customer Profile  
+
+
+
+ + +@endforeach +
+
+@endsection \ No newline at end of file diff --git a/resources/views/superadmin/superadmin_garbage_status.blade.php b/resources/views/superadmin/superadmin_garbage_status.blade.php new file mode 100644 index 0000000..cf64dc1 --- /dev/null +++ b/resources/views/superadmin/superadmin_garbage_status.blade.php @@ -0,0 +1,8 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +garbage + + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/superadmin_password_reset.blade.php b/resources/views/superadmin/superadmin_password_reset.blade.php new file mode 100644 index 0000000..5cc499c --- /dev/null +++ b/resources/views/superadmin/superadmin_password_reset.blade.php @@ -0,0 +1,74 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + + Change Password + +
+
+ + + +
+
+
+
+
+
+ + +
+
+ @if(Session::get('success')) +
+ {{ Session::get('success')}} + @endif + + @if(Session::get('fail')) +
+ {{ Session::get('fail')}} + @endif + + @csrf +
+ +

Update Password

+
+
+

Old Password

+
@error('old'){{$message}} @enderror +
+ +

+
+
+

New Password

+
+ + @error('new'){{$message}} @enderror +
+
+

Confirm Password

+
+ @error('confirm'){{$message}} @enderror +
+
+
+ +
+ +
+ +
+
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/superadmin_update_profile.blade.php b/resources/views/superadmin/superadmin_update_profile.blade.php new file mode 100644 index 0000000..b52b51e --- /dev/null +++ b/resources/views/superadmin/superadmin_update_profile.blade.php @@ -0,0 +1,130 @@ + @extends('superadmin.SuperAdminTemplate') + +@section('content') + +

Update Profile

+
+
+
+
+
+
+ @if(Session::get('success')) +
+ {{ Session::get('success')}} + @endif + + @if(Session::get('fail')) +
+ {{ Session::get('fail')}} + @endif + +
+ +
+
+

General Information

+
+ + +
+ @csrf +
+ +
+ +

Name

+

+
+ +
+
+
+

Email

+

+
+
+

Phone

+

+
+
+
+ + +
+ +
+

Formal Information

+
+ @csrf +
+ +
+

Zone

+

+
+ +
+
+
+

Rank

+

+
+ +
+
+ + +
+ +
+ +
+ @csrf +

Address

+
+
+

Post

+

+
+ +
+
+
+

Thana/UZ

+

+
+
+

District

+

+
+
+ +
+ + +
+ +
+ +
+
+
+
+
+
+
+
+
+ + +@endsection \ No newline at end of file diff --git a/resources/views/superadmin/user_profile_admin.blade.php b/resources/views/superadmin/user_profile_admin.blade.php new file mode 100644 index 0000000..62d3541 --- /dev/null +++ b/resources/views/superadmin/user_profile_admin.blade.php @@ -0,0 +1,78 @@ +@extends('superadmin.SuperAdminTemplate') + +@section('content') + +

Admin's Profile

+
+
+
+
+
+
+
+ +
+
+

General Information

+
+
+ +
+ +

Name

+
{{$user->name}}
+
+ +
+
+
+

Email

+
{{$user->email}}
+
+
+

Phone

+
{{$user->cont_no}}
+
+
+

+

+ +
Formal Information
+
Edit +
+ +
+ +

+
+
+

Home Town

+
{{$user->Dist}}
+
+ +
+
+
+

Area

+
{{$user->zone}}
+
+
+

Rank

+
{{$user->rank}}
+
+
+ +
+
+
+
+
+
+
+
+ + + +@endsection \ No newline at end of file diff --git a/resources/views/usermanual/customer_feedback.blade.php b/resources/views/usermanual/customer_feedback.blade.php index a2909c7..f6c0133 100644 --- a/resources/views/usermanual/customer_feedback.blade.php +++ b/resources/views/usermanual/customer_feedback.blade.php @@ -19,7 +19,7 @@ FeedBack: {{$data->feedback}} Explain: {{$data->discrive}} - like {{$data->like}} +
diff --git a/resources/views/usermanual/login/superadmin.blade.php b/resources/views/usermanual/login/superadmin.blade.php index 56628be..3216889 100644 --- a/resources/views/usermanual/login/superadmin.blade.php +++ b/resources/views/usermanual/login/superadmin.blade.php @@ -15,7 +15,7 @@

SuperAdmin Login

-
+ @if(Session::get('fail'))
diff --git a/resources/views/usermanual/registration.blade.php b/resources/views/usermanual/registration.blade.php index f52de30..2098d80 100644 --- a/resources/views/usermanual/registration.blade.php +++ b/resources/views/usermanual/registration.blade.php @@ -8,20 +8,8 @@
-

Read it Before Sing up

-
-
Do you know about our service ?
-
Are you willing to take our services?
-

-
    - -
  • Enter your valided gmail
    • -
  • Please Enter your active phone number.
    • - -
  • After registration , login Your account and update your profile. then we communicate with you.
    • - -
- + +
diff --git a/routes/web.php b/routes/web.php index 93f5916..f8c35aa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -104,6 +104,8 @@ Route::post('/reset','mapController@reset')->name('reset'); +Route::post('/remove_drivers','admincontroller@remove_drivers')->name('remove_drivers'); + /// Driver @@ -119,6 +121,24 @@ /// ----------------X ------------- + /// -------------SUPER ADMIN -------------- + + Route::post('/SuperAdminLogin','SuperAdminController@SuperAdminLogin')->name('SuperAdminLogin'); + + Route::post('/SuperAdmin_userProfile','SuperAdminController@SuperAdmin_userProfile')->name('SuperAdmin_userProfile'); + + Route::post('/SuperAdmin_driverprofile','SuperAdminController@SuperAdmin_driverprofile')->name('SuperAdmin_driverprofile'); + + Route::post('/user_profile_admin','SuperAdminController@user_profile_admin')->name('user_profile_admin'); + + Route::post('/admin_delete','SuperAdminController@admin_delete')->name('admin_delete'); + Route::post('/AddeAdmin','SuperAdminController@AddeAdmin')->name('AddeAdmin'); + + Route::post('/superadmin_password_update','SuperAdminController@superadmin_password_update')->name('superadmin_password_update'); + + +/// --------------------X------------- + /// -----------GET Route ---------- @@ -211,7 +231,7 @@ Route::get('/desboard','admincontroller@desboard'); - Route::get('/customer_complain','complainController@user_complain'); +Route::get('/customer_complain','complainController@user_complain'); Route::get('/admin_feedback','feedbackController@admin_feedback'); Route::get('/admin_notification','admincontroller@admin_notification'); @@ -245,8 +265,12 @@ Route::get('/reset_collection','admincontroller@reset_collection'); Route::get('/garbage_status','admincontroller@garbage_status'); + Route::get('/checkpayment','admincontroller@checkpayment'); + }); +//checkpayment + /// Driver @@ -264,4 +288,32 @@ Route::get('/viewroute','DriverController@viewroute')->name('viewroute'); -}); \ No newline at end of file +}); + + +Route::middleware(['AuthSuperAdmin'])->group(function(){ + + + Route::get('/SuperAdmin_profile','SuperAdminController@SuperAdmin_profile')->name('SuperAdmin_profile'); + + Route::get('/Super_customer_list','SuperAdminController@Super_customer_list')->name('Super_customer_list'); +Route::get('/adminList','SuperAdminController@adminList')->name('adminList'); + +Route::get('/remove_admin','SuperAdminController@remove_admin')->name('remove_admin'); + +Route::get('/add_admin','SuperAdminController@add_admin')->name('add_admin'); + +Route::get('/Super_driver_list','SuperAdminController@Super_driver_list')->name('Super_driver_list'); +Route::get('/super_customer_complain','SuperAdminController@super_customer_complain')->name('super_customer_complain'); + +Route::get('/Super_admin_feedback','SuperAdminController@Super_admin_feedback')->name('Super_admin_feedback'); + +Route::get('/SuperAdmin_desboard','SuperAdminController@SuperAdmin_desboard')->name('SuperAdmin_desboard'); + +Route::get('/superadmin_garbage_status','SuperAdminController@superadmin_garbage_status')->name('superadmin_garbage_status'); + +Route::get('/superadmin_update_profile','SuperAdminController@superadmin_update_profile')->name('superadmin_update_profile'); + +Route::get('/superadmin_password_reset','SuperAdminController@superadmin_password_reset')->name('superadmin_password_reset'); + +}); \ No newline at end of file