From 673a283e2a032c3031fca2f8b266320a6d154a57 Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 1 May 2024 19:57:54 +0900
Subject: [PATCH 01/10] feat: change modal inner's css
---
.../molecules/ModalInnerTextBox.tsx | 42 +++++++------------
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 62339219..661f1fbb 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -29,6 +29,9 @@ import {
gap,
border,
round,
+ row,
+ center,
+ justify,
} from "@biseo/web/styles";
interface ModalInnerProps extends PropsWithChildren {
@@ -80,36 +83,23 @@ export const ModalInner: React.FC & SubComponents = ({
children,
required = false,
}: ModalInnerProps) => (
-
-
-
-
-
- {title}
-
- {required && (
-
- *
-
- )}
-
+
+
+
+
+
{title}
+ {required &&
*
}
+
{count !== undefined && (
-
- {count}
-
+
)}
-
+
{buttonText}
-
+
{children}
-
+
);
const TextBox: React.FC = ({ children = null }) => (
From 545fb1b760f521e4f4e5cb48c2bbd05ebedecd27 Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 1 May 2024 20:07:23 +0900
Subject: [PATCH 02/10] feat: change text to p with token css
---
.../molecules/ModalInnerTextBox.tsx | 26 ++++++-------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 661f1fbb..3a2a78ee 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -2,7 +2,6 @@ import React, { type PropsWithChildren } from "react";
import {
BorderedBox,
Box,
- Text,
GrayTextButton,
Scroll,
TextInput,
@@ -114,9 +113,7 @@ const TextBox: React.FC = ({ children = null }) => (
borderStyle="solid"
gap={10}
>
-
- {children}
-
+ {children}
);
ModalInner.TextBox = TextBox;
@@ -132,9 +129,7 @@ const WhiteTextBox: React.FC = ({ children = null }) => (
borderStyle="solid"
gap={10}
>
-
- {children}
-
+ {children}
);
ModalInner.WhiteTextBox = WhiteTextBox;
@@ -210,7 +205,7 @@ const TextButton: React.FC = ({
}}
/>
);
@@ -256,9 +251,7 @@ const VoteOption: React.FC = ({ children = null }) => (
overflowWrap: "break-word",
}}
>
-
- {children}
-
+ {children}
);
ModalInner.VoteOption = VoteOption;
@@ -315,16 +308,15 @@ const VoteChoice: React.FC void }> = ({
minHeight: 32,
}}
>
-
{children}
-
+
@@ -348,9 +340,7 @@ const TagChoice: React.FC = ({ children = null }) => (
justify="center"
align="center"
>
-
- {children}
-
+ {children}
);
ModalInner.TagChoice = TagChoice;
From c8b44f8c46721215904e08685222de25f6622f03 Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 1 May 2024 20:34:18 +0900
Subject: [PATCH 03/10] feat: change text box
---
.../molecules/ModalInnerTextBox.tsx | 81 +++++++------------
1 file changed, 28 insertions(+), 53 deletions(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 3a2a78ee..a96a1136 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -102,55 +102,46 @@ export const ModalInner: React.FC & SubComponents = ({
);
const TextBox: React.FC = ({ children = null }) => (
-
{children}
-
+
);
ModalInner.TextBox = TextBox;
const WhiteTextBox: React.FC = ({ children = null }) => (
-
{children}
-
+
);
ModalInner.WhiteTextBox = WhiteTextBox;
const InputBox: React.FC = ({ value = undefined, onChange }) => (
-
+
-
+
);
ModalInner.InputBox = InputBox;
@@ -158,22 +149,14 @@ const TextAreaInputBox: React.FC = ({
value = undefined,
onChange,
}) => (
-
+
-
+
);
ModalInner.TextAreaInputBox = TextAreaInputBox;
@@ -183,15 +166,7 @@ const TextButton: React.FC = ({
onClick,
onSubmit,
}) => (
-
+
);
ModalInner.TextButton = TextButton;
From ecf046a886dd0b9bcbabeaf934924f72fa82f7b8 Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 1 May 2024 20:42:36 +0900
Subject: [PATCH 04/10] feat: fix vote options
---
.../molecules/ModalInnerTextBox.tsx | 23 +++++++++++--------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index a96a1136..2d5f9005 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -192,18 +192,23 @@ const VoteOptions: React.FC = ({ children = null }) => {
${scrollBar}
overflow-y: scroll;
`;
+ const flexWrap = css`
+ flex-wrap: wrap;
+ `;
return (
-
{children}
-
+
);
};
ModalInner.VoteOptions = VoteOptions;
From d1b294c04293c6c93f1e19ad19aaa37f4a4c544f Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 8 May 2024 20:24:30 +0900
Subject: [PATCH 05/10] feat: update modalInner TextBox
---
.../molecules/ModalInnerTextBox.tsx | 79 +++++++++----------
1 file changed, 37 insertions(+), 42 deletions(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 2d5f9005..598c2fc1 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -1,7 +1,5 @@
import React, { type PropsWithChildren } from "react";
import {
- BorderedBox,
- Box,
GrayTextButton,
Scroll,
TextInput,
@@ -10,6 +8,7 @@ import {
Clickable,
TaggersBox,
Divider,
+ Box,
} from "@biseo/web/components/atoms";
import "@biseo/web/components/atoms/placeholder.css";
import { TrashIcon } from "@biseo/web/assets";
@@ -214,17 +213,16 @@ const VoteOptions: React.FC = ({ children = null }) => {
ModalInner.VoteOptions = VoteOptions;
const VoteOption: React.FC = ({ children = null }) => (
- = ({ children = null }) => (
}}
>
{children}
-
+
);
ModalInner.VoteOption = VoteOption;
@@ -270,20 +268,19 @@ const VoteChoice: React.FC void }> = ({
children = null,
onClick = () => {},
}) => (
- void }> = ({
-
+
);
ModalInner.VoteChoice = VoteChoice;
const TagChoice: React.FC = ({ children = null }) => (
-
{children}
-
+
);
ModalInner.TagChoice = TagChoice;
From fcd5998310f8bb80363063fb967a57b0d3fdee8c Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 8 May 2024 20:38:58 +0900
Subject: [PATCH 06/10] fix: change justiry for option
---
packages/web/src/components/molecules/ModalInnerTextBox.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 598c2fc1..14795baf 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -273,7 +273,7 @@ const VoteChoice: React.FC void }> = ({
w("fill"),
h("hug"),
bg.white,
- justify.start,
+ justify.between,
border.gray200,
round.md,
padding.vertical(8),
From 3bfa4ad5e89b696cc036cc519ef09b0ef392cee5 Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 8 May 2024 20:39:50 +0900
Subject: [PATCH 07/10] fix: update voteChoice flex
---
packages/web/src/components/molecules/ModalInnerTextBox.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 14795baf..69a63cc4 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -274,6 +274,7 @@ const VoteChoice: React.FC void }> = ({
h("hug"),
bg.white,
justify.between,
+ align.start,
border.gray200,
round.md,
padding.vertical(8),
From 5755ddb37c6290772c1ec7a1fe8a3b407acf0e70 Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 8 May 2024 20:49:15 +0900
Subject: [PATCH 08/10] fix: change box to submitterable button
---
.../src/components/molecules/ModalInnerTextBox.tsx | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 69a63cc4..59a6b20b 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -8,7 +8,6 @@ import {
Clickable,
TaggersBox,
Divider,
- Box,
} from "@biseo/web/components/atoms";
import "@biseo/web/components/atoms/placeholder.css";
import { TrashIcon } from "@biseo/web/assets";
@@ -296,9 +295,17 @@ const VoteChoice: React.FC void }> = ({
{children}
-
+
+
);
From c86b1ad8d6da65ad6b19e683bd20d2c99707945c Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 8 May 2024 20:53:14 +0900
Subject: [PATCH 09/10] fix: change to button
---
.../src/components/molecules/ModalInnerTextBox.tsx | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index 59a6b20b..cb1a2f73 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -295,17 +295,9 @@ const VoteChoice: React.FC void }> = ({
{children}
-
);
From 064ffff1a745afb40b3b82917bd704b261c0a8d7 Mon Sep 17 00:00:00 2001
From: Sanghou
Date: Wed, 8 May 2024 20:56:08 +0900
Subject: [PATCH 10/10] fix: change button style
---
packages/web/src/components/molecules/ModalInnerTextBox.tsx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/packages/web/src/components/molecules/ModalInnerTextBox.tsx b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
index cb1a2f73..095dd879 100644
--- a/packages/web/src/components/molecules/ModalInnerTextBox.tsx
+++ b/packages/web/src/components/molecules/ModalInnerTextBox.tsx
@@ -295,7 +295,11 @@ const VoteChoice: React.FC void }> = ({
{children}
-
+