Skip to content

Commit 1b09b8d

Browse files
authored
Merge pull request #40 from osusach/staging
chore: release updates from staging to master
2 parents 0c818ce + 5d72efe commit 1b09b8d

14 files changed

+367
-330
lines changed

.github/pull_request_template.md

-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
<!--
2828
For pull requests that relate or close an issue, please include them
2929
below. We like to follow [Github's guidance on linking issues to pull requests](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
30-
31-
For example having the text: "closes #1234" would connect the current pull
32-
request to issue 1234. And when we merge the pull request, Github will
33-
automatically close the issue.
3430
-->
3531

3632
- Related Issue #

app/(auth-pages)/layout.tsx

-7
This file was deleted.

app/(auth-pages)/sign-in/page.tsx

+23-24
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
11
"use client";
22

3-
import Link from "next/link";
3+
import Image from "next/image";
44

55
import { Button } from "@/components/ui/button";
66
import { signInWithGoogle } from "@/actions/auth";
77

88
export default function Login() {
9+
const handleSignIn = async () => {
10+
await signInWithGoogle();
11+
};
12+
913
return (
10-
<div className={"flex justify-center items-center min-h-screen p-5"}>
14+
<>
1115
<div
1216
className={
13-
"flex flex-col items-center gap-4 max-w-md border border-gray-300 rounded-lg p-5 lg:p-10 text-center"
17+
"container relative pt-20 flex flex-col justify-center items-center lg:px-0"
1418
}
1519
>
16-
<h1 className={"text-2xl font-semibold lg:text-3xl"}>Sign in</h1>
17-
<p>Continue with</p>
18-
<Button
19-
onClick={async () => {
20-
await signInWithGoogle();
21-
}}
22-
>
23-
Google
24-
</Button>
25-
<p className={"text-sm"}>
26-
By continuing, you agree to our{" "}
27-
<Link className={"underline underline-offset-4"} href={"/legal"}>
28-
Terms of Service
29-
</Link>{" "}
30-
and confirm that you have read our{" "}
31-
<Link className={"underline underline-offset-4"} href={"/privacy"}>
32-
Privacy Policy
33-
</Link>
34-
.
35-
</p>
20+
<div className={"mx-auto flex flex-col w-full space-y-6 sm:w-[350px]"}>
21+
<div className={"flex flex-col items-center space-y-2 text-center"}>
22+
<Image
23+
alt={"ChileBecas logo"}
24+
height={100}
25+
src={"/logo.svg"}
26+
width={100}
27+
/>
28+
<h1 className={"text-2xl font-semibold tracking-tight"}>
29+
Iniciar sesión
30+
</h1>
31+
</div>
32+
<p className={"text-center text-muted-foreground"}>Continúa con</p>
33+
<Button onClick={handleSignIn}>Google</Button>
34+
</div>
3635
</div>
37-
</div>
36+
</>
3837
);
3938
}

app/(onboarding)/get-started/page.tsx

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { Metadata } from "next";
22

33
import { Onboarding } from "@/components/onboarding";
4+
import { SignOutButton } from "@/components/buttons";
45
import { fetchFormOptions, fetchOnboardingMatch } from "@/lib/data";
56

67
export const metadata: Metadata = {
@@ -13,7 +14,14 @@ export default async function GetStartedPage() {
1314
const { matchResult, onboardingProfile } = await fetchOnboardingMatch();
1415

1516
return (
16-
<div>
17+
<div className={"h-full min-h-screen py-20 px-2.5 bg-gray-100 md:px-0"}>
18+
<section
19+
className={
20+
"w-full max-w-2xl mx-auto flex flex-row justify-center md:justify-end mb-2.5"
21+
}
22+
>
23+
<SignOutButton />
24+
</section>
1725
<Onboarding
1826
formOptions={{
1927
cities,

app/(onboarding)/layout.tsx

-11
This file was deleted.

app/layout.tsx

+11-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { GeistSans } from "geist/font/sans";
22
import type { Metadata } from "next";
33

44
import { Toaster } from "@/components/ui/toaster";
5+
import { cn } from "@/lib/utils";
56

67
import "@/app/globals.css";
78

@@ -25,9 +26,16 @@ export default function RootLayout({
2526
children: React.ReactNode;
2627
}) {
2728
return (
28-
<html lang={"en"}>
29-
<body className={`${GeistSans.className} antialiased`}>
30-
{children}
29+
<html className={"h-full"} lang={"es"}>
30+
<body
31+
className={cn(
32+
"relative h-full font-sans antialiased",
33+
GeistSans.className,
34+
)}
35+
>
36+
<main className={"relative flex flex-col min-h-screen"}>
37+
<div className={"flex-grow flex-1"}>{children}</div>
38+
</main>
3139
<Toaster />
3240
</body>
3341
</html>

0 commit comments

Comments
 (0)