diff --git a/app/Enums/UserGender.php b/app/Enums/UserGender.php new file mode 100644 index 0000000..198cb74 --- /dev/null +++ b/app/Enums/UserGender.php @@ -0,0 +1,9 @@ +validated(); + + if (!Auth::attempt($user)) { + return back()->withErrors([ + 'general' => 'شماره موبایل یا رمز عبور اشتباه است.', + ])->withInput(); + } + + $request->session()->regenerate(); + + return redirect()->route('users.dashboard'); + } + } diff --git a/app/Http/Controllers/Auth/LogoutController.php b/app/Http/Controllers/Auth/LogoutController.php index 25f566a..948af54 100644 --- a/app/Http/Controllers/Auth/LogoutController.php +++ b/app/Http/Controllers/Auth/LogoutController.php @@ -4,8 +4,18 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class LogoutController extends Controller { - // + public function index() + { + Auth::logout(); + + Request()->session()->invalidate(); + Request()->session()->regenerateToken(); + + return redirect()->route('index'); + + } } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 79fa756..7f0438d 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers\Auth; use App\Enums\UserStatus; use App\Http\Controllers\Controller; -use App\Http\Requests\RegisterRequest; +use App\Http\Requests\RegisterPostRequest; use App\Models\Province; use App\Models\User; use Illuminate\Http\Request; @@ -22,7 +22,7 @@ class RegisterController extends Controller return view('auth.register',compact('withoutHeader','withoutFooter','withoutHero','provinces')); } - public function post(RegisterRequest $request) + public function post(RegisterPostRequest $request) { $inputs = $request->validated(); diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php new file mode 100644 index 0000000..cefe72d --- /dev/null +++ b/app/Http/Controllers/DashboardController.php @@ -0,0 +1,17 @@ +|string> + */ + public function rules(): array + { + return [ + 'mobile'=>[ + 'required', + 'string', + 'ir_mobile' + ], + 'password'=>[ + 'required', + 'string' + ] + ]; + } +} diff --git a/app/Http/Requests/ProfileUpdateRequest.php b/app/Http/Requests/ProfileUpdateRequest.php new file mode 100644 index 0000000..49d52b1 --- /dev/null +++ b/app/Http/Requests/ProfileUpdateRequest.php @@ -0,0 +1,28 @@ +|string> + */ + public function rules(): array + { + return [ + ]; + } +} diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterPostRequest.php similarity index 93% rename from app/Http/Requests/RegisterRequest.php rename to app/Http/Requests/RegisterPostRequest.php index be17aab..40d16a3 100644 --- a/app/Http/Requests/RegisterRequest.php +++ b/app/Http/Requests/RegisterPostRequest.php @@ -6,7 +6,7 @@ use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Rule; -class RegisterRequest extends FormRequest +class RegisterPostRequest extends FormRequest { /** * Determine if the user is authorized to make this request. @@ -41,7 +41,7 @@ class RegisterRequest extends FormRequest 'national_code' => [ 'required', 'unique:users,national_code', - 'ir_national_id' +// 'ir_national_id' ], 'gender' => [ @@ -72,7 +72,8 @@ class RegisterRequest extends FormRequest 'username' => [ 'required', - 'unique:users,username' + 'unique:users,username', + 'regex:/^[A-Za-z0-9]+$/', ], 'image' => [ 'nullable', diff --git a/public/uploads/users/1786859789.jpg b/public/uploads/users/1786859789.jpg new file mode 100644 index 0000000..1c2daa2 Binary files /dev/null and b/public/uploads/users/1786859789.jpg differ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index a98d5d1..c5c328c 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,85 +1,189 @@ @extends('layouts.app') + @section('content') +
+
-
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
@endsection diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php index 41fc35a..699c099 100644 --- a/resources/views/layouts/header.blade.php +++ b/resources/views/layouts/header.blade.php @@ -1050,41 +1050,27 @@
  • - اولویت ها + پروفایل + +
    • +
  • + + تغییر رمز عبور
  • - اطلاعیه +علاقه مندی ها
  • - روش های پرداخت + نظرات قبلی
    • -
  • - - مسافران - -
    • - -
  • - - تاریخچه سفر - -
    • - -
  • - - علاقه‌مندی‌ها - -
    • - -
  • @csrf diff --git a/resources/views/users/dashboard.blade.php b/resources/views/users/dashboard.blade.php new file mode 100644 index 0000000..8970743 --- /dev/null +++ b/resources/views/users/dashboard.blade.php @@ -0,0 +1,111 @@ +@extends('layouts.app') + +@section('content') + +
    + +
    + +
    + +
    + +
    + پنل کاربری +
    + +
    + + + +
    + +
    + +
    + + +
    + +
    + +
    + داشبورد +
    + +
    + +

    + سلام {{ $user->first_name }} {{ $user->last_name }} 👋 +

    + +

    + به پنل کاربری خود خوش آمدید. +

    + +
    + +

    + نام کاربری: + {{ $user->username }} +

    + +

    + ایمیل: + {{ $user->email }} +

    + +

    + موبایل: + {{ $user->mobile }} +

    + +
    + +
    + +
    + +
    + +
    + +@endsection diff --git a/resources/views/users/favorite/index.blade.php b/resources/views/users/favorite/index.blade.php new file mode 100644 index 0000000..c510322 --- /dev/null +++ b/resources/views/users/favorite/index.blade.php @@ -0,0 +1,3 @@ +
    + +
    diff --git a/resources/views/users/profile/edit.blade.php b/resources/views/users/profile/edit.blade.php new file mode 100644 index 0000000..49e432a --- /dev/null +++ b/resources/views/users/profile/edit.blade.php @@ -0,0 +1,3 @@ +
    + +
    diff --git a/routes/web.php b/routes/web.php index a634e19..7e39222 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,8 +1,18 @@ name('index'); + +Route::prefix('users')->name('users.')->middleware('auth:web')->group(function (){ + Route::get('/',[DashboardController::class,'index'])->name('dashboard'); + + Route::get('/profile/edit',[ProfileController::class,'edite'])->name('profile.edit'); + Route::put('/profile/update',[ProfileController::class,'update'])->name('profile.update'); + +});