Index: app/Http/Controllers/ActivityController.php =================================================================== --- app/Http/Controllers/ActivityController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/ActivityController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -8,5 +8,5 @@ use Illuminate\Contracts\View\View; use Illuminate\Foundation\Application; -use Illuminate\Http\Request; + class ActivityController extends Controller { @@ -20,3 +20,2 @@ } } - Index: app/Http/Controllers/AuthController.php =================================================================== --- app/Http/Controllers/AuthController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/AuthController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -4,7 +4,5 @@ use App\Models\TravelSageUser; -use App\Models\User; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Auth; class AuthController extends Controller @@ -49,6 +47,6 @@ $korisnik = TravelSageUser::where('eposhta', $request->eposhta)->first(); - if (!$korisnik) { - $korisnik = new TravelSageUser(); + if (! $korisnik) { + $korisnik = new TravelSageUser; $korisnik->ime = $request->ime; $korisnik->prezime = $request->prezime; @@ -61,4 +59,3 @@ return redirect()->route('preferences')->with('success', 'Успешно сте најавени!'); } - } Index: app/Http/Controllers/DestinationController.php =================================================================== --- app/Http/Controllers/DestinationController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/DestinationController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -25,4 +25,5 @@ ->when($popularity, function (Builder $query) use ($popularity) { $popularnost = explode('-', $popularity); + return $query->whereBetween('popularnost', [$popularnost[0], $popularnost[1]]); }) @@ -38,22 +39,4 @@ } - public function events($imelokacija): View|Factory|Application - { - $destination = Destination::where('imelokacija', $imelokacija)->firstOrFail(); - return view('destinations.events', compact('destination')); - } - - public function activities($imelokacija): View|Factory|Application - { - $destination = Destination::where('imelokacija', $imelokacija)->firstOrFail(); - return view('destinations.activity', compact('destination')); - } - - public function packages($imelokacija): View|Factory|Application - { - $destination = Destination::where('imelokacija', $imelokacija)->firstOrFail(); - return view('destinations.package', compact('destination')); - } - public function home(): View|Factory|Application { @@ -65,6 +48,6 @@ $count = DB::table('travel_sage.nastani') - ->whereRaw('LOWER(naziv) LIKE ?', ['%' . $lowerLocation . '%']) - ->orWhereRaw('LOWER(detali) LIKE ?', ['%' . $lowerLocation . '%']) + ->whereRaw('LOWER(naziv) LIKE ?', ['%'.$lowerLocation.'%']) + ->orWhereRaw('LOWER(detali) LIKE ?', ['%'.$lowerLocation.'%']) ->count(); @@ -81,39 +64,5 @@ $data = ViewProcentCheapDestination::all(); - return view('home', compact('topLocations', 'cheapActivities', 'data')); } - - - - public function search(Request $request): Application|Factory|View - { - $tipovimesta = $request->input('tipovimesta'); - $preporachanasezona = $request->input('preporachanasezona'); - $filter = $request->input('filter'); - - $destinations = Destination::query(); - - if ($tipovimesta && $tipovimesta !== 'allDest') { - $destinations->where('tipovimesta', $tipovimesta); - } - - if ($preporachanasezona && $preporachanasezona !== 'allSeasons') { - $destinations->where('preporachanasezona', $preporachanasezona); - } - - if ($filter === 'popularnost') { - $destinations->orderBy('popularnost', 'desc'); - } elseif ($filter === 'season') { - $destinations->orderBy('preporachanasezona'); - } elseif ($filter === 'typeDest') { - $destinations->orderBy('tipovimesta'); - } - - $results = $destinations->get(); - - return view('search', compact('results')); - } - - } Index: app/Http/Controllers/EventController.php =================================================================== --- app/Http/Controllers/EventController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/EventController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -8,5 +8,4 @@ use Illuminate\Contracts\View\View; use Illuminate\Foundation\Application; -use Illuminate\Http\Request; class EventController extends Controller @@ -22,4 +21,3 @@ return view('destinations.events', compact('destination', 'nastani')); } - } Index: app/Http/Controllers/PackageController.php =================================================================== --- app/Http/Controllers/PackageController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/PackageController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -6,5 +6,4 @@ use App\Models\TravelPackage; use Faker\Factory; -use Illuminate\Http\Request; use Illuminate\View\View; use Symfony\Component\Console\Application; @@ -20,4 +19,3 @@ return view('destinations.packages', compact('destination', 'paketi')); } - } Index: app/Http/Controllers/PreferencesController.php =================================================================== --- app/Http/Controllers/PreferencesController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/PreferencesController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -2,6 +2,4 @@ namespace App\Http\Controllers; - -use Illuminate\Http\Request; class PreferencesController extends Controller @@ -9,5 +7,5 @@ public function index(): \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Foundation\Application { - return view('preferences'); + return view('preferences'); } } Index: p/Http/Controllers/ReservationController.php =================================================================== --- app/Http/Controllers/ReservationController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ (revision ) @@ -1,10 +1,0 @@ -input('tipovimesta'); - $preporachanasezona = $request->input('preporachanasezona'); - $filter = $request->input('filter'); - - $destinations = Destination::query(); - - if ($tipovimesta && $tipovimesta !== 'allDest') { - $destinations->where('tipovimesta', $tipovimesta); - } - - if ($preporachanasezona && $preporachanasezona !== 'allSeasons') { - $destinations->where('preporachanasezona', $preporachanasezona); - } - - if ($filter === 'popularnost') { - $destinations->orderBy('popularnost', 'desc'); - } elseif ($filter === 'season') { - $destinations->orderBy('preporachanasezona'); - } elseif ($filter === 'typeDest') { - $destinations->orderBy('tipovimesta'); - } - - $results = $destinations->get(); - - return view('destinations.search', compact('results')); - } -} Index: p/Http/Controllers/TagController.php =================================================================== --- app/Http/Controllers/TagController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ (revision ) @@ -1,10 +1,0 @@ -delete(); + return redirect()->route('travel-activities.index')->with('success', 'Активноста е успешно избришана!'); } - } Index: app/Http/Controllers/TravelEventController.php =================================================================== --- app/Http/Controllers/TravelEventController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/TravelEventController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -5,4 +5,7 @@ use App\Http\Requests\TravelEventRequest; use App\Models\TravelEvent; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View; +use Illuminate\Foundation\Application; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -10,5 +13,5 @@ class TravelEventController extends Controller { - public function index(): \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Foundation\Application + public function index(): View|Factory|Application { $travelEvents = TravelEvent::all(); @@ -17,5 +20,5 @@ } - public function create(): \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Foundation\Application + public function create(): View|Factory|Application { return view('travel-events.create'); @@ -39,5 +42,5 @@ } - public function edit(TravelEvent $travelEvent): \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Foundation\Application + public function edit(TravelEvent $travelEvent): View|Factory|Application { return view('travel-events/edit', compact('travelEvent')); @@ -54,4 +57,5 @@ { $travelEvent->delete(); + return redirect()->route('travel-events.index')->with('success', 'Настанот е успешно избришан!'); } Index: app/Http/Controllers/TravelPackageController.php =================================================================== --- app/Http/Controllers/TravelPackageController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/TravelPackageController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -5,4 +5,7 @@ use App\Http\Requests\TravelPackageRequest; use App\Models\TravelPackage; +use Illuminate\Contracts\View\Factory; +use Illuminate\Contracts\View\View; +use Illuminate\Foundation\Application; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -10,11 +13,12 @@ class TravelPackageController extends Controller { - public function index(): \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Foundation\Application + public function index(): View|Factory|Application { $travelPackages = TravelPackage::all(); + return view('travel-packages.index', compact('travelPackages')); } - public function create(): \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Foundation\Application + public function create(): View|Factory|Application { return view('travel-packages.create'); @@ -37,5 +41,5 @@ } - public function edit(TravelPackage $travelPackage): \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Foundation\Application + public function edit(TravelPackage $travelPackage): View|Factory|Application { return view('travel-packages.edit', compact('travelPackage')); @@ -52,4 +56,5 @@ { $travelPackage->delete(); + return redirect()->route('travel-packages.index')->with('success', 'Пакетот е успешно избришан!'); } Index: app/Http/Controllers/WeatherConditionController.php =================================================================== --- app/Http/Controllers/WeatherConditionController.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Http/Controllers/WeatherConditionController.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -3,5 +3,4 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; @@ -12,12 +11,13 @@ $apiKey = env('WEATHER_API_KEY'); - $response = Http::get("https://api.openweathermap.org/data/2.5/forecast", [ + $response = Http::get('https://api.openweathermap.org/data/2.5/forecast', [ 'q' => $location, 'units' => 'metric', - 'appid' => $apiKey + 'appid' => $apiKey, ]); if ($response->successful()) { $data = $response->json(); + return view('weather.show', compact('data', 'location')); } else { Index: app/Models/Destination.php =================================================================== --- app/Models/Destination.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Models/Destination.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -48,8 +48,8 @@ ->withPivot(['ocena', 'komentar', 'datum']); } + public function getRouteKeyName(): string { return 'imelokacija'; } - } Index: app/Models/Tag.php =================================================================== --- app/Models/Tag.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Models/Tag.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -18,4 +18,3 @@ return $this->belongsToMany(Destination::class, 'destinacii_has_tagovi', 'idtag', 'iddest'); } - } Index: app/Models/TravelSageUser.php =================================================================== --- app/Models/TravelSageUser.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Models/TravelSageUser.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -3,5 +3,4 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; @@ -11,4 +10,5 @@ { protected $table = 'travel_sage.korisnici'; + public $timestamps = false; @@ -35,5 +35,3 @@ ->withPivot(['ocena', 'komentar', 'datum']); } - - } Index: app/Models/User.php =================================================================== --- app/Models/User.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Models/User.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -38,6 +38,4 @@ ]; - - /** * Get the attributes that should be cast. Index: app/Models/ViewProcentCheapDestination.php =================================================================== --- app/Models/ViewProcentCheapDestination.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ app/Models/ViewProcentCheapDestination.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -8,5 +8,5 @@ { protected $table = 'view_procent_cheap_destinations'; + public $timestamps = false; } - Index: database/migrations/2025_06_24_232513_create_view_procent_cheap_destinations.php =================================================================== --- database/migrations/2025_06_24_232513_create_view_procent_cheap_destinations.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ database/migrations/2025_06_24_232513_create_view_procent_cheap_destinations.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -2,5 +2,4 @@ use Illuminate\Database\Migrations\Migration; -use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; @@ -13,5 +12,5 @@ public function up(): void { - DB::statement(" + DB::statement(' CREATE VIEW view_procent_cheap_destinations AS SELECT @@ -22,5 +21,5 @@ GROUP BY d.iddest, d.imelokacija ORDER BY procent_cheap DESC - "); + '); } Index: routes/web.php =================================================================== --- routes/web.php (revision 711abb68d34e2270b14729e7a4988c7eb46197c7) +++ routes/web.php (revision dab60e57d4ae4392b55bc2c84c87f86b69dc80ff) @@ -1,39 +1,36 @@ name('home'); -Route::get('/login', function () { - return view('login'); -})->name('login'); +Route::resource('destinations', DestinationController::class)->only('index', 'show'); -Route::resource('destinations', DestinationController::class)->only('index', 'show'); -Route::get('destinations/{imelokacija}/events', [DestinationController::class, 'events'])->name('events.index'); -Route::get('destinations/{imelokacija}/activities', [DestinationController::class, 'activities'])->name('activity.index'); -Route::get('destinations/{imelokacija}/packages', [DestinationController::class, 'packages'])->name('package.index'); -Route::get('/destinations/{destination}/travel-events', [EventController::class, 'travelEvents'])->name('travelEvents.index'); -Route::get('/destinations/{destination}/travel-activities', [ActivityController::class, 'travelActivities'])->name('travelActivities.index'); -Route::get('/destinations/{destination}/travel-packages', [PackageController::class, 'travelPackages'])->name('travelPackages.index'); +Route::prefix('/destinations/{destination}')->group(function () { + Route::get('/travel-events', [EventController::class, 'travelEvents'])->name('travelEvents.index'); + Route::get('/travel-activities', [ActivityController::class, 'travelActivities'])->name('travelActivities.index'); + Route::get('/travel-packages', [PackageController::class, 'travelPackages'])->name('travelPackages.index'); +}); + Route::get('/weather/{imelokacija}', [WeatherConditionController::class, 'show'])->name('weather.show'); +Route::prefix('/register')->group(function () { + Route::get('/', [AuthController::class, 'showRegisterForm'])->name('register'); + Route::post('/', [AuthController::class, 'store'])->name('register'); +}); -Route::get('/register', [AuthController::class, 'showRegisterForm'])->name('register'); -Route::post('/register', [AuthController::class, 'store'])->name('register'); - -Route::get('/login', [AuthController::class, 'showLoginForm'])->name('login'); -Route::post('/login', [AuthController::class, 'login'])->name('login.post'); - +Route::prefix('/login')->group(function () { + Route::get('/', [AuthController::class, 'showLoginForm'])->name('login'); + Route::post('/', [AuthController::class, 'login'])->name('login.post'); +}); Route::get('/preferences', function () { @@ -41,13 +38,5 @@ })->name('preferences'); - - -/* manager side */ -Route::post('/travel-events', [TravelEventController::class, 'store'])->name('travel-events.store'); Route::resource('travel-events', TravelEventController::class); - -Route::post('/travel-activities', [TravelActivityController::class, 'store'])->name('travel-activities.store'); Route::resource('travel-activities', TravelActivityController::class); - -Route::post('/travel-packages', [TravelPackageController::class, 'store'])->name('travel-packages.store'); Route::resource('travel-packages', TravelPackageController::class);