-
Notifications
You must be signed in to change notification settings - Fork 0
chore: global 스타일 적용 #33
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
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
a416b5d
chore: 글로벌 style 세팅(shadcn테마, 폰트, 토큰, 기본 타이포세팅)
jjjsun a57d8f3
chore: cn 유틸리티를 lib/utils로 통일
jjjsun 79ea13c
chore: axios 인스턴스 및 요청/응답 인터셉터 설정
jjjsun b6f31fb
chore: Tanstack Query QueryClient 전역 설정 추가
jjjsun f617627
chore: API연동 대비 query key관리(keys.ts)추가, 폴더구조 정리
jjjsun 33f656b
fix:QueryClientProvider 중복 제거후, queryClient 단일화
jjjsun dfccd66
chore:border 중복스타일 제거
jjjsun ffbf7c1
chore: 스위치 버튼에 포커스표시와 ARIA 속성 추가로 접근성 개선
jjjsun d30e6ed
fix:타이포 기본 적용 조건 수정
jjjsun 6646d0e
chore: global.css 수정
jjjsun c87e41b
chore: owner 쿼리키에 중간키 추가
jjjsun bba8c0a
Merge branch 'develop' into chore/global-setup
jjjsun e3d6e2c
chore: 쿼리 키에 넣을 params를 직렬화 가능한 타입으로 제한
jjjsun 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "css": { | ||
| "parser": { | ||
| "tailwindDirectives": true | ||
| } | ||
| } | ||
| } |
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,38 @@ | ||
| import axios, { type AxiosError, type InternalAxiosRequestConfig } from "axios"; | ||
|
|
||
| export const api = axios.create({ | ||
| baseURL: import.meta.env.VITE_API_URL as string | undefined, | ||
| timeout: 10000, | ||
| }); | ||
|
|
||
| function getAccessToken() { | ||
| return localStorage.getItem("accessToken"); | ||
| } | ||
|
|
||
| api.interceptors.request.use((config: InternalAxiosRequestConfig) => { | ||
| const token = getAccessToken(); | ||
| if (token) { | ||
| config.headers.Authorization = `Bearer ${token}`; | ||
| } | ||
| return config; | ||
| }); | ||
|
|
||
| api.interceptors.response.use( | ||
| (res) => res, | ||
| (err: AxiosError) => { | ||
| const status = err.response?.status; | ||
| const data = err.response?.data; | ||
|
|
||
| if (import.meta.env.DEV) { | ||
| console.error("[api error]", { | ||
| status, | ||
| data, | ||
| message: err.message, | ||
| url: err.config?.url, | ||
| method: err.config?.method, | ||
| }); | ||
| } | ||
| //Todo: 401 처리(로그아웃.리다이렉트,refresh)는 스펙 확정후 | ||
| return Promise.reject(err); | ||
| }, | ||
| ); |
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 |
|---|---|---|
| @@ -1,128 +1 @@ | ||
| @import "tailwindcss"; | ||
| @import "tw-animate-css"; | ||
|
|
||
| @custom-variant dark (&:is(.dark *)); | ||
|
|
||
| @theme inline { | ||
| --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); | ||
| --color-background: var(--background); | ||
| --color-foreground: var(--foreground); | ||
| --color-card: var(--card); | ||
| --color-card-foreground: var(--card-foreground); | ||
| --color-popover: var(--popover); | ||
| --color-popover-foreground: var(--popover-foreground); | ||
| --color-primary: var(--primary); | ||
| --color-primary-foreground: var(--primary-foreground); | ||
| --color-secondary: var(--secondary); | ||
| --color-secondary-foreground: var(--secondary-foreground); | ||
| --color-muted: var(--muted); | ||
| --color-muted-foreground: var(--muted-foreground); | ||
| --color-accent: var(--accent); | ||
| --color-accent-foreground: var(--accent-foreground); | ||
| --color-destructive: var(--destructive); | ||
| --color-border: var(--border); | ||
| --color-input: var(--input); | ||
| --color-ring: var(--ring); | ||
| --color-chart-1: var(--chart-1); | ||
| --color-chart-2: var(--chart-2); | ||
| --color-chart-3: var(--chart-3); | ||
| --color-chart-4: var(--chart-4); | ||
| --color-chart-5: var(--chart-5); | ||
| --color-sidebar: var(--sidebar); | ||
| --color-sidebar-foreground: var(--sidebar-foreground); | ||
| --color-sidebar-primary: var(--sidebar-primary); | ||
| --color-sidebar-primary-foreground: var(--sidebar-primary-foreground); | ||
| --color-sidebar-accent: var(--sidebar-accent); | ||
| --color-sidebar-accent-foreground: var(--sidebar-accent-foreground); | ||
| --color-sidebar-border: var(--sidebar-border); | ||
| --color-sidebar-ring: var(--sidebar-ring); | ||
| } | ||
|
|
||
| :root { | ||
| --radius: 0.625rem; | ||
| --background: oklch(1 0 0); | ||
| --foreground: oklch(0.13 0.028 261.692); | ||
| --card: oklch(1 0 0); | ||
| --card-foreground: oklch(0.13 0.028 261.692); | ||
| --popover: oklch(1 0 0); | ||
| --popover-foreground: oklch(0.13 0.028 261.692); | ||
| --primary: oklch(0.21 0.034 264.665); | ||
| --primary-foreground: oklch(0.985 0.002 247.839); | ||
| --secondary: oklch(0.967 0.003 264.542); | ||
| --secondary-foreground: oklch(0.21 0.034 264.665); | ||
| --muted: oklch(0.967 0.003 264.542); | ||
| --muted-foreground: oklch(0.551 0.027 264.364); | ||
| --accent: oklch(0.967 0.003 264.542); | ||
| --accent-foreground: oklch(0.21 0.034 264.665); | ||
| --destructive: oklch(0.577 0.245 27.325); | ||
| --border: oklch(0.928 0.006 264.531); | ||
| --input: oklch(0.928 0.006 264.531); | ||
| --ring: oklch(0.707 0.022 261.325); | ||
| --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.002 247.839); | ||
| --sidebar-foreground: oklch(0.13 0.028 261.692); | ||
| --sidebar-primary: oklch(0.21 0.034 264.665); | ||
| --sidebar-primary-foreground: oklch(0.985 0.002 247.839); | ||
| --sidebar-accent: oklch(0.967 0.003 264.542); | ||
| --sidebar-accent-foreground: oklch(0.21 0.034 264.665); | ||
| --sidebar-border: oklch(0.928 0.006 264.531); | ||
| --sidebar-ring: oklch(0.707 0.022 261.325); | ||
| } | ||
|
|
||
| .dark { | ||
| --background: oklch(0.13 0.028 261.692); | ||
| --foreground: oklch(0.985 0.002 247.839); | ||
| --card: oklch(0.21 0.034 264.665); | ||
| --card-foreground: oklch(0.985 0.002 247.839); | ||
| --popover: oklch(0.21 0.034 264.665); | ||
| --popover-foreground: oklch(0.985 0.002 247.839); | ||
| --primary: oklch(0.928 0.006 264.531); | ||
| --primary-foreground: oklch(0.21 0.034 264.665); | ||
| --secondary: oklch(0.278 0.033 256.848); | ||
| --secondary-foreground: oklch(0.985 0.002 247.839); | ||
| --muted: oklch(0.278 0.033 256.848); | ||
| --muted-foreground: oklch(0.707 0.022 261.325); | ||
| --accent: oklch(0.278 0.033 256.848); | ||
| --accent-foreground: oklch(0.985 0.002 247.839); | ||
| --destructive: oklch(0.704 0.191 22.216); | ||
| --border: oklch(1 0 0 / 10%); | ||
| --input: oklch(1 0 0 / 15%); | ||
| --ring: oklch(0.551 0.027 264.364); | ||
| --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.034 264.665); | ||
| --sidebar-foreground: oklch(0.985 0.002 247.839); | ||
| --sidebar-primary: oklch(0.488 0.243 264.376); | ||
| --sidebar-primary-foreground: oklch(0.985 0.002 247.839); | ||
| --sidebar-accent: oklch(0.278 0.033 256.848); | ||
| --sidebar-accent-foreground: oklch(0.985 0.002 247.839); | ||
| --sidebar-border: oklch(1 0 0 / 10%); | ||
| --sidebar-ring: oklch(0.551 0.027 264.364); | ||
| } | ||
|
|
||
| @layer base { | ||
| * { | ||
| @apply border-border outline-ring/50; | ||
| } | ||
| body { | ||
| @apply bg-background text-foreground; | ||
| } | ||
| } | ||
|
|
||
| body { | ||
| word-break: keep-all; | ||
| overflow-wrap: break-word; | ||
| } | ||
| @import "./styles/globals.css"; |
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 was deleted.
Oops, something went wrong.
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,6 +1,6 @@ | ||
| import { clsx, type ClassValue } from "clsx"; | ||
| import { twMerge } from "tailwind-merge"; | ||
|
|
||
| export function cn(...inputs: ClassValue[]) { | ||
| return twMerge(clsx(inputs)); | ||
| } | ||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| import { StrictMode } from "react"; | ||
| import { createRoot } from "react-dom/client"; | ||
| import "./index.css"; | ||
| import App from "./App.tsx"; | ||
|
|
||
| createRoot(document.getElementById("root")!).render( | ||
| <StrictMode> | ||
| <App /> | ||
| </StrictMode> | ||
| ); | ||
| import { StrictMode } from "react"; | ||
| import { createRoot } from "react-dom/client"; | ||
| import "./index.css"; | ||
| import App from "./App.tsx"; | ||
| import { QueryClientProvider } from "@tanstack/react-query"; | ||
| import { queryClient } from "@/query/queryClient.ts"; | ||
|
|
||
| createRoot(document.getElementById("root")!).render( | ||
| <StrictMode> | ||
| <QueryClientProvider client={queryClient}> | ||
| <App /> | ||
| </QueryClientProvider> | ||
| </StrictMode>, | ||
| ); | ||
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.