Skip to content

Commit 3bf40af

Browse files
BaspaBaspa
committed
Merge branch '2.x' of github.com:backstagephp/cms into 2.x
2 parents 5cf1f57 + 222208e commit 3bf40af

File tree

10 files changed

+61
-197
lines changed

10 files changed

+61
-197
lines changed

‎database/seeders/BackstageSeeder.php‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Backstage\Models\Language;
1313
use Backstage\Models\Site;
1414
use Backstage\Models\Type;
15-
use Backstage\Models\User;
1615
use Illuminate\Database\Seeder;
1716
use Illuminate\Support\Str;
1817

@@ -173,47 +172,5 @@ public function run(): void
173172
(string) Str::uuid() => ['type' => 'form', 'data' => ['slug' => 'contact']],
174173
]),
175174
]), 'values')->create();
176-
177-
User::factory([
178-
'name' => 'Mark',
179-
'email' => '[email protected]',
180-
'password' => '[email protected]',
181-
])->create();
182-
183-
User::factory([
184-
'name' => 'Rob',
185-
'email' => '[email protected]',
186-
'password' => '[email protected]',
187-
])->create();
188-
189-
User::factory([
190-
'name' => 'Mathieu',
191-
'email' => '[email protected]',
192-
'password' => '[email protected]',
193-
])->create();
194-
195-
User::factory([
196-
'name' => 'Bas',
197-
'email' => '[email protected]',
198-
'password' => '[email protected]',
199-
])->create();
200-
201-
User::factory([
202-
'name' => 'Yoni',
203-
'email' => '[email protected]',
204-
'password' => '[email protected]',
205-
])->create();
206-
207-
User::factory([
208-
'name' => 'Patrick',
209-
'email' => '[email protected]',
210-
'password' => '[email protected]',
211-
])->create();
212-
213-
User::factory([
214-
'name' => 'Sandro',
215-
'email' => '[email protected]',
216-
'password' => '[email protected]',
217-
])->create();
218175
}
219176
}

‎packages/core/config/backstage/cms.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
Backstage\Resources\SettingResource::class,
2323
Backstage\Resources\SiteResource::class,
2424
Backstage\Resources\TagResource::class,
25-
Backstage\Resources\MediaResource::class,
25+
// Backstage\Resources\MediaResource::class,
2626
// Backstage\Resources\TemplateResource::class,
2727
Backstage\Resources\TypeResource::class,
2828
Backstage\Resources\UserResource::class,

‎packages/core/database/seeders/BackstageSeeder.php‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Backstage\Models\Language;
1313
use Backstage\Models\Site;
1414
use Backstage\Models\Type;
15-
use Backstage\Models\User;
1615
use Illuminate\Database\Seeder;
1716
use Illuminate\Support\Str;
1817

@@ -173,47 +172,5 @@ public function run(): void
173172
(string) Str::uuid() => ['type' => 'form', 'data' => ['slug' => 'contact']],
174173
]),
175174
]), 'values')->create();
176-
177-
User::factory([
178-
'name' => 'Mark',
179-
'email' => '[email protected]',
180-
'password' => '[email protected]',
181-
])->create();
182-
183-
User::factory([
184-
'name' => 'Rob',
185-
'email' => '[email protected]',
186-
'password' => '[email protected]',
187-
])->create();
188-
189-
User::factory([
190-
'name' => 'Mathieu',
191-
'email' => '[email protected]',
192-
'password' => '[email protected]',
193-
])->create();
194-
195-
User::factory([
196-
'name' => 'Bas',
197-
'email' => '[email protected]',
198-
'password' => '[email protected]',
199-
])->create();
200-
201-
User::factory([
202-
'name' => 'Yoni',
203-
'email' => '[email protected]',
204-
'password' => '[email protected]',
205-
])->create();
206-
207-
User::factory([
208-
'name' => 'Patrick',
209-
'email' => '[email protected]',
210-
'password' => '[email protected]',
211-
])->create();
212-
213-
User::factory([
214-
'name' => 'Sandro',
215-
'email' => '[email protected]',
216-
'password' => '[email protected]',
217-
])->create();
218175
}
219176
}

‎packages/core/src/BackstageServiceProvider.php‎

Lines changed: 18 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,12 @@ public function configurePackage(Package $package): void
6666
->startWith(function (InstallCommand $command) {
6767
$command->info('Welcome to the Backstage setup process.');
6868
$command->comment("Don't trip over the wires; this is where the magic happens.");
69-
$command->comment('Let\'s get started!');
69+
$command->comment("Let's get started!");
7070

71-
// if ($command->confirm('Would you like us to install Backstage for you?', true)) {
7271
$command->comment('Lights, camera, action! Setting up for the show...');
7372

7473
$command->comment('Preparing stage...');
7574

76-
$command->callSilently('vendor:publish', [
77-
'--tag' => 'translations-config',
78-
'--force' => true,
79-
]);
80-
8175
$command->callSilently('vendor:publish', [
8276
'--tag' => 'backstage-config',
8377
'--force' => true,
@@ -87,8 +81,6 @@ public function configurePackage(Package $package): void
8781

8882
$this->writeMediaPickerConfig();
8983

90-
$this->writeTranslationsConfig();
91-
9284
$command->callSilently('vendor:publish', [
9385
'--tag' => 'backstage-migrations',
9486
'--force' => true,
@@ -120,12 +112,27 @@ public function configurePackage(Package $package): void
120112
$path = app()->environmentFilePath();
121113
file_put_contents($path, file_get_contents($path) . PHP_EOL . $key . '=' . $value);
122114

115+
if ($command->confirm('Would you like to create a user?', true)) {
116+
$command->comment('Our next performer is...');
117+
$user = $command->ask('Your name?');
118+
$email = $command->ask('Your email?');
119+
$password = $command->secret('Your password?');
120+
if ($email && $password) {
121+
User::factory()->create([
122+
'name' => $user,
123+
'email' => $email,
124+
'password' => $password,
125+
]);
126+
} else {
127+
$command->error('Stage frights! User not created.');
128+
}
129+
}
130+
123131
$command->comment('Raise the curtain...');
124-
// }
125132
})
126133
->endWith(function (InstallCommand $command) {
127134
$command->info('The stage is cleared for a fresh start');
128-
$command->comment('You can now go on stage and start creating!');
135+
$command->comment('You can now go on stage (/backstage) and start creating!');
129136
})
130137
->askToStarRepoOnGitHub('backstage/cms');
131138
});
@@ -408,90 +415,6 @@ private function writeMediaPickerConfig(?string $path = null): void
408415
file_put_contents($path, $configContent);
409416
}
410417

411-
private function generateTranslationsConfig(): array
412-
{
413-
$config = [
414-
'scan' => [
415-
'paths' => [
416-
app_path(),
417-
resource_path('views'),
418-
base_path(''),
419-
],
420-
421-
'extensions' => [
422-
'*.php',
423-
'*.blade.php',
424-
'*.json',
425-
],
426-
427-
'functions' => [
428-
'trans',
429-
'trans_choice',
430-
'Lang::transChoice',
431-
'Lang::trans',
432-
'Lang::get',
433-
'Lang::choice',
434-
'@lang',
435-
'@choice',
436-
'__',
437-
],
438-
],
439-
440-
'eloquent' => [
441-
'translatable-models' => [
442-
\Backstage\Models\ContentFieldValue::class,
443-
\Backstage\Models\Tag::class,
444-
],
445-
],
446-
447-
'translators' => [
448-
'default' => env('TRANSLATION_DRIVER', 'google-translate'),
449-
450-
'drivers' => [
451-
'google-translate' => [
452-
// no options
453-
],
454-
455-
'ai' => [
456-
'provider' => \Prism\Prism\Enums\Provider::OpenAI,
457-
'model' => 'gpt-5',
458-
'system_prompt' => 'You are an expert mathematician who explains concepts simply. The only thing you do it output what i ask. No comments, no extra information. Just the answer.',
459-
],
460-
461-
'deep-l' => [
462-
//
463-
],
464-
],
465-
],
466-
];
467-
468-
config(['translations' => $config]);
469-
470-
return $config;
471-
}
472-
473-
private function writeTranslationsConfig(?string $path = null): void
474-
{
475-
$path ??= config_path('translations.php');
476-
477-
// Ensure directory exists
478-
$directory = dirname($path);
479-
if (! is_dir($directory)) {
480-
mkdir($directory, 0755, true);
481-
}
482-
483-
// Generate the config file content
484-
$configContent = "<?php\n\n";
485-
$configContent .= "use Backstage\Models\Tag;\n";
486-
$configContent .= "use Prism\Prism\Enums\Provider;\n";
487-
$configContent .= "use Backstage\Models\ContentFieldValue;\n\n";
488-
489-
// Custom export function to create more readable output
490-
$configContent .= 'return ' . $this->customVarExport($this->generateTranslationsConfig()) . ";\n";
491-
492-
file_put_contents($path, $configContent);
493-
}
494-
495418
private function customVarExport($var, $indent = ''): string
496419
{
497420
switch (gettype($var)) {

‎packages/core/src/Models/ContentFieldValue.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public function getHydratedValue(): Content | HtmlString | array | Collection |
5757
{
5858
if ($this->isRichEditor()) {
5959
$html = self::getRichEditorHtml($this->value ?? '') ?? '';
60+
6061
return $this->shouldHydrate() ? new HtmlString($html) : $html;
6162
}
6263

@@ -92,11 +93,6 @@ public function getHydratedValue(): Content | HtmlString | array | Collection |
9293
$val = $this->value ?? '';
9394
$res = $this->shouldHydrate() ? new HtmlString($val) : $val;
9495

95-
if ($this->field->slug === 'banner-image') {
96-
\Illuminate\Support\Facades\Log::info("[CFV::getHydratedValue] Returning default. Result Type: " . gettype($res));
97-
}
98-
99-
// file_put_contents('/tmp/cfv_return.log', "Field: {$this->field->slug} | Returning default: " . gettype($res) . "\n", FILE_APPEND);
10096
return $res;
10197
}
10298

@@ -247,7 +243,7 @@ public function shouldHydrate(): bool
247243
}
248244

249245
$path = request()->path();
250-
246+
251247
// Broad check for admin/cms/livewire paths
252248
if (str($path)->contains(['admin', 'backstage', 'filament', 'livewire']) || request()->headers->has('X-Livewire-Id')) {
253249
return false;

‎packages/fields/src/Concerns/CanMapDynamicFields.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private function processContainerFieldFillMutation(Model $field, object $fieldIn
172172

173173
// Check for both ULID and slug keys (nested fields use slug)
174174
$mutatedValue = $tempData[$this->record->valueColumn][$field->ulid] ?? $tempData[$this->record->valueColumn][$field->slug] ?? null;
175-
175+
176176
if ($mutatedValue !== null || isset($tempData[$this->record->valueColumn][$field->ulid]) || isset($tempData[$this->record->valueColumn][$field->slug])) {
177177
$this->updateDataAtPath($data[$this->record->valueColumn], $fieldLocation['fullPath'], $fieldLocation['fieldKey'], $mutatedValue);
178178
}
@@ -234,14 +234,14 @@ protected function mutateFormData(array $data, Collection $fields, callable $mut
234234
{
235235
foreach ($fields as $field) {
236236
['config' => $fieldConfig, 'instance' => $fieldInstance] = $this->resolveFieldConfigAndInstance($field);
237-
237+
238238
$valueColumn = $this->record->valueColumn ?? 'values';
239239
$oldValue = $data[$valueColumn][$field->ulid] ?? $data[$valueColumn][$field->slug] ?? 'NOT_SET';
240-
240+
241241
$data = $mutationStrategy($field, $fieldConfig, $fieldInstance, $data);
242-
242+
243243
$newValue = $data[$valueColumn][$field->ulid] ?? $data[$valueColumn][$field->slug] ?? 'NOT_SET';
244-
244+
245245
if ($newValue === true) {
246246
\Log::warning("Field {$field->ulid} (slug: {$field->slug}, type: {$field->field_type}) mutated to TRUE", [
247247
'old_value' => $oldValue,

‎packages/fields/src/Fields/Radio.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static function mutateBeforeSaveCallback(Model $record, Field $field, arr
6868
if (! property_exists($record, 'valueColumn')) {
6969
return $data;
7070
}
71-
71+
7272
$value = $data[$record->valueColumn][$field->ulid] ?? $data[$record->valueColumn][$field->slug] ?? null;
7373

7474
if ($value === null && ! isset($data[$record->valueColumn][$field->ulid]) && ! isset($data[$record->valueColumn][$field->slug])) {

‎packages/fields/src/Fields/Select.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,14 @@ public static function make(string $name, ?Field $field = null): Input
9191
return $input;
9292
}
9393

94-
9594
public static function mutateFormDataCallback(Model $record, Field $field, array $data): array
9695
{
9796
if (! property_exists($record, 'valueColumn')) {
9897
return $data;
9998
}
10099

101100
$value = self::getFieldValueFromRecord($record, $field);
102-
101+
103102
if ($value === null) {
104103
return $data;
105104
}
@@ -114,7 +113,7 @@ public static function mutateBeforeSaveCallback(Model $record, Field $field, arr
114113
if (! property_exists($record, 'valueColumn')) {
115114
return $data;
116115
}
117-
116+
118117
$value = $data[$record->valueColumn][$field->ulid] ?? $data[$record->valueColumn][$field->slug] ?? null;
119118

120119
if ($value === null && ! isset($data[$record->valueColumn][$field->ulid]) && ! isset($data[$record->valueColumn][$field->slug])) {

‎packages/laravel-redirects/database/factories/RedirectFactory.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?php
2+
3+
namespace Backstage\Redirects\Laravel\Database\Factories;
4+
5+
use Backstage\Redirects\Laravel\Models\Redirect;
6+
use Illuminate\Database\Eloquent\Factories\Factory;
7+
8+
class RedirectFactory extends Factory
9+
{
10+
protected $model = Redirect::class;
11+
12+
/**
13+
* Define the model's default state.
14+
*
15+
* @return array<string, mixed>
16+
*/
17+
public function definition(): array
18+
{
19+
return [
20+
'source' => '/' . $this->faker->unique()->slug(),
21+
'destination' => '/' . $this->faker->slug(),
22+
'code' => 301,
23+
'hits' => 0,
24+
];
25+
}
26+
}

0 commit comments

Comments
 (0)