diff --git a/components/vikings/SingleField/index.tsx b/components/vikings/SingleField/index.tsx
new file mode 100644
index 0000000..68b4090
--- /dev/null
+++ b/components/vikings/SingleField/index.tsx
@@ -0,0 +1,46 @@
+import styles from "../../../styles/SingleField.module.css";
+
+type Viking = {
+ fullName: string;
+ presenceOfChildren: boolean;
+ age: number;
+ hometown: string;
+ canFightWithSword: boolean;
+ canFightWithAxe: boolean;
+ canFightWithSpear: boolean;
+};
+
+function SingleField(props: { viking: Viking }): JSX.Element {
+ const {
+ fullName,
+ presenceOfChildren,
+ age,
+ hometown,
+ canFightWithSword,
+ canFightWithAxe,
+ canFightWithSpear,
+ } = props.viking;
+
+ return (
+
+ | {fullName} |
+ {presenceOfChildren ? "Yes" : "No"} |
+ {age} |
+ {hometown} |
+
+ {" "}
+ {canFightWithSword || canFightWithAxe || canFightWithSpear ? (
+ <>
+ {canFightWithSword && "Sword"}
+ {canFightWithAxe && "Axe"}
+ {canFightWithSpear && "Spear"}
+
+ ) : (
+ "None"
+ )}
+ |
+
+ );
+}
+
+export default SingleField;
diff --git a/lib/vikings.ts b/lib/vikings.ts
new file mode 100644
index 0000000..b2abbb3
--- /dev/null
+++ b/lib/vikings.ts
@@ -0,0 +1,62 @@
+type yaml = {
+ name: string;
+ weapon: string;
+ name_of_father: string;
+ has_home_in: string;
+ years_old: number;
+ number_of_children: number;
+};
+type json = {
+ fullName: string;
+ village: string;
+ age: number;
+ valkyrie: string;
+ hasSon: boolean;
+};
+type Viking = {
+ fullName: string;
+ presenceOfChildren: boolean;
+ age: number;
+ hometown: string;
+ canFightWithSword: boolean;
+ canFightWithAxe: boolean;
+ canFightWithSpear: boolean;
+};
+
+function transformData(data: yaml | json): Viking {
+ if ("name" in data) {
+ return {
+ fullName: data.name + " " + data.name_of_father + "son",
+ presenceOfChildren: data.number_of_children > 0,
+ age: data.years_old,
+ hometown: data.has_home_in,
+ canFightWithSword: data.weapon === "sword",
+ canFightWithAxe: data.weapon === "axe",
+ canFightWithSpear: data.weapon === "spear",
+ };
+ } else {
+ return {
+ fullName: data.fullName,
+ presenceOfChildren: data.hasSon,
+ age: data.age,
+ hometown: data.village,
+ canFightWithSword: false,
+ canFightWithAxe: false,
+ canFightWithSpear: false,
+ };
+ }
+}
+
+function getValidVikings(vikings: Viking[]): Viking[] {
+ return vikings.filter((viking) => viking.age > 25 && viking.age < 65);
+}
+
+export default function ValidateMergeYamlJsonData(
+ yaml: [yaml],
+ json: Array
+) {
+ const datayaml = yaml.map((data: yaml) => transformData(data));
+ const datajson = json.map((data: json) => transformData(data));
+
+ return getValidVikings([...datajson, ...datayaml]);
+}
diff --git a/next.config.js b/next.config.js
index ae88795..a3f4713 100644
--- a/next.config.js
+++ b/next.config.js
@@ -2,6 +2,16 @@
const nextConfig = {
reactStrictMode: true,
swcMinify: true,
-}
+};
-module.exports = nextConfig
+module.exports = {
+ nextConfig,
+ webpack: (config) => {
+ config.module.rules.push({
+ test: /\.yaml$/,
+ use: "js-yaml-loader",
+ });
+
+ return config;
+ },
+};
diff --git a/package.json b/package.json
index d1a5824..3739a10 100644
--- a/package.json
+++ b/package.json
@@ -14,9 +14,15 @@
"@types/react-dom": "18.0.9",
"eslint": "8.29.0",
"eslint-config-next": "13.0.6",
+ "js-yaml": "^4.1.0",
"next": "13.0.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "4.9.4"
+ },
+ "devDependencies": {
+ "@types/js-yaml": "^4.0.5",
+ "js-yaml-loader": "^1.2.2",
+ "yaml-loader": "^0.8.0"
}
}
diff --git a/pages/api/getVikings.tsx b/pages/api/getVikings.tsx
new file mode 100644
index 0000000..aa3f073
--- /dev/null
+++ b/pages/api/getVikings.tsx
@@ -0,0 +1,16 @@
+// Next.js API route support: https://nextjs.org/docs/api-routes/introduction
+import type { NextApiRequest, NextApiResponse } from "next";
+
+import ValidateMergeYamlJsonData from "../../lib/vikings";
+
+export default function getVikings(req: NextApiRequest, res: NextApiResponse) {
+ try {
+ res.status(200).json(ValidateMergeYamlJsonData);
+ } catch (err: unknown) {
+ if (typeof err === "string") {
+ res.status(500).json({ message: err });
+ } else {
+ res.status(500).json({ message: "An error occurred" });
+ }
+ }
+}
diff --git a/pages/index.tsx b/pages/index.tsx
index cdffa57..46f37b3 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -1,71 +1,20 @@
-import Head from 'next/head'
-import Image from 'next/image'
-import styles from '../styles/Home.module.css'
+import Head from "next/head";
+import styles from "../styles/Home.module.css";
+import Vikings from "./vikings";
+import getVikings from "./api/getVikings";
export default function Home() {
return (
-
Create Next App
+
Local Host
-
-
-
- Get started by editing{' '}
- pages/index.tsx
-
-
-
+
-
-
+
Załoga na najbliższą wyprawę do Anglii
+
W wyprawie wezmą tylko udział osoby między 25 a 65 rokiem życia
+
+
+
+ | Full Name |
+ Has children |
+ Age |
+ HomeTown |
+ Weapon Fighting skills |
+
+ {mapVikings}
+
+
+