Skip to content
This repository was archived by the owner on Jun 22, 2022. It is now read-only.

Commit 03c1834

Browse files
mitulgolakiyamitulgolakiya
committed
Merge branch 'develop'
2 parents 0a3dc13 + 5349d19 commit 03c1834

File tree

165 files changed

+5269
-5495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+5269
-5495
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/node_modules
22
/public/assets
3+
/public/fonts
34
/storage/*.key
45
/vendor
56
.env

‎app/Console/Kernel.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class Kernel extends ConsoleKernel
1919
/**
2020
* Define the application's command schedule.
2121
*
22-
* @param \Illuminate\Console\Scheduling\Schedule $schedule
22+
* @param \Illuminate\Console\Scheduling\Schedule $schedule
23+
*
2324
* @return void
2425
*/
2526
protected function schedule(Schedule $schedule)

‎app/Exceptions/Handler.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,11 @@ class Handler extends ExceptionHandler
3232
/**
3333
* Report or log an exception.
3434
*
35-
* @param \Exception $exception
36-
* @return void
35+
* @param \Exception $exception
36+
*
3737
* @throws Exception
38+
*
39+
* @return void
3840
*/
3941
public function report(Exception $exception)
4042
{
@@ -44,8 +46,9 @@ public function report(Exception $exception)
4446
/**
4547
* Render an exception into an HTTP response.
4648
*
47-
* @param \Illuminate\Http\Request $request
48-
* @param \Exception $exception
49+
* @param \Illuminate\Http\Request $request
50+
* @param \Exception $exception
51+
*
4952
* @return \Illuminate\Http\JsonResponse|\Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
5053
*/
5154
public function render($request, Exception $exception)
@@ -65,6 +68,7 @@ public function render($request, Exception $exception)
6568
if ($request->expectsJson() or $request->isXmlHttpRequest()) {
6669
if ($exception instanceof ValidationException) {
6770
$validator = $exception->validator;
71+
6872
return Response::json([
6973
'success' => false,
7074
'message' => $validator->errors()->first(),

‎app/Http/Controllers/ActivityTypeController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class ActivityTypeController extends AppBaseController
1717
{
18-
/** @var ActivityTypeRepository */
18+
/** @var ActivityTypeRepository */
1919
private $activityTypeRepository;
2020

2121
public function __construct(ActivityTypeRepository $activityTypeRepo)
@@ -28,16 +28,16 @@ public function __construct(ActivityTypeRepository $activityTypeRepo)
2828
*
2929
* @param Request $request
3030
*
31-
* @return Factory|View
32-
*
3331
* @throws Exception
3432
*
33+
* @return Factory|View
3534
*/
3635
public function index(Request $request)
3736
{
3837
if ($request->ajax()) {
3938
return DataTables::of((new ActivityTypeDataTable())->get($request->only(['name'])))->make(true);
4039
}
40+
4141
return view('activity_types.index');
4242
}
4343

@@ -74,7 +74,7 @@ public function edit($id)
7474
/**
7575
* Update the specified ActivityType in storage.
7676
*
77-
* @param int $id
77+
* @param int $id
7878
* @param UpdateActivityTypeRequest $request
7979
*
8080
* @return JsonResponse
@@ -93,9 +93,9 @@ public function update($id, UpdateActivityTypeRequest $request)
9393
*
9494
* @param int $id
9595
*
96-
* @return JsonResponse
9796
* @throws Exception
9897
*
98+
* @return JsonResponse
9999
*/
100100
public function destroy($id)
101101
{

‎app/Http/Controllers/AppBaseController.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
use Validator;
88

99
/**
10-
* Class AppBaseController
11-
* @package App\Http\Controllers
10+
* Class AppBaseController.
1211
*/
1312
class AppBaseController extends Controller
1413
{
1514
/**
16-
* @param array|mixed $result
17-
* @param string $message
15+
* @param array|mixed $result
16+
* @param string $message
17+
*
1818
* @return \Illuminate\Http\JsonResponse
1919
*/
2020
public function sendResponse($result, $message)
@@ -23,8 +23,9 @@ public function sendResponse($result, $message)
2323
}
2424

2525
/**
26-
* @param string $error
27-
* @param int $code
26+
* @param string $error
27+
* @param int $code
28+
*
2829
* @return \Illuminate\Http\JsonResponse
2930
*/
3031
public function sendError($error, $code = 500)
@@ -33,22 +34,23 @@ public function sendError($error, $code = 500)
3334
}
3435

3536
/**
36-
* @param string $message
37+
* @param string $message
38+
*
3739
* @return \Illuminate\Http\JsonResponse
3840
*/
3941
public function sendSuccess($message)
4042
{
4143
return Response::json([
4244
'success' => true,
43-
'message' => $message
45+
'message' => $message,
4446
], 200);
4547
}
4648

4749
/**
4850
* @param array $request
4951
* @param array $rules
50-
*
5152
* @param array $ruleMessage
53+
*
5254
* @return null|string
5355
*/
5456
public function validateRules($request, $rules, $ruleMessage = [])
@@ -57,7 +59,5 @@ public function validateRules($request, $rules, $ruleMessage = [])
5759
if ($validator->fails()) {
5860
return $validator->messages()->first();
5961
}
60-
61-
return null;
6262
}
6363
}

‎app/Http/Controllers/Auth/RegisterController.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace App\Http\Controllers\Auth;
44

5-
use App\Models\User;
65
use App\Http\Controllers\Controller;
6+
use App\Models\User;
7+
use Illuminate\Foundation\Auth\RegistersUsers;
78
use Illuminate\Support\Facades\Hash;
89
use Illuminate\Support\Facades\Validator;
9-
use Illuminate\Foundation\Auth\RegistersUsers;
1010

1111
class RegisterController extends Controller
1212
{
@@ -43,29 +43,31 @@ public function __construct()
4343
/**
4444
* Get a validator for an incoming registration request.
4545
*
46-
* @param array $data
46+
* @param array $data
47+
*
4748
* @return \Illuminate\Contracts\Validation\Validator
4849
*/
4950
protected function validator(array $data)
5051
{
5152
return Validator::make($data, [
52-
'name' => ['required', 'string', 'max:255'],
53-
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
53+
'name' => ['required', 'string', 'max:255'],
54+
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
5455
'password' => ['required', 'string', 'min:8', 'confirmed'],
5556
]);
5657
}
5758

5859
/**
5960
* Create a new user instance after a valid registration.
6061
*
61-
* @param array $data
62+
* @param array $data
63+
*
6264
* @return \App\Models\User
6365
*/
6466
protected function create(array $data)
6567
{
6668
return User::create([
67-
'name' => $data['name'],
68-
'email' => $data['email'],
69+
'name' => $data['name'],
70+
'email' => $data['email'],
6971
'password' => Hash::make($data['password']),
7072
]);
7173
}

‎app/Http/Controllers/AuthController.php

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
namespace App\Http\Controllers;
44

5+
use App\Models\User;
56
use App\Repositories\AccountRepository;
67
use App\Repositories\UserRepository;
7-
use App\Models\User;
88
use Crypt;
99
use Exception;
1010
use Illuminate\Http\Request;
1111
use Session;
1212

1313
class AuthController extends AppBaseController
1414
{
15-
/** @var AccountRepository */
15+
/** @var AccountRepository */
1616
private $accountRepository;
1717

1818
/**
@@ -35,6 +35,7 @@ public function verifyAccount()
3535

3636
if (empty($token)) {
3737
Session::flash('error', 'token not found');
38+
3839
return redirect('login');
3940
}
4041

@@ -44,6 +45,7 @@ public function verifyAccount()
4445

4546
if (count($result) < 2) {
4647
Session::flash('error', 'token not found');
48+
4749
return redirect('login');
4850
}
4951

@@ -52,31 +54,37 @@ public function verifyAccount()
5254

5355
if (empty($user)) {
5456
Session::flash('msg', 'This account activation token is invalid');
57+
5558
return redirect('login');
5659
}
5760
if ($user->is_email_verified) {
5861
Session::flash('success', 'Your account already activated. Please do a login');
62+
5963
return redirect('login');
6064
}
6165

6266
$user->is_email_verified = 1;
6367
$user->save();
6468
if ($user->set_password) {
6569
Session::flash('success', 'Your account is successfully activated. Please do a login');
70+
6671
return redirect('login');
6772
}
6873

6974
return view('auth.set_password', compact('user'));
7075
} catch (Exception $e) {
7176
Session::flash('msg', 'Something went wrong');
77+
7278
return redirect('login');
7379
}
7480
}
7581

7682
/**
77-
* @param Request $request
78-
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
83+
* @param Request $request
84+
*
7985
* @throws Exception
86+
*
87+
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
8088
*/
8189
public function setPassword(Request $request)
8290
{
@@ -87,6 +95,7 @@ public function setPassword(Request $request)
8795
/** @var User $user */
8896
$user = User::findOrFail($input['user_id']);
8997
Session::flash('error', $error);
98+
9099
return view('auth.set_password', compact('user'));
91100
}
92101

‎app/Http/Controllers/ClientController.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class ClientController extends AppBaseController
1515
{
16-
/** @var ClientRepository */
16+
/** @var ClientRepository */
1717
private $clientRepository;
1818

1919
public function __construct(ClientRepository $clientRepo)
@@ -25,8 +25,10 @@ public function __construct(ClientRepository $clientRepo)
2525
* Display a listing of the Client.
2626
*
2727
* @param Request $request
28-
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
28+
*
2929
* @throws Exception
30+
*
31+
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
3032
*/
3133
public function index(Request $request)
3234
{
@@ -56,19 +58,21 @@ public function store(CreateClientRequest $request)
5658

5759
/**
5860
* @param $input
61+
*
5962
* @return mixed
6063
*/
6164
public function fill($input)
6265
{
6366
$input['email'] = is_null($input['email']) ? '' : $input['email'];
6467
$input['website'] = is_null($input['website']) ? '' : $input['website'];
68+
6569
return $input;
6670
}
6771

6872
/**
6973
* Show the form for editing the specified Client.
7074
*
71-
* @param int $id
75+
* @param int $id
7276
*
7377
* @return JsonResponse
7478
*/
@@ -82,8 +86,8 @@ public function edit($id)
8286
/**
8387
* Update the specified Client in storage.
8488
*
85-
* @param int $id
86-
* @param UpdateClientRequest $request
89+
* @param int $id
90+
* @param UpdateClientRequest $request
8791
*
8892
* @return JsonResponse
8993
*/
@@ -98,11 +102,11 @@ public function update($id, UpdateClientRequest $request)
98102
/**
99103
* Remove the specified Client from storage.
100104
*
101-
* @param int $id
105+
* @param int $id
102106
*
103-
* @return JsonResponse
104107
* @throws Exception
105108
*
109+
* @return JsonResponse
106110
*/
107111
public function destroy($id)
108112
{

0 commit comments

Comments
 (0)