refactor!: migrate packages structure to laravel-modules

.github/workflows/docs.yml

@@ -44,4 +44,4 @@ jobs:
 
       - name: Generate PHPDocs
         run: |
-          php phpDocumentor.phar -d app,packages -t docs
+          php phpDocumentor.phar -d app,modules -t docs

.php-cs-fixer.php

@@ -4,7 +4,7 @@
 use PhpCsFixer\Finder;
 
 $finder = Finder::create()
-    ->in(['app', 'routes', 'database', 'packages'])
+    ->in(['app', 'routes', 'database', 'modules'])
     ->name('*.php')
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
@@ -55,7 +55,7 @@
         ],
         'cast_spaces' => true,
         'class_attributes_separation' => [
-            'elements' =>['const' => 'one', 'method' => 'one', 'property' => 'one', 'trait_import' => 'none', 'case' => 'none']
+            'elements' => ['const' => 'one', 'method' => 'one', 'property' => 'one', 'trait_import' => 'none', 'case' => 'none']
         ],
         'class_definition' => ['single_line' => false],
         'concat_space' => [

Makefile

@@ -15,8 +15,6 @@ DC_RUN_ARGS = $(ENV_FILE) $(DC_PROFILES) $(DC_FILE)
 HOST_UID=$(shell id -u)
 HOST_GID=$(shell id -g)
 
-PACKAGE_DIRS := $(wildcard packages/*/database/migrations)
-
 .PHONY : help migrate up down shell\:app stop-all ps update build restart down-up images\:list images\:clean logs\:app logs containers\:health command\:app
 .DEFAULT_GOAL : help
 
@@ -27,9 +25,6 @@ help: ## Show this help
 
 migrate: ## Run all migrations
 	php artisan migrate
-	@for dir in $(PACKAGE_DIRS); do \
-		php artisan migrate --path=/$$dir; \
-	done
 
 test: ## Run tests using pgsql and redis
 	@docker run -d --rm \

app/Filament/Pages/Settings/SiteSettings.php

@@ -3,7 +3,7 @@
 namespace App\Filament\Pages\Settings;
 
 use Filament\Forms;
-use Packages\Page\Models\Page;
+use Modules\Page\Models\Page;
 use Spatie\Permission\Models\Role as SpatieRole;
 
 class SiteSettings

app/Filament/Resources/ArticleResource.php

@@ -13,7 +13,7 @@
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;
-use Packages\Article\Models\Article;
+use Modules\Article\Models\Article;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
 class ArticleResource extends Resource

app/Filament/Resources/ArticleResource/Widgets/ArticleStatsOverview.php

@@ -5,7 +5,7 @@
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Widgets\StatsOverviewWidget as BaseWidget;
 use Filament\Widgets\StatsOverviewWidget\Stat;
-use Packages\Article\Models\Article;
+use Modules\Article\Models\Article;
 
 class ArticleStatsOverview extends BaseWidget
 {

app/Filament/Resources/ArticleResource/Widgets/RecentArticles.php

@@ -7,7 +7,7 @@
 use Filament\Tables\Actions\Action;
 use Filament\Widgets\TableWidget as BaseWidget;
 use Illuminate\Database\Eloquent\Builder;
-use Packages\Article\Models\Article;
+use Modules\Article\Models\Article;
 
 class RecentArticles extends BaseWidget
 {

app/Filament/Resources/CategoryResource.php

@@ -9,7 +9,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Packages\Category\Models\Category;
+use Modules\Category\Models\Category;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
 class CategoryResource extends Resource

app/Filament/Resources/CommentResource.php

@@ -10,7 +10,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Packages\React\Models\Comment;
+use Modules\React\Models\Comment;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
 class CommentResource extends Resource

app/Filament/Resources/CommentResource/Widgets/CommentStatsOverview.php

@@ -5,7 +5,7 @@
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Widgets\StatsOverviewWidget as BaseWidget;
 use Filament\Widgets\StatsOverviewWidget\Stat;
-use Packages\React\Models\Comment;
+use Modules\React\Models\Comment;
 
 class CommentStatsOverview extends BaseWidget
 {

app/Filament/Resources/CourseChapterResource.php

@@ -10,7 +10,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Packages\Course\Models\CourseChapter;
+use Modules\Course\Models\CourseChapter;
 
 class CourseChapterResource extends Resource
 {

app/Filament/Resources/CourseLessonResource.php

@@ -10,7 +10,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Packages\Course\Models\CourseLesson;
+use Modules\Course\Models\CourseLesson;
 
 class CourseLessonResource extends Resource
 {

app/Filament/Resources/CourseResource.php

@@ -14,7 +14,7 @@
 use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Packages\Course\Models\Course;
+use Modules\Course\Models\Course;
 
 class CourseResource extends Resource
 {

app/Filament/Resources/DislikeResource.php

@@ -4,7 +4,7 @@
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
-use Packages\React\Models\Dislike;
+use Modules\React\Models\Dislike;
 
 class DislikeResource extends Resource
 {

app/Filament/Resources/EntryResource.php

@@ -11,7 +11,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Packages\Entry\Models\Entry;
+use Modules\Entry\Models\Entry;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
 class EntryResource extends Resource

app/Filament/Resources/EntryResource/Widgets/EntryStatsOverview.php

@@ -5,7 +5,7 @@
 use BezhanSalleh\FilamentShield\Traits\HasWidgetShield;
 use Filament\Widgets\StatsOverviewWidget as BaseWidget;
 use Filament\Widgets\StatsOverviewWidget\Stat;
-use Packages\Entry\Models\Entry;
+use Modules\Entry\Models\Entry;
 
 class EntryStatsOverview extends BaseWidget
 {

app/Filament/Resources/EntryResource/Widgets/RecentEntries.php

@@ -7,7 +7,7 @@
 use Filament\Tables\Actions\Action;
 use Filament\Widgets\TableWidget as BaseWidget;
 use Illuminate\Database\Eloquent\Builder;
-use Packages\Entry\Models\Entry;
+use Modules\Entry\Models\Entry;
 
 class RecentEntries extends BaseWidget
 {

app/Filament/Resources/FollowResource.php

@@ -4,7 +4,7 @@
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
-use Packages\React\Models\Follow;
+use Modules\React\Models\Follow;
 
 class FollowResource extends Resource
 {

app/Filament/Resources/LikeResource.php

@@ -4,7 +4,7 @@
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
-use Packages\React\Models\Like;
+use Modules\React\Models\Like;
 
 class LikeResource extends Resource
 {

app/Filament/Resources/NewsResource.php

@@ -13,7 +13,7 @@
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;
-use Packages\News\Models\News;
+use Modules\News\Models\News;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
 class NewsResource extends Resource

app/Filament/Resources/PageResource.php

@@ -13,7 +13,7 @@
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;
-use Packages\Page\Models\Page;
+use Modules\Page\Models\Page;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
 class PageResource extends Resource

app/Filament/Resources/SaveResource.php

@@ -4,7 +4,7 @@
 
 use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
 use Filament\Resources\Resource;
-use Packages\React\Models\Save;
+use Modules\React\Models\Save;
 
 class SaveResource extends Resource
 {

app/Filament/Resources/TagResource.php

@@ -9,7 +9,7 @@
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Packages\Tag\Models\Tag;
+use Modules\Tag\Models\Tag;
 use Rmsramos\Activitylog\RelationManagers\ActivitylogRelationManager;
 
 class TagResource extends Resource

app/Jobs/GenerateSitemapJob.php

@@ -45,42 +45,42 @@ public function handle(): void
                 ->setLastModificationDate($user->updated_at));
         }
 
-        foreach (\Packages\Article\Models\Article::where('status', 'PUBLISHED')->get() as $article) {
+        foreach (\Modules\Article\Models\Article::where('status', 'PUBLISHED')->get() as $article) {
             $totalItems += 1;
             $sitemap->add(Url::create(route('article.view', ['slug' => $article->slug]))
                 ->setPriority(0.7)
                 ->setLastModificationDate($article->updated_at));
         }
 
-        foreach (\Packages\Entry\Models\Entry::get() as $entry) {
+        foreach (\Modules\Entry\Models\Entry::get() as $entry) {
             $totalItems += 1;
             $sitemap->add(Url::create(route('entry.view', ['slug' => $entry->slug]))
                 ->setPriority(0.6)
                 ->setLastModificationDate($entry->created_at));
         }
 
-        foreach (\Packages\News\Models\News::where('status', 'PUBLISHED')->get() as $news) {
+        foreach (\Modules\News\Models\News::where('status', 'PUBLISHED')->get() as $news) {
             $totalItems += 1;
             $sitemap->add(Url::create(route('news.view', ['slug' => $news->slug]))
                 ->setPriority(0.6)
                 ->setLastModificationDate($news->updated_at));
         }
 
-        foreach (\Packages\Page\Models\Page::where('status', 'PUBLISHED')->get() as $page) {
+        foreach (\Modules\Page\Models\Page::where('status', 'PUBLISHED')->get() as $page) {
             $totalItems += 1;
             $sitemap->add(Url::create(route('page.view', ['slug' => $page->slug]))
                 ->setPriority(0.5)
                 ->setLastModificationDate($page->updated_at));
         }
 
-        foreach (\Packages\Tag\Models\Tag::all() as $tag) {
+        foreach (\Modules\Tag\Models\Tag::all() as $tag) {
             $totalItems += 1;
             $sitemap->add(Url::create(route('tag.view', ['slug' => $tag->slug]))
                 ->setPriority(0.4)
                 ->setLastModificationDate($tag->updated_at));
         }
 
-        foreach (\Packages\Category\Models\Category::all() as $cat) {
+        foreach (\Modules\Category\Models\Category::all() as $cat) {
             $totalItems += 1;
             $sitemap->add(Url::create(route('category.view', ['slug' => $cat->slug]))
                 ->setPriority(0.4)

app/Models/User.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Packages\User\Models\User as BaseUser;
+use Modules\User\Models\User as BaseUser;
 
 /**
  * @property int $id
@@ -21,23 +21,23 @@
  * @property-read mixed $breezy_session
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \Jeffgreco13\FilamentBreezy\Models\BreezySession> $breezySessions
  * @property-read int|null $breezy_sessions_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \Packages\React\Models\Follow> $followers
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \Modules\React\Models\Follow> $followers
  * @property-read int|null $followers_count
- * @property-read \Illuminate\Database\Eloquent\Collection<int, \Packages\React\Models\Follow> $followings
+ * @property-read \Illuminate\Database\Eloquent\Collection<int, \Modules\React\Models\Follow> $followings
  * @property-read int|null $followings_count
  * @property-read \Spatie\MediaLibrary\MediaCollections\Models\Collections\MediaCollection<int, \Spatie\MediaLibrary\MediaCollections\Models\Media> $media
  * @property-read int|null $media_count
  * @property-read \Illuminate\Notifications\DatabaseNotificationCollection<int, \Illuminate\Notifications\DatabaseNotification> $notifications
  * @property-read int|null $notifications_count
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \Spatie\Permission\Models\Permission> $permissions
  * @property-read int|null $permissions_count
- * @property-read \Packages\User\Models\UserProfile|null $profile
+ * @property-read \Modules\User\Models\UserProfile|null $profile
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \Spatie\Permission\Models\Role> $roles
  * @property-read int|null $roles_count
  * @property-read mixed $two_factor_recovery_codes
  * @property-read mixed $two_factor_secret
  *
- * @method static \Packages\User\Database\Factories\UserFactory factory($count = null, $state = [])
+ * @method static \Modules\User\Database\Factories\UserFactory factory($count = null, $state = [])
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User newModelQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User newQuery()
  * @method static \Illuminate\Database\Eloquent\Builder<static>|User onlyTrashed()

app/Services/SeoService.php

@@ -8,18 +8,18 @@
 use Honeystone\Seo\Contracts\BuildsMetadata;
 use Honeystone\Seo\OpenGraph\ArticleProperties;
 use Honeystone\Seo\OpenGraph\ProfileProperties;
-use Packages\Article\Data\ArticleData;
-use Packages\Category\Data\CategoryData;
-use Packages\Category\Data\CategoryProfileData;
-use Packages\Course\Data\CourseData;
-use Packages\Course\Data\CourseLessonData;
-use Packages\Entry\Data\EntryData;
-use Packages\News\Data\NewsData;
-use Packages\Page\Data\PageData;
-use Packages\Tag\Data\TagData;
-use Packages\Tag\Data\TagProfileData;
-use Packages\User\Data\UserData;
-use Packages\User\Data\UserProfileData;
+use Modules\Article\Data\ArticleData;
+use Modules\Category\Data\CategoryData;
+use Modules\Category\Data\CategoryProfileData;
+use Modules\Course\Data\CourseData;
+use Modules\Course\Data\CourseLessonData;
+use Modules\Entry\Data\EntryData;
+use Modules\News\Data\NewsData;
+use Modules\Page\Data\PageData;
+use Modules\Tag\Data\TagData;
+use Modules\Tag\Data\TagProfileData;
+use Modules\User\Data\UserData;
+use Modules\User\Data\UserProfileData;
 use Spatie\SchemaOrg\Schema;
 
 class SeoService

bootstrap/providers.php

@@ -2,16 +2,5 @@
 
 return [
     App\Providers\AppServiceProvider::class,
-    App\Providers\Filament\AdminPanelProvider::class,
-    Packages\User\UserProvider::class,
-    Packages\Article\ArticleProvider::class,
-    Packages\Category\CategoryProvider::class,
-    Packages\News\NewsProvider::class,
-    Packages\Page\PageProvider::class,
-    Packages\Recommend\RecommendProvider::class,
-    Packages\Tag\TagProvider::class,
-    Packages\Entry\EntryProvider::class,
-    Packages\React\ReactProvider::class,
-    Packages\Search\SearchProvider::class,
-    Packages\Course\CourseProvider::class
+    App\Providers\Filament\AdminPanelProvider::class
 ];