04 10 2023 snapshot

This commit is contained in:
Anatoliy Poloz
2023-10-04 17:57:09 +03:00
parent 1e546fa48e
commit 09a00744a0
441 changed files with 41582 additions and 254079 deletions

View File

@@ -19,20 +19,18 @@ class BlogPostController extends Controller
*/
public function index(Request $request)
{
if ($request->has('author')) {
$author = $request->get('author');
$user = User::find($author);
$blogPosts = $user ? $user->author_of_blog_post()->limit(10)->get()->unique() : [];
} elseif($request->has('tag')) {
$tagId = Str::of($request->get('tag'))->split('/-/')->first();
$blogPosts = Tag::find($tagId)->blogPosts()->limit(10)->get()->unique();
} else {
$blogPosts = BlogPost::limit(10)->get();
}
// if ($request->has('author')) {
// $author = $request->get('author');
// $user = User::find($author);
// $blogPosts = $user ? $user->author_of_blog_post()->distinct()->limit(10)->get()->unique() : [];
// } elseif ($request->has('tag')) {
// $tagId = Str::of($request->get('tag'))->split('/-/')->first();
// $blogPosts = Tag::find($tagId)->blogPosts()->orderBy('created_at', 'desc')->limit(10)->get()->unique();
// } else {
// $blogPosts = BlogPost::orderBy('created_at', 'desc')->limit(10)->get();
// }
return view('blog_post/index', [
'blogPosts' => $blogPosts,
]);
return view('blog_post/index');
}
/**

View File

@@ -81,9 +81,10 @@ class ChatController extends Controller
->map(fn ($id) => User::find($id));
$lastChatMessage = Chat::withLastUserMessage($curUserId);
$lastChatRecipientUserId = $lastChatMessage['from_user_id'];
if ($lastChatMessage['from_user_id'] === $curUserId) {
$lastChatRecipientUserId = $lastChatMessage->count() ? $lastChatMessage['from_user_id'] : null;
if (!is_null($lastChatRecipientUserId) && $lastChatMessage['from_user_id'] === $curUserId) {
$lastChatRecipientUserId = $lastChatMessage['to_user_id'];
}

View File

@@ -0,0 +1,84 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class ConsultantController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
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.
*
* @param \Illuminate\Http\Request $request
* @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 \Illuminate\Http\Request $request
* @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)
{
//
}
}

View File

@@ -82,7 +82,16 @@ class ConsultantRequestFormController extends Controller
*/
public function edit(User $user)
{
//
// dd($user);
// return redirect()->route('consultant_request.show', [$user]);
$state = $user->consultant_state;
return view(
'consultant.registration',
[
'user' => $user,
'currentConsultantRegistrationState' => $state,
]
);
}
/**

View File

@@ -0,0 +1,86 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Services\FeedService;
class FeedController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
$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.
*
* @param \Illuminate\Http\Request $request
* @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 \Illuminate\Http\Request $request
* @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)
{
//
}
}

View File

@@ -0,0 +1,85 @@
<?php
namespace App\Http\Controllers;
use App\Models\Finance;
use Illuminate\Http\Request;
class FinanceController 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.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\Models\Finance $finance
* @return \Illuminate\Http\Response
*/
public function show(Finance $finance)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Models\Finance $finance
* @return \Illuminate\Http\Response
*/
public function edit(Finance $finance)
{
//
}
/**
* 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)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\Models\Finance $finance
* @return \Illuminate\Http\Response
*/
public function destroy(Finance $finance)
{
//
}
}

View File

@@ -0,0 +1,65 @@
<?php
namespace App\Http\Controllers;
use App\Models\ProductNutritionalValue;
use Illuminate\Http\Request;
class ProductNutritionalValueController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
return view('product_nutritional/index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
return view('product_nutritional/create');
}
/**
* Display the specified resource.
*
* @param \App\Models\ProductNutritionalValue $productNutritionalValue
* @return \Illuminate\Http\Response
*/
public function show(ProductNutritionalValue $productNutritionalValue)
{
return view(
'product_nutritional/show',
['productNutritionalValue' => $productNutritionalValue]
);
}
/**
* Show the form for editing the specified resource.
*
* @param \App\Models\ProductNutritionalValue $productNutritionalValue
* @return \Illuminate\Http\Response
*/
public function edit(ProductNutritionalValue $productNutritionalValue)
{
return view('product_nutritional/edit', ['productNutritionalValue' => $productNutritionalValue]);
}
/**
* Remove the specified resource from storage.
*
* @param \App\Models\ProductNutritionalValue $productNutritionalValue
* @return \Illuminate\Http\Response
*/
public function destroy(ProductNutritionalValue $productNutritionalValue)
{
//
}
}

View File

@@ -16,7 +16,29 @@ class ProfileController extends Controller
*/
public function index()
{
return view('profile.index', ['user' => Auth::user()]);
$user = Auth::user();
$userPosts = $user
->author_of_blog_post()
->distinct()
->orderBy('updated_at', 'desc')
->limit(5)
->get();
$profileViewsCount = views($user)->unique()->count();
$totalLikes = 0;
$totalLikes += $user->author_of_plans()->distinct()->get()->sum('likes_count');
$totalLikes += $user->author_of_diets()->distinct()->get()->sum('likes_count');
$totalLikes += $user->author_of_blog_post()->distinct()->get()->sum('likes_count');
$totalLikes += $user->author_of_recipe()->distinct()->get()->sum('likes_count');
return view(
'profile.index',
[
'user' => $user,
'userPosts' => $userPosts,
'totalLikes' => $totalLikes,
'profileViewsCount' => $profileViewsCount
]
);
}
/**
@@ -48,7 +70,33 @@ class ProfileController extends Controller
*/
public function show(User $user)
{
return view('user.show', ['user' => $user]);
$expiresAt = now()->addHours(24);
$userPosts = $user
->author_of_blog_post()
->distinct()
->orderBy('updated_at', 'desc')
->limit(5)
->get();
views($user)->cooldown($expiresAt)->record();
$profileViewsCount = views($user)->unique()->count();
$totalLikes = 0;
$totalLikes += $user->author_of_plans()->distinct()->get()->sum('likes_count');
$totalLikes += $user->author_of_diets()->distinct()->get()->sum('likes_count');
$totalLikes += $user->author_of_blog_post()->distinct()->get()->sum('likes_count');
$totalLikes += $user->author_of_recipe()->distinct()->get()->sum('likes_count');
return view(
'user.show',
[
'user' => $user,
'userPosts' => $userPosts,
'totalLikes' => $totalLikes,
'profileViewsCount' => $profileViewsCount
]
);
}
/**

View File

@@ -0,0 +1,14 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class RegistrationStartController extends Controller
{
public function start()
{
session()->flush();
return redirect()->route('register.step1', ['step' => 'step1']);
}
}

View File

@@ -57,6 +57,7 @@ class UserDetailzController extends Controller
'city' => __('reg_form.city'),
'lang' => __('reg_form.talk_lang'),
'weight' => __('reg_form.your_weight'),
'height' => __('reg_form.your_height'),
'chest_circumference' => __('reg_form.chest_circumference'),
'waist_circumference' => __('reg_form.waist_circumference'),
'hip_circumference' => __('reg_form.hip_circumference'),