From 7f04feebcec3ab734f3de55e1436ebe80940c576 Mon Sep 17 00:00:00 2001 From: Casey Lei <63774760+caseyzlei@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:05:40 -0700 Subject: [PATCH 1/4] edit import on login --- src/app/login/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 552e2aad..ca19b89e 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -1,6 +1,6 @@ 'use client'; -import LoginForm from '../../../components/LoginForm'; +import LoginForm from '../../components/LoginForm'; import { GlobalStyle, From 9891ab4acc2554726b1baba32e634bf27946d193 Mon Sep 17 00:00:00 2001 From: Casey Lei <63774760+caseyzlei@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:10:13 -0700 Subject: [PATCH 2/4] nav between landing and login --- src/app/page.tsx | 4 +++- src/components/InputFields.tsx | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index c03d6e4d..0d7e781e 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,7 +1,9 @@ +import Link from "next/link"; + export default function Checkout() { return (
-
Landing Page
+ Login
); } diff --git a/src/components/InputFields.tsx b/src/components/InputFields.tsx index 02af1188..a7e92afb 100644 --- a/src/components/InputFields.tsx +++ b/src/components/InputFields.tsx @@ -1,6 +1,6 @@ 'use client'; -import { FormHeaders, Input } from '../app/screens/login/styles'; +import { FormHeaders, Input } from '../app/login/styles'; export default function InputFields(props: { text: string; From cc3764b4f8c526789edf115ae615c7021eb03baf Mon Sep 17 00:00:00 2001 From: Casey Lei <63774760+caseyzlei@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:11:31 -0700 Subject: [PATCH 3/4] nav between login and storefront --- src/app/login/page.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index ca19b89e..6ac60547 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -1,5 +1,6 @@ 'use client'; +import Link from 'next/link'; import LoginForm from '../../components/LoginForm'; import { @@ -22,7 +23,9 @@ export default function App() { Welcome - + From c1d1b595161b7f60b7d1e2944f572c4fcd1e6491 Mon Sep 17 00:00:00 2001 From: Casey Lei <63774760+caseyzlei@users.noreply.github.com> Date: Wed, 4 Oct 2023 20:57:53 -0700 Subject: [PATCH 4/4] prettier --- src/app/checkout/page.tsx | 13 ++++++------- src/app/login/page.tsx | 2 +- src/app/page.tsx | 15 +++++++-------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/app/checkout/page.tsx b/src/app/checkout/page.tsx index 55cfafaf..3b66b7ef 100644 --- a/src/app/checkout/page.tsx +++ b/src/app/checkout/page.tsx @@ -1,8 +1,7 @@ export default function Checkout() { - return ( -
-
Checkout
-
- ); - } - \ No newline at end of file + return ( +
+
Checkout
+
+ ); +} diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 6ac60547..a42e544a 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -25,7 +25,7 @@ export default function App() { + diff --git a/src/app/page.tsx b/src/app/page.tsx index 0d7e781e..7d064724 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,10 +1,9 @@ -import Link from "next/link"; +import Link from 'next/link'; export default function Checkout() { - return ( -
- Login -
- ); - } - \ No newline at end of file + return ( +
+ Login +
+ ); +}