diff --git a/app/Http/Controllers/Admin/ActivityLogController.php b/app/Http/Controllers/Admin/ActivityLogController.php index 4e523b3..2572782 100644 --- a/app/Http/Controllers/Admin/ActivityLogController.php +++ b/app/Http/Controllers/Admin/ActivityLogController.php @@ -8,8 +8,7 @@ use Illuminate\Http\Request; class ActivityLogController extends Controller { - // - public function index() + public function index() { $logs=ActivityLog::with('admin') ->latest() diff --git a/app/Http/Controllers/Admin/Auth/AuthController.php b/app/Http/Controllers/Admin/Auth/AuthController.php index e90a69b..10b4f07 100644 --- a/app/Http/Controllers/Admin/Auth/AuthController.php +++ b/app/Http/Controllers/Admin/Auth/AuthController.php @@ -18,20 +18,21 @@ class AuthController extends Controller } public function loginPost(LoginPostRequest $request) { - $loginData=$request->validated(); + $login=$request->validated(); $admins=Admin::query() ->where('username',$request->input('username')) ->where('status',AdminStatus::Active) ->first(); - if (!$admins){ + if (!$admins || !\Hash::check($login['password'],$admins->password)){ return back()->withErrors([ 'general' => 'اطلاعات وارد شده نامعتبر است' ]); } Auth::guard('admin')->login($admins); + $request->session()->regenerate(); return redirect()->route('admin.dashboard.index'); } diff --git a/app/Http/Controllers/Admin/FlightController.php b/app/Http/Controllers/Admin/FlightController.php index 62ccdac..9eb39b5 100644 --- a/app/Http/Controllers/Admin/FlightController.php +++ b/app/Http/Controllers/Admin/FlightController.php @@ -24,14 +24,10 @@ class FlightController extends Controller return view('admin.flights.index', compact('flights')); } - - public function create() { return view('admin.flights.create'); } - - public function store(FlightStoreRequest $request) { DB::beginTransaction(); @@ -46,8 +42,6 @@ class FlightController extends Controller )->formatGregorian('Y-m-d'); } - - if ($request->hasFile('image')) { $data['image'] = $request @@ -70,7 +64,6 @@ class FlightController extends Controller DB::commit(); - return redirect() ->route('admin.flights.index') ->with('success','پرواز ثبت شد'); @@ -84,14 +77,10 @@ class FlightController extends Controller } } - - - public function edit(Flight $flight) { return view('admin.flights.edit',compact('flight')); } - public function update(FlightStoreRequest $request, Flight $flight) { @@ -118,12 +107,9 @@ class FlightController extends Controller ->delete($flight->image); } - - $data['image'] = $request ->file('image') ->store('flights','public'); - } $data['updated_by'] = auth('admin')->id(); @@ -140,12 +126,10 @@ class FlightController extends Controller DB::commit(); - return redirect() ->route('admin.flights.index') ->with('success','پرواز ویرایش شد'); - }catch(\Exception $e){ DB::rollBack(); @@ -155,7 +139,6 @@ class FlightController extends Controller } } - public function destroy(Flight $flight) { @@ -179,6 +162,5 @@ class FlightController extends Controller return back() ->with('success','پرواز حذف شد'); - } } diff --git a/app/Http/Controllers/Admin/ProvinceController.php b/app/Http/Controllers/Admin/ProvinceController.php index af390ed..629b2f1 100644 --- a/app/Http/Controllers/Admin/ProvinceController.php +++ b/app/Http/Controllers/Admin/ProvinceController.php @@ -8,7 +8,6 @@ use Illuminate\Http\Request; class ProvinceController extends Controller { - public function index() { $provinces = Province::latest()->paginate(5); @@ -16,15 +15,11 @@ class ProvinceController extends Controller return view('admin.provinces.index', compact('provinces')); } - - public function create() { return view('admin.provinces.create'); } - - public function store(Request $request) { @@ -42,41 +37,27 @@ class ProvinceController extends Controller ->route('admin.provinces.index'); } - - public function edit(Province $province) { return view('admin.provinces.edit',compact('province')); } - - public function update(Request $request, Province $province) { $request->validate([ 'name'=>'required' ]); - - $province->update([ 'name'=>$request->name ]); - - return redirect() ->route('admin.provinces.index'); } - - public function destroy(Province $province) { - $province->delete(); - - return back(); } - } diff --git a/app/Http/Controllers/Admin/RoleController.php b/app/Http/Controllers/Admin/RoleController.php index db98581..4bbf221 100644 --- a/app/Http/Controllers/Admin/RoleController.php +++ b/app/Http/Controllers/Admin/RoleController.php @@ -26,7 +26,5 @@ class RoleController extends Controller return redirect()->back()->with('success','دسترسی‌ها با موفقیت ذخیره شد'); } - - } diff --git a/app/Http/Controllers/Admin/SettingController.php b/app/Http/Controllers/Admin/SettingController.php index 3b91f20..5a090bc 100644 --- a/app/Http/Controllers/Admin/SettingController.php +++ b/app/Http/Controllers/Admin/SettingController.php @@ -18,14 +18,12 @@ class SettingController extends Controller return view('admin.settings.index', compact('settings')); } - public function create() { $settings = Setting::all(); return view('admin.settings.create',compact('settings')); } - public function store(SettingStoreRequest $request) { Setting::create($request->validated()); @@ -36,18 +34,14 @@ class SettingController extends Controller public function edit(Setting $setting) { return view('admin.settings.edit', compact('setting')); - } - public function update(SettingUpdateRequest $request,Setting $setting) { - $setting->update($request->validated()); return redirect() ->route('admin.settings.index') ->with('success', 'تنظیمات با موفقیت ویرایش شد.'); - } public function destroy(Setting $setting) diff --git a/app/Http/Controllers/Admin/TourController.php b/app/Http/Controllers/Admin/TourController.php index 530e011..8d45415 100644 --- a/app/Http/Controllers/Admin/TourController.php +++ b/app/Http/Controllers/Admin/TourController.php @@ -25,15 +25,10 @@ class TourController extends Controller return view('admin.tours.index', compact('tours')); } - - public function create() { - return view('admin.tours.create' ); } - - public function store(TourStoreRequest $request) { DB::beginTransaction(); @@ -49,7 +44,6 @@ class TourController extends Controller )->formatGregorian('Y-m-d'); } - if ($request->hasFile('image')) { $data['image'] = $request @@ -69,8 +63,6 @@ class TourController extends Controller 'model_id' => $tour->id, 'description' => 'ثبت تور جدید', ]); - - DB::commit(); @@ -78,7 +70,6 @@ class TourController extends Controller ->route('admin.tours.index') ->with('success','تور ثبت شد'); - } catch(\Exception $e) { DB::rollBack(); @@ -92,8 +83,6 @@ class TourController extends Controller return view('admin.tours.edit',compact('tour')); } - - public function update(TourStoreRequest $request, Tour $tour) { @@ -121,7 +110,6 @@ class TourController extends Controller } - $data['image'] = $request ->file('image') ->store('tours','public'); @@ -139,15 +127,12 @@ class TourController extends Controller 'description' => 'ویرایش تور', ]); - DB::commit(); - return redirect() ->route('admin.tours.index') ->with('success','تور ویرایش شد'); - }catch(\Exception $e){ DB::rollBack(); @@ -155,12 +140,10 @@ class TourController extends Controller dd($e->getMessage()); } - } public function destroy(Tour $tour) { - if($tour->image){ Storage::disk('public') @@ -176,12 +159,9 @@ class TourController extends Controller 'description' => 'حذف تور', ]); - $tour->delete(); - return back() ->with('success','تور حذف شد'); - } } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 66ff969..c3bf8a7 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -49,7 +49,5 @@ class UserController extends Controller $user->update(['password'=>Hash::make($request->password)]); return back(); - - } } diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 662558a..ef47ebd 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -18,7 +18,6 @@ class LoginController extends Controller return view('auth.login',compact('withoutHeader','withoutHero','withoutFooter')); } - public function post(LoginPostRequest $request) { $user = $request->validated(); diff --git a/app/Http/Controllers/Auth/LogoutController.php b/app/Http/Controllers/Auth/LogoutController.php index 948af54..b8107ee 100644 --- a/app/Http/Controllers/Auth/LogoutController.php +++ b/app/Http/Controllers/Auth/LogoutController.php @@ -16,6 +16,5 @@ class LogoutController extends Controller Request()->session()->regenerateToken(); return redirect()->route('index'); - } } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 78b41ed..9d4eec1 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -40,8 +40,6 @@ class RegisterController extends Controller $inputs['profile_image'] = $imageName; } - - $inputs['password']=Hash::make($inputs['password']); $inputs['status']=UserStatus::Draft; @@ -51,6 +49,5 @@ class RegisterController extends Controller return redirect()->route('index'); - } } diff --git a/app/Http/Controllers/FavoriteController.php b/app/Http/Controllers/FavoriteController.php index 2fbdd6b..23b028b 100644 --- a/app/Http/Controllers/FavoriteController.php +++ b/app/Http/Controllers/FavoriteController.php @@ -25,20 +25,15 @@ class FavoriteController extends Controller 'favoritable_id' => $request->id, ]); - return back(); } - - public function destroy(Favorite $favorite) { - $favorite->delete(); return back()->with( 'success', 'تور از علاقه‌مندی‌ها حذف شد.' ); - } } diff --git a/app/Http/Controllers/FlightController.php b/app/Http/Controllers/FlightController.php index bf53bca..5cbf0ce 100644 --- a/app/Http/Controllers/FlightController.php +++ b/app/Http/Controllers/FlightController.php @@ -15,26 +15,19 @@ class FlightController extends Controller ->applySearch($request->all()) ->paginate(10); - $newestFlight = Flight::latest() ->take(3) ->get(); - $newestTour = Tour::latest() ->take(3) ->get(); - $tours = Tour::latest() ->paginate(10); - - return view('flights.index', compact( - 'flights', - 'newestFlight', - 'newestTour', - 'tours' + return view('flights.index', compact('flights', 'newestFlight', + 'newestTour', 'tours' )); } public function show(Flight $flight) @@ -48,7 +41,6 @@ class FlightController extends Controller ->latest() ->get(); - return view('flights.show', compact('flight', 'comments')); } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 36d55ce..860a466 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -24,11 +24,8 @@ class HomeController extends Controller $tours = Tour::latest() ->paginate(5); - return view('home.index', compact( - 'newestFlight', - 'newestTour', - 'flights', - 'tours' + return view('home.index', compact('newestFlight', + 'newestTour', 'flights', 'tours' )); } } diff --git a/app/Http/Controllers/ReservationController.php b/app/Http/Controllers/ReservationController.php index 193fa05..ab21053 100644 --- a/app/Http/Controllers/ReservationController.php +++ b/app/Http/Controllers/ReservationController.php @@ -16,11 +16,8 @@ class ReservationController extends Controller ->latest() ->get(); - return view('account.users.Reservation.index', compact('reservations')); - } - public function store(Request $request) { @@ -32,6 +29,7 @@ class ReservationController extends Controller 'status' => 'pending' ]); - return redirect()->route('users.reservations.index')->with('success','رزرو شما ثبت شد.'); } + return redirect()->route('users.reservations.index') + ->with('success','رزرو شما ثبت شد.'); } } diff --git a/app/Http/Controllers/TourController.php b/app/Http/Controllers/TourController.php index 0ff27b8..85cc8e3 100644 --- a/app/Http/Controllers/TourController.php +++ b/app/Http/Controllers/TourController.php @@ -17,9 +17,8 @@ class TourController extends Controller ->latest() ->paginate(2); - return view('tours.index', compact('tours')) - ->with('withoutHero', true); } - + return view('tours.index', compact('tours', 'newestTour')); + } public function show(Tour $tour) { @@ -33,7 +32,6 @@ class TourController extends Controller ->latest() ->get(); - return view('tours.show', compact('tour','comments')); } } diff --git a/app/Http/Requests/Admin/FlightStoreRequest.php b/app/Http/Requests/Admin/FlightStoreRequest.php index d53c449..2d65fb8 100644 --- a/app/Http/Requests/Admin/FlightStoreRequest.php +++ b/app/Http/Requests/Admin/FlightStoreRequest.php @@ -16,6 +16,27 @@ class FlightStoreRequest extends FormRequest return true; } + protected function prepareForValidation() + { + if ($this->departure_date) { + + try { + + $this->merge([ + 'departure_date' => verta($this->departure_date) + ->formatGregorian('Y-m-d') + ]); + + } catch (\Exception $e) { + + $this->merge([ + 'departure_date' => null + ]); + + } + + } + } /** * Get the validation rules that apply to the request. * @@ -46,20 +67,7 @@ class FlightStoreRequest extends FormRequest ], 'departure_date' => [ 'required', - function ($attribute, $value, $fail) { - - try { - $gregorian = Verta::parse($value) - ->formatGregorian('Y-m-d'); - } catch (\Exception $e) { - $fail('تاریخ حرکت معتبر نیست.'); - return; - } - - if ($gregorian < now()->format('Y-m-d')) { - $fail('تاریخ حرکت نمی‌تواند قبل از تاریخ امروز باشد.'); - } - }, + 'date' ], 'departure_time' => [ 'required', diff --git a/public/uploads/users/1787382448.jpg b/public/uploads/users/1787382448.jpg new file mode 100644 index 0000000..1c2daa2 Binary files /dev/null and b/public/uploads/users/1787382448.jpg differ diff --git a/resources/views/account/layout/app.blade.php b/resources/views/account/layout/app.blade.php index 573c749..2629aed 100644 --- a/resources/views/account/layout/app.blade.php +++ b/resources/views/account/layout/app.blade.php @@ -15,23 +15,38 @@
+
- + + @if(auth()->user()->profile_image) + + تصویر پروفایل + + @else + + + + @endif +
-

-

+
- {{Auth::user()->email}} + {{ auth()->user()->email }} +
- diff --git a/resources/views/account/users/Reservation/index.blade.php b/resources/views/account/users/Reservation/index.blade.php index fcf3e3e..108d91e 100644 --- a/resources/views/account/users/Reservation/index.blade.php +++ b/resources/views/account/users/Reservation/index.blade.php @@ -1,52 +1,29 @@ @extends('layouts.app') - @section('content')
-
-
-
- @include('account.layout.app') -
- -
- - - -
- -
-
-
- - @endsection diff --git a/resources/views/account/users/dashboard.blade.php b/resources/views/account/users/dashboard.blade.php index 2794dac..6500c16 100644 --- a/resources/views/account/users/dashboard.blade.php +++ b/resources/views/account/users/dashboard.blade.php @@ -1,27 +1,17 @@ @extends('account.layout.app') - - @section('account-content') -
- -

سلام {{auth()->user()->name}} 👋

-

از اینجا می‌توانید تورها، پروازها و نظرات خود را مدیریت کنید.

-
- -
-
@@ -31,15 +21,10 @@ {{ auth()->user()->favorites()->count() }} -
-
- -
-
@@ -51,31 +36,19 @@
-
-
رزرو✈️
- {{ auth()->user()->reservations()->count() }} -
-
- - -
- -
- - @endsection diff --git a/resources/views/account/users/favorite/index.blade.php b/resources/views/account/users/favorite/index.blade.php index dbd65db..17f55c5 100644 --- a/resources/views/account/users/favorite/index.blade.php +++ b/resources/views/account/users/favorite/index.blade.php @@ -80,7 +80,6 @@ @endforeach - @else
diff --git a/resources/views/account/users/profile/edit.blade.php b/resources/views/account/users/profile/edit.blade.php index 5230895..7e269e2 100644 --- a/resources/views/account/users/profile/edit.blade.php +++ b/resources/views/account/users/profile/edit.blade.php @@ -1,35 +1,25 @@ @extends('layouts.app') - @section('content')
-
-
- @include('account.layout.app') -
- @endif - @if($errors->any())
لطفاً خطاهای فرم را بررسی کنید.
@endif -
-
@@ -321,12 +308,9 @@ {{ $message }} @enderror -
-
-
@@ -350,13 +334,9 @@ @enderror
-
-
-
-
-
-
- - -
@@ -458,9 +432,7 @@ alt="تصویر پروفایل" style="width:100px;height:100px;object-fit:cover;border-radius:50%;" > -
- @endif
@@ -482,15 +454,11 @@ {{ $message }} @enderror -
-
-
-

@@ -532,7 +500,6 @@

-
@@ -555,10 +522,8 @@ @enderror
-
-
@@ -575,13 +540,9 @@ >
-
-
- -
@@ -592,20 +553,13 @@ > ذخیره تغییرات -
- - - - - - @endsection @push('scripts') diff --git a/resources/views/admin/activityLog/index.blade.php b/resources/views/admin/activityLog/index.blade.php index 7e6b951..be8f8ae 100644 --- a/resources/views/admin/activityLog/index.blade.php +++ b/resources/views/admin/activityLog/index.blade.php @@ -5,72 +5,42 @@ گزارش فعالیت‌ها @endsection - @section('content') -
- -
-
-
گزارش تغییرات سیستم
-
- - - - + - + - + - + - + - - - + + - - - - @forelse($logs as $log) - @@ -89,7 +59,6 @@ @break - @case('update') ویرایش @@ -103,7 +72,6 @@ @break - @default {{ $log->action }} @@ -133,14 +101,10 @@ {{ $log->model_id }} - - - - @@ -149,7 +113,6 @@ @empty - -
- شناسه - شناسه - مدیر - مدیر - عملیات - عملیات - بخش - بخش - شناسه مورد - شناسه مورد - توضیحات - - تاریخ - توضیحاتتاریخ
{{ $loop->iteration }} {{ $log->description }} {{ $log->created_at->toJalali()->format('Y/m/d H:i') }}
@@ -164,19 +127,14 @@
{{ $logs->links() }} -
-
- -
@endsection diff --git a/resources/views/admin/admins/create.blade.php b/resources/views/admin/admins/create.blade.php index 9a06112..df53216 100644 --- a/resources/views/admin/admins/create.blade.php +++ b/resources/views/admin/admins/create.blade.php @@ -1,5 +1,4 @@ @extends('admin.layouts.app') - @section('breadcrumb')
@@ -29,11 +28,8 @@ @section('content')
-
-
-
ایجاد ادمین جدید
@@ -260,13 +256,9 @@ > ذخیره ادمین -
- -
-
@endsection diff --git a/resources/views/admin/admins/edit.blade.php b/resources/views/admin/admins/edit.blade.php index 7f6736e..95402e6 100644 --- a/resources/views/admin/admins/edit.blade.php +++ b/resources/views/admin/admins/edit.blade.php @@ -1,12 +1,10 @@ @extends('admin.layouts.app') - @section('breadcrumb')

ویرایش ادمین

-
@@ -29,11 +26,8 @@ @section('content')
-
-
-
ویرایش ادمین
@@ -98,7 +92,6 @@
-
-
-
-
-
-
- -
-
@endsection diff --git a/resources/views/admin/admins/index.blade.php b/resources/views/admin/admins/index.blade.php index 703aafc..24232e7 100644 --- a/resources/views/admin/admins/index.blade.php +++ b/resources/views/admin/admins/index.blade.php @@ -1,13 +1,9 @@ @extends('admin.layouts.app') - @section('content')
-
-
-
لیست ادمین‌ها
@@ -20,11 +16,8 @@
-
- - @@ -39,9 +32,7 @@ @forelse($admins as $admin) - - @@ -99,11 +90,9 @@ - @empty - @endforelse - -
نام
{{ $admin->first_name }}
ادمینی ثبت نشده است. @@ -111,11 +100,8 @@
-
@@ -123,9 +109,7 @@
-
-
@endsection diff --git a/resources/views/admin/auth/login.blade.php b/resources/views/admin/auth/login.blade.php index 3a5bb3f..2b234d7 100644 --- a/resources/views/admin/auth/login.blade.php +++ b/resources/views/admin/auth/login.blade.php @@ -1,17 +1,11 @@ @extends('admin.layouts.app') - @section('content')
-
-
-
-
-

ورود مدیر

@@ -19,12 +13,10 @@ {{$message}} @enderror -
@csrf -
-
- -
-
-
-
-
-
- @endsection diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index e5c8981..06698a9 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,10 +1,8 @@ @extends('layouts.app') - @section('content')
-
-
-
-
-
-
-
- -
- @endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 8478520..f127ef7 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -3,7 +3,6 @@ @extends('layouts.app') @section('content') -
@@ -13,18 +12,15 @@
-
-
-