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.

Sign up for GitHub

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

영상제작 전 마지막 수정 #272

Merged
merged 2 commits into from
Apr 4, 2024
Merged

영상제작 전 마지막 수정 #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b320421
fix(#246): 긴급 수정2
CBWDG Apr 4, 2024
e907b97
Merge pull request #271 from modern-agile-team/feat/report-1/#246
zzzRYT Apr 4, 2024
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
2 changes: 1 addition & 1 deletion src/components/molecules/mentor-review-elements/MentorReviewElements.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const MentorReviewElements = (props: ReviewProprType) => {
</LinkBox>
<S.ReviewTextBox defaultBg={props.isLocation}>
<div>{props.createdAt.slice(0, 10)}</div>
<div>{props.review}123123</div>
<div>{props.review}</div>
</S.ReviewTextBox>
<S.ReportBox>
{props.isLocation ? (
Expand Down
4 changes: 3 additions & 1 deletion src/components/organisms/create-board/CreateBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,9 @@ const CreateBody = () => {
</div>
</S.ImageUploadBox>
</div>
<S.SubmitBox onClick={handleSubmit}>올리기</S.SubmitBox>
<FlexBox type="flex" col="right">
<S.SubmitBox onClick={handleSubmit}>올리기</S.SubmitBox>
</FlexBox>
</S.CreateHelpContainer>
</S.CreateBoardWrapper>
);
Expand Down
14 changes: 13 additions & 1 deletion src/components/organisms/create-board/styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,21 @@ export const ImageUploadBox = styled.div`
width: 100%;
`;

export const SubmitBox = styled.div`
export const SubmitBox = styled.button`
color: #ff772b;
cursor: pointer;
font-size: 0.83em;
font-weight: 400;
line-height: 150%;
margin: 10px 0px 10vh 0px;
border: 2px solid #ff772b;
border-radius: 5px;
background-color: #fff;
transition: background-color 0.3 ease;
&:hover {
background-color: #ff772b;
color: #fff;
}
`;

interface DropType {
Expand Down
21 changes: 16 additions & 5 deletions src/components/organisms/my-profile/MyProfileConetents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import USER from '@/apis/user';
import { FlexBox, ImageBox } from '@/components/common/globalStyled/styled';
import {
FlexBox,
ImageBox,
ToolTipBox,
ToolTipContainer,
Tooltip,
TooltipImage,
} from '@/components/common/globalStyled/styled';
import { useEffect, useState } from 'react';
import * as S from './styled';
import { MyProfileType, UserProfileType } from '@/types/user';
Expand All @@ -25,10 +32,14 @@ const MyProfileContents = () => {
href={{
pathname: `/mypage/info/update`,
}}>
<img
src="https://menbosha-s3.s3.ap-northeast-2.amazonaws.com/public/mypage/profileSettingBtn.svg"
alt="프로필설정"
/>
<ToolTipContainer hoverBox="image">
<TooltipImage
src="https://menbosha-s3.s3.ap-northeast-2.amazonaws.com/public/mypage/profileSettingBtn.svg"
alt="프로필설정"
/>

<Tooltip>프로필 수정</Tooltip>
</ToolTipContainer>
</Link>
<div></div>
<div>
Expand Down