Skip to content
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

Fix: *.css.ts 파일 내 import 문제 임시 조치 #293

Merged
merged 5 commits into from
Mar 3, 2024
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { style, styleVariants } from '@vanilla-extract/css';
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';

const BASE = style({
backgroundColor: colors.GREY_200,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const CONTAINER_BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';
export const SEGMENT_CONTAINER = style({
display: 'flex',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const BOLD = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import type { ComponentPropsWithoutRef, ReactNode } from 'react';

import { TYPE } from './P.css';
import { textColors } from '#/constants/Text.css';
import { textColors } from '#/style/text.css';

export interface PghProps extends ComponentPropsWithoutRef<'p'> {
type?: 'text' | 'caption';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import type { ComponentPropsWithoutRef, ReactNode } from 'react';
import { textColors } from '#/constants/Text.css';
import { textColors } from '#/style/text.css';

export interface SpanProps extends ComponentPropsWithoutRef<'span'> {
color?: keyof typeof textColors;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

// 기본 CSS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { styleVariants } from '@vanilla-extract/css';

export const COLOR = styleVariants({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const UL_BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '#/constants/colors';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
6 changes: 3 additions & 3 deletions frontend/_libs/external-temporal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ export * from './components/view/Tooltip/Tooltip';
export * from './components/fallback/ErrorBoundary/ErrorBoundary';
export * from './components/fallback/Loading/Loading';

export * from './util/global.css';
export * from './style/global.css';
export * from './util/throttle';
export * from './util/debounce';

export * from './constants/colors';
export * from './constants/Text.css';
export * from './style/colors';
export * from './style/text.css';
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { globalFontFace, globalStyle } from '@vanilla-extract/css';
import { colors } from '../constants/colors';
import { colors } from './colors';

export const style = {
overflow: globalStyle('html, body', {
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/notice/components/Notice/Notice.css.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { styleVariants } from '@vanilla-extract/css';
export const BACKGROUND = styleVariants({
normal: {
Expand Down
3 changes: 1 addition & 2 deletions frontend/apps/notice/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"baseUrl": "./",
"paths": {
"@N/*": ["./*"],
"#/components/*": ["../../_libs/external-temporal/components/*"],
"#/constants/*": ["../../_libs/external-temporal/constants/*"]
"#/*": ["../../_libs/external-temporal/*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const CONTAINER = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { style } from '@vanilla-extract/css';
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';

export const BASE = style({
display: 'grid',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const LAYOUT_SCH = styleVariants({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { style, styleVariants } from '@vanilla-extract/css';
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';

export const BASE = style({
// width: 'calc(430px / 7)',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';
export const PARTICIPANTS = style({
backgroundColor: colors.GREY_100,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({});
2 changes: 1 addition & 1 deletion frontend/apps/schedule/layout/Layout.css.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const APPLAYOUT_MOBILE = style({
Expand Down
3 changes: 1 addition & 2 deletions frontend/apps/schedule/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"baseUrl": "./",
"paths": {
"@SCH/*": ["./*"],
"#/components/*": ["../../_libs/external-temporal/components/*"],
"#/constants/*": ["../../_libs/external-temporal/constants/*"]
"#/*": ["../../_libs/external-temporal/*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/shell/components/Header/Header.css.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const BASE = style({
Expand Down
2 changes: 1 addition & 1 deletion frontend/apps/shell/layout/Layout.css.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style } from '@vanilla-extract/css';

export const APPLAYOUT_MOBILE = style({
Expand Down
3 changes: 1 addition & 2 deletions frontend/apps/shell/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"baseUrl": "./",
"paths": {
"@SH/*": ["./*"],
"#/components/*": ["../../_libs/external-temporal/components/*"],
"#/constants/*": ["../../_libs/external-temporal/constants/*"]
"#/*": ["../../_libs/external-temporal/*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { colors } from '@amadda/external-temporal';
import { colors } from '#/style/colors';
import { style, styleVariants } from '@vanilla-extract/css';

export const GROUP_LAYOUT = style({
Expand Down
3 changes: 1 addition & 2 deletions frontend/apps/user/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"baseUrl": "./",
"paths": {
"@U/*": ["./*"],
"#/components/*": ["../../_libs/external-temporal/components/*"],
"#/constants/*": ["../../_libs/external-temporal/constants/*"]
"#/*": ["../../_libs/external-temporal/*"]
}
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
Expand Down