Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added src/assets/navbar/Gear.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions src/components/Navbar/Navbar.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/pages/home/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Navbar from '../../components/Navbar/Navbar';
import Navbar from './components/Navbar/Navbar';
import ListFilter from './components/Filter/ListFilter';
import ListSite from './components/Site/ListSite';
import Alert from './components/Alert/Alert';
Expand Down
9 changes: 8 additions & 1 deletion src/pages/home/components/Filter/ItemFilter.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import clsx from 'clsx';
import { useShallow } from 'zustand/react/shallow';
import type { FilterItem } from '../../../../types/filter.type';
import { useFilterStore } from '../../../../stores/filterStore';

Expand All @@ -7,7 +8,13 @@ interface ItemFilterProps {
}

const ItemFilter = ({ item }: ItemFilterProps) => {
const { selectedFilter, setFilter } = useFilterStore();
const { selectedFilter, setFilter } = useFilterStore(
useShallow((state) => ({
selectedFilter: state.selectedFilter,
setFilter: state.setFilter,
})),
);

const active = selectedFilter === item.value;

return (
Expand Down
22 changes: 22 additions & 0 deletions src/pages/home/components/Navbar/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import settingBtn from '../../../../assets/navbar/Gear.png';
import useNavigation from '../../../../hooks/useNavigation';

const Navbar = () => {
const { goTo } = useNavigation();

const handleClick = () => {
goTo('/setting');
};
return (
<div className="w-full h-[4.8rem] flex justify-end items-center">
<img
src={settingBtn}
alt="setting-button"
className="object-contain w-10 h-10 cursor-pointer"
onClick={handleClick}
/>
</div>
);
};

export default Navbar;
5 changes: 5 additions & 0 deletions src/pages/setting/Setting.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
function Setting() {
return <div>세팅페이지</div>;
}

export default Setting;
6 changes: 6 additions & 0 deletions src/routes/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import Spinner from '../components/Spinner/Spinner';
import Splash from '../components/Splash/Splash';

import HomePage from '../pages/home/Home';

const NotFoundPage = lazy(() => import('../pages/notFound/NotFound'));
const SettingPage = lazy(() => import('../pages/setting/Setting'));

const router = createBrowserRouter([
{
Expand All @@ -25,6 +27,10 @@ const router = createBrowserRouter([
path: 'home',
element: <HomePage />,
},
{
path: 'setting',
element: <SettingPage />,
},
{
path: '*',
element: <NotFoundPage />,
Expand Down