From db7e4d66606132002ac65728261db4efec619881 Mon Sep 17 00:00:00 2001 From: Titus Muthomi Date: Wed, 25 Jan 2023 09:10:26 +0300 Subject: [PATCH 1/6] FIX: Install packages to resolve package error --- package-lock.json | 15 ++++++++++++++ package.json | 1 + src/App.tsx | 2 ++ src/views/Register.tsx | 47 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 src/views/Register.tsx diff --git a/package-lock.json b/package-lock.json index 2e43fc2..7a788cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,6 +19,7 @@ "firebase": "^9.16.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-icons": "^4.7.1", "react-router-dom": "^6.7.0", "react-scripts": "5.0.1", "typescript": "^4.9.4", @@ -14720,6 +14721,14 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, + "node_modules/react-icons": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.7.1.tgz", + "integrity": "sha512-yHd3oKGMgm7zxo3EA7H2n7vxSoiGmHk5t6Ou4bXsfcgWyhfDKMpyKfhHR6Bjnn63c+YXBLBPUql9H4wPJM6sXw==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -28078,6 +28087,12 @@ "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, + "react-icons": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.7.1.tgz", + "integrity": "sha512-yHd3oKGMgm7zxo3EA7H2n7vxSoiGmHk5t6Ou4bXsfcgWyhfDKMpyKfhHR6Bjnn63c+YXBLBPUql9H4wPJM6sXw==", + "requires": {} + }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", diff --git a/package.json b/package.json index d0e0443..a618510 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "firebase": "^9.16.0", "react": "^18.2.0", "react-dom": "^18.2.0", + "react-icons": "^4.7.1", "react-router-dom": "^6.7.0", "react-scripts": "5.0.1", "typescript": "^4.9.4", diff --git a/src/App.tsx b/src/App.tsx index b3af05b..4c73ec3 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,11 +2,13 @@ import React from "react"; import { Routes, Route } from "react-router-dom"; import "./App.css"; import Home from "./views/Home"; +import Register from "./views/Register"; function App() { return ( } /> + } /> ); } diff --git a/src/views/Register.tsx b/src/views/Register.tsx new file mode 100644 index 0000000..d4c012b --- /dev/null +++ b/src/views/Register.tsx @@ -0,0 +1,47 @@ +import React from "react"; +import useHeader from "../hooks/useHeader"; +import { FcGoogle } from "react-icons/fc"; +import { AiFillFacebook } from "react-icons/ai"; +function Register() { + // extract the header from the hook + // Header extracted will be used to determine the current page + return ( +
+
+
+

THE FORCE

+
+

+ Google +

+

+ Facebook +

+
+
+ + +
+
+ + +
+ +
+ + +
+ +
+

+ + Remember Me +

+

Login to your account

+
+
+
+
+ ); +} +export default Register; \ No newline at end of file From 002bb37066acbb36ff605c13539bd9c6a59f3503 Mon Sep 17 00:00:00 2001 From: Titus Muthomi Date: Wed, 25 Jan 2023 09:13:58 +0300 Subject: [PATCH 2/6] FIX: fix spacing in register view --- src/views/Register.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/Register.tsx b/src/views/Register.tsx index d4c012b..3b18ae2 100644 --- a/src/views/Register.tsx +++ b/src/views/Register.tsx @@ -22,21 +22,21 @@ function Register() { -
+
-
+
- +
-

+ {/*

Remember Me -

+

*/}

Login to your account

From 81a49cfedaff7ce710f454622eebb05d078ccc61 Mon Sep 17 00:00:00 2001 From: Titus Muthomi Date: Wed, 25 Jan 2023 09:23:09 +0300 Subject: [PATCH 3/6] remove commented code and unused vars to resolve console warnings --- src/views/Register.tsx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/views/Register.tsx b/src/views/Register.tsx index 3b18ae2..fa5b111 100644 --- a/src/views/Register.tsx +++ b/src/views/Register.tsx @@ -1,10 +1,7 @@ import React from "react"; -import useHeader from "../hooks/useHeader"; import { FcGoogle } from "react-icons/fc"; import { AiFillFacebook } from "react-icons/ai"; function Register() { - // extract the header from the hook - // Header extracted will be used to determine the current page return (
@@ -33,11 +30,7 @@ function Register() {
- {/*

- - Remember Me -

*/} -

Login to your account

+

Login to your existing account

From bde7aadfe63c96d3c869a36a7c6c40d653f5f36d Mon Sep 17 00:00:00 2001 From: Titus Muthomi Date: Wed, 25 Jan 2023 14:18:57 +0300 Subject: [PATCH 4/6] FIX: update register form to reflect email type --- src/views/Register.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Register.tsx b/src/views/Register.tsx index fa5b111..ea9f48e 100644 --- a/src/views/Register.tsx +++ b/src/views/Register.tsx @@ -17,7 +17,7 @@ function Register() {
- +
@@ -25,7 +25,7 @@ function Register() {
- +
From 6f5fbd8b3da82485d0b8a96846612bad076e23d2 Mon Sep 17 00:00:00 2001 From: Titus Muthomi Date: Wed, 25 Jan 2023 14:34:07 +0300 Subject: [PATCH 5/6] FIX: update Google and Facebook p to links --- src/views/Register.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/Register.tsx b/src/views/Register.tsx index ea9f48e..26d79cd 100644 --- a/src/views/Register.tsx +++ b/src/views/Register.tsx @@ -1,4 +1,5 @@ import React from "react"; +// import {Link} from 'react-router-dom' import { FcGoogle } from "react-icons/fc"; import { AiFillFacebook } from "react-icons/ai"; function Register() { @@ -9,10 +10,10 @@ function Register() {

THE FORCE

- Google + Google

- Facebook + Facebook

From a6dcf8e2eac2c8d1f13553857dacc5223c75ba98 Mon Sep 17 00:00:00 2001 From: Titus Muthomi Date: Wed, 25 Jan 2023 14:35:59 +0300 Subject: [PATCH 6/6] Remove commented out code --- src/views/Register.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/views/Register.tsx b/src/views/Register.tsx index 26d79cd..18a7f5d 100644 --- a/src/views/Register.tsx +++ b/src/views/Register.tsx @@ -9,12 +9,8 @@ function Register() {

THE FORCE