From e2139af045f2cf31db79ed7ff6bfbdc4056de7f7 Mon Sep 17 00:00:00 2001 From: nnebuoukamaka Date: Sun, 29 Sep 2024 12:08:32 +0100 Subject: [PATCH 1/4] NnebuoUkamaka_TestBranch2 initial commit --- .../container/settingsContainer.tsx | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx diff --git a/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx b/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx new file mode 100644 index 0000000..87b5090 --- /dev/null +++ b/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx @@ -0,0 +1,48 @@ +import React from "react"; +import { NextPage } from "next"; +// import Image from "next/image"; +const SettingsContainer: NextPage = () => { + return ( +
+
+

Messages

+
+
+ {/* star */} +
+
+ Proxima +
+ {/*
*/} +
+

+ Transaction processing +

+
+ {/* Processing Cube */} +
+ +

Uploading your transaction to the node.

+

please wait for a moment...

+ +

This may take up to 2 minutes.

+
+ {/*
*/} +
+
+
+ ); +}; + +export default SettingsContainer; From 48fe45ee41f042934ffaa60685f3d2863b0fb1c3 Mon Sep 17 00:00:00 2001 From: nnebuoukamaka Date: Sun, 29 Sep 2024 14:02:02 +0100 Subject: [PATCH 2/4] completed the second page of the test. --- pages/_app.js | 7 ++++ pages/settingsPage.tsx | 8 +++++ public/svgs/blocks.svg | 9 +++++ public/svgs/headerIcon.svg | 4 +++ public/svgs/settingsIcon.svg | 10 ++++++ public/svgs/starIcon.svg | 17 +++++++++ .../NnebuoUkamaka/header/headerContainer.tsx | 35 +++++++++++++++++++ .../container/settingsContainer.tsx | 16 +++++---- 8 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 pages/_app.js create mode 100644 pages/settingsPage.tsx create mode 100644 public/svgs/blocks.svg create mode 100644 public/svgs/headerIcon.svg create mode 100644 public/svgs/settingsIcon.svg create mode 100644 public/svgs/starIcon.svg create mode 100644 src/app/NnebuoUkamaka/header/headerContainer.tsx diff --git a/pages/_app.js b/pages/_app.js new file mode 100644 index 0000000..3e33d4b --- /dev/null +++ b/pages/_app.js @@ -0,0 +1,7 @@ +import '../src/styles/globals.css'; + +function MyApp({ Component, pageProps }) { + return ; +} + +export default MyApp; \ No newline at end of file diff --git a/pages/settingsPage.tsx b/pages/settingsPage.tsx new file mode 100644 index 0000000..43aef4c --- /dev/null +++ b/pages/settingsPage.tsx @@ -0,0 +1,8 @@ +import SettingsContainer from "../src/app/NnebuoUkamaka/settingsPage/container/settingsContainer"; +// import Header from "../src/app/NnebuoUkamaka/header/headerContainer"; +const Settings = () => { + return + {/* */} +}; + +export default Settings; diff --git a/public/svgs/blocks.svg b/public/svgs/blocks.svg new file mode 100644 index 0000000..3512553 --- /dev/null +++ b/public/svgs/blocks.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/public/svgs/headerIcon.svg b/public/svgs/headerIcon.svg new file mode 100644 index 0000000..ecce8c0 --- /dev/null +++ b/public/svgs/headerIcon.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/public/svgs/settingsIcon.svg b/public/svgs/settingsIcon.svg new file mode 100644 index 0000000..110ea0d --- /dev/null +++ b/public/svgs/settingsIcon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/public/svgs/starIcon.svg b/public/svgs/starIcon.svg new file mode 100644 index 0000000..138f90d --- /dev/null +++ b/public/svgs/starIcon.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/app/NnebuoUkamaka/header/headerContainer.tsx b/src/app/NnebuoUkamaka/header/headerContainer.tsx new file mode 100644 index 0000000..a0ea7db --- /dev/null +++ b/src/app/NnebuoUkamaka/header/headerContainer.tsx @@ -0,0 +1,35 @@ +import React from "react"; +import Image from "next/image"; +const Header = () => { + return ( +
+
+ + copy + +
+
+

Proxima OS

+
+
+ + star + +
+
+ ); +}; + +export default Header; diff --git a/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx b/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx index 87b5090..8fd61cc 100644 --- a/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx +++ b/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx @@ -1,20 +1,23 @@ import React from "react"; import { NextPage } from "next"; -// import Image from "next/image"; +import Image from "next/image"; +import Header from "../../header/headerContainer"; const SettingsContainer: NextPage = () => { return ( +
+

Messages

- {/* star */} + />
Proxima @@ -25,12 +28,12 @@ const SettingsContainer: NextPage = () => { Transaction processing
- {/* Processing Cube */} + />

Uploading your transaction to the node.

@@ -42,6 +45,7 @@ const SettingsContainer: NextPage = () => {
+
); }; From b3beeddb83d82f81112206aaa01663d8d3effd04 Mon Sep 17 00:00:00 2001 From: nnebuoukamaka Date: Sun, 29 Sep 2024 14:05:02 +0100 Subject: [PATCH 3/4] Deleted unused code from the components --- pages/settingsPage.tsx | 2 -- src/app/NnebuoUkamaka/header/headerContainer.tsx | 2 +- .../settingsPage/container/settingsContainer.tsx | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pages/settingsPage.tsx b/pages/settingsPage.tsx index 43aef4c..608fa0a 100644 --- a/pages/settingsPage.tsx +++ b/pages/settingsPage.tsx @@ -1,8 +1,6 @@ import SettingsContainer from "../src/app/NnebuoUkamaka/settingsPage/container/settingsContainer"; -// import Header from "../src/app/NnebuoUkamaka/header/headerContainer"; const Settings = () => { return - {/* */} }; export default Settings; diff --git a/src/app/NnebuoUkamaka/header/headerContainer.tsx b/src/app/NnebuoUkamaka/header/headerContainer.tsx index a0ea7db..7676af5 100644 --- a/src/app/NnebuoUkamaka/header/headerContainer.tsx +++ b/src/app/NnebuoUkamaka/header/headerContainer.tsx @@ -18,7 +18,7 @@ const Header = () => {

Proxima OS

*/} From 4264494446851b03d9a99187ceef3dff2951c2cb Mon Sep 17 00:00:00 2001 From: nnebuoukamaka Date: Sun, 29 Sep 2024 17:00:31 +0100 Subject: [PATCH 4/4] appended the footer component to the main component of the branch --- public/svgs/cardIcon.svg | 3 + public/svgs/messageIcon.svg | 3 + public/svgs/paymentIcon.svg | 3 + public/svgs/reloadIcon.svg | 3 + .../NnebuoUkamaka/footer/FooterContainer.tsx | 62 +++++++++++++++++++ .../container/settingsContainer.tsx | 58 ++++++++--------- 6 files changed, 104 insertions(+), 28 deletions(-) create mode 100644 public/svgs/cardIcon.svg create mode 100644 public/svgs/messageIcon.svg create mode 100644 public/svgs/paymentIcon.svg create mode 100644 public/svgs/reloadIcon.svg create mode 100644 src/app/NnebuoUkamaka/footer/FooterContainer.tsx diff --git a/public/svgs/cardIcon.svg b/public/svgs/cardIcon.svg new file mode 100644 index 0000000..77d8bbb --- /dev/null +++ b/public/svgs/cardIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/svgs/messageIcon.svg b/public/svgs/messageIcon.svg new file mode 100644 index 0000000..b1b3232 --- /dev/null +++ b/public/svgs/messageIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/svgs/paymentIcon.svg b/public/svgs/paymentIcon.svg new file mode 100644 index 0000000..7739135 --- /dev/null +++ b/public/svgs/paymentIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/svgs/reloadIcon.svg b/public/svgs/reloadIcon.svg new file mode 100644 index 0000000..5d26595 --- /dev/null +++ b/public/svgs/reloadIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/NnebuoUkamaka/footer/FooterContainer.tsx b/src/app/NnebuoUkamaka/footer/FooterContainer.tsx new file mode 100644 index 0000000..e5f6cb6 --- /dev/null +++ b/src/app/NnebuoUkamaka/footer/FooterContainer.tsx @@ -0,0 +1,62 @@ +import React from "react"; +import Link from "next/link"; +import Image from "next/image"; + +const Footer = () => { + return ( + + ); +}; + +export default Footer; diff --git a/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx b/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx index 961ddda..70d0ccf 100644 --- a/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx +++ b/src/app/NnebuoUkamaka/settingsPage/container/settingsContainer.tsx @@ -2,47 +2,49 @@ import React from "react"; import { NextPage } from "next"; import Image from "next/image"; import Header from "../../header/headerContainer"; +import Footer from "../../footer/FooterContainer"; const SettingsContainer: NextPage = () => { return (
-
-
-
-

Messages

-
-
- star -
-
- Proxima -
-
-

- Transaction processing -

-
+
+
+
+

Messages

+
+
Processing Cube
+
+ Proxima +
+
+

+ Transaction processing +

+
+ Processing Cube +
-

Uploading your transaction to the node.

-

please wait for a moment...

+

Uploading your transaction to the node.

+

please wait for a moment...

-

This may take up to 2 minutes.

+

This may take up to 2 minutes.

+
-
+
); };