Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/assets/welcome_lesson-picture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/index/activity/ActivitySection.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { ImageMetadata } from 'astro'
import Section from '@/components/common/Section.astro'
import LinkButton from '@/components/common/button/LinkButton.astro'
import ActivityCard from '@/components/activity/ActivityCard.astro'
import welcomeImage from '@/assets/welcome_lessons.webp'
import welcomeImage from '@/assets/welcome_lesson-picture.png'
import exhibition1Image from '@/assets/exhibition1.webp'
import springDevImage from '@/assets/spring_dev.webp'

Expand Down
4 changes: 3 additions & 1 deletion src/components/layout/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import FooterLink from './FooterLink.astro'
<footer class="flex flex-wrap items-center justify-center gap-8 py-8">
<div class="flex flex-wrap items-center justify-center gap-4 px-4">
<OuccImage role="img" aria-label="OUCC" class="w-12" />
<span class="text-sm">© 2025 大阪大学コンピュータクラブ</span>
<span class="text-sm"
>© {new Date().getFullYear()} 大阪大学コンピュータクラブ</span
>
</div>
<div class="flex flex-wrap items-center justify-center gap-4 px-4">
<FooterLink to="/oucc-rules.pdf">規約</FooterLink>
Expand Down
49 changes: 49 additions & 0 deletions src/components/workshop/Workshop2026Section.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
import Section from '@/components/common/Section.astro'
import WorkshopCard from './WorkshopCard.astro'
import type { ComponentProps } from 'astro/types'

export interface Item
extends Omit<ComponentProps<typeof WorkshopCard>, 'date'> {
date?: Date
}
export function date(
month: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12,
date: number,
hour?: number,
minute?: number,
) {
return hour === undefined
? new Date(2026, month - 1, date)
: minute === undefined
? new Date(2026, month - 1, date, hour)
: new Date(2026, month - 1, date, hour, minute)
}

export const items: Item[] = []

const dateFormat = new Intl.DateTimeFormat('ja-JP', {
weekday: 'short',
month: 'numeric',
day: 'numeric',
// hour: '2-digit',
// minute: '2-digit',
})
---

<Section background="secondary">
<Fragment slot="title">2026年度のOUCCの講習会</Fragment>
<div class="flex flex-col gap-5">
<p>
2026年度の講習会をサーオリ後に発表します。
開始時刻や開催場所などの詳細ついては随時更新します。是非お気軽にご参加ください!
</p>
<ul class="grid grid-cols-[repeat(auto-fit,minmax(18rem,1fr))] gap-5">
{
items.map(({ date, ...item }) => (
<WorkshopCard {...item} date={dateFormat.format(date)} />
))
}
</ul>
</div>
</Section>
8 changes: 2 additions & 6 deletions src/components/workshop/WorkshopSection.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Section from '@/components/common/Section.astro'
import OUTechsDiscordJoinLink from '@/components/common/button/OUTechsDiscordJoinLink.astro'
import DiscordJoinLink from '@/components/common/button/DiscordJoinLink.astro'
---

<Section background="white">
Expand All @@ -9,15 +9,11 @@ import OUTechsDiscordJoinLink from '@/components/common/button/OUTechsDiscordJoi
新歓イベントの一環として部員や外部講師による講習会を開催しています。様々な技術について未経験者向けに解説しながら実際に使えるようになることを目指します。講習会内で必要なソフトウェアのインストールから説明しますので、事前準備は必要ありません。
</p>
<div class="flex justify-center">
<OUTechsDiscordJoinLink />
<DiscordJoinLink />
</div>
<p>
こちらから講習会の資料や連絡を受け取れます。
どなたでも無料で参加できます。是非お気軽にご参加ください!
</p>
<p>
2026年度の講習会を現在計画中です。
2025年度には、以下のような講習会を開催しました。
</p>
</div>
</Section>
2 changes: 2 additions & 0 deletions src/pages/workshop.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Layout from '@/layouts/Layout.astro'
import Hero from '@/components/common/Hero.astro'
import WorkshopSection from '@/components/workshop/WorkshopSection.astro'
import Workshop2025Section from '@/components/workshop/Workshop2025Section.astro'
import Workshop2026Section from '@/components/workshop/Workshop2026Section.astro'
---

<Layout
Expand All @@ -13,6 +14,7 @@ import Workshop2025Section from '@/components/workshop/Workshop2025Section.astro
<Hero title="講習会" copy="一緒に新しい技術を学びませんか?" compact />
<main>
<WorkshopSection />
<Workshop2026Section />
<Workshop2025Section />
</main>
</Layout>
Loading