diff --git a/src/components/TopBarText.tsx b/src/components/TopBarText.tsx index e37f9df..93a5964 100644 --- a/src/components/TopBarText.tsx +++ b/src/components/TopBarText.tsx @@ -42,7 +42,7 @@ const TopBarText: FC = ({ } }} > - + logo {center} = ({ } }} > - + back {center} diff --git a/src/pages/BoardPage/BoardBottomModal.tsx b/src/pages/BoardPage/BoardBottomModal.tsx index 82632e1..ceda6b0 100644 --- a/src/pages/BoardPage/BoardBottomModal.tsx +++ b/src/pages/BoardPage/BoardBottomModal.tsx @@ -67,7 +67,7 @@ const BoardBottomModal = ({ selectedOption, onSelect, isOpen, onClose }: BoardBo onClick={() => onSelect(i)} > {option.value} - {isSelcted && } + {isSelcted && checkModal} ); })} diff --git a/src/pages/BoardPage/BoardDetailpage/BoardDetailPage.tsx b/src/pages/BoardPage/BoardDetailpage/BoardDetailPage.tsx index 71979cb..c532d3a 100644 --- a/src/pages/BoardPage/BoardDetailpage/BoardDetailPage.tsx +++ b/src/pages/BoardPage/BoardDetailpage/BoardDetailPage.tsx @@ -314,6 +314,7 @@ const BoardDetailPage = () => { key={i + postsData?.title + "img"} src={img} className="board-post-detail-content-img" + alt="board post detail content img" /> ); })} @@ -360,7 +361,7 @@ const BoardDetailPage = () => { placeholder="댓글을 입력하세요." onChange={(e) => setCommentValue(e.target.value)} > - + send ); diff --git a/src/pages/BoardPage/BoardPage.tsx b/src/pages/BoardPage/BoardPage.tsx index dc3e513..7f81da9 100644 --- a/src/pages/BoardPage/BoardPage.tsx +++ b/src/pages/BoardPage/BoardPage.tsx @@ -53,12 +53,16 @@ const BoardPage = () => { return ( <> - }> + } + > 게시글 {postsData.length}개
setIsModalOpen((prev) => !prev)}> {boardSelectedOption[selectedOption].value} - + arrowDown
{postsData.length !== 0 ? ( diff --git a/src/pages/BoardPage/BoardPostItem.tsx b/src/pages/BoardPage/BoardPostItem.tsx index 184d682..012ce13 100644 --- a/src/pages/BoardPage/BoardPostItem.tsx +++ b/src/pages/BoardPage/BoardPostItem.tsx @@ -216,7 +216,12 @@ const BoardPostItem = ({
{thumbnail && thumbnail.map((img, i) => ( - + board post item content img ))}
diff --git a/src/pages/BoardPage/BoardRegisterPage/BoardRegisterPage.tsx b/src/pages/BoardPage/BoardRegisterPage/BoardRegisterPage.tsx index 1a178d9..83e9ae6 100644 --- a/src/pages/BoardPage/BoardRegisterPage/BoardRegisterPage.tsx +++ b/src/pages/BoardPage/BoardRegisterPage/BoardRegisterPage.tsx @@ -203,6 +203,7 @@ const BoardRegisterPage = () => { className="board-register-selected-image" key={i + image.name} src={URL.createObjectURL(image)} + alt="board register selected image" /> ); })} @@ -216,9 +217,9 @@ const BoardRegisterPage = () => { onChange={handleImageImport} style={{ display: "none" }} /> - + camera inputImgRef.current?.click()} /> - + link ); diff --git a/src/pages/ChatPage/ChatCreatePage/ChatCreatePage.tsx b/src/pages/ChatPage/ChatCreatePage/ChatCreatePage.tsx index 7f0323a..17b366c 100644 --- a/src/pages/ChatPage/ChatCreatePage/ChatCreatePage.tsx +++ b/src/pages/ChatPage/ChatCreatePage/ChatCreatePage.tsx @@ -142,7 +142,10 @@ const ChatCreatePage = () => { }} >
- + member profile {member.userName} {member.userAuth === "manager" && 관리자}
diff --git a/src/pages/ChatPage/ChatSettingPage/ChatSettingInvitePage.tsx b/src/pages/ChatPage/ChatSettingPage/ChatSettingInvitePage.tsx index d689d0e..f71f20f 100644 --- a/src/pages/ChatPage/ChatSettingPage/ChatSettingInvitePage.tsx +++ b/src/pages/ChatPage/ChatSettingPage/ChatSettingInvitePage.tsx @@ -88,7 +88,10 @@ const ChatSettingInvitePage = () => { }} >
- + member profile {member.userName} {member.userAuth === "manager" && 관리자}
diff --git a/src/pages/ChatPage/ChatSettingPage/ChatSettingMemberPage.tsx b/src/pages/ChatPage/ChatSettingPage/ChatSettingMemberPage.tsx index 2fe2e86..e451e44 100644 --- a/src/pages/ChatPage/ChatSettingPage/ChatSettingMemberPage.tsx +++ b/src/pages/ChatPage/ChatSettingPage/ChatSettingMemberPage.tsx @@ -56,7 +56,7 @@ const ChatSettingMemberPage = () => { } >
- + add member 채팅방에 초대하기
@@ -65,7 +65,10 @@ const ChatSettingMemberPage = () => { {userList.map((member, index) => (
- + member profile img {member.userName} {member.userAuth === "manager" && 관리자}
diff --git a/src/pages/HomePage/HomePageMember.tsx b/src/pages/HomePage/HomePageMember.tsx index f1bdf5d..91f822a 100644 --- a/src/pages/HomePage/HomePageMember.tsx +++ b/src/pages/HomePage/HomePageMember.tsx @@ -1,13 +1,13 @@ import { useEffect, useState } from "react"; import { useLocation, useNavigate, useParams } from "react-router-dom"; +import { toast, ToastContainer } from "react-toastify"; -import { Chatroom, ChatroomSearchAllUserApi, User, spaceSearchAllUserApi } from "@/apis"; +import { Chatroom, ChatroomSearchAllUserApi, spaceSearchAllUserApi, User } from "@/apis"; import AddMemberImg from "@/assets/ChatPage/btn_add_member.svg"; import TopBarText, { LeftEnum } from "@/components/TopBarText"; import { Member, MemberContainer } from "@/pages/ChatPage/ChatCreatePage/ChatCreatePage.styled"; -import { getUserDefaultImageURL } from "@/utils/getUserDefaultImageURL"; import * as s from "@/pages/HomePage/HomePage.styled"; -import { ToastContainer, toast } from "react-toastify"; +import { getUserDefaultImageURL } from "@/utils/getUserDefaultImageURL"; const HomePageMemberPage = () => { const navigate = useNavigate(); @@ -67,7 +67,7 @@ const HomePageMemberPage = () => { onClick={clickInviteHandler} style={{ alignItems: "center", padding: "1rem 0rem 1rem 0rem", cursor: "pointer" }} > - + add member
스페이스에 초대하기
{userList.map((member, index) => ( diff --git a/src/pages/PayPage/CompleteCreatePay.tsx b/src/pages/PayPage/CompleteCreatePay.tsx index 64e841a..d76f917 100644 --- a/src/pages/PayPage/CompleteCreatePay.tsx +++ b/src/pages/PayPage/CompleteCreatePay.tsx @@ -1,7 +1,8 @@ -import { BottomBtn } from "@/components/BottomBtn"; +import { useNavigate } from "react-router-dom"; + import Check from "@/assets/PayPage/check.svg"; +import { BottomBtn } from "@/components/BottomBtn"; import * as s from "@/pages/PayPage/PayPage.styled"; -import { useNavigate } from "react-router-dom"; const CompleteCreatePay = () => { const navigator = useNavigate(); @@ -10,7 +11,7 @@ const CompleteCreatePay = () => { {/* 여기에 지금 height 넣어줘야 */}
- + check

정산요청을

diff --git a/src/pages/PayPage/CompletePay.tsx b/src/pages/PayPage/CompletePay.tsx index bec8b48..64a60e0 100644 --- a/src/pages/PayPage/CompletePay.tsx +++ b/src/pages/PayPage/CompletePay.tsx @@ -1,7 +1,8 @@ -import { BottomBtn } from "@/components/BottomBtn"; +import { useNavigate } from "react-router-dom"; + import Check from "@/assets/PayPage/check.svg"; +import { BottomBtn } from "@/components/BottomBtn"; import * as s from "@/pages/PayPage/PayPage.styled"; -import { useNavigate } from "react-router-dom"; export type CompletePayType = { money?: number; @@ -17,7 +18,7 @@ const CompletePay = ({ money, account }: CompletePayType) => { {/* 여기에 지금 height 넣어줘야 */}
- + check

요청받은 정산을

diff --git a/src/pages/PayPage/CompleteReqDataDiv.tsx b/src/pages/PayPage/CompleteReqDataDiv.tsx index 4172bd2..78bef27 100644 --- a/src/pages/PayPage/CompleteReqDataDiv.tsx +++ b/src/pages/PayPage/CompleteReqDataDiv.tsx @@ -1,13 +1,14 @@ -import * as s from "@/pages/PayPage/PayPage.styled"; -import { NormalBtn } from "@/pages/PayPage/NormalBtn"; -import reactIcon from "@/assets/react.svg"; import { useEffect, useState } from "react"; +import { toast, ToastContainer } from "react-toastify"; + +import reactIcon from "@/assets/react.svg"; import { DarkNormalBtn } from "@/pages/PayPage/DarkNormalBtn"; +import { GrayBtn } from "@/pages/PayPage/GrayBtn"; +import { NormalBtn } from "@/pages/PayPage/NormalBtn"; +import { addComma, PayReceiveInfo } from "@/pages/PayPage/PayPage"; +import * as s from "@/pages/PayPage/PayPage.styled"; -import { ToastContainer, toast } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; -import { PayReceiveInfo, addComma } from "@/pages/PayPage/PayPage"; -import { GrayBtn } from "@/pages/PayPage/GrayBtn"; const ReqDataDiv = ({ data }: { data: PayReceiveInfo }) => { // useEffect(() => { @@ -25,7 +26,8 @@ const ReqDataDiv = ({ data }: { data: PayReceiveInfo }) => { width={"40px"} height={"40px"} style={{ marginRight: "0.625rem" }} - > + alt="reaction" + /> {data.payCreatorName} {price}원 diff --git a/src/pages/PayPage/CreatePayComponents.tsx b/src/pages/PayPage/CreatePayComponents.tsx index c81021f..8780d1e 100644 --- a/src/pages/PayPage/CreatePayComponents.tsx +++ b/src/pages/PayPage/CreatePayComponents.tsx @@ -19,6 +19,7 @@ const PayChatMemberDiv = ({ info }: { info: UserInfoInSpace }) => { profile {info.userName} @@ -37,7 +38,7 @@ export const PayChatDiv = ({ info }: { info: ChatUserInfoInSpace }) => {
- + info img {info.chatRoomName} {info.userList?.length}
diff --git a/src/pages/PayPage/CreateRequestPage.tsx b/src/pages/PayPage/CreateRequestPage.tsx index 1c9db95..b83880f 100644 --- a/src/pages/PayPage/CreateRequestPage.tsx +++ b/src/pages/PayPage/CreateRequestPage.tsx @@ -52,7 +52,7 @@ const idToPrice = new Map(); const RecentAccountDiv = ({ data }: { data: BankInfo }) => { return ( - + kookmin 은행 {data.bankName} {data.bankAccountNum} @@ -235,6 +235,7 @@ const CreateRequestPage2 = ({ ? value.profileImgUrl : getUserDefaultImageURL(value.userId) } + alt="profile img" /> {value.userName} @@ -365,6 +366,7 @@ const CreateRequestPage3 = ({ ? value.userProfileImg : getUserDefaultImageURL(value.userId!) } + alt="profile img" /> {value.userName} @@ -392,6 +394,7 @@ const CreateRequestPage3 = ({ ? value.userProfileImg : getUserDefaultImageURL(value.userId!) } + alt="profile img" /> {value.userName} @@ -479,6 +482,7 @@ const CreateRequestPage4 = ({ ? _userData?.profileImgUrl : getUserDefaultImageURL(_userData!.userId) } + alt="profile img" /> {_userData?.userName} diff --git a/src/pages/PayPage/PayPage.tsx b/src/pages/PayPage/PayPage.tsx index de8804c..74f780d 100644 --- a/src/pages/PayPage/PayPage.tsx +++ b/src/pages/PayPage/PayPage.tsx @@ -1,14 +1,15 @@ -import TopBarText, { LeftEnum } from "@/components/TopBarText"; -import { GradientBtn } from "@/pages/PayPage/GradientBtn"; -import right from "@/assets/PayPage/arrow_right.svg"; -import * as s from "@/pages/PayPage/PayPage.styled"; -import { useNavigate } from "react-router-dom"; import { useEffect, useState } from "react"; +import { useNavigate } from "react-router-dom"; import axios from "axios"; + import { payCompleteApi, payDetailApi, payHomeApi } from "@/apis/Pay/PayPageAPI"; +import right from "@/assets/PayPage/arrow_right.svg"; +import TopBarText, { LeftEnum } from "@/components/TopBarText"; +import { GradientBtn } from "@/pages/PayPage/GradientBtn"; +import * as s from "@/pages/PayPage/PayPage.styled"; export const addComma = (price: number) => { - let returnString = price?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); + const returnString = price?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); return returnString; }; @@ -108,8 +109,8 @@ const PayPage = () => { > 요청한 정산 - - {/* */} + right + {/* right */} {reqData?.length == 0 ? ( 요청한 정산이 없어요! @@ -129,8 +130,8 @@ const PayPage = () => { > 요청받은 정산 - - {/* */} + right + {/* */}
{recData?.length == 0 ? ( diff --git a/src/pages/PayPage/PayResult.tsx b/src/pages/PayPage/PayResult.tsx index ab812f4..7d1472d 100644 --- a/src/pages/PayPage/PayResult.tsx +++ b/src/pages/PayPage/PayResult.tsx @@ -1,10 +1,11 @@ -import * as s from "@/pages/PayPage/PayPage.styled"; import bell from "@/assets/PayPage/bell.svg"; import check from "@/assets/PayPage/check.svg"; import ReactImg from "@/assets/react.svg"; -import { addComma, payTargetInfoDtoList } from "./PayPage"; +import * as s from "@/pages/PayPage/PayPage.styled"; import { getUserDefaultImageURL } from "@/utils/getUserDefaultImageURL"; +import { addComma, payTargetInfoDtoList } from "./PayPage"; + const PayResult = ({ props }: { props: payTargetInfoDtoList }) => { const price = addComma(props.requestAmount); return ( @@ -17,7 +18,8 @@ const PayResult = ({ props }: { props: payTargetInfoDtoList }) => { } width={"40px"} height={"40px"} - > + alt="profile" + /> {props.targetUserName} {price}원 @@ -27,7 +29,8 @@ const PayResult = ({ props }: { props: payTargetInfoDtoList }) => { width={"36px"} height={"36px"} style={{ marginLeft: "auto" }} - > + alt="check" + /> ); }; diff --git a/src/pages/PayPage/ReqDataDiv.tsx b/src/pages/PayPage/ReqDataDiv.tsx index 72b5ff4..e7a265e 100644 --- a/src/pages/PayPage/ReqDataDiv.tsx +++ b/src/pages/PayPage/ReqDataDiv.tsx @@ -1,15 +1,16 @@ -import * as s from "@/pages/PayPage/PayPage.styled"; -import { NormalBtn } from "@/pages/PayPage/NormalBtn"; -import reactIcon from "@/assets/react.svg"; import { useEffect, useState } from "react"; +import { toast, ToastContainer } from "react-toastify"; + +import { payCompleteApi } from "@/apis/Pay/PayPageAPI"; +import check from "@/assets/PayPage/check.svg"; +import reactIcon from "@/assets/react.svg"; import { DarkNormalBtn } from "@/pages/PayPage/DarkNormalBtn"; +import { GradientBtn } from "@/pages/PayPage/GradientBtn"; +import { NormalBtn } from "@/pages/PayPage/NormalBtn"; +import { addComma, PayReceiveInfo } from "@/pages/PayPage/PayPage"; +import * as s from "@/pages/PayPage/PayPage.styled"; -import { ToastContainer, toast } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; -import { PayReceiveInfo, addComma } from "@/pages/PayPage/PayPage"; -import { GradientBtn } from "@/pages/PayPage/GradientBtn"; -import check from "@/assets/PayPage/check.svg"; -import { payCompleteApi } from "@/apis/Pay/PayPageAPI"; const ReqDataDiv = ({ data }: { data: PayReceiveInfo }) => { const spaceID = 3; @@ -78,7 +79,7 @@ const ReqDataDiv = ({ data }: { data: PayReceiveInfo }) => { style={{ flexGrow: 1, display: "flex", alignItems: "center", justifyContent: "center" }} > 송금완료 - + check ); } @@ -86,7 +87,13 @@ const ReqDataDiv = ({ data }: { data: PayReceiveInfo }) => { return ( - + reaction {data.payCreatorName} {price}원 diff --git a/src/pages/SpacePage/AddSpacePage.tsx b/src/pages/SpacePage/AddSpacePage.tsx index 5b5953e..d3066ea 100644 --- a/src/pages/SpacePage/AddSpacePage.tsx +++ b/src/pages/SpacePage/AddSpacePage.tsx @@ -1,11 +1,12 @@ -import TopBarText, { LeftEnum } from "@/components/TopBarText"; import { ChangeEvent, useState } from "react"; -import { BottomBtn } from "@/components/BottomBtn"; -import { Input } from "@/components/Input"; -import styled from "styled-components"; -import camera from "@/assets/Space/icon_camera.svg"; import { To, useNavigate } from "react-router-dom"; +import styled from "styled-components"; + import { createSpaceApi } from "@/apis"; +import camera from "@/assets/Space/icon_camera.svg"; +import { BottomBtn } from "@/components/BottomBtn"; +import { Input } from "@/components/Input"; +import TopBarText, { LeftEnum } from "@/components/TopBarText"; const ImgContainer = styled.div` display: flex; @@ -89,7 +90,7 @@ const AddSpacePage = () => {
- + camera diff --git a/src/pages/SpacePage/SpacePage.tsx b/src/pages/SpacePage/SpacePage.tsx index f3b983d..3d98030 100644 --- a/src/pages/SpacePage/SpacePage.tsx +++ b/src/pages/SpacePage/SpacePage.tsx @@ -236,7 +236,7 @@ const SpacePage = () => { ))} {!editActive ? ( navigate("/space/addspace")}> - + add ) : ( diff --git a/src/pages/VoiceRoomPage/JoinVoiceRoomPage.tsx b/src/pages/VoiceRoomPage/JoinVoiceRoomPage.tsx index b101cc6..75f1d52 100644 --- a/src/pages/VoiceRoomPage/JoinVoiceRoomPage.tsx +++ b/src/pages/VoiceRoomPage/JoinVoiceRoomPage.tsx @@ -1,17 +1,17 @@ -import BigRoundDiv from "@/components/BigRoundDiv"; -import TopBarText, { LeftEnum } from "@/components/TopBarText"; -import * as s from "@/pages/VoiceRoomPage/JoinVoiceRoom.styled"; -import redo from "@/assets/icon_redo.svg"; +import { useEffect, useState } from "react"; +import { useLocation, useNavigate } from "react-router-dom"; +import { GetUserProfileApi } from "@/apis/GetUserProfileApi"; +import { UserProfile } from "@/apis/GetUserProfileApi"; +import { VrTokenApi } from "@/apis/voiceroomApi"; +import redo from "@/assets/icon_redo.svg"; +import BigRoundDiv from "@/components/BigRoundDiv"; //임시로 적용하는 프로필 이미지 import { BottomBtn } from "@/components/BottomBtn"; -import { useLocation, useNavigate } from "react-router-dom"; -import { useEffect, useState } from "react"; -import VoiceRoomPage from "@/pages/VoiceRoomPage/VoiceRoomPage"; +import TopBarText, { LeftEnum } from "@/components/TopBarText"; +import * as s from "@/pages/VoiceRoomPage/JoinVoiceRoom.styled"; import { VrList } from "@/pages/VoiceRoomPage/VoiceRoomListPage"; -import { VrTokenApi } from "@/apis/voiceroomApi"; -import { GetUserProfileApi } from "@/apis/GetUserProfileApi"; -import { UserProfile } from "@/apis/GetUserProfileApi"; +import VoiceRoomPage from "@/pages/VoiceRoomPage/VoiceRoomPage"; import { getUserDefaultImageURL } from "@/utils/getUserDefaultImageURL"; const JoinVoiceRoomPage = () => { @@ -53,7 +53,7 @@ const JoinVoiceRoomPage = () => { GetUserProfileApi().then((data) => { console.log(data); // - let _temp: UserProfile | undefined = data?.result.userProfileList.find((e) => { + const _temp: UserProfile | undefined = data?.result.userProfileList.find((e) => { return e.spaceId === Number.parseInt(spaceId); }); if (_temp !== undefined) { @@ -83,7 +83,10 @@ const JoinVoiceRoomPage = () => { - + user img
{userName}
{ navigate("/createvoiceroom"); }} > - + plus 새로 만들기
diff --git a/src/pages/VoiceRoomPage/VoiceRoomPage.tsx b/src/pages/VoiceRoomPage/VoiceRoomPage.tsx index 04c8221..2004807 100644 --- a/src/pages/VoiceRoomPage/VoiceRoomPage.tsx +++ b/src/pages/VoiceRoomPage/VoiceRoomPage.tsx @@ -1,14 +1,5 @@ -import TopBarText from "@/components/TopBarText"; -import { LeftEnum } from "@/components/TopBarText"; -import plus from "@/assets/VoiceRoom/icon_plus.svg"; -import back from "@/assets/icon_back.svg"; -import setting from "@/assets/VoiceRoom/icon_setting.svg"; - import { useEffect, useState } from "react"; import { useNavigate } from "react-router-dom"; -import * as s from "@/pages/VoiceRoomPage/VoiceRoomListPage.styled"; -import * as sty from "@/components/TopBarText.styled"; - import { CarouselLayout, ControlBar, @@ -21,9 +12,18 @@ import { RoomAudioRenderer, useTracks, } from "@livekit/components-react"; -import "@livekit/components-styles"; import { Room, Track } from "livekit-client"; +import back from "@/assets/icon_back.svg"; +import plus from "@/assets/VoiceRoom/icon_plus.svg"; +import setting from "@/assets/VoiceRoom/icon_setting.svg"; +import TopBarText from "@/components/TopBarText"; +import { LeftEnum } from "@/components/TopBarText"; +import * as sty from "@/components/TopBarText.styled"; +import * as s from "@/pages/VoiceRoomPage/VoiceRoomListPage.styled"; + +import "@livekit/components-styles"; + const VoiceRoomPage = ({ VoiceRoomName, setJoin, @@ -60,13 +60,13 @@ const VoiceRoomPage = ({ setJoin(false); }} > - + back {VoiceRoomName} - + setting