Skip to content

Commit 401fa58

Browse files
mucho613mucho613
committed
Merge remote-tracking branch 'origin/main' into feature/top-member-list
2 parents cf4b7c9 + f4899a7 commit 401fa58

29 files changed

+463
-54
lines changed

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
# SKIP_BUILD=true bundle exec rake test
3636
# NOTE: サイトが仕上がったら、上記テストを走らせると自動検知できる。
3737
# ただ初期は自動検知の通知が多すぎるので手動で実行するのが吉。
38+
python test-directory-structure.py
3839
3940
# Deploy job is triggered only pushed to main branch && CI passed
4041
deploy:
@@ -86,4 +87,3 @@ jobs:
8687
with:
8788
personal_token: ${{ secrets.GITHUB_TOKEN }}
8889
publish_dir: ./_site
89-

‎404.html‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,13 @@
33
layout: default
44
---
55

6-
<style type="text/css" media="screen">
7-
.container {
8-
margin: 10px auto;
9-
max-width: 600px;
10-
text-align: center;
11-
}
12-
h1 {
13-
margin: 30px 0;
14-
font-size: 4em;
15-
line-height: 1;
16-
letter-spacing: -1px;
17-
}
18-
</style>
6+
{% include navbar.html %}
197

20-
<div class="container" style='margin-bottom: 200px;'>
21-
<h1 style='margin-top: 130px;'>Page Not Found</h1>
8+
<div class="text-center my-40 mx-8 xl:my-20">
9+
<h2 class="text-5xl">Page Not Found</h1>
2210

23-
<p><strong>お探しのページが見つかりませんでした 🥹</strong></p>
24-
<p style='margin-bottom: 100px;'>リンク切れなどあれば <a href='https://twitter.com/DojoConJapan'>@DojoConJapan</a> アカウントまで<br class='ignore-sp'>ご報告いただけると嬉しいです 🙏</p>
25-
26-
<h2 style='margin-bottom: 30px;'>
27-
<i class="fab fa-twitter"></i>
28-
<a href='https://twitter.com/DojoConJapan'>
29-
最近の投稿を見る
30-
</a>
31-
</h2>
32-
<a class="twitter-timeline" data-lang="ja" data-height="600" href="https://twitter.com/DojoConJapan?ref_src=twsrc%5Etfw">Tweets by DojoConJapan</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
11+
<p class="my-8">
12+
<strong>お探しのページが見つかりませんでした🥹</strong><br />
13+
リンク切れなどあれば <i class="fab fa-x-twitter"></i> <a href='https://x.com/{{ site.x }}' target="_blank">@DojoConJapan</a> アカウントまで<wbr>ご報告いただけると嬉しいです🙏
14+
</p>
3315
</div>

‎_data/events.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- title: ぼくのかんがえたさいきょうのCoderDojoワークショップ
2+
outline: 理想のCoderDojoをみんなで考えるワークショップです。ワークシートに自分が考える理想のCoderDojoを書いて、他の参加者とシェアしましょう。
3+
img: /img/events/saikyo-coderdojo.webp
4+
tag: ワークショップ
5+
url: /events/saikyo-coderdojo/

‎_data/sponsors.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# - id: ID（スポンサーページのアンカータグになります）
2+
# name: スポンサー名
3+
# tool: スポンサー提供ツール名（inkindの場合使用）
4+
# logo: ロゴ画像ファイルのパス
5+
# link: ロゴ画像をクリックした際のリンク先
6+
# type: スポンサー種別（platinum, gold, silver, bronze, inkind, individual）
7+
# message: スポンサー紹介文
8+
# logo_scale: ロゴ画像の拡大率（1が等倍、0.5が半分のサイズ）
9+
10+
- id: cygames
11+
name: 株式会社<wbr>Cygames
12+
logo: /img/sponsors/Cygames.jpg
13+
link:
14+
type: gold
15+
message:
16+
logo_scale: 1
17+
18+
- id: sakura_internet
19+
name: さくら<wbr>インターネット<wbr>株式会社
20+
logo: /img/sponsors/sakura_internet.png
21+
link:
22+
type: silver
23+
message:
24+
logo_scale: 1
25+
26+
- id: sunnyside_systems
27+
name: サニーサイド<wbr>システムズ<wbr>合同会社
28+
logo: /img/sponsors/Sunnyside_systems.png
29+
link:
30+
type: bronze
31+
message:
32+
logo_scale: 1
33+
34+
- id: dojoletter
35+
name: DojoLetter<wbr>編集部
36+
logo: /img/sponsors/DojoLetter.png
37+
link:
38+
type: bronze
39+
message:
40+
logo_scale: 0.8
41+
42+
- id: unique_i_net
43+
name: ユニーク･<wbr>アイネット<wbr>株式会社
44+
logo: /img/sponsors/Unique_i_net.png
45+
link:
46+
type: bronze
47+
message:
48+
logo_scale: 1
49+
50+
- id: tcs
51+
name: 株式会社<wbr>テクノ・<wbr>カルチャー・<wbr>システム
52+
logo: /img/sponsors/TechnoCultureSystem.png
53+
link:
54+
type: bronze
55+
message:
56+
logo_scale: 0.8
57+
58+
- id: ma
59+
name: 一般社団法人<wbr>MA
60+
tool: ProtoPedia
61+
logo: /img/sponsors/ProtoPedia.png
62+
link:
63+
type: inkind
64+
message:
65+
logo_scale: 1
66+
67+
- id: nulab
68+
name: 株式会社<wbr>ヌーラボ
69+
tool: Backlog
70+
logo: /img/sponsors/Nulab.png
71+
link:
72+
type: inkind
73+
message:
74+
logo_scale: 0.8
75+
76+
- id: yasslab
77+
name: YassLab <wbr>株式会社
78+
tool: Doorkeeper
79+
logo: /img/sponsors/YassLab.png
80+
link:
81+
type: inkind
82+
message:
83+
logo_scale: 0.9

‎_includes/head.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<meta name="twitter:image" content="{{ site.url }}{{ page.thumbnail }}" />
2525
<meta property="og:image" content="{{ site.url }}{{ page.thumbnail }}" />
2626
{% else %}
27-
<meta name="twitter:image" content="{{ site.url }}/img/{{ site.year }}/ogp/ogp.jpg" />
28-
<meta property="og:image" content="{{ site.url }}/img/{{ site.year }}/ogp/ogp.jpg" />
27+
<meta name="twitter:image" content="{{ site.url }}/img/ogp/ogp.jpg" />
28+
<meta property="og:image" content="{{ site.url }}/img/ogp/ogp.jpg" />
2929
{% endif %}
3030

3131
{% if page.url != "/" %}

‎_includes/top/sections/outline.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@ <h2 id="outline" class="text-4xl text-center mb-8 pt-28 -mt-8">
99
min-[400px]:*:w-[45%] xl:*:w-[24%]">
1010
<div class="flex flex-col justify-between">
1111
<div class="flex flex-1 items-center justify-center mb-4">
12-
<img class="place-self-center align-middle" src="/img/top/outline/date.webp">
12+
<img class="place-self-center align-middle" src="/img/top/outline/date.webp" alt="2025 10.25 10:00-17:00">
1313
</div>
1414
<p>開催日時</p>
1515
</div>
1616

1717
<div class="flex flex-col justify-between">
1818
<div class="flex flex-1 items-center justify-center mb-4">
19-
<img class="place-self-center align-middle" src="/img/top/outline//kurume-kappa.webp">
19+
<img class="place-self-center align-middle" src="/img/top/outline/kurume-kappa.webp" alt="福岡県のイラスト">
2020
</div>
2121
<p class="whitespace-pre">福岡県久留米市<wbr />六ツ門町８−１</p>
2222
</div>
2323

2424
<div class="flex flex-col justify-between">
2525
<div class="flex flex-1 items-center justify-center mb-4">
26-
<img class="place-self-center align-middle" src="/img/top/outline//city-plaza.webp">
26+
<img class="place-self-center align-middle" src="/img/top/outline/city-plaza.webp" alt="ビルのイラスト">
2727
</div>
28-
<p class="whitespace-pre">久留米市<wbr />シティプラザ</p>
28+
<p class="whitespace-pre">久留米<wbr />シティプラザ</p>
2929
</div>
3030

3131
<div class="flex flex-col justify-between">
3232
<div class="flex flex-1 items-center justify-center mb-4">
33-
<img class="place-self-center align-middle" src="/img/top/outline//free.webp">
33+
<img class="place-self-center align-middle" src="/img/top/outline/free.webp" alt="FREE">
3434
</div>
3535
<p>参加無料</p>
3636
</div>

‎_includes/top/sections/session.html‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div id="session" class="max-w-3xl lg:max-w-[1800px] px-8 mx-auto pt-28 -mt-28 mb-16 flex flex-col lg:-mt-64 lg:flex-row items-center lg:items-start">
1+
{% comment %} <div id="session" class="max-w-3xl lg:max-w-[1800px] px-8 mx-auto pt-28 -mt-28 mb-16 flex flex-col lg:-mt-64 lg:flex-row items-center lg:items-start">
22
<div class="w-full lg:w-2/5 mb-8 lg:mt-68">
33
<div class="lg:max-w-sm lg:place-self-end lg:mr-[10%]">
44
<h2 class="text-4xl mb-4 text-center lg:text-left">
@@ -24,4 +24,23 @@ <h2 class="text-4xl mb-4 text-center lg:text-left">
2424
</li>
2525
{% endfor %}
2626
</ul>
27+
</div> {% endcomment %}
28+
29+
<div id="session" class="max-w-3xl lg:max-w-[1800px] px-8 mx-auto pt-28 -mt-28 mb-16 flex flex-col lg:-mt-64 lg:flex-row items-center lg:items-start">
30+
<div class="w-full lg:w-2/5 mb-8 lg:mt-55">
31+
<div class="lg:max-w-sm lg:place-self-end lg:mr-[10%]">
32+
<h2 class="text-4xl mb-4 text-center lg:text-left">
33+
セッション
34+
<span class="block mt-2 text-2xl">SESSION</span>
35+
</h2>
36+
<p class="leading-7 mb-10">
37+
さまざまな分野で活やくしている人たちの話を聞いて、考え方やアイデアを広げてみよう。<br />
38+
プログラミングや教育、地域での活動など、たくさんのヒントがつまった時間です。
39+
</p>
40+
</div>
41+
</div>
42+
43+
<div class="lg:mt-50 mt-0 flex item-center justify-center h-[150px] lg:h-[300px] w-full lg:w-3/5">
44+
<p class="size-full lg:text-7xl text-2xl text-gray-500 opacity-50 text-center flex items-center justify-center">Coming soon...</p>
45+
</div>
2746
</div>

‎_includes/top/sections/sponsor.html‎

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,67 @@
1+
{% assign gold_sponsors = site.data.sponsors | where: "type", "gold" %}
2+
{% assign silver_sponsors = site.data.sponsors | where: "type", "silver" %}
3+
{% assign bronze_sponsors = site.data.sponsors | where: "type", "bronze" %}
4+
{% assign inkind_sponsors = site.data.sponsors | where: "type", "inkind" %}
5+
{% assign individual_sponsors = site.data.sponsors | where: "type", "individual" %}
6+
17
<h2 class="text-4xl text-center">
28
スポンサー
39
<span class="block mt-5 text-2xl">SPONSOR</span>
410
</h2>
511

6-
<h3 class="text-2xl mt-22 mx-8 text-center mb-4">ゴールドスポンサー
12+
<h3 class="text-2xl mt-20 mx-8 text-center mb-4">ゴールドスポンサー
713
<span class="block text-base mt-1">GOLD SPONSOR</span>
814
</h3>
9-
10-
<div class="flex gap-x-8 px-8 max-w-3xl mx-auto">
11-
<img class="w-full max-w-3xl mx-auto mb-8" src="https://placehold.jp/1920x1080.png" alt="ゴールドスポンサーのロゴ">
15+
<div class="flex justify-center flex-wrap gap-x-8 px-8 max-w-3xl w-full mx-auto">
16+
{% for sponsor in gold_sponsors %}
17+
<div class="w-full flex flex-col mb-5">
18+
<div class="flex-grow w-full flex items-center justify-center">
19+
<img class="w-full mx-auto mb-3" src="{{ sponsor.logo }}" alt="{{ sponsor.name | strip_html }}のロゴ">
20+
</div>
21+
</div>
22+
{% endfor %}
1223
</div>
1324

14-
<h3 class="text-2xl mt-22 mx-8 text-center mb-4">シルバースポンサー
25+
<h3 class="text-2xl mt-20 mx-8 text-center mb-4">シルバースポンサー
1526
<span class="block text-base mt-1">SILVER SPONSOR</span>
1627
</h3>
1728

18-
<div class="flex gap-x-8 px-8 max-w-3xl mx-auto">
19-
<div><img class="w-full mx-auto mb-8" src="https://placehold.jp/1920x1080.png" alt="シルバースポンサーのロゴ">
20-
</div>
21-
<div><img class="w-full mx-auto mb-8" src="https://placehold.jp/1920x1080.png" alt="シルバースポンサーのロゴ">
29+
<div class="flex justify-center flex-wrap gap-x-8 px-8 max-w-3xl mx-auto">
30+
{% for sponsor in silver_sponsors %}
31+
<div class="max-w-[{{500 | times:sponsor.logo_scale | round}}px] w-full flex flex-col mb-5">
32+
<div class="flex-grow w-full flex items-center justify-center">
33+
<img class="w-full mx-auto mb-3" src="{{ sponsor.logo }}" alt="{{ sponsor.name | strip_html }}のロゴ">
34+
</div>
2235
</div>
36+
{% endfor %}
2337
</div>
2438

25-
<h3 class="text-2xl mt-22 mx-8 text-center mb-4">ブロンズスポンサー
39+
<h3 class="text-2xl mt-20 mx-8 text-center mb-4">ブロンズスポンサー
2640
<span class="block text-base mt-1">BRONZE SPONSOR</span>
2741
</h3>
2842

29-
<div class="flex gap-x-8 px-8 max-w-3xl mx-auto">
30-
<div><img class="w-full mx-auto mb-8" src="https://placehold.jp/1920x1080.png" alt="ブロンズスポンサーのロゴ">
31-
</div>
32-
<div><img class="w-full mx-auto mb-8" src="https://placehold.jp/1920x1080.png" alt="ブロンズスポンサーのロゴ">
43+
<div class="flex justify-center flex-wrap gap-x-8 px-8 max-w-3xl mx-auto">
44+
{% for sponsor in bronze_sponsors %}
45+
<div class="max-w-[{{300 | times:sponsor.logo_scale | round}}px] w-full flex flex-col mb-5">
46+
<div class="flex-grow w-full flex items-center justify-center">
47+
<img class="w-full mx-auto mb-3" src="{{ sponsor.logo }}" alt="{{ sponsor.name | strip_html }}のロゴ">
48+
</div>
3349
</div>
50+
{% endfor %}
3451
</div>
3552

36-
<h3 class="text-2xl mt-22 mx-8 text-center mb-4">インカインドスポンサー
53+
<h3 class="text-2xl mt-20 mx-8 text-center mb-4">インカインドスポンサー
3754
<span class="block text-base mt-1">IN-KIND SPONSOR</span>
3855
</h3>
3956

40-
<div class="flex gap-x-8 px-8 max-w-3xl mx-auto">
41-
<div><img class="w-full mx-auto mb-8" src="https://placehold.jp/1920x1080.png" alt="インカインドスポンサーのロゴ">
42-
</div>
43-
<div><img class="w-full mx-auto mb-8" src="https://placehold.jp/1920x1080.png" alt="インカインドスポンサーのロゴ">
57+
<div class="flex justify-center flex-wrap gap-x-8 gap-y-10 px-8 max-w-3xl mx-auto">
58+
{% for sponsor in inkind_sponsors %}
59+
<div class="max-w-[{{270 | times:sponsor.logo_scale | round}}px] w-full flex flex-col">
60+
<div class="flex-grow w-full flex items-center justify-center">
61+
<img class="w-full mx-auto mb-3" src="{{ sponsor.logo }}" alt="{{ sponsor.name + "("+ sponsor.tool +")" | strip_html }}のロゴ">
62+
</div>
63+
<p class="w-full text-center break-keep">{{ sponsor.tool }}<wbr>のご提供</p>
4464
</div>
65+
{% endfor %}
4566
</div>
67+

‎_includes/top/sections/workshop.html‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div
1+
{% comment %} <div
22
class="max-w-3xl lg:max-w-[1800px] px-8 mx-auto mt-20 lg:mt-48 mb-16 flex flex-col lg:flex-row-reverse items-center lg:items-start">
33
<div class="w-full lg:w-2/5 mb-8">
44
<div class="lg:max-w-sm lg:place-self-start lg:ml-[10%]">
@@ -25,4 +25,24 @@ <h2 class="text-4xl mb-4 text-center lg:text-left">
2525
</li>
2626
{% endfor %}
2727
</ul>
28+
</div> {% endcomment %}
29+
30+
<div
31+
class="max-w-3xl lg:max-w-[1800px] px-8 mx-auto mb-16 flex flex-col lg:flex-row-reverse items-center lg:items-start">
32+
<div class="w-full lg:w-2/5 mb-8 lg:mt-15">
33+
<div class="lg:max-w-sm lg:place-self-start lg:ml-[10%]">
34+
<h2 class="text-4xl mb-4 text-center lg:text-left">
35+
ワークショップ
36+
<span class="block mt-2 text-2xl">WORKSHOP</span>
37+
</h2>
38+
<p class="leading-7 mb-10">
39+
実際にプログラミングやものづくりを体験できるコーナーです。<br />
40+
気になっていたことにチャレンジしたり、新しい道具や考え方にふれるチャンス！
41+
</p>
42+
</div>
43+
</div>
44+
45+
<div class=" flex item-center justify-center h-[150px] lg:h-[300px] w-full lg:w-3/5">
46+
<p class="size-full lg:text-7xl text-2xl text-gray-500 opacity-50 text-center flex items-center justify-center">Coming soon...</p>
47+
</div>
2848
</div>

‎_layouts/post.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
layout: default
3+
---
4+
{% include navbar.html %}
5+
6+
<h2 class="max-w-4xl mx-auto text-4xl text-center mb-2 mt-30 px-8 xl:mt-15">
7+
{{ page.title }}
8+
<span class="block mt-5 text-2xl">{{ page.subtitle | upcase }}</span>
9+
</h2>
10+
11+
<div class="max-w-4xl mx-auto px-4 sm:px-8 post-content my-8">
12+
{{ content | markdownify }}
13+
</div>

0 commit comments

Comments
 (0)