Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/components/ui/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const DialogOverlay = React.forwardRef<
ref={ref}
className={cn(
"data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80 data-[state=closed]:animate-out data-[state=open]:animate-in",
className,
className
)}
{...props}
/>
Expand All @@ -36,7 +36,7 @@ const DialogContent = React.forwardRef<
ref={ref}
className={cn(
"data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom fixed top-[50%] left-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=closed]:animate-out data-[state=open]:animate-in sm:rounded-lg",
className,
className
)}
{...props}
>
Expand All @@ -57,7 +57,7 @@ const DialogHeader = ({
<div
className={cn(
"flex flex-col space-y-1.5 text-center sm:text-left",
className,
className
)}
{...props}
/>
Expand All @@ -71,7 +71,7 @@ const DialogFooter = ({
<div
className={cn(
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
className,
className
)}
{...props}
/>
Expand All @@ -86,7 +86,7 @@ const DialogTitle = React.forwardRef<
ref={ref}
className={cn(
"font-semibold text-lg leading-none tracking-tight",
className,
className
)}
{...props}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "tailwindcss";

@plugin 'tailwindcss-animate';
@plugin "tailwindcss-animate";

@custom-variant dark (&:is(.dark *));

Expand Down
14 changes: 7 additions & 7 deletions src/pages/LoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import { useExternalBrowser } from "@/hooks/useExternalBrowser";
import { Analytics } from "@/service/analytics";
import BrowserRedirectPage from "./BrowserRedirectPage";

const GOOGLE_LOGIN_URL = `${import.meta.env.VITE_API_URL}/oauth2/authorization/google`;
const AEGIS_HOMEPAGE_URL = "https://homepage.dkuaegis.org/";
const GMAIL_GUIDE_URL = "https://sites.google.com/dankook.ac.kr/help";

const LoginPage = () => {
const { isKakaoInApp } = useExternalBrowser();

Expand Down Expand Up @@ -37,11 +41,7 @@ const LoginPage = () => {
className="w-full"
asChild
>
<a
href={`${import.meta.env.VITE_API_URL}/oauth2/authorization/google`}
>
Google로 로그인
</a>
<a href={GOOGLE_LOGIN_URL}>Google로 로그인</a>
</Button>
<Button
onClick={() => {
Expand All @@ -54,7 +54,7 @@ const LoginPage = () => {
asChild
>
<a
href="https://dkuaegis.org/"
href={AEGIS_HOMEPAGE_URL}
target="_blank"
rel="noopener noreferrer"
>
Expand All @@ -64,7 +64,7 @@ const LoginPage = () => {
</div>
<div className="flex flex-col text-center">
<a
href="https://sites.google.com/dankook.ac.kr/help"
href={GMAIL_GUIDE_URL}
target="_blank"
rel="noopener noreferrer"
className="inline-flex items-center justify-center gap-1 font-extrabold text-muted-foreground text-sm underline"
Expand Down