Skip to content

Commit 296d95e

Browse files
authored
Merge pull request #138 from TEAM-COMFIT/feat/#133/experience-matching-qa
[Feat] 경험매칭AI QA 반영
2 parents 57cefa8 + ad077dd commit 296d95e

11 files changed

Lines changed: 48 additions & 37 deletions

File tree

src/features/experience-matching/ui/analyzing/analyzing.css.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export const layout = style({
66
display: "flex",
77
width: "106rem",
88
height: "39.2rem",
9+
marginTop: "4.3rem",
910
padding: "1.6rem 0.4rem",
1011
flexDirection: "column",
1112
justifyContent: "center",

src/features/experience-matching/ui/matching-auto-complete/matching-auto-complete.css.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const inputFocused = style({
3838

3939
export const icon = style({
4040
position: "absolute",
41-
right: "1.8rem",
41+
right: "1.2rem",
4242
top: "50%",
4343
transform: "translateY(-50%)",
4444
color: themeVars.color.blue600,
@@ -66,15 +66,18 @@ export const menu = style({
6666

6767
selectors: {
6868
"&::-webkit-scrollbar": {
69-
width: "0.4rem",
69+
width: "1.2rem",
7070
},
7171
"&::-webkit-scrollbar-thumb": {
7272
backgroundColor: themeVars.color.gray300,
73+
height: "50px",
7374
borderRadius: "100px",
75+
backgroundClip: "padding-box",
76+
border: `4px solid transparent`,
7477
},
7578
"&::-webkit-scrollbar-track": {
7679
backgroundColor: "transparent",
77-
margin: "0.4rem 0",
80+
margin: "0.8rem 1rem",
7881
},
7982
},
8083
});
@@ -87,7 +90,7 @@ export const menuItem = style({
8790
height: "4.4rem",
8891
borderRadius: "8px",
8992
cursor: "pointer",
90-
...themeVars.fontStyles.body_m_14,
93+
...themeVars.fontStyles.body_r_16,
9194
color: themeVars.color.gray800,
9295
transition: "background-color 0.2s",
9396

src/features/experience-matching/ui/select-experience/select-experience.css.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export const layout = style({
1010
export const totalCount = style({
1111
marginBottom: "0.8rem",
1212
color: themeVars.color.gray800,
13-
...themeVars.fontStyles.body_b_14,
13+
...themeVars.fontStyles.body_b_16,
1414
});
1515

1616
export const blueCount = style({
@@ -22,11 +22,12 @@ export const box = style({
2222
gridTemplateColumns: "repeat(3, 1fr)",
2323
alignContent: "start",
2424
gridAutoRows: "max-content",
25-
gap: "1.6rem",
25+
gap: "1.3rem",
2626
width: "106rem",
2727
height: "39.2rem",
28-
padding: "1.6rem 0.2rem 1.6rem 2rem",
28+
padding: "1.6rem 4rem 1.6rem 4rem",
2929

30+
overflowX: "hidden",
3031
overflowY: "auto",
3132
borderRadius: "16px",
3233
border: `1.5px ${themeVars.color.normal} solid`,

src/features/landing/ui/point-card/point-card.css.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ export const container = style({
4040
export const header = style({
4141
display: "flex",
4242
flexDirection: "column",
43-
textAlign: "center",
43+
textAlign: "left",
44+
45+
...screen.mobile({
46+
textAlign: "center",
47+
}),
4448
});
4549

4650
export const title = style({
Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
import { style, keyframes } from "@vanilla-extract/css";
1+
import { style } from "@vanilla-extract/css";
22

33
import { themeVars } from "@/app/styles";
44

5-
const rotate = keyframes({
6-
"0%": { transform: "rotate(0deg)" },
7-
"100%": { transform: "rotate(360deg)" },
8-
});
9-
105
export const overlay = style({
116
position: "fixed",
127
top: 0,
@@ -19,7 +14,8 @@ export const overlay = style({
1914
justifyContent: "center",
2015
alignItems: "center",
2116

22-
backgroundColor: "rgba(255, 255, 255, 0.5)",
17+
opacity: "0.6",
18+
backgroundColor: themeVars.color.gray800,
2319
backdropFilter: "blur(8px)",
2420
WebkitBackdropFilter: "blur(8px)",
2521
});
@@ -32,12 +28,12 @@ export const container = style({
3228
});
3329

3430
export const spinner = style({
35-
width: "10rem",
36-
height: "10rem",
37-
animation: `${rotate} 1.5s linear infinite`,
31+
width: "22rem",
32+
height: "10.8rem",
33+
aspectRatio: 55 / 27,
3834
});
3935

4036
export const text = style({
41-
color: themeVars.color.black,
42-
...themeVars.fontStyles.hding_b_22,
37+
color: themeVars.color.white,
38+
...themeVars.fontStyles.title_m_24,
4339
});

src/pages/fallback/loading-page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { LOADING } from "@/shared/assets/images";
1+
import { KEY_SPINNER } from "@/shared/assets/gifs";
22

33
import * as styles from "./loading-page.css";
44

55
export const LoadingPage = () => {
66
return (
77
<div className={styles.overlay}>
88
<div className={styles.container}>
9-
<img src={LOADING} className={styles.spinner} alt="로딩 중" />
10-
<div className={styles.text}>잠시만 기다려주세요</div>
9+
<img src={KEY_SPINNER} className={styles.spinner} alt="로딩 중" />
10+
<div className={styles.text}>페이지가 로딩중입니다 ...</div>
1111
</div>
1212
</div>
1313
);

src/pages/landing/landing-page.tsx

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { useRef } from "react";
2+
import { useNavigate } from "react-router-dom";
23

4+
import { ROUTES } from "@/app/routes/paths";
5+
import { useAuthStore } from "@/app/store";
36
import {
47
LandingCard,
58
WorryCard,
69
PointCard,
710
CompanySlider,
8-
AlertModal,
911
} from "@/features/landing";
1012
import { LANDING_CARD_ITEMS } from "@/features/landing/config/landing-card.constant";
1113
import { CHARACTER, FLOAT_IMG, KEY } from "@/shared/assets/images";
@@ -16,11 +18,16 @@ import * as styles from "./landing-page.css";
1618
const LandingPage = () => {
1719
useScrollToTop();
1820
const { isMobile } = useDevice();
19-
const modalRef = useRef<HTMLDialogElement>(null);
21+
const { isLoggedIn } = useAuthStore();
22+
const navigate = useNavigate();
2023
const sectionRef = useRef<HTMLDivElement>(null);
2124

22-
const handleModal = () => {
23-
modalRef.current?.showModal();
25+
const handleMovetoPage = () => {
26+
if (isLoggedIn) {
27+
navigate(ROUTES.EXPERIENCE_MATCHING);
28+
} else {
29+
navigate(ROUTES.HOME);
30+
}
2431
};
2532

2633
const handleScrollToSection = () => {
@@ -115,12 +122,10 @@ const LandingPage = () => {
115122
<br /> 하지만 올바른 방향과 전략이 있다면 충분히 해낼 수 있습니다
116123
</p>
117124
</div>
118-
<button className={styles.footerButton} onClick={handleModal}>
125+
<button className={styles.footerButton} onClick={handleMovetoPage}>
119126
경험 매칭하기
120127
</button>
121128
</footer>
122-
{/** 모달 */}
123-
<AlertModal ref={modalRef} />
124129
</div>
125130
);
126131
};
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
export const height = {
22
header: "6.6rem",
3-
mobile_header: "10.3rem",
3+
mobile_header: "6.1rem",
44
} as const;

src/shared/ui/textfield/textfield.css.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export const wrapper = style({
66
display: "flex",
77
flexDirection: "column",
88

9-
padding: "2.8rem 2rem",
9+
padding: "2rem 2rem",
1010
borderRadius: "16px",
1111
border: `1px solid ${themeVars.color.normal}`,
1212
});

0 commit comments

Comments
 (0)