Nikurasu/elk
1
0
Fork 0
forked from Mirrors/elk
Code Pull requests Releases 2 Packages 1 Activity

refactor: update composable names

Browse source
This commit is contained in:
Anthony Fu 2022-11-18 05:32:03 +08:00
parent 787a55bea7
commit 4fc6e405e0
9 changed files with 46 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/account/AccountMe.client.vue
View file

@ -1,5 +1,5 @@
<script setup lang="ts">
const { currentUser } = $(useAppStore())
const { currentUser } = $(useClientState())
const account = $computed(() => currentUser?.account)
</script>

46
components/nav/NavSide.vue
View file

@ -1,17 +1,19 @@
<script setup lang="ts">
const isLogin = useLoginState()
</script>
<template>
<div px6 py2 flex="~ col gap6" text-lg>
<NuxtLink flex gap2 items-center to="/home" active-class="text-primary">
<div i-ri:home-5-line />
<span>Home</span>
</NuxtLink>
<NuxtLink flex gap2 items-center to="/notifications" active-class="text-primary">
<div i-ri:notification-4-line />
<span>Notifications</span>
</NuxtLink>
<template v-if="isLogin">
<NuxtLink flex gap2 items-center to="/home" active-class="text-primary">
<div i-ri:home-5-line />
<span>Home</span>
</NuxtLink>
<NuxtLink flex gap2 items-center to="/notifications" active-class="text-primary">
<div i-ri:notification-4-line />
<span>Notifications</span>
</NuxtLink>
</template>
<NuxtLink flex gap2 items-center to="/explore" active-class="text-primary">
<div i-ri:hashtag />
<span>Explore</span>
@ -24,17 +26,19 @@
<div i-ri:earth-line />
<span>Federated</span>
</NuxtLink>
<NuxtLink flex gap2 items-center active-class="text-primary">
<div i-ri:at-line />
<span>Messages</span>
</NuxtLink>
<NuxtLink flex gap2 items-center to="/favourites" active-class="text-primary">
<div i-ri:heart-3-line />
<span>Favorites</span>
</NuxtLink>
<NuxtLink flex gap2 items-center to="/bookmarks" active-class="text-primary">
<div i-ri:bookmark-line />
<span>Bookmarks</span>
</NuxtLink>
<template v-if="isLogin">
<NuxtLink flex gap2 items-center active-class="text-primary">
<div i-ri:at-line />
<span>Messages</span>
</NuxtLink>
<NuxtLink flex gap2 items-center to="/favourites" active-class="text-primary">
<div i-ri:heart-3-line />
<span>Favorites</span>
</NuxtLink>
<NuxtLink flex gap2 items-center to="/bookmarks" active-class="text-primary">
<div i-ri:bookmark-line />
<span>Bookmarks</span>
</NuxtLink>
</template>
</div>
</template>

8
composables/client.ts
View file

@ -1,10 +1,10 @@
import type { MastoClient } from 'masto'
import type { AppStore } from '~~/plugins/store.client'
import type { ClientState } from '~/plugins/store.client'
export function useMasto() {
return inject('masto') as Promise<MastoClient>
return useNuxtApp().$masto as Promise<MastoClient>
}
export function useAppStore() {
return inject('app-store') as AppStore
export function useClientState() {
return useNuxtApp().$clientState as ClientState
}

5
composables/cookies.ts
View file

@ -9,3 +9,8 @@ export function useAppCookies() {
token,
}
}
export function useLoginState() {
const token = useCookie('nuxtodon-token')
return computed(() => !!token.value)
}

2
layouts/default.vue
View file

@ -1,6 +1,6 @@
<template>
<div h-full of-hidden>
<main grid="~ lg:cols-[1fr_40rem_1fr]" max-w-70rem mxa h-full>
<main grid="~ lg:cols-[1fr_40rem_1fr]" max-w-80rem mxa h-full>
<div>
<slot name="left">
<AccountMe />

2
package.json
View file

@ -1,6 +1,6 @@
{
"private": true,
"type": "module",
"private": true,
"packageManager": "pnpm@7.9.0",
"scripts": {
"build": "nuxi build",

2
pages/login/callback.vue
View file

@ -2,7 +2,7 @@
const { query } = useRoute()
onMounted(async () => {
const { login } = useAppStore()
const { login } = useClientState()
await login(query as any)
await nextTick()
await nextTick()

5
plugins/masto.ts
View file

@ -5,7 +5,8 @@ export default defineNuxtPlugin((nuxt) => {
const masto = login({
url: `https://${server.value}`,
accessToken: token.value,
accessToken: token.value || undefined,
})
nuxt.vueApp.provide('masto', masto)
nuxt.$masto = masto
})

8
plugins/store.client.ts
View file

@ -1,10 +1,12 @@
import { login as loginMasto } from 'masto'
import type { UserLogin } from '~/types'
function createStore() {
function createClientState() {
const { server, token } = useAppCookies()
const accounts = useLocalStorage<UserLogin[]>('nuxtodon-accounts', [], { deep: true })
const currentId = useLocalStorage<string>('nuxtodon-current-user', '')
const currentUser = computed<UserLogin | undefined>(() => {
let user: UserLogin | undefined
if (currentId.value) {
@ -48,8 +50,8 @@ function createStore() {
}
}
export type AppStore = ReturnType<typeof createStore>
export type ClientState = ReturnType<typeof createClientState>
export default defineNuxtPlugin((nuxt) => {
nuxt.vueApp.provide('app-store', createStore())
nuxt.$clientState = createClientState()
})