Skip to content

Apply fixes from StyleCI #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2021
Merged

Apply fixes from StyleCI #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Http/Controllers/Auth/ActivateController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Http\Controllers\Controller;
use App\Models\Activation;
use App\Models\Profile;
use App\Models\User;
use App\Traits\ActivationTrait;
use App\Traits\CaptureIpTrait;
use Auth;
Expand Down
3 changes: 2 additions & 1 deletion app/Http/Controllers/Auth/RegisterController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ protected function validator(array $data)
$data['captcha'] = true;
}

return Validator::make($data,
return Validator::make(
$data,
[
'name' => 'required|max:255|unique:users',
'first_name' => '',
Expand Down
4 changes: 3 additions & 1 deletion app/Http/Controllers/Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@

class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
use AuthorizesRequests;
use DispatchesJobs;
use ValidatesRequests;
}
18 changes: 12 additions & 6 deletions app/Http/Controllers/ProfilesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ public function update($username, Request $request)

if ($profile_validator->fails()) {
$this->throwValidationException(
$request, $profile_validator
$request,
$profile_validator
);

return redirect('profile/'.$user->name.'/edit')->withErrors($validator)->withInput();
Expand Down Expand Up @@ -257,7 +258,8 @@ public function updateUserAccount(Request $request, $id)

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
$request,
$validator
);
}

Expand Down Expand Up @@ -290,7 +292,8 @@ public function updateUserPassword(Request $request, $id)
$user = User::findOrFail($id);
$ipAddress = new CaptureIpTrait();

$validator = Validator::make($request->all(),
$validator = Validator::make(
$request->all(),
[
'password' => 'required|min:6|max:20|confirmed',
'password_confirmation' => 'required|same:password',
Expand All @@ -304,7 +307,8 @@ public function updateUserPassword(Request $request, $id)

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
$request,
$validator
);
}

Expand Down Expand Up @@ -426,7 +430,8 @@ public function deleteUserAccount(Request $request, $id)
$user = User::findOrFail($id);
$ipAddress = new CaptureIpTrait();

$validator = Validator::make($request->all(),
$validator = Validator::make(
$request->all(),
[
'checkConfirmDelete' => 'required',
],
Expand All @@ -437,7 +442,8 @@ public function deleteUserAccount(Request $request, $id)

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
$request,
$validator
);
}

Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/TasksController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Http\Controllers;

use App\Models\Task;
use App\Models\User;
use Auth;
use Illuminate\Http\Request;
use Illuminate\View\View;
Expand Down
6 changes: 4 additions & 2 deletions app/Http/Controllers/ThemesManagementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ public function store(Request $request)

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
$request,
$validator
);

return redirect('themes/create')->withErrors($validator)->withInput();
Expand Down Expand Up @@ -152,7 +153,8 @@ public function update(Request $request, $id)

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
$request,
$validator
);

return redirect('themes/'.$theme->id.'/edit')->withErrors($validator)->withInput();
Expand Down
41 changes: 22 additions & 19 deletions app/Http/Controllers/UsersManagementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public function create()
*/
public function store(Request $request)
{
$validator = Validator::make($request->all(),
$validator = Validator::make(
$request->all(),
[
'name' => 'required|max:255|unique:users',
'first_name' => '',
Expand All @@ -86,22 +87,23 @@ public function store(Request $request)

if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
$request,
$validator
);
} else {
$ipAddress = new CaptureIpTrait();
$profile = new Profile();

$user = User::create([
'name' => $request->input('name'),
'first_name' => $request->input('first_name'),
'last_name' => $request->input('last_name'),
'email' => $request->input('email'),
'password' => bcrypt($request->input('password')),
'token' => str_random(64),
'admin_ip_address' => $ipAddress->getClientIp(),
'activated' => 1,
]);
'name' => $request->input('name'),
'first_name' => $request->input('first_name'),
'last_name' => $request->input('last_name'),
'email' => $request->input('email'),
'password' => bcrypt($request->input('password')),
'token' => str_random(64),
'admin_ip_address' => $ipAddress->getClientIp(),
'activated' => 1,
]);

$user->profile()->save($profile);
$user->attachRole($request->input('role'));
Expand Down Expand Up @@ -168,19 +170,20 @@ public function update(Request $request, $id)

if ($emailCheck) {
$validator = Validator::make($request->all(), [
'name' => 'required|max:255',
'email' => 'email|max:255|unique:users',
'password' => 'present|confirmed|min:6',
]);
'name' => 'required|max:255',
'email' => 'email|max:255|unique:users',
'password' => 'present|confirmed|min:6',
]);
} else {
$validator = Validator::make($request->all(), [
'name' => 'required|max:255',
'password' => 'nullable|confirmed|min:6',
]);
'name' => 'required|max:255',
'password' => 'nullable|confirmed|min:6',
]);
}
if ($validator->fails()) {
$this->throwValidationException(
$request, $validator
$request,
$validator
);
} else {
$user->name = $request->input('name');
Expand Down
3 changes: 0 additions & 3 deletions app/Http/Middleware/Authenticate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ public function __construct(Guard $auth)
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
*
* ////////////////
* @param $role
* ////////////////
*
* @return mixed
*/
Expand Down
3 changes: 2 additions & 1 deletion app/Mail/ExceptionOccured.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

class ExceptionOccured extends Mailable
{
use Queueable, SerializesModels;
use Queueable;
use SerializesModels;

private $content;

Expand Down
3 changes: 2 additions & 1 deletion app/Models/Theme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ public static function rules($id = 0, $merge = [])
'notes' => 'max:500',
'status' => 'required',
],
$merge);
$merge
);
}

/**
Expand Down
15 changes: 10 additions & 5 deletions app/Providers/ComposerServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,36 @@ class ComposerServiceProvider extends ServiceProvider
*/
public function boot()
{
View::composer([
View::composer(
[
'*',
],
'App\Http\ViewComposers\ThemeComposer'
);

View::composer([
View::composer(
[
'*',
],
'App\Http\ViewComposers\UsersComposer'
);

View::composer([
View::composer(
[
'*',
],
'App\Http\Controllers\TasksController@getAllTasks'
);

View::composer([
View::composer(
[
'*',
],
'App\Http\Controllers\TasksController@getCompleteTasks'
);

View::composer([
View::composer(
[
'*',
],
'App\Http\Controllers\TasksController@getIncompleteTasks'
Expand Down
2 changes: 1 addition & 1 deletion config/debugbar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

return [

/*
/*
* Environment to show the debug bar on.
*/
'enabled_environment' => env('DEBUG_BAR_ENVIRONMENT'),
Expand Down
3 changes: 2 additions & 1 deletion routes/web.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
// User Profile and Account Routes
Route::resource(
'profile',
'ProfilesController', [
'ProfilesController',
[
'only' => [
'account',
'show',
Expand Down