diff --git a/modules/.gitignore b/modules/.gitignore index 72c3c59b..aff817d1 100644 --- a/modules/.gitignore +++ b/modules/.gitignore @@ -3,5 +3,5 @@ /* /*/ !.gitignore -!/Sample/ -!/vacentral/ +!/Sample +!/vacentral diff --git a/modules/Sample/Config/config.php b/modules/Sample/Config/config.php deleted file mode 100644 index 36578109..00000000 --- a/modules/Sample/Config/config.php +++ /dev/null @@ -1,5 +0,0 @@ - 'Sample' -]; diff --git a/modules/Sample/Database/seeders/SampleDatabaseSeeder.php b/modules/Sample/Database/seeders/SampleDatabaseSeeder.php deleted file mode 100644 index dad32f12..00000000 --- a/modules/Sample/Database/seeders/SampleDatabaseSeeder.php +++ /dev/null @@ -1,21 +0,0 @@ -call("OthersTableSeeder"); - } -} diff --git a/modules/Sample/Http/Controllers/AdminController.php b/modules/Sample/Http/Controllers/AdminController.php deleted file mode 100644 index 596724f3..00000000 --- a/modules/Sample/Http/Controllers/AdminController.php +++ /dev/null @@ -1,63 +0,0 @@ - [ - 'role:admin|user' # leave blank to make this public -]], function() { - - # all your routes are prefixed with the above prefix - # e.g. yoursite.com/sample - Route::get('/', 'SampleController@index'); - - # This is the admin path. Comment this out if you don't have - # an admin panel component. - Route::group([ - 'middleware' => ['role:admin'], - ], function () { - Route::get('/admin', 'AdminController@index'); - }); -}); diff --git a/modules/Sample/Listeners/TestEventListener.php b/modules/Sample/Listeners/TestEventListener.php deleted file mode 100644 index 4725fd4b..00000000 --- a/modules/Sample/Listeners/TestEventListener.php +++ /dev/null @@ -1,16 +0,0 @@ -moduleSvc = app('App\Services\ModuleService'); - - $this->registerRoutes(); - $this->registerTranslations(); - $this->registerConfig(); - $this->registerViews(); - - $this->registerLinks(); - - $this->registerFactories(); - $this->loadMigrationsFrom(__DIR__ . '/../Database/migrations'); - } - - /** - * Register the service provider. - */ - public function register() - { - // - } - - /** - * Add module links here - */ - public function registerLinks() - { - // Show this link if logged in - // $this->moduleSvc->addFrontendLink('Sample', '/sample', '', $logged_in=true); - - // Admin links: - $this->moduleSvc->addAdminLink('Sample', '/sample/admin'); - } - - /** - * Register the routes - */ - protected function registerRoutes() - { - Route::group([ - 'as' => 'sample.', - 'prefix' => 'sample', - // If you want a RESTful module, change this to 'api' - 'middleware' => ['web'], - 'namespace' => 'Modules\Sample\Http\Controllers' - ], function() { - $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); - }); - } - - /** - * Register config. - */ - protected function registerConfig() - { - $this->publishes([ - __DIR__.'/../Config/config.php' => config_path('sample.php'), - ], 'config'); - - $this->mergeConfigFrom( - __DIR__.'/../Config/config.php', 'sample' - ); - } - - /** - * Register views. - */ - public function registerViews() - { - $viewPath = resource_path('views/modules/sample'); - $sourcePath = __DIR__.'/../Resources/views'; - - $this->publishes([ - $sourcePath => $viewPath - ],'views'); - - $this->loadViewsFrom(array_merge(array_map(function ($path) { - return $path . '/modules/sample'; - }, \Config::get('view.paths')), [$sourcePath]), 'sample'); - } - - /** - * Register translations. - */ - public function registerTranslations() - { - $langPath = resource_path('lang/modules/sample'); - - if (is_dir($langPath)) { - $this->loadTranslationsFrom($langPath, 'sample'); - } else { - $this->loadTranslationsFrom(__DIR__ .'/../Resources/lang', 'sample'); - } - } - - /** - * Register an additional directory of factories. - * @source https://github.com/sebastiaanluca/laravel-resource-flow/blob/develop/src/Modules/ModuleServiceProvider.php#L66 - */ - public function registerFactories() - { - if (! app()->environment('production')) { - app(Factory::class)->load(__DIR__ . '/../Database/factories'); - } - } - - /** - * Get the services provided by the provider. - */ - public function provides() - { - return []; - } -} diff --git a/modules/Sample/Resources/views/admin/index.blade.php b/modules/Sample/Resources/views/admin/index.blade.php deleted file mode 100644 index 62e588c0..00000000 --- a/modules/Sample/Resources/views/admin/index.blade.php +++ /dev/null @@ -1,18 +0,0 @@ -@extends('sample::layouts.admin') - -@section('title', 'Sample') -@section('actions') -
  • - - - Add New -
  • -@endsection -@section('content') -
    -

    Admin Scaffold!

    -
    -

    This view is loaded from module: {!! config('sample.name') !!}

    -
    -
    -@endsection diff --git a/modules/Sample/Resources/views/index.blade.php b/modules/Sample/Resources/views/index.blade.php deleted file mode 100644 index 6198e2fb..00000000 --- a/modules/Sample/Resources/views/index.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@extends('sample::layouts.frontend') - -@section('content') -

    Hello World

    - -

    - This view is loaded from module: {!! config('sample.name') !!} -

    -@endsection diff --git a/modules/Sample/Resources/views/layouts/admin.blade.php b/modules/Sample/Resources/views/layouts/admin.blade.php deleted file mode 100644 index 421bbe11..00000000 --- a/modules/Sample/Resources/views/layouts/admin.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -{{-- -You probably don't want to edit anything here. Just make -sure to extend this in your views. It will pass the content section through ---}} -@extends('admin.app') diff --git a/modules/Sample/Resources/views/layouts/frontend.blade.php b/modules/Sample/Resources/views/layouts/frontend.blade.php deleted file mode 100644 index 9340e4f9..00000000 --- a/modules/Sample/Resources/views/layouts/frontend.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -{{-- -You probably don't want to edit anything here. Just make -sure to extend this in your views. It will pass the content section through ---}} -@extends('layouts.' . config('phpvms.skin') . '.app') diff --git a/modules/Sample/module.json b/modules/Sample/module.json deleted file mode 100644 index 7f563f3b..00000000 --- a/modules/Sample/module.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Sample", - "alias": "sample", - "description": "", - "keywords": [], - "active": 1, - "order": 0, - "providers": [ - "Modules\\Sample\\Providers\\SampleServiceProvider", - "Modules\\Sample\\Providers\\EventServiceProvider" - ], - "aliases": {}, - "files": [], - "requires": [] -} diff --git a/modules/vacentral/Config/config.php b/modules/vacentral/Config/config.php new file mode 100644 index 00000000..b0e617d3 --- /dev/null +++ b/modules/vacentral/Config/config.php @@ -0,0 +1,5 @@ + 'vacentral' +]; diff --git a/modules/vacentral/Listeners/PirepAcceptedEventListener.php b/modules/vacentral/Listeners/PirepAcceptedEventListener.php new file mode 100644 index 00000000..e8971f63 --- /dev/null +++ b/modules/vacentral/Listeners/PirepAcceptedEventListener.php @@ -0,0 +1,18 @@ +registerConfig(); + } + + /** + * Register the service provider. + */ + public function register() + { + // + } + + /** + * Register config. + */ + protected function registerConfig() + { + $this->publishes([ + __DIR__.'/../Config/config.php' => config_path('vacentral.php'), + ], 'config'); + + $this->mergeConfigFrom( + __DIR__.'/../Config/config.php', 'vacentral' + ); + } +} diff --git a/modules/Sample/Providers/EventServiceProvider.php b/modules/vacentral/Providers/EventServiceProvider.php similarity index 65% rename from modules/Sample/Providers/EventServiceProvider.php rename to modules/vacentral/Providers/EventServiceProvider.php index f0044216..ac757014 100644 --- a/modules/Sample/Providers/EventServiceProvider.php +++ b/modules/vacentral/Providers/EventServiceProvider.php @@ -1,9 +1,9 @@ [TestEventListener::class], + PirepAccepted::class => [PirepAcceptedEventListener::class], ]; /** diff --git a/modules/Sample/composer.json b/modules/vacentral/composer.json similarity index 69% rename from modules/Sample/composer.json rename to modules/vacentral/composer.json index 9b016e64..7e9fde06 100644 --- a/modules/Sample/composer.json +++ b/modules/vacentral/composer.json @@ -1,7 +1,7 @@ { - "name": "nabeel/sample", - "type": "laravel-module", + "name": "nabeel/vacentral", "license": "MIT", + "type": "laravel-module", "description": "", "authors": [ { @@ -15,8 +15,8 @@ "extra": { "laravel": { "providers": [ - "Modules\\Sample\\Providers\\SampleServiceProvider", - "Modules\\Sample\\Providers\\EventServiceProvider" + "Modules\\Vacentral\\Providers\\AppServiceProvider", + "Modules\\Vacentral\\Providers\\EventServiceProvider" ], "aliases": { @@ -25,7 +25,7 @@ }, "autoload": { "psr-4": { - "Modules\\Sample\\": "" + "Modules\\Vacentral\\": "" } } } diff --git a/modules/vacentral/module.json b/modules/vacentral/module.json new file mode 100644 index 00000000..9de82ca6 --- /dev/null +++ b/modules/vacentral/module.json @@ -0,0 +1,15 @@ +{ + "name": "vacentral", + "alias": "", + "description": "", + "keywords": [], + "active": 1, + "order": 0, + "providers": [ + "Modules\\Vacentral\\Providers\\AppServiceProvider", + "Modules\\Vacentral\\Providers\\EventServiceProvider" + ], + "aliases": {}, + "files": [], + "requires": [] +}