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.

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

Chore/#286 delete data #288

Merged
merged 7 commits into from
Oct 27, 2024
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 modified .yarn/install-state.gz
Binary file not shown.
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,8 @@
"typescript": "^5.2.2",
"vite": "^5.2.0"
},
"packageManager": "[email protected]+sha512.837566d24eec14ec0f5f1411adb544e892b3454255e61fdef8fd05f3429480102806bac7446bc9daff3896b01ae4b62d00096c7e989f1596f2af10b927532f39"
"resolutions": {
"rollup": "4.24.0"
},
"packageManager": "[email protected]"
}
7 changes: 4 additions & 3 deletions src/containers/common/Header/component/HeaderSheet.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { dataPath, menuItems } from '@/containers/common/Header/const/pathData';
import { menuItems } from '@/containers/common/Header/const/pathData';
import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet';
import { CaretDown } from '@phosphor-icons/react';
import { ReactNode, useState, useEffect } from 'react';
Expand Down Expand Up @@ -92,12 +92,13 @@ export function HeaderSheet({ trigger, state: initialState = State.Logout }: Hea
)}
</div>
))}
<div
{/*자료집 임시 제거*/}
{/* <div
onClick={() => handleLinkClick(dataPath)}
className={`flex h-[64px] cursor-pointer items-center border-b border-[#E5E7EB] pl-10 text-gray-800`}
>
자료집
</div>
</div> */}
<a
href={`https://ssuketch60.cafe24.com/`}
className={`flex h-[64px] cursor-pointer items-center border-b border-[#E5E7EB] pl-10 text-gray-800`}
Expand Down
8 changes: 4 additions & 4 deletions src/containers/common/Header/component/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ import {
NavigationMenuTrigger,
NavigationMenuContent,
} from '@/components/ui/navigation-menu';
import { dataPath, menuItems } from '../const/pathData';
import { menuItems } from '../const/pathData';
import { getStyles } from '../const/style';
import { State } from '../const/state';
import { cn } from '@/libs/utils';
import DropDownMenu from './DropDownMenu';
import { Link } from 'react-router-dom';

interface NavigationProps {
state?: State;
Expand All @@ -34,11 +33,12 @@ export function Navigation({ state = State.Onboarding }: NavigationProps) {
</NavigationMenuContent>
</NavigationMenuItem>
))}
<NavigationMenuItem className="relative h-full min-w-fit text-[20px]">
{/*자료집 임시 제거*/}
{/* <NavigationMenuItem className="relative h-full min-w-fit text-[20px]">
<NavigationMenuTrigger isData={true} className={cn(styles.headerItemStyle)}>
<Link to={dataPath}>자료집</Link>
</NavigationMenuTrigger>
</NavigationMenuItem>
</NavigationMenuItem> */}
<NavigationMenuItem className="relative h-full min-w-fit text-[20px]">
<NavigationMenuTrigger isData={true} className={cn(styles.headerItemStyle)}>
<a href={`https://ssuketch60.cafe24.com/`}>이전 홈페이지</a>
Expand Down
7 changes: 3 additions & 4 deletions src/pages/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { PartnershipPage } from './partnership/page';
import { PetitionNoticePage } from './petition-notice/page';
import { PetitionNoticeEditPage } from './petition-notice/edit/page';
import { PetitionNoticeDetailPage } from './petition-notice/[id]/page';
import { Data } from './data/page';
import { PartnershipDetailPage } from './partnership/partnershipDetail/page';
import { PartnershipEditPage } from './partnership/partnershipEdit/page';
import PartnershipPatchPage from './partnership/partnershipPatch/page';
Expand Down Expand Up @@ -64,9 +63,9 @@ export function MainRouter() {
<Route path="/audit/:id" element={<AuditDetailPage />} />
<Route path="/audit/edit" element={<AuditEditPage />} />
<Route path="/audit/:id/patch" element={<AuditPatchPage />} />
{/*자료집*/}
<Route path="/data" element={<Data />} />
<Route path="/data/edit" element={<Data />} />
{/*자료집 임시 제거*/}
{/* <Route path="/data" element={<Data />} />
<Route path="/data/edit" element={<Data />} /> */}
{/*개인정보이용약관*/}
<Route path="/personal-data" element={<PersonalDataPage />} />
</Route>
Expand Down
Loading