8000 fix:[lar-180] fix style in profile questions tabs by cybersoldattech · Pull Request #317 · laravelcm/laravel.cm · GitHub
[go: up one dir, main page]
Skip to content

fix:[lar-180] fix style in profile questions tabs #317

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 4 commits into from
Jan 11, 2025
Merged

fix:[lar-180] fix style in profile questions tabs #317

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e34deb
fix:[lar-183] fix style in profile questions tabs
cybersoldattech Jan 9, 2025
70ed8af
feat: update thread card and create computed methods for user data
mckenziearts Jan 11, 2025
decf404
feat:lar-180 rebase develop , move article reaction place and fix que…
cybersoldattech Jan 11, 2025
9d7e729
feat: apply cache
mckenziearts Jan 11, 2025
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
Prev Previous commit
Next Next commit
feat: update thread card and create computed methods for user data
  • Loading branch information
@mckenziearts @cybersoldattech
mckenziearts authored and cybersoldattech committed Jan 11, 2025
commit 70ed8afffc40490eb3592cd4207c917d574c7dcf
53 changes: 39 additions & 14 deletions app/Livewire/Pages/Account/Profile.php
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,55 @@

namespace App\Livewire\Pages\Account;

use App\Models\Article;
use App\Models\Discussion;
use App\Models\Thread;
use App\Models\User;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Collection;
use Livewire\Attributes\Computed;
use Livewire\Component;

final class Profile extends Component
{
public User $user;

#[Computed(persist: true)]
public function articles(): Collection
{
return Article::with('media', 'tags')
->select('id', 'title', 'slug', 'body', 'published_at')
->whereBelongsTo($this->user)
->published()
->recent()
->limit(5)
->get();
}

#[Computed(persist: true)]
public function threads(): Collection
{
return Thread::with('channels')
->withCount('replies')
->whereBelongsTo($this->user)
->orderByDesc('created_at')
->limit(5)
->get();
}

#[Computed(persist: true)]
public function discussions(): Collection
{
return Discussion::with('tags')
->withCount('replies', 'reactions')
->whereBelongsTo($this->user)
->limit(5)
->get();
}

public function render(): View
{
return view('livewire.pages.account.profile', [
'articles' => $this->user->articles() // @phpstan-ignore-line
->recent()
->published()
->limit(5)
->get(),
'threads' => $this->user->threads()
->orderByDesc('created_at')
->limit(5)
->get(),
'discussions' => $this->user->discussions()
->limit(5)
->get(),
])
return view('livewire.pages.account.profile')
->title($this->user->username.' ( '.$this->user->name.')');
}
}
4 changes: 2 additions & 2 deletions resources/views/components/forum/thread.blade.php
View file
Open in desktop
8000
Original file line numberDiff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<article class="rounded-xl p-4 bg-white ring-1 ring-gray-200/50 transition duration-200 ease-in-out dark:bg-gray-800 dark:ring-white/10 dark:hover:bg-white/10 lg:p-5" aria-labelledby="{{ $thread->slug }}">
<x-forum.thread-channels :thread="$thread" />

<div class="flex fle-wrap items-center gap-4">
<h2 id="question-title-{{ $thread->id }}" class="text-xl font-heading/7 font-semibold text-gray-900 dark:text-white">
<div class="flex items-center gap-4">
<h2 id="question-title-{{ $thread->id }}" class="truncate text-lg font-heading/7 font-semibold text-gray-900 dark:text-white lg:text-xl">
<x-link :href="route('forum.show', $thread)" class="hover:underline">
{{ $thread->subject() }}
</x-link>
Expand Down
92 changes: 45 additions & 47 deletions resources/views/components/user/articles.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,54 @@
'articles',
])

<div>
@if ($articles->isNotEmpty())
<div class="-mt-6 divide-y divide-gray-200 dark:divide-white/20">
@foreach ($articles as $article)
<div class="py-6">
<x-articles.card :article="$article" is-summary />
</div>
@endforeach
</div>
@else
<x-empty-state>
@if ($articles->isNotEmpty())
<div class="-mt-6 divide-y divide-gray-200 dark:divide-white/20">
@foreach ($articles as $article)
<div class="py-6">
<x-articles.card :article="$article" is-summary />
</div>
@endforeach
</div>
@else
<x-empty-state>
<div class="relative">
<div class="absolute scale-90 shadow inset-x-0 -top-4 flex items-start -z-10 bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
</div>
<div class="relative">
<div class="absolute scale-90 shadow inset-x-0 -top-4 flex items-start -z-10 bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
</div>
<div class="relative">
<div class="absolute -inset-1 bg-gradient-to-r from-flag-green to-flag-red rounded-lg blur opacity-25"></div>
<div class="relative flex items-start z-20 bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
<div class="w-1/4 h-20 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-lg dark:bg-gray-800"></div>
<div class="w-3/4 pt-2 space-y-2">
<div class="grid grid-cols-3 gap-2 w-2/3">
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
</div>
<div class="h-4 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
<div class="h-6 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
<div class="absolute -inset-1 bg-gradient-to-r from-flag-green to-flag-red rounded-lg blur opacity-25"></div>
<div class="relative flex items-start z-20 bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
<div class="w-1/4 h-20 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-lg dark:bg-gray-800"></div>
<div class="w-3/4 pt-2 space-y-2">
<div class="grid grid-cols-3 gap-2 w-2/3">
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
</div>
<div class="h-4 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
<div class="h-6 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
</div>
</div>
<div class="absolute scale-[0.8] inset-x-0 -z-10 shadow -bottom-3 flex items-start bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
</div>
</div>
<div class="mt-8 space-y-4">
<p class="mt-8 text-base text-gray-500 dark:text-gray-400">
<span class="font-medium text-gray-700 dark:text-gray-300">{{ $user->name }}</span>
{{ __('pages/account.activities.empty_articles') }}
</p>

@if ($user->isLoggedInUser())
@can('create', \App\Models\Article::class)
<x-buttons.primary
type="button"
onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.article-form' })"
>
<x-untitledui-file-06 class="size-5" aria-hidden="true" />
{{ __('global.launch_modal.article_action') }}
</x-buttons.primary>
@endcan
@endif
<div class="absolute scale-[0.8] inset-x-0 -z-10 shadow -bottom-3 flex items-start bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
</div>
</x-empty-state>
@endif
</div>
</div>
<div class="mt-8 space-y-4">
<p class="mt-8 text-base text-gray-500 dark:text-gray-400">
<span class="font-medium text-gray-700 dark:text-gray-300">{{ $user->name }}</span>
{{ __('pages/account.activities.empty_articles') }}
</p>

@if ($user->isLoggedInUser())
@can('create', \App\Models\Article::class)
<x-buttons.primary
type="button"
onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.article-form' })"
>
<x-untitledui-file-06 class="size-5" aria-hidden="true" />
{{ __('global.launch_modal.article_action') }}
</x-buttons.primary>
@endcan
@endif
</div>
</x-empty-state>
@endif
88 changes: 43 additions & 45 deletions resources/views/components/user/discussions.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,56 @@
'discussions',
])

<div>
@if ($discussions->isNotEmpty())
<div class="relative -mt-6 divide-y divide-gray-200 dark:divide-white/20">
@foreach ($discussions as $discussion)
<x-discussions.overview :discussion="$discussion" />
@endforeach
</div>
@else
<x-empty-state>
@if ($discussions->isNotEmpty())
<div class="relative -mt-6 divide-y divide-gray-200 dark:divide-white/20">
@foreach ($discussions as $discussion)
<x-discussions.overview :discussion="$discussion" />
@endforeach
</div>
@else
<x-empty-state>
<div class="relative">
<div class="relative">
<div class="relative">
<div class="absolute -inset-1 bg-gradient-to-r rotate-3 w-72 from-flag-green to-flag-red rounded-lg blur opacity-25"></div>
<div class="relative z-20 bg-white gap-3 rotate-3 p-3 w-72 rounded-lg shadow ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
<div class="space-y-2">
<div class="grid grid-cols-3 gap-2 w-1/3">
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
</div>
<div class="h-4 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
<div class="h-6 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
</div>
</div>
</div>
<div class="absolute transform scale-[0.8] bottom-10 right-2 shadow w-40 -rotate-6 z-20 bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
<div class="absolute -inset-1 bg-gradient-to-r rotate-3 w-72 from-flag-green to-flag-red rounded-lg blur opacity-25"></div>
<div class="relative z-20 bg-white gap-3 rotate-3 p-3 w-72 rounded-lg shadow ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
<div class="space-y-2">
<div class="grid grid-cols-3 gap-2 w-2/3">
<div class="grid grid-cols-3 gap-2 w-1/3">
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
</div>
<div class="h-2 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
<div class="h-4 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
<div class="h-6 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
</div>
</div>
</div>
<div class="mt-8 space-y-4">
<p class="mt-8 text-base text-gray-500 dark:text-gray-400">
<span class="font-medium text-gray-700 dark:text-gray-300">{{ $user->name }}</span>
{{ __('pages/account.activities.empty_discussions') }}
</p>

@if ($user->isLoggedInUser())
@can('create', \App\Models\Discussion::class)
<x-buttons.primary
type="button"
onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })"
>
<x-untitledui-message-text-square class="size-5" aria-hidden="true" />
{{ __('global.launch_modal.discussion_action') }}
</x-buttons.primary>
@endcan
@endif
<div class="absolute transform scale-[0.8] bottom-10 right-2 shadow w-40 -rotate-6 z-20 bg-white gap-3 p-3 rounded-lg ring-1 ring-gray-200/50 dark:bg-gray-900 dark:ring-white/10">
<div class="space-y-2">
<div class="grid grid-cols-3 gap-2 w-2/3">
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
<div class="h-3 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded dark:bg-gray-800"></div>
</div>
<div class="h-2 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
<div class="h-6 bg-gray-50 ring-1 ring-gray-200/50 dark:ring-white/20 rounded-md dark:bg-gray-800"></div>
</div>
</div>
</x-empty-state>
@endif
</div>
</div>
<div class="mt-8 space-y-4">
<p class="mt-8 text-base text-gray-500 dark:text-gray-400">
<span class="font-medium text-gray-700 dark:text-gray-300">{{ $user->name }}</span>
{{ __('pages/account.activities.empty_discussions') }}
</p>

@if ($user->isLoggedInUser())
@can('create', \App\Models\Discussion::class)
<x-buttons.primary
type="button"
onclick="Livewire.dispatch('openPanel', { component: 'components.slideovers.thread-form' })"
>
<x-untitledui-message-text-square class="size-5" aria-hidden="true" />
{{ __('global.launch_modal.discussion_action') }}
</x-buttons.primary>
@endcan
@endif
</div>
</x-empty-state>
@endif
Loading
0