Skip to content

Commit

Permalink
fix: use game unemployed job to hide/show char job grade info
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Trost <[email protected]>
  • Loading branch information
galexrt committed Jan 30, 2025
1 parent 3a43c67 commit 81c3ab0
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 26 deletions.
15 changes: 6 additions & 9 deletions app/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@ useHead({
lang: 'en',
},
meta: [{ key: 'theme-color', name: 'theme-color', content: color }],
titleTemplate: (title?: string) => {
if (title?.includes('.')) {
title = t(title);
}
return title ? `${title} - FiveNet` : 'FiveNet';
},
titleTemplate: (title?: string) => (title ? `${title?.includes('.') ? t(title) : title} - FiveNet` : 'FiveNet'),
});

useSeoMeta({
Expand Down Expand Up @@ -82,12 +77,14 @@ async function clickListener(event: MouseEvent): Promise<void> {
});
}

onBeforeMount(async () => {
async function setUserLocale(): Promise<void> {
logger.info('Setting user locale to', userLocale.value);
if (userLocale.value !== null) {
if (userLocale.value !== undefined) {
await setLocale(userLocale.value);
}
});
}
setUserLocale();
watch(userLocale, () => setUserLocale());

onMounted(async () => {
if (!import.meta.client) {
Expand Down
2 changes: 1 addition & 1 deletion app/components/citizens/info/CitizenInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ const isOpen = ref(false);
<div class="inline-flex gap-2">
<UBadge>
{{ user.jobLabel }}
<template v-if="user.jobGrade > 0 && user.job !== game.unemployedJobName">
<template v-if="user.job !== game.unemployedJobName">
({{ $t('common.rank') }}: {{ user.jobGradeLabel }})
</template>
{{ user.props?.jobName || user.props?.jobGradeNumber ? '*' : '' }}
Expand Down
6 changes: 5 additions & 1 deletion app/components/jobs/colleagues/ColleagueInfoPopover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ async function getCitizen(id: number): Promise<Colleague> {
const user = computed(() => data.value || props.user);
const { game } = useAppConfig();
const opened = ref(false);
watchOnce(opened, async () => {
if (props.user) {
Expand Down Expand Up @@ -176,7 +178,9 @@ watchOnce(opened, async () => {
<p v-if="user.jobLabel" class="text-sm font-normal">
<span class="font-semibold">{{ $t('common.job') }}:</span>
{{ user.jobLabel }}
<span v-if="user.jobGrade > 0 && user.jobGradeLabel"> ({{ user.jobGradeLabel }})</span>
<template v-if="user.jobGradeLabel && user.job !== game.unemployedJobName">
({{ $t('common.rank') }}: {{ user.jobGradeLabel }})
</template>
</p>

<p v-if="user.dateofbirth" class="text-sm font-normal">
Expand Down
14 changes: 10 additions & 4 deletions app/components/jobs/colleagues/ColleaguesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ const columns = [
: undefined,
].filter((c) => c !== undefined) as { key: string; label: string; sortable?: boolean }[];
const { game } = useAppConfig();
const input = useTemplateRef('input');
defineShortcuts({
Expand Down Expand Up @@ -381,13 +383,15 @@ defineShortcuts({
<dl class="font-normal lg:hidden">
<dt class="sr-only">{{ $t('common.job_grade') }}</dt>
<dd class="mt-1 truncate">
{{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
{{ colleague.jobGradeLabel }}
<template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }})</template>
</dd>
</dl>
</template>

<template #rank-data="{ row: colleague }">
{{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
{{ colleague.jobGradeLabel }}
<template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }})</template>
</template>

<template #absence-data="{ row: colleague }">
Expand Down Expand Up @@ -500,8 +504,10 @@ defineShortcuts({
<template #description>
<div class="flex flex-col gap-1">
<span>
{{ colleague.jobGradeLabel
}}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
{{ colleague.jobGradeLabel }}
<template v-if="colleague.job !== game.unemployedJobName">
({{ colleague.jobGrade }})
</template>
</span>

<PhoneNumberBlock :number="colleague.phoneNumber" />
Expand Down
10 changes: 6 additions & 4 deletions app/components/jobs/colleagues/info/ColleagueInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ defineEmits<{
const modal = useModal();
const { attr, can, activeChar } = useAuth();
const { game } = useAppConfig();
</script>

<template>
Expand All @@ -38,11 +40,11 @@ const { attr, can, activeChar } = useAuth();
</div>

<div class="inline-flex flex-col gap-2 lg:flex-row">
<UBadge>
<UBadge class="truncate">
{{ colleague.jobLabel }}
<span v-if="colleague.jobGrade > 0" class="ml-1 truncate">
({{ $t('common.rank') }}: {{ colleague.jobGradeLabel }})</span
>
<template v-if="colleague.job !== game.unemployedJobName">
({{ $t('common.rank') }}: {{ colleague.jobGradeLabel }})
</template>
</UBadge>

<UBadge
Expand Down
8 changes: 6 additions & 2 deletions app/components/jobs/timeclock/TimeclockInactiveList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ const columns = [
permission: 'JobsService.GetColleague' as Perms,
},
].filter((c) => c.permission === undefined || can(c.permission).value);
const { game } = useAppConfig();
</script>

<template>
Expand Down Expand Up @@ -170,13 +172,15 @@ const columns = [
<dl class="font-normal lg:hidden">
<dt class="sr-only">{{ $t('common.job_grade') }}</dt>
<dd class="mt-1 truncate">
{{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
{{ colleague.jobGradeLabel }}
<template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }}) </template>
</dd>
</dl>
</template>

<template #rank-data="{ row: colleague }">
{{ colleague.jobGradeLabel }}<span v-if="colleague.jobGrade > 0"> ({{ colleague.jobGrade }})</span>
{{ colleague.jobGradeLabel }}
<template v-if="colleague.job !== game.unemployedJobName"> ({{ colleague.jobGrade }}) </template>
</template>

<template #phoneNumber-data="{ row: colleague }">
Expand Down
5 changes: 4 additions & 1 deletion app/components/jobs/timeclock/TimeclockList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ const selectedMode = computed({
query.mode = timeRangeModes.value[value]?.mode ?? TimeclockMode.DAILY;
},
});
const { game } = useAppConfig();
</script>

<template>
Expand Down Expand Up @@ -599,7 +601,8 @@ const selectedMode = computed({
</template>

<template #rank-data="{ row: entry }">
{{ entry.user.jobGradeLabel }}<span v-if="entry.user.jobGrade > 0"> ({{ entry.user.jobGrade }})</span>
{{ entry.user.jobGradeLabel }}
<template v-if="entry.user.job !== game.unemployedJobName"> ({{ entry.user.jobGrade }})</template>
</template>

<template #time-data="{ row: entry }">
Expand Down
4 changes: 2 additions & 2 deletions app/components/partials/LanguageSwitcherModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ async function switchLanguage(lang: LocaleObject): Promise<void> {
return;
}
useLogger('⚙️ Settings').info('Switching language to:', lang.code);
preventClose.value = true;
useLogger('⚙️ Settings').info('Switching language to:', lang.code);
userLocale.value = lang.code;
notifications.add({
title: { key: 'notifications.language_switched.title', parameters: {} },
description: { key: 'notifications.language_switched.content', parameters: { name: lang.name ?? lang.code } },
type: NotificationType.SUCCESS,
timeout: 1750,
timeout: 1650,
callback: () => reloadNuxtApp({ persistState: false, force: true }),
});
}
Expand Down
2 changes: 1 addition & 1 deletion app/store/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export const logger = useLogger('⚙️ Settings');
export interface SettingsState {
updateAvailable: false | string;
version: string;
locale: Locale | null;
locale: Locale | undefined;

nuiEnabled: boolean;
nuiResourceName: string | undefined;
Expand Down
3 changes: 2 additions & 1 deletion nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ export default defineNuxtConfig({
build: {
terserOptions: {
compress: {
drop_console: true,
// Only drop certain console log calls
drop_console: ['trace', 'debug', 'info'],
drop_debugger: true,
},
},
Expand Down

0 comments on commit 81c3ab0

Please sign in to comment.