From db019cf304fba5d12cfe12e138cd18fb57c2e724 Mon Sep 17 00:00:00 2001 From: Umeano Ibuchukwu Date: Sun, 6 Oct 2024 13:07:56 +0100 Subject: [PATCH 1/7] Added fonts --- src/styles/globals.css | 2 ++ tailwind.config.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/styles/globals.css b/src/styles/globals.css index 778c42d..7246475 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -1,3 +1,5 @@ +@import url("https://fonts.googleapis.com/css2?family=Inter:opsz@14..32&display=swap"); +@import url("https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/static/pretendard.min.css"); @tailwind base; @tailwind components; @tailwind utilities; diff --git a/tailwind.config.ts b/tailwind.config.ts index 9ee6e27..ee258d8 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -7,6 +7,8 @@ export default { extend: { fontFamily: { sans: ["var(--font-geist-sans)", ...fontFamily.sans], + inter: ["Inter", ...fontFamily.sans], + pretendard: ["Pretendard", ...fontFamily.sans], }, spacing: { page: "500px", From 515cce2aa5c1f1d2d038eb1d15a997f69954f93e Mon Sep 17 00:00:00 2001 From: Umeano Ibuchukwu Date: Sun, 6 Oct 2024 13:08:12 +0100 Subject: [PATCH 2/7] fix --- src/app/layout.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 3a8a114..908ad5f 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -15,12 +15,12 @@ export default function RootLayout({ children: React.ReactNode; }) { return ( - - -
+ + +
{children} -
-
+
+
From 358e8c21d460a6c2ed91cba5f09312ab3c3e9cae Mon Sep 17 00:00:00 2001 From: Umeano Ibuchukwu Date: Sun, 6 Oct 2024 13:08:52 +0100 Subject: [PATCH 3/7] form test page --- src/app/ibuchukwu/testpage2/page.tsx | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/app/ibuchukwu/testpage2/page.tsx diff --git a/src/app/ibuchukwu/testpage2/page.tsx b/src/app/ibuchukwu/testpage2/page.tsx new file mode 100644 index 0000000..25138f5 --- /dev/null +++ b/src/app/ibuchukwu/testpage2/page.tsx @@ -0,0 +1,7 @@ +import { TestPageTwoContainer } from "./container/TestPage2Container"; + +const TestPageTwo = () => { + return ; +}; + +export default TestPageTwo; From 717d13a96bde89b6d1ef75cb8126eac9553e4fd4 Mon Sep 17 00:00:00 2001 From: Umeano Ibuchukwu Date: Sun, 6 Oct 2024 13:09:10 +0100 Subject: [PATCH 4/7] modules --- .../FormTestPageContentModule.tsx | 22 ++++++ .../FormTestPage/FormTestPageFormModule.tsx | 68 +++++++++++++++++++ .../FormTestPage/FormTestPageHeaderModule.tsx | 9 +++ 3 files changed, 99 insertions(+) create mode 100644 src/components/Modules/FormTestPage/FormTestPageContentModule.tsx create mode 100644 src/components/Modules/FormTestPage/FormTestPageFormModule.tsx create mode 100644 src/components/Modules/FormTestPage/FormTestPageHeaderModule.tsx diff --git a/src/components/Modules/FormTestPage/FormTestPageContentModule.tsx b/src/components/Modules/FormTestPage/FormTestPageContentModule.tsx new file mode 100644 index 0000000..dabd297 --- /dev/null +++ b/src/components/Modules/FormTestPage/FormTestPageContentModule.tsx @@ -0,0 +1,22 @@ +import { Button, DatePicker, Form, Input, message, Select } from "antd"; +import { CameraFilled } from "@ant-design/icons"; +import TextArea from "antd/es/input/TextArea"; +import { FormTestPageFormModule } from "./FormTestPageFormModule"; + +type Props = { + setFormData: (data: any) => void; +}; + +export const FormTestPageContentModule = (props: Props) => { + return ( +
+
+ 10 FAO will be + deducted when voting is generated (Amount : 9 FAO) +
+
+ +
+
+ ); +}; diff --git a/src/components/Modules/FormTestPage/FormTestPageFormModule.tsx b/src/components/Modules/FormTestPage/FormTestPageFormModule.tsx new file mode 100644 index 0000000..dc9b294 --- /dev/null +++ b/src/components/Modules/FormTestPage/FormTestPageFormModule.tsx @@ -0,0 +1,68 @@ +import { Button, DatePicker, Form, Input, message, Select } from "antd"; +import { CameraFilled } from "@ant-design/icons"; +import TextArea from "antd/es/input/TextArea"; + +type Props = { + setFormData: (data: any) => void; +}; + +export const FormTestPageFormModule = (props: Props) => { + const [form] = Form.useForm(); + const onFinish = (values: any) => { + void message.info(JSON.stringify(values)); + }; + + return ( +
{ + props.setFormData((prevData: any) => + changedFields.reduce( + (acc, { name, value }) => ({ ...acc, [name[0]]: value }), + prevData + ) + ); + }} + labelCol={{ + style: { fontFamily: "Inter", fontWeight: 500 }, + }} + > + + + + + + + +
+ +
+ + +