forked from eatvio/eatvio-infra
analysators added
This commit is contained in:
@@ -3,10 +3,11 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\BlogPost;
|
||||
use App\Models\User;
|
||||
use App\Models\Tag;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
/* use Spatie\QueryBuilder\AllowedFilter; */
|
||||
/* use Spatie\QueryBuilder\QueryBuilder; */
|
||||
|
||||
@@ -46,7 +47,6 @@ class BlogPostController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -57,7 +57,6 @@ class BlogPostController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\BlogPost $blogPost
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(BlogPost $blogPost)
|
||||
@@ -78,7 +77,6 @@ class BlogPostController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\BlogPost $blogPost
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(BlogPost $blogPost)
|
||||
@@ -89,8 +87,6 @@ class BlogPostController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\BlogPost $blogPost
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, BlogPost $blogPost)
|
||||
@@ -101,7 +97,6 @@ class BlogPostController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\BlogPost $blogPost
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(BlogPost $blogPost)
|
||||
|
||||
@@ -4,18 +4,24 @@ namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Calendar;
|
||||
use App\Models\Diary;
|
||||
use Carbon\Carbon;
|
||||
use Carbon\CarbonPeriod;
|
||||
use Illuminate\Http\Request;
|
||||
use Carbon\{Carbon, CarbonPeriod};
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
|
||||
|
||||
class CalendarController extends Controller
|
||||
{
|
||||
public $weekStartsAt;
|
||||
|
||||
public $weekEndsAt;
|
||||
|
||||
public $startsAt;
|
||||
|
||||
public $endsAt;
|
||||
|
||||
public $gridStartsAt;
|
||||
|
||||
public $gridEndsAt;
|
||||
|
||||
public function __construct($initialYear = null, $initialMonth = null, $weekStartsAt = null)
|
||||
@@ -23,8 +29,7 @@ class CalendarController extends Controller
|
||||
$this->weekStartsAt = $weekStartsAt ?? Carbon::MONDAY;
|
||||
$this->weekEndsAt = $this->weekStartsAt == Carbon::MONDAY
|
||||
? Carbon::SUNDAY
|
||||
: collect([0,1,2,3,4,5,6])->get($this->weekStartsAt + 6 - 7)
|
||||
;
|
||||
: collect([0, 1, 2, 3, 4, 5, 6])->get($this->weekStartsAt + 6 - 7);
|
||||
|
||||
$initialYear = $initialYear ?? Carbon::today()->year;
|
||||
$initialMonth = $initialMonth ?? Carbon::today()->month;
|
||||
@@ -40,6 +45,7 @@ class CalendarController extends Controller
|
||||
$this->gridStartsAt = $this->startsAt->clone()->startOfWeek($this->weekStartsAt);
|
||||
$this->gridEndsAt = $this->endsAt->clone()->endOfWeek($this->weekEndsAt);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
@@ -57,6 +63,7 @@ class CalendarController extends Controller
|
||||
->whereMonth('date', now()->month)
|
||||
->get()
|
||||
->keyBy('date');
|
||||
|
||||
return view(
|
||||
'calendar.index',
|
||||
[
|
||||
@@ -82,7 +89,6 @@ class CalendarController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -93,7 +99,6 @@ class CalendarController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\Calendar $calendar
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Calendar $calendar)
|
||||
@@ -104,7 +109,6 @@ class CalendarController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\Calendar $calendar
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(Calendar $calendar)
|
||||
@@ -115,8 +119,6 @@ class CalendarController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\Calendar $calendar
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, Calendar $calendar)
|
||||
@@ -127,7 +129,6 @@ class CalendarController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\Calendar $calendar
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(Calendar $calendar)
|
||||
|
||||
@@ -6,13 +6,11 @@ use App\Events\ChatMessageUpdated;
|
||||
use App\Models\Chat;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Faker\Factory as FakerFaktory;
|
||||
|
||||
class ChatMessage
|
||||
{
|
||||
|
||||
public $id;
|
||||
|
||||
public $payload;
|
||||
|
||||
public function __construct($id, $payload)
|
||||
@@ -38,13 +36,13 @@ class ChatMessage
|
||||
$data1 = [
|
||||
'from_user_id' => $user2,
|
||||
'to_user_id' => $user1,
|
||||
'data' => $faker->text()
|
||||
'data' => $faker->text(),
|
||||
];
|
||||
|
||||
$data2 = [
|
||||
'from_user_id' => $user1,
|
||||
'to_user_id' => $user2,
|
||||
'data' => $faker->text()
|
||||
'data' => $faker->text(),
|
||||
];
|
||||
|
||||
$newMessage = (new Chat())->forceFill($data1);
|
||||
@@ -84,7 +82,7 @@ class ChatController extends Controller
|
||||
|
||||
$lastChatRecipientUserId = $lastChatMessage->count() ? $lastChatMessage['from_user_id'] : null;
|
||||
|
||||
if (!is_null($lastChatRecipientUserId) && $lastChatMessage['from_user_id'] === $curUserId) {
|
||||
if (! is_null($lastChatRecipientUserId) && $lastChatMessage['from_user_id'] === $curUserId) {
|
||||
$lastChatRecipientUserId = $lastChatMessage['to_user_id'];
|
||||
}
|
||||
|
||||
@@ -94,7 +92,7 @@ class ChatController extends Controller
|
||||
'lastChatRecipientUserId' => $lastChatRecipientUserId,
|
||||
'lastChatUsers' => $lastChatUsers,
|
||||
'curUserId' => $curUserId,
|
||||
'chanId' => $this->makeChanName($curUserId, $lastChatRecipientUserId)
|
||||
'chanId' => $this->makeChanName($curUserId, $lastChatRecipientUserId),
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -102,8 +100,8 @@ class ChatController extends Controller
|
||||
private function makeChanName($from, $to)
|
||||
{
|
||||
return (int) $from < (int) $to
|
||||
? $from. "_" . $to
|
||||
: $to . "_" . $from;
|
||||
? $from.'_'.$to
|
||||
: $to.'_'.$from;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -113,13 +111,12 @@ class ChatController extends Controller
|
||||
*/
|
||||
public function create()
|
||||
{
|
||||
ChatMessageUpdated::dispatch(new ChatMessage(time(), 'some text ' . md5(time())));
|
||||
ChatMessageUpdated::dispatch(new ChatMessage(time(), 'some text '.md5(time())));
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -130,7 +127,7 @@ class ChatController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\Chat $chat
|
||||
* @param \App\Models\Chat $chat
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(int $lastChatUser)
|
||||
@@ -156,7 +153,7 @@ class ChatController extends Controller
|
||||
'lastChatRecipientUserId' => $lastChatUser->id,
|
||||
'lastChatUsers' => $lastChatUsers,
|
||||
'curUserId' => $curUserId,
|
||||
'chanId' => $this->makeChanName($curUserId, $lastChatUser->id)
|
||||
'chanId' => $this->makeChanName($curUserId, $lastChatUser->id),
|
||||
]
|
||||
);
|
||||
//
|
||||
@@ -165,7 +162,6 @@ class ChatController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\chat $chat
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(chat $chat)
|
||||
@@ -176,8 +172,6 @@ class ChatController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\chat $chat
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, chat $chat)
|
||||
@@ -188,7 +182,6 @@ class ChatController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\chat $chat
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(chat $chat)
|
||||
|
||||
@@ -13,7 +13,7 @@ class ConsultantController extends Controller
|
||||
*/
|
||||
public function index()
|
||||
{
|
||||
return view('consultant.list');
|
||||
return view('consultant.list');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -29,7 +29,6 @@ class ConsultantController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -62,7 +61,6 @@ class ConsultantController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\ConsultantDiaryComment;
|
||||
use App\Models\Diary;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
@@ -31,7 +30,6 @@ class ConsultantDiaryCommentController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -42,7 +40,6 @@ class ConsultantDiaryCommentController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\Diary $diary
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Diary $diary)
|
||||
@@ -51,13 +48,13 @@ class ConsultantDiaryCommentController extends Controller
|
||||
'daysCount' => 1,
|
||||
'diary' => $diary,
|
||||
];
|
||||
|
||||
return view('diary.consultant_comments', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\Diary $diary
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(Diary $diary)
|
||||
@@ -68,7 +65,7 @@ class ConsultantDiaryCommentController extends Controller
|
||||
__('diary.dinner'),
|
||||
__('diary.supper'),
|
||||
__('diary.lunch'),
|
||||
__('diary.snacks')
|
||||
__('diary.snacks'),
|
||||
];
|
||||
|
||||
$data = [
|
||||
@@ -78,14 +75,13 @@ class ConsultantDiaryCommentController extends Controller
|
||||
'curMeals' => $curMeals,
|
||||
'typeNames' => $typeNames,
|
||||
];
|
||||
|
||||
return view('diary.consultant_comments_edit', $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\Diary $diary
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, Diary $diary)
|
||||
|
||||
@@ -30,6 +30,7 @@ class ConsultantRequestFormController extends Controller
|
||||
if ($state !== 'incomplete') {
|
||||
return redirect()->route('consultant_request.show', [$user]);
|
||||
}
|
||||
|
||||
return view(
|
||||
'consultant.registration',
|
||||
[
|
||||
@@ -42,7 +43,6 @@ class ConsultantRequestFormController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -53,7 +53,6 @@ class ConsultantRequestFormController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(User $user)
|
||||
@@ -61,6 +60,7 @@ class ConsultantRequestFormController extends Controller
|
||||
$requestData = $user->consultant_request;
|
||||
$medicalEducations = $requestData ? json_decode($requestData->completed_courses, true) : [];
|
||||
$certs = $user->attachments()->certs()->get();
|
||||
|
||||
return view(
|
||||
'consultant.show',
|
||||
[
|
||||
@@ -77,7 +77,6 @@ class ConsultantRequestFormController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(User $user)
|
||||
@@ -85,6 +84,7 @@ class ConsultantRequestFormController extends Controller
|
||||
// dd($user);
|
||||
// return redirect()->route('consultant_request.show', [$user]);
|
||||
$state = $user->consultant_state;
|
||||
|
||||
return view(
|
||||
'consultant.registration',
|
||||
[
|
||||
@@ -97,8 +97,6 @@ class ConsultantRequestFormController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, User $user)
|
||||
@@ -109,7 +107,6 @@ class ConsultantRequestFormController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(User $user)
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\Diary;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class DiaryController extends Controller
|
||||
@@ -17,6 +17,7 @@ class DiaryController extends Controller
|
||||
{
|
||||
/* return view('diary.index'); */
|
||||
$curDiary = $this->getCurrentDiary();
|
||||
|
||||
/* dd($curDiary); */
|
||||
return redirect()->route('diary.edit', $curDiary);
|
||||
}
|
||||
@@ -26,24 +27,25 @@ class DiaryController extends Controller
|
||||
$curUserId = Auth::id();
|
||||
$curDiary = Diary::userToDayItem($curUserId)->first();
|
||||
|
||||
if (!is_null($curDiary)) {
|
||||
if (! is_null($curDiary)) {
|
||||
return $curDiary;
|
||||
}
|
||||
|
||||
return $this->newDiary($curUserId);
|
||||
}
|
||||
|
||||
private function newDiary($curUserId)
|
||||
{
|
||||
$curDiary = new Diary();
|
||||
$curDiary->date = now()->setTimezone('3')->format('Y-m-d');
|
||||
$curDiary->wakeup = '06:30';
|
||||
$curDiary->retire = '22:30';
|
||||
$curDiary->user_id = $curUserId;
|
||||
$curDiary->closed = false;
|
||||
$curDiary->comment = "";
|
||||
$curDiary->save();
|
||||
$curDiary = new Diary();
|
||||
$curDiary->date = now()->setTimezone('3')->format('Y-m-d');
|
||||
$curDiary->wakeup = '06:30';
|
||||
$curDiary->retire = '22:30';
|
||||
$curDiary->user_id = $curUserId;
|
||||
$curDiary->closed = false;
|
||||
$curDiary->comment = '';
|
||||
$curDiary->save();
|
||||
|
||||
return $curDiary;
|
||||
return $curDiary;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -59,7 +61,6 @@ class DiaryController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -78,6 +79,7 @@ class DiaryController extends Controller
|
||||
{
|
||||
/* $curDiary = Diary::find($id); */
|
||||
$daysCount = Diary::where('user_id', auth()->id())->count();
|
||||
|
||||
return view('diary.show', ['curDiary' => $diary, 'daysCount' => $daysCount]);
|
||||
}
|
||||
|
||||
@@ -91,12 +93,13 @@ class DiaryController extends Controller
|
||||
{
|
||||
$curDiary = Diary::find($id);
|
||||
$daysCount = Diary::where('user_id', auth()->id())->count();
|
||||
|
||||
return view(
|
||||
'diary.index',
|
||||
[
|
||||
'diaryId' => $id,
|
||||
'curDiary' => $curDiary,
|
||||
'daysCount' => $daysCount
|
||||
'daysCount' => $daysCount,
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -104,7 +107,6 @@ class DiaryController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
@@ -118,6 +120,7 @@ class DiaryController extends Controller
|
||||
$curDiary->comment = $request->input('comment') ?? '';
|
||||
$curDiary->closed = true;
|
||||
$curDiary->save();
|
||||
|
||||
return redirect()->route('diary.show', $id);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,15 +2,14 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\User;
|
||||
use App\Models\Diet;
|
||||
use Spatie\QueryBuilder\QueryBuilder;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use Spatie\QueryBuilder\AllowedFilter;
|
||||
use Spatie\QueryBuilder\QueryBuilder;
|
||||
|
||||
class DietController extends Controller
|
||||
{
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
*
|
||||
@@ -25,7 +24,7 @@ class DietController extends Controller
|
||||
} else {
|
||||
|
||||
$hasTypes = data_get($request->get('filter'), 'contains_type', []);
|
||||
$diets = QueryBuilder::for(Diet::class)
|
||||
$diets = QueryBuilder::for(Diet::class)
|
||||
->allowedFilters([
|
||||
'name',
|
||||
AllowedFilter::callback('contains_type', function ($query, $v) use ($hasTypes) {
|
||||
@@ -67,7 +66,6 @@ class DietController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\Diet $diet
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Diet $diet)
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use App\Services\FeedService;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class FeedController extends Controller
|
||||
{
|
||||
@@ -15,6 +15,7 @@ class FeedController extends Controller
|
||||
public function index()
|
||||
{
|
||||
$feed = (new FeedService())->showActualFeed();
|
||||
|
||||
return view('feed.index', ['posts' => $feed]);
|
||||
}
|
||||
|
||||
@@ -31,7 +32,6 @@ class FeedController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -64,7 +64,6 @@ class FeedController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
|
||||
@@ -30,7 +30,6 @@ class FinanceController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -41,7 +40,6 @@ class FinanceController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\Finance $finance
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Finance $finance)
|
||||
@@ -52,7 +50,6 @@ class FinanceController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\Finance $finance
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(Finance $finance)
|
||||
@@ -63,8 +60,6 @@ class FinanceController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\Finance $finance
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, Finance $finance)
|
||||
@@ -75,7 +70,6 @@ class FinanceController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\Finance $finance
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(Finance $finance)
|
||||
|
||||
@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
|
||||
use App\Models\Plan;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\PlanComment;
|
||||
|
||||
class PlanController extends Controller
|
||||
{
|
||||
@@ -24,6 +23,7 @@ class PlanController extends Controller
|
||||
} else {
|
||||
$plans = Plan::all();
|
||||
}
|
||||
|
||||
return view('plan/index', ['plans' => $plans]);
|
||||
}
|
||||
|
||||
@@ -40,7 +40,6 @@ class PlanController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -51,7 +50,6 @@ class PlanController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\Plan $plan
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Plan $plan)
|
||||
@@ -85,13 +83,13 @@ class PlanController extends Controller
|
||||
if (preg_match('/^".*"$/', $str)) {
|
||||
return json_decode(stripslashes(mb_substr($str, 1, -1)), true);
|
||||
}
|
||||
|
||||
return json_decode(stripslashes($str), true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\Plan $plan
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(Plan $plan)
|
||||
@@ -102,8 +100,6 @@ class PlanController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\Plan $plan
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, Plan $plan)
|
||||
@@ -114,7 +110,6 @@ class PlanController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\Plan $plan
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(Plan $plan)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\ProductNutritionalValue;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class ProductNutritionalValueController extends Controller
|
||||
{
|
||||
@@ -30,7 +29,6 @@ class ProductNutritionalValueController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\ProductNutritionalValue $productNutritionalValue
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(ProductNutritionalValue $productNutritionalValue)
|
||||
@@ -44,7 +42,6 @@ class ProductNutritionalValueController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\ProductNutritionalValue $productNutritionalValue
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(ProductNutritionalValue $productNutritionalValue)
|
||||
@@ -55,7 +52,6 @@ class ProductNutritionalValueController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\ProductNutritionalValue $productNutritionalValue
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(ProductNutritionalValue $productNutritionalValue)
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\UserDetailz;
|
||||
use App\Models\User;
|
||||
use App\Models\UserDetailz;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
@@ -22,7 +22,7 @@ class ProfileController extends Controller
|
||||
->distinct()
|
||||
->orderBy('updated_at', 'desc')
|
||||
->limit(5)
|
||||
->get();
|
||||
->get();
|
||||
$profileViewsCount = views($user)->unique()->count();
|
||||
$totalLikes = 0;
|
||||
$totalLikes += $user->author_of_plans()->distinct()->get()->sum('likes_count');
|
||||
@@ -36,7 +36,7 @@ class ProfileController extends Controller
|
||||
'user' => $user,
|
||||
'userPosts' => $userPosts,
|
||||
'totalLikes' => $totalLikes,
|
||||
'profileViewsCount' => $profileViewsCount
|
||||
'profileViewsCount' => $profileViewsCount,
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -54,7 +54,6 @@ class ProfileController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -65,7 +64,6 @@ class ProfileController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(User $user)
|
||||
@@ -94,7 +92,7 @@ class ProfileController extends Controller
|
||||
'user' => $user,
|
||||
'userPosts' => $userPosts,
|
||||
'totalLikes' => $totalLikes,
|
||||
'profileViewsCount' => $profileViewsCount
|
||||
'profileViewsCount' => $profileViewsCount,
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -102,7 +100,6 @@ class ProfileController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(UserDetailz $userDetailz)
|
||||
@@ -113,8 +110,6 @@ class ProfileController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, UserDetailz $userDetailz)
|
||||
@@ -125,7 +120,6 @@ class ProfileController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(UserDetailz $userDetailz)
|
||||
|
||||
@@ -29,7 +29,6 @@ class RecipeController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\Recipe $recipe
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(Recipe $recipe)
|
||||
@@ -37,7 +36,7 @@ class RecipeController extends Controller
|
||||
$data = [
|
||||
'author' => $recipe->author()->first(),
|
||||
'tags' => $recipe->tags()->get(),
|
||||
'recipe' => $recipe
|
||||
'recipe' => $recipe,
|
||||
];
|
||||
|
||||
$expiresAt = now()->addHours(24);
|
||||
@@ -52,12 +51,10 @@ class RecipeController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\Recipe $recipe
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(Recipe $recipe)
|
||||
{
|
||||
return view('recipe/edit_form', ['recipe' => $recipe]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -2,13 +2,12 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class RegistrationStartController extends Controller
|
||||
{
|
||||
public function start()
|
||||
{
|
||||
session()->flush();
|
||||
|
||||
return redirect()->route('register.step1', ['step' => 'step1']);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\UserDetailz;
|
||||
use App\Models\User;
|
||||
use App\Models\UserDetailz;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class UserController extends Controller
|
||||
@@ -31,7 +31,6 @@ class UserController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -42,7 +41,6 @@ class UserController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(User $user)
|
||||
@@ -53,7 +51,6 @@ class UserController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(UserDetailz $userDetailz)
|
||||
@@ -64,8 +61,6 @@ class UserController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, UserDetailz $userDetailz)
|
||||
@@ -76,7 +71,6 @@ class UserController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(UserDetailz $userDetailz)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\UserDetailz;
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class UserDetailzController extends Controller
|
||||
@@ -31,7 +30,6 @@ class UserDetailzController extends Controller
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
@@ -42,16 +40,15 @@ class UserDetailzController extends Controller
|
||||
/**
|
||||
* Display the specified resource.
|
||||
*
|
||||
* @param \App\Models\User $user
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @param \App\Models\User $user
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(UserDetailz $userDetailz)
|
||||
{
|
||||
$regFormKeys = [
|
||||
'first_name' => __('reg_form.first_name'),
|
||||
'last_name' => __('reg_form.last_name'),
|
||||
'birthdate' => __('reg_form.date_of_birth'),
|
||||
'last_name' => __('reg_form.last_name'),
|
||||
'birthdate' => __('reg_form.date_of_birth'),
|
||||
'gender' => __('reg_form.gender'),
|
||||
'country' => __('reg_form.country'),
|
||||
'city' => __('reg_form.city'),
|
||||
@@ -60,17 +57,17 @@ class UserDetailzController extends Controller
|
||||
'height' => __('reg_form.your_height'),
|
||||
'chest_circumference' => __('reg_form.chest_circumference'),
|
||||
'waist_circumference' => __('reg_form.waist_circumference'),
|
||||
'hip_circumference' => __('reg_form.hip_circumference'),
|
||||
'blood_pressure_up' => __('reg_form.pressure_up'),
|
||||
'hip_circumference' => __('reg_form.hip_circumference'),
|
||||
'blood_pressure_up' => __('reg_form.pressure_up'),
|
||||
'blood_pressure_down' => __('reg_form.pressure_down'),
|
||||
'has_hypo' => __('reg_form.tendency_to_be_hypo'),
|
||||
'has_hyper' => __('reg_form.prone_to_hypertension'),
|
||||
'about_alergy' => __('reg_form.has_alergy'),
|
||||
'about_taking_pils' => __('reg_form.take_pils'),
|
||||
'about_taking_pils' => __('reg_form.take_pils'),
|
||||
'about_sport_hobbies' => __('reg_form.sport_hobbies'),
|
||||
'favorite_foods' => __('reg_form.favorite_foods'),
|
||||
'favorite_foods' => __('reg_form.favorite_foods'),
|
||||
'unfavorite_foods' => __('reg_form.unfavorite_foods'),
|
||||
'additional_info' => __('reg_form.optional_info')
|
||||
'additional_info' => __('reg_form.optional_info'),
|
||||
];
|
||||
|
||||
$userAttributes = json_decode(json_encode($userDetailz->user), true);
|
||||
@@ -83,7 +80,7 @@ class UserDetailzController extends Controller
|
||||
'userDetailz' => $userDetailz,
|
||||
'regFormKeys' => $regFormKeys,
|
||||
'userAttributes' => $userAttributes,
|
||||
'userDetailzAttributes' => $userDetailzAttributes
|
||||
'userDetailzAttributes' => $userDetailzAttributes,
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -91,15 +88,14 @@ class UserDetailzController extends Controller
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function edit(UserDetailz $userDetailz)
|
||||
{
|
||||
$regFormKeys = [
|
||||
'first_name' => __('reg_form.first_name'),
|
||||
'last_name' => __('reg_form.last_name'),
|
||||
'birthdate' => __('reg_form.date_of_birth'),
|
||||
'last_name' => __('reg_form.last_name'),
|
||||
'birthdate' => __('reg_form.date_of_birth'),
|
||||
'gender' => __('reg_form.gender'),
|
||||
'country' => __('reg_form.country'),
|
||||
'city' => __('reg_form.city'),
|
||||
@@ -107,23 +103,23 @@ class UserDetailzController extends Controller
|
||||
'weight' => __('reg_form.your_weight'),
|
||||
'chest_circumference' => __('reg_form.chest_circumference'),
|
||||
'waist_circumference' => __('reg_form.waist_circumference'),
|
||||
'hip_circumference' => __('reg_form.hip_circumference'),
|
||||
'blood_pressure_up' => __('reg_form.pressure_up'),
|
||||
'hip_circumference' => __('reg_form.hip_circumference'),
|
||||
'blood_pressure_up' => __('reg_form.pressure_up'),
|
||||
'blood_pressure_down' => __('reg_form.pressure_down'),
|
||||
'has_hypo' => __('reg_form.tendency_to_be_hypo'),
|
||||
'has_hyper' => __('reg_form.prone_to_hypertension'),
|
||||
'about_alergy' => __('reg_form.has_alergy'),
|
||||
'about_taking_pils' => __('reg_form.take_pils'),
|
||||
'about_taking_pils' => __('reg_form.take_pils'),
|
||||
'about_sport_hobbies' => __('reg_form.sport_hobbies'),
|
||||
'favorite_foods' => __('reg_form.favorite_foods'),
|
||||
'favorite_foods' => __('reg_form.favorite_foods'),
|
||||
'unfavorite_foods' => __('reg_form.unfavorite_foods'),
|
||||
'additional_info' => __('reg_form.optional_info')
|
||||
'additional_info' => __('reg_form.optional_info'),
|
||||
];
|
||||
|
||||
$regFormTypes = [
|
||||
'first_name' => 'text',
|
||||
'last_name' => 'text',
|
||||
'birthdate' => 'date',
|
||||
'last_name' => 'text',
|
||||
'birthdate' => 'date',
|
||||
'gender' => 'text',
|
||||
'country' => 'text',
|
||||
'city' => 'text',
|
||||
@@ -131,15 +127,15 @@ class UserDetailzController extends Controller
|
||||
'weight' => 'number',
|
||||
'chest_circumference' => 'number',
|
||||
'waist_circumference' => 'number',
|
||||
'hip_circumference' => 'number',
|
||||
'blood_pressure_up' => 'number',
|
||||
'hip_circumference' => 'number',
|
||||
'blood_pressure_up' => 'number',
|
||||
'blood_pressure_down' => 'number',
|
||||
'has_hypo' => 'text',
|
||||
'has_hyper' => 'text',
|
||||
'about_alergy' => 'text',
|
||||
'about_taking_pils' => 'text',
|
||||
'about_taking_pils' => 'text',
|
||||
'about_sport_hobbies' => 'text',
|
||||
'favorite_foods' => 'text',
|
||||
'favorite_foods' => 'text',
|
||||
'unfavorite_foods' => 'text',
|
||||
'additional_info' => 'text',
|
||||
];
|
||||
@@ -163,8 +159,6 @@ class UserDetailzController extends Controller
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(Request $request, UserDetailz $userDetailz)
|
||||
@@ -175,12 +169,10 @@ class UserDetailzController extends Controller
|
||||
/**
|
||||
* Remove the specified resource from storage.
|
||||
*
|
||||
* @param \App\Models\UserDetailz $userDetailz
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(UserDetailz $userDetailz)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user