Index: app/Http/Controllers/ActivityController.php =================================================================== --- app/Http/Controllers/ActivityController.php (revision 6045f7200f562e006c47110d487d8d522ab9b07f) +++ app/Http/Controllers/ActivityController.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -13,7 +13,7 @@ public function travelActivities(Destination $destination): View|Factory|Application { - $sezona = strtolower($destination->preporachanasezona); - - $aktivnosti = TravelActivity::whereRaw("LOWER(kategorija) LIKE ?", ["%{$sezona}%"])->get(); + $aktivnosti = TravelActivity::query() + ->whereLike('aktivnosti', "%$destination->preporachanasezona%") + ->get(); return view('destinations.activities', compact('destination', 'aktivnosti')); Index: app/Http/Controllers/DestinationController.php =================================================================== --- app/Http/Controllers/DestinationController.php (revision 6045f7200f562e006c47110d487d8d522ab9b07f) +++ app/Http/Controllers/DestinationController.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -4,6 +4,9 @@ use App\Models\Destination; +use App\Models\TravelActivity; +use App\Models\ViewProcentCheapDestination; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Foundation\Application; use Illuminate\Http\Request; @@ -12,7 +15,18 @@ class DestinationController extends Controller { - public function index(): View|Factory|Application + public function index(Request $request): View|Factory|Application { - $destinations = Destination::all(); + $type = $request->input('tipovimesta'); + $season = $request->input('preporachanasezona'); + $popularity = $request->input('popularnost'); + + $destinations = Destination::query() + ->when($season && $season !== 'any', fn ($query) => $query->where('preporachanasezona', $season)) + ->when($popularity, function (Builder $query) use ($popularity) { + $popularnost = explode('-', $popularity); + return $query->whereBetween('popularnost', [$popularnost[0], $popularnost[1]]); + }) + ->when($type && $type !== 'any', fn ($query) => $query->where('tipovimesta', 'like', "%$type%")) + ->get(); return view('destinations/index', compact('destinations')); @@ -61,9 +75,12 @@ $topLocations = collect(array_slice($locationCounts, 0, 5, true)); - $cheapActivities = DB::table('travel_sage.aktivnosti') + $cheapActivities = TravelActivity::query() ->where('iznos', '<', 500) ->get(); - return view('home', compact('topLocations', 'cheapActivities')); + $data = ViewProcentCheapDestination::all(); + + + return view('home', compact('topLocations', 'cheapActivities', 'data')); } @@ -78,30 +95,4 @@ return view('cheap', compact('cheapActivities')); } */ - - public function explore(): View|Factory|Application - { - $locations = DB::table('travel_sage.destinacii')->pluck('imelokacija'); - $locationCounts = []; - - foreach ($locations as $location) { - $lowerLocation = mb_strtolower($location, 'UTF-8'); - - $count = DB::table('travel_sage.nastani') - ->whereRaw('LOWER(naziv) LIKE ?', ['%' . $lowerLocation . '%']) - ->orWhereRaw('LOWER(detali) LIKE ?', ['%' . $lowerLocation . '%']) - ->count(); - - $locationCounts[$location] = $count; - } - - arsort($locationCounts); - $topLocations = collect(array_slice($locationCounts, 0, 5, true)); - - $cheapActivities = DB::table('travel_sage.aktivnosti') - ->where('iznos', '<', 500) - ->get(); - - return view('explore', compact('topLocations', 'cheapActivities')); - } public function cheapActivitiesChart(): \Illuminate\Contracts\View\View Index: app/Http/Controllers/PackageController.php =================================================================== --- app/Http/Controllers/PackageController.php (revision 6045f7200f562e006c47110d487d8d522ab9b07f) +++ app/Http/Controllers/PackageController.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -14,7 +14,7 @@ public function travelPackages(Destination $destination): View|Factory|Application { - $sezona = strtolower($destination->preporachanasezona); - - $paketi = TravelPackage::where('imepaket', 'LIKE', "%{$sezona}%")->get(); + $paketi = TravelPackage::query() + ->where('imepaket', 'like', "%$destination->preporachanasezona%") + ->get(); return view('destinations.packages', compact('destination', 'paketi')); Index: app/Http/Controllers/SearchController.php =================================================================== --- app/Http/Controllers/SearchController.php (revision 6045f7200f562e006c47110d487d8d522ab9b07f) +++ app/Http/Controllers/SearchController.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -10,5 +10,5 @@ public function index(): \Illuminate\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View { - $results = collect([]); // Празен резултат по дефиниција + $results = collect([]); return view('destinations.search', compact('results')); Index: app/Http/Controllers/TravelActivityController.php =================================================================== --- app/Http/Controllers/TravelActivityController.php (revision 6045f7200f562e006c47110d487d8d522ab9b07f) +++ app/Http/Controllers/TravelActivityController.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -6,4 +6,5 @@ use App\Models\TravelActivity; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class TravelActivityController extends Controller @@ -23,12 +24,14 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse { - $validatedData = $request->validate([ - 'imeaktivnost' => 'required|string|max:255', - 'informacii' => 'nullable|string|max:255', - 'kategorija' => 'required|string|max:255', - 'iznos' => 'nullable|numeric', - ]); + DB::transaction(function () use ($request) { + $validatedData = $request->validate([ + 'imeaktivnost' => 'required|string|max:255', + 'informacii' => 'nullable|string|max:255', + 'kategorija' => 'required|string|max:255', + 'iznos' => 'nullable|numeric', + ]); - TravelActivity::create($validatedData); + TravelActivity::create($validatedData); + }); return redirect()->route('travel-activities.index')->with('success', 'Активноста е успешно креирана!'); Index: app/Http/Controllers/TravelEventController.php =================================================================== --- app/Http/Controllers/TravelEventController.php (revision 6045f7200f562e006c47110d487d8d522ab9b07f) +++ app/Http/Controllers/TravelEventController.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -6,4 +6,5 @@ use App\Models\TravelEvent; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class TravelEventController extends Controller @@ -23,13 +24,15 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse { - $validatedData = $request->validate([ - 'naziv' => 'required|string|max:255', - 'vidovi' => 'required|string|max:255', - 'detali' => 'nullable|string', - 'pochetendatum' => 'required|date', - 'kraendatum' => 'required|date', - ]); + DB::transaction(function () use ($request) { + $validatedData = $request->validate([ + 'naziv' => 'required|string|max:255', + 'vidovi' => 'required|string|max:255', + 'detali' => 'nullable|string', + 'pochetendatum' => 'required|date', + 'kraendatum' => 'required|date', + ]); - TravelEvent::create($validatedData); + TravelEvent::create($validatedData); + }); return redirect()->route('travel-events.index')->with('success', 'Настанот е успешно креиран!'); Index: app/Http/Controllers/TravelPackageController.php =================================================================== --- app/Http/Controllers/TravelPackageController.php (revision 6045f7200f562e006c47110d487d8d522ab9b07f) +++ app/Http/Controllers/TravelPackageController.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -6,4 +6,5 @@ use App\Models\TravelPackage; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; class TravelPackageController extends Controller @@ -22,12 +23,14 @@ public function store(Request $request): \Illuminate\Http\RedirectResponse { - $validatedData = $request->validate([ - 'imepaket' => 'required|string|max:255', - 'cena' => 'required|numeric', - 'pochetok' => 'required|date_format:Y-m-d\TH:i', - 'kraj' => 'required|date_format:Y-m-d\TH:i|after_or_equal:pochetok', - ]); + DB::transaction(function () use ($request) { + $validatedData = $request->validate([ + 'imepaket' => 'required|string|max:255', + 'cena' => 'required|numeric', + 'pochetok' => 'required|date_format:Y-m-d\TH:i', + 'kraj' => 'required|date_format:Y-m-d\TH:i|after_or_equal:pochetok', + ]); - TravelPackage::create($validatedData); + TravelPackage::create($validatedData); + }); return redirect()->route('travel-packages.index')->with('success', 'Пакетот е успешно креиран!'); Index: app/Models/ViewProcentCheapDestination.php =================================================================== --- app/Models/ViewProcentCheapDestination.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) +++ app/Models/ViewProcentCheapDestination.php (revision a17bc4e46fe4cd0358521a43bf800fe525e51881) @@ -0,0 +1,12 @@ + @@ -93,7 +95,7 @@

Топ 5 дестинации со најмногу организирани настани

+ padding-top: 20vh;">Топ 5 дестинации со најмногу организирани настани -