diff --git a/app/Http/Controllers/Auth/AuthenticationController.php b/app/Http/Controllers/Auth/AuthenticationController.php index 4caf782..1db03b9 100644 --- a/app/Http/Controllers/Auth/AuthenticationController.php +++ b/app/Http/Controllers/Auth/AuthenticationController.php @@ -18,7 +18,7 @@ class AuthenticationController extends Controller public function __construct() { $this->path = config('app.client_path'); - $ads = Advertisements::where('status', 1)->where('parent_advertisement',0)->get(); + $ads = Advertisements::where('status', 1)->where('parent_advertisement', 0)->get(); $headerMenuItems = Menuitems::where(['parent_menu' => 0, "status" => 1, "menulocations_id" => 1])->with('children')->orderBy('display_order')->get(); $footerMenuItems = Menuitems::where(['parent_menu' => 0, "status" => 1, "menulocations_id" => 2])->with('children')->orderBy('display_order')->get(); $latestNews = News::where('status', 1)->inRandomOrder()->limit(4)->get(); @@ -32,32 +32,45 @@ class AuthenticationController extends Controller public function login() { - return view($this->path.'.auth.login'); + return view($this->path . '.auth.login'); } public function register() { - return view($this->path.'.auth.registration'); + return view($this->path . '.auth.registration'); } public static function store(Request $request) { - dd($request->all()); $request->validate([ 'name' => ['required', 'string', 'max:255'], 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], - 'password' => ['required', 'string', 'min:8', 'confirmed'], + 'password' => ['required', 'string', 'min:8'], + 'phone' => ['required', 'integer'], ]); User::create([ 'name' => $request->name, 'email' => $request->email, 'password' => bcrypt($request->password), - 'username' => $request->name - ]); + 'username' => $request->name, + 'phone' => $request->phone, + 'status' => 1, + 'email_verified_at' => now() + ])->assignRole('user'); - $credentials = $request->only('email', 'password'); - if (Auth::attempt($credentials)) { + return response()->json(['success' => true, 'message' => 'User created successfully!', 'redirect_url' => route('userLogin')]); + } + + + public static function authenticate(Request $request) + { + $credentials = $request->validate([ + 'email' => ['required', 'string', 'email', 'max:255'], + 'password' => ['required', 'string', 'min:8'], + ]); + $remember = $request->has('remember_me') ? true : false; + if (Auth::attempt($credentials, $remember)) { $request->session()->regenerate(); return response()->json([ 'success' => true, @@ -71,32 +84,12 @@ class AuthenticationController extends Controller ]); } - public static function authenticate(Request $request){ - $credentials = $request->validate([ - 'email' => ['required', 'string', 'email', 'max:255'], - 'password' => ['required', 'string', 'min:8'], - ]); - $remember = $request->has('remember_me') ? true : false; - if (Auth::attempt($credentials, $remember)) { - $request->session()->regenerate(); - return response()->json([ - 'success' => true, - 'message' => 'You have successfully logged in!', - 'redirect_url' => route('home') - ]); - } - return response()->json([ - 'success' => false, - 'message' => 'The provided credentials do not match our records.' - ]); - } - - public static function logout(Request $request){ + public static function logout(Request $request) + { Auth::logout(); $request->session()->invalidate(); $request->session()->regenerateToken(); return redirect()->route('userLogin'); - } } diff --git a/app/Http/Controllers/NewscategoriesController.php b/app/Http/Controllers/NewscategoriesController.php index 41dab1a..f2d3761 100644 --- a/app/Http/Controllers/NewscategoriesController.php +++ b/app/Http/Controllers/NewscategoriesController.php @@ -23,6 +23,8 @@ class NewscategoriesController extends Controller { $this->modelService = new CommonModelService($model); $this->newsCategoriesRepository = $newsCategoriesRepository; + + } public function index(Request $request) { diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 494c050..6bd7139 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -40,7 +40,7 @@ class Kernel extends HttpKernel 'api' => [ // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, - \Illuminate\Routing\Middleware\ThrottleRequests::class.':api', + \Illuminate\Routing\Middleware\ThrottleRequests::class . ':api', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], ]; @@ -64,5 +64,8 @@ class Kernel extends HttpKernel 'signed' => \App\Http\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, + 'role' => \Spatie\Permission\Middleware\RoleMiddleware::class, + 'permission' => \Spatie\Permission\Middleware\PermissionMiddleware::class, + 'role_or_permission' => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class, ]; } diff --git a/app/Models/User.php b/app/Models/User.php index f174341..85a42d5 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -21,6 +21,7 @@ class User extends Authenticatable protected $fillable = [ 'name', 'email', + 'phone', 'username', 'password', ]; diff --git a/database/migrations/2024_06_20_105821_add_phone_on_users_table.php b/database/migrations/2024_06_20_105821_add_phone_on_users_table.php new file mode 100644 index 0000000..234c514 --- /dev/null +++ b/database/migrations/2024_06_20_105821_add_phone_on_users_table.php @@ -0,0 +1,28 @@ +string('phone')->nullable()->after('username'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('phone'); + }); + } +}; diff --git a/resources/views/hulaki_khabar/Auth/login.blade.php b/resources/views/hulaki_khabar/Auth/login.blade.php index f15e35c..72243fc 100644 --- a/resources/views/hulaki_khabar/Auth/login.blade.php +++ b/resources/views/hulaki_khabar/Auth/login.blade.php @@ -12,6 +12,8 @@ + + @@ -19,19 +21,20 @@

लगइन फर्म

-
+ + @csrf
- +
- +
- +
@@ -48,7 +51,6 @@
@endsection - @push('js') + }); +}); + + @endpush diff --git a/resources/views/hulaki_khabar/layout/layout.blade.php b/resources/views/hulaki_khabar/layout/layout.blade.php index 8e33de7..f5df9ba 100644 --- a/resources/views/hulaki_khabar/layout/layout.blade.php +++ b/resources/views/hulaki_khabar/layout/layout.blade.php @@ -66,6 +66,7 @@ +