familytree365 / backend

app/Models/User.php

Indentation +50 added lines, -50 removed lines

@@ -15,67 +15,67 @@
 use Spatie\MediaLibrary\Models\Media;
 
 class User extends Authenticatable implements MustVerifyEmail {
-	use HasFactory, Notifiable, HasApiTokens, Billable, HasRoles;
+    use HasFactory, Notifiable, HasApiTokens, Billable, HasRoles;
 
-	/**
-	 * The attributes that are mass assignable.
-	 *
-	 * @var array
-	 */
-	protected $fillable = [
-		'first_name',
-		'last_name',
-		'email',
-		'password',
-	];
-	protected $connection = 'landlord';
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'first_name',
+        'last_name',
+        'email',
+        'password',
+    ];
+    protected $connection = 'landlord';
 
-	public function sendPasswordResetNotification($token) {
-		// Your your own implementation.
-		$this->notify(new ResetPasswordNotification($token));
-	}
+    public function sendPasswordResetNotification($token) {
+        // Your your own implementation.
+        $this->notify(new ResetPasswordNotification($token));
+    }
 
-	/**
-	 * The attributes that should be hidden for arrays.
-	 *
-	 * @var array
-	 */
-	protected $hidden = [
-		'password',
-		'remember_token',
-	];
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password',
+        'remember_token',
+    ];
 
-	/**
-	 * The attributes that should be cast to native types.
-	 *
-	 * @var array
-	 */
-	protected $casts = [
-		'email_verified_at' => 'datetime',
-	];
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
 
-	public function providers() {
-		return $this->hasMany(Provider::class, 'user_id', 'id');
-	}
+    public function providers() {
+        return $this->hasMany(Provider::class, 'user_id', 'id');
+    }
 
-	public function userStartedChats() {
-		return $this->hasMany(Chat::class, 'user_1')->join('users as partner', 'user_2', '=', 'partner.id');
-	}
+    public function userStartedChats() {
+        return $this->hasMany(Chat::class, 'user_1')->join('users as partner', 'user_2', '=', 'partner.id');
+    }
 
-	public function userNotStartedChats() {
-		return $this->hasMany(Chat::class, 'user_2')->join('users as partner', 'user_1', '=', 'partner.id');
-	}
+    public function userNotStartedChats() {
+        return $this->hasMany(Chat::class, 'user_2')->join('users as partner', 'user_1', '=', 'partner.id');
+    }
 
-	public function userChats() {
-		return $this->userStartedChats->merge($this->userNotStartedChats);
-	}
-	public function Company() {
-		return $this->belongsToMany(Company::class, 'user_company');
+    public function userChats() {
+        return $this->userStartedChats->merge($this->userNotStartedChats);
+    }
+    public function Company() {
+        return $this->belongsToMany(Company::class, 'user_company');
     }
 
-	public function sendEmailVerificationNotification() {
+    public function sendEmailVerificationNotification() {
 
-         return $this->notify(new VerifyNotification());
+            return $this->notify(new VerifyNotification());
     }
 
 }

app/Models/Role.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 
 class Role extends BaseRole
 {
-	protected $connection = 'landlord';
+    protected $connection = 'landlord';
 }

app/Models/Subm.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
     public function addr()
     {
-       return $this->belongsTo(Addr::class);
+        return $this->belongsTo(Addr::class);
     }
 
 

app/Models/CalendarEvent.php

Indentation +1 added lines, -1 removed lines

@@ -9,5 +9,5 @@
 {
     use HasFactory;
 	
-	protected $fillable = ['title'];
+    protected $fillable = ['title'];
 }

app/Http/Controllers/RegisterController.php

Indentation +95 added lines, -95 removed lines

@@ -10,121 +10,121 @@
 use Spatie\Multitenancy\Models\Concerns\UsesLandlordConnection;
 use Illuminate\Auth\Events\Registered;
 class RegisterController extends Controller {
-	use UsesLandlordConnection;
-
-	public function register(Request $request) {
-
-		$request->validate([
-			'first_name' => ['required'],
-			'last_name' => ['required'],
-			'email' => ['required', 'email', 'unique:landlord.users'],
-			'password' => ['required', 'min:8', 'confirmed'],
-		]);
-
-		DB::connection($this->getConnectionName())->beginTransaction();
-
-		try
-		{
-
-		// $user_id = DB::connection($this->getConnectionName())->table('users')->insertGetId([
-		// 	'first_name' => $request->first_name,
-		// 	'last_name' => $request->last_name,
-		// 	'email' => $request->email,
-		// 	'password' => bcrypt($request->password),
-		// ]);
-		// $user = User::create([
-		// 	'first_name' => $request->first_name,
-		// 	'last_name' => $request->last_name,
-		// 	'email' => $request->email,
-		// 	'password' => bcrypt($request->password)
-		// ]);
-
-		$user = new User;
-
-		$user->first_name = $request->first_name;
-		$user->last_name = $request->last_name;
-		$user->email = $request->email;
-		$user->password = bcrypt($request->password);
-		$user->save();
-		event(new Registered($user));
-		$user_id = $user->id;
-		$user = User::find($user_id);
+    use UsesLandlordConnection;
+
+    public function register(Request $request) {
+
+        $request->validate([
+            'first_name' => ['required'],
+            'last_name' => ['required'],
+            'email' => ['required', 'email', 'unique:landlord.users'],
+            'password' => ['required', 'min:8', 'confirmed'],
+        ]);
+
+        DB::connection($this->getConnectionName())->beginTransaction();
+
+        try
+        {
+
+        // $user_id = DB::connection($this->getConnectionName())->table('users')->insertGetId([
+        // 	'first_name' => $request->first_name,
+        // 	'last_name' => $request->last_name,
+        // 	'email' => $request->email,
+        // 	'password' => bcrypt($request->password),
+        // ]);
+        // $user = User::create([
+        // 	'first_name' => $request->first_name,
+        // 	'last_name' => $request->last_name,
+        // 	'email' => $request->email,
+        // 	'password' => bcrypt($request->password)
+        // ]);
+
+        $user = new User;
+
+        $user->first_name = $request->first_name;
+        $user->last_name = $request->last_name;
+        $user->email = $request->email;
+        $user->password = bcrypt($request->password);
+        $user->save();
+        event(new Registered($user));
+        $user_id = $user->id;
+        $user = User::find($user_id);
         $user->assignRole('free');
         // $user->sendEmailVerificationNotification();
 
-		$random = $this->unique_random('companies', 'name', 5);
-		$company_id = DB::connection($this->getConnectionName())->table('companies')->insertGetId([
-			'name' => 'company' . $random,
-			'status' => 1,
-			'current_tenant' => 1,
-		]);
+        $random = $this->unique_random('companies', 'name', 5);
+        $company_id = DB::connection($this->getConnectionName())->table('companies')->insertGetId([
+            'name' => 'company' . $random,
+            'status' => 1,
+            'current_tenant' => 1,
+        ]);
 
-		DB::connection($this->getConnectionName())->table('user_company')->insert([
-			'user_id' => $user_id,
-			'company_id' => $company_id,
-		]);
+        DB::connection($this->getConnectionName())->table('user_company')->insert([
+            'user_id' => $user_id,
+            'company_id' => $company_id,
+        ]);
 
-		$tree_id = DB::connection($this->getConnectionName())->table('trees')->insertGetId([
-			'company_id' => $company_id,
-			'name' => 'tree' . $company_id,
-			'description' => '',
-			'current_tenant' => 1,
-		]);
+        $tree_id = DB::connection($this->getConnectionName())->table('trees')->insertGetId([
+            'company_id' => $company_id,
+            'name' => 'tree' . $company_id,
+            'description' => '',
+            'current_tenant' => 1,
+        ]);
 
-		$tenant_id = DB::connection($this->getConnectionName())->table('tenants')->insertGetId([
-			'name' => 'tenant' . $tree_id,
-			'tree_id' => $tree_id,
-			'database' => 'tenant' . $tree_id,
-		]);
+        $tenant_id = DB::connection($this->getConnectionName())->table('tenants')->insertGetId([
+            'name' => 'tenant' . $tree_id,
+            'tree_id' => $tree_id,
+            'database' => 'tenant' . $tree_id,
+        ]);
 
-		DB::statement('create database tenant' . $tree_id);
+        DB::statement('create database tenant' . $tree_id);
 
-		Artisan::call('tenants:artisan "migrate --database=tenant --force"');
-		} catch (Exception $e) {
-			DB::connection($this->getConnectionName())->rollback();
-		}
+        Artisan::call('tenants:artisan "migrate --database=tenant --force"');
+        } catch (Exception $e) {
+            DB::connection($this->getConnectionName())->rollback();
+        }
 
-		DB::connection($this->getConnectionName())->commit();
-	}
+        DB::connection($this->getConnectionName())->commit();
+    }
 
-	public function unique_random($table, $col, $chars = 16) {
+    public function unique_random($table, $col, $chars = 16) {
 
-		$unique = false;
+        $unique = false;
 
-		// Store tested results in array to not test them again
-		$tested = [];
+        // Store tested results in array to not test them again
+        $tested = [];
 
-		do {
+        do {
 
-			// Generate random string of characters
-			$random = Str::random($chars);
+            // Generate random string of characters
+            $random = Str::random($chars);
 
-			// Check if it's already testing
-			// If so, don't query the database again
-			if (in_array($random, $tested)) {
-				continue;
-			}
+            // Check if it's already testing
+            // If so, don't query the database again
+            if (in_array($random, $tested)) {
+                continue;
+            }
 
-			// Check if it is unique in the database
-			$count = DB::connection($this->getConnectionName())->table('companies')->where($col, '=', $random)->count();
+            // Check if it is unique in the database
+            $count = DB::connection($this->getConnectionName())->table('companies')->where($col, '=', $random)->count();
 
-			// Store the random character in the tested array
-			// To keep track which ones are already tested
-			$tested[] = $random;
+            // Store the random character in the tested array
+            // To keep track which ones are already tested
+            $tested[] = $random;
 
-			// String appears to be unique
-			if ($count == 0) {
-				// Set unique to true to break the loop
-				$unique = true;
-			}
+            // String appears to be unique
+            if ($count == 0) {
+                // Set unique to true to break the loop
+                $unique = true;
+            }
 
-			// If unique is still false at this point
-			// it will just repeat all the steps until
-			// it has generated a random string of characters
+            // If unique is still false at this point
+            // it will just repeat all the steps until
+            // it has generated a random string of characters
 
-		} while (!$unique);
+        } while (!$unique);
 
-		return $random;
-	}
+        return $random;
+    }
 
 }

app/Http/Controllers/DashboardController.php

Braces +1 added lines, -2 removed lines

@@ -69,8 +69,7 @@
             $tree->current_tenant = 1;
             $tree->save();
             return response()->json(['changedb' => true]);
-        }
-        else {
+        } else {
             return response()->json(['changedb' => false]);
         }
     }

app/Http/Controllers/TreeController.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 
         else if ($role == 5 || $role == 6) {
             if(Tree::whereIn('company_id', $companies_id)->count() < 10){
-               return response()->json(['create_tree' => true]);
+                return response()->json(['create_tree' => true]);
             } else {
                 return response()->json(['create_tree' => false]);
             }

Braces +3 added lines, -8 removed lines

@@ -90,20 +90,15 @@
             } else {
                 return response()->json(['create_tree' => false]);
             }
-        }
-
-        else if ($role == 5 || $role == 6) {
+        } else if ($role == 5 || $role == 6) {
             if(Tree::whereIn('company_id', $companies_id)->count() < 10){
                return response()->json(['create_tree' => true]);
             } else {
                 return response()->json(['create_tree' => false]);
             }
-        }
-
-        else if ($role == 3 || $role == 4) {
+        } else if ($role == 3 || $role == 4) {
             return response()->json(['create_tree' => true]);
-        }
-        else {
+        } else {
             return response()->json(['create_tree' => false]);
         }
 

app/Http/Controllers/DnaController.php

Braces +1 added lines, -2 removed lines

@@ -152,8 +152,7 @@
                 'message' => __('The dna was successfully deleted'),
                 'redirect' => 'dna.index',
             ];
-        }
-        else 
+        } else 
         {
             return [
                 'message' => __('The dna could not be deleted'),

app/Http/Controllers/PermissionController.php

Indentation +3 added lines, -3 removed lines

@@ -9,10 +9,10 @@
 {
     public function index() {
 
-    	return auth()->user()->getAllPermissions()->pluck('name');
+        return auth()->user()->getAllPermissions()->pluck('name');
     }
-     public function getPermission(Request $request) {
-    	$query = Permission::query();
+        public function getPermission(Request $request) {
+        $query = Permission::query();
 
         if($request->has('searchTerm')) {
             $columnsToSearch = ['name'];