diff --git a/app/Http/Livewire/Frontend/Header.php b/app/Http/Livewire/Frontend/Header.php index 41455580..d56f316d 100644 --- a/app/Http/Livewire/Frontend/Header.php +++ b/app/Http/Livewire/Frontend/Header.php @@ -64,14 +64,17 @@ class Header extends Component public function updatedC($value) { - return to_route($this->currentRouteName, ['country' => $value, 'lang' => $this->l]); + $url = str(request()->header('Referer'))->explode('/'); + $url[3] = $value; + + return redirect($url->implode('/')); } public function updatedL($value) { Cookie::queue('lang', $this->l, 60 * 24 * 365); - return to_route($this->currentRouteName, ['country' => $this->c, 'l' => $value]); + return redirect(request()->header('Referer')); } public function render() diff --git a/composer.json b/composer.json index a8a6fb43..f755f4ad 100644 --- a/composer.json +++ b/composer.json @@ -24,17 +24,18 @@ "laravel/horizon": "^5.13", "laravel/jetstream": "^2.15", "laravel/nova": "~4.0", - "nova/start": "*", "laravel/sanctum": "^3.2", "laravel/socialite": "^5.6", "laravel/tinker": "^2.8", "league/glide-laravel": "^1.0", "livewire/livewire": "^2.11", + "nova/start": "*", "oneduo/nova-time-field": "^1.0", "podcastindex/podcastindex-php": "^1.0", "pusher/pusher-php-server": "^7.2.2", "qcod/laravel-gamify": "dev-master#6c0a55cf5351be5e7b4f31aa2499984853d895cf", "ralphjsmit/laravel-seo": "^1.3", + "ralphjsmit/livewire-urls": "^1.2", "rappasoft/laravel-livewire-tables": "^2.11", "sentry/sentry-laravel": "^3.2", "simplesoftwareio/simple-qrcode": "^4.2", diff --git a/composer.lock b/composer.lock index 0a6319e0..9e730b49 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8e6822cad9f125346158e3e8ce1dff4a", + "content-hash": "3c72a76d40874c2712eb1961b4fc3d3f", "packages": [ { "name": "akuechler/laravel-geoly", @@ -7299,6 +7299,76 @@ }, "time": "2023-02-17T17:52:50+00:00" }, + { + "name": "ralphjsmit/livewire-urls", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/ralphjsmit/livewire-urls.git", + "reference": "5600447be283ab6381ddaaf8b77bf0fa76677c5e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralphjsmit/livewire-urls/zipball/5600447be283ab6381ddaaf8b77bf0fa76677c5e", + "reference": "5600447be283ab6381ddaaf8b77bf0fa76677c5e", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^8.83|^9.0|^10.0", + "livewire/livewire": "^2.10", + "php": "^8.0", + "spatie/laravel-package-tools": "^1.9.2" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.8", + "nesbot/carbon": "^2.66", + "nunomaduro/collision": "^5.0|^6.0|^7.0", + "orchestra/testbench": "^6.0|^7.0|^8.0", + "pestphp/pest": "^1.21", + "pestphp/pest-plugin-laravel": "^1.1", + "phpunit/phpunit": "^9.5|^10.0", + "spatie/laravel-ray": "^1.26" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "RalphJSmit\\Livewire\\Urls\\LivewireUrlsServiceProvider" + ], + "aliases": { + "LivewireUrls": "RalphJSmit\\Livewire\\Urls\\Facades\\Url" + } + } + }, + "autoload": { + "psr-4": { + "RalphJSmit\\Livewire\\Urls\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph J. Smit", + "email": "rjs@ralphjsmit.com", + "role": "Developer" + } + ], + "description": "Get the previous and current url in Livewire.", + "homepage": "https://github.com/ralphjsmit/livewire-urls", + "keywords": [ + "laravel", + "livewire-urls", + "ralphjsmit" + ], + "support": { + "issues": "https://github.com/ralphjsmit/livewire-urls/issues", + "source": "https://github.com/ralphjsmit/livewire-urls/tree/1.2.0" + }, + "time": "2023-02-17T17:40:53+00:00" + }, { "name": "ramsey/collection", "version": "2.0.0",