Merge branch 'refs/heads/master' into feature_es

# Conflicts:
#	app/components/AppHeader.vue
#	app/components/content/Quote.vue
#	app/components/home/Map.vue
#	app/pages/index.vue
#	content/home/en.md
#	content/home/fr.md
#	nuxt.config.ts
#	package.json
#	pnpm-lock.yaml
#	tailwind.config.ts
This commit is contained in:
2024-11-26 20:10:22 +01:00
75 changed files with 4324 additions and 2987 deletions

View File

@@ -3,40 +3,56 @@ import { type Activity, IDEs } from '~~/types'
const { data: activity, refresh } = await useAsyncData<Activity>('activity', () => $fetch('/api/activity'))
useIntervalFn(async () => await refresh(), 5000)
const codingActivity = computed(() => activity.value!.data.activities.filter(activity => IDEs.some(ide => ide.name === activity.name))[0])
const codingActivity = computed(() => activity.value!.data.activities.find(activity => IDEs.some(ide => ide.name === activity.name)))
const { locale, locales } = useI18n()
const currentLocale = computed(() => locales.value.filter(l => l.code === locale.value)[0])
const currentLocale = computed(() => locales.value.find(l => l.code === locale.value))
const getActivity = computed(() => {
const activity = codingActivity.value
if (!activity) return
if (!codingActivity.value)
return
const active = activity.name === 'Visual Studio Code' ? !activity.details.includes('Idling') : activity.state.toLowerCase().includes('editing')
const capitalise = (str: string) => str.charAt(0).toUpperCase() + str.slice(1)
const project = activity.details ? capitalise(activity.details.replace('Workspace:', '')) : ''
const state = activity.state.split(' ')[1]
const start = {
ago: useTimeAgo(activity.timestamps.start).value,
formated: `${useDateFormat(
activity.timestamps.start,
'DD MMM YYYY',
{ locales: currentLocale.value!.code ?? 'en' }
).value} ${t('separator')}
${useDateFormat(activity.timestamps.start, 'HH:mm:ss', { locales: currentLocale.value!.code ?? 'en' }).value}`
}
const { name, details, state, timestamps } = codingActivity.value
const isActive = name === 'Visual Studio Code'
? !details.includes('Idling')
: state.toLowerCase().includes('editing')
const project = details
? details
.charAt(0)
.toUpperCase()
+ details
.slice(1)
.replace('Workspace:', '')
.trim()
: ''
const stateWord = state.split(' ')[1]
const timeAgo = useTimeAgo(timestamps.start).value
const formatDate = (date: number, format: string) => useDateFormat(date, format, { locales: currentLocale.value?.code ?? 'en' }).value
return {
active,
name: activity.name,
active: isActive,
name,
project,
state,
start
state: stateWord,
start: {
ago: locale.value === 'en'
? timeAgo
: timeAgo
.replace('ago', '')
.replace('hours', 'heures')
.replace('minutes', 'minutes')
.replace('seconds', 'secondes')
.trim(),
formated: {
date: formatDate(timestamps.start, 'DD MMM YYYY'),
time: formatDate(timestamps.start, 'HH:mm:ss'),
},
},
}
})
const { t } = useI18n({
useScope: 'local'
useScope: 'local',
})
</script>
@@ -62,7 +78,6 @@ const { t } = useI18n({
v-if="getActivity.active"
keypath="working"
tag="div"
class="space-x-1"
>
<template #project>
<strong>{{ getActivity.project }}</strong>
@@ -71,17 +86,19 @@ const { t } = useI18n({
{{ getActivity.state }}
</template>
<template #editor>
<UIcon
:name="IDEs.find(ide => ide.name === getActivity!.name)!.icon"
size="16"
/>
<strong>{{ getActivity.name }}</strong>
<span class="space-x-1">
<UIcon
:name="`i-logos:${IDEs.find(ide => ide.name === getActivity!.name)!.icon}`"
size="16"
/>
<strong>{{ getActivity.name }}</strong></span>
</template>
<template #start>
<strong>{{ getActivity.start.ago }}</strong>
</template>
<template #format>
<strong>{{ getActivity.start.formated }}</strong>
<strong>{{ getActivity.start.formated.date }}</strong> {{ t('separator') }}
<strong>{{ getActivity.start.formated.time }}</strong>
</template>
</i18n-t>
<i18n-t