Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
73 changes: 17 additions & 56 deletions resources/js/components/navigation/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,13 @@ function resolveNavItemHref(
return `/notes?curriculum=${course}&group=${group}`;
}

if (href === '/leaderboard' && authUser) {
const course = authUser.curriculum || 'hsc';
const group = authUser.group || 'science';

return `/leaderboard?curriculum=${course}&group=${group}`;
}

return href;
}

Expand Down Expand Up @@ -242,13 +249,6 @@ export const SiteRail = defineComponent({
const { theme, toggle } = useDarkMode();
const showLogoutModal = ref(false);
const notifRowRef = ref<HTMLElement | null>(null);
const { deferredPrompt, isInstalled, promptInstall } = usePwa();
const canInstallApp = computed(
() => !isInstalled.value && Boolean(deferredPrompt.value),
);
const handleInstallApp = async () => {
await promptInstall();
};

const homeHref = computed(() =>
preferredHomeHref(currentUrl.value, (page.props.auth as any)?.user),
Expand Down Expand Up @@ -689,22 +689,6 @@ export const SiteRail = defineComponent({
</div>
)}

{/* PWA Install */}
{canInstallApp.value && (
<button
type="button"
aria-label="Install App"
title="Install App"
onClick={handleInstallApp}
class="flex h-10 w-full items-center justify-center rounded-xl border border-slate-900 bg-slate-900 text-white shadow-sm transition-all hover:border-slate-700 hover:bg-slate-800 dark:border-white dark:bg-white dark:text-slate-900 dark:hover:border-slate-200 dark:hover:bg-slate-200"
>
<MaterialIcon
name="download"
size={20}
/>
</button>
)}

{/* Auth */}
{!user.value ? (
<Link
Expand Down Expand Up @@ -806,22 +790,6 @@ export const SiteRail = defineComponent({
</div>
)}

{/* PWA Install */}
{canInstallApp.value && (
<button
type="button"
aria-label="Install App"
onClick={handleInstallApp}
class="flex h-11 w-full items-center justify-center gap-2.5 rounded-xl border border-indigo-200 bg-indigo-50 px-3 text-[13px] font-bold text-indigo-700 shadow-sm transition-all duration-150 hover:bg-indigo-100 hover:shadow-sm dark:border-indigo-500/30 dark:bg-indigo-500/10 dark:text-indigo-300 dark:hover:bg-indigo-500/20"
>
<MaterialIcon
name="download"
size={20}
/>
<span>Install App</span>
</button>
)}

{/* Auth */}
<div class="pt-1">
{!user.value ? (
Expand Down Expand Up @@ -998,8 +966,9 @@ export const SiteBottomNav = defineComponent({
<Link
key={item.href}
href={resolvedHref(item)}
aria-label={item.label}
class={[
'relative flex min-w-0 flex-1 flex-col items-center gap-1 rounded-xl px-2 py-2 transition-all duration-150 ease-out',
'relative flex min-w-0 flex-1 flex-col items-center justify-center rounded-xl px-2 py-2.5 transition-all duration-150 ease-out',
isActive(item.href, item.match)
? 'text-slate-900 dark:text-white'
: 'text-slate-500 hover:text-slate-700 dark:text-slate-400 dark:hover:text-slate-200',
Expand All @@ -1021,16 +990,6 @@ export const SiteBottomNav = defineComponent({
<span class="absolute -top-0.5 -right-0.5 h-2 w-2 rounded-full bg-rose-500 ring-2 ring-white dark:ring-slate-900" />
)}
</div>
<span
class={[
'text-[10px] leading-none tracking-wide antialiased',
isActive(item.href, item.match)
? 'font-bold'
: 'font-medium',
]}
>
{item.label}
</span>
</Link>
);
})}
Expand Down Expand Up @@ -1510,12 +1469,14 @@ export const SiteDrawer = defineComponent({
return (
<Link
key={item.href}
href={
item.href ===
'/'
? homeHref.value
: item.href
}
href={resolveNavItemHref(
item.href,
(
page.props
.auth as any
)?.user,
homeHref.value,
)}
onClick={close}
class={[
'group flex items-center gap-2.5 rounded-[10px] px-2.5 py-2 text-[13px] font-medium tracking-tight transition-all duration-150 ease-out',
Expand Down
2 changes: 1 addition & 1 deletion resources/js/pages/Forum/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ const handleAskQuestion = () => {
HSCStack <span class="text-indigo-600">Forum</span>
</h1>
<p
class="hidden text-xs text-slate-500 sm:mt-1 sm:block sm:text-sm dark:text-gray-400"
class="mt-1 text-xs text-slate-500 sm:text-sm dark:text-gray-400"
>
প্রশ্ন করুন, উত্তর দিন এবং সহপাঠীদের সাথে জ্ঞান আদান-প্রদান
করুন।
Expand Down
92 changes: 17 additions & 75 deletions resources/js/pages/Leaderboard/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import {
SlidersHorizontal,
Trophy,
UploadCloud,
Users,
} from 'lucide-vue-next';
import { computed, onBeforeUnmount, onMounted, ref } from 'vue';
import { computed, onBeforeUnmount, ref } from 'vue';
import BaseModal from '@/components/BaseModal.vue';
import VerifiedBadge from '@/components/VerifiedBadge.vue';
import { useAuth } from '@/lib/useAuth';
Expand Down Expand Up @@ -56,7 +57,6 @@ const props = defineProps<Props>();
const { user } = useAuth();

const showFilterModal = ref(false);
const rememberChoice = ref(false);

// Local draft state for modal
const modalCurriculum = ref<'hsc' | 'ssc' | null>(props.curriculum || null);
Expand All @@ -72,59 +72,7 @@ const openFilterModal = () => {
showFilterModal.value = true;
};

// Check localStorage for saved leaderboard preferences on initial visit without explicit query params
onMounted(() => {
if (typeof window === 'undefined') {
return;
}

try {
const saved = localStorage.getItem('leaderboard_custom_filter');

if (saved) {
rememberChoice.value = true;
const urlParams = new URLSearchParams(window.location.search);

// Only auto-apply if no URL query params are set
if (
!urlParams.has('curriculum') &&
!urlParams.has('group') &&
!urlParams.has('batch') &&
!urlParams.has('scope')
) {
const parsed = JSON.parse(saved);

if (
parsed &&
(parsed.curriculum ||
parsed.group ||
parsed.batch ||
parsed.scope)
) {
applyLeaderboardFilters(parsed);
}
}
}
} catch {
// Ignore localStorage error
}
});

const applyModalFilters = () => {
if (rememberChoice.value && typeof window !== 'undefined') {
localStorage.setItem(
'leaderboard_custom_filter',
JSON.stringify({
curriculum: modalCurriculum.value,
group: modalGroup.value,
batch: modalBatch.value,
scope: modalScope.value,
}),
);
} else if (typeof window !== 'undefined') {
localStorage.removeItem('leaderboard_custom_filter');
}

showFilterModal.value = false;
applyLeaderboardFilters({
curriculum: modalCurriculum.value,
Expand All @@ -142,7 +90,6 @@ const resetFilters = () => {

if (typeof window !== 'undefined') {
localStorage.removeItem('leaderboard_custom_filter');
rememberChoice.value = false;
}

showFilterModal.value = false;
Expand Down Expand Up @@ -467,7 +414,6 @@ onBeforeUnmount(() => {

<!-- Customizable Filters Bar (Clean UX Summary Bar + Modal) -->
<div
v-if="tab === 'students'"
class="mb-6 flex flex-wrap items-center justify-between gap-3 rounded-2xl border border-slate-200/80 bg-white p-3.5 shadow-2xs sm:px-4.5 dark:border-gray-800 dark:bg-gray-900"
>
<div class="flex flex-wrap items-center gap-2">
Expand Down Expand Up @@ -932,6 +878,21 @@ onBeforeUnmount(() => {
</div>
</Link>
</div>

<!-- View More / Find Peers Link -->
<div
class="border-t border-slate-100 p-3 text-center sm:p-4 dark:border-gray-800/60"
>
<Link
href="/peers"
class="inline-flex items-center justify-center gap-2 rounded-xl border border-slate-200/90 bg-white px-4 py-2.5 text-xs font-bold text-slate-700 shadow-2xs transition hover:border-indigo-300 hover:bg-slate-50 hover:text-indigo-600 active:scale-95 sm:text-sm dark:border-gray-700 dark:bg-gray-800 dark:text-gray-200 dark:hover:border-indigo-500/50 dark:hover:bg-gray-700/80 dark:hover:text-indigo-400"
>
<Users
class="h-4 w-4 text-indigo-600 dark:text-indigo-400"
/>
<span>সহপাঠী খুঁজুন (সকল শিক্ষার্থী দেখুন) →</span>
</Link>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1363,25 +1324,6 @@ onBeforeUnmount(() => {
</p>
</div>

<!-- 5. Remember this choice (localStorage) -->
<div
class="flex items-center gap-2.5 rounded-xl border border-slate-200/80 bg-slate-50/60 p-3 dark:border-gray-800 dark:bg-gray-800/40"
>
<input
id="remember_leaderboard_choice"
v-model="rememberChoice"
type="checkbox"
class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500 dark:border-gray-700 dark:bg-gray-900"
/>
<label
for="remember_leaderboard_choice"
class="cursor-pointer text-xs font-medium text-slate-700 select-none dark:text-gray-300"
>
আমার এই পছন্দটি মনে রাখুন (পরবর্তীতে লিডারবোর্ডে
স্বয়ংক্রিয়ভাবে দেখাবে)
</label>
</div>

<!-- Modal Action Buttons -->
<div
class="flex items-center justify-between gap-3 border-t border-slate-100 pt-4 dark:border-gray-800"
Expand Down
17 changes: 17 additions & 0 deletions resources/js/pages/Peers/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,23 @@ const clearSearch = () => {

const setSort = (sortValue: string) => {
currentSort.value = sortValue;

if (sortValue === 'appreciated') {
searchQuery.value = '';
router.get(
'/peers',
{
sort: 'appreciated',
},
{
preserveState: false,
preserveScroll: true,
},
);

return;
}

applyFilters();
};

Expand Down
Loading