Skip to content

Commit

Permalink
Migration to Eleventy marks the version 0.14.0 while still not all fe…
Browse files Browse the repository at this point in the history
…atures there...
  • Loading branch information
paazmaya committed May 23, 2023
1 parent b2de8c0 commit 7d58a1b
Show file tree
Hide file tree
Showing 73 changed files with 2,844 additions and 342 deletions.
28 changes: 28 additions & 0 deletions .eleventy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/** @param {import("@11ty/eleventy").UserConfig} eleventyConfig */
module.exports = function(eleventyConfig) {

eleventyConfig.addPassthroughCopy({"src/img": "img"});
eleventyConfig.addPassthroughCopy({"src/icons": "icons"});
eleventyConfig.addPassthroughCopy({"assets": "/"});

const facebook = require("./lib/facebook-meta");
eleventyConfig.addGlobalData("facebook", facebook());

const flickrImageList = require("./lib/flickr-image-list");
eleventyConfig.addGlobalData("prefetch", flickrImageList());

return {
dir: {

input: "content",
includes: "../views", // relative to dir.input

output: "dist"
},
data: {
layout: "index.html",
},
markdownTemplateEngine: "njk",
htmlTemplateEngine: "njk"
}
};
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
coverage
node_modules
npm-debug.log
public_html/**/*.html
public_html/*.xml
public_html/css/naginata.css
dist
assets/*.min.*
source/favicons.jade
.DS_store
bogu-*.png
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
59 changes: 59 additions & 0 deletions content/_data/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"languages": {
"fi": {
"enabled": true,
"name": "Suomi"
},
"en": {
"enabled": true,
"name": "English"
},
"ja": {
"enabled": true,
"name": "日本語"
}
},
"titlesuffix": {
"fi": "Naginata Suomessa",
"en": "Naginata Finland",
"ja": "なぎなた フィンランド"
},
"footer": {
"fi": [
{
"url": "https://paazmaya.fi",
"alt": "paazmaya.fi",
"text": "© Jukka Paasonen"
},
{
"url": "https://github.com/paazmaya/naginata.fi",
"alt": "Muokkaa sivuja GitHubissa",
"text": "Muokkaa GitHubissa"
}
],
"en": [
{
"url": "https://paazmaya.fi",
"alt": "paazmaya.fi",
"text": "© Jukka Paasonen"
},
{
"url": "https://github.com/paazmaya/naginata.fi",
"alt": "Contribute to the content and the code at GitHub",
"text": "Contribute at GitHub"
}
],
"ja": [
{
"url": "https://paazmaya.fi",
"alt": "paazmaya.fi",
"text": "© パーソネン ユッカ"
},
{
"url": "https://github.com/paazmaya/naginata.fi",
"alt": "GitHubで貢献する",
"text": "GitHubで貢献する"
}
]
}
}
8 changes: 8 additions & 0 deletions content/en/contact.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
layout: index.njk
date: '2000-01-04'
url: "/en/contact"
header: Contact Information
title: Contact
description: Get connected to the people who are in anyway related to the history and contents of this web site and to Naginata in Finland
---
Atarashii Naginata in Finland is organised under the [Finnish Kendo
Association (FKA)](http://fka.fi/ "FKA - Finnish Kendo Association") which
is a member of the European Naginata Federation. The head instructor is
Expand Down
1 change: 1 addition & 0 deletions content/en/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"lang": "en"}
6 changes: 6 additions & 0 deletions content/en/grading-rules.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
---
layout: index.njk
eleventyExcludeFromCollections: true
title: Grading Rules
---

# Grading Rules

> Finnish Kendo Association - Atarashii Naginata
Expand Down
8 changes: 8 additions & 0 deletions content/en/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
layout: index.njk
date: '2000-01-01'
url: "/en"
header: News
title: News
description: Latest events and news in the area of Finnish Naginata, with International coverage
---
## Upcoming events

Currently there are no upcoming events in Finland related to Atarashii Naginata.
Expand Down
9 changes: 9 additions & 0 deletions content/en/koryu.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
---
layout: index.njk
date: '2000-01-03'
url: "/en/koryu"
header: Jikishinkageryu Naginatajutsu
title: Koryu
description: Literally koryu means old school. While related to naginata, it stands for the classical old schools which were using the weapon in their system.
---

Jikishinkageryū Naginatajutsu is one of the biggest styles that are still being
practised,in which the naginata is the main weapon. The style was founded in Japan
about 500 years ago, in the Kanto area, in a place called Kashima. From the same
Expand Down
9 changes: 9 additions & 0 deletions content/en/naginata.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
---
layout: index.njk
date: '2000-01-02'
url: "/en/naginata"
header: Atarashii Naginata
title: Naginata
description: The modern Japanese martial art Atarashii Naginata is about using a long weapon
---

Atarashii Naginata is largely based on the two biggest old classical
naginata styles, namely [Tendōryū](http://shingetsukai.com/ "天道流薙刀術 眞月会") and
[Jikishinkageryū](http://www.jikishin-naginata.jp/ "直心影流薙刀術 秀徳会"), which are still
Expand Down
1 change: 1 addition & 0 deletions content/fi/fi.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"lang": "fi"}
5 changes: 5 additions & 0 deletions content/fi/graduointisaannot.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
---
layout: index.njk
eleventyExcludeFromCollections: true
title: Graduointisäännöt
---
# Graduointisäännöt

> Suomen Kendoseurojen Keskusliitto ry - Atarashii Naginata
Expand Down
9 changes: 8 additions & 1 deletion content/fi/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@

---
layout: index.njk
date: '2000-01-01'
url: "/fi"
header: Ajankohtaista
title: Ajankohtaista
description: Ajankohtaista ja historiallista tietoa Naginata-aseella harjoitteluun liittyen
---
## Tulevia tapahtumia

Tällä hetkellä ei ole suunniteltuja tapahtumia Suomessa, liittyen Atarashii Naginataan.
Expand Down
8 changes: 8 additions & 0 deletions content/fi/koryu.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
layout: index.njk
date: '2000-01-03'
url: "/fi/koryu"
header: Jikishinkageryu Naginatajutsu
title: Koryu
description: Kirjaimellisesti käännettynä koryu tarkoittaa vanhaa koulua. Naginatan osalta koryu viittaa niihin vanhoihin kouluihin ja tyyleihin, joissa aseella harjoiteltiin.
---
Jikishinkageryū Naginatajutsu on yksi suurimmista edelleen harjoiteltavista
kouluista tai tyyleistä, jonka pääaseena on naginata. Tyyli perustettiin
Japanissa noin 500 vuotta sitten, Kanto:n alueella Kashima:ssa, josta
Expand Down
8 changes: 8 additions & 0 deletions content/fi/naginata.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
layout: index.njk
date: '2000-01-02'
url: "/fi/naginata"
header: Atarashii Naginata
title: Naginata
description: Uuden ja yhdenmukaisen naginatan harjoittelu perustuu kahden naginatan kohtaamiseen, joko suojavarusteiden kanssa tai ilman
---
Atarashii Naginata rakentuu pitkälti kahden vanhan Japanin suurimman
naginatatyylin pohjalta. Nämä tyylit olivat [Tendōryū](http://shingetsukai.com/ "天道流薙刀術 眞月会")
ja [Jikishinkageryū](http://www.jikishin-naginata.jp/ "直心影流薙刀術 秀徳会"),
Expand Down
8 changes: 8 additions & 0 deletions content/fi/yhteystiedot.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
layout: index.njk
date: '2000-01-04'
url: "/fi/yhteystiedot"
header: Yhteystiedot
title: Yhteystiedot
description: Yhteystiedot seuroihin ja ihmisiin jotka tämän sivuston luontiin ovat vaikuttaneet, jakamalla tietoaan, opetuksellaan tai muulla tapaa
---
Suomessa Atarashii Naginataa hallinnoi [Suomen Kendoseurojen Keskusliitto
ry](http://fka.fi/ "FKA - Suomen Kendoseurojen Keskusliitto ry"), joka on
jäsenenä Euroopan Naginataliitossa. Lajin pääohjaajana toimii
Expand Down
8 changes: 8 additions & 0 deletions content/ja/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
layout: index.njk
date: '2000-01-01'
url: "/ja"
header: ニュ-ス
title: ニュ-ス
description: フィンランドにおけるなぎなたの最新イベント及びニュース
---

## 今後のイベント

Expand Down
1 change: 1 addition & 0 deletions content/ja/ja.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"lang": "ja"}
9 changes: 9 additions & 0 deletions content/ja/koryu.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
---
layout: index.njk
date: '2000-01-03'
url: "/ja/koryu"
header: 直心影流薙刀術
title: 古流
description: 文字通り古流とは古い流派のことである。なぎなたと関連しており、???
---

直心影流薙刀術は、現在まで継承されている日本の伝統的文化遺産である古流薙刀の一流派である。

当流派は今からおよそ五百年前、日本の関東に位置する鹿島の地で創始したのに始まる。
Expand Down
8 changes: 8 additions & 0 deletions content/ja/naginata.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
---
layout: index.njk
date: '2000-01-02'
url: "/ja/naginata"
header: 新しいなぎなた
title: なぎなた
description: 現代日本武道である新しいなぎなたは長い武器を使用する
---
日本の伝統文化である "新しいなぎなた"は、二大流派である[天道流](http://shingetsukai.com/ "天道流薙刀術眞月会")
[直心影流](http://www.jikishin-naginata.jp/ "直心影流薙刀術秀徳会")の優れたところを集めて
創出されました。
Expand Down
5 changes: 5 additions & 0 deletions content/ja/shinsakijun.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
---
layout: index.njk
eleventyExcludeFromCollections: true
title: 審査基準
---
# 審査基準

> 新しいなぎなた ・ フィンランド剣道連盟
Expand Down
9 changes: 9 additions & 0 deletions content/ja/toiawase.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
---
layout: index.njk
date: '2000-01-04'
url: "/ja/toiawase"
header: 問い合わせ
title: 問い合わせ
description: 当該ウェブサイト運営管理者への問い合わせ
---

フィンランドの新しいなぎなたは、ヨーロッパなぎなた連盟のメンバーであるフィンランド剣道連盟(FKA)の下、ヘッドインストラクターはパーソネン・ユッカ(二段)で構成されている。

直心影流薙刀術では、すべてのメンバーが日本の秀徳会に属している(登録協会)。
Expand Down
Loading

0 comments on commit 7d58a1b

Please sign in to comment.