alex_chevski/eatvio-infra
1
0
Fork 0
forked from eatvio/eatvio-infra
Code Pull Requests Activity

static analisys refactoryn, View types added

Browse Source
This commit is contained in:
Anatoliy Poloz
2023-12-29 10:59:20 +03:00
parent 9b2d703374
commit 8e97a8abd4
14 changed files with 62 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/Http/Controllers/BlogPostController.php
View File

@@ -4,18 +4,15 @@ namespace App\Http\Controllers;
use App\Models\BlogPost;
use Illuminate\Http\Request;
use Illuminate\View\View;
/* use Spatie\QueryBuilder\AllowedFilter; */
/* use Spatie\QueryBuilder\QueryBuilder; */
class BlogPostController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
public function index(Request $request): View
{
// if ($request->has('author')) {
// $author = $request->get('author');
@@ -31,31 +28,12 @@ class BlogPostController extends Controller
return view('blog_post/index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
public function create(): View
{
return view('blog_post/edit_form');
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(BlogPost $blogPost)
public function show(BlogPost $blogPost): View
{
$data['author'] = $blogPost->author()->first();
$data['tags'] = $blogPost->tags()->get();
@@ -70,31 +48,8 @@ class BlogPostController extends Controller
echo view('blog_post/show', $data);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(BlogPost $blogPost)
public function edit(BlogPost $blogPost): View
{
return view('blog_post/edit_form', ['blogPost' => $blogPost]);
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, BlogPost $blogPost)
{
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(BlogPost $blogPost)
{
}
}

62
app/Http/Controllers/CalendarController.php
View File

@@ -9,6 +9,7 @@ use Carbon\CarbonPeriod;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
use Illuminate\View\View;
class CalendarController extends Controller
{
@@ -45,12 +46,7 @@ class CalendarController extends Controller
$this->gridEndsAt = $this->endsAt->clone()->endOfWeek($this->weekEndsAt);
}
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View
{
$curUser = Auth::user();
$fullGridPeriod = CarbonPeriod::create(
@@ -73,58 +69,4 @@ class CalendarController extends Controller
]
);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(Calendar $calendar)
{
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(Calendar $calendar)
{
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Calendar $calendar)
{
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(Calendar $calendar)
{
}
}

53
app/Http/Controllers/ChatController.php
View File

@@ -6,6 +6,7 @@ use App\Events\ChatMessageUpdated;
use App\Models\Chat;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\View\View;
class ChatMessage
{
@@ -57,12 +58,7 @@ class ChatMessage
class ChatController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View
{
// $_ = "from_user_id to_user_id";
$curUserId = Auth()->user()->id;
@@ -106,23 +102,7 @@ class ChatController extends Controller
ChatMessageUpdated::dispatch(new ChatMessage(time(), 'some text '.md5(time())));
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @param \App\Models\Chat $chat
*
* @return \Illuminate\Http\Response
*/
public function show(int $lastChatUser)
public function show(int $lastChatUser): View
{
$lastChatUser = User::find($lastChatUser);
// $_ = "from_user_id to_user_id";
@@ -150,33 +130,6 @@ class ChatController extends Controller
);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(chat $chat)
{
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, chat $chat)
{
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(chat $chat)
{
}
private function makeChanName($from, $to)
{
return (int) $from < (int) $to

70
app/Http/Controllers/ConsultantController.php
View File

@@ -3,78 +3,12 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\View\View;
class ConsultantController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View
{
return view('consultant.list');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function show($id)
{
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
}
/**
* Update the specified resource in storage.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
}
/**
* Remove the specified resource from storage.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
}
}

61
app/Http/Controllers/ConsultantDiaryCommentController.php
View File

@@ -4,42 +4,12 @@ namespace App\Http\Controllers;
use App\Models\Diary;
use Illuminate\Http\Request;
use Illuminate\View\View;
class ConsultantDiaryCommentController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(Diary $diary)
public function show(Diary $diary): View
{
$data = [
'daysCount' => 1,
@@ -49,12 +19,7 @@ class ConsultantDiaryCommentController extends Controller
return view('diary.consultant_comments', $data);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(Diary $diary)
public function edit(Diary $diary): View
{
$curMeals = $diary->meals()->orderBy('type')->get();
$typeNames = [
@@ -75,24 +40,4 @@ class ConsultantDiaryCommentController extends Controller
return view('diary.consultant_comments_edit', $data);
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Diary $diary)
{
}
/**
* Remove the specified resource from storage.
*
* @param \App\Models\Diary $consultantDiaryComment
*
* @return \Illuminate\Http\Response
*/
public function destroy(Diary $diary)
{
}
}

56
app/Http/Controllers/ConsultantRequestFormController.php
View File

@@ -5,25 +5,16 @@ namespace App\Http\Controllers;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\View\View;
class ConsultantRequestFormController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View
{
return view('consultant.index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
public function create(): View
{
$user = Auth::user();
$state = $user->consultant_state;
@@ -40,21 +31,7 @@ class ConsultantRequestFormController extends Controller
);
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(User $user)
public function show(User $user): View
{
$requestData = $user->consultant_request;
$medicalEducations = $requestData ? json_decode($requestData->completed_courses, true) : [];
@@ -72,12 +49,7 @@ class ConsultantRequestFormController extends Controller
);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(User $user)
public function edit(User $user): View
{
// dd($user);
// return redirect()->route('consultant_request.show', [$user]);
@@ -91,22 +63,4 @@ class ConsultantRequestFormController extends Controller
]
);
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, User $user)
{
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(User $user)
{
}
}

50
app/Http/Controllers/DiaryController.php
View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Models\Diary;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\View\View;
class DiaryController extends Controller
{
@@ -22,33 +23,12 @@ class DiaryController extends Controller
return redirect()->route('diary.edit', $curDiary);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
public function store(Request $request): void
{
dd($request);
}
/**
* Display the specified resource.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function show(Diary $diary)
public function show(Diary $diary): View
{
/* $curDiary = Diary::find($id); */
$daysCount = Diary::where('user_id', auth()->id())->count();
@@ -56,14 +36,7 @@ class DiaryController extends Controller
return view('diary.show', ['curDiary' => $diary, 'daysCount' => $daysCount]);
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function edit($id)
public function edit($id): View
{
$curDiary = Diary::find($id);
$daysCount = Diary::where('user_id', auth()->id())->count();
@@ -98,18 +71,7 @@ class DiaryController extends Controller
return redirect()->route('diary.show', $id);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
}
private function getCurrentDiary()
private function getCurrentDiary(): Diary
{
$curUserId = Auth::id();
$curDiary = Diary::userToDayItem($curUserId)->first();
@@ -121,7 +83,7 @@ class DiaryController extends Controller
return $this->newDiary($curUserId);
}
private function newDiary($curUserId)
private function newDiary(int $curUserId): Diary
{
$curDiary = new Diary();
$curDiary->date = now()->setTimezone('3')->format('Y-m-d');

24
app/Http/Controllers/DietController.php
View File

@@ -7,15 +7,11 @@ use App\Models\User;
use Illuminate\Http\Request;
use Spatie\QueryBuilder\AllowedFilter;
use Spatie\QueryBuilder\QueryBuilder;
use Illuminate\View\View;
class DietController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
public function index(Request $request): View
{
$hasTypes = [];
if ($request->has('author')) {
@@ -48,27 +44,17 @@ class DietController extends Controller
);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
public function create(): View
{
return view('diet/edit_form');
}
public function edit(Diet $diet)
public function edit(Diet $diet): View
{
return view('diet/edit_form', ['diet' => $diet]);
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(Diet $diet)
public function show(Diet $diet): View
{
$expiresAt = now()->addHours(24);

72
app/Http/Controllers/FeedController.php
View File

@@ -3,81 +3,15 @@
namespace App\Http\Controllers;
use App\Services\FeedService;
use Illuminate\Http\Request;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory as ViewFactory;
class FeedController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View | ViewFactory
{
$feed = (new FeedService())->showActualFeed();
return view('feed.index', ['posts' => $feed]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function show($id)
{
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
}
/**
* Update the specified resource in storage.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
}
/**
* Remove the specified resource from storage.
*
* @param int $id
*
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
}
}

83
app/Http/Controllers/PlanController.php
View File

@@ -5,15 +5,12 @@ namespace App\Http\Controllers;
use App\Models\Plan;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory as ViewFactory;
class PlanController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index(Request $request)
public function index(Request $request): View|ViewFactory
{
if ($request->has('author')) {
$author = $request->get('author');
@@ -26,31 +23,12 @@ class PlanController extends Controller
return view('plan/index', ['plans' => $plans]);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
public function create(): View|ViewFactory
{
return view('plan/edit_form');
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(Plan $plan)
public function show(Plan $plan): View|ViewFactory
{
$expiresAt = now()->addHours(24);
@@ -58,58 +36,11 @@ class PlanController extends Controller
->cooldown($expiresAt)
->record();
// $options1 = $this->unserializeOptions($plan->packet1_options);
// $options2 = $this->unserializeOptions($plan->packet2_options);
// $options3 = $this->unserializeOptions($plan->packet2_options);
// $options1 = $plan->packet1_options;
// $options2 = $plan->packet2_options;
// $options3 = $plan->packet2_options;
return view(
'plan/show',
[
'plan' => $plan,
// 'options1' => $options1,
// 'options2' => $options2,
// 'options3' => $options3,
]
);
return view('plan/show', ['plan' => $plan]);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(Plan $plan)
public function edit(Plan $plan): View|ViewFactory
{
return view('plan/edit_form', ['plan' => $plan]);
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Plan $plan)
{
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(Plan $plan)
{
}
private function unserializeOptions($str)
{
if (preg_match('/^".*"$/', $str)) {
return json_decode(stripslashes(mb_substr($str, 1, -1)), true);
}
return json_decode(stripslashes($str), true);
}
}

39
app/Http/Controllers/ProductNutritionalValueController.php
View File

@@ -3,35 +3,22 @@
namespace App\Http\Controllers;
use App\Models\ProductNutritionalValue;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory as ViewFactory;
class ProductNutritionalValueController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View|ViewFactory
{
return view('product_nutritional/index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
public function create(): View|ViewFactory
{
return view('product_nutritional/create');
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(ProductNutritionalValue $productNutritionalValue)
public function show(ProductNutritionalValue $productNutritionalValue): View|ViewFactory
{
return view(
'product_nutritional/show',
@@ -39,22 +26,8 @@ class ProductNutritionalValueController extends Controller
);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(ProductNutritionalValue $productNutritionalValue)
public function edit(ProductNutritionalValue $productNutritionalValue): View|ViewFactory
{
return view('product_nutritional/edit', ['productNutritionalValue' => $productNutritionalValue]);
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(ProductNutritionalValue $productNutritionalValue)
{
}
}

61
app/Http/Controllers/ProfileController.php
View File

@@ -6,15 +6,12 @@ use App\Models\User;
use App\Models\UserDetailz;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory as ViewFactory;
class ProfileController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View|ViewFactory
{
$user = Auth::user();
$userPosts = $user
@@ -41,30 +38,7 @@ class ProfileController extends Controller
);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(User $user)
public function show(User $user): View|ViewFactory
{
$expiresAt = now()->addHours(24);
$userPosts = $user
@@ -94,31 +68,4 @@ class ProfileController extends Controller
]
);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(UserDetailz $userDetailz)
{
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, UserDetailz $userDetailz)
{
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(UserDetailz $userDetailz)
{
}
}

30
app/Http/Controllers/RecipeController.php
View File

@@ -3,35 +3,22 @@
namespace App\Http\Controllers;
use App\Models\Recipe;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory as ViewFactory;
class RecipeController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function index(): View|ViewFactory
{
return view('recipe/index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
public function create(): View|ViewFactory
{
return view('recipe/edit_form');
}
/**
* Display the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function show(Recipe $recipe)
public function show(Recipe $recipe): View|ViewFactory
{
$data = [
'author' => $recipe->author()->first(),
@@ -48,12 +35,7 @@ class RecipeController extends Controller
return view('recipe/show', $data);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(Recipe $recipe)
public function edit(Recipe $recipe): View|ViewFactory
{
return view('recipe/edit_form', ['recipe' => $recipe]);
}

62
app/Http/Controllers/UserDetailzController.php
View File

@@ -4,44 +4,13 @@ namespace App\Http\Controllers;
use App\Models\UserDetailz;
use Illuminate\Http\Request;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory as ViewFactory;
class UserDetailzController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
}
/**
* Display the specified resource.
*
* @param \App\Models\User $user
*
* @return \Illuminate\Http\Response
*/
public function show(UserDetailz $userDetailz)
public function show(UserDetailz $userDetailz): View|ViewFactory
{
$regFormKeys = [
'first_name' => __('reg_form.first_name'),
@@ -83,12 +52,7 @@ class UserDetailzController extends Controller
);
}
/**
* Show the form for editing the specified resource.
*
* @return \Illuminate\Http\Response
*/
public function edit(UserDetailz $userDetailz)
public function edit(UserDetailz $userDetailz): View|ViewFactory
{
$regFormKeys = [
'first_name' => __('reg_form.first_name'),
@@ -153,22 +117,4 @@ class UserDetailzController extends Controller
]
);
}
/**
* Update the specified resource in storage.
*
* @return \Illuminate\Http\Response
*/
public function update(Request $request, UserDetailz $userDetailz)
{
}
/**
* Remove the specified resource from storage.
*
* @return \Illuminate\Http\Response
*/
public function destroy(UserDetailz $userDetailz)
{
}
}