From 691770282b460684015c5685e387f359ce76775b Mon Sep 17 00:00:00 2001 From: farid saravi Date: Tue, 9 Jul 2019 22:37:38 +0430 Subject: [PATCH] place core in a seperate module --- .../AthenticateServiceProvider.php | 31 -------- app/CorePackages/Authenticate/AuthFinder.php | 27 ------- .../Authenticate/AuthFinderFacade.php | 11 --- .../Middleware/VirtualActivity.php | 27 ------- app/CorePackages/Models/VAModel.php | 17 ---- app/CorePackages/RelatedToUser.php | 23 ------ app/CorePackages/Resources/UserResource.php | 23 ------ .../Scopes/RelatedToVirtualActivity.php | 27 ------- .../Scopes/VirtualActivityScope.php | 24 ------ .../Exceptions/SiteNotFoundException.php | 10 --- .../VirtualActivityNotFoundException.php | 11 --- .../VirtualActivity/VirtualActivityFinder.php | 77 ------------------- .../VirtualActivityServiceProvider.php | 56 -------------- app/Http/Kernel.php | 1 - config/app.php | 3 +- 15 files changed, 1 insertion(+), 367 deletions(-) delete mode 100644 app/CorePackages/Authenticate/AthenticateServiceProvider.php delete mode 100644 app/CorePackages/Authenticate/AuthFinder.php delete mode 100644 app/CorePackages/Authenticate/AuthFinderFacade.php delete mode 100644 app/CorePackages/Middleware/VirtualActivity.php delete mode 100644 app/CorePackages/Models/VAModel.php delete mode 100644 app/CorePackages/RelatedToUser.php delete mode 100644 app/CorePackages/Resources/UserResource.php delete mode 100644 app/CorePackages/Scopes/RelatedToVirtualActivity.php delete mode 100644 app/CorePackages/Scopes/VirtualActivityScope.php delete mode 100644 app/CorePackages/VirtualActivity/Exceptions/SiteNotFoundException.php delete mode 100644 app/CorePackages/VirtualActivity/Exceptions/VirtualActivityNotFoundException.php delete mode 100644 app/CorePackages/VirtualActivity/VirtualActivityFinder.php delete mode 100644 app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php diff --git a/app/CorePackages/Authenticate/AthenticateServiceProvider.php b/app/CorePackages/Authenticate/AthenticateServiceProvider.php deleted file mode 100644 index 634e427..0000000 --- a/app/CorePackages/Authenticate/AthenticateServiceProvider.php +++ /dev/null @@ -1,31 +0,0 @@ -app->singleton(AuthFinderFacade::class, function () { - return AuthFinderFacade::user(); - }); - - } - - - /** - * Get the services provided by the provider. - * - * @return array - */ - public function provides() - { - return [AuthFinder::class]; - } -} diff --git a/app/CorePackages/Authenticate/AuthFinder.php b/app/CorePackages/Authenticate/AuthFinder.php deleted file mode 100644 index 2daac68..0000000 --- a/app/CorePackages/Authenticate/AuthFinder.php +++ /dev/null @@ -1,27 +0,0 @@ -check()) { - return auth()->user(); - } elseif (auth('api')->check()) { - return auth('api')->user(); - } - return null; - } - - public static function check() { - - if (auth()->check() || auth('api')->check()) { - return true; - } - return false; - } - - -} diff --git a/app/CorePackages/Authenticate/AuthFinderFacade.php b/app/CorePackages/Authenticate/AuthFinderFacade.php deleted file mode 100644 index 44dc56c..0000000 --- a/app/CorePackages/Authenticate/AuthFinderFacade.php +++ /dev/null @@ -1,11 +0,0 @@ -merge([ - 'business_id' => $business->id, - ]); - - return $next($request); - } -} diff --git a/app/CorePackages/Models/VAModel.php b/app/CorePackages/Models/VAModel.php deleted file mode 100644 index 14eff4c..0000000 --- a/app/CorePackages/Models/VAModel.php +++ /dev/null @@ -1,17 +0,0 @@ -attributes); - } - -} diff --git a/app/CorePackages/RelatedToUser.php b/app/CorePackages/RelatedToUser.php deleted file mode 100644 index 30bc430..0000000 --- a/app/CorePackages/RelatedToUser.php +++ /dev/null @@ -1,23 +0,0 @@ -user_id = 116; - }); - } - -} diff --git a/app/CorePackages/Resources/UserResource.php b/app/CorePackages/Resources/UserResource.php deleted file mode 100644 index 2ed115c..0000000 --- a/app/CorePackages/Resources/UserResource.php +++ /dev/null @@ -1,23 +0,0 @@ - $this->id, - 'name' => $this->name, - ]; - } -} diff --git a/app/CorePackages/Scopes/RelatedToVirtualActivity.php b/app/CorePackages/Scopes/RelatedToVirtualActivity.php deleted file mode 100644 index c460c8b..0000000 --- a/app/CorePackages/Scopes/RelatedToVirtualActivity.php +++ /dev/null @@ -1,27 +0,0 @@ -business_id = request()->business_id; - $model->user_id = 116; - }); - } - -} diff --git a/app/CorePackages/Scopes/VirtualActivityScope.php b/app/CorePackages/Scopes/VirtualActivityScope.php deleted file mode 100644 index 726d233..0000000 --- a/app/CorePackages/Scopes/VirtualActivityScope.php +++ /dev/null @@ -1,24 +0,0 @@ -where('business_id', $business->id); - } -} diff --git a/app/CorePackages/VirtualActivity/Exceptions/SiteNotFoundException.php b/app/CorePackages/VirtualActivity/Exceptions/SiteNotFoundException.php deleted file mode 100644 index 24df796..0000000 --- a/app/CorePackages/VirtualActivity/Exceptions/SiteNotFoundException.php +++ /dev/null @@ -1,10 +0,0 @@ -root()); - - $site = Site::where('domain', $domain)->first(); - - if ($site) { - - return $site->user_template->business; - - } elseif (in_array($domain, static::$mainDomains)) { - if ( \AuthFinder::check() && \AuthFinder::user()->last_used_business !== 0) { - return Business::findOrFail(\AuthFinder::user()->last_used_business); - } - - throw new VirtualActivityNotFoundException('Business Not Found'); - } - - throw new SiteNotFoundException('Site Not Found'); - - } - - /** - * finds site name based on specified url address. - * - * @param string $domain - * @return Business - */ - public static function findSiteName($domain) { - - $array = explode('.', parse_url($domain, PHP_URL_HOST)); - if (count($array) == 4) { - $domain = $array[1]; - } elseif (count($array) == 3) { - if ($array[0] === 'www') { - $domain = $array[1] . '.' . $array[2]; - } else { - $domain = $array[0]; - } - } elseif (count($array) == 2) { - $domain = $array[0] . '.' . $array[1]; - } - return $domain; - - } - - -} diff --git a/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php b/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php deleted file mode 100644 index d42a284..0000000 --- a/app/CorePackages/VirtualActivity/VirtualActivityServiceProvider.php +++ /dev/null @@ -1,56 +0,0 @@ -where($column, $value) - ->where('business_id', request()->business_id) - ->count() > 0; - - }); - } - - public function register() - { - - $this->app->singleton(Business::class, function () { - return VirtualActivityFinder::fetch(); - }); - - $this->registerHandler(); - } - - protected function registerHandler() - { - - Route::macro('handler', function ($prefix) { - $singular = Str::singular($prefix); - Route::group([ - 'namespace' => $singular - ], function () use ($prefix, $singular) { - Route::get($prefix, 'Index' . $singular); - Route::post($prefix , 'Store' . $singular); - Route::put($prefix . '/{' . $singular . '}', 'Update' . $singular); - Route::delete($prefix . '/{' . $singular . '}', 'Destroy' . $singular); - Route::get($prefix . '/{' . $singular . '}', 'Show' . $singular); - }); - }); - } -} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d3f1a64..a3d8c48 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -60,7 +60,6 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, - 'va' => \App\CorePackages\Middleware\VirtualActivity::class, ]; /** diff --git a/config/app.php b/config/app.php index b1cf65d..ed73c79 100644 --- a/config/app.php +++ b/config/app.php @@ -174,8 +174,7 @@ return [ // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, - App\CorePackages\VirtualActivity\VirtualActivityServiceProvider::class, - App\CorePackages\Authenticate\AthenticateServiceProvider::class, + // App\CorePackages\Authenticate\AthenticateServiceProvider::class, ],