Skip to content

Commit a414833

Browse files
committed
Merge branch 'main' into feature/2025/add_sessions
2 parents 6958bb1 + d4aef83 commit a414833

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
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/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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ import { ExternalLink, Heart } from "@lucide/astro";
4545
<div
4646
class="mb-8 flex flex-col items-center justify-center gap-3 sm:flex-row"
4747
>
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-
>
5248
<button
5349
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"
5450
><a

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)