diff --git a/src/@core/layouts/components/navbar/NavbarUser.js b/src/@core/layouts/components/navbar/NavbarUser.js index 9c033958..df5d2378 100644 --- a/src/@core/layouts/components/navbar/NavbarUser.js +++ b/src/@core/layouts/components/navbar/NavbarUser.js @@ -3,7 +3,7 @@ import { Fragment } from 'react'; // ** Third Party Components import { Menu, Moon, Sun } from 'react-feather'; import { useDispatch, useSelector } from 'react-redux'; -import { Nav, NavItem, NavLink } from 'reactstrap'; +import { Nav, NavItem, NavLink } from '@component/ui'; import * as Actions from '../../../../modules/menu/actions/menuAction'; import UserDropdown from './UserDropdown'; diff --git a/src/@core/layouts/components/navbar/UserDropdown.js b/src/@core/layouts/components/navbar/UserDropdown.js index 1d776a76..d07a1521 100644 --- a/src/@core/layouts/components/navbar/UserDropdown.js +++ b/src/@core/layouts/components/navbar/UserDropdown.js @@ -16,7 +16,7 @@ import { DropdownMenu, DropdownToggle, UncontrolledDropdown -} from 'reactstrap'; +} from '@component/ui'; import * as Actions from '../../../../modules/account/auth/actions'; const UserDropdown = () => { diff --git a/src/components/ui/dropdown/CustomDropdownItem.tsx b/src/components/ui/dropdown/CustomDropdownItem.tsx index 6ccd0cd7..c8a06eff 100644 --- a/src/components/ui/dropdown/CustomDropdownItem.tsx +++ b/src/components/ui/dropdown/CustomDropdownItem.tsx @@ -7,6 +7,8 @@ interface Props { style?: React.CSSProperties; header?: boolean; onClick?: MouseEventHandler; + tag?: any; + to?: string; } /** @@ -15,6 +17,7 @@ interface Props { * @param className?:string * @param style?: React.CSSProperties * @param header?: boolean + * @param onClick?: MouseEventHandler * */ @@ -22,15 +25,19 @@ export default function CustomDropdownItem({ children, className, style, - header, - onClick + header = false, + tag, + onClick, + to }: Props) { return ( {children} diff --git a/src/components/ui/dropdown/CustomDropdownMenu.tsx b/src/components/ui/dropdown/CustomDropdownMenu.tsx index ede8d252..2676ae74 100644 --- a/src/components/ui/dropdown/CustomDropdownMenu.tsx +++ b/src/components/ui/dropdown/CustomDropdownMenu.tsx @@ -4,15 +4,25 @@ import { ReactNode } from 'react'; interface Props { children: ReactNode; className?: string; + right?: boolean; } /** * * @param children: ReactNode * @param className?:string + * @param right?: boolean * */ -export default function CustomDropdownMenu({ children, className }: Props) { - return {children}; +export default function CustomDropdownMenu({ + children, + className, + right +}: Props) { + return ( + + {children} + + ); } diff --git a/src/components/ui/dropdown/CustomDropdownToggle.tsx b/src/components/ui/dropdown/CustomDropdownToggle.tsx index e4ea6457..ee6cf34f 100644 --- a/src/components/ui/dropdown/CustomDropdownToggle.tsx +++ b/src/components/ui/dropdown/CustomDropdownToggle.tsx @@ -1,10 +1,13 @@ import { DropdownToggle } from 'reactstrap'; -import { ReactNode } from 'react'; +import { MouseEventHandler, ReactNode } from 'react'; interface Props { children: ReactNode; className?: string; color?: 'primary'; + tag?: any; + onClick?: MouseEventHandler; + href?: string; } /** @@ -17,10 +20,19 @@ interface Props { export default function CustomDropdownToggle({ children, className, - color + color, + tag, + onClick, + href }: Props) { return ( - + {children} ); diff --git a/src/components/ui/dropdown/CustomUncontrolledDropdown.tsx b/src/components/ui/dropdown/CustomUncontrolledDropdown.tsx index 6b437857..0fada663 100644 --- a/src/components/ui/dropdown/CustomUncontrolledDropdown.tsx +++ b/src/components/ui/dropdown/CustomUncontrolledDropdown.tsx @@ -5,6 +5,7 @@ interface Props { children: ReactNode; className?: string; direction?: 'up' | 'down' | 'left' | 'right'; + tag?: any; } /** @@ -12,16 +13,18 @@ interface Props { * @param children: ReactNode * @param className?:string * @param direction?: 'up' | 'down' | 'left' | 'right'; + * @param tag?: any * */ export default function CustomUncontrolledDropdown({ children, className, - direction + direction, + tag }: Props) { return ( - + {children} ); diff --git a/src/modules/laanc/models/laancModels.ts b/src/modules/laanc/models/laancModels.ts index 2bf29fd4..ac891957 100644 --- a/src/modules/laanc/models/laancModels.ts +++ b/src/modules/laanc/models/laancModels.ts @@ -298,6 +298,7 @@ export const LaancFlightData = { ] } }; + export interface weatherData { serviceKey: string; numOfRows: string; @@ -308,10 +309,12 @@ export interface weatherData { nx: string; ny: string; } + export interface LaancPdf { address: string; pdfUrl: string; } + // laanc 승인 model export interface LaancApproval { validatedRs: { @@ -341,9 +344,6 @@ export interface LaancApproval { flight: boolean; // 무조건 날 수 있음 }; } -// valid false 이면서 flight true이면 승인 불필요 조건 성립 -// valid false 이면 laanc가 필요 없는 것도 걸러줌 -// 만약 둘 다 false이면 뭐 땜에 안되는지 정의 필요 export interface FlightPlanData { planSno?: number;