Skip to content

Commit cc0eca3

Browse files
committed
refactor(core): streamline initial setup by removing member creation and standardizing default language and settings.
1 parent 339d651 commit cc0eca3

2 files changed

Lines changed: 11 additions & 39 deletions

File tree

src/Http/Controllers/Admin/CommentController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Juzaweb\Modules\Core\Http\Controllers\Admin;
44

5-
use Juzaweb\Modules\Blog\Models\Post;
65
use Juzaweb\Modules\Core\Enums\CommentStatus;
76
use Juzaweb\Modules\Core\Facades\Breadcrumb;
87
use Juzaweb\Modules\Core\Http\Controllers\AdminController;

src/Http/Controllers/Admin/SetupController.php

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
use Illuminate\Http\JsonResponse;
1616
use Illuminate\Http\Request;
1717
use Illuminate\Support\Facades\DB;
18-
use Juzaweb\Modules\Admin\Enums\UserStatus;
19-
use Juzaweb\Modules\Admin\Models\Users\Member;
20-
use Juzaweb\Modules\Admin\Networks\Facades\Network;
2118
use Juzaweb\Modules\Core\Enums\PageStatus;
2219
use Juzaweb\Modules\Core\Facades\Theme;
2320
use Juzaweb\Modules\Core\Http\Controllers\AdminController;
@@ -37,7 +34,7 @@ public function index()
3734

3835
return view(
3936
'core::admin.setup.index',
40-
compact('website', 'title')
37+
compact('title')
4138
);
4239
}
4340

@@ -46,37 +43,16 @@ public function index()
4643
*/
4744
public function setup(Request $request): JsonResponse
4845
{
49-
$user = $request->user();
50-
5146
try {
5247
DB::transaction(
53-
function () use ($website, $user) {
54-
Member::firstOrCreate([
55-
'email' => $user->email,
56-
], [
57-
'name' => $user->name,
58-
'user_id' => $user->id,
59-
'password' => $user->password,
60-
'status' => UserStatus::ACTIVE,
61-
]);
62-
48+
function () use ($request) {
6349
// Create default language (English)
6450
Language::firstOrCreate([
6551
'code' => 'en',
6652
], [
6753
'name' => 'English',
6854
]);
6955

70-
if ($website->language && $website->language != 'en') {
71-
Language::firstOrCreate([
72-
'code' => $website->language,
73-
], [
74-
'name' => config("locales.{$website->language}.name", 'Unknown'),
75-
]);
76-
} else {
77-
$website->update(['language' => 'en']);
78-
}
79-
8056
// Create home page with English translation
8157
$homePage = Page::updateOrCreate([
8258
'template' => 'home',
@@ -93,21 +69,21 @@ function () use ($website, $user) {
9369
if (! $privacyPolicy) {
9470
$privacyPolicy = Page::create([
9571
'status' => PageStatus::PUBLISHED,
96-
$website->language => [
72+
'en' => [
9773
'title' => __('core::translation.privacy_policy'),
9874
'content' => view('core::frontend.defaults.privacy-policy')->render(),
99-
'locale' => $website->language,
75+
'locale' => 'en',
10076
],
10177
]);
10278
}
10379

10480
if (! $termsOfService) {
10581
$termsOfService = Page::create([
10682
'status' => PageStatus::PUBLISHED,
107-
$website->language => [
83+
'en' => [
10884
'title' => __('core::translation.terms_of_service'),
10985
'content' => view('core::frontend.defaults.terms')->render(),
110-
'locale' => $website->language,
86+
'locale' => 'en',
11187
],
11288
]);
11389
}
@@ -132,30 +108,27 @@ function () use ($website, $user) {
132108
]);
133109

134110
if (!setting('title')) {
135-
setting()?->set('title', $website->title);
111+
setting()?->set('title', 'Juzaweb');
136112
}
137113

138114
if (!setting('description')) {
139-
setting()?->set('description', $website->description);
115+
setting()?->set('description', 'Just another Juzaweb site');
140116
}
141117
if (!setting('language')) {
142-
setting()?->set('language', $website->language ?? 'en');
118+
setting()?->set('language', 'en');
143119
}
144120
if (!setting('theme')) {
145121
setting()?->set('theme', $website->theme ?? 'itech');
146122
}
123+
147124
if (!setting('sitename')) {
148-
$host = parse_url($website->url, PHP_URL_HOST);
125+
$host = $request->getHost();
149126
$siteName = generate_site_name_from_host($host);
150127
setting()?->set('sitename', $siteName);
151128
}
152129

153130
theme_setting()?->set('home_page', $homePage->id);
154131
theme_setting()?->set('nav_location', ['main' => $mainMenu->id]);
155-
156-
// Mark website as set up
157-
$website->setup = true;
158-
$website->save();
159132
}
160133
);
161134

0 commit comments

Comments
 (0)