teutat3s/elk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ui: restyling navbar

Browse source
This commit is contained in:
Anthony Fu 2022-11-23 16:08:49 +08:00
parent c42fe49ce9
commit 507aedceee
17 changed files with 56 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/account/AccountPaginator.vue
View file

@ -9,7 +9,6 @@ const { paginator } = defineProps<{
<template>
<CommonPaginator
:paginator="paginator"
border="t base"
>
<template #default="{ item }">
<AccountCard

28
components/common/CommonTabs.vue
View file

@ -1,9 +1,11 @@
<script setup lang="ts">
defineProps<{
modelValue: string
options: string[]
}>()
defineEmits(['update:modelValue'])
const { modelValue } = defineModel<{
modelValue: string
}>()
function toValidName(otpion: string) {
return otpion.toLowerCase().replace(/[^a-zA-Z0-9]/g, '-')
@ -11,11 +13,27 @@ function toValidName(otpion: string) {
</script>
<template>
<div flex w-full>
<div flex w-full text-lg>
<template v-for="option in options" :key="option">
<input
:id="`tab-${toValidName(option)}`" :checked="modelValue === option" :value="option" type="radio" name="tabs" display="none" @change="$emit('update:modelValue', option)"
><label flex w-full justify-center h-8 cursor-pointer :for="`tab-${toValidName(option)}`" :class="modelValue === option ? 'color-primary' : 'hover:color-purple'" tabindex="1" @keypress.enter="$emit('update:modelValue', option)">{{ option }}</label>
:id="`tab-${toValidName(option)}`"
:checked="modelValue === option"
:value="option"
type="radio"
name="tabs"
display="none"
@change="modelValue = option"
><label
flex flex-1 cursor-pointer pt2 m1 rounded transition-all
:for="`tab-${toValidName(option)}`"
tabindex="1"
hover:bg-active
@keypress.enter="modelValue = option"
><span
mxa px2
:class="modelValue === option ? 'font-bold border-b-3 border-primary' : 'op50 hover:op50'"
>{{ option }}</span>
</label>
</template>
</div>
</template>

1
components/conversation/ConversationPaginator.vue
View file

@ -9,7 +9,6 @@ const { paginator } = defineProps<{
<template>
<CommonPaginator
:paginator="paginator"
border="t base"
>
<template #default="{ item }">
<ConversationCard

13
components/main/MainContent.vue
View file

@ -1,14 +1,19 @@
<template>
<div relative>
<div sticky top-0 bg="#222" z10>
<div flex justify-between>
<div p3 flex gap-1>
<div
sticky top-0 z10
border="b base"
backdrop="blur-10px brightness-120 dark:brightness-80"
>
<div flex justify-between px5 py4>
<div flex gap-1>
<slot name="title" />
</div>
<div p3 flex>
<div flex>
<slot name="actions" />
</div>
</div>
<slot name="header" />
</div>
<div>
<slot />

2
components/notification/NotificationCard.vue
View file

@ -18,7 +18,7 @@ const displayName = $computed(() => getDisplayName(notification.account))
</template>
<template v-if="notification.type === 'follow_request'">
<div flex ml-4>
<div i-ri:user-follow-fill mr-3 color-gray />{{ displayName }} requested to follow you
<div i-ri:user-follow-fill mr-3 />{{ displayName }} requested to follow you
</div>
<!-- TODO: accept request -->
<AccountCard :account="notification.account" p3 />

3
components/notification/NotificationPaginator.vue
View file

@ -9,12 +9,11 @@ const { paginator } = defineProps<{
<template>
<CommonPaginator
:paginator="paginator"
border="t base"
>
<template #default="{ item }">
<NotificationCard
:notification="item"
border="t base" pt-4
border="b base" pt-4
/>
</template>
</CommonPaginator>

1
components/timeline/TimelinePaginator.vue
View file

@ -9,7 +9,6 @@ const { paginator } = defineProps<{
<template>
<CommonPaginator
:paginator="paginator"
border="t base"
>
<template #default="{ item }">
<StatusCard

4
pages/bookmarks.vue
View file

@ -9,10 +9,10 @@ const paginator = masto.bookmarks.getIterator()
<template>
<MainContent>
<template #title>
<div i-ri:bookmark-fill h-6 mr-1 /><span>Bookmarks</span>
<span text-lg font-bold>Bookmarks</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<TimelinePaginator :paginator="paginator" />

4
pages/conversations.vue
View file

@ -9,10 +9,10 @@ const paginator = masto.conversations.getIterator()
<template>
<MainContent>
<template #title>
<div i-ri:at-line h-6 mr-1 /><span>Conversations</span>
<span text-lg font-bold>Conversations</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<ConversationPaginator :paginator="paginator" />

2
pages/explore.vue
View file

@ -12,7 +12,7 @@ const paginator = masto.trends.getStatuses()
<div i-ri:hashtag h-6 mr-1 /><span>Explore</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<!-- TODO: Tabs for trending statuses, tags, and links -->

4
pages/favourites.vue
View file

@ -9,10 +9,10 @@ const paginator = masto.favourites.getIterator()
<template>
<MainContent>
<template #title>
<div i-ri:heart-fill h-6 mr-1 /><span>Favourites</span>
<span text-lg font-bold>Favourites</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<TimelinePaginator :paginator="paginator" />

4
pages/home.vue
View file

@ -9,10 +9,10 @@ const paginator = masto.timelines.getHomeIterable()
<template>
<MainContent>
<template #title>
<div i-ri:home-fill h-6 mr-1 /><span>Home</span>
<span text-lg font-bold>Home</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<TimelinePaginator :paginator="paginator" />

8
pages/notifications.vue
View file

@ -14,13 +14,15 @@ const paginator = $computed(() => {
<template>
<MainContent>
<template #title>
<div i-ri:notification-2-fill h-6 mr-1 /><span>Notifications</span>
<span text-lg font-bold>Notifications</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<template #header>
<CommonTabs v-model="tab" :options="tabNames" />
</template>
<slot>
<CommonTabs v-model="tab" :options="tabNames" />
<NotificationPaginator :key="tab" :paginator="paginator" />
</slot>
</MainContent>

4
pages/public/index.vue
View file

@ -6,10 +6,10 @@ const paginator = masto.timelines.getPublicIterable()
<template>
<MainContent>
<template #title>
<div i-ri:earth-fill h-6 mr-1 /><span>Federated Timeline</span>
<span text-lg font-bold>Federated Timeline</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<TimelinePaginator :paginator="paginator" />

5
pages/public/local.vue
View file

@ -4,17 +4,16 @@ const router = useRouter()
if (!token.value)
router.replace('/public')
const { data: timelines } = await useAsyncData('timelines-home', () => masto.timelines.fetchPublic({ local: true }).then(r => r.value))
</script>
<template>
<MainContent>
<template #title>
<div i-ri:group-fill h-6 mr-1 /><span>Local timeline</span>
<span text-lg font-bold>Local timeline</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<TimelineList :timelines="timelines" />

4
pages/tags/[tag].vue
View file

@ -8,10 +8,10 @@ const paginator = masto.timelines.getHashtagIterable(tag)
<template>
<MainContent>
<template #title>
<div i-ri:hashtag h-6 mr-1 /><span>{{ tag }}</span>
<span text-lg font-bold>#{{ tag }}</span>
</template>
<template #actions>
<div color-gray i-ri:equalizer-fill mr-1 h-6 />
<div i-ri:equalizer-fill mr-1 h-6 />
</template>
<slot>
<TimelinePaginator :paginator="paginator" />

4
styles/vars.css
View file

@ -3,13 +3,13 @@
--c-primary-active: #3a7b8c;
--c-border: #88888820;
--c-bg-base: #fff;
--c-bg-active: #efefef;
--c-bg-active: #f6f6f6;
--c-text-base: #222;
--c-text-secondary: #888;
}
.dark {
--c-bg-base: #111;
--c-bg-active: #222;
--c-bg-active: #151515;
--c-text-base: #fff;
}