Skip to content

Commit 088395b

Browse files
committed
Merge branch 'main' into feature/2025/add_timetable
2 parents 73e18db + d55606a commit 088395b

File tree

5 files changed

+42
-31
lines changed

5 files changed

+42
-31
lines changed

2025/astro.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Macros from 'unplugin-macros/vite';
88

99
// https://astro.build/config
1010
export default defineConfig({
11+
site: 'https://vimconf.org/',
1112
base: '/2025',
1213

1314
vite: {

2025/src/components/Header.astro

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ import { Menu, X } from "@lucide/astro";
1717
</a>
1818
</div>
1919
<nav class="hidden items-center space-x-6 md:flex">
20-
<a
21-
href="#cfp"
22-
class="text-sm font-medium transition-colors hover:text-emerald-600"
23-
>
24-
プロポーザルの募集
25-
</a>
2620
<a
2721
href="#keynote"
2822
class="text-sm font-medium transition-colors hover:text-emerald-600"
@@ -94,11 +88,6 @@ import { Menu, X } from "@lucide/astro";
9488
>
9589
<div class="container mx-auto px-4 py-4">
9690
<nav class="flex flex-col space-y-4">
97-
<a
98-
href="#cfp"
99-
class="py-2 text-sm font-medium transition-colors hover:text-emerald-600"
100-
>プロポーザルの募集</a
101-
>
10291
<a
10392
href="#keynote"
10493
class="py-2 text-sm font-medium transition-colors hover:text-emerald-600"

2025/src/components/Sponsors/Company.astro

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
---
2+
import type { ImageMetadata } from "astro";
3+
4+
// import.meta.globで画像をlazyロード
5+
const images = import.meta.glob<{ default: ImageMetadata }>(
6+
"/src/assets/sponsors/*.{png,svg}",
7+
);
8+
29
type Props = {
310
sponsor: {
411
rank: "platinum" | "gold" | "silver" | "bronze";
@@ -11,14 +18,14 @@ type Props = {
1118
const props = Astro.props;
1219
const { rank, name, url, image } = props.sponsor;
1320
21+
const imagePath = `/src/assets/sponsors/${image}`;
1422
let imageUrl = "";
15-
try {
16-
const module = await import(
17-
/* @vite-ignore */ `../../assets/sponsors/${image}?url`
18-
);
19-
imageUrl = module.default;
20-
} catch (e) {
21-
console.error(`Icon not found: ${image}`);
23+
24+
if (images[imagePath]) {
25+
const imageModule = await images[imagePath]();
26+
imageUrl = imageModule.default.src;
27+
} else {
28+
console.error(`Image not found: ${imagePath}`);
2229
}
2330
2431
// ランクごとのスタイル設定

2025/src/components/Top.astro

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
import VimLogo from "./VimLogo.astro";
3-
import { ExternalLink, Heart } from "@lucide/astro";
3+
import { ExternalLink, Heart, Zap } from "@lucide/astro";
44
---
55

66
<section
@@ -35,20 +35,23 @@ import { ExternalLink, Heart } from "@lucide/astro";
3535
</p>
3636
</div>
3737
</div>
38-
<div
39-
class="mb-6 inline-flex items-center rounded-full bg-gradient-to-r from-emerald-500 to-green-500 px-6 py-3 text-white"
40-
>
41-
<span class="text-sm font-bold md:text-base"
42-
>🎉 チケット販売開始! 🎉</span
38+
<div class="mb-6 flex flex-col items-center gap-3">
39+
<div
40+
class="inline-flex items-center rounded-full bg-gradient-to-r from-purple-500 to-violet-500 px-6 py-3 text-white"
4341
>
42+
<span class="text-sm font-bold md:text-base">⚡ LT募集開始! ⚡</span>
43+
</div>
44+
<div
45+
class="inline-flex items-center rounded-full bg-gradient-to-r from-emerald-500 to-green-500 px-6 py-3 text-white"
46+
>
47+
<span class="text-sm font-bold md:text-base"
48+
>🎉 チケット販売開始! 🎉</span
49+
>
50+
</div>
4451
</div>
4552
<div
4653
class="mb-8 flex flex-col items-center justify-center gap-3 sm:flex-row"
4754
>
48-
<button
49-
class="inline-flex h-10 w-auto items-center justify-center gap-2 rounded-md border border-emerald-600 bg-background px-4 py-2 text-sm font-medium whitespace-nowrap text-emerald-700 ring-offset-background transition-colors hover:bg-emerald-50 hover:text-accent-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0"
50-
><a href="#cfp">プロポーザルを提出する</a></button
51-
>
5255
<button
5356
class="inline-flex h-10 items-center justify-center gap-2 rounded-md bg-emerald-600 px-4 py-2 text-sm font-medium whitespace-nowrap text-primary-foreground ring-offset-background transition-colors hover:bg-emerald-700 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0"
5457
><a
@@ -65,7 +68,7 @@ import { ExternalLink, Heart } from "@lucide/astro";
6568
><a href="#schedule">スケジュールを見る</a></button
6669
>
6770
</div>
68-
<div class="flex justify-center">
71+
<div class="flex flex-col justify-center gap-2">
6972
<a
7073
href="https://peatix.com/event/4468783/view"
7174
target="_blank"
@@ -79,6 +82,19 @@ import { ExternalLink, Heart } from "@lucide/astro";
7982
<ExternalLink class="ml-2 h-4 w-4" />
8083
</button>
8184
</a>
85+
<a
86+
href="https://docs.google.com/forms/d/e/1FAIpQLSe_j3WMp1ZcIWNHpzYYbX01cLWOjDnoaeMotT5sn-5g4ji7Gg/viewform"
87+
target="_blank"
88+
rel="noopener"
89+
>
90+
<button
91+
class="inline-flex h-10 items-center justify-center gap-2 rounded-md bg-purple-500 px-4 py-2 text-sm font-medium whitespace-nowrap text-primary-foreground ring-offset-background transition-colors hover:bg-purple-600 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0"
92+
>
93+
<Zap class="mr-2 h-5 w-5" />
94+
LTを応募する
95+
<ExternalLink class="ml-2 h-4 w-4" />
96+
</button>
97+
</a>
8298
</div>
8399
</div>
84100
</section>

2025/src/pages/[lang]/index.astro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import Staff from "../../components/Staff/index.astro";
77
import Top from "../../components/Top.astro";
88
import Venue from "../../components/Venue.astro";
99
import OfficialBlog from "../../components/OfficialBlog.astro";
10-
import CfP from "../../components/CfP.astro";
1110
import "../../styles/global.css";
1211
import { LANGUAGES } from "@/i18n";
1312
@@ -21,7 +20,6 @@ export function getStaticPaths() {
2120
<Layout>
2221
<main class="min-h-screen">
2322
<Top />
24-
<CfP />
2523
<KeynoteSpeakers />
2624
<Venue />
2725
<AboutVimConf />

0 commit comments

Comments
 (0)