Browse Source

공통 컴포넌트 view,container 적용

master
박상현 8 months ago
parent
commit
b2b2f9d1b6
  1. 6
      src/components/ui/custominput/index.tsx
  2. 2
      src/containers/account/mypage/AccountMypageContainer.js
  3. 2
      src/containers/analysis/history/AnalysisHistoryContainer.js
  4. 2
      src/containers/basis/flight/plan/WeatherContainer.js
  5. 2
      src/containers/cstmrService/inquiry/AdminInquiryContainer.js
  6. 2
      src/containers/laanc/LaancContainer.js
  7. 2
      src/containers/laanc/LaancPlanContainer.js
  8. 2
      src/containers/main/dash/MainDashContainer.js
  9. 8
      src/views/control/alarm/ControlAlarmDetail.js
  10. 2
      src/views/control/alarm/ControlAlarmList.js
  11. 2
      src/views/control/main/ControlMain.js
  12. 2
      src/views/control/report/ControlReportDetail.js
  13. 2
      src/views/control/report/ControlReportList.js
  14. 2
      src/views/control/setting/ControlSetting.js
  15. 2
      src/views/control/weather/WeatherList.js

6
src/components/ui/custominput/index.tsx

@ -15,6 +15,7 @@ interface Props {
bsSize?: 'lg' | 'sm' | undefined; bsSize?: 'lg' | 'sm' | undefined;
label?: string; label?: string;
inline?: boolean; inline?: boolean;
defaultChecked?: boolean;
} }
/** /**
* *
@ -31,6 +32,7 @@ interface Props {
* @param type?:string * @param type?:string
* @param bsSize?: "lg" | "sm" * @param bsSize?: "lg" | "sm"
* @param inline?:boolean default false * @param inline?:boolean default false
* @param defaultChecked?:boolean default false
* *
*/ */
@ -47,7 +49,8 @@ export default function CustomInputs({
readOnly, readOnly,
type, type,
inline, inline,
bsSize bsSize,
defaultChecked = false
}: Props) { }: Props) {
return ( return (
<> <>
@ -64,6 +67,7 @@ export default function CustomInputs({
onClick={onClick} onClick={onClick}
inline={inline} inline={inline}
onChange={onChange} onChange={onChange}
defaultChecked={defaultChecked}
> >
{children} {children}
</CustomInput> </CustomInput>

2
src/containers/account/mypage/AccountMypageContainer.js

@ -14,7 +14,7 @@ import {
ModalHeader, ModalHeader,
ModalBody, ModalBody,
ModalFooter ModalFooter
} from 'reactstrap'; } from '../../../components/ui/index';
import { accountAPI } from '../../../modules/account/register'; import { accountAPI } from '../../../modules/account/register';
import AccountMypagePwForm from '../../../components/account/mypage/AccountMypagePwForm'; import AccountMypagePwForm from '../../../components/account/mypage/AccountMypagePwForm';
import AccountMypageForm from '../../../components/account/mypage/AccountMypageForm'; import AccountMypageForm from '../../../components/account/mypage/AccountMypageForm';

2
src/containers/analysis/history/AnalysisHistoryContainer.js

@ -16,7 +16,7 @@ import {
ModalHeader, ModalHeader,
ModalBody, ModalBody,
ModalFooter ModalFooter
} from 'reactstrap'; } from '../../../components/ui/index';
import * as LaancAction from '../../../modules/laanc/actions/laancActions'; import * as LaancAction from '../../../modules/laanc/actions/laancActions';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { MessageErrorModal } from '../../../components/message/MessageErrorModal'; import { MessageErrorModal } from '../../../components/message/MessageErrorModal';

2
src/containers/basis/flight/plan/WeatherContainer.js

@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { Compass } from 'react-feather'; import { Compass } from 'react-feather';
import { Spinner } from 'reactstrap'; import { Spinner } from '../../../../components/ui/index';
import { import {
TodayWeather, TodayWeather,
TomorrowWeahter, TomorrowWeahter,

2
src/containers/cstmrService/inquiry/AdminInquiryContainer.js

@ -1,6 +1,6 @@
import { useEffect, useState, useCallback } from 'react'; import { useEffect, useState, useCallback } from 'react';
import { useSelector, useDispatch } from 'react-redux'; import { useSelector, useDispatch } from 'react-redux';
import { Col, Row } from 'reactstrap'; import { Col, Row } from '../../../components/ui/index';
import { import {
ADMIN_LIST, ADMIN_LIST,
ADMIN_DETAIL, ADMIN_DETAIL,

2
src/containers/laanc/LaancContainer.js

@ -1,6 +1,6 @@
import { useEffect, useState, lazy, Suspense } from 'react'; import { useEffect, useState, lazy, Suspense } from 'react';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { Button, Badge } from 'reactstrap'; import { Button, Badge } from '../../components/ui/index';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { CustomMainLayout } from '../../components/layout/CustomMainLayout'; import { CustomMainLayout } from '../../components/layout/CustomMainLayout';
import * as LaancAction from '../../modules/laanc/actions/laancActions'; import * as LaancAction from '../../modules/laanc/actions/laancActions';

2
src/containers/laanc/LaancPlanContainer.js

@ -1,7 +1,7 @@
import { lazy, useEffect, useState, Suspense } from 'react'; import { lazy, useEffect, useState, Suspense } from 'react';
import LaancModal from '../../components/laanc/LaancModal'; import LaancModal from '../../components/laanc/LaancModal';
import { initFlightBas } from '../../modules/laanc/models/laancModels'; 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 { AREA_DETAIL_INIT } from '../../modules/laanc/actions/laancActions';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions'; import { drawTypeChangeAction } from '../../modules/control/map/actions/controlMapActions';

2
src/containers/main/dash/MainDashContainer.js

@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';
import { shallowEqual, useDispatch, useSelector } from 'react-redux'; import { shallowEqual, useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { Col, Row } from 'reactstrap'; import { Col, Row } from '../../../components/ui/index';
import DroneFlightSchedule from '../../../components/dashboard/DroneFlightSchedule'; import DroneFlightSchedule from '../../../components/dashboard/DroneFlightSchedule';
import { DashboardGroupList } from '../../../components/dashboard/DashboardGroupList'; import { DashboardGroupList } from '../../../components/dashboard/DashboardGroupList';
import { DashboardStcsArea } from '../../../components/dashboard/DashboardStcsArea'; import { DashboardStcsArea } from '../../../components/dashboard/DashboardStcsArea';

8
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 = ({ const ControlAlarmDetail = ({
historyModal, historyModal,

2
src/views/control/alarm/ControlAlarmList.js

@ -3,7 +3,7 @@ import { X } from 'react-feather';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { controlGpLogAction } from '../../../modules/control/gp/actions/controlGpAction'; import { controlGpLogAction } from '../../../modules/control/gp/actions/controlGpAction';
import ControlAlarmDetail from './ControlAlarmDetail'; import ControlAlarmDetail from './ControlAlarmDetail';
import { Badge } from 'reactstrap'; import { Badge } from '../../../components/ui/index';
const ControlAlarmList = props => { const ControlAlarmList = props => {
const dispatch = useDispatch(); const dispatch = useDispatch();

2
src/views/control/main/ControlMain.js

@ -13,7 +13,7 @@ import {
} from 'react-feather'; } from 'react-feather';
import { AiOutlinePoweroff } from 'react-icons/ai'; import { AiOutlinePoweroff } from 'react-icons/ai';
import { IoAlertOutline } from 'react-icons/io5'; import { IoAlertOutline } from 'react-icons/io5';
import { Card } from 'reactstrap'; import { Card } from '../../../components/ui/index';
import ControlSetting from '../setting/ControlSetting'; import ControlSetting from '../setting/ControlSetting';
import WebsocketClient from '../../../components/websocket/WebsocketClient'; import WebsocketClient from '../../../components/websocket/WebsocketClient';
import { controlweatherAction } from '../../../modules/control/gp/actions/controlGpAction'; import { controlweatherAction } from '../../../modules/control/gp/actions/controlGpAction';

2
src/views/control/report/ControlReportDetail.js

@ -10,7 +10,7 @@ import {
CloudRain, CloudRain,
CloudSnow CloudSnow
} from 'react-feather'; } from 'react-feather';
import { Table } from 'reactstrap'; import { Table } from '../../../components/ui/index';
import drone_img from '../../../assets/images/drone.jpg'; import drone_img from '../../../assets/images/drone.jpg';
import uam_img from '../../../assets/images/uam_img.jpg'; import uam_img from '../../../assets/images/uam_img.jpg';
import drone_yellow from '../../../assets/images/drone_yellow.png'; import drone_yellow from '../../../assets/images/drone_yellow.png';

2
src/views/control/report/ControlReportList.js

@ -1,7 +1,7 @@
import { useState } from 'react'; import { useState } from 'react';
import { Search, X } from 'react-feather'; import { Search, X } from 'react-feather';
import { useDispatch, useSelector } from 'react-redux'; 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 dayjs from 'dayjs';
import { controlGpDtlAction } from '../../../modules/control/gp'; import { controlGpDtlAction } from '../../../modules/control/gp';
import { objectClickAction } from '../../../modules/control/map/actions/controlMapActions'; import { objectClickAction } from '../../../modules/control/map/actions/controlMapActions';

2
src/views/control/setting/ControlSetting.js

@ -1,7 +1,7 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom'; 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 * as Actions from '../../../modules/menu/actions/menuAction';
import { import {
areaClickAction, areaClickAction,

2
src/views/control/weather/WeatherList.js

@ -11,7 +11,7 @@ import {
CloudRain, CloudRain,
CloudSnow CloudSnow
} from 'react-feather'; } from 'react-feather';
import { Button, InputGroup, InputGroupAddon, Input, Table } from 'reactstrap'; import { Button, InputGroup, Input, Table } from '../../../components/ui/index';
const WeatherList = props => { const WeatherList = props => {
const [clickTab, setClickTab] = useState(true); const [clickTab, setClickTab] = useState(true);

Loading…
Cancel
Save