Skip to content

Commit

Permalink
add goerlitz kyu5 - kyu3
Browse files Browse the repository at this point in the history
  • Loading branch information
nknapp committed Sep 2, 2024
1 parent 71b54d7 commit 079016f
Show file tree
Hide file tree
Showing 10 changed files with 211 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/core/model/Dojo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export type TranslatedText = {
} & Record<string, string>;

export interface Dojo {
draft?: boolean;
info: DojoInfo;
details: () => Promise<{ default: DojoDetails }>;
}
Expand All @@ -17,7 +18,7 @@ export interface ResolvedDojo {
export interface DojoInfo {
id: string;
name: string;
logo: string | URL;
logo?: string | URL;
}

export interface DojoDetails {
Expand Down
10 changes: 10 additions & 0 deletions src/data/dojos/goerlitz/details.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { kyu5 } from "./exams/kyu5";
import { kyu4 } from "./exams/kyu4";
import { kyu3 } from "./exams/kyu3";
import { kyu2 } from "./exams/kyu2";
import { kyu1 } from "./exams/kyu1";
import type { DojoDetails } from "$core/model/Dojo";

export default {
exams: [kyu5, kyu4, kyu3, kyu2, kyu1],
} satisfies DojoDetails;
11 changes: 11 additions & 0 deletions src/data/dojos/goerlitz/exams/kyu1.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import type { Exam } from "$core/model";

export const kyu1: Exam = {
id: "kyu1",
label: {
type: "wellknown",
key: "kyu1",
},

techniques: {},
};
11 changes: 11 additions & 0 deletions src/data/dojos/goerlitz/exams/kyu2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import type { Exam } from "$core/model";

export const kyu2: Exam = {
id: "kyu2",
label: {
type: "wellknown",
key: "kyu2",
},

techniques: {},
};
76 changes: 76 additions & 0 deletions src/data/dojos/goerlitz/exams/kyu3.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import type { Exam } from "$core/model";

export const kyu3: Exam = {
id: "kyu3",
label: {
type: "wellknown",
key: "kyu3",
},
techniques: {
"suwari waza": {
"gyuako hanmi katate dori": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
sankyo: { omote: {}, ura: {} },
},
"kata dori": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
sankyo: { omote: {}, ura: {} },
},
"shomen uchi": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
sankyo: { omote: {}, ura: {} },
"kote gaeshi": { "single-direction": {} },
},
},
"hanmi handachi waza": {
"gyuako hanmi katate dori": {
ikkyo: { omote: {}, ura: {} },
"shiho nage": { omote: {}, ura: {} },
},
},
"tachi waza": {
"ai hanmi katate dori": {
sankyo: { omote: {}, ura: {} },
},
"gyuako hanmi katate dori": {
"sokumen irimi nage": { "single-direction": {} },
},
"ryote dori": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
"uchi kaiten nage": { omote: {}, ura: {} },
},
"shomen uchi": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
sankyo: { omote: {}, ura: {} },
"shiho nage": { "single-direction": {} },
"kokyu nage": { "single-direction": {} },
"soto kaiten nage": { omote: {}, ura: {} },
},
"katate ryote dori": {
"shiho nage": { "single-direction": {} },
"ude kime nage": { "single-direction": {} },
"kokyu ho": { "single-direction": {} },
},
"yokomen uchi": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
"kote gaeshi": { "single-direction": {} },
"irimi nage": { "single-direction": {} },
},
"ushiro ryote dori": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
"shiho nage": { omote: {}, ura: {} },
"ude kime nage": { "single-direction": {} },
"kote gaeshi": { "single-direction": {} },
"kokyu nage": { "single-direction": {} },
"irimi nage": { "single-direction": {} },
},
},
},
};
51 changes: 51 additions & 0 deletions src/data/dojos/goerlitz/exams/kyu4.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import type { Exam } from "$core/model";

export const kyu4: Exam = {
id: "kyu4",
label: {
type: "wellknown",
key: "kyu4",
},

techniques: {
"suwari waza": {
"ai hanmi katate dori": {
ikkyo: { omote: {}, ura: {} },
"irimi nage": { "single-direction": {} },
},
"shomen uchi": {
ikkyo: { omote: {}, ura: {} },
"irimi nage": { "single-direction": {} },
},
},
"tachi waza": {
"ai hanmi katate dori": {
nikyo: { omote: {}, ura: {} },
"ude kime nage": { omote: {}, ura: {} },
},
"gyuako hanmi katate dori": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
"kote gaeshi": { "single-direction": {} },
"irimi nage": { "single-direction": {} },
"uchi kaiten nage": { omote: {}, ura: {} },
"ude kime nage": { omote: {}, ura: {} },
"soto kaiten nage": { omote: {}, ura: {} },
"kokyu nage": { "single-direction": {} },
},
"yokomen uchi": { "shiho nage": { omote: {}, ura: {} }, "ude kime nage": { omote: {}, ura: {} } },
"ushiro ryote dori": { sankyo: { omote: {}, ura: {} } },
"ryote dori": {
"tenchi nage": { omote: {}, ura: {} },
"shiho nage": { omote: {}, ura: {} },
},
"kata dori": {
ikkyo: { omote: {}, ura: {} },
nikyo: { omote: {}, ura: {} },
},
"shomen uchi": {
"kote gaeshi": { "single-direction": {} },
},
},
},
};
33 changes: 33 additions & 0 deletions src/data/dojos/goerlitz/exams/kyu5.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import type { Exam } from "$core/model";

export const kyu5: Exam = {
id: "kyu5",
label: {
type: "wellknown",
key: "kyu5",
},
techniques: {
"suwari waza": {
"ryote dori": {
"kokyu ho": { "single-direction": {} },
},
},
"tachi waza": {
"ai hanmi katate dori": {
ikkyo: { omote: {}, ura: {} },
"shiho nage": { omote: {}, ura: {} },
"kote gaeshi": { "single-direction": {} },
"irimi nage": { "single-direction": {} },
"ude kime nage": { omote: {}, ura: {} },
},
"katate ryote dori": {
"shiho nage": { omote: {}, ura: {} },
"tenchi nage": { omote: {}, ura: {} },
},
"shomen uchi": {
ikkyo: {},
"irimi nage": {},
},
},
},
};
10 changes: 10 additions & 0 deletions src/data/dojos/goerlitz/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import type { Dojo } from "$core/model/Dojo";

export default {
draft: true,
info: {
id: "goerlitz",
name: "Görlitz",
},
details: () => import("./details"),
} satisfies Dojo;
4 changes: 3 additions & 1 deletion src/data/dojos/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ import type { Dojo, DojoInfo, ResolvedDojo } from "$core/model/Dojo";

export async function listDojos(): Promise<DojoInfo[]> {
const dojos = import.meta.glob<Dojo>("./*/index.ts", { eager: true, import: "default" });
return Object.values(dojos).map((dojo) => dojo.info);
return Object.values(dojos)
.filter((dojo) => !dojo.draft)
.map((dojo) => dojo.info);
}

export async function loadDojo(id: string): Promise<ResolvedDojo> {
Expand Down
7 changes: 4 additions & 3 deletions src/pages/[language]/[dojoId]/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ const dojo = await loadDojo(id);
</Fragment>
<Header slot="header" />
<h1>{t("app.button.chooseExamTable.label")}</h1>
<p>{t("examChooser.exams-from")} <img class="inline h-[1.2em] me-2" alt="logo" src={dojo.info.logo} />{dojo.info.name}</p>
<p>{t("examChooser.source")}: <a href={dojo.details.sourceLink} ">{dojo.details.sourceLink}</a></p>
<p class="bg-info-lightest border-info border rounded p-5 print:p-1">{tx(dojo.details.additionalText)}</p>
<p>{t("examChooser.exams-from")} {dojo.info.logo && ( <img class="inline h-[1.2em] me-2" alt="logo" src={dojo.info.logo} />) }{dojo.info.name}</p>
{dojo.details.sourceLink && ( <p>{t("examChooser.source")}: <a href={dojo.details.sourceLink} ">{dojo.details.sourceLink}</a></p> )}
{dojo.details.additionalText && ( <p class="bg-info-lightest border-info border rounded p-5 print:p-1">{tx(dojo.details.additionalText)}</p> )}
<TechniqueChooser dojo={dojo} client:load />


Expand Down

0 comments on commit 079016f

Please sign in to comment.