From 572153b0a41c3fb7f417a337000b084aab9efd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com> Date: Fri, 15 Jan 2021 22:01:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Modules/Bbs/Config/.gitkeep | 0 app/Modules/Bbs/Config/config.php | 5 + app/Modules/Bbs/Console/.gitkeep | 0 app/Modules/Bbs/Database/Migrations/.gitkeep | 0 app/Modules/Bbs/Database/Seeders/.gitkeep | 0 .../Database/Seeders/BbsDatabaseSeeder.php | 21 ++++ app/Modules/Bbs/Database/factories/.gitkeep | 0 app/Modules/Bbs/Entities/.gitkeep | 0 app/Modules/Bbs/Http/Controllers/.gitkeep | 0 .../Bbs/Http/Controllers/BbsController.php | 79 ++++++++++++ app/Modules/Bbs/Http/Middleware/.gitkeep | 0 app/Modules/Bbs/Http/Requests/.gitkeep | 0 app/Modules/Bbs/Providers/.gitkeep | 0 .../Bbs/Providers/BbsServiceProvider.php | 112 ++++++++++++++++++ .../Bbs/Providers/RouteServiceProvider.php | 69 +++++++++++ app/Modules/Bbs/Resources/assets/.gitkeep | 0 app/Modules/Bbs/Resources/assets/js/app.js | 0 .../Bbs/Resources/assets/sass/app.scss | 0 app/Modules/Bbs/Resources/lang/.gitkeep | 0 app/Modules/Bbs/Resources/views/.gitkeep | 0 .../Bbs/Resources/views/index.blade.php | 9 ++ .../Resources/views/layouts/master.blade.php | 19 +++ app/Modules/Bbs/Routes/.gitkeep | 0 app/Modules/Bbs/Routes/api.php | 18 +++ app/Modules/Bbs/Routes/web.php | 16 +++ app/Modules/Bbs/Tests/Feature/.gitkeep | 0 app/Modules/Bbs/Tests/Unit/.gitkeep | 0 app/Modules/Bbs/composer.json | 23 ++++ app/Modules/Bbs/module.json | 13 ++ app/Modules/Bbs/package.json | 17 +++ app/Modules/Bbs/webpack.mix.js | 14 +++ modules_statuses.json | 3 +- 32 files changed, 417 insertions(+), 1 deletion(-) create mode 100644 app/Modules/Bbs/Config/.gitkeep create mode 100644 app/Modules/Bbs/Config/config.php create mode 100644 app/Modules/Bbs/Console/.gitkeep create mode 100644 app/Modules/Bbs/Database/Migrations/.gitkeep create mode 100644 app/Modules/Bbs/Database/Seeders/.gitkeep create mode 100644 app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php create mode 100644 app/Modules/Bbs/Database/factories/.gitkeep create mode 100644 app/Modules/Bbs/Entities/.gitkeep create mode 100644 app/Modules/Bbs/Http/Controllers/.gitkeep create mode 100644 app/Modules/Bbs/Http/Controllers/BbsController.php create mode 100644 app/Modules/Bbs/Http/Middleware/.gitkeep create mode 100644 app/Modules/Bbs/Http/Requests/.gitkeep create mode 100644 app/Modules/Bbs/Providers/.gitkeep create mode 100644 app/Modules/Bbs/Providers/BbsServiceProvider.php create mode 100644 app/Modules/Bbs/Providers/RouteServiceProvider.php create mode 100644 app/Modules/Bbs/Resources/assets/.gitkeep create mode 100644 app/Modules/Bbs/Resources/assets/js/app.js create mode 100644 app/Modules/Bbs/Resources/assets/sass/app.scss create mode 100644 app/Modules/Bbs/Resources/lang/.gitkeep create mode 100644 app/Modules/Bbs/Resources/views/.gitkeep create mode 100644 app/Modules/Bbs/Resources/views/index.blade.php create mode 100644 app/Modules/Bbs/Resources/views/layouts/master.blade.php create mode 100644 app/Modules/Bbs/Routes/.gitkeep create mode 100644 app/Modules/Bbs/Routes/api.php create mode 100644 app/Modules/Bbs/Routes/web.php create mode 100644 app/Modules/Bbs/Tests/Feature/.gitkeep create mode 100644 app/Modules/Bbs/Tests/Unit/.gitkeep create mode 100644 app/Modules/Bbs/composer.json create mode 100644 app/Modules/Bbs/module.json create mode 100644 app/Modules/Bbs/package.json create mode 100644 app/Modules/Bbs/webpack.mix.js diff --git a/app/Modules/Bbs/Config/.gitkeep b/app/Modules/Bbs/Config/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Config/config.php b/app/Modules/Bbs/Config/config.php new file mode 100644 index 0000000..f32b2c6 --- /dev/null +++ b/app/Modules/Bbs/Config/config.php @@ -0,0 +1,5 @@ + 'Bbs' +]; diff --git a/app/Modules/Bbs/Console/.gitkeep b/app/Modules/Bbs/Console/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Database/Migrations/.gitkeep b/app/Modules/Bbs/Database/Migrations/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Database/Seeders/.gitkeep b/app/Modules/Bbs/Database/Seeders/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php b/app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php new file mode 100644 index 0000000..cea0aa9 --- /dev/null +++ b/app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php @@ -0,0 +1,21 @@ +call("OthersTableSeeder"); + } +} diff --git a/app/Modules/Bbs/Database/factories/.gitkeep b/app/Modules/Bbs/Database/factories/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Entities/.gitkeep b/app/Modules/Bbs/Entities/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Http/Controllers/.gitkeep b/app/Modules/Bbs/Http/Controllers/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Http/Controllers/BbsController.php b/app/Modules/Bbs/Http/Controllers/BbsController.php new file mode 100644 index 0000000..1527f5a --- /dev/null +++ b/app/Modules/Bbs/Http/Controllers/BbsController.php @@ -0,0 +1,79 @@ +registerTranslations(); + $this->registerConfig(); + $this->registerViews(); + $this->loadMigrationsFrom(module_path($this->moduleName, 'Database/Migrations')); + } + + /** + * Register the service provider. + * + * @return void + */ + public function register() + { + $this->app->register(RouteServiceProvider::class); + } + + /** + * Register config. + * + * @return void + */ + protected function registerConfig() + { + $this->publishes([ + module_path($this->moduleName, 'Config/config.php') => config_path($this->moduleNameLower . '.php'), + ], 'config'); + $this->mergeConfigFrom( + module_path($this->moduleName, 'Config/config.php'), $this->moduleNameLower + ); + } + + /** + * Register views. + * + * @return void + */ + public function registerViews() + { + $viewPath = resource_path('views/modules/' . $this->moduleNameLower); + + $sourcePath = module_path($this->moduleName, 'Resources/views'); + + $this->publishes([ + $sourcePath => $viewPath + ], ['views', $this->moduleNameLower . '-module-views']); + + $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower); + } + + /** + * Register translations. + * + * @return void + */ + public function registerTranslations() + { + $langPath = resource_path('lang/modules/' . $this->moduleNameLower); + + if (is_dir($langPath)) { + $this->loadTranslationsFrom($langPath, $this->moduleNameLower); + } else { + $this->loadTranslationsFrom(module_path($this->moduleName, 'Resources/lang'), $this->moduleNameLower); + } + } + + /** + * Get the services provided by the provider. + * + * @return array + */ + public function provides() + { + return []; + } + + private function getPublishableViewPaths(): array + { + $paths = []; + foreach (\Config::get('view.paths') as $path) { + if (is_dir($path . '/modules/' . $this->moduleNameLower)) { + $paths[] = $path . '/modules/' . $this->moduleNameLower; + } + } + return $paths; + } +} diff --git a/app/Modules/Bbs/Providers/RouteServiceProvider.php b/app/Modules/Bbs/Providers/RouteServiceProvider.php new file mode 100644 index 0000000..c966617 --- /dev/null +++ b/app/Modules/Bbs/Providers/RouteServiceProvider.php @@ -0,0 +1,69 @@ +mapApiRoutes(); + + $this->mapWebRoutes(); + } + + /** + * Define the "web" routes for the application. + * + * These routes all receive session state, CSRF protection, etc. + * + * @return void + */ + protected function mapWebRoutes() + { + Route::middleware('web') + ->namespace($this->moduleNamespace) + ->group(module_path('Bbs', '/Routes/web.php')); + } + + /** + * Define the "api" routes for the application. + * + * These routes are typically stateless. + * + * @return void + */ + protected function mapApiRoutes() + { + Route::prefix('api') + ->middleware('api') + ->namespace($this->moduleNamespace) + ->group(module_path('Bbs', '/Routes/api.php')); + } +} diff --git a/app/Modules/Bbs/Resources/assets/.gitkeep b/app/Modules/Bbs/Resources/assets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Resources/assets/js/app.js b/app/Modules/Bbs/Resources/assets/js/app.js new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Resources/assets/sass/app.scss b/app/Modules/Bbs/Resources/assets/sass/app.scss new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Resources/lang/.gitkeep b/app/Modules/Bbs/Resources/lang/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Resources/views/.gitkeep b/app/Modules/Bbs/Resources/views/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Resources/views/index.blade.php b/app/Modules/Bbs/Resources/views/index.blade.php new file mode 100644 index 0000000..275b588 --- /dev/null +++ b/app/Modules/Bbs/Resources/views/index.blade.php @@ -0,0 +1,9 @@ +@extends('bbs::layouts.master') + +@section('content') +

Hello World

+ +

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

+@endsection diff --git a/app/Modules/Bbs/Resources/views/layouts/master.blade.php b/app/Modules/Bbs/Resources/views/layouts/master.blade.php new file mode 100644 index 0000000..c693be5 --- /dev/null +++ b/app/Modules/Bbs/Resources/views/layouts/master.blade.php @@ -0,0 +1,19 @@ + + + + + + + Module Bbs + + {{-- Laravel Mix - CSS File --}} + {{-- --}} + + + + @yield('content') + + {{-- Laravel Mix - JS File --}} + {{-- --}} + + diff --git a/app/Modules/Bbs/Routes/.gitkeep b/app/Modules/Bbs/Routes/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Routes/api.php b/app/Modules/Bbs/Routes/api.php new file mode 100644 index 0000000..69376d8 --- /dev/null +++ b/app/Modules/Bbs/Routes/api.php @@ -0,0 +1,18 @@ +get('/bbs', function (Request $request) { + return $request->user(); +}); \ No newline at end of file diff --git a/app/Modules/Bbs/Routes/web.php b/app/Modules/Bbs/Routes/web.php new file mode 100644 index 0000000..af4b822 --- /dev/null +++ b/app/Modules/Bbs/Routes/web.php @@ -0,0 +1,16 @@ +group(function() { + Route::get('/', 'BbsController@index'); +}); diff --git a/app/Modules/Bbs/Tests/Feature/.gitkeep b/app/Modules/Bbs/Tests/Feature/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/Tests/Unit/.gitkeep b/app/Modules/Bbs/Tests/Unit/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/app/Modules/Bbs/composer.json b/app/Modules/Bbs/composer.json new file mode 100644 index 0000000..6627ab5 --- /dev/null +++ b/app/Modules/Bbs/composer.json @@ -0,0 +1,23 @@ +{ + "name": "nwidart/bbs", + "description": "", + "authors": [ + { + "name": "Nicolas Widart", + "email": "n.widart@gmail.com" + } + ], + "extra": { + "laravel": { + "providers": [], + "aliases": { + + } + } + }, + "autoload": { + "psr-4": { + "App\\Modules\\Bbs\\": "" + } + } +} diff --git a/app/Modules/Bbs/module.json b/app/Modules/Bbs/module.json new file mode 100644 index 0000000..bd62979 --- /dev/null +++ b/app/Modules/Bbs/module.json @@ -0,0 +1,13 @@ +{ + "name": "Bbs", + "alias": "bbs", + "description": "", + "keywords": [], + "priority": 0, + "providers": [ + "App\\Modules\\Bbs\\Providers\\BbsServiceProvider" + ], + "aliases": {}, + "files": [], + "requires": [] +} diff --git a/app/Modules/Bbs/package.json b/app/Modules/Bbs/package.json new file mode 100644 index 0000000..4599509 --- /dev/null +++ b/app/Modules/Bbs/package.json @@ -0,0 +1,17 @@ +{ + "private": true, + "scripts": { + "dev": "npm run development", + "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", + "watch-poll": "npm run watch -- --watch-poll", + "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", + "prod": "npm run production", + "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" + }, + "devDependencies": { + "cross-env": "^7.0", + "laravel-mix": "^5.0.1", + "laravel-mix-merge-manifest": "^0.1.2" + } +} diff --git a/app/Modules/Bbs/webpack.mix.js b/app/Modules/Bbs/webpack.mix.js new file mode 100644 index 0000000..9cadd4f --- /dev/null +++ b/app/Modules/Bbs/webpack.mix.js @@ -0,0 +1,14 @@ +const dotenvExpand = require('dotenv-expand'); +dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/})); + +const mix = require('laravel-mix'); +require('laravel-mix-merge-manifest'); + +mix.setPublicPath('../../public').mergeManifest(); + +mix.js(__dirname + '/Resources/assets/js/app.js', 'js/bbs.js') + .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/bbs.css'); + +if (mix.inProduction()) { + mix.version(); +} diff --git a/modules_statuses.json b/modules_statuses.json index 85c1078..7d9e1e5 100644 --- a/modules_statuses.json +++ b/modules_statuses.json @@ -1,4 +1,5 @@ { "Admin": true, - "Blog": true + "Blog": true, + "Bbs": true } \ No newline at end of file -- Gitee From 230b246fa87c1e90be9dc3ef5e480128163f981e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com> Date: Fri, 15 Jan 2021 22:55:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AD=A4=E4=BB=93=E5=BA=93=E4=BB=85?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E7=BB=B4=E6=8A=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Modules/Bbs/Config/.gitkeep | 0 app/Modules/Bbs/Config/config.php | 5 - app/Modules/Bbs/Console/.gitkeep | 0 app/Modules/Bbs/Database/Migrations/.gitkeep | 0 app/Modules/Bbs/Database/Seeders/.gitkeep | 0 .../Database/Seeders/BbsDatabaseSeeder.php | 21 ---- app/Modules/Bbs/Database/factories/.gitkeep | 0 app/Modules/Bbs/Entities/.gitkeep | 0 app/Modules/Bbs/Http/Controllers/.gitkeep | 0 .../Bbs/Http/Controllers/BbsController.php | 79 ------------ app/Modules/Bbs/Http/Middleware/.gitkeep | 0 app/Modules/Bbs/Http/Requests/.gitkeep | 0 app/Modules/Bbs/Providers/.gitkeep | 0 .../Bbs/Providers/BbsServiceProvider.php | 112 ------------------ .../Bbs/Providers/RouteServiceProvider.php | 69 ----------- app/Modules/Bbs/Resources/assets/.gitkeep | 0 app/Modules/Bbs/Resources/assets/js/app.js | 0 .../Bbs/Resources/assets/sass/app.scss | 0 app/Modules/Bbs/Resources/lang/.gitkeep | 0 app/Modules/Bbs/Resources/views/.gitkeep | 0 .../Bbs/Resources/views/index.blade.php | 9 -- .../Resources/views/layouts/master.blade.php | 19 --- app/Modules/Bbs/Routes/.gitkeep | 0 app/Modules/Bbs/Routes/api.php | 18 --- app/Modules/Bbs/Routes/web.php | 16 --- app/Modules/Bbs/Tests/Feature/.gitkeep | 0 app/Modules/Bbs/Tests/Unit/.gitkeep | 0 app/Modules/Bbs/composer.json | 23 ---- app/Modules/Bbs/module.json | 13 -- app/Modules/Bbs/package.json | 17 --- app/Modules/Bbs/webpack.mix.js | 14 --- app/Modules/Blog/Config/.gitkeep | 0 app/Modules/Blog/Config/config.php | 5 - app/Modules/Blog/Console/.gitkeep | 0 app/Modules/Blog/Database/Migrations/.gitkeep | 0 app/Modules/Blog/Database/Seeders/.gitkeep | 0 .../Database/Seeders/BlogDatabaseSeeder.php | 21 ---- app/Modules/Blog/Database/factories/.gitkeep | 0 app/Modules/Blog/Entities/.gitkeep | 0 app/Modules/Blog/Http/Controllers/.gitkeep | 0 .../Blog/Http/Controllers/BlogController.php | 79 ------------ app/Modules/Blog/Http/Middleware/.gitkeep | 0 app/Modules/Blog/Http/Requests/.gitkeep | 0 app/Modules/Blog/Providers/.gitkeep | 0 .../Blog/Providers/BlogServiceProvider.php | 112 ------------------ .../Blog/Providers/RouteServiceProvider.php | 69 ----------- app/Modules/Blog/Resources/assets/.gitkeep | 0 app/Modules/Blog/Resources/assets/js/app.js | 0 .../Blog/Resources/assets/sass/app.scss | 0 app/Modules/Blog/Resources/lang/.gitkeep | 0 app/Modules/Blog/Resources/views/.gitkeep | 0 .../Blog/Resources/views/index.blade.php | 9 -- .../Resources/views/layouts/master.blade.php | 19 --- app/Modules/Blog/Routes/.gitkeep | 0 app/Modules/Blog/Routes/api.php | 18 --- app/Modules/Blog/Routes/web.php | 16 --- app/Modules/Blog/Tests/Feature/.gitkeep | 0 app/Modules/Blog/Tests/Unit/.gitkeep | 0 app/Modules/Blog/composer.json | 23 ---- app/Modules/Blog/module.json | 13 -- app/Modules/Blog/package.json | 17 --- app/Modules/Blog/webpack.mix.js | 14 --- modules_statuses.json | 4 +- public/mix-manifest.json | 6 + 64 files changed, 7 insertions(+), 833 deletions(-) delete mode 100644 app/Modules/Bbs/Config/.gitkeep delete mode 100644 app/Modules/Bbs/Config/config.php delete mode 100644 app/Modules/Bbs/Console/.gitkeep delete mode 100644 app/Modules/Bbs/Database/Migrations/.gitkeep delete mode 100644 app/Modules/Bbs/Database/Seeders/.gitkeep delete mode 100644 app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php delete mode 100644 app/Modules/Bbs/Database/factories/.gitkeep delete mode 100644 app/Modules/Bbs/Entities/.gitkeep delete mode 100644 app/Modules/Bbs/Http/Controllers/.gitkeep delete mode 100644 app/Modules/Bbs/Http/Controllers/BbsController.php delete mode 100644 app/Modules/Bbs/Http/Middleware/.gitkeep delete mode 100644 app/Modules/Bbs/Http/Requests/.gitkeep delete mode 100644 app/Modules/Bbs/Providers/.gitkeep delete mode 100644 app/Modules/Bbs/Providers/BbsServiceProvider.php delete mode 100644 app/Modules/Bbs/Providers/RouteServiceProvider.php delete mode 100644 app/Modules/Bbs/Resources/assets/.gitkeep delete mode 100644 app/Modules/Bbs/Resources/assets/js/app.js delete mode 100644 app/Modules/Bbs/Resources/assets/sass/app.scss delete mode 100644 app/Modules/Bbs/Resources/lang/.gitkeep delete mode 100644 app/Modules/Bbs/Resources/views/.gitkeep delete mode 100644 app/Modules/Bbs/Resources/views/index.blade.php delete mode 100644 app/Modules/Bbs/Resources/views/layouts/master.blade.php delete mode 100644 app/Modules/Bbs/Routes/.gitkeep delete mode 100644 app/Modules/Bbs/Routes/api.php delete mode 100644 app/Modules/Bbs/Routes/web.php delete mode 100644 app/Modules/Bbs/Tests/Feature/.gitkeep delete mode 100644 app/Modules/Bbs/Tests/Unit/.gitkeep delete mode 100644 app/Modules/Bbs/composer.json delete mode 100644 app/Modules/Bbs/module.json delete mode 100644 app/Modules/Bbs/package.json delete mode 100644 app/Modules/Bbs/webpack.mix.js delete mode 100644 app/Modules/Blog/Config/.gitkeep delete mode 100644 app/Modules/Blog/Config/config.php delete mode 100644 app/Modules/Blog/Console/.gitkeep delete mode 100644 app/Modules/Blog/Database/Migrations/.gitkeep delete mode 100644 app/Modules/Blog/Database/Seeders/.gitkeep delete mode 100644 app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php delete mode 100644 app/Modules/Blog/Database/factories/.gitkeep delete mode 100644 app/Modules/Blog/Entities/.gitkeep delete mode 100644 app/Modules/Blog/Http/Controllers/.gitkeep delete mode 100644 app/Modules/Blog/Http/Controllers/BlogController.php delete mode 100644 app/Modules/Blog/Http/Middleware/.gitkeep delete mode 100644 app/Modules/Blog/Http/Requests/.gitkeep delete mode 100644 app/Modules/Blog/Providers/.gitkeep delete mode 100644 app/Modules/Blog/Providers/BlogServiceProvider.php delete mode 100644 app/Modules/Blog/Providers/RouteServiceProvider.php delete mode 100644 app/Modules/Blog/Resources/assets/.gitkeep delete mode 100644 app/Modules/Blog/Resources/assets/js/app.js delete mode 100644 app/Modules/Blog/Resources/assets/sass/app.scss delete mode 100644 app/Modules/Blog/Resources/lang/.gitkeep delete mode 100644 app/Modules/Blog/Resources/views/.gitkeep delete mode 100644 app/Modules/Blog/Resources/views/index.blade.php delete mode 100644 app/Modules/Blog/Resources/views/layouts/master.blade.php delete mode 100644 app/Modules/Blog/Routes/.gitkeep delete mode 100644 app/Modules/Blog/Routes/api.php delete mode 100644 app/Modules/Blog/Routes/web.php delete mode 100644 app/Modules/Blog/Tests/Feature/.gitkeep delete mode 100644 app/Modules/Blog/Tests/Unit/.gitkeep delete mode 100644 app/Modules/Blog/composer.json delete mode 100644 app/Modules/Blog/module.json delete mode 100644 app/Modules/Blog/package.json delete mode 100644 app/Modules/Blog/webpack.mix.js create mode 100644 public/mix-manifest.json diff --git a/app/Modules/Bbs/Config/.gitkeep b/app/Modules/Bbs/Config/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Config/config.php b/app/Modules/Bbs/Config/config.php deleted file mode 100644 index f32b2c6..0000000 --- a/app/Modules/Bbs/Config/config.php +++ /dev/null @@ -1,5 +0,0 @@ - 'Bbs' -]; diff --git a/app/Modules/Bbs/Console/.gitkeep b/app/Modules/Bbs/Console/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Database/Migrations/.gitkeep b/app/Modules/Bbs/Database/Migrations/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Database/Seeders/.gitkeep b/app/Modules/Bbs/Database/Seeders/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php b/app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php deleted file mode 100644 index cea0aa9..0000000 --- a/app/Modules/Bbs/Database/Seeders/BbsDatabaseSeeder.php +++ /dev/null @@ -1,21 +0,0 @@ -call("OthersTableSeeder"); - } -} diff --git a/app/Modules/Bbs/Database/factories/.gitkeep b/app/Modules/Bbs/Database/factories/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Entities/.gitkeep b/app/Modules/Bbs/Entities/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Http/Controllers/.gitkeep b/app/Modules/Bbs/Http/Controllers/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Http/Controllers/BbsController.php b/app/Modules/Bbs/Http/Controllers/BbsController.php deleted file mode 100644 index 1527f5a..0000000 --- a/app/Modules/Bbs/Http/Controllers/BbsController.php +++ /dev/null @@ -1,79 +0,0 @@ -registerTranslations(); - $this->registerConfig(); - $this->registerViews(); - $this->loadMigrationsFrom(module_path($this->moduleName, 'Database/Migrations')); - } - - /** - * Register the service provider. - * - * @return void - */ - public function register() - { - $this->app->register(RouteServiceProvider::class); - } - - /** - * Register config. - * - * @return void - */ - protected function registerConfig() - { - $this->publishes([ - module_path($this->moduleName, 'Config/config.php') => config_path($this->moduleNameLower . '.php'), - ], 'config'); - $this->mergeConfigFrom( - module_path($this->moduleName, 'Config/config.php'), $this->moduleNameLower - ); - } - - /** - * Register views. - * - * @return void - */ - public function registerViews() - { - $viewPath = resource_path('views/modules/' . $this->moduleNameLower); - - $sourcePath = module_path($this->moduleName, 'Resources/views'); - - $this->publishes([ - $sourcePath => $viewPath - ], ['views', $this->moduleNameLower . '-module-views']); - - $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower); - } - - /** - * Register translations. - * - * @return void - */ - public function registerTranslations() - { - $langPath = resource_path('lang/modules/' . $this->moduleNameLower); - - if (is_dir($langPath)) { - $this->loadTranslationsFrom($langPath, $this->moduleNameLower); - } else { - $this->loadTranslationsFrom(module_path($this->moduleName, 'Resources/lang'), $this->moduleNameLower); - } - } - - /** - * Get the services provided by the provider. - * - * @return array - */ - public function provides() - { - return []; - } - - private function getPublishableViewPaths(): array - { - $paths = []; - foreach (\Config::get('view.paths') as $path) { - if (is_dir($path . '/modules/' . $this->moduleNameLower)) { - $paths[] = $path . '/modules/' . $this->moduleNameLower; - } - } - return $paths; - } -} diff --git a/app/Modules/Bbs/Providers/RouteServiceProvider.php b/app/Modules/Bbs/Providers/RouteServiceProvider.php deleted file mode 100644 index c966617..0000000 --- a/app/Modules/Bbs/Providers/RouteServiceProvider.php +++ /dev/null @@ -1,69 +0,0 @@ -mapApiRoutes(); - - $this->mapWebRoutes(); - } - - /** - * Define the "web" routes for the application. - * - * These routes all receive session state, CSRF protection, etc. - * - * @return void - */ - protected function mapWebRoutes() - { - Route::middleware('web') - ->namespace($this->moduleNamespace) - ->group(module_path('Bbs', '/Routes/web.php')); - } - - /** - * Define the "api" routes for the application. - * - * These routes are typically stateless. - * - * @return void - */ - protected function mapApiRoutes() - { - Route::prefix('api') - ->middleware('api') - ->namespace($this->moduleNamespace) - ->group(module_path('Bbs', '/Routes/api.php')); - } -} diff --git a/app/Modules/Bbs/Resources/assets/.gitkeep b/app/Modules/Bbs/Resources/assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Resources/assets/js/app.js b/app/Modules/Bbs/Resources/assets/js/app.js deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Resources/assets/sass/app.scss b/app/Modules/Bbs/Resources/assets/sass/app.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Resources/lang/.gitkeep b/app/Modules/Bbs/Resources/lang/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Resources/views/.gitkeep b/app/Modules/Bbs/Resources/views/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Resources/views/index.blade.php b/app/Modules/Bbs/Resources/views/index.blade.php deleted file mode 100644 index 275b588..0000000 --- a/app/Modules/Bbs/Resources/views/index.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@extends('bbs::layouts.master') - -@section('content') -

Hello World

- -

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

-@endsection diff --git a/app/Modules/Bbs/Resources/views/layouts/master.blade.php b/app/Modules/Bbs/Resources/views/layouts/master.blade.php deleted file mode 100644 index c693be5..0000000 --- a/app/Modules/Bbs/Resources/views/layouts/master.blade.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - Module Bbs - - {{-- Laravel Mix - CSS File --}} - {{-- --}} - - - - @yield('content') - - {{-- Laravel Mix - JS File --}} - {{-- --}} - - diff --git a/app/Modules/Bbs/Routes/.gitkeep b/app/Modules/Bbs/Routes/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Routes/api.php b/app/Modules/Bbs/Routes/api.php deleted file mode 100644 index 69376d8..0000000 --- a/app/Modules/Bbs/Routes/api.php +++ /dev/null @@ -1,18 +0,0 @@ -get('/bbs', function (Request $request) { - return $request->user(); -}); \ No newline at end of file diff --git a/app/Modules/Bbs/Routes/web.php b/app/Modules/Bbs/Routes/web.php deleted file mode 100644 index af4b822..0000000 --- a/app/Modules/Bbs/Routes/web.php +++ /dev/null @@ -1,16 +0,0 @@ -group(function() { - Route::get('/', 'BbsController@index'); -}); diff --git a/app/Modules/Bbs/Tests/Feature/.gitkeep b/app/Modules/Bbs/Tests/Feature/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/Tests/Unit/.gitkeep b/app/Modules/Bbs/Tests/Unit/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Bbs/composer.json b/app/Modules/Bbs/composer.json deleted file mode 100644 index 6627ab5..0000000 --- a/app/Modules/Bbs/composer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "nwidart/bbs", - "description": "", - "authors": [ - { - "name": "Nicolas Widart", - "email": "n.widart@gmail.com" - } - ], - "extra": { - "laravel": { - "providers": [], - "aliases": { - - } - } - }, - "autoload": { - "psr-4": { - "App\\Modules\\Bbs\\": "" - } - } -} diff --git a/app/Modules/Bbs/module.json b/app/Modules/Bbs/module.json deleted file mode 100644 index bd62979..0000000 --- a/app/Modules/Bbs/module.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Bbs", - "alias": "bbs", - "description": "", - "keywords": [], - "priority": 0, - "providers": [ - "App\\Modules\\Bbs\\Providers\\BbsServiceProvider" - ], - "aliases": {}, - "files": [], - "requires": [] -} diff --git a/app/Modules/Bbs/package.json b/app/Modules/Bbs/package.json deleted file mode 100644 index 4599509..0000000 --- a/app/Modules/Bbs/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "npm run watch -- --watch-poll", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "devDependencies": { - "cross-env": "^7.0", - "laravel-mix": "^5.0.1", - "laravel-mix-merge-manifest": "^0.1.2" - } -} diff --git a/app/Modules/Bbs/webpack.mix.js b/app/Modules/Bbs/webpack.mix.js deleted file mode 100644 index 9cadd4f..0000000 --- a/app/Modules/Bbs/webpack.mix.js +++ /dev/null @@ -1,14 +0,0 @@ -const dotenvExpand = require('dotenv-expand'); -dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/})); - -const mix = require('laravel-mix'); -require('laravel-mix-merge-manifest'); - -mix.setPublicPath('../../public').mergeManifest(); - -mix.js(__dirname + '/Resources/assets/js/app.js', 'js/bbs.js') - .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/bbs.css'); - -if (mix.inProduction()) { - mix.version(); -} diff --git a/app/Modules/Blog/Config/.gitkeep b/app/Modules/Blog/Config/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Config/config.php b/app/Modules/Blog/Config/config.php deleted file mode 100644 index 6d927e0..0000000 --- a/app/Modules/Blog/Config/config.php +++ /dev/null @@ -1,5 +0,0 @@ - 'Blog' -]; diff --git a/app/Modules/Blog/Console/.gitkeep b/app/Modules/Blog/Console/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Database/Migrations/.gitkeep b/app/Modules/Blog/Database/Migrations/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Database/Seeders/.gitkeep b/app/Modules/Blog/Database/Seeders/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php b/app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php deleted file mode 100644 index bd8df9b..0000000 --- a/app/Modules/Blog/Database/Seeders/BlogDatabaseSeeder.php +++ /dev/null @@ -1,21 +0,0 @@ -call("OthersTableSeeder"); - } -} diff --git a/app/Modules/Blog/Database/factories/.gitkeep b/app/Modules/Blog/Database/factories/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Entities/.gitkeep b/app/Modules/Blog/Entities/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Http/Controllers/.gitkeep b/app/Modules/Blog/Http/Controllers/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Http/Controllers/BlogController.php b/app/Modules/Blog/Http/Controllers/BlogController.php deleted file mode 100644 index 670d446..0000000 --- a/app/Modules/Blog/Http/Controllers/BlogController.php +++ /dev/null @@ -1,79 +0,0 @@ -registerTranslations(); - $this->registerConfig(); - $this->registerViews(); - $this->loadMigrationsFrom(module_path($this->moduleName, 'Database/Migrations')); - } - - /** - * Register the service provider. - * - * @return void - */ - public function register() - { - $this->app->register(RouteServiceProvider::class); - } - - /** - * Register config. - * - * @return void - */ - protected function registerConfig() - { - $this->publishes([ - module_path($this->moduleName, 'Config/config.php') => config_path($this->moduleNameLower . '.php'), - ], 'config'); - $this->mergeConfigFrom( - module_path($this->moduleName, 'Config/config.php'), $this->moduleNameLower - ); - } - - /** - * Register views. - * - * @return void - */ - public function registerViews() - { - $viewPath = resource_path('views/modules/' . $this->moduleNameLower); - - $sourcePath = module_path($this->moduleName, 'Resources/views'); - - $this->publishes([ - $sourcePath => $viewPath - ], ['views', $this->moduleNameLower . '-module-views']); - - $this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower); - } - - /** - * Register translations. - * - * @return void - */ - public function registerTranslations() - { - $langPath = resource_path('lang/modules/' . $this->moduleNameLower); - - if (is_dir($langPath)) { - $this->loadTranslationsFrom($langPath, $this->moduleNameLower); - } else { - $this->loadTranslationsFrom(module_path($this->moduleName, 'Resources/lang'), $this->moduleNameLower); - } - } - - /** - * Get the services provided by the provider. - * - * @return array - */ - public function provides() - { - return []; - } - - private function getPublishableViewPaths(): array - { - $paths = []; - foreach (\Config::get('view.paths') as $path) { - if (is_dir($path . '/modules/' . $this->moduleNameLower)) { - $paths[] = $path . '/modules/' . $this->moduleNameLower; - } - } - return $paths; - } -} diff --git a/app/Modules/Blog/Providers/RouteServiceProvider.php b/app/Modules/Blog/Providers/RouteServiceProvider.php deleted file mode 100644 index 6affbbc..0000000 --- a/app/Modules/Blog/Providers/RouteServiceProvider.php +++ /dev/null @@ -1,69 +0,0 @@ -mapApiRoutes(); - - $this->mapWebRoutes(); - } - - /** - * Define the "web" routes for the application. - * - * These routes all receive session state, CSRF protection, etc. - * - * @return void - */ - protected function mapWebRoutes() - { - Route::middleware('web') - ->namespace($this->moduleNamespace) - ->group(module_path('Blog', '/Routes/web.php')); - } - - /** - * Define the "api" routes for the application. - * - * These routes are typically stateless. - * - * @return void - */ - protected function mapApiRoutes() - { - Route::prefix('api') - ->middleware('api') - ->namespace($this->moduleNamespace) - ->group(module_path('Blog', '/Routes/api.php')); - } -} diff --git a/app/Modules/Blog/Resources/assets/.gitkeep b/app/Modules/Blog/Resources/assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Resources/assets/js/app.js b/app/Modules/Blog/Resources/assets/js/app.js deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Resources/assets/sass/app.scss b/app/Modules/Blog/Resources/assets/sass/app.scss deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Resources/lang/.gitkeep b/app/Modules/Blog/Resources/lang/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Resources/views/.gitkeep b/app/Modules/Blog/Resources/views/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Resources/views/index.blade.php b/app/Modules/Blog/Resources/views/index.blade.php deleted file mode 100644 index cf0370e..0000000 --- a/app/Modules/Blog/Resources/views/index.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@extends('blog::layouts.master') - -@section('content') -

Hello World

- -

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

-@endsection diff --git a/app/Modules/Blog/Resources/views/layouts/master.blade.php b/app/Modules/Blog/Resources/views/layouts/master.blade.php deleted file mode 100644 index 7fbe4a1..0000000 --- a/app/Modules/Blog/Resources/views/layouts/master.blade.php +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - Module Blog - - {{-- Laravel Mix - CSS File --}} - {{-- --}} - - - - @yield('content') - - {{-- Laravel Mix - JS File --}} - {{-- --}} - - diff --git a/app/Modules/Blog/Routes/.gitkeep b/app/Modules/Blog/Routes/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Routes/api.php b/app/Modules/Blog/Routes/api.php deleted file mode 100644 index dec1928..0000000 --- a/app/Modules/Blog/Routes/api.php +++ /dev/null @@ -1,18 +0,0 @@ -get('/blog', function (Request $request) { - return $request->user(); -}); \ No newline at end of file diff --git a/app/Modules/Blog/Routes/web.php b/app/Modules/Blog/Routes/web.php deleted file mode 100644 index d4d641f..0000000 --- a/app/Modules/Blog/Routes/web.php +++ /dev/null @@ -1,16 +0,0 @@ -group(function() { - Route::get('/', 'BlogController@index'); -}); diff --git a/app/Modules/Blog/Tests/Feature/.gitkeep b/app/Modules/Blog/Tests/Feature/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/Tests/Unit/.gitkeep b/app/Modules/Blog/Tests/Unit/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/Modules/Blog/composer.json b/app/Modules/Blog/composer.json deleted file mode 100644 index dbf5e5d..0000000 --- a/app/Modules/Blog/composer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "nwidart/blog", - "description": "", - "authors": [ - { - "name": "Nicolas Widart", - "email": "n.widart@gmail.com" - } - ], - "extra": { - "laravel": { - "providers": [], - "aliases": { - - } - } - }, - "autoload": { - "psr-4": { - "App\\Modules\\Blog\\": "" - } - } -} diff --git a/app/Modules/Blog/module.json b/app/Modules/Blog/module.json deleted file mode 100644 index da7cd74..0000000 --- a/app/Modules/Blog/module.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Blog", - "alias": "blog", - "description": "", - "keywords": [], - "priority": 0, - "providers": [ - "App\\Modules\\Blog\\Providers\\BlogServiceProvider" - ], - "aliases": {}, - "files": [], - "requires": [] -} diff --git a/app/Modules/Blog/package.json b/app/Modules/Blog/package.json deleted file mode 100644 index 4599509..0000000 --- a/app/Modules/Blog/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "npm run watch -- --watch-poll", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "devDependencies": { - "cross-env": "^7.0", - "laravel-mix": "^5.0.1", - "laravel-mix-merge-manifest": "^0.1.2" - } -} diff --git a/app/Modules/Blog/webpack.mix.js b/app/Modules/Blog/webpack.mix.js deleted file mode 100644 index 2a6d6d7..0000000 --- a/app/Modules/Blog/webpack.mix.js +++ /dev/null @@ -1,14 +0,0 @@ -const dotenvExpand = require('dotenv-expand'); -dotenvExpand(require('dotenv').config({ path: '../../.env'/*, debug: true*/})); - -const mix = require('laravel-mix'); -require('laravel-mix-merge-manifest'); - -mix.setPublicPath('../../public').mergeManifest(); - -mix.js(__dirname + '/Resources/assets/js/app.js', 'js/blog.js') - .sass( __dirname + '/Resources/assets/sass/app.scss', 'css/blog.css'); - -if (mix.inProduction()) { - mix.version(); -} diff --git a/modules_statuses.json b/modules_statuses.json index 7d9e1e5..1f5f991 100644 --- a/modules_statuses.json +++ b/modules_statuses.json @@ -1,5 +1,3 @@ { - "Admin": true, - "Blog": true, - "Bbs": true + "Admin": true } \ No newline at end of file diff --git a/public/mix-manifest.json b/public/mix-manifest.json new file mode 100644 index 0000000..e6971d7 --- /dev/null +++ b/public/mix-manifest.json @@ -0,0 +1,6 @@ +{ + "/js/main.js": "/js/main.js", + "/css/app.css": "/css/app.css", + "/js/manifest.js": "/js/manifest.js", + "/js//js/vendor.377e3f.js": "/js//js/vendor.377e3f.js" +} -- Gitee