Skip to content

Commit 89b911d

Browse files
committed
fix addColumnButton
1 parent f95df53 commit 89b911d

File tree

5 files changed

+23
-20
lines changed

5 files changed

+23
-20
lines changed

src/components/AddAnotherCardBtn/AddAnotherCardBtn.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ export const AddAnotherCardBtn = () => {
2424
</div>
2525
Add another card
2626
</button>
27-
{createCardModal &&
28-
<CreateCard isOpen={createCardModal} isClose={closeModal} />}
27+
{createCardModal && (
28+
<CreateCard isOpen={createCardModal} isClose={closeModal} />)}
2929
</div>
3030
);
3131
};

src/components/AddColumnBtn/AddColumnBtn.jsx

+8-6
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,27 @@ import { useState } from "react";
66
export const AddColumnBtn = () => {
77
const [isOpen, setIsOpen] = useState(false);
88

9-
function openColumnCreateModal() {
9+
const openModal = () => {
1010
setIsOpen(true)
1111
}
12-
13-
function closeColumnCreateModal() {
12+
13+
const closeModal = () => {
1414
setIsOpen(false)
1515
}
1616

1717
return (
18-
<div className={css.btn} onClick={openColumnCreateModal}>
18+
<>
19+
<button onClick={openModal} className={css.openModalBtn}>
1920
<div className={css.iconBox}>
2021
<svg className={css.icon} width="14px" height="14px">
2122
<use href={svg + "#icon-plus"}></use>
2223
</svg>
2324
</div>
2425
<p className={css.text}>Add another column</p>
26+
</button>
2527
{isOpen && (
26-
<CreateColumn isOpen={isOpen} isClose={closeColumnCreateModal} />
28+
<CreateColumn isOpen={isOpen} isClose={closeModal} />
2729
)}
28-
</div>
30+
</>
2931
);
3032
};

src/components/AddColumnBtn/AddColumnBtn.module.css

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
.btn {
2-
padding: 14px 78px;
3-
background-color: #121212;
4-
border-radius: 8px;
5-
border: none;
1+
.openModalBtn {
62
cursor: pointer;
73
display: flex;
84
align-items: center;
95
justify-content: center;
10-
max-width: 335px;
116
gap: 8px;
7+
border: none;
8+
border-radius: 8px;
9+
background: #121212;
10+
min-width: 334px;
1211
height: 56px;
1312
}
1413

@@ -27,6 +26,7 @@
2726
font-size: 14px;
2827
letter-spacing: -0.02em;
2928
color: #fff;
29+
width: 141px;
3030
}
3131

3232
.icon {

src/components/CreateColumnModal/CreateColumnModal.jsx

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ export const CreateColumn = ({ isOpen, isClose }) => {
1111
columnname: Yup.string().min(3, 'Too short!').max(20, 'Too long!').required('Required!')
1212
});
1313

14-
1514
return (
1615
<>
1716
<Modal isOpen={isOpen} onRequestClose={() => isClose()} className={css.createColumnModal} overlayClassName={css.createColumnModalOverlay}>
18-
<button className={css.createColumnModalCloseBtn} type="button" onClick={() => isClose()}>
17+
<button className={css.createColumnModalCloseBtn} type="button" onClick={isClose}>
1918
<svg className={css.createColumnModalIcon} width="18px" height="18px">
2019
<use href={svg + "#x-close"}></use>
2120
</svg>
@@ -30,7 +29,7 @@ export const CreateColumn = ({ isOpen, isClose }) => {
3029
>
3130
<Form autoComplete="off" className={css.createColumnModalForm}>
3231
<Field type='text' name='columnname' className={css.createColumnModalInput} placeholder="Title" />
33-
<button type="submit" className={css.createColumnModalSubmit} onClick={() => isClose()}>
32+
<button type="submit" className={css.createColumnModalSubmit} onClick={isClose}>
3433
<span className={css.createColumnModalSpan}>
3534
<svg className={css.createColumnModalAddIcon} width="14px" height="14px">
3635
<use href={svg + "#icon-plus"}></use>

src/components/EditColumnModal/EditColumnModal.jsx

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const EditColumn = ({ isOpen, isClose, title }) => {
1515
return (
1616
<>
1717
<Modal isOpen={isOpen} onRequestClose={() => isClose()} className={css.editColumnModal} overlayClassName={css.editColumnModalOverlay}>
18-
<button className={css.editColumnModalCloseBtn} type="button" onClick={isClose}>
18+
<button className={css.editColumnModalCloseBtn} type="button" onClick={() => isClose()}>
1919
<svg className={css.editColumnModalIcon} width="18px" height="18px">
2020
<use href={svg + "#x-close"}></use>
2121
</svg>
@@ -26,11 +26,13 @@ export const EditColumn = ({ isOpen, isClose, title }) => {
2626
initialValues={{ columnname: title }}
2727
validationSchema={columnModalValidation}
2828
portalClassName="createColumnModalContainer"
29-
// onSubmit={(values, actions) => {}}
29+
onSubmit={(values, actions) => {
30+
isClose()
31+
}}
3032
>
3133
<Form autoComplete="off" className={css.editColumnModalForm}>
3234
<Field type='text' name='columnname' className={css.editColumnModalInput} placeholder="Title" />
33-
<button type="submit" className={css.editColumnModalSubmit} onClick={() => isClose()}>
35+
<button type="submit" className={css.editColumnModalSubmit}>
3436
<span className={css.editColumnModalSpan}>
3537
<svg className={css.editColumnModalAddIcon} width="14px" height="14px">
3638
<use href={svg + "#icon-plus"}></use>

0 commit comments

Comments
 (0)