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
30 changes: 15 additions & 15 deletions getcloser/frontend/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { dirname } from "path";
import { fileURLToPath } from "url";
import { FlatCompat } from "@eslint/eslintrc";
import { dirname } from 'path';
import { fileURLToPath } from 'url';
import { FlatCompat } from '@eslint/eslintrc';

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
Expand All @@ -10,22 +10,22 @@ const compat = new FlatCompat({
});

const eslintConfig = [
...compat.extends("next/core-web-vitals", "next/typescript"),
...compat.extends('next/core-web-vitals', 'next/typescript'),
{
rules: {
indent: ["error", 2, { SwitchCase: 1 }], // Enforce 2-space indentation
"linebreak-style": ["error", "unix"],
quotes: ["error", "single"],
semi: ["error", "always"],
"object-curly-spacing": ["error", "always"],
"key-spacing": ["error", { beforeColon: false, afterColon: true }],
indent: ['error', 2, { SwitchCase: 1 }], // Enforce 2-space indentation
'linebreak-style': ['error', 'unix'],
quotes: ['error', 'single'],
semi: ['error', 'always'],
'object-curly-spacing': ['error', 'always'],
'key-spacing': ['error', { beforeColon: false, afterColon: true }],
},
ignores: [
"node_modules/**",
".next/**",
"out/**",
"build/**",
"next-env.d.ts",
'node_modules/**',
'.next/**',
'out/**',
'build/**',
'next-env.d.ts',
],
},
];
Expand Down
2 changes: 1 addition & 1 deletion getcloser/frontend/postcss.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const config = {
plugins: ["@tailwindcss/postcss"],
plugins: ['@tailwindcss/postcss'],
};

export default config;
12 changes: 6 additions & 6 deletions getcloser/frontend/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
'use client';


import { Geist, Geist_Mono, Dongle } from "next/font/google";
import "./globals.css";
import { Geist, Geist_Mono, Dongle } from 'next/font/google';
import './globals.css';
import { Providers } from './providers';
import { usePathname } from 'next/navigation';
import Header from '@/components/Header';

const geistSans = Geist({
variable: "--font-geist-sans",
subsets: ["latin"],
variable: '--font-geist-sans',
subsets: ['latin'],
});

const geistMono = Geist_Mono({
variable: "--font-geist-mono",
subsets: ["latin"],
variable: '--font-geist-mono',
subsets: ['latin'],
});

const dongle = Dongle({
Expand Down
4 changes: 2 additions & 2 deletions getcloser/frontend/src/app/page1/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ export default function Page1() {
<div className="container mx-auto p-4 min-h-screen flex items-center justify-center">
<main className="max-w-md mx-auto bg-card text-card-foreground p-6 rounded-lg shadow-md">
<h1 className="text-5xl font-bold">์นœํ•ด์ง€๊ธธ๋ฐ”๋ผ</h1>
<Image src="/logo.png" alt="Fail" width={52} height={58} style={{marginTop: 36, marginBottom: 36}} className="mx-auto block" />
<div className="items-center text-center" style={{marginBottom: 36}}>
<Image src="/logo.png" alt="Fail" width={52} height={58} style={{ marginTop: 36, marginBottom: 36 }} className="mx-auto block" />
<div className="items-center text-center" style={{ marginBottom: 36 }}>
<p className="text-md mt-1">Pseudo Lab</p>
<p className="text-md">2nd Grand Gathering</p>
<p className="text-md">2025. 12. 20</p>
Expand Down
12 changes: 6 additions & 6 deletions getcloser/frontend/src/app/page2/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ export default function Page2() {
<Modal
title="๋ฏธ์…˜ ์†Œ๊ฐœ"
content={(
`1. ์ฐธ๊ฐ€์ž๋“ค์˜ ์ฝ”๋“œ๋ฅผ ๋ชจ์œผ์„ธ์š”!<br />` +
` ์ฝ”๋“œ๋Š” ์œ„์— ๊ฐœ์ธ๋ณ„ ๋‹ค๋ฅธ ์ฝ”๋“œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค.<br />` +
`2. 5๋ช…์ด ํ•จ๊ป˜ ๋ฌธ์ œ ํ’€๊ธฐ์— ๋„์ „ํ•˜์„ธ์š”!<br />` +
` (ํŒ! ๋ฌธ์ œ๋Š” ํŒ€์›๋“ค๊ณผ ๊ด€๋ จ๋œ ๋ฌธ์ œ๊ฐ€ ๋‚˜์˜ต๋‹ˆ๋‹ค.)<br />` +
`3. ์„ฑ๊ณต ์‹œ ๋ถ€์Šค ๋ฐฉ๋ฌธํ•ด์ฃผ์„ธ์š”.<br />` +
` ์„ฑ๊ณต ์„ ๋ฌผ์„ ๋“œ๋ฆฝ๋‹ˆ๋‹ค.`
'1. ์ฐธ๊ฐ€์ž๋“ค์˜ ์ฝ”๋“œ๋ฅผ ๋ชจ์œผ์„ธ์š”!<br />' +
' ์ฝ”๋“œ๋Š” ์œ„์— ๊ฐœ์ธ๋ณ„ ๋‹ค๋ฅธ ์ฝ”๋“œ๊ฐ€ ์žˆ์Šต๋‹ˆ๋‹ค.<br />' +
'2. 5๋ช…์ด ํ•จ๊ป˜ ๋ฌธ์ œ ํ’€๊ธฐ์— ๋„์ „ํ•˜์„ธ์š”!<br />' +
' (ํŒ! ๋ฌธ์ œ๋Š” ํŒ€์›๋“ค๊ณผ ๊ด€๋ จ๋œ ๋ฌธ์ œ๊ฐ€ ๋‚˜์˜ต๋‹ˆ๋‹ค.)<br />' +
'3. ์„ฑ๊ณต ์‹œ ๋ถ€์Šค ๋ฐฉ๋ฌธํ•ด์ฃผ์„ธ์š”.<br />' +
' ์„ฑ๊ณต ์„ ๋ฌผ์„ ๋“œ๋ฆฝ๋‹ˆ๋‹ค.'
)}
onConfirm={handleConfirm}
onDoNotShowAgain={handleDoNotShowAgain}
Expand Down
2 changes: 1 addition & 1 deletion getcloser/frontend/src/app/page4/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function Page4() {
throw new Error(`HTTP error! status: ${response.status}`);
}

alert("์ˆ˜๋ น ์™„๋ฃŒ!");
alert('์ˆ˜๋ น ์™„๋ฃŒ!');

}
};
Expand Down
2 changes: 1 addition & 1 deletion getcloser/frontend/src/components/Modal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"use client";
'use client';

import React from 'react';

Expand Down
46 changes: 23 additions & 23 deletions getcloser/frontend/src/components/ui/button.tsx
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
import * as React from "react"
import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority"
import * as React from 'react';
import { Slot } from '@radix-ui/react-slot';
import { cva, type VariantProps } from 'class-variance-authority';

import { cn } from "@/lib/utils"
import { cn } from '@/lib/utils';

const buttonVariants = cva(
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
{
variants: {
variant: {
default: "bg-yellow-100 text-emerald-900 hover:bg-primary/90",
default: 'bg-yellow-100 text-emerald-900 hover:bg-primary/90',
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
'bg-destructive text-destructive-foreground hover:bg-destructive/90',
outline:
"border border-input text-yellow-100 hover:bg-accent hover:text-accent-foreground",
'border border-input text-yellow-100 hover:bg-accent hover:text-accent-foreground',
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
'bg-secondary text-secondary-foreground hover:bg-secondary/80',
ghost: 'hover:bg-accent hover:text-accent-foreground',
link: 'text-primary underline-offset-4 hover:underline',
},
size: {
default: "h-10 px-4 py-2",
sm: "h-9 rounded-md px-3",
lg: "h-11 rounded-md px-8",
icon: "h-10 w-10",
default: 'h-10 px-4 py-2',
sm: 'h-9 rounded-md px-3',
lg: 'h-11 rounded-md px-8',
icon: 'h-10 w-10',
},
},
defaultVariants: {
variant: "default",
size: "default",
variant: 'default',
size: 'default',
},
}
)
);

export interface ButtonProps
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
Expand All @@ -41,16 +41,16 @@ export interface ButtonProps

const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "button"
const Comp = asChild ? Slot : 'button';
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
/>
)
);
}
)
Button.displayName = "Button"
);
Button.displayName = 'Button';

export { Button, buttonVariants }
export { Button, buttonVariants };
16 changes: 8 additions & 8 deletions getcloser/frontend/src/components/ui/input.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import * as React from "react"
import * as React from 'react';

import { cn } from "@/lib/utils"
import { cn } from '@/lib/utils';

const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<"input">>(
const Input = React.forwardRef<HTMLInputElement, React.ComponentProps<'input'>>(
({ className, type, ...props }, ref) => {
return (
<input
type={type}
className={cn(
"flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-foreground placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
className
)}
ref={ref}
{...props}
/>
)
);
}
)
Input.displayName = "Input"
);
Input.displayName = 'Input';

export { Input }
export { Input };
20 changes: 10 additions & 10 deletions getcloser/frontend/src/components/ui/label.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"use client"
'use client';

import * as React from "react"
import * as LabelPrimitive from "@radix-ui/react-label"
import { cva, type VariantProps } from "class-variance-authority"
import * as React from 'react';
import * as LabelPrimitive from '@radix-ui/react-label';
import { cva, type VariantProps } from 'class-variance-authority';

import { cn } from "@/lib/utils"
import { cn } from '@/lib/utils';

const labelVariants = cva(
"text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
)
'text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70'
);

const Label = React.forwardRef<
React.ElementRef<typeof LabelPrimitive.Root>,
Expand All @@ -20,7 +20,7 @@ const Label = React.forwardRef<
className={cn(labelVariants(), className)}
{...props}
/>
))
Label.displayName = LabelPrimitive.Root.displayName
));
Label.displayName = LabelPrimitive.Root.displayName;

export { Label }
export { Label };
16 changes: 8 additions & 8 deletions getcloser/frontend/src/components/ui/textarea.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import * as React from "react"
import * as React from 'react';

import { cn } from "@/lib/utils"
import { cn } from '@/lib/utils';

const Textarea = React.forwardRef<
HTMLTextAreaElement,
React.ComponentProps<"textarea">
React.ComponentProps<'textarea'>
>(({ className, ...props }, ref) => {
return (
<textarea
className={cn(
"flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
className
)}
ref={ref}
{...props}
/>
)
})
Textarea.displayName = "Textarea"
);
});
Textarea.displayName = 'Textarea';

export { Textarea }
export { Textarea };
6 changes: 3 additions & 3 deletions getcloser/frontend/src/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// src/lib/utils.ts
import { type ClassValue, clsx } from "clsx"
import { twMerge } from "tailwind-merge"
import { type ClassValue, clsx } from 'clsx';
import { twMerge } from 'tailwind-merge';

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
return twMerge(clsx(inputs));
}
Loading