diff --git a/src/components/Crew/CrewRanking.tsx b/src/components/Crew/CrewRanking.tsx index f42b58d..47c1fe9 100644 --- a/src/components/Crew/CrewRanking.tsx +++ b/src/components/Crew/CrewRanking.tsx @@ -1,41 +1,57 @@ import Crew1stCrownIcon from "@assets/icons/crew-1st-crown.svg?react" const RankPillar = ({ rank, name, score, height }: any) => { - const rankStyleMap: { gap: string; bgColor: string; fontSize: string }[] = [ + const rankStyleMap: { gap: number | string; bgColor: string; fontSize: string; fontWeight: string }[] = [ { - gap: "6", + gap: 24, bgColor: "#8BBAFE", fontSize: "32px", + fontWeight: "600", }, { - gap: "6", + gap: 24, bgColor: "#DCEBFD", fontSize: "22px", + fontWeight: "500", }, { - gap: "4", + gap: 16, bgColor: "#DCEBFD", fontSize: "22px", + fontWeight: "500", }, ] const style = rankStyleMap[rank - 1] return ( -
+
-
- {rank === 1 && } -
{rank}등
+
+ {rank === 1 && ( +
+ +
+ )} +
+ {rank}등 +
-
{name}
-
틀어짐 {score}회
+
{name}
+
자세 경고 {score}회
) @@ -60,9 +76,9 @@ const CrewRanking = ({ rankings, myRank }: { rankings: any[]; myRank: any }) =>
{/* 1, 2, 3등 랭킹 */}
- - - + + +
{/* 전체 랭킹 목록 */} diff --git a/src/components/Crew/MyCrew/CrewRanking.tsx b/src/components/Crew/MyCrew/CrewRanking.tsx deleted file mode 100644 index e7ef7f7..0000000 --- a/src/components/Crew/MyCrew/CrewRanking.tsx +++ /dev/null @@ -1,85 +0,0 @@ -import Crew1stCrownIcon from "@assets/icons/crew-1st-crown.svg?react" - -const RankPillar = ({ rank, name, score, height }: any) => { - const rankStyleMap: { gap: string; bgColor: string; fontSize: string }[] = [ - { - gap: "6", - bgColor: "#8BBAFE", - fontSize: "32px", - }, - { - gap: "6", - bgColor: "#DCEBFD", - fontSize: "22px", - }, - { - gap: "4", - bgColor: "#DCEBFD", - fontSize: "22px", - }, - ] - - const style = rankStyleMap[rank - 1] - - return ( -
-
-
- {rank === 1 && } -
{rank}등
-
-
{name}
-
틀어짐 {score}회
-
-
- ) -} - -const RankCard = ({ rank, name, score, isMe }: any) => ( -
-
-
{rank}
- {isMe ? "나" : name} -
- 자세경고 {score}회 -
-) - -const CrewRanking = ({ rankings, myRank }: { rankings: any[]; myRank: any }) => { - const topThree = rankings.slice(0, 3) - - return ( -
- {/* 1, 2, 3등 랭킹 */} -
- {topThree[0] && } - {topThree[1] && } - {topThree[2] && } -
- - {/* 전체 랭킹 목록 */} -
-
-
- -
-
- {rankings.map((rank, index) => ( - - ))} -
-
-
-
- ) -} - -export default CrewRanking diff --git a/src/components/Crew/MyCrew/MyCrewRankingContainer.tsx b/src/components/Crew/MyCrew/MyCrewRankingContainer.tsx index 9a4eb0d..45504f7 100644 --- a/src/components/Crew/MyCrew/MyCrewRankingContainer.tsx +++ b/src/components/Crew/MyCrew/MyCrewRankingContainer.tsx @@ -1,7 +1,7 @@ import SendInvitationIcon from "@assets/icons/crew-send-invitation.svg?react" import CrewUserIcon from "@assets/icons/crew-user-icon.svg?react" import { Link } from "react-router-dom" -import CrewRanking from "./CrewRanking" +import CrewRanking from "../CrewRanking" import RoutePath from "@/constants/routes.json" import MyCrewHeader from "./MyCrewHeader" @@ -58,9 +58,7 @@ export default function MyCrewRankingContainer(props: MyCrewRankingContainerProp
{/* 랭킹 표시 */} -
- {ranks.length > 0 && myRank && } -
+
{ranks.length > 0 && myRank && }
) diff --git a/src/components/Posture/GuidePopup/GuidePopupModal.tsx b/src/components/Posture/GuidePopup/GuidePopupModal.tsx index 875f069..a2dc72a 100644 --- a/src/components/Posture/GuidePopup/GuidePopupModal.tsx +++ b/src/components/Posture/GuidePopup/GuidePopupModal.tsx @@ -25,8 +25,11 @@ const GuidePopupModal = ({ onClose }: { onClose: () => void }): ReactElement => {step === 1 && ( <> - )} diff --git a/src/components/Posture/GuidePopup/ServiceIntroduction.tsx b/src/components/Posture/GuidePopup/ServiceIntroduction.tsx index 1acff8f..e05b67f 100644 --- a/src/components/Posture/GuidePopup/ServiceIntroduction.tsx +++ b/src/components/Posture/GuidePopup/ServiceIntroduction.tsx @@ -5,17 +5,17 @@ export default function ServiceIntroduction() {
-
-
+
+
자세공작소는 실시간 모니터링으로
바른 자세 유지를 돕는 서비스입니다
- + 더 세밀한 모니터링을 위해, 최초 1회 자세 기준점 설정이 필요합니다.
{/* content */} -
+
1 diff --git a/src/components/Posture/GuidePopup/SnapshotGuide.tsx b/src/components/Posture/GuidePopup/SnapshotGuide.tsx index fab99c2..33020d3 100644 --- a/src/components/Posture/GuidePopup/SnapshotGuide.tsx +++ b/src/components/Posture/GuidePopup/SnapshotGuide.tsx @@ -3,42 +3,46 @@ import CloseCrewPanelIcon from "@assets/images/posture-snapshot-guide.png" export default function SnapshotGuide() { return ( <> -
+
-
바른 자세를 취해주세요
+
바른 자세를 취해주세요
{/* content */} -
+
스냅샷 가이드
-
+
1 - 머리와 목을 일직선으로 곧게 펴기 + + 머리와 목을 일직선으로 곧게 펴기 +
-
+
2 - 양쪽 어깨 일직선 유지하기 + 양쪽 어깨 일직선 유지하기
-
+
3 - 팔은 책상 위에 수평으로 두기 + 팔은 책상 위에 수평으로 두기
-
+
4 - 등과 허리는 등받이에 지지하기 + + 등과 허리는 등받이에 지지하기 +
diff --git a/src/layouts/AnalysisLayout.tsx b/src/layouts/AnalysisLayout.tsx index 409b397..410aef4 100644 --- a/src/layouts/AnalysisLayout.tsx +++ b/src/layouts/AnalysisLayout.tsx @@ -2,7 +2,7 @@ import { Outlet } from "react-router-dom" export default function AnalysisLayout() { return ( -
+
) diff --git a/src/layouts/BaseLayout.tsx b/src/layouts/BaseLayout.tsx index 5461f7b..1010158 100644 --- a/src/layouts/BaseLayout.tsx +++ b/src/layouts/BaseLayout.tsx @@ -8,7 +8,7 @@ const BaseLayout: React.FC = () => { {/* Main Content */} -
+
diff --git a/src/layouts/MonitoringLayout.tsx b/src/layouts/MonitoringLayout.tsx index fb7d262..1f9fe3b 100644 --- a/src/layouts/MonitoringLayout.tsx +++ b/src/layouts/MonitoringLayout.tsx @@ -2,7 +2,7 @@ import { Outlet } from "react-router-dom" export default function MonitoringLayout() { return ( -
+
) diff --git a/src/pages/AnalysisDashboard.tsx b/src/pages/AnalysisDashboard.tsx index cd9a0aa..41c524b 100644 --- a/src/pages/AnalysisDashboard.tsx +++ b/src/pages/AnalysisDashboard.tsx @@ -99,15 +99,15 @@ const AnalysisDashboard = () => { {isError &&
데이터를 불러오는 것에 실패했습니다
} {!isLoading && !isError && todayAnalysis && ( -
+
{/* 고정된 전체 틀어짐 횟수 카드 */}
-

전체 자세 경고 횟수

-
- {totalCount} - + 전체 자세 경고 횟수 +
+ {totalCount} +
@@ -133,10 +133,10 @@ const AnalysisDashboard = () => {
{title}
-

{title}

+ {title}
-
{getPoseCount(type)}
-
+
{getPoseCount(type)}
+
diff --git a/src/pages/MyCrew.tsx b/src/pages/MyCrew.tsx index dfa3893..0d6e76b 100644 --- a/src/pages/MyCrew.tsx +++ b/src/pages/MyCrew.tsx @@ -1,4 +1,4 @@ -import CrewRanking from "@/components/Crew/MyCrew/CrewRanking" +import CrewRanking from "@/components/Crew/CrewRanking" import MyCrewHeader from "@/components/Crew/MyCrew/MyCrewHeader" import { useModals } from "@/hooks/useModals" import useMyGroup from "@/hooks/useMyGroup" @@ -106,7 +106,7 @@ export default function MyCrew() { {/* 랭킹 헤더 */}
- 바른자세 랭킹 + 바른자세 랭킹
최근 1시간 |