Merge remote-tracking branch 'origin/master'

liberu-genealogy · Aug 5, 2020 · 21ccfb7 · 21ccfb7
2 parents d6f624a + 308bce6
commit 21ccfb7
Show file tree

Hide file tree

Showing 48 changed files with 90 additions and 84 deletions.
diff --git a/app/Activation.php b/app/Activation.php
@@ -25,7 +25,7 @@ class Activation extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Addr.php b/app/Addr.php
@@ -30,7 +30,7 @@ class Addr extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Author.php b/app/Author.php
@@ -19,7 +19,7 @@ class Author extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Chan.php b/app/Chan.php
@@ -28,7 +28,7 @@ class Chan extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Citation.php b/app/Citation.php
@@ -20,7 +20,7 @@ class Citation extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Event.php b/app/Event.php
@@ -17,7 +17,7 @@ class Event extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Family.php b/app/Family.php
@@ -21,7 +21,7 @@ class Family extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/FamilyEvent.php b/app/FamilyEvent.php
@@ -21,7 +21,7 @@ class FamilyEvent extends Event
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/FamilySlgs.php b/app/FamilySlgs.php
@@ -29,7 +29,7 @@ class FamilySlgs extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Forms/Builders/PersonFormIndi.php b/app/Forms/Builders/PersonFormIndi.php
@@ -31,6 +31,7 @@ public function edit(Person $person)
             )->readonly('email');
         }
         $actions = ['back', 'update'];
+
         return $this->form
             ->value('company', optional($person->company())->id)
             ->append('userId', optional($person->user)->id)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -5,13 +5,13 @@
 use App\Events\enso\core\Login;
 use App\Http\Controllers\Controller;
 use App\Models\User;
+use App\Traits\ConnectionTrait;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\ValidationException;
 use LaravelEnso\Multitenancy\Enums\Connections;
 use LaravelEnso\Multitenancy\Services\Tenant;
-use App\Traits\ConnectionTrait;
 
 class LoginController extends Controller
 {
@@ -66,7 +66,7 @@ private function loggableUser(Request $request)
         }
         // set company id as default
         $main_company = $user->person->company();
-        if($main_company !== null && !($user->isAdmin())) {
+        if ($main_company !== null && ! ($user->isAdmin())) {
             $c_id = $main_company->id;
             $db = Connections::Tenant.$c_id;
             $this->setConnection(Connections::Tenant, $db);

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -5,22 +5,21 @@
 use App\Http\Controllers\Controller;
 use App\Jobs\Tenant\CreateDB;
 use App\Jobs\Tenant\Migration;
-use LaravelEnso\Companies\Models\Company;
-use LaravelEnso\Core\Models\UserGroup;
-use LaravelEnso\Roles\Models\Role;
 use App\Models\User;
 use App\Person;
 use App\Providers\RouteServiceProvider;
 use App\Traits\ActivationTrait;
+use App\Traits\ConnectionTrait;
+use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
 // use LaravelEnso\Multitenancy\Jobs\CreateDatabase;
 // use LaravelEnso\Multitenancy\Jobs\Migrate;
-use Illuminate\Foundation\Auth\RegistersUsers;
-use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
-use App\Traits\ConnectionTrait;
+use LaravelEnso\Companies\Models\Company;
+use LaravelEnso\Core\Models\UserGroup;
 use LaravelEnso\Multitenancy\Enums\Connections;
-
+use LaravelEnso\Roles\Models\Role;
 use Str;
 
 class RegisterController extends Controller
@@ -54,7 +53,6 @@ protected function create(array $data)
             $person->email = $data['email'];
             $person->save();
 
-
             // get user_group_id
             $user_group = UserGroup::where('name', 'Administrators')->first();
             if ($user_group == null) {

diff --git a/app/Http/Controllers/Dashboard/ChartController.php b/app/Http/Controllers/Dashboard/ChartController.php
@@ -3,19 +3,20 @@
 namespace App\Http\Controllers\Dashboard;
 
 use App\Person;
+use App\Traits\ConnectionTrait;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Auth;
 use LaravelEnso\Charts\Factories\Bar;
 use LaravelEnso\Charts\Factories\Bubble;
 use LaravelEnso\Charts\Factories\Doughnut;
 use LaravelEnso\Charts\Factories\Line;
 use LaravelEnso\Charts\Factories\Pie;
 use LaravelEnso\Charts\Factories\Polar;
 use LaravelEnso\Charts\Factories\Radar;
-use Illuminate\Support\Facades\Auth;
 use LaravelEnso\Multitenancy\Enums\Connections;
 use LaravelEnso\Multitenancy\Services\Tenant;
-use App\Traits\ConnectionTrait;
-use Illuminate\Http\Request;
+
 class ChartController extends Controller
 {
     use ConnectionTrait;
@@ -109,24 +110,28 @@ public function bubble()
     }
 
     // change database to use
-    public function changedb(Request $request) {
+    public function changedb(Request $request)
+    {
         $company_id = $request->get('comid');
-        if(!empty($company_id)){
+        if (! empty($company_id)) {
             $db = Connections::Tenant.$company_id;
             $this->setConnection(Connections::Tenant, $db);
         } else {
             $this->setConnection('mysql');
         }
-        $conn =  $this->getConnection();
+        $conn = $this->getConnection();
+
         return $conn;
     }
 
     // get companies of user.
-    public function getDB(){
+    public function getDB()
+    {
         $user = Auth::user();
         $companies = $user->person->companies()->get();
-        $ret = array();
+        $ret = [];
         $ret['company'] = $companies;
+
         return $ret;
     }
 }
diff --git a/app/Http/Controllers/Gedcom/Store.php b/app/Http/Controllers/Gedcom/Store.php
@@ -9,13 +9,13 @@
 use App\Note;
 use App\Person;
 use App\Source;
+use App\Traits\ConnectionTrait;
 use Auth;
 use Illuminate\Http\Request;
-use ModularSoftware\LaravelGedcom\Facades\GedcomParserFacade;
-use ModularSoftware\LaravelGedcom\Utils\GedcomParser;
 use Illuminate\Support\Facades\Artisan;
 use LaravelEnso\Multitenancy\Enums\Connections;
-use App\Traits\ConnectionTrait;
+use ModularSoftware\LaravelGedcom\Facades\GedcomParserFacade;
+use ModularSoftware\LaravelGedcom\Utils\GedcomParser;
 
 class Store extends Controller
 {

diff --git a/app/Http/Middleware/Multitenant.php b/app/Http/Middleware/Multitenant.php
@@ -4,9 +4,10 @@
 
 use App\Service\MixedConnection;
 use Closure;
-use LaravelEnso\Multitenancy\Services\Tenant;
-// use App\Models\enso\companies\Company;
 use LaravelEnso\Companies\Models\Company;
+// use App\Models\enso\companies\Company;
+use LaravelEnso\Multitenancy\Services\Tenant;
+
 class Multitenant
 {
     /**
@@ -20,11 +21,11 @@ public function handle($request, Closure $next)
     {
         $conn = \Session::get('conn');
         $value = \Session::get('db');
-        if($conn === 'tenant') {
+        if ($conn === 'tenant') {
             $key = 'database.connections.tenant.database';
             config([$key => $value]);
             config(['database.default'=>'tenant']);
-        }else {
+        } else {
             config(['database.default'=>'mysql']);
         }
 
@@ -38,6 +39,6 @@ public function handle($request, Closure $next)
     private function ownerRequestsTenant($request)
     {
         return $request->user()->isSupervisor();
-            // && $request->has('_tenantId');
+        // && $request->has('_tenantId');
     }
 }
diff --git a/app/ImportJob.php b/app/ImportJob.php
@@ -25,7 +25,7 @@ class ImportJob extends Model
     //     if($db === env('DB_DATABASE')) {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
-    //     } else { 
+    //     } else {
     //         $key = 'database.connections.mysql.database';
     //         config([$key => $db]);
     //     }

diff --git a/app/Jobs/ImportGedcom.php b/app/Jobs/ImportGedcom.php
@@ -9,9 +9,9 @@
 use Illuminate\Http\Request;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
 use ModularSoftware\LaravelGedcom\Utils\GedcomParser;
-use Illuminate\Support\Facades\Artisan;
 
 class ImportGedcom implements ShouldQueue
 {
@@ -50,7 +50,7 @@ public function handle()
         $slug = $this->slug;
         $user_id = $this->user_id;
         $status = 'queue';
-        if($this->conn == 'tenant') {
+        if ($this->conn == 'tenant') {
             $key = 'database.connections.tenant.database';
             $value = $this->db;
             config([$key => $value]);
@@ -60,7 +60,6 @@ public function handle()
         $parser = new GedcomParser();
         $parser->parse($this->conn, storage_path($this->filename), $slug, true);
         File::delete(storage_path($this->filename));
-
 
         // update import job
         $status = 'complete';

diff --git a/app/Jobs/Tenant/ClearStrg.php b/app/Jobs/Tenant/ClearStrg.php
@@ -2,14 +2,14 @@
 
 namespace App\Jobs\Tenant;
 
+use App\Models\enso\companies\Company;
+use App\Service\Tenant;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Storage;
-use App\Models\enso\companies\Company;
-use App\Service\Tenant;
 use LaravelEnso\Multitenancy\Traits\ConnectionStoragePath;
 
 class ClearStrg implements ShouldQueue

diff --git a/app/Jobs/Tenant/CreateDB.php b/app/Jobs/Tenant/CreateDB.php
@@ -2,14 +2,14 @@
 
 namespace App\Jobs\Tenant;
 
+use App\Models\enso\companies\Company;
+use App\Service\Tenant;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\DB;
-use App\Models\enso\companies\Company;
-use App\Service\Tenant;
 use LaravelEnso\Multitenancy\Traits\TenantResolver;
 
 class CreateDB implements ShouldQueue

diff --git a/app/Jobs/Tenant/DropDB.php b/app/Jobs/Tenant/DropDB.php
@@ -2,14 +2,14 @@
 
 namespace App\Jobs\Tenant;
 
+use App\Models\enso\companies\Company;
+use App\Service\Tenant;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\DB;
-use App\Models\enso\companies\Company;
-use App\Service\Tenant;
 use LaravelEnso\Multitenancy\Traits\TenantResolver;
 
 class DropDB implements ShouldQueue

diff --git a/app/Jobs/Tenant/DropTb.php b/app/Jobs/Tenant/DropTb.php
@@ -2,15 +2,15 @@
 
 namespace App\Jobs\Tenant;
 
+use App\Models\enso\companies\Company;
+use App\Service\Tenant;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\DB;
-use App\Models\enso\companies\Company;
 use LaravelEnso\Multitenancy\Enums\Connections;
-use App\Service\Tenant;
 
 class DropTb implements ShouldQueue
 {

diff --git a/app/Jobs/Tenant/Migration.php b/app/Jobs/Tenant/Migration.php
@@ -2,8 +2,12 @@
 
 namespace App\Jobs\Tenant;
 
+use App\Models\enso\companies\Company;
+use App\Models\enso\core\UserGroup;
+use App\Models\enso\Roles\Role;
 use App\Models\User;
 use App\Person;
+use App\Service\Tenant;
 use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -12,11 +16,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Hash;
-use App\Models\enso\companies\Company;
-use App\Models\enso\core\UserGroup;
 use LaravelEnso\Multitenancy\Enums\Connections;
-use App\Service\Tenant;
-use App\Models\enso\Roles\Role;
 use Str;
 
 class Migration implements ShouldQueue
@@ -83,4 +83,4 @@ public function handle()
             'is_active' => 1,
         ]);
     }
-}
+}