Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
EthanAuyeung committed Oct 6, 2023
2 parents 64c6227 + d2666ce commit 2ddf3fc
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
13 changes: 6 additions & 7 deletions src/app/checkout/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
export default function Checkout() {
return (
<main>
<div>Checkout</div>
</main>
);
}

return (
<main>
<div>Checkout</div>
</main>
);
}
5 changes: 4 additions & 1 deletion src/app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use client';

import Link from 'next/link';
import LoginForm from '../../components/LoginForm';

import {
Expand All @@ -22,7 +23,9 @@ export default function App() {
<LoginContent>
<WelcomeSign>Welcome</WelcomeSign>
<LoginForm />
<Button>Log In</Button>
<Button>
<Link href="/storefront">Log In</Link>
</Button>
</LoginContent>
</LoginBox>
</Fullscreen>
Expand Down
15 changes: 8 additions & 7 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import Link from 'next/link';

export default function Checkout() {
return (
<main>
<div>Landing Page</div>
</main>
);
}

return (
<main>
<Link href="/login">Login</Link>
</main>
);
}
2 changes: 1 addition & 1 deletion src/components/InputFields.tsx
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 2ddf3fc

Please sign in to comment.