diff --git a/Modules/Demo/database/Seeders/DemoContentSeeder.php b/Modules/Demo/database/Seeders/DemoContentSeeder.php index ebabeeeac..cb991dd69 100644 --- a/Modules/Demo/database/Seeders/DemoContentSeeder.php +++ b/Modules/Demo/database/Seeders/DemoContentSeeder.php @@ -10,7 +10,6 @@ class DemoContentSeeder extends Seeder { $this->call([ \Modules\User\Database\Seeders\AuthUserSeeder::class, - \Modules\Listing\Database\Seeders\ListingSeeder::class, \Modules\Listing\Database\Seeders\ListingPanelDemoSeeder::class, \Modules\Favorite\Database\Seeders\FavoriteDemoSeeder::class, \Modules\Conversation\Database\Seeders\ConversationDemoSeeder::class, diff --git a/Modules/User/App/Http/Controllers/ProfileController.php b/Modules/User/App/Http/Controllers/ProfileController.php index 272559a45..90ac9faf3 100644 --- a/Modules/User/App/Http/Controllers/ProfileController.php +++ b/Modules/User/App/Http/Controllers/ProfileController.php @@ -7,13 +7,12 @@ use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Validation\Rule; -use Illuminate\View\View; class ProfileController extends Controller { - public function edit(Request $request): View + public function edit(): RedirectResponse { - return view('user::profile.edit', ['user' => $request->user()]); + return redirect()->route('panel.profile.edit'); } public function update(Request $request): RedirectResponse diff --git a/Modules/User/resources/views/profile/edit.blade.php b/Modules/User/resources/views/profile/edit.blade.php deleted file mode 100644 index c3fdb0050..000000000 --- a/Modules/User/resources/views/profile/edit.blade.php +++ /dev/null @@ -1,29 +0,0 @@ - - -

- {{ __('Profile') }} -

- - -
-
-
-
- @include('user::profile.partials.update-profile-information-form') -
-
- -
-
- @include('user::profile.partials.update-password-form') -
-
- -
-
- @include('user::profile.partials.delete-user-form') -
-
-
-
- diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 2ee822070..f1e8e5eee 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -14,6 +14,7 @@ class DatabaseSeeder extends Seeder \Modules\Location\Database\Seeders\LocationSeeder::class, \Modules\Category\Database\Seeders\CategorySeeder::class, \Modules\Listing\Database\Seeders\ListingCustomFieldSeeder::class, + \Modules\Listing\Database\Seeders\ListingSeeder::class, ]); if ((bool) config('demo.enabled') || (bool) config('demo.provisioning')) { diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php deleted file mode 100644 index 66028f2dc..000000000 --- a/resources/views/dashboard.blade.php +++ /dev/null @@ -1,17 +0,0 @@ - - -

- {{ __('Dashboard') }} -

- - -
-
-
-
- {{ __("You're logged in!") }} -
-
-
-
- diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index c527aa460..017753a35 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -78,7 +78,7 @@ 'bg-slate-50' => $demoLandingMode, 'bg-[#f5f5f7]' => $simplePage && ! $demoLandingMode, ])> - @if(!$demoLandingMode && $simplePage) + @if($simplePage) - @elseif(!$demoLandingMode) + @else @endif - @if(!$demoLandingMode && $demoRemainingLabel) + @if($demoRemainingLabel)
Demo auto deletes in {{ $demoRemainingLabel }}
@endif - @unless($demoLandingMode) @if(session('success'))
{{ session('success') }}
@@ -359,12 +354,11 @@
{{ session('error') }}
@endif - @endunless
$demoLandingMode, ])>@yield('content')
- @if(!$demoLandingMode && !$simplePage) + @if(!$simplePage)