wip

Author: WovenCoast

composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.3",
         "illuminate/support": "^9.0 || ^10.0 || ^11.0 || ^12.0",
         "javaabu/helpers": "^1.61",
         "javaabu/translatable": "^1.1",
@@ -33,7 +33,10 @@
     },
     "autoload": {
         "psr-4": {
-            "Javaabu\\Cms\\": "src/"
+            "Javaabu\\Cms\\": "src/",
+            "Javaabu\\Cms\\Database\\Factories\\": "database/factories/",
+            "Javaabu\\Cms\\Database\\Seeders\\": "database/seeders/"
+
         }
     },
     "autoload-dev": {

database/factories/PostFactory.php

@@ -1,39 +1,45 @@
 <?php
 
-namespace Database\Factories;
+namespace Javaabu\Cms\Database\Factories;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 use Javaabu\Cms\Models\Post;
 use Javaabu\Cms\Models\PostType;
 use Javaabu\Cms\Support\Faker\Factory\ContentBlockFactory;
+use Javaabu\Helpers\Enums\PublishStatuses;
 
 class PostFactory extends ContentBlockFactory
 {
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var class-string<\Illuminate\Database\Eloquent\Model>
+     */
     protected $model = Post::class;
 
     public function definition(): array
     {
         return [
-            'title' => $this->faker->word(),
-            'slug' => $this->faker->slug(),
+            'title' => fake()->words(2, true),
+            'slug' => fake()->slug(),
             'content' => $this->getContentBlock(),
-            'excerpt' => $this->faker->word(),
-            'menu_order' => $this->faker->randomNumber(),
-            'status' => $this->faker->word(),
-            'published_at' => Carbon::now(),
-            'created_at' => Carbon::now(),
-            'updated_at' => Carbon::now(),
-            'document_no' => $this->faker->word(),
-            'expire_at' => Carbon::now(),
-            'format' => $this->faker->word(),
-            'video_url' => $this->faker->url(),
-            'page_style' => $this->faker->word(),
-            'ref_no' => $this->faker->word(),
-            'recently_updated' => $this->faker->boolean(),
-            'coords' => $this->faker->word(),
-            'city_id' => $this->faker->randomNumber(),
-
+            'excerpt' => fake()->words(2, true),
+            'menu_order' => fake()->randomNumber(),
+            'status' => fake()->randomElement(PublishStatuses::cases()),
+//            'published_at' => Carbon::now(),
+//            'created_at' => Carbon::now(),
+//            'updated_at' => Carbon::now(),
+//            'document_no' => fake()->words(2, true),
+//            'expire_at' => Carbon::now(),
+//            'format' => fake()->words(2, true),
+//            'video_url' => fake()->url(),
+//            'page_style' => fake()->words(2, true),
+//            'ref_no' => fake()->words(2, true),
+//            'recently_updated' => fake()->boolean(),
+//            'coords' => fake()->words(2, true),
+//            'city_id' => fake()->randomNumber(),
+//
             'type' => random_id_or_generate(PostType::class, 'slug'),
         ];
     }

src/Cms.php

@@ -83,15 +83,15 @@ public function registerNormalRoutes(): void
         foreach ($post_types as $post_type) {
             Route::get($post_type->slug, [config('cms.web.controllers.posts'), 'index'])
                 ->defaults('web_post_type_slug', $post_type->slug)
-                ->name('cms::posts.index.' . $post_type->slug);
+                ->name('web.posts.index.' . $post_type->slug);
 
             Route::get($post_type->slug . '/{post_slug}', [config('cms.web.controllers.posts'), 'show'])
                 ->defaults('web_post_type_slug', $post_type)
-                ->name('cms::posts.show.' . $post_type->slug);
+                ->name('web.posts.show.' . $post_type->slug);
 
 //            Route::get($post_type->slug . '/{post_slug}/files', [PostsController::class, 'downloadFiles'])
 //                ->defaults('web_post_type_slug', $post_type)
-//                ->name('cms::posts.show.files.' . $post_type->slug);
+//                ->name('web.posts.show.files.' . $post_type->slug);
         }
     }
 

src/Models/Post.php

@@ -3,7 +3,7 @@
 namespace Javaabu\Cms\Models;
 
 use Carbon\Carbon;
-use Database\Factories\PostFactory;
+use Javaabu\Cms\Database\Factories\PostFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -179,10 +179,10 @@ public function getAdminLinkNameAttribute(): string
      * @param string $namespace
      * @return string
      */
-    public function url(string $action = 'show', string $locale = null, string $namespace = 'cms::'): string
+    public function url(string $action = 'show', string $locale = null, string $namespace = 'web'): string
     {
         $controller = Str::lower(Str::plural(Str::kebab(class_basename(get_class($this)))));
-        $controller_action = $namespace . '.' . $controller . '.' . $action;
+        $controller_action = $namespace . '.' . $controller . '.' . $action . '.' . $this->postType->slug;
 
         $params = [
             'post_type' => $this->postType->slug,
@@ -328,9 +328,9 @@ public function translatedPermalink(string $action = 'show', string $locale = nu
         $controller = Str::lower(Str::plural(Str::kebab(class_basename(get_class($this)))));
 
         if ($post_type_slug != 'pages') {
-            $controller_action = 'cms::' . $controller . '.' . $action . '.' . $post_type_slug;
+            $controller_action = 'web.' . $controller . '.' . $action . '.' . $post_type_slug;
         } else {
-            $controller_action = 'cms::pages.' . $action;
+            $controller_action = 'web.pages.' . $action;
         }
 
         $params = [$locale, $this->slug];
@@ -437,8 +437,13 @@ public function getContentBlocksAttribute(): array
         }
     }
 
-    protected static function newFactory(): PostFactory
+    protected static function newFactory()
     {
         return PostFactory::new();
     }
+
+//    protected static function newFactory(): PostFactory
+//    {
+//        return new PostFactory();
+//    }
 }

src/Models/PostType.php

@@ -3,6 +3,7 @@
 namespace Javaabu\Cms\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Javaabu\Cms\Database\Factories\PostTypeFactory;
 use Javaabu\Helpers\AdminModel\AdminModel;
@@ -104,6 +105,11 @@ public function posts(): HasMany
         return $this->hasMany(Post::class, 'type', 'slug');
     }
 
+    public function categoryType(): BelongsTo
+    {
+        return $this->belongsTo(CategoryType::class, 'category_type_id', 'id');
+    }
+
     protected static function newFactory(): PostTypeFactory
     {
         return PostTypeFactory::new();

src/Support/Faker/ContentBlockFactory.php …rt/Faker/Factory/ContentBlockFactory.phpsrc/Support/Faker/ContentBlockFactory.php renamed to src/Support/Faker/Factory/ContentBlockFactory.php src/Support/Faker/ContentBlockFactory.php renamed to src/Support/Faker/Factory/ContentBlockFactory.php

@@ -18,11 +18,11 @@ abstract function definition();
 
     public function getContentBlock()
     {
-        return (new EnglishContentBlock(true))->get();
+        return (new EnglishContentBlock(fake(), true))->get();
     }
 
     public function getLiteContentBlock()
     {
-        return (new EnglishContentBlock(true, true))->get();
+        return (new EnglishContentBlock(fake(), true, true))->get();
     }
 }