-
Notifications
You must be signed in to change notification settings - Fork 1
Chore/ 환경 설정 #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Chore/ 환경 설정 #4
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3b6417f
chore: 폰트 설정
dasosann 863e877
chore: metadata 설정 및 저장 시 prettier 설정 적용
dasosann 78971cf
chore: shadcn 설치
dasosann 339681b
chore: github actions에서 pnpm 버전 명시
dasosann 45eec1c
chore: update styleguide with web standards and SEO best practices
dasosann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "editor.formatOnSave": true, | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode", | ||
| "[javascript]": { | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| }, | ||
| "[typescript]": { | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| }, | ||
| "[typescriptreact]": { | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| }, | ||
| "[javascriptreact]": { | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| }, | ||
| "[json]": { | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| }, | ||
| "[css]": { | ||
| "editor.defaultFormatter": "esbenp.prettier-vscode" | ||
| } | ||
| } |
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,125 @@ | ||
| @import 'tailwindcss'; | ||
| @import "tw-animate-css"; | ||
|
|
||
| :root { | ||
| --background: #ffffff; | ||
| --foreground: #171717; | ||
| } | ||
| @custom-variant dark (&:is(.dark *)); | ||
|
|
||
| @theme inline { | ||
| --color-background: var(--background); | ||
| --color-foreground: var(--foreground); | ||
| --font-sans: var(--font-geist-sans); | ||
| --font-sans: var(--font-pretendard); | ||
| --font-mono: var(--font-geist-mono); | ||
| --color-sidebar-ring: var(--sidebar-ring); | ||
| --color-sidebar-border: var(--sidebar-border); | ||
| --color-sidebar-accent-foreground: var(--sidebar-accent-foreground); | ||
| --color-sidebar-accent: var(--sidebar-accent); | ||
| --color-sidebar-primary-foreground: var(--sidebar-primary-foreground); | ||
| --color-sidebar-primary: var(--sidebar-primary); | ||
| --color-sidebar-foreground: var(--sidebar-foreground); | ||
| --color-sidebar: var(--sidebar); | ||
| --color-chart-5: var(--chart-5); | ||
| --color-chart-4: var(--chart-4); | ||
| --color-chart-3: var(--chart-3); | ||
| --color-chart-2: var(--chart-2); | ||
| --color-chart-1: var(--chart-1); | ||
| --color-ring: var(--ring); | ||
| --color-input: var(--input); | ||
| --color-border: var(--border); | ||
| --color-destructive: var(--destructive); | ||
| --color-accent-foreground: var(--accent-foreground); | ||
| --color-accent: var(--accent); | ||
| --color-muted-foreground: var(--muted-foreground); | ||
| --color-muted: var(--muted); | ||
| --color-secondary-foreground: var(--secondary-foreground); | ||
| --color-secondary: var(--secondary); | ||
| --color-primary-foreground: var(--primary-foreground); | ||
| --color-primary: var(--primary); | ||
| --color-popover-foreground: var(--popover-foreground); | ||
| --color-popover: var(--popover); | ||
| --color-card-foreground: var(--card-foreground); | ||
| --color-card: var(--card); | ||
| --radius-sm: calc(var(--radius) - 4px); | ||
| --radius-md: calc(var(--radius) - 2px); | ||
| --radius-lg: var(--radius); | ||
| --radius-xl: calc(var(--radius) + 4px); | ||
| --radius-2xl: calc(var(--radius) + 8px); | ||
| --radius-3xl: calc(var(--radius) + 12px); | ||
| --radius-4xl: calc(var(--radius) + 16px); | ||
| } | ||
|
|
||
| @media (prefers-color-scheme: dark) { | ||
| :root { | ||
| --background: #0a0a0a; | ||
| --foreground: #ededed; | ||
| } | ||
| :root { | ||
| --radius: 0.625rem; | ||
| --background: oklch(1 0 0); | ||
| --foreground: oklch(0.141 0.005 285.823); | ||
| --card: oklch(1 0 0); | ||
| --card-foreground: oklch(0.141 0.005 285.823); | ||
| --popover: oklch(1 0 0); | ||
| --popover-foreground: oklch(0.141 0.005 285.823); | ||
| --primary: oklch(0.21 0.006 285.885); | ||
| --primary-foreground: oklch(0.985 0 0); | ||
| --secondary: oklch(0.967 0.001 286.375); | ||
| --secondary-foreground: oklch(0.21 0.006 285.885); | ||
| --muted: oklch(0.967 0.001 286.375); | ||
| --muted-foreground: oklch(0.552 0.016 285.938); | ||
| --accent: oklch(0.967 0.001 286.375); | ||
| --accent-foreground: oklch(0.21 0.006 285.885); | ||
| --destructive: oklch(0.577 0.245 27.325); | ||
| --border: oklch(0.92 0.004 286.32); | ||
| --input: oklch(0.92 0.004 286.32); | ||
| --ring: oklch(0.705 0.015 286.067); | ||
| --chart-1: oklch(0.646 0.222 41.116); | ||
| --chart-2: oklch(0.6 0.118 184.704); | ||
| --chart-3: oklch(0.398 0.07 227.392); | ||
| --chart-4: oklch(0.828 0.189 84.429); | ||
| --chart-5: oklch(0.769 0.188 70.08); | ||
| --sidebar: oklch(0.985 0 0); | ||
| --sidebar-foreground: oklch(0.141 0.005 285.823); | ||
| --sidebar-primary: oklch(0.21 0.006 285.885); | ||
| --sidebar-primary-foreground: oklch(0.985 0 0); | ||
| --sidebar-accent: oklch(0.967 0.001 286.375); | ||
| --sidebar-accent-foreground: oklch(0.21 0.006 285.885); | ||
| --sidebar-border: oklch(0.92 0.004 286.32); | ||
| --sidebar-ring: oklch(0.705 0.015 286.067); | ||
| } | ||
|
|
||
| body { | ||
| background: var(--background); | ||
| color: var(--foreground); | ||
| font-family: Arial, Helvetica, sans-serif; | ||
| .dark { | ||
| --background: oklch(0.141 0.005 285.823); | ||
| --foreground: oklch(0.985 0 0); | ||
| --card: oklch(0.21 0.006 285.885); | ||
| --card-foreground: oklch(0.985 0 0); | ||
| --popover: oklch(0.21 0.006 285.885); | ||
| --popover-foreground: oklch(0.985 0 0); | ||
| --primary: oklch(0.92 0.004 286.32); | ||
| --primary-foreground: oklch(0.21 0.006 285.885); | ||
| --secondary: oklch(0.274 0.006 286.033); | ||
| --secondary-foreground: oklch(0.985 0 0); | ||
| --muted: oklch(0.274 0.006 286.033); | ||
| --muted-foreground: oklch(0.705 0.015 286.067); | ||
| --accent: oklch(0.274 0.006 286.033); | ||
| --accent-foreground: oklch(0.985 0 0); | ||
| --destructive: oklch(0.704 0.191 22.216); | ||
| --border: oklch(1 0 0 / 10%); | ||
| --input: oklch(1 0 0 / 15%); | ||
| --ring: oklch(0.552 0.016 285.938); | ||
| --chart-1: oklch(0.488 0.243 264.376); | ||
| --chart-2: oklch(0.696 0.17 162.48); | ||
| --chart-3: oklch(0.769 0.188 70.08); | ||
| --chart-4: oklch(0.627 0.265 303.9); | ||
| --chart-5: oklch(0.645 0.246 16.439); | ||
| --sidebar: oklch(0.21 0.006 285.885); | ||
| --sidebar-foreground: oklch(0.985 0 0); | ||
| --sidebar-primary: oklch(0.488 0.243 264.376); | ||
| --sidebar-primary-foreground: oklch(0.985 0 0); | ||
| --sidebar-accent: oklch(0.274 0.006 286.033); | ||
| --sidebar-accent-foreground: oklch(0.985 0 0); | ||
| --sidebar-border: oklch(1 0 0 / 10%); | ||
| --sidebar-ring: oklch(0.552 0.016 285.938); | ||
| } | ||
|
|
||
| @layer base { | ||
| * { | ||
| @apply border-border outline-ring/50; | ||
| } | ||
| body { | ||
| @apply bg-background text-foreground; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,33 @@ | ||
| import type { Metadata } from 'next'; | ||
| import { Geist, Geist_Mono } from 'next/font/google'; | ||
| import './globals.css'; | ||
| import type { Metadata } from "next"; | ||
| import localFont from "next/font/local"; | ||
| import "./globals.css"; | ||
|
|
||
| const geistSans = Geist({ | ||
| variable: '--font-geist-sans', | ||
| subsets: ['latin'], | ||
| }); | ||
|
|
||
| const geistMono = Geist_Mono({ | ||
| variable: '--font-geist-mono', | ||
| subsets: ['latin'], | ||
| const pretendard = localFont({ | ||
| src: "./fonts/PretendardVariable.woff2", | ||
| display: "swap", | ||
| weight: "45 920", | ||
| variable: "--font-pretendard", | ||
| }); | ||
|
|
||
| export const metadata: Metadata = { | ||
| title: 'Create Next App', | ||
| description: 'Generated by create next app', | ||
| title: { | ||
| default: "코매칭", | ||
| template: "%s | 코매칭", | ||
| }, | ||
| description: "대학교 축제에서 운명의 인연을 만나보세요!", | ||
| keywords: ["대학축제", "커플매칭", "소개팅", "만남", "대학생", "축제"], | ||
| openGraph: { | ||
| title: "코매칭 - 대학축제 커플매칭", | ||
| description: "대학교 축제에서 운명의 인연을 만나보세요!", | ||
| type: "website", | ||
| locale: "ko_KR", | ||
| }, | ||
| viewport: { | ||
| width: "device-width", | ||
| initialScale: 1, | ||
| maximumScale: 1, | ||
| userScalable: false, | ||
| }, | ||
|
Comment on lines
+25
to
+30
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| }; | ||
|
|
||
| export default function RootLayout({ | ||
|
|
@@ -23,11 +36,13 @@ export default function RootLayout({ | |
| children: React.ReactNode; | ||
| }>) { | ||
| return ( | ||
| <html lang="en"> | ||
| <html lang="ko" className={pretendard.variable}> | ||
| <body | ||
| className={`${geistSans.variable} ${geistMono.variable} antialiased`} | ||
| className={`${pretendard.className} flex justify-center bg-white antialiased md:bg-gray-100`} | ||
| > | ||
| {children} | ||
| <div className="min-h-dvh w-full overflow-x-hidden bg-white px-4 text-black md:max-w-[430px] md:shadow-lg"> | ||
| {children} | ||
| </div> | ||
| </body> | ||
| </html> | ||
| ); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "$schema": "https://ui.shadcn.com/schema.json", | ||
| "style": "new-york", | ||
| "rsc": true, | ||
| "tsx": true, | ||
| "tailwind": { | ||
| "config": "", | ||
| "css": "app/globals.css", | ||
| "baseColor": "zinc", | ||
| "cssVariables": true, | ||
| "prefix": "" | ||
| }, | ||
| "iconLibrary": "lucide", | ||
| "aliases": { | ||
| "components": "@/components/ui", | ||
| "utils": "@/lib/utils", | ||
| "ui": "@/components/ui", | ||
| "lib": "@/lib", | ||
| "hooks": "@/hooks" | ||
| }, | ||
| "registries": {} | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import { clsx, type ClassValue } from "clsx"; | ||
| import { twMerge } from "tailwind-merge"; | ||
|
|
||
| export function cn(...inputs: ClassValue[]) { | ||
| return twMerge(clsx(inputs)); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.