diff --git a/apps/web/app/components/SpeakerPageSection.vue b/apps/web/app/components/SpeakerPageSection.vue index a6b48064..cc3acff6 100644 --- a/apps/web/app/components/SpeakerPageSection.vue +++ b/apps/web/app/components/SpeakerPageSection.vue @@ -1,10 +1,8 @@ @@ -36,7 +32,7 @@ const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props :to="`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}sessions/${speaker.detail_page_id}`" > import type { Speaker } from '@vuejs-jp/model' import { useLocaleCurrent } from '~/composables/useLocaleCurrent' -import { useSupabaseStorage } from '~/composables/useSupabaseStorage' interface PanelerListProps { panelers: Speaker[] @@ -9,8 +8,6 @@ interface PanelerListProps { const props = defineProps() -const { getStaticAvatarUrl } = useSupabaseStorage() - const currentLocale = useLocaleCurrent().locale @@ -19,7 +16,7 @@ const currentLocale = useLocaleCurrent().locale import type { PersonalSponsorInfo, SponsorInfo } from '@vuejs-jp/model' import { useLocaleCurrent } from '~/composables/useLocaleCurrent' -import { useSupabaseStorage } from '~/composables/useSupabaseStorage' type Props = SponsorInfo & { personal?: PersonalSponsorInfo @@ -9,8 +8,6 @@ type Props = SponsorInfo & { defineProps() -const { getStaticAvatarUrl } = useSupabaseStorage() - const currentLocale = useLocaleCurrent().locale @@ -27,7 +24,7 @@ const currentLocale = useLocaleCurrent().locale > diff --git a/apps/web/app/components/ticket/NamecardSection.vue b/apps/web/app/components/ticket/NamecardSection.vue index 27c61594..caef6137 100644 --- a/apps/web/app/components/ticket/NamecardSection.vue +++ b/apps/web/app/components/ticket/NamecardSection.vue @@ -1,7 +1,9 @@ @@ -37,7 +39,6 @@ const pathWithLocale = usePathWithLocale() :href="pathWithLocale('/namecard')" background-color="vue-green/200" color="white" - :disabled="isDone" > {{ endedCreateNamecard ? $t('namecard.confirmNamecard') : $t('namecard.createNamecard') }} diff --git a/apps/web/app/composables/useSupabaseStorage.ts b/apps/web/app/composables/useSupabaseStorage.ts index 7bbe613c..64ff9b80 100644 --- a/apps/web/app/composables/useSupabaseStorage.ts +++ b/apps/web/app/composables/useSupabaseStorage.ts @@ -1,22 +1,15 @@ import { useRuntimeConfig } from '#imports' import { bucket } from '@vuejs-jp/model' -import { REDIRECT_URL } from '../utils/environment.constants' export function useSupabaseStorage() { const config = useRuntimeConfig() const { supabaseUrl } = config.public - function getStaticAvatarUrl(avatarUrl?: string) { - if (!avatarUrl) return `${REDIRECT_URL}/supabase/common/default.png` - if (avatarUrl?.startsWith(supabaseUrl)) return `${REDIRECT_URL}/supabase/common/${new URL(avatarUrl).pathname.split('/').pop()}` - return `${REDIRECT_URL}/supabase/common/${new URL(avatarUrl).pathname.split('/').pop()}` - } - function getFullAvatarUrl(avatarUrl: string) { if (!avatarUrl) return `${supabaseUrl}/storage/v1/object/public/${bucket}/default.png` if (avatarUrl?.startsWith(supabaseUrl)) return avatarUrl return `${supabaseUrl}/storage/v1/object/public/${bucket}${avatarUrl}` } - return { getStaticAvatarUrl, getFullAvatarUrl } + return { getFullAvatarUrl } } diff --git a/apps/web/app/pages/jobboard.vue b/apps/web/app/pages/jobboard.vue index 740929a4..cc88066c 100644 --- a/apps/web/app/pages/jobboard.vue +++ b/apps/web/app/pages/jobboard.vue @@ -1,6 +1,5 @@