Skip to content

Commit 8b2dd10

Browse files
jiyuujinjiyuujin
authored
Merge pull request #397 from vuejs-jp/revert-396-chore/storage-to-local
Revert "Supabase Storage から Local の管理へ切り替え"
2 parents 094fcc4 + 0e0fa85 commit 8b2dd10

File tree

265 files changed

+20
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+20
-56
lines changed

‎apps/web/app/components/SpeakerPageSection.vue‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<script setup lang="ts">
22
import SpeakerCfp from '~/components/speaker/SpeakerCfp.vue'
33
import { useLocaleCurrent } from '@/composables/useLocaleCurrent'
4-
import { useSupabaseStorage } from '@/composables/useSupabaseStorage'
54
import type { SpeakerCategory, SpeakerInfo } from '@vuejs-jp/model'
65
import { useRuntimeConfig } from '#imports'
7-
import { REDIRECT_URL } from '~/utils/environment.constants'
86
97
type _SpeakerCategory = Extract<SpeakerCategory, 'sessionSpeakers' | 'lightningTalkSpeakers' | 'sponsorSessionSpeakers'>
108
type Speakers = Record<_SpeakerCategory, SpeakerInfo>
@@ -16,8 +14,6 @@ const props = defineProps<{
1614
const config = useRuntimeConfig()
1715
const currentLocale = useLocaleCurrent().locale
1816
19-
const { getStaticAvatarUrl } = useSupabaseStorage()
20-
2117
const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props.data as Speakers
2218
</script>
2319

@@ -36,7 +32,7 @@ const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props
3632
:to="`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}sessions/${speaker.detail_page_id}`"
3733
>
3834
<VFSpeaker
39-
:image="getStaticAvatarUrl(speaker.image_url)"
35+
:image="speaker.image_url"
4036
:company="currentLocale === 'en' ? speaker.company_en : speaker.company_ja"
4137
:division="currentLocale === 'en' ? speaker.position_en : speaker.position_ja"
4238
:name="currentLocale === 'en' ? speaker.name_en : speaker.name_ja"
@@ -46,7 +42,7 @@ const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props
4642
</NuxtLink>
4743
<VFSpeaker
4844
v-else
49-
:image="getStaticAvatarUrl(speaker.image_url)"
45+
:image="speaker.image_url"
5046
:company="currentLocale === 'en' ? speaker.company_en : speaker.company_ja"
5147
:division="currentLocale === 'en' ? speaker.position_en : speaker.position_ja"
5248
:name="currentLocale === 'en' ? speaker.name_en : speaker.name_ja"
@@ -72,7 +68,7 @@ const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props
7268
:to="`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}sessions/${speaker.detail_page_id}`"
7369
>
7470
<VFSpeaker
75-
:image="getStaticAvatarUrl(speaker.image_url)"
71+
:image="speaker.image_url"
7672
:company="currentLocale === 'en' ? speaker.company_en : speaker.company_ja"
7773
:division="currentLocale === 'en' ? speaker.position_en : speaker.position_ja"
7874
:name="currentLocale === 'en' ? speaker.name_en : speaker.name_ja"
@@ -82,7 +78,7 @@ const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props
8278
</NuxtLink>
8379
<VFSpeaker
8480
v-else
85-
:image="getStaticAvatarUrl(speaker.image_url)"
81+
:image="speaker.image_url"
8682
:company="currentLocale === 'en' ? speaker.company_en : speaker.company_ja"
8783
:division="currentLocale === 'en' ? speaker.position_en : speaker.position_ja"
8884
:name="currentLocale === 'en' ? speaker.name_en : speaker.name_ja"
@@ -103,7 +99,7 @@ const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props
10399
:to="`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}sessions/${speaker.detail_page_id}`"
104100
>
105101
<VFSpeaker
106-
:image="getStaticAvatarUrl(speaker.image_url)"
102+
:image="speaker.image_url"
107103
:company="currentLocale === 'en' ? speaker.company_en : speaker.company_ja"
108104
:division="currentLocale === 'en' ? speaker.position_en : speaker.position_ja"
109105
:name="currentLocale === 'en' ? speaker.name_en : speaker.name_ja"
@@ -113,7 +109,7 @@ const { sessionSpeakers, lightningTalkSpeakers, sponsorSessionSpeakers } = props
113109
</NuxtLink>
114110
<VFSpeaker
115111
v-else
116-
:image="getStaticAvatarUrl(speaker.image_url)"
112+
:image="speaker.image_url"
117113
:company="currentLocale === 'en' ? speaker.company_en : speaker.company_ja"
118114
:division="currentLocale === 'en' ? speaker.position_en : speaker.position_ja"
119115
:name="currentLocale === 'en' ? speaker.name_en : speaker.name_ja"

‎apps/web/app/components/event/PanelerList.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<script setup lang="ts">
22
import type { Speaker } from '@vuejs-jp/model'
33
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
4-
import { useSupabaseStorage } from '~/composables/useSupabaseStorage'
54
65
interface PanelerListProps {
76
panelers: Speaker[]
87
}
98
109
const props = defineProps<PanelerListProps>()
1110
12-
const { getStaticAvatarUrl } = useSupabaseStorage()
13-
1411
const currentLocale = useLocaleCurrent().locale
1512
</script>
1613

@@ -19,7 +16,7 @@ const currentLocale = useLocaleCurrent().locale
1916
<VFSpeaker
2017
v-for="paneler in panelers"
2118
:key="paneler.id"
22-
:image="getStaticAvatarUrl(paneler.image_url)"
19+
:image="paneler.image_url"
2320
:company="currentLocale === 'en' ? paneler.company_en : paneler.company_ja"
2421
:division="currentLocale === 'en' ? paneler.position_en : paneler.position_en"
2522
:name="currentLocale === 'en' ? paneler.name_en : paneler.name_ja"

‎apps/web/app/components/sponsor/SponsorList.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
<script setup lang="ts">
22
import type { PersonalSponsorInfo, SponsorInfo } from '@vuejs-jp/model'
33
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
4-
import { useSupabaseStorage } from '~/composables/useSupabaseStorage'
54
65
type Props = SponsorInfo & {
76
personal?: PersonalSponsorInfo
87
}
98
109
defineProps<Props>()
1110
12-
const { getStaticAvatarUrl } = useSupabaseStorage()
13-
1411
const currentLocale = useLocaleCurrent().locale
1512
</script>
1613

@@ -27,7 +24,7 @@ const currentLocale = useLocaleCurrent().locale
2724
>
2825
<img
2926
class="sponsor-list-item-image"
30-
:src="getStaticAvatarUrl(item.image_url)"
27+
:src="item['image_url']"
3128
:alt="item.name"
3229
loading="lazy"
3330
/>

‎apps/web/app/components/ticket/NamecardSection.vue‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<script setup lang="ts">
2-
import { endedApplyNormal, endedCreateNamecard, isDone, ticketUrl } from '~/utils/constants'
2+
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
3+
import { endedApplyNormal, endedCreateNamecard, ticketUrl } from '~/utils/constants'
34
import { useWithBase, usePathWithLocale } from '#imports'
45
6+
const { locale: currentLocale } = useLocaleCurrent()
57
const basePath = useWithBase()
68
const pathWithLocale = usePathWithLocale()
79
</script>
@@ -37,7 +39,6 @@ const pathWithLocale = usePathWithLocale()
3739
:href="pathWithLocale('/namecard')"
3840
background-color="vue-green/200"
3941
color="white"
40-
:disabled="isDone"
4142
>
4243
{{ endedCreateNamecard ? $t('namecard.confirmNamecard') : $t('namecard.createNamecard') }}
4344
</VFLinkButton>

‎apps/web/app/composables/useSupabaseStorage.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,15 @@
11
import { useRuntimeConfig } from '#imports'
22
import { bucket } from '@vuejs-jp/model'
3-
import { REDIRECT_URL } from '../utils/environment.constants'
43

54
export function useSupabaseStorage() {
65
const config = useRuntimeConfig()
76
const { supabaseUrl } = config.public
87

9-
function getStaticAvatarUrl(avatarUrl?: string) {
10-
if (!avatarUrl) return `${REDIRECT_URL}/supabase/common/default.png`
11-
if (avatarUrl?.startsWith(supabaseUrl)) return `${REDIRECT_URL}/supabase/common/${new URL(avatarUrl).pathname.split('/').pop()}`
12-
return `${REDIRECT_URL}/supabase/common/${new URL(avatarUrl).pathname.split('/').pop()}`
13-
}
14-
158
function getFullAvatarUrl(avatarUrl: string) {
169
if (!avatarUrl) return `${supabaseUrl}/storage/v1/object/public/${bucket}/default.png`
1710
if (avatarUrl?.startsWith(supabaseUrl)) return avatarUrl
1811
return `${supabaseUrl}/storage/v1/object/public/${bucket}${avatarUrl}`
1912
}
2013

21-
return { getStaticAvatarUrl, getFullAvatarUrl }
14+
return { getFullAvatarUrl }
2215
}

‎apps/web/app/pages/jobboard.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script setup lang="ts">
22
import { useFetch, useHead, usePathWithLocale } from '#imports'
3-
import { useSupabaseStorage } from '~/composables/useSupabaseStorage'
43
import type { JobInfo } from '@vuejs-jp/model'
54
import { conferenceTitle, linkUrl, ogJobboardDescription } from '~/utils/constants'
65
import { generalOg, twitterOg } from '~/utils/og.constants'
@@ -13,8 +12,6 @@ if (error.value) {
1312
}
1413
const { allJobs } = data.value as Jobs
1514
16-
const { getStaticAvatarUrl } = useSupabaseStorage()
17-
1815
const pathWithLocale = usePathWithLocale()
1916
2017
useHead({
@@ -42,7 +39,7 @@ useHead({
4239
<ul class="jobboard-body">
4340
<li v-for="(job, index) in allJobs.list" :key="index">
4441
<nuxt-link :to="job.link_url" target="_blank">
45-
<img :src="getStaticAvatarUrl(job.image_url)" :alt="job.image_alt" />
42+
<img :src="job.image_url" :alt="job.image_alt" />
4643
</nuxt-link>
4744
</li>
4845
</ul>

‎apps/web/app/pages/sessions/[id]/index.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type { Speaker } from '@vuejs-jp/model'
1111
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
1212
import { useSupabase } from '~/composables/useSupabase'
1313
import { useSession } from '~/composables/useSession'
14-
import { useSupabaseStorage } from '~/composables/useSupabaseStorage'
1514
import { conferenceTitle, linkUrl, ogSpeakerDescription } from '~/utils/constants'
1615
import { generalOg, twitterOg } from '~/utils/og.constants'
1716
import { useRange } from '@vuejs-jp/composable'
@@ -37,7 +36,6 @@ const { range } = useRange()
3736
const { color, trackName } = useSession()
3837
const currentLocale = useLocaleCurrent().locale
3938
const pathWithLocale = usePathWithLocale()
40-
const { getStaticAvatarUrl } = useSupabaseStorage()
4139
4240
useHead({
4341
titleTemplate: (titleChunk) => `${speakerData[0].session_title_ja} | ${conferenceTitle}`,
@@ -107,7 +105,7 @@ useHead({
107105

108106
<div class="detailbody-persons">
109107
<VFSpeaker
110-
:image="getStaticAvatarUrl(speakerData[0].image_url)"
108+
:image="speakerData[0].image_url"
111109
:company="currentLocale === 'en' ? speakerData[0].company_en : speakerData[0].company_ja"
112110
:division="
113111
currentLocale === 'en' ? speakerData[0].position_en : speakerData[0].position_ja

‎apps/web/app/pages/sessions/[id]/share.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
} from '#imports'
1010
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
1111
import { useSupabase } from '~/composables/useSupabase'
12-
import { useSupabaseStorage } from '~/composables/useSupabaseStorage'
1312
import { conferenceTitle, linkUrl, ogSpeakerDescription } from '~/utils/constants'
1413
import { generalOg, twitterOg } from '~/utils/og.constants'
1514
import type { Speaker } from '@vuejs-jp/model'
@@ -33,8 +32,6 @@ if (!speakerData[0].detail_page_id) {
3332
3433
const currentLocale = useLocaleCurrent().locale
3534
36-
const { getStaticAvatarUrl } = useSupabaseStorage()
37-
3835
function copyUrl() {
3936
const element = document.createElement('input')
4037
element.value = `https://vuefes.jp/2024/namecard/${id}/share`
@@ -76,7 +73,7 @@ useHead({
7673
class="session"
7774
:user="{
7875
display_name: speakerData[0].name_ja,
79-
avatar_url: getStaticAvatarUrl(speakerData[0].image_url),
76+
avatar_url: speakerData[0].image_url,
8077
role: 'speaker',
8178
}"
8279
/>

‎apps/web/app/pages/sponsors/[id]/index.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type { Job, Speaker, Sponsor } from '@vuejs-jp/model'
1111
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
1212
import { useSupabase } from '~/composables/useSupabase'
1313
import { useSponsor } from '~/composables/useSponsor'
14-
import { useSupabaseStorage } from '~/composables/useSupabaseStorage'
1514
import { conferenceTitle, linkUrl, ogSponsorDescription } from '~/utils/constants'
1615
import { generalOg, twitterOg } from '~/utils/og.constants'
1716
import { useColor } from '@vuejs-jp/composable'
@@ -49,7 +48,6 @@ const currentLocale = useLocaleCurrent().locale
4948
const pathWithLocale = usePathWithLocale()
5049
const { color: updateColor } = useColor()
5150
const { color, borderColor, isMoreSilver } = useSponsor()
52-
const { getStaticAvatarUrl } = useSupabaseStorage()
5351
5452
useHead({
5553
titleTemplate: (titleChunk) => `${sponsorData[0].name} | ${conferenceTitle}`,
@@ -94,7 +92,7 @@ useHead({
9492
:style="{ border: `1px solid ${updateColor(borderColor(sponsorData[0].tag))}` }"
9593
>
9694
<img
97-
:src="getStaticAvatarUrl(sponsorData[0].image_url)"
95+
:src="`${sponsorData[0].image_url}`"
9896
:alt="sponsorData[0].name"
9997
width="570"
10098
height="322"
@@ -128,7 +126,7 @@ useHead({
128126
<VFSpeaker
129127
v-for="(speaker, index) in speakerData"
130128
:key="index"
131-
:image="getStaticAvatarUrl(speaker.image_url)"
129+
:image="speaker.image_url"
132130
:company="currentLocale === 'en' ? speaker.company_en : speaker.company_ja"
133131
:division="currentLocale === 'en' ? speaker.position_en : speaker.position_ja"
134132
:name="currentLocale === 'en' ? speaker.name_en : speaker.name_ja"
@@ -160,7 +158,7 @@ useHead({
160158
{{ `${sponsorData[0].name}のジョブボード` }}
161159
</h3>
162160
<nuxt-link :to="jobData[0].link_url" target="_blank">
163-
<img :src="getStaticAvatarUrl(jobData[0].image_url)" :alt="jobData[0].image_alt" />
161+
<img :src="jobData[0].image_url" :alt="jobData[0].image_alt" />
164162
</nuxt-link>
165163
</div>
166164

‎apps/web/app/pages/sponsors/[id]/share.vue‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
} from '#imports'
1010
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
1111
import { useSupabase } from '~/composables/useSupabase'
12-
import { useSupabaseStorage } from '~/composables/useSupabaseStorage'
1312
import { conferenceTitle, linkUrl, ogSponsorDescription } from '~/utils/constants'
1413
import { generalOg, twitterOg } from '~/utils/og.constants'
1514
import type { Sponsor } from '@vuejs-jp/model'
@@ -33,8 +32,6 @@ if (!sponsorData[0].detail_page_id) {
3332
3433
const currentLocale = useLocaleCurrent().locale
3534
36-
const { getStaticAvatarUrl } = useSupabaseStorage()
37-
3835
function copyUrl() {
3936
const element = document.createElement('input')
4037
element.value = `https://vuefes.jp/2024/namecard/${id}/share`
@@ -76,7 +73,7 @@ useHead({
7673
class="session"
7774
:user="{
7875
display_name: sponsorData[0].name,
79-
avatar_url: getStaticAvatarUrl(sponsorData[0].share_image_url),
76+
avatar_url: sponsorData[0].share_image_url,
8077
role: 'sponsor',
8178
}"
8279
/>

0 commit comments

Comments
 (0)