Skip to content

Commit 798ddb3

Browse files
jiyuujinjiyuujin
authored
Merge pull request #333 from vuejs-jp/enhance/brushup
brushup
2 parents 8953e0a + 593af35 commit 798ddb3

File tree

10 files changed

+73
-21
lines changed

10 files changed

+73
-21
lines changed

‎app/components/TopPageSection.vue

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,29 @@
33
<div class="relative mx-auto max-w-1920">
44
<div class="px-5">
55
<div
6+
v-if="!SHOW_ANIMATION"
7+
class="aspect-[650/384] mb-[6.23vw] md:aspect-[782/384] lg:aspect-auto lg:mb-9"
8+
>
9+
<picture>
10+
<source
11+
:srcset="`${urlBasePath}/img/kv_solid_lg.png`"
12+
media="(min-width: 981px)"
13+
>
14+
<source
15+
:srcset="`${urlBasePath}/img/kv_solid_md.png`"
16+
media="(min-width: 771px)"
17+
>
18+
<img
19+
class="mx-auto"
20+
:src="`${urlBasePath}/img/kv_solid_sm.png`"
21+
:alt="conferenceTitle"
22+
width="1178"
23+
height="384"
24+
>
25+
</picture>
26+
</div>
27+
<div
28+
v-if="SHOW_ANIMATION"
629
class="aspect-[648/384] mx-auto mb-[6.23vw] max-w-1176 md:aspect-[780/384] lg:aspect-[1176/384] lg:mb-9"
730
>
831
<top-animation />
@@ -52,16 +75,16 @@
5275
</div>
5376
<picture>
5477
<source
55-
srcset="/img/wave_lg.png"
78+
:srcset="`${urlBasePath}/img/wave_lg.png`"
5679
media="(min-width: 981px)"
5780
>
5881
<source
59-
srcset="/img/wave_md.png"
82+
:srcset="`${urlBasePath}/img/wave_md.png`"
6083
media="(min-width: 771px)"
6184
>
6285
<img
6386
class="absolute bottom-0 left-1/2 -z-10 opacity-40 -translate-x-1/2"
64-
src="/img/wave_sm.png"
87+
:src="`${urlBasePath}/img/wave_sm.png`"
6588
alt=""
6689
>
6790
</picture>
@@ -71,8 +94,8 @@
7194

7295
<script setup lang="ts">
7396
import TweetButtonField from '~/components/forms/customize/TweetButtonField.vue'
74-
import { conferenceTitle, eventDate, streamingNow, tracks, tweetLabel, tweetUrl } from '~/utils/constants'
75-
import { LIVE_YOUTUBE } from '~/utils/feature.constants'
97+
import { conferenceTitle, eventDate, streamingNow, tracks, tweetLabel, tweetUrl, urlBasePath } from '~/utils/constants'
98+
import { LIVE_YOUTUBE, SHOW_ANIMATION } from '~/utils/feature.constants'
7699
import TopAnimation from '~/components/TopAnimation.vue'
77100
78101
const tweet = () => {

‎app/components/timetable/TrackLabel.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
const props = withDefaults(defineProps<{
33
trackIndex: 0 | 1 | 2,
4-
isSponsorEvent: boolean
4+
isSponsorEvent?: boolean
55
}>(), {
66
isSponsorEvent: false
77
})

‎app/composables/useAnimation.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { urlBasePath } from '~/utils/constants'
2-
31
export function useAnimation() {
42
// types
53
type TWindowType = 'sm' | 'md' | 'lg'
@@ -101,7 +99,7 @@ export function useAnimation() {
10199
x: (GAP + GRID) / 2 + col * (GAP + GRID),
102100
y: (GAP + GRID) / 2 + row * (GAP + GRID),
103101
rotate: 0,
104-
src: urlBasePath,
102+
src: '',
105103
key: `${row}-${col}`,
106104
}
107105
switch (p) {

‎app/server/api/hello.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/static/img/kv_solid_lg.png

66 KB
Loading

‎app/static/img/kv_solid_md.png

2.06 KB
Loading

‎app/static/img/kv_solid_sm.png

42.1 KB
Loading

‎app/utils/feature.constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
export const SHOW_ANIMATION = true
12
export const SHOW_TICKET = true
23
export const SHOW_TEAM = true
34
export const SHOW_SPEAKER_LIST = true

‎app/utils/preload.constants.ts

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,44 @@
1+
import { urlBasePath } from './constants'
2+
13
export const preloadImages = () => [
2-
{ rel: 'preload', as: 'image', type: 'image/png', href: '/img/wave_lg.png' },
3-
{ rel: 'preload', as: 'image', type: 'image/png', href: '/img/wave_md.png' },
4-
{ rel: 'preload', as: 'image', type: 'image/png', href: '/img/wave_sm.png' },
5-
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: '/icon/github_logo.svg' },
6-
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: '/icon/note_logo.svg' },
7-
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: '/icon/twitter_logo.svg' },
8-
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: '/icon/twitter_logo-invert.svg' },
9-
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: '/icon/vuefes_logo.svg' },
10-
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: '/icon/vuefes_logo-invert.svg' },
11-
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: '/icon/youtube_logo.svg' },
4+
{ rel: 'preload', as: 'image', type: 'image/png', href: `${urlBasePath}/img/wave_lg.png` },
5+
{ rel: 'preload', as: 'image', type: 'image/png', href: `${urlBasePath}/img/wave_md.png` },
6+
{ rel: 'preload', as: 'image', type: 'image/png', href: `${urlBasePath}/img/wave_sm.png` },
7+
{
8+
rel: 'preload',
9+
as: 'image',
10+
type: 'image/svg+xml',
11+
href: `${urlBasePath}/icon/github_logo.svg`,
12+
},
13+
{ rel: 'preload', as: 'image', type: 'image/svg+xml', href: `${urlBasePath}/icon/note_logo.svg` },
14+
{
15+
rel: 'preload',
16+
as: 'image',
17+
type: 'image/svg+xml',
18+
href: `${urlBasePath}/icon/twitter_logo.svg`,
19+
},
20+
{
21+
rel: 'preload',
22+
as: 'image',
23+
type: 'image/svg+xml',
24+
href: `${urlBasePath}/icon/twitter_logo-invert.svg`,
25+
},
26+
{
27+
rel: 'preload',
28+
as: 'image',
29+
type: 'image/svg+xml',
30+
href: `${urlBasePath}/icon/vuefes_logo.svg`,
31+
},
32+
{
33+
rel: 'preload',
34+
as: 'image',
35+
type: 'image/svg+xml',
36+
href: `${urlBasePath}/icon/vuefes_logo-invert.svg`,
37+
},
38+
{
39+
rel: 'preload',
40+
as: 'image',
41+
type: 'image/svg+xml',
42+
href: `${urlBasePath}/icon/youtube_logo.svg`,
43+
},
1244
]

‎nuxt.config.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export default defineNuxtConfig({
3636
class: [isProd ? 'prod-body' : 'body'],
3737
},
3838
},
39-
serverMiddleware: [{ path: '/api/hello', handler: '~/server/api/hello.ts' }],
4039
buildModules: ['@nuxtjs/device', '@nuxtjs/svg', '@nuxtjs/tailwindcss'],
4140
modules: [
4241
[

0 commit comments

Comments
 (0)