Skip to content

Commit

Permalink
Merge pull request #164 from boostcampwm-2024/feature/layout/detail/c…
Browse files Browse the repository at this point in the history
…hart-#123

[FE] 차트 리펙토링 & 차트 사이즈 조절 기능 구현
  • Loading branch information
dongree authored Nov 20, 2024
2 parents 35a0318 + 44afedf commit 1d76404
Show file tree
Hide file tree
Showing 23 changed files with 425 additions and 258 deletions.
2 changes: 2 additions & 0 deletions FE/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import StocksDetail from 'page/StocksDetail';
import Header from 'components/Header';
import Login from 'components/Login';
import SearchModal from './components/Search';
import Rank from './page/Rank.tsx';

function App() {
return (
Expand All @@ -18,6 +19,7 @@ function App() {
<Route path='/' element={<Layout />}>
<Route index element={<Home />} />
<Route path='stocks/:id' element={<StocksDetail />} />
<Route path='rank' element={<Rank />} />
</Route>
</Routes>
</Router>
Expand Down
2 changes: 1 addition & 1 deletion FE/src/assets/emptyAnimation.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion FE/src/assets/noResultAnimation.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion FE/src/assets/searchAnimation.json

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions FE/src/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ export default function Header() {

<div className='flex items-center gap-8'>
<nav className='flex items-center gap-6 text-sm font-bold text-juga-grayscale-500'>
<button className='px-0.5 py-2'></button>
<button className='px-0.5 py-2'>랭킹</button>
<Link to={'/'}>
<button className='px-0.5 py-2'></button>
</Link>
<Link to={'/rank'}>
<button className='px-0.5 py-2'>랭킹</button>
</Link>
<button className='px-0.5 py-2'>마이페이지</button>
</nav>
<div className='relative'>
Expand Down
4 changes: 2 additions & 2 deletions FE/src/components/Search/SearchCard.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SearchDataType } from './searchDataType.ts';
import { useNavigate } from 'react-router-dom';
import useSearchModalStore from '../../store/useSearchModalStore.ts';
import useSearchInputStore from '../../store/useSearchInputStore.ts';
import useSearchModalStore from 'store/useSearchModalStore.ts';
import useSearchInputStore from 'store/useSearchInputStore.ts';
import { SearchCardHighLight } from './SearchCardHighlight.tsx';

type SearchCardProps = {
Expand Down
2 changes: 1 addition & 1 deletion FE/src/components/Search/SearchHistoryItem.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { XMarkIcon } from '@heroicons/react/16/solid';
import useSearchInputStore from '../../store/useSearchInputStore.ts';
import useSearchInputStore from 'store/useSearchInputStore.ts';

type SearchHistoryItemProps = {
item: string;
Expand Down
Loading

0 comments on commit 1d76404

Please sign in to comment.