git add .
git commit "Complete project development and finalize features"
This commit is contained in:
@@ -8,8 +8,7 @@ use Illuminate\Http\Request;
|
||||
|
||||
class ActivityLogController extends Controller
|
||||
{
|
||||
//
|
||||
public function index()
|
||||
public function index()
|
||||
{
|
||||
$logs=ActivityLog::with('admin')
|
||||
->latest()
|
||||
|
||||
@@ -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');
|
||||
|
||||
}
|
||||
|
||||
@@ -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','پرواز حذف شد');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -26,7 +26,5 @@ class RoleController extends Controller
|
||||
|
||||
return redirect()->back()->with('success','دسترسیها با موفقیت ذخیره شد');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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','تور حذف شد');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,7 +49,5 @@ class UserController extends Controller
|
||||
$user->update(['password'=>Hash::make($request->password)]);
|
||||
|
||||
return back();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user