From b2b2f9d1b600c39189f35665aef3784a94c7b082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=83=81=ED=98=84?= Date: Wed, 31 Jan 2024 18:05:13 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=ED=86=B5=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20view,container=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ui/custominput/index.tsx | 6 +++++- src/containers/account/mypage/AccountMypageContainer.js | 2 +- .../analysis/history/AnalysisHistoryContainer.js | 2 +- src/containers/basis/flight/plan/WeatherContainer.js | 2 +- .../cstmrService/inquiry/AdminInquiryContainer.js | 2 +- src/containers/laanc/LaancContainer.js | 2 +- src/containers/laanc/LaancPlanContainer.js | 2 +- src/containers/main/dash/MainDashContainer.js | 2 +- src/views/control/alarm/ControlAlarmDetail.js | 8 +++++++- src/views/control/alarm/ControlAlarmList.js | 2 +- src/views/control/main/ControlMain.js | 2 +- src/views/control/report/ControlReportDetail.js | 2 +- src/views/control/report/ControlReportList.js | 2 +- src/views/control/setting/ControlSetting.js | 2 +- src/views/control/weather/WeatherList.js | 2 +- 15 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/components/ui/custominput/index.tsx b/src/components/ui/custominput/index.tsx index 61288ed6..2054dfd7 100644 --- a/src/components/ui/custominput/index.tsx +++ b/src/components/ui/custominput/index.tsx @@ -15,6 +15,7 @@ interface Props { bsSize?: 'lg' | 'sm' | undefined; label?: string; inline?: boolean; + defaultChecked?: boolean; } /** * @@ -31,6 +32,7 @@ interface Props { * @param type?:string * @param bsSize?: "lg" | "sm" * @param inline?:boolean default false + * @param defaultChecked?:boolean default false * */ @@ -47,7 +49,8 @@ export default function CustomInputs({ readOnly, type, inline, - bsSize + bsSize, + defaultChecked = false }: Props) { return ( <> @@ -64,6 +67,7 @@ export default function CustomInputs({ onClick={onClick} inline={inline} onChange={onChange} + defaultChecked={defaultChecked} > {children} diff --git a/src/containers/account/mypage/AccountMypageContainer.js b/src/containers/account/mypage/AccountMypageContainer.js index 3f70a487..87f6ed22 100644 --- a/src/containers/account/mypage/AccountMypageContainer.js +++ b/src/containers/account/mypage/AccountMypageContainer.js @@ -14,7 +14,7 @@ import { ModalHeader, ModalBody, ModalFooter -} from 'reactstrap'; +} from '../../../components/ui/index'; import { accountAPI } from '../../../modules/account/register'; import AccountMypagePwForm from '../../../components/account/mypage/AccountMypagePwForm'; import AccountMypageForm from '../../../components/account/mypage/AccountMypageForm'; diff --git a/src/containers/analysis/history/AnalysisHistoryContainer.js b/src/containers/analysis/history/AnalysisHistoryContainer.js index 8e9cc4c5..2b20d331 100644 --- a/src/containers/analysis/history/AnalysisHistoryContainer.js +++ b/src/containers/analysis/history/AnalysisHistoryContainer.js @@ -16,7 +16,7 @@ import { ModalHeader, ModalBody, ModalFooter -} from 'reactstrap'; +} from '../../../components/ui/index'; import * as LaancAction from '../../../modules/laanc/actions/laancActions'; import { useHistory } from 'react-router-dom'; import { MessageErrorModal } from '../../../components/message/MessageErrorModal'; diff --git a/src/containers/basis/flight/plan/WeatherContainer.js b/src/containers/basis/flight/plan/WeatherContainer.js index e78ff866..ea01e578 100644 --- a/src/containers/basis/flight/plan/WeatherContainer.js +++ b/src/containers/basis/flight/plan/WeatherContainer.js @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import dayjs from 'dayjs'; import { Compass } from 'react-feather'; -import { Spinner } from 'reactstrap'; +import { Spinner } from '../../../../components/ui/index'; import { TodayWeather, TomorrowWeahter, diff --git a/src/containers/cstmrService/inquiry/AdminInquiryContainer.js b/src/containers/cstmrService/inquiry/AdminInquiryContainer.js index 60ca1232..4d7cd1e4 100644 --- a/src/containers/cstmrService/inquiry/AdminInquiryContainer.js +++ b/src/containers/cstmrService/inquiry/AdminInquiryContainer.js @@ -1,6 +1,6 @@ import { useEffect, useState, useCallback } from 'react'; import { useSelector, useDispatch } from 'react-redux'; -import { Col, Row } from 'reactstrap'; +import { Col, Row } from '../../../components/ui/index'; import { ADMIN_LIST, ADMIN_DETAIL, diff --git a/src/containers/laanc/LaancContainer.js b/src/containers/laanc/LaancContainer.js index f529a5e1..2950b625 100644 --- a/src/containers/laanc/LaancContainer.js +++ b/src/containers/laanc/LaancContainer.js @@ -1,6 +1,6 @@ import { useEffect, useState, lazy, Suspense } from 'react'; import { useLocation } from 'react-router-dom'; -import { Button, Badge } from 'reactstrap'; +import { Button, Badge } from '../../components/ui/index'; import { useDispatch } from 'react-redux'; import { CustomMainLayout } from '../../components/layout/CustomMainLayout'; import * as LaancAction from '../../modules/laanc/actions/laancActions'; diff --git a/src/containers/laanc/LaancPlanContainer.js b/src/containers/laanc/LaancPlanContainer.js index 05bdad1f..da15fd02 100644 --- a/src/containers/laanc/LaancPlanContainer.js +++ b/src/containers/laanc/LaancPlanContainer.js @@ -1,7 +1,7 @@ import { lazy, useEffect, useState, Suspense } from 'react'; import LaancModal from '../../components/laanc/LaancModal'; import { initFlightBas } from '../../modules/laanc/models/laancModels'; -import { Modal } from 'reactstrap'; +import { Modal } from '../../components/ui/index'; import { AREA_DETAIL_INIT } from '../../modules/laanc/actions/laancActions'; import { useDispatch, useSelector } from 'react-redux'; import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions'; diff --git a/src/containers/main/dash/MainDashContainer.js b/src/containers/main/dash/MainDashContainer.js index e7226ad5..382b7c63 100644 --- a/src/containers/main/dash/MainDashContainer.js +++ b/src/containers/main/dash/MainDashContainer.js @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'; import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; import dayjs from 'dayjs'; -import { Col, Row } from 'reactstrap'; +import { Col, Row } from '../../../components/ui/index'; import DroneFlightSchedule from '../../../components/dashboard/DroneFlightSchedule'; import { DashboardGroupList } from '../../../components/dashboard/DashboardGroupList'; import { DashboardStcsArea } from '../../../components/dashboard/DashboardStcsArea'; diff --git a/src/views/control/alarm/ControlAlarmDetail.js b/src/views/control/alarm/ControlAlarmDetail.js index ccf0753f..b1135aa3 100644 --- a/src/views/control/alarm/ControlAlarmDetail.js +++ b/src/views/control/alarm/ControlAlarmDetail.js @@ -1,4 +1,10 @@ -import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap'; +import { + Button, + Modal, + ModalHeader, + ModalBody, + ModalFooter +} from '../../../components/ui/index'; const ControlAlarmDetail = ({ historyModal, diff --git a/src/views/control/alarm/ControlAlarmList.js b/src/views/control/alarm/ControlAlarmList.js index f57a796b..49f7f0a2 100644 --- a/src/views/control/alarm/ControlAlarmList.js +++ b/src/views/control/alarm/ControlAlarmList.js @@ -3,7 +3,7 @@ import { X } from 'react-feather'; import { useDispatch, useSelector } from 'react-redux'; import { controlGpLogAction } from '../../../modules/control/gp/actions/controlGpAction'; import ControlAlarmDetail from './ControlAlarmDetail'; -import { Badge } from 'reactstrap'; +import { Badge } from '../../../components/ui/index'; const ControlAlarmList = props => { const dispatch = useDispatch(); diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index 5f56dee5..715ab4fe 100644 --- a/src/views/control/main/ControlMain.js +++ b/src/views/control/main/ControlMain.js @@ -13,7 +13,7 @@ import { } from 'react-feather'; import { AiOutlinePoweroff } from 'react-icons/ai'; import { IoAlertOutline } from 'react-icons/io5'; -import { Card } from 'reactstrap'; +import { Card } from '../../../components/ui/index'; import ControlSetting from '../setting/ControlSetting'; import WebsocketClient from '../../../components/websocket/WebsocketClient'; import { controlweatherAction } from '../../../modules/control/gp/actions/controlGpAction'; diff --git a/src/views/control/report/ControlReportDetail.js b/src/views/control/report/ControlReportDetail.js index 2c066340..16f3dcf8 100644 --- a/src/views/control/report/ControlReportDetail.js +++ b/src/views/control/report/ControlReportDetail.js @@ -10,7 +10,7 @@ import { CloudRain, CloudSnow } from 'react-feather'; -import { Table } from 'reactstrap'; +import { Table } from '../../../components/ui/index'; import drone_img from '../../../assets/images/drone.jpg'; import uam_img from '../../../assets/images/uam_img.jpg'; import drone_yellow from '../../../assets/images/drone_yellow.png'; diff --git a/src/views/control/report/ControlReportList.js b/src/views/control/report/ControlReportList.js index f7e51803..d867e58d 100644 --- a/src/views/control/report/ControlReportList.js +++ b/src/views/control/report/ControlReportList.js @@ -1,7 +1,7 @@ import { useState } from 'react'; import { Search, X } from 'react-feather'; import { useDispatch, useSelector } from 'react-redux'; -import { Badge, Button, Input, InputGroup } from 'reactstrap'; +import { Badge, Button, Input, InputGroup } from '../../../components/ui/index'; import dayjs from 'dayjs'; import { controlGpDtlAction } from '../../../modules/control/gp'; import { objectClickAction } from '../../../modules/control/map/actions/controlMapActions'; diff --git a/src/views/control/setting/ControlSetting.js b/src/views/control/setting/ControlSetting.js index 473d0af7..b77b3c77 100644 --- a/src/views/control/setting/ControlSetting.js +++ b/src/views/control/setting/ControlSetting.js @@ -1,7 +1,7 @@ import { useEffect, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { useHistory } from 'react-router-dom'; -import { Button, ButtonGroup, CustomInput } from 'reactstrap'; +import { Button, ButtonGroup, CustomInput } from '../../../components/ui/index'; import * as Actions from '../../../modules/menu/actions/menuAction'; import { areaClickAction, diff --git a/src/views/control/weather/WeatherList.js b/src/views/control/weather/WeatherList.js index 554558e1..bfbc23b3 100644 --- a/src/views/control/weather/WeatherList.js +++ b/src/views/control/weather/WeatherList.js @@ -11,7 +11,7 @@ import { CloudRain, CloudSnow } from 'react-feather'; -import { Button, InputGroup, InputGroupAddon, Input, Table } from 'reactstrap'; +import { Button, InputGroup, Input, Table } from '../../../components/ui/index'; const WeatherList = props => { const [clickTab, setClickTab] = useState(true);