From 688ea34c2462caecb52caa910251f002f7077cab Mon Sep 17 00:00:00 2001 From: James Wyndham Date: Wed, 1 May 2024 10:59:19 +0800 Subject: [PATCH 1/3] feature - Added badge --- Frontend/components/FastPocketBadge.tsx | 44 +++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Frontend/components/FastPocketBadge.tsx diff --git a/Frontend/components/FastPocketBadge.tsx b/Frontend/components/FastPocketBadge.tsx new file mode 100644 index 0000000..a126e6d --- /dev/null +++ b/Frontend/components/FastPocketBadge.tsx @@ -0,0 +1,44 @@ +import * as React from "react"; +const SvgComponent = (props: any) => ( + + + + + + + + + + +); +export default SvgComponent; From 0ba99e14eb838896d65c3ba173bce9ccf6615f00 Mon Sep 17 00:00:00 2001 From: James Wyndham Date: Wed, 1 May 2024 11:08:21 +0800 Subject: [PATCH 2/3] bugfix - fixed badge --- Frontend/components/FastPocketBadge.tsx | 83 +++++++++++++------------ 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/Frontend/components/FastPocketBadge.tsx b/Frontend/components/FastPocketBadge.tsx index a126e6d..ee462e0 100644 --- a/Frontend/components/FastPocketBadge.tsx +++ b/Frontend/components/FastPocketBadge.tsx @@ -1,44 +1,47 @@ import * as React from "react"; const SvgComponent = (props: any) => ( - - - - - - - - - - + + + + + + + + + + + + ); export default SvgComponent; From 2157edd2f053f5d46fba86a5543501f2735cd3da Mon Sep 17 00:00:00 2001 From: James Wyndham Date: Wed, 5 Jun 2024 10:06:50 +0800 Subject: [PATCH 3/3] bugfix - better routing --- .DS_Store | Bin 6148 -> 8196 bytes Backend/.DS_Store | Bin 8196 -> 8196 bytes Frontend/components/Modals/ModalSignIn.tsx | 40 +++++++++++++++----- Frontend/components/Modals/ModalSignUp.tsx | 41 +++++++++++++++------ 4 files changed, 61 insertions(+), 20 deletions(-) diff --git a/.DS_Store b/.DS_Store index 5291e9a845eb93807f1caf1a9f704e8dfe625f38..6525920b5c44abcdc58e39126256bda35acfb884 100644 GIT binary patch delta 216 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD6%nNH}hr%jz7$c**Q2SHn1>? zZ02FfVdP9pDNatx&(C3;oW{CQnwP*>`PhxXC2Q40H_;NN@uQSCGRt3vzsCp3E=e bIoY3wgM$&`W`@b}JX0rMV>jH`aE%E7`sOfV delta 119 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$SAlmU^g?P;AS3y9LC8dBEplG z3HEHZ6INtoWSpEJa&9p@2ZtatPy-MMa03Zfklu}j-}DPTQ^tBWhIEE}20eycAerKslb@WFlb^)Ez#zcD!1xnL z>-`4i7urmVy{V6XI diff --git a/Frontend/components/Modals/ModalSignIn.tsx b/Frontend/components/Modals/ModalSignIn.tsx index bf3b47a..ac090d4 100644 --- a/Frontend/components/Modals/ModalSignIn.tsx +++ b/Frontend/components/Modals/ModalSignIn.tsx @@ -1,3 +1,5 @@ +"use client"; + import React from "react"; import Icon from "@/components/Icons/Icon"; import { useForm } from "react-hook-form"; @@ -5,9 +7,11 @@ import { yupResolver } from "@hookform/resolvers/yup"; import { signInValidationSchema } from "@/utils/form"; import { login } from "@/app/actions"; import { toast } from "react-toastify"; -import pb from "@/lib/pocketbase"; +import { useRouter } from "next/navigation"; function ModalSignIn() { + const router = useRouter(); + const { register, handleSubmit, @@ -25,6 +29,7 @@ function ModalSignIn() { ) { reset(); document.getElementById("sign-in-modal")?.click(); + router.push("/account"); } } catch (error) { if (error instanceof Error) { @@ -96,14 +101,31 @@ function ModalSignIn() {
- +
+ +
+ + Dont have an account?{" "} + + + { + document.getElementById("sign-in-modal")?.click(); + document.getElementById("sign-up-modal")?.click(); + }} + className="text-primary hover:text-primary/60 cursor-pointer " + > + Sign up + +
+
- +
+ +
+ + Already have an account?{" "} + + + { + document.getElementById("sign-up-modal")?.click(); + document.getElementById("sign-in-modal")?.click(); + }} + className="text-primary hover:text-primary/60 cursor-pointer " + > + Sign in + +
+