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

[Fix] - 6차 데모데이 1차 QA(지니) #580

Merged
merged 3 commits into from
Oct 24, 2024
Merged

[Fix] - 6차 데모데이 1차 QA(지니) #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5761246
fix(SearchPage): 여행기를 들어갈 때 탭이 클릭되지 않는 이슈 해결
jinyoung234 Oct 23, 2024
76880ff
refactor(MyTravelPlans): 여행기 전환 텍스트 수정
jinyoung234 Oct 24, 2024
9c60422
fix(TextArea): font size로 인해 확대되는 문제 수정
jinyoung234 Oct 24, 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
9 changes: 5 additions & 4 deletions frontend/src/components/common/Textarea/Textarea.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@ import styled from "@emotion/styled";
export const TextareaContainer = styled.div`
display: flex;
flex-direction: column;
gap: 0.8rem;

padding: 1.6rem;
width: 100%;
padding: 1.6rem;
border-radius: 10px;

background-color: ${({ theme }) => theme.colors.background.disabled};
gap: 0.8rem;
`;

export const Textarea = styled.textarea`
width: 100%;
height: 9rem;
border: none;
resize: none;

background-color: ${({ theme }) => theme.colors.background.disabled};

font-size: 1.6rem;
resize: none;

&:focus {
outline: none;
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/pages/my/MyTravelPlans/MyTravelPlans.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const MyTravelPlans = ({ userData }: MyTravelPlansProps) => {
iconType="plus"
css={S.iconButtonStyle}
>
여행기로 전환
여행기로 남기기
</IconButton>
</S.Layout>
)}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/pages/search/SearchPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { useLocation } from "react-router-dom";

import { FloatingButton, SearchFallback, Tab } from "@components/common";

import { STORAGE_KEYS_MAP } from "@constants/storage";

import { extractLastPath } from "@utils/extractId";

import * as S from "./SearchPage.styled";
Expand Down Expand Up @@ -30,6 +32,7 @@ const SearchPage = () => {
return (
<>
<Tab
storageKey={STORAGE_KEYS_MAP.searchPageTabIndex}
labels={TAB_CONTENT.map((tab) => tab.label)}
tabContent={(selectedIndex) => (
<TravelogueList
Expand Down
1 change: 1 addition & 0 deletions frontend/src/constants/storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export const STORAGE_KEYS_MAP = {
mainPageSort: "mainPageSort",
mainPageTravelPeriod: "mainPageTravelPeriod",
mainPageSelectedTagIDs: "mainPageSelectedTagIDs",
searchPageTabIndex: "searchPageTabIndex",
searchPageSort: "searchPageSort",
searchPageTravelPeriod: "searchPageTravelPeriod",
searchPageSelectedTagIDs: "searchPageSelectedTagIDs",
Expand Down
Loading