From 0f17c40cc481eb814c57a417d387bdd7b2c64f17 Mon Sep 17 00:00:00 2001 From: aster <137767097+aster-void@users.noreply.github.com> Date: Fri, 28 Mar 2025 13:00:02 +0900 Subject: [PATCH 1/5] fixes --- bun.lock | 25 ++++----- package.json | 1 - src/components/ActivityPage/Section.astro | 12 ++--- src/components/ArticleList.astro | 2 +- src/components/Footer.astro | 5 +- src/components/Footer/FooterSection.astro | 7 ++- src/components/ProjectList.astro | 11 ++-- src/images/activity-develop-brainstorming.jpg | Bin 988705 -> 0 bytes src/images/activity-develop-meeting.jpg | Bin 927744 -> 0 bytes .../develop/cover.jpg} | Bin src/images/activity/develop/hackathon.jpg | Bin 0 -> 1319706 bytes .../develop/project.jpg} | Bin src/images/activity/develop/solo-dev.jpg | Bin 0 -> 1733404 bytes .../learn/cover.jpg} | Bin .../learn/festival.png} | Bin .../learn/specialized-seminar.jpg} | Bin .../learn/utcode-learn.jpg} | Bin .../share/camp.jpg} | Bin .../share/cover.jpg} | Bin .../share/festival.jpg} | Bin .../share/weekly-meetup.jpg} | Bin .../gmo-media.png} | Bin src/images/{favicon.png => favicon/1000x.png} | Bin .../{favicon-64x.png => favicon/64x.png} | Bin src/images/logo/normal.svg | 7 +++ src/layouts/GlobalLayout.astro | 2 +- src/pages/activities/develop.astro | 51 +++++++----------- src/pages/activities/learn.astro | 39 +++++--------- src/pages/activities/share.astro | 14 ++--- src/pages/donation.astro | 2 +- src/pages/index.astro | 2 +- 31 files changed, 76 insertions(+), 104 deletions(-) delete mode 100644 src/images/activity-develop-brainstorming.jpg delete mode 100644 src/images/activity-develop-meeting.jpg rename src/images/{activity-develop.jpg => activity/develop/cover.jpg} (100%) create mode 100644 src/images/activity/develop/hackathon.jpg rename src/images/{activity-develop-project.jpg => activity/develop/project.jpg} (100%) create mode 100644 src/images/activity/develop/solo-dev.jpg rename src/images/{activity-learn.jpg => activity/learn/cover.jpg} (100%) rename src/images/{activity-learn-festival.png => activity/learn/festival.png} (100%) rename src/images/{activity-learn-specialized-seminar.jpg => activity/learn/specialized-seminar.jpg} (100%) rename src/images/{activity-learn-utcode-learn.jpg => activity/learn/utcode-learn.jpg} (100%) rename src/images/{activity-share-camp.jpg => activity/share/camp.jpg} (100%) rename src/images/{activity-share.jpg => activity/share/cover.jpg} (100%) rename src/images/{activity-share-festival.jpg => activity/share/festival.jpg} (100%) rename src/images/{activity-share-weekly-meetup.jpg => activity/share/weekly-meetup.jpg} (100%) rename src/images/{logo-gmo-media.png => donators/gmo-media.png} (100%) rename src/images/{favicon.png => favicon/1000x.png} (100%) rename src/images/{favicon-64x.png => favicon/64x.png} (100%) create mode 100644 src/images/logo/normal.svg diff --git a/bun.lock b/bun.lock index ea1dea69..15ba8318 100644 --- a/bun.lock +++ b/bun.lock @@ -4,33 +4,32 @@ "": { "name": "website", "dependencies": { - "@astrojs/mdx": "^4.1.0", - "@astrojs/sitemap": "^3.2.1", - "@astrojs/svelte": "^7.0.6", + "@astrojs/mdx": "^4.2.2", + "@astrojs/sitemap": "^3.3.0", + "@astrojs/svelte": "^7.0.8", "@date-fns/tz": "^1.2.0", "@iconify-json/feather": "^1.2.1", "@tailwindcss/typography": "^0.5.16", - "astro": "^5.4.2", + "astro": "^5.5.5", "astro-icon": "^1.1.5", "bits-ui": "^1.3.13", - "daisyui": "^5.0.4", + "daisyui": "^5.0.9", "date-fns": "^4.1.0", "markdown-to-txt": "^2.0.1", "sharp": "^0.33.5", - "svelte": "^5.23.1", + "svelte": "^5.25.3", }, "devDependencies": { "@astrojs/check": "^0.9.4", "@biomejs/biome": "^1.9.4", - "@tailwindcss/vite": "^4.0.12", - "@types/bun": "^1.2.4", - "lefthook": "^1.11.3", + "@tailwindcss/vite": "^4.0.17", + "lefthook": "^1.11.5", "prettier": "^3.5.3", "prettier-plugin-astro": "^0.14.1", "prettier-plugin-svelte": "^3.3.3", "prettier-plugin-tailwindcss": "^0.6.11", "rollup-plugin-visualizer": "^5.14.0", - "tailwindcss": "^4.0.12", + "tailwindcss": "^4.0.17", "typescript": "^5.8.2", }, }, @@ -328,8 +327,6 @@ "@types/acorn": ["@types/acorn@4.0.6", "", { "dependencies": { "@types/estree": "*" } }, "sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ=="], - "@types/bun": ["@types/bun@1.2.6", "", { "dependencies": { "bun-types": "1.2.6" } }, "sha512-fY9CAmTdJH1Llx7rugB0FpgWK2RKuHCs3g2cFDYXUutIy1QGiPQxKkGY8owhfZ4MXWNfxwIbQLChgH5gDsY7vw=="], - "@types/debug": ["@types/debug@4.1.12", "", { "dependencies": { "@types/ms": "*" } }, "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="], "@types/estree": ["@types/estree@1.0.6", "", {}, "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="], @@ -354,8 +351,6 @@ "@types/unist": ["@types/unist@3.0.3", "", {}, "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q=="], - "@types/ws": ["@types/ws@8.5.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw=="], - "@types/yauzl": ["@types/yauzl@2.10.3", "", { "dependencies": { "@types/node": "*" } }, "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q=="], "@ungap/structured-clone": ["@ungap/structured-clone@1.3.0", "", {}, "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g=="], @@ -424,8 +419,6 @@ "buffer-crc32": ["buffer-crc32@0.2.13", "", {}, "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="], - "bun-types": ["bun-types@1.2.6", "", { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } }, "sha512-FbCKyr5KDiPULUzN/nm5oqQs9nXCHD8dVc64BArxJadCvbNzAI6lUWGh9fSJZWeDIRD38ikceBU8Kj/Uh+53oQ=="], - "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="], "camelcase": ["camelcase@8.0.0", "", {}, "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA=="], diff --git a/package.json b/package.json index e161a0ce..2c9bc632 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,6 @@ "@astrojs/check": "^0.9.4", "@biomejs/biome": "^1.9.4", "@tailwindcss/vite": "^4.0.17", - "@types/bun": "^1.2.6", "lefthook": "^1.11.5", "prettier": "^3.5.3", "prettier-plugin-astro": "^0.14.1", diff --git a/src/components/ActivityPage/Section.astro b/src/components/ActivityPage/Section.astro index 52b5f10d..4bbe6210 100644 --- a/src/components/ActivityPage/Section.astro +++ b/src/components/ActivityPage/Section.astro @@ -2,12 +2,12 @@ import { Picture } from "astro:assets"; interface Props { title: string; - edge: "left" | "right"; + "align-image": "left" | "right"; image: ImageMetadata; imageAlt: string; } -const { title, edge, image, imageAlt } = Astro.props; +const { title, "align-image": align, image, imageAlt } = Astro.props; ---
@@ -16,9 +16,9 @@ const { title, edge, image, imageAlt } = Astro.props; class:list={[ "isolate h-[300px] overflow-clip md:h-[400px] lg:h-[500px] lg:w-1/2 xl:h-[600px]", { - left: "lg:ml-auto lg:rounded-l-2xl", - right: "lg:rounded-r-2xl", - }[edge], + left: "lg:rounded-r-2xl", + right: "lg:ml-auto lg:rounded-l-2xl", + }[align], ]} > -
+

{title}

diff --git a/src/components/ArticleList.astro b/src/components/ArticleList.astro index 952e0cb3..9239ed97 100644 --- a/src/components/ArticleList.astro +++ b/src/components/ArticleList.astro @@ -73,7 +73,7 @@ const articlesWithExcerpts = await Promise.all( diff --git a/src/components/Footer.astro b/src/components/Footer.astro index f14094f6..45a3ccf5 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -38,10 +38,7 @@ const props = Astro.props; title="リンク" links={[ { title: "ut.code(); Learn", to: "https://learn.utcode.net/" }, - { - title: "はじめてのプログラミング教室", - to: "https://first-programming.utcode.net/", - }, + { title: "プロジェクト", to: "/projects" }, { title: "GitHub", to: "https://github.com/ut-code" }, { title: "X", to: "https://x.com/utokyo_code" }, ]} diff --git a/src/components/Footer/FooterSection.astro b/src/components/Footer/FooterSection.astro index 198bc1a3..d5e52229 100644 --- a/src/components/Footer/FooterSection.astro +++ b/src/components/Footer/FooterSection.astro @@ -1,4 +1,6 @@ --- +import { Icon } from "astro-icon/components"; + interface Props { title: string; links: { title: string; to: string }[]; @@ -11,7 +13,7 @@ const { title, links } = Astro.props;
-
+

- ソフトウェアは、作り始める前にしっかりとアイデアを練り上げることが重要です。ut.code(); - では、プロジェクトの実施の前にブレインストーミング会を実施し、多くの人から作りたいプロダクトについてのアイデアに対するフィードバックを得る機会を提供しています。 + ハッカソンは、限られた時間の中でアイデアを形にし、実際に動くプロダクトを開発するイベントです。 + 参加者はチームを組み、短期間で設計・実装・発表までを行うため、創造力や技術力、チームワークが試されます。 + アイデアを素早く具体化し、試行錯誤しながらブラッシュアップする過程を通じて、実践的なスキルを磨くことができます。

-
+

- プロジェクトが動き始めた後、重要になってくるのは継続です。ut.code(); - では、すべてのプロジェクトで週 1 - 度の定例ミーティングを実施することを推奨しています。テスト期間など、時間がとりづらい時期でも、週に - 1 - 度、ほんの少しだけ実施中のプロジェクトに意識を向けることにより、プロジェクトの成功率を大きく高めることができます。 + 個人開発は、アイデアを自由に形にし、自分のペースで開発を進めるスタイルです。 + 発想から実装までを一貫して行うことで、技術力や問題解決能力を高めることができます。 + 思いついたものをすぐに試し、試行錯誤を重ねながらプロダクトを作り上げていく過程そのものが、大きな学びや発見につながります。 + ut.code(); + は、そんな個人開発を支えるため、発表の場や開発に必要なリソース提供を通じて、開発者の挑戦をサポートしています。

-); } - diff --git a/src/pages/activities/learn.astro b/src/pages/activities/learn.astro index 0f2fb80e..4c2b3b58 100644 --- a/src/pages/activities/learn.astro +++ b/src/pages/activities/learn.astro @@ -5,10 +5,9 @@ import Summary from "+/components/ActivityPage/Summary.astro"; import Title from "+/components/ActivityPage/Title.astro"; import ActionButton from "+/components/ActionButton.astro"; -import Festival from "+/images/activity-learn-festival.png"; -import Seminar from "+/images/activity-learn-specialized-seminar.jpg"; -import UTCodeLearn from "+/images/activity-learn-utcode-learn.jpg"; -import Cover from "+/images/activity-learn.jpg"; +import Cover from "+/images/activity/learn/cover.jpg"; +import Seminar from "+/images/activity/learn/specialized-seminar.jpg"; +import UTCodeLearn from "+/images/activity/learn/utcode-learn.jpg"; --- @@ -22,8 +21,8 @@ import Cover from "+/images/activity-learn.jpg";

ut.code(); Learn は、ut.code(); @@ -39,30 +38,16 @@ import Cover from "+/images/activity-learn.jpg"; title="全ゼミ / 自主ゼミ「モダン Web システム開発入門」" image={Seminar} imageAlt="" - edge="right" + align-image="left" >

ut.code(); Learn を教材に、駒場キャンパスで講義形式で Web - システム開発を学ぶことのできる自主ゼミです。自学自習のペース配分が苦手でも、毎週の参加と課題により学習を進めることができます。 + システム開発を学ぶことのできるゼミです。自学自習のペース配分が苦手でも、毎週の参加と課題により学習を進めることができます。

-

- ut.code(); - の新歓イベントを兼ねていますが、ゼミのみへの参加も、ゼミなしでの - ut.code(); への入会も歓迎しています。 -

-
-
-

- 例年 5 月に開催される五月祭、11 - 月に開催される駒場祭にそれぞれ出展しています。様々な企画を用意していますが、その中でも「はじめてのプログラミング教室」は、プログラムに触れたことのない方でもアルゴリズムの力に触れることのできる企画となっています。 -

- - 駒場祭参加報告 -
+ diff --git a/src/pages/activities/share.astro b/src/pages/activities/share.astro index bdea508f..f19d4d1e 100644 --- a/src/pages/activities/share.astro +++ b/src/pages/activities/share.astro @@ -4,10 +4,10 @@ import Section from "+/components/ActivityPage/Section.astro"; import Summary from "+/components/ActivityPage/Summary.astro"; import Title from "+/components/ActivityPage/Title.astro"; -import Camp from "+/images/activity-share-camp.jpg"; -import Festival from "+/images/activity-share-festival.jpg"; -import WeeklyMeetup from "+/images/activity-share-weekly-meetup.jpg"; -import Cover from "+/images/activity-share.jpg"; +import Camp from "+/images/activity/share/camp.jpg"; +import Cover from "+/images/activity/share/cover.jpg"; +import Festival from "+/images/activity/share/festival.jpg"; +import WeeklyMeetup from "+/images/activity/share/weekly-meetup.jpg"; --- @@ -17,7 +17,7 @@ import Cover from "+/images/activity-share.jpg"; ソフトウェア開発のために必要な技術は増加の一途をたどっており、ひとつのソフトウェアのために投資されるエネルギーも拡大し続けています。現代の開発者にとって、多くの関係者と密にコミュニケーションをとり、互いの足りない部分を補い合うことは、大切な技術のひとつです。

-
+

大学の長期休暇は 2 か月にも及ぶため、ソフトウェア開発プロジェクトを実施するには絶好の機会です。しかし、長い休暇を有意義に使うために自らを律することは容易ではありません。 @@ -31,7 +31,7 @@ import Cover from "+/images/activity-share.jpg"; title="五月祭・駒場祭" image={Festival} imageAlt="2022 年度駒場祭グランプリ受賞式の様子" - edge="left" + align-image="right" >

東京大学の主要な学園祭である五月祭・駒場祭に、ut.code(); @@ -46,7 +46,7 @@ import Cover from "+/images/activity-share.jpg"; title="合宿" image={Camp} imageAlt="2023 年度夏合宿の様子" - edge="right" + align-image="left" >

ソフトウェア開発には長い時間がかかります。大学生活には時間的余裕があるとはいえ、集中して開発に取り組むのはなかなか難しいのが現実です。 diff --git a/src/pages/donation.astro b/src/pages/donation.astro index 8dbcdba2..a2bd0844 100644 --- a/src/pages/donation.astro +++ b/src/pages/donation.astro @@ -27,7 +27,7 @@ import { Focus } from "+/schema";

協賛による支援

- ut.code();は、ウェブサイトにご協賛いただいた企業様のロゴを掲載しております。 + ut.code();は、ご協賛いただいた企業様のロゴをウェブサイトに掲載しております。

ご寄付による支援

ご寄付いただける方は、以下の口座にお振込みください。

diff --git a/src/pages/index.astro b/src/pages/index.astro index 3eaeaacf..227aeb3b 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -11,9 +11,9 @@ import ProjectList from "+/components/ProjectList.astro"; import SectionHeader from "+/components/per-page/SectionHeader.astro"; import { Focus } from "+/schema.ts"; +import LogoGMOMedia from "+/images/donators/gmo-media.png"; import Hero from "+/images/headers/index.jpg"; import LabCafe from "+/images/lab-cafe.jpg"; -import LogoGMOMedia from "+/images/logo-gmo-media.png"; const projects = (await getCollection("projects")).sort((a, b) => { const a_order = a.data.order ?? Number.POSITIVE_INFINITY; From 32fae85a586473d41ca7d1dcde1cb05070b6dc2b Mon Sep 17 00:00:00 2001 From: aster <137767097+aster-void@users.noreply.github.com> Date: Fri, 28 Mar 2025 13:09:04 +0900 Subject: [PATCH 2/5] fix about default og:image --- bun.lock | 4 ++-- package.json | 2 +- src/layouts/GlobalLayout.astro | 3 +-- src/layouts/meta.astro | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bun.lock b/bun.lock index 15ba8318..eeac8cdc 100644 --- a/bun.lock +++ b/bun.lock @@ -12,7 +12,7 @@ "@tailwindcss/typography": "^0.5.16", "astro": "^5.5.5", "astro-icon": "^1.1.5", - "bits-ui": "^1.3.13", + "bits-ui": "^1.3.14", "daisyui": "^5.0.9", "date-fns": "^4.1.0", "markdown-to-txt": "^2.0.1", @@ -409,7 +409,7 @@ "base-64": ["base-64@1.0.0", "", {}, "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="], - "bits-ui": ["bits-ui@1.3.13", "", { "dependencies": { "@floating-ui/core": "^1.6.4", "@floating-ui/dom": "^1.6.7", "@internationalized/date": "^3.5.6", "esm-env": "^1.1.2", "runed": "^0.23.2", "svelte-toolbelt": "^0.7.1", "tabbable": "^6.2.0" }, "peerDependencies": { "svelte": "^5.11.0" } }, "sha512-0ysKdvHBIArfFBe+MYVAvu5OANOsivk+UJftdiW+e6lGHzf+EW/TZpLh69Vf0n8pYTjkH+33CHlVIImxTZRIMQ=="], + "bits-ui": ["bits-ui@1.3.14", "", { "dependencies": { "@floating-ui/core": "^1.6.4", "@floating-ui/dom": "^1.6.7", "@internationalized/date": "^3.5.6", "esm-env": "^1.1.2", "runed": "^0.23.2", "svelte-toolbelt": "^0.7.1", "tabbable": "^6.2.0" }, "peerDependencies": { "svelte": "^5.11.0" } }, "sha512-T4ClhH0eQmrhZ8uMfC8Q4WBcpygnfdVTfb/1Y/6PrYA5Fqv7HTLmK3B9NSv4DUbDXpuG4SiC2cPSXVUqsEA/aw=="], "boolbase": ["boolbase@1.0.0", "", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="], diff --git a/package.json b/package.json index 2c9bc632..dad7ec2e 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@tailwindcss/typography": "^0.5.16", "astro": "^5.5.5", "astro-icon": "^1.1.5", - "bits-ui": "^1.3.13", + "bits-ui": "^1.3.14", "daisyui": "^5.0.9", "date-fns": "^4.1.0", "markdown-to-txt": "^2.0.1", diff --git a/src/layouts/GlobalLayout.astro b/src/layouts/GlobalLayout.astro index bd1582f2..2c43f7de 100644 --- a/src/layouts/GlobalLayout.astro +++ b/src/layouts/GlobalLayout.astro @@ -2,7 +2,6 @@ import { ClientRouter } from "astro:transitions"; import Footer from "+/components/Footer.astro"; import Header from "+/components/Header.astro"; -import Logo from "+/images/logo/normal.svg"; import type { Focus } from "+/schema"; import Meta from "./meta.astro"; @@ -17,7 +16,7 @@ const { title, description, focus, image } = Astro.props; --- - +