From b3fd93e4315714719b4abce90ea920b6a1ceeeda Mon Sep 17 00:00:00 2001 From: random776 Date: Tue, 22 Aug 2023 15:39:41 +0900 Subject: [PATCH 1/6] add tutorials to kanji --- src/pages/kanji/index.tsx | 26 ++++++++ .../tutorial10/dialog/11_advanced_kanji_4.mdx | 62 +++++++++++++++++++ src/pages/kanji/tutorial/tutorial10/index.tsx | 9 +++ 3 files changed, 97 insertions(+) create mode 100644 src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx create mode 100644 src/pages/kanji/tutorial/tutorial10/index.tsx diff --git a/src/pages/kanji/index.tsx b/src/pages/kanji/index.tsx index c7bc8ddd..daea6f9a 100644 --- a/src/pages/kanji/index.tsx +++ b/src/pages/kanji/index.tsx @@ -3,9 +3,13 @@ import Tutorial from "@/components/Tutorial"; import Practice6 from "./tutorial/tutorial6"; import Practice7 from "./tutorial/tutorial7"; import Practice8 from "./tutorial/tutorial8"; +import Practice9 from "./tutorial/tutorial9"; +import Practice10 from "./tutorial/tutorial10"; import Tutorial1Dialog7 from "./tutorial/tutorial6/dialog/7_write_kanji.mdx"; import Tutorial1Dialog8 from "./tutorial/tutorial7/dialog/8_advanced_kanji_1.mdx"; import Tutorial1Dialog9 from "./tutorial/tutorial8/dialog/9_advanced_kanji_2.mdx"; +import Tutorial1Dialog10 from "./tutorial/tutorial9/dialog/10_advanced_kanji_3.mdx"; +import Tutorial1Dialog11 from "./tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx"; export default function Touch(): JSX.Element { return ( @@ -44,6 +48,28 @@ export default function Touch(): JSX.Element { hasHintHiraganaTable: false, hasHintAlphabetTable: false, }, + { + dialog: [ + { + title: "構造を意識して漢点字を学習しよう③", + content: , + }, + ], + content: , + hasHintHiraganaTable: false, + hasHintAlphabetTable: false, + }, + { + dialog: [ + { + title: "構造を意識して漢点字を学習しよう④", + content: , + }, + ], + content: , + hasHintHiraganaTable: false, + hasHintAlphabetTable: false, + }, ]} /> ); diff --git a/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx b/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx new file mode 100644 index 00000000..27281570 --- /dev/null +++ b/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx @@ -0,0 +1,62 @@ +import EdittableBraille from "../../../../../components/EdittableBraille"; +import PracticeTouch from "../../../../../components/practiceTouch"; + +### 漢点字を「部首」からみてみよう④ + +引き続き漢点字を部首の観点から見ていきましょう。 + +### ④ くさかんむり・しめすへん・ころもへん・たけかんむり + +くさかんむり + +| ⢓ | | | | | | +| -------- | -------- | -------- | -------- | -------- | -------- | +| 「花」⢓⠸ | 「草」⢛ | 「苦」⢓⠼ | 「荷」⢓⡊ | 「落」⢓⠾ | 「葉」⢓⡸ | +| 「薬」⢓⡌ | 「芽」⢓⣾ | 「芸」⢓⠞ | 「英」⢓⠜ | 「菜」⢓⡮ | 「若」⢓⢨ | +| 「蒸」⢓⡎ | 「蔵」⢓⢺ | | | | | + +| ⢥ | | +| -------- | -------- | +| 「茶」⢥⢎ | 「茨」⢥⣨ | + +| その他 | +| -------- | +| 「著」⡵⢚ | + +しめすへん + +| ⡗ | | | | | | +| -------- | -------- | -------- | -------- | -------- | -------- | --- | +| 「社」⡗⡺ | 「礼」⡗⡼ | 「福」⡗⣚ | 「神」⡗⢮ | 「祝」⡗⠬ | 「祖」⡗⢼ | | + +ころもへん + +| ⡗ | | +| -------- | -------- | +| 「複」⡗⢺ | 「補」⡗⣜ | + +たけかんむり + +| ⡧ | | | | | | +| -------- | -------- | -------- | -------- | -------- | -------- | +| 「答」⡧⣬ | 「第」⡧⣘ | 「等」⡧⢮ | 「筆」⡧⣚ | 「箱」⡧⣾ | 「笑」⡧⢞ | +| 「節」⡧⢪ | 「管」⡧⠪ | 「築」⡧⣈ | 「策」⡧⢨ | 「筋」⡧⢌ | 「簡」⡧⣌ | + +| ⣷ | | +| -------- | -------- | +| 「算」⣷⡼ | 「笛」⡣⡮ | + +
+ +
+ diff --git a/src/pages/kanji/tutorial/tutorial10/index.tsx b/src/pages/kanji/tutorial/tutorial10/index.tsx new file mode 100644 index 00000000..2fe89520 --- /dev/null +++ b/src/pages/kanji/tutorial/tutorial10/index.tsx @@ -0,0 +1,9 @@ +import TouchMain from "@/components/TouchMain"; + +export const advancedkanjiQuestions = ["福神づけ", "筆箱", "落葉"]; // 濁音、半濁音が含まれる言葉 + +export default function Practice4(): JSX.Element { + return ( + + ); +} From 4761e4df5b1bdeba448a8cf2ac96e275be5e484c Mon Sep 17 00:00:00 2001 From: random776 Date: Tue, 22 Aug 2023 15:47:03 +0900 Subject: [PATCH 2/6] fix nests of the dialogs --- .../kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx | 2 +- .../kanji/tutorial/tutorial7/dialog/8_advanced_kanji_1.mdx | 2 +- .../kanji/tutorial/tutorial8/dialog/9_advanced_kanji_2.mdx | 2 +- .../kanji/tutorial/tutorial9/dialog/10_advanced_kanji_3.mdx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx b/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx index 27281570..88f721d0 100644 --- a/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx +++ b/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx @@ -5,7 +5,7 @@ import PracticeTouch from "../../../../../components/practiceTouch"; 引き続き漢点字を部首の観点から見ていきましょう。 -### ④ くさかんむり・しめすへん・ころもへん・たけかんむり +#### ④ くさかんむり・しめすへん・ころもへん・たけかんむり くさかんむり diff --git a/src/pages/kanji/tutorial/tutorial7/dialog/8_advanced_kanji_1.mdx b/src/pages/kanji/tutorial/tutorial7/dialog/8_advanced_kanji_1.mdx index e9b266e3..cbfa13ff 100644 --- a/src/pages/kanji/tutorial/tutorial7/dialog/8_advanced_kanji_1.mdx +++ b/src/pages/kanji/tutorial/tutorial7/dialog/8_advanced_kanji_1.mdx @@ -21,7 +21,7 @@ import PracticeTouch from "../../../../../components/PracticeTouch"; となるからです（ただし例外が多い）。 -### ① にんべん・さんずい・きへん +#### ① にんべん・さんずい・きへん にんべん diff --git a/src/pages/kanji/tutorial/tutorial8/dialog/9_advanced_kanji_2.mdx b/src/pages/kanji/tutorial/tutorial8/dialog/9_advanced_kanji_2.mdx index 57abb68b..4a691ce4 100644 --- a/src/pages/kanji/tutorial/tutorial8/dialog/9_advanced_kanji_2.mdx +++ b/src/pages/kanji/tutorial/tutorial8/dialog/9_advanced_kanji_2.mdx @@ -5,7 +5,7 @@ import PracticeTouch from "../../../../../components/PracticeTouch"; 引き続き漢点字を部首の観点から見ていきましょう。 -### ② いとへん・ごんべん・うかんむり・あなかんむり +#### ② いとへん・ごんべん・うかんむり・あなかんむり いとへん diff --git a/src/pages/kanji/tutorial/tutorial9/dialog/10_advanced_kanji_3.mdx b/src/pages/kanji/tutorial/tutorial9/dialog/10_advanced_kanji_3.mdx index ad4e6968..32d23c1a 100644 --- a/src/pages/kanji/tutorial/tutorial9/dialog/10_advanced_kanji_3.mdx +++ b/src/pages/kanji/tutorial/tutorial9/dialog/10_advanced_kanji_3.mdx @@ -5,7 +5,7 @@ import PracticeTouch from "../../../../../components/PracticeTouch"; 引き続き漢点字を部首の観点から見ていきましょう。 -### ③ てへん・こころ・しんにょう +#### ③ てへん・こころ・しんにょう いとへん From 638cb1b93fb5a2604937a52a28dffb4c11bd5f6e Mon Sep 17 00:00:00 2001 From: random776 Date: Tue, 22 Aug 2023 16:19:37 +0900 Subject: [PATCH 3/6] fix small changes --- .../kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx b/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx index 88f721d0..df5bd3a2 100644 --- a/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx +++ b/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx @@ -42,7 +42,7 @@ import PracticeTouch from "../../../../../components/practiceTouch"; | 「答」⡧⣬ | 「第」⡧⣘ | 「等」⡧⢮ | 「筆」⡧⣚ | 「箱」⡧⣾ | 「笑」⡧⢞ | | 「節」⡧⢪ | 「管」⡧⠪ | 「築」⡧⣈ | 「策」⡧⢨ | 「筋」⡧⢌ | 「簡」⡧⣌ | -| ⣷ | | +| その他 | | | -------- | -------- | | 「算」⣷⡼ | 「笛」⡣⡮ | From 99c74ecc87cabb237f0454b1c79095f981453a2e Mon Sep 17 00:00:00 2001 From: chvmvd <104971044+chvmvd@users.noreply.github.com> Date: Sat, 26 Aug 2023 23:59:25 +0900 Subject: [PATCH 4/6] Move `tutorial10` to `learn` directory --- .../kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx | 0 {src => learn/src}/pages/kanji/tutorial/tutorial10/index.tsx | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {src => learn/src}/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx (100%) rename {src => learn/src}/pages/kanji/tutorial/tutorial10/index.tsx (100%) diff --git a/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx b/learn/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx similarity index 100% rename from src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx rename to learn/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx diff --git a/src/pages/kanji/tutorial/tutorial10/index.tsx b/learn/src/pages/kanji/tutorial/tutorial10/index.tsx similarity index 100% rename from src/pages/kanji/tutorial/tutorial10/index.tsx rename to learn/src/pages/kanji/tutorial/tutorial10/index.tsx From 6cb6856ad962dbc6298b0c2e026ae7375a7d738e Mon Sep 17 00:00:00 2001 From: random776 Date: Sun, 27 Aug 2023 12:32:03 +0900 Subject: [PATCH 5/6] replace komoji with oomoji --- .../kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/learn/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx b/learn/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx index df5bd3a2..87c000db 100644 --- a/learn/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx +++ b/learn/src/pages/kanji/tutorial/tutorial10/dialog/11_advanced_kanji_4.mdx @@ -1,5 +1,5 @@ import EdittableBraille from "../../../../../components/EdittableBraille"; -import PracticeTouch from "../../../../../components/practiceTouch"; +import PracticeTouch from "../../../../../components/PracticeTouch"; ### 漢点字を「部首」からみてみよう④ From e8f8b57a606a89a0b3083d5e099a9233067b6733 Mon Sep 17 00:00:00 2001 From: random776 <125573400+random776@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:14:38 +0900 Subject: [PATCH 6/6] modified: .vscode/settings.json --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 245993ca..292e0ecb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { "editor.defaultFormatter": "esbenp.prettier-vscode", - "typescript.tsdk": "learn/node_modules/typescript/lib" + "typescript.tsdk": "node_modules/typescript/lib" }