Browse Source

buuton 태그 ripple 삭제

master
박상현 7 months ago
parent
commit
6e3d1e9eff
  1. 12
      src/components/account/mypage/AccountMypageForm.js
  2. 4
      src/components/account/mypage/AccountMypagePwForm.js
  3. 11
      src/components/account/register/AccountRegisterForm.js
  4. 2
      src/components/account/register/AccountRegisterTerm.js
  5. 2
      src/components/analysis/history/AnalysisHistoryDetailSearch.js
  6. 1
      src/components/analysis/history/AnalysisHistorySearch.js
  7. 1
      src/components/analysis/simulation/AnalysisSimulationDetail.js
  8. 1
      src/components/basis/BasisSearch.js
  9. 2
      src/components/basis/dron/BasisDronImage.js
  10. 4
      src/components/basis/dron/BasisIdntform.js
  11. 2
      src/components/basis/flight/plan/FlightPlanGroupGrid.js
  12. 2
      src/components/basis/flight/schedule/FlightScheduleSearch.js
  13. 2
      src/components/basis/group/BaisGroupForm.js
  14. 2
      src/components/crud/excel/ExcelExportButton.js
  15. 1
      src/components/cstmrService/inquiry/QnaGrid.js
  16. 7
      src/components/cstmrService/inquiry/QnaSearchBox.js
  17. 2
      src/components/laanc/list/LaancGrid.js
  18. 1
      src/components/laanc/list/LaancSearch.js
  19. 7
      src/components/layout/CustomDetailLayout.js
  20. 52
      src/components/ui/button/CustomButton.tsx
  21. 2
      src/containers/account/find/AccounFindTabContainer.js
  22. 3
      src/containers/basis/dron/BasisDronContainer.js
  23. 2
      src/containers/basis/dron/BasisDronDetailContainer.js
  24. 4
      src/containers/basis/group/BasisGroupApprovalContainer.js
  25. 10
      src/containers/basis/group/BasisGroupContainer.js
  26. 1
      src/containers/basis/group/BasisGroupDetailJoinContainer.js
  27. 5
      src/containers/basis/group/BasisGroupUsersContainer.js
  28. 1
      src/containers/cstmrService/faq/FaqContainer.js
  29. 1
      src/containers/cstmrService/inquiry/UserInquiryContainer.js
  30. 1
      src/containers/cstmrService/inquiry/tempCodeRunnerFile.js

12
src/components/account/mypage/AccountMypageForm.js

@ -141,7 +141,6 @@ const AccountMypageForm = ({
</Label>
<div className='user-phone-btn'>
<Button
ripple
type='button'
color='primary'
onClick={handler}
@ -208,7 +207,6 @@ const AccountMypageForm = ({
{seconds_Counter}
</span>
<Button
ripple
type='button'
color='secondary'
onClick={handlerSmsSend}
@ -245,7 +243,6 @@ const AccountMypageForm = ({
</Col>
<Col md='4' xs='12'>
<Button
ripple
type='button'
color='secondary'
onClick={handlerSmsConfirm}
@ -280,7 +277,6 @@ const AccountMypageForm = ({
<div className='d-flex justify-content-between'>
<div>
<Button
ripple
className='mr-1'
color='primary'
size='sm'
@ -288,18 +284,12 @@ const AccountMypageForm = ({
>
저장
</Button>
<Button
ripple
color='danger'
size='sm'
onClick={handleUseHitory}
>
<Button color='danger' size='sm' onClick={handleUseHitory}>
취소
</Button>
</div>
<div>
<Button
ripple
color='danger'
size='sm'
onClick={() => handlerWidthrow()}

4
src/components/account/mypage/AccountMypagePwForm.js

@ -147,7 +147,6 @@ const AccountMypagePwForm = ({ activeTab }) => {
color='primary'
onClick={pwok}
size='sm'
ripple
>
확인
</Button>
@ -202,11 +201,10 @@ const AccountMypagePwForm = ({ activeTab }) => {
onClick={pwSubmit}
disabled={resultOk}
size='sm'
ripple
>
저장
</Button>
<Button color='danger' size='sm' onClick={handleUseHitory} ripple>
<Button color='danger' size='sm' onClick={handleUseHitory}>
취소
</Button>
</div>

11
src/components/account/register/AccountRegisterForm.js

@ -464,12 +464,7 @@ export const AccountRegisterForm = ({
<span className={!isRunning || isCrtfy ? 'time d-none' : 'time'}>
남은시간 {minutes_Counter}:{seconds_Counter}
</span>
<Button
ripple
type='button'
color='secondary'
onClick={handlerSmsSend}
>
<Button type='button' color='secondary' onClick={handlerSmsSend}>
<span className='d-sm-inline-block'>인증번호 발송</span>
</Button>
</div>
@ -510,7 +505,6 @@ export const AccountRegisterForm = ({
)}
<div className='user-phone-btn'>
<Button
ripple
type='button'
color='secondary'
onClick={handlerSmsConfirm}
@ -658,7 +652,6 @@ export const AccountRegisterForm = ({
</Row>
<div className='d-flex justify-content-between'>
<Button
ripple
color='dark'
className='btn-prev'
onClick={handlerCancel}
@ -666,7 +659,7 @@ export const AccountRegisterForm = ({
>
<span className='align-middle d-sm-inline-block'> 취소</span>
</Button>
<button ripple type='submit' color='primary' className='btn-next'>
<button type='submit' color='primary' className='btn-next'>
<span className='align-middle d-sm-inline-block'>완료</span>
</button>
</div>

2
src/components/account/register/AccountRegisterTerm.js

@ -212,7 +212,6 @@ export const AccountRegisterTerm = ({ stepper, type, movePage }) => {
<div className='d-flex justify-content-between'>
<Button
ripple
color='dark'
className='btn-prev'
onClick={handlerCancel}
@ -221,7 +220,6 @@ export const AccountRegisterTerm = ({ stepper, type, movePage }) => {
<span className='align-middle d-sm-inline-block'> 취소</span>
</Button>
<Button
ripple
type='submit'
color='primary'
className='btn-next'

2
src/components/analysis/history/AnalysisHistoryDetailSearch.js

@ -18,7 +18,7 @@ export const AnalysisHistoryDetailSearch = props => {
<h4>검색조건</h4>
</div>
<div className='d-flex align-items-center'>
<Button ripple color='primary' size='sm'>
<Button color='primary' size='sm'>
<Search size={16} />
검색
</Button>

1
src/components/analysis/history/AnalysisHistorySearch.js

@ -37,7 +37,6 @@ export const AnalysisHistorySearch = props => {
</div>
<div className='d-flex align-items-center'>
<Button
ripple
color='primary'
size='sm'
onClick={e => props.handlerSearch()}

1
src/components/analysis/simulation/AnalysisSimulationDetail.js

@ -178,7 +178,6 @@ export const AnalysisSimulationDetail = props => {
</div>
<div className='simulation-slider-time'>
<Button
ripple
className='btn-icon'
color='primary'
onClick={() => props.setIsPlay(!props.isPlay)}

1
src/components/basis/BasisSearch.js

@ -12,7 +12,6 @@ export const BasisSearch = ({ children, ...props }) => {
</div>
<div className='d-flex align-items-center'>
<Button
ripple
color='primary'
size='sm'
onClick={e => props.handlerSearch()}

2
src/components/basis/dron/BasisDronImage.js

@ -27,7 +27,6 @@ export const BasisDronImage = props => {
</div>
<div className='d-flex flex-wrap mt-1 px-0 media-btn-2n'>
<Button
ripple
id='change-img'
tag={Label}
className='mr-1'
@ -48,7 +47,6 @@ export const BasisDronImage = props => {
/>
</Button>
<Button
ripple
color={!props.img ? 'secondary' : 'danger'}
onClick={props.handlerImageDelete}
disabled={!props.img || props.isDisabled}

4
src/components/basis/dron/BasisIdntform.js

@ -150,7 +150,6 @@ export const BasisIdntfForm = props => {
</Col>
<Col xs={1} md={1} className='count-del-btn'>
<Button
ripple
color='danger'
className='text-nowrap px-1'
onClick={() =>
@ -173,7 +172,6 @@ export const BasisIdntfForm = props => {
<Col xs={1} md={1} className='count-del-btn'>
{props.data[i].isSave && (
<Button
ripple
color='primary'
className='text-nowrap px-1'
onClick={() => {
@ -200,7 +198,6 @@ export const BasisIdntfForm = props => {
</dl>
<div className='d-flex align-items-center'>
<Button
ripple
className='mr-1'
color='primary'
size='sm'
@ -211,7 +208,6 @@ export const BasisIdntfForm = props => {
+ 추가
</Button>
<Button
ripple
className='mr-1'
color='primary'
size='sm'

2
src/components/basis/flight/plan/FlightPlanGroupGrid.js

@ -48,7 +48,6 @@ const FlightPlanGroupGrid = ({
cell: row => {
return selectGroup?.groupId === row?.groupId ? (
<Button
ripple
color='danger'
className='badge badge-danger'
onClick={() => handlerGroupCancel()}
@ -57,7 +56,6 @@ const FlightPlanGroupGrid = ({
</Button>
) : (
<Button
ripple
color='primary'
className='badge badge-primary'
onClick={() => {

2
src/components/basis/flight/schedule/FlightScheduleSearch.js

@ -43,7 +43,7 @@ function FlightScheduleSearch() {
<h4>검색조건</h4>
</div>
<div className='d-flex align-items-center'>
<Button ripple color='primary' size='sm' onClick={handlerSearch}>
<Button color='primary' size='sm' onClick={handlerSearch}>
<Search size={16} />
검색
</Button>

2
src/components/basis/group/BaisGroupForm.js

@ -143,7 +143,6 @@ export const BasisGroupForm = props => {
<div className='d-flex align-items-center'>
<Button
ripple
className='mr-1'
color='primary'
size='sm'
@ -154,7 +153,6 @@ export const BasisGroupForm = props => {
</Button>
{props.groupData.type != 'create' ? (
<Button
ripple
color='danger'
size='sm'
onClick={() => props.handlerWithDrawal()}

2
src/components/crud/excel/ExcelExportButton.js

@ -10,7 +10,7 @@ export const ExcelExportButton = props => {
filename={props.filename}
target='_blank'
>
<Button ripple color='primary' size='sm'>
<Button color='primary' size='sm'>
<File size={16} />
엑셀다운로드
</Button>

1
src/components/cstmrService/inquiry/QnaGrid.js

@ -55,7 +55,6 @@ export default function QnaGrid({ lists, handlerDetailModal }) {
minWidth: '150px',
cell: row => (
<Button
ripple
color='flat-primary'
onClick={() => {
handlerDetailModal(row.qnaSno);

7
src/components/cstmrService/inquiry/QnaSearchBox.js

@ -57,12 +57,7 @@ export default function QnaSearchBox({
<h4>검색조건</h4>
</div>
<div className='d-flex align-items-center'>
<Button
ripple
color='primary'
size='sm'
onClick={handlerSubmitSearch}
>
<Button color='primary' size='sm' onClick={handlerSubmitSearch}>
<Search size={16} />
검색
</Button>

2
src/components/laanc/list/LaancGrid.js

@ -142,7 +142,6 @@ export default function LaancGrid({ isSearch }) {
cell: row => {
return (
<Button
ripple
color='primary'
size='sm'
onClick={() => {
@ -161,7 +160,6 @@ export default function LaancGrid({ isSearch }) {
cell: row => {
return (
<Button
ripple
color='primary'
size='sm'
onClick={() => {

1
src/components/laanc/list/LaancSearch.js

@ -50,7 +50,6 @@ function LaancSearch({ isSearch }) {
</div>
<div className='d-flex align-items-center'>
<Button
ripple
color='primary'
size='sm'
onClick={() => {

7
src/components/layout/CustomDetailLayout.js

@ -19,12 +19,7 @@ export const CustomDetailLayout = ({ children, ...props }) => {
<h3>{props.title}</h3>
</div>
<div>
<Button
ripple
color='danger'
className='btn-icon'
onClick={handlerClose}
>
<Button color='danger' className='btn-icon' onClick={handlerClose}>
<X size={18} />
</Button>
</div>

52
src/components/ui/button/CustomButton.tsx

@ -27,7 +27,6 @@ interface Props {
disabled?: boolean;
id?: string;
style?: React.CSSProperties;
ripple?: boolean;
}
/**
@ -43,7 +42,6 @@ interface Props {
* @param children?:ReactNode
* @param disabled?:boolean default false
* @param id?:string
* @param ripple?:boolean default false Button.Ripple과 Button
* @param style?:React.CSSProperties
*/
@ -58,7 +56,6 @@ export default function CustomButton({
children,
disabled = false,
id,
ripple = false,
style
}: Props) {
const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
@ -69,41 +66,20 @@ export default function CustomButton({
};
return (
<>
{ripple ? (
<>
<Button.Ripple
onClick={handleClick}
outline={outline}
color={color}
type={type}
size={size}
className={className}
tag={tag}
disabled={disabled}
style={style}
id={id}
>
{children}
</Button.Ripple>
</>
) : (
<>
<Button
onClick={handleClick}
outline={outline}
color={color}
type={type}
size={size}
className={className}
tag={tag}
disabled={disabled}
id={id}
style={style}
>
{children}
</Button>
</>
)}
<Button
onClick={handleClick}
outline={outline}
color={color}
type={type}
size={size}
className={className}
tag={tag}
disabled={disabled}
id={id}
style={style}
>
{children}
</Button>
</>
);
}

2
src/containers/account/find/AccounFindTabContainer.js

@ -22,7 +22,7 @@ export const AccountFindTabContainer = () => {
<AccountFindTab />
</div>
<div className='user-search-link'>
<Button ripple color='flat-warning' onClick={handlerRegister}>
<Button color='flat-warning' onClick={handlerRegister}>
회원가입 바로가기
</Button>
</div>

3
src/containers/basis/dron/BasisDronContainer.js

@ -69,7 +69,6 @@ export const BasisDronContainer = ({ history, user }) => {
cell: row => {
return selectGroup?.groupId === row?.groupId ? (
<Button
ripple
color='danger'
className='badge badge-danger'
onClick={() => handlerCancel()}
@ -78,7 +77,6 @@ export const BasisDronContainer = ({ history, user }) => {
</Button>
) : (
<Button
ripple
color='primary'
className='badge badge-primary'
onClick={() =>
@ -249,7 +247,6 @@ export const BasisDronContainer = ({ history, user }) => {
button={
<div className='d-flex align-items-center'>
<Button
ripple
color='primary'
size='sm'
onClick={handlerGroupCreate}

2
src/containers/basis/dron/BasisDronDetailContainer.js

@ -265,7 +265,6 @@ export const BasisDronDetailContainer = props => {
<Col md='12'>
<div className='d-flex align-items-center'>
<Button
ripple
className='mr-1'
color='primary'
size='sm'
@ -280,7 +279,6 @@ export const BasisDronDetailContainer = props => {
</Button>
{pageType != 'create' ? (
<Button
ripple
color='danger'
size='sm'
onClick={handlerDelete}

4
src/containers/basis/group/BasisGroupApprovalContainer.js

@ -103,7 +103,6 @@ export const BasisGroupApprovalContainer = ({ user }) => {
// return selectData?.groupId === row?.groupId ? (
return aprvSelect?.groupId === row?.groupId ? (
<Button
ripple
color='danger'
className='badge badge-danger'
onClick={() => handlerCancel()}
@ -112,7 +111,6 @@ export const BasisGroupApprovalContainer = ({ user }) => {
</Button>
) : (
<Button
ripple
color='primary'
className='badge badge-primary'
onClick={() =>
@ -207,7 +205,6 @@ export const BasisGroupApprovalContainer = ({ user }) => {
return row?.aprvlYn === 'N' ? (
<Button
ripple
color='primary'
className='badge badge-primary'
onClick={() => handlerAprvConfirm(row?.cstmrGroupSno, trmnlId)}
@ -217,7 +214,6 @@ export const BasisGroupApprovalContainer = ({ user }) => {
</Button>
) : (
<Button
ripple
color='danger'
className='badge badge-danger'
onClick={() => handlerCancelConfirm(row?.cstmrGroupSno)}

10
src/containers/basis/group/BasisGroupContainer.js

@ -141,7 +141,6 @@ export const BasisGroupContainer = ({ history, user }) => {
<div>-</div>
) : (
<Button
ripple
color='danger'
className='badge badge-danger'
onClick={() => handlerWithDrawal(row.cstmrGroupSno)}
@ -204,12 +203,7 @@ export const BasisGroupContainer = ({ history, user }) => {
pagination={false}
button={
<div className='d-flex align-items-center'>
<Button
ripple
color='primary'
size='sm'
onClick={handlerGroupCreate}
>
<Button color='primary' size='sm' onClick={handlerGroupCreate}>
그룹생성
</Button>
</div>
@ -224,7 +218,7 @@ export const BasisGroupContainer = ({ history, user }) => {
pagination={false}
button={
<div className='d-flex align-items-center'>
<Button ripple color='primary' size='sm' onClick={handlerGroupJoin}>
<Button color='primary' size='sm' onClick={handlerGroupJoin}>
가입하기
</Button>
</div>

1
src/containers/basis/group/BasisGroupDetailJoinContainer.js

@ -114,7 +114,6 @@ export const BasisGroupDetailJoinContainer = ({ user }) => {
return row?.joinYn === 'N' ? (
<Button
ripple
color='primary'
className='badge badge-primary'
onClick={() => handlerJoin(row?.groupId)}

5
src/containers/basis/group/BasisGroupUsersContainer.js

@ -104,7 +104,6 @@ export const BasisGroupUsersContainer = ({ user }) => {
// return selectData?.groupId === row?.groupId ? (
return userSelect?.groupId === row?.groupId ? (
<Button
ripple
color='danger'
className='badge badge-danger'
onClick={() => handlerCancel()}
@ -113,7 +112,6 @@ export const BasisGroupUsersContainer = ({ user }) => {
</Button>
) : (
<Button
ripple
color='primary'
className='badge badge-primary'
onClick={() =>
@ -271,7 +269,6 @@ export const BasisGroupUsersContainer = ({ user }) => {
return (
<>
<Button
ripple
{...(master ? {} : { color: 'warning' })}
className='badge badge-warning'
style={{ marginRight: '0.35rem' }}
@ -283,7 +280,6 @@ export const BasisGroupUsersContainer = ({ user }) => {
LEVEL 1
</Button>
<Button
ripple
{...(leader ? {} : { color: 'danger' })}
className='badge badge-danger'
style={{ marginRight: '0.35rem' }}
@ -293,7 +289,6 @@ export const BasisGroupUsersContainer = ({ user }) => {
LEVEL 2
</Button>
<Button
ripple
{...(normal ? {} : { color: 'primary' })}
className='badge badge-primary'
onClick={() => handlerNormal(row?.cstmrGroupSno)}

1
src/containers/cstmrService/faq/FaqContainer.js

@ -256,7 +256,6 @@ export default function FaqContainer() {
{user?.authId !== 'USER' && (
<div>
<Button
ripple
color='flat-primary'
onClick={e => {
e.stopPropagation();

1
src/containers/cstmrService/inquiry/UserInquiryContainer.js

@ -97,7 +97,6 @@ export default function UserInquiryContainer({ memberName }) {
</h5>
<div>
<Button
ripple
color='flat-primary'
onClick={e => {
e.stopPropagation();

1
src/containers/cstmrService/inquiry/tempCodeRunnerFile.js

@ -0,0 +1 @@
ripple
Loading…
Cancel
Save