CloudToys/elk
1
0
Fork 0
Code

feat: allow setting default server via env (#854)

Browse Source
This commit is contained in:
Daniel Roe 2023-01-07 13:38:31 -08:00 committed by GitHub
parent 697a88ac3d
commit 57fd9aeae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@ -1,4 +1,5 @@
NUXT_PUBLIC_TRANSLATE_API= NUXT_PUBLIC_TRANSLATE_API=
NUXT_PUBLIC_DEFAULT_SERVER=
# Production only # Production only
NUXT_CLOUDFLARE_ACCOUNT_ID= NUXT_CLOUDFLARE_ACCOUNT_ID=

3
components/user/UserSignIn.vue
View File

@ -1,7 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import Fuse from 'fuse.js' import Fuse from 'fuse.js'
import { $fetch } from 'ofetch' import { $fetch } from 'ofetch'
import { DEFAULT_SERVER } from '~/constants'
const input = $ref<HTMLInputElement>() const input = $ref<HTMLInputElement>()
let server = $ref<string>('') let server = $ref<string>('')
@ -26,7 +25,7 @@ async function oauth() {
server = server.split('/')[0] server = server.split('/')[0]
try { try {
location.href = await $fetch<string>(`/api/${server || DEFAULT_SERVER}/login`, { location.href = await $fetch<string>(`/api/${server || publicServer.value}/login`, {
method: 'POST', method: 'POST',
body: { body: {
origin: location.origin, origin: location.origin,

3
composables/users.ts
View File

@ -5,7 +5,6 @@ import type { RemovableRef } from '@vueuse/core'
import type { ElkMasto, UserLogin } from '~/types' import type { ElkMasto, UserLogin } from '~/types'
import { import {
DEFAULT_POST_CHARS_LIMIT, DEFAULT_POST_CHARS_LIMIT,
DEFAULT_SERVER,
STORAGE_KEY_CURRENT_USER, STORAGE_KEY_CURRENT_USER,
STORAGE_KEY_NOTIFICATION, STORAGE_KEY_NOTIFICATION,
STORAGE_KEY_NOTIFICATION_POLICY, STORAGE_KEY_NOTIFICATION_POLICY,
@ -57,7 +56,7 @@ export const currentUser = computed<UserLogin | undefined>(() => {
const publicInstance = ref<Instance | null>(null) const publicInstance = ref<Instance | null>(null)
export const currentInstance = computed<null | Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value) export const currentInstance = computed<null | Instance>(() => currentUser.value ? instances.value[currentUser.value.server] ?? null : publicInstance.value)
export const publicServer = ref(DEFAULT_SERVER) export const publicServer = ref('')
export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value) export const currentServer = computed<string>(() => currentUser.value?.server || publicServer.value)
// when multiple tabs: we need to reload window when sign in, switch account or sign out // when multiple tabs: we need to reload window when sign in, switch account or sign out

1
constants/index.ts
View File

@ -1,7 +1,6 @@
export const APP_NAME = 'Elk' export const APP_NAME = 'Elk'
export const DEFAULT_POST_CHARS_LIMIT = 500 export const DEFAULT_POST_CHARS_LIMIT = 500
export const DEFAULT_SERVER = 'mas.to'
export const DEFAULT_FONT_SIZE = 'md' export const DEFAULT_FONT_SIZE = 'md'
export const STORAGE_KEY_DRAFTS = 'elk-drafts' export const STORAGE_KEY_DRAFTS = 'elk-drafts'

1
nuxt.config.ts
View File

@ -95,6 +95,7 @@ export default defineNuxtConfig({
env: '', // set in build-info module env: '', // set in build-info module
pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true', pwaEnabled: !isDevelopment || process.env.VITE_DEV_PWA === 'true',
translateApi: '', translateApi: '',
defaultServer: 'mas.to',
}, },
storage: { storage: {
driver: isCI ? 'cloudflare' : 'fs', driver: isCI ? 'cloudflare' : 'fs',

1
plugins/masto.ts
View File

@ -1,5 +1,6 @@
export default defineNuxtPlugin(async (nuxtApp) => { export default defineNuxtPlugin(async (nuxtApp) => {
const masto = createMasto() const masto = createMasto()
publicServer.value = publicServer.value || useRuntimeConfig().public.defaultServer
if (process.client) { if (process.client) {
const { query } = useRoute() const { query } = useRoute()