Skip to content

Commit 1623c93

Browse files
authored
Merge pull request #151 from TEAM-COMFIT/dev
2 parents c20f79b + cf791e2 commit 1623c93

9 files changed

Lines changed: 43 additions & 18 deletions

File tree

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@
66
> Comfit은 기업의 핵심 정보와 나의 경험을 하나로 엮어 지원 기업별 맞춤 자소서 전략을 제안하는 AI 기반 분석 플랫폼입니다.
77
88
<br/>
9+
<img width="1080" alt="comfit_background" src="https://github.com/user-attachments/assets/26653123-9674-4584-b94a-242c36db19b7" />
910

1011

11-
12+
13+
14+
<br/><br/>
1215

1316
## 👥 Team member
1417

15-
| <img src="https://avatars.githubusercontent.com/u/84303489?v=4" width="150" /> | <img src="https://avatars.githubusercontent.com/u/91336314?v=4" width="150" /> | <img src="https://avatars.githubusercontent.com/u/108409327?v=4" width="150" /> | <img src="https://avatars.githubusercontent.com/u/101101694?v=4" width="150" /> |
18+
| <img width="200" height="300" alt="채리드" src="https://github.com/user-attachments/assets/c59d5e55-e980-48b6-b745-27c10d470f74" /> | <img width="200" height="300" alt="오두콩" src="https://github.com/user-attachments/assets/74c2eb7e-ef44-4a9a-a71d-b4271cddd038" /> | <img width="200" height="300" alt="막냉이" src="https://github.com/user-attachments/assets/1480d054-19c9-4f9d-8b15-08052ad14e38" /> | <img width="200" height="300" alt="배정민" src="https://github.com/user-attachments/assets/8644c3db-81da-44cb-9979-0bc672810b47" /> |
1619
| :--: | :--: | :--: | :--: |
1720
| <div align="center"><b>이채영 👑</b></div> | <div align="center"><b>오수빈</b></div> | <div align="center"><b>정유진</b></div> | <div align="center"><b>배정민</b></div> |
1821
| [@hummingbbird](https://github.com/hummingbbird) | [@odukong](https://github.com/odukong) | [@u-zzn](https://github.com/u-zzn) | [@qowjdals23](https://github.com/qowjdals23) |
1922

20-
<br/>
2123
<br/>
2224

2325
## 🔧 Tech Stack
@@ -71,7 +73,6 @@ type: description (#이슈 넘버)
7173
<br>
7274

7375
### 👀 Git Convention
74-
<img width="585" height="682" alt="git flow 이미지" src="https://github.com/user-attachments/assets/e98f22e2-a1a4-4627-b27d-c3b2ffc3651c" />
7576

7677
- 기본 틀: **[type]/#[이슈넘버]/기능 이름** (ex)`feat/#914/company-card-component`)
7778
- 기능 타입에 맞게 가장 앞단의 키워드를 변경해주세요. (feat / refactor / fix / hotfix/ chore 등)
@@ -198,4 +199,4 @@ src
198199
4. 근거 있는 개발, 근거 있는 AI 툴 사용 🤖
199200
5. 컨벤션 잘 지키기 👮
200201

201-
<br><br>
202+
<br><br>

src/features/experience-matching/ui/analyzing/analyzing.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useEffect, useState } from "react";
22

3-
import { LOVE } from "@/shared/assets/gifs";
3+
import { CAT_SPINNER } from "@/shared/assets/gifs";
44
import { Alert } from "@/shared/ui/alert";
55
import { useCreateReport } from "@features/experience-matching/index";
66

@@ -45,7 +45,7 @@ export const Analyzing = ({ nextStep }: { nextStep: () => void }) => {
4545
return (
4646
<>
4747
<div className={styles.layout}>
48-
<img className={styles.spinner} src={LOVE} alt="로딩 스피너" />
48+
<img className={styles.spinner} src={CAT_SPINNER} alt="로딩 스피너" />
4949
<div className={styles.titleBox}>
5050
<div className={styles.title}>기업과 나의 경험을 분석하고 있어요</div>
5151
<div className={styles.subTitle}>평균 15~30초 소요됩니다</div>

src/pages/experience-detail/experience-detail-page.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ const ExperienceDetailPage = ({ mode }: ExperiencePageProps) => {
7171
<ExperienceAlertRenderer />
7272
<ModalBasic
7373
isOpen={isOpen}
74-
onClose={confirmLeave}
75-
onConfirm={cancelLeave}
74+
onClose={cancelLeave}
75+
onConfirm={confirmLeave}
7676
title={`작성중인 내용이 있습니다.\n정말 나가시겠습니까?`}
7777
subTitle="저장하지 않으면 내용이 사라져요."
78-
closeText="나가기"
79-
confirmText="이어서 작성하기"
78+
closeText="이어서 작성"
79+
confirmText="나가기"
8080
/>
8181
</>
8282
);

src/pages/home/major-company-section/major-company-section.css.ts

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,27 @@ export const smallCards = style({
5252
});
5353

5454
export const emptyWrapper = style({
55-
display: "grid",
56-
gridTemplateColumns: "1fr 1fr",
57-
gap: "2rem",
55+
// 1. 부모 그리드에서 가로를 꽉 채우기 (2컬럼 기준)
56+
gridColumn: "1 / -1",
57+
58+
// 2. 내부 이미지 중앙 정렬을 위해 flex 사용
59+
display: "flex",
60+
flexDirection: "column",
61+
justifyContent: "center",
62+
alignItems: "center", // 부모 그리드 수직 중앙 정렬 (필요시)
63+
5864
width: "100%",
5965
minHeight: "45rem",
6066
});
67+
68+
export const spinner = style({
69+
width: "20rem",
70+
aspectRatio: "1 / 1",
71+
objectFit: "contain",
72+
});
73+
74+
export const spinnerText = style({
75+
marginTop: "0.2rem",
76+
...themeVars.fontStyles.hline_m_18,
77+
color: themeVars.color.gray600,
78+
});

src/pages/home/major-company-section/major-company-section.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { useState } from "react";
33
import { useAuthStore } from "@/app/store";
44
import { useGetMajorCompanies } from "@/features/home/api/use-get-major-companies.query";
55
import { MajorCompanyCard } from "@/features/home/ui";
6+
import { CAT_SPINNER } from "@/shared/assets/gifs";
67
import { RefreshButton } from "@/widgets";
78

89
import * as styles from "./major-company-section.css";
@@ -40,7 +41,10 @@ const MajorCompanySection = () => {
4041

4142
<div className={styles.cardGrid}>
4243
{isLoading || safeData.length < 3 ? (
43-
<div className={styles.emptyWrapper}>로딩 중...</div>
44+
<div className={styles.emptyWrapper}>
45+
<img src={CAT_SPINNER} className={styles.spinner} alt="로딩중" />
46+
<p className={styles.spinnerText}>기업 정보를 불러오고 있어요</p>
47+
</div>
4448
) : (
4549
<>
4650
<div className={styles.smallCards}>

src/pages/login/kakao-login-page.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ const KakaoLoginPage = () => {
2323
if (result && result.accessToken) {
2424
actions.login(result.accessToken);
2525
const targetPath = result.isNew ? "/onboarding" : "/";
26-
console.log("응답값:", result);
27-
console.log("응답값:", result.isNew);
2826
navigate(targetPath, { replace: true });
2927
} else {
3028
navigate("/login", { replace: true });

src/pages/login/login-page.css.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ const AppleFont = fontFace({
1111

1212
export const container = style({
1313
margin: `0 auto`,
14-
paddingTop: `calc(${themeVars.height.header} + 28.4rem)`,
14+
paddingTop: `calc(${themeVars.height.header})`,
1515
display: "flex",
1616
flexDirection: "column",
1717
alignItems: "center",
18+
justifyContent: "center",
1819
gap: "8rem",
20+
border: "1px solid red",
21+
height: "100vh",
1922
});
2023

2124
export const section = style({
5.7 MB
Loading

src/shared/assets/gifs/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
export { default as LOADING } from "./spinner.gif";
22
export { default as LOVE } from "./love.gif";
33
export { default as KEY_SPINNER } from "./key-spinner.gif";
4+
export { default as CAT_SPINNER } from "./cat_walk.gif";

0 commit comments

Comments
 (0)