From 69303dad3d35e816fcdf5fced7b947adc99b1f7e Mon Sep 17 00:00:00 2001 From: arkorede Date: Sun, 22 Sep 2024 20:05:07 +0100 Subject: [PATCH 1/5] feat: add header --- public/svgs/index.ts | 1 + public/svgs/vote.svg | 4 +++ .../home/container/IsraelHomeContainer.tsx | 35 +++++++++++++++++++ src/app/israel/home/page.tsx | 8 +++++ .../sample/empty/container/EmptyContainer.tsx | 1 + .../IsraelHeaderAtom/IsraelHeaderAtom.tsx | 34 ++++++++++++++++++ .../IsraelHome/IsraelHomeContentModule.tsx | 7 ++++ .../IsraelHome/IsraelHomeFooterModule.tsx | 0 .../IsraelHome/IsraelHomeHeaderModule.tsx | 9 +++++ .../Templates/Home/IsraelHomeTemplate.tsx | 31 ++++++++++++++++ 10 files changed, 130 insertions(+) create mode 100644 public/svgs/vote.svg create mode 100644 src/app/israel/home/container/IsraelHomeContainer.tsx create mode 100644 src/app/israel/home/page.tsx create mode 100644 src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx create mode 100644 src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx create mode 100644 src/components/Modules/IsraelHome/IsraelHomeFooterModule.tsx create mode 100644 src/components/Modules/IsraelHome/IsraelHomeHeaderModule.tsx create mode 100644 src/components/Templates/Home/IsraelHomeTemplate.tsx diff --git a/public/svgs/index.ts b/public/svgs/index.ts index 430202e..2d40754 100644 --- a/public/svgs/index.ts +++ b/public/svgs/index.ts @@ -3,3 +3,4 @@ export { default as copy } from "./copy.svg"; export { default as control } from "./control.svg"; export { default as arrowLeft } from "./arrowLeft.svg"; export { default as outLink } from "./outLink.svg"; +export { default as vote } from "./vote.svg"; diff --git a/public/svgs/vote.svg b/public/svgs/vote.svg new file mode 100644 index 0000000..627b637 --- /dev/null +++ b/public/svgs/vote.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/app/israel/home/container/IsraelHomeContainer.tsx b/src/app/israel/home/container/IsraelHomeContainer.tsx new file mode 100644 index 0000000..7d0a554 --- /dev/null +++ b/src/app/israel/home/container/IsraelHomeContainer.tsx @@ -0,0 +1,35 @@ +import React, { useState } from "react"; +import { message } from "antd"; +import { useRouter } from "next/navigation"; +import { IsraelHomeTemplate } from "~/components/Templates/Home/IsraelHomeTemplate"; + +export const IsraelHomeContainer = () => { + const [showCustomModal, setShowCustomModal] = useState(false); + const router = useRouter(); + + const headerLeftIconClicked = () => { + void router.push("israel/vote"); + }; + + const headerRightIconClicked = () => { + void message.info("can't go Settings"); + }; + + const homeTemplateProps: React.ComponentProps = { + homeHeaderModuleProps: { + headerProps: { + title: "Proxima OS", + onClickLeftIcon: headerLeftIconClicked, + onClickRightIcon: headerRightIconClicked, + }, + }, + homeContentModuleProps: { onClick: setShowCustomModal }, + homeFooterModuleProps: { title: "HomeFooterModule" }, + transactionModalProps: { + isModalOpen: showCustomModal, + setIsModalOpen: setShowCustomModal, + }, + }; + + return ; +}; diff --git a/src/app/israel/home/page.tsx b/src/app/israel/home/page.tsx new file mode 100644 index 0000000..1116e87 --- /dev/null +++ b/src/app/israel/home/page.tsx @@ -0,0 +1,8 @@ +"use client"; +import { IsraelHomeContainer } from "./container/IsraelHomeContainer"; + +const Home = () => { + return ; +}; + +export default Home; diff --git a/src/app/sample/empty/container/EmptyContainer.tsx b/src/app/sample/empty/container/EmptyContainer.tsx index 53ee966..ba612be 100644 --- a/src/app/sample/empty/container/EmptyContainer.tsx +++ b/src/app/sample/empty/container/EmptyContainer.tsx @@ -1,6 +1,7 @@ "use client"; import { useRouter } from "next/navigation"; import { EmptyTemplate } from "~/components/Templates/Empty/EmptyTemplate"; +import React from "react"; export const EmptyContainer = () => { const router = useRouter(); diff --git a/src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx b/src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx new file mode 100644 index 0000000..ddd926c --- /dev/null +++ b/src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx @@ -0,0 +1,34 @@ +import { SettingOutlined } from "@ant-design/icons"; +import SVGAtom from "../SVGAtom/SVGAtom"; + +type Props = { + title: string; + onClickLeftIcon?: () => void; + onClickRightIcon?: () => void; +}; + +export const IsraelHeaderAtom = (props: Props) => { + return ( +
+ {props.onClickLeftIcon && ( +
+ +
+ )} + +
{props.title}
+ + {props.onClickRightIcon && ( +
console.log("Antd icon clicked")} + > + +
+ )} +
+ ); +}; diff --git a/src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx b/src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx new file mode 100644 index 0000000..32f835a --- /dev/null +++ b/src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx @@ -0,0 +1,7 @@ +import React from "react"; + +const IsraelHomeContentModule = () => { + return
IsraelHomeContentModule
; +}; + +export default IsraelHomeContentModule; diff --git a/src/components/Modules/IsraelHome/IsraelHomeFooterModule.tsx b/src/components/Modules/IsraelHome/IsraelHomeFooterModule.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/components/Modules/IsraelHome/IsraelHomeHeaderModule.tsx b/src/components/Modules/IsraelHome/IsraelHomeHeaderModule.tsx new file mode 100644 index 0000000..a7a1afa --- /dev/null +++ b/src/components/Modules/IsraelHome/IsraelHomeHeaderModule.tsx @@ -0,0 +1,9 @@ +import { IsraelHeaderAtom } from "~/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom"; + +type Props = { + headerProps: React.ComponentProps; +}; + +export const IsraelHomeHeaderModule = (props: Props) => { + return ; +}; diff --git a/src/components/Templates/Home/IsraelHomeTemplate.tsx b/src/components/Templates/Home/IsraelHomeTemplate.tsx new file mode 100644 index 0000000..3f2bd8a --- /dev/null +++ b/src/components/Templates/Home/IsraelHomeTemplate.tsx @@ -0,0 +1,31 @@ +import { IsraelHomeHeaderModule } from "~/components/Modules/IsraelHome/IsraelHomeHeaderModule"; +// import { IsraelHomeContentModule } from "~/components/Modules/IsraelHome/IsraelHomeContentModule"; +// import { IsraelHomeFooterModule } from "~/components/Modules/IsraelHome/IsraelHomeFooterModule"; +import { Layout } from "antd"; +import { Content, Footer, Header } from "antd/es/layout/layout"; +import { HomeDescriptionModule } from "~/components/Modules/HomeDescription/HomeDescriptionModule"; + +type Props = { + homeHeaderModuleProps: React.ComponentProps; + // homeContentModuleProps: React.ComponentProps; + // homeFooterModuleProps: React.ComponentProps; +}; + +export const IsraelHomeTemplate = (props: Props) => { + return ( + +
+ +
+ + {/* + + + */} + + {/*
+ +
*/} + + ); +}; From 26019ae808884ab56b272a8f2ca0a8da67e310b5 Mon Sep 17 00:00:00 2001 From: arkorede Date: Mon, 23 Sep 2024 14:07:46 +0100 Subject: [PATCH 2/5] feat: add content module --- public/pngs/eth.png | Bin 0 -> 5359 bytes public/pngs/nvir.png | Bin 0 -> 20589 bytes public/svgs/badge.svg | 4 ++ public/svgs/index.ts | 2 + public/svgs/logo.svg | 17 +++++ .../home/container/IsraelHomeContainer.tsx | 0 src/app/israel/{ => testPage1}/home/page.tsx | 0 src/app/layout.tsx | 10 +-- .../IsraelHeaderAtom/IsraelHeaderAtom.tsx | 2 +- .../Components/MessageList/MessageList.tsx | 56 ++++++++++++++++ .../Modules/Home/HomeContentModule.tsx | 3 +- .../IsraelHome/IsraelHomeContentModule.tsx | 61 ++++++++++++++++-- .../Templates/Home/HomeTemplate.tsx | 2 + .../Templates/Home/IsraelHomeTemplate.tsx | 9 ++- tsconfig.json | 24 +++++-- 15 files changed, 167 insertions(+), 23 deletions(-) create mode 100644 public/pngs/eth.png create mode 100644 public/pngs/nvir.png create mode 100644 public/svgs/badge.svg create mode 100644 public/svgs/logo.svg rename src/app/israel/{ => testPage1}/home/container/IsraelHomeContainer.tsx (100%) rename src/app/israel/{ => testPage1}/home/page.tsx (100%) create mode 100644 src/components/Components/MessageList/MessageList.tsx diff --git a/public/pngs/eth.png b/public/pngs/eth.png new file mode 100644 index 0000000000000000000000000000000000000000..cc6cad102d028792d32b56623b5f5141fef2dd4e GIT binary patch literal 5359 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 + + + diff --git a/public/svgs/index.ts b/public/svgs/index.ts index 2d40754..d66b4e0 100644 --- a/public/svgs/index.ts +++ b/public/svgs/index.ts @@ -4,3 +4,5 @@ export { default as control } from "./control.svg"; export { default as arrowLeft } from "./arrowLeft.svg"; export { default as outLink } from "./outLink.svg"; export { default as vote } from "./vote.svg"; +export { default as logo } from "./logo.svg"; +export { default as badge } from "./badge.svg"; diff --git a/public/svgs/logo.svg b/public/svgs/logo.svg new file mode 100644 index 0000000..778ad13 --- /dev/null +++ b/public/svgs/logo.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/app/israel/home/container/IsraelHomeContainer.tsx b/src/app/israel/testPage1/home/container/IsraelHomeContainer.tsx similarity index 100% rename from src/app/israel/home/container/IsraelHomeContainer.tsx rename to src/app/israel/testPage1/home/container/IsraelHomeContainer.tsx diff --git a/src/app/israel/home/page.tsx b/src/app/israel/testPage1/home/page.tsx similarity index 100% rename from src/app/israel/home/page.tsx rename to src/app/israel/testPage1/home/page.tsx diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 3a8a114..6d9bd32 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -15,12 +15,12 @@ export default function RootLayout({ children: React.ReactNode; }) { return ( - - -
+ + +
{children} -
-
+
+
diff --git a/src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx b/src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx index ddd926c..d7bd7ce 100644 --- a/src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx +++ b/src/components/Atoms/IsraelHeaderAtom/IsraelHeaderAtom.tsx @@ -19,7 +19,7 @@ export const IsraelHeaderAtom = (props: Props) => {
)} -
{props.title}
+
{props.title}
{props.onClickRightIcon && (
{ + return ( +
    + {props.messages.map((message) => ( +
  • +
    + {message.title} +
    +

    + {message.title} +

    +

    + {message.content} +

    +
    +

    + {message.timestamp} +

    + {/* {message.isViewed && ( + + )} */} +
    +
    • + ))} +
+ ); +}; diff --git a/src/components/Modules/Home/HomeContentModule.tsx b/src/components/Modules/Home/HomeContentModule.tsx index c6e8de5..0bd33d6 100644 --- a/src/components/Modules/Home/HomeContentModule.tsx +++ b/src/components/Modules/Home/HomeContentModule.tsx @@ -5,8 +5,9 @@ type Props = { }; export const HomeContentModule = (props: Props) => { + console.log(props); return ( -
+
); diff --git a/src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx b/src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx index 32f835a..1fb067c 100644 --- a/src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx +++ b/src/components/Modules/IsraelHome/IsraelHomeContentModule.tsx @@ -1,7 +1,60 @@ -import React from "react"; +import SVGAtom from "../../Atoms/SVGAtom/SVGAtom"; +import { MessageList } from "~/components/Components/MessageList/MessageList"; +import * as svgs from "public/svgs"; +import eth from "./../../../../public/pngs/eth.png"; +import nvir from "./../../../../public/pngs/nvir.png"; -const IsraelHomeContentModule = () => { - return
IsraelHomeContentModule
; +// type Message = { +// id: string; +// image?: keyof typeof svgs; +// title: string; +// content: string; +// timestamp: string; +// }; + +// type Props = { +// messages: Message[]; +// }; + +type Props = { + onClick: (isTrue: boolean) => void; }; -export default IsraelHomeContentModule; +const messages = [ + { + id: "1", + image: eth, + title: "ETH", + content: "User: namulabs is fantasic company...", + timestamp: "08:43 PM", + isViewed: true, + }, + { + id: "2", + image: nvir, + title: "Nvir", + content: "User: namulabs is fantasic company...", + timestamp: "08:42 AM", + isViewed: false, + }, +]; + +export const IsraelHomeContentModule = (props: Props) => { + // console.log(props); + + return ( +
+
+

+ Messages +

+
+ +
+
+
+ +
+
+ ); +}; diff --git a/src/components/Templates/Home/HomeTemplate.tsx b/src/components/Templates/Home/HomeTemplate.tsx index 689a99c..eb048e3 100644 --- a/src/components/Templates/Home/HomeTemplate.tsx +++ b/src/components/Templates/Home/HomeTemplate.tsx @@ -12,6 +12,8 @@ type Props = { }; export const HomeTemplate = (props: Props) => { + console.log(props); + return (
diff --git a/src/components/Templates/Home/IsraelHomeTemplate.tsx b/src/components/Templates/Home/IsraelHomeTemplate.tsx index 3f2bd8a..b9eba3f 100644 --- a/src/components/Templates/Home/IsraelHomeTemplate.tsx +++ b/src/components/Templates/Home/IsraelHomeTemplate.tsx @@ -1,5 +1,5 @@ import { IsraelHomeHeaderModule } from "~/components/Modules/IsraelHome/IsraelHomeHeaderModule"; -// import { IsraelHomeContentModule } from "~/components/Modules/IsraelHome/IsraelHomeContentModule"; +import { IsraelHomeContentModule } from "~/components/Modules/IsraelHome/IsraelHomeContentModule"; // import { IsraelHomeFooterModule } from "~/components/Modules/IsraelHome/IsraelHomeFooterModule"; import { Layout } from "antd"; import { Content, Footer, Header } from "antd/es/layout/layout"; @@ -7,7 +7,7 @@ import { HomeDescriptionModule } from "~/components/Modules/HomeDescription/Home type Props = { homeHeaderModuleProps: React.ComponentProps; - // homeContentModuleProps: React.ComponentProps; + homeContentModuleProps: React.ComponentProps; // homeFooterModuleProps: React.ComponentProps; }; @@ -18,10 +18,9 @@ export const IsraelHomeTemplate = (props: Props) => {
- {/* + - - */} + {/*