Skip to content

Commit 24f1f90

Browse files
authored
Merge pull request #391 from vuejs-jp/fix/add-baseurl
Fix/add baseurl
2 parents 52d4994 + 91af90a commit 24f1f90

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

apps/web/app/components/FooterPageSection.vue

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { useI18n } from '#i18n'
33
import { useColor, useTypography } from '@vuejs-jp/composable'
44
import { useLocaleCurrent } from '~/composables/useLocaleCurrent'
5-
5+
import { useWithBase } from '#imports'
66
//#region types
77
type LinkList = {
88
href: string
@@ -15,6 +15,7 @@ const { t } = useI18n()
1515
const { path: localePath } = useLocaleCurrent()
1616
const { color } = useColor()
1717
const { fontSize } = useTypography()
18+
const withBase = useWithBase()
1819
//#endregion
1920
2021
//#region private variables
@@ -38,19 +39,19 @@ const snsLinkList: LinkList[] = [
3839
]
3940
const internalLinkList: LinkList[] = [
4041
{
41-
href: '/events',
42+
href: withBase('/events'),
4243
text: 'related_events.title',
4344
},
4445
{
45-
href: '/privacy',
46+
href: withBase('/privacy'),
4647
text: 'privacy.title',
4748
},
4849
{
49-
href: '/code-of-conduct',
50+
href: withBase('/code-of-conduct'),
5051
text: 'code_of_conduct.title',
5152
},
5253
{
53-
href: '/tokusho',
54+
href: withBase('/tokusho'),
5455
text: 'tokusho.title',
5556
},
5657
]

apps/web/app/components/SponsorPageSection.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import { useI18n } from '#i18n'
3-
import { useLocaleCurrent, useRuntimeConfig } from '#imports'
3+
import { useLocaleCurrent, useRuntimeConfig, useWithBase } from '#imports'
44
import { useColor, useTypography } from '@vuejs-jp/composable'
55
import { useTranslation } from '@/composables/useTranslation'
66
import SponsorList from './sponsor/SponsorList.vue'
@@ -22,6 +22,8 @@ const { translate } = useTranslation()
2222
2323
const currentLocale = useLocaleCurrent().locale
2424
25+
const withBase = useWithBase()
26+
2527
// const periodStart = {
2628
// prefixYear: t('prefix_year'),
2729
// date: t('sponsor.start_date'),
@@ -169,10 +171,7 @@ const personalSponsorInfo: PersonalSponsorInfo = {
169171
<SponsorList v-bind="simultaneousInterpretationSponsors" />
170172
<SponsorList v-bind="childcareSponsors" />
171173
</div>
172-
<SponsorList
173-
v-if="handsonSponsors.list.length !== 0"
174-
v-bind="handsonSponsors"
175-
/>
174+
<SponsorList v-if="handsonSponsors.list.length !== 0" v-bind="handsonSponsors" />
176175
<SponsorList v-bind="mediaSponsors" />
177176
<SponsorList v-bind="toolSponsors" />
178177
<SponsorList
@@ -187,7 +186,7 @@ const personalSponsorInfo: PersonalSponsorInfo = {
187186
<div class="sponsor-buttons">
188187
<VFLinkButton
189188
class="sponsor-button"
190-
:href="`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}jobboard`"
189+
:href="withBase(`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}jobboard`)"
191190
background-color="vue-green/200"
192191
color="white"
193192
>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const basePath = useWithBase()
3535
<div class="buttons-wrapper">
3636
<VFLinkButton
3737
class="action-button"
38-
:href="`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}namecard/`"
38+
:href="basePath(`${currentLocale === 'ja' ? '/' : `/${currentLocale}/`}namecard/`)"
3939
background-color="vue-green/200"
4040
color="white"
4141
>

apps/web/nuxt.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default defineNuxtConfig({
1919
...twitterOg(),
2020
],
2121
link: [
22-
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
22+
{ rel: 'icon', type: 'image/x-icon', href: '/2024/favicon.ico' },
2323
{ rel: 'stylesheet', href: 'https://use.typekit.net/lff1jgr.css' },
2424
],
2525
htmlAttrs: {

0 commit comments

Comments
 (0)