From fc3b4955deef23488dc2dd38823da04e48f2be1d Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Mon, 12 Jun 2023 17:33:36 +0900 Subject: [PATCH 01/11] Chore(web): Add SettingsButtons Component --- web/src/beta/components/Icon/Icons/audio.svg | 3 + .../components/Icon/Icons/buttonBlock.svg | 4 ++ web/src/beta/components/Icon/Icons/camera.svg | 4 ++ .../beta/components/Icon/Icons/editIcon.svg | 3 + web/src/beta/components/Icon/Icons/mdFile.svg | 6 ++ .../beta/components/Icon/Icons/settings.svg | 3 + web/src/beta/components/Icon/Icons/video.svg | 3 + web/src/beta/components/Icon/icons.ts | 14 ++++ .../SettingsButtons/index.stories.tsx | 29 +++++++++ .../beta/components/SettingsButtons/index.tsx | 64 +++++++++++++++++++ 10 files changed, 133 insertions(+) create mode 100644 web/src/beta/components/Icon/Icons/audio.svg create mode 100644 web/src/beta/components/Icon/Icons/buttonBlock.svg create mode 100644 web/src/beta/components/Icon/Icons/camera.svg create mode 100644 web/src/beta/components/Icon/Icons/editIcon.svg create mode 100644 web/src/beta/components/Icon/Icons/mdFile.svg create mode 100644 web/src/beta/components/Icon/Icons/settings.svg create mode 100644 web/src/beta/components/Icon/Icons/video.svg create mode 100644 web/src/beta/components/SettingsButtons/index.stories.tsx create mode 100644 web/src/beta/components/SettingsButtons/index.tsx diff --git a/web/src/beta/components/Icon/Icons/audio.svg b/web/src/beta/components/Icon/Icons/audio.svg new file mode 100644 index 0000000000..e73c60548e --- /dev/null +++ b/web/src/beta/components/Icon/Icons/audio.svg @@ -0,0 +1,3 @@ + + + diff --git a/web/src/beta/components/Icon/Icons/buttonBlock.svg b/web/src/beta/components/Icon/Icons/buttonBlock.svg new file mode 100644 index 0000000000..b922ecacb7 --- /dev/null +++ b/web/src/beta/components/Icon/Icons/buttonBlock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/web/src/beta/components/Icon/Icons/camera.svg b/web/src/beta/components/Icon/Icons/camera.svg new file mode 100644 index 0000000000..fbb8548d52 --- /dev/null +++ b/web/src/beta/components/Icon/Icons/camera.svg @@ -0,0 +1,4 @@ + + + + diff --git a/web/src/beta/components/Icon/Icons/editIcon.svg b/web/src/beta/components/Icon/Icons/editIcon.svg new file mode 100644 index 0000000000..4f844cf905 --- /dev/null +++ b/web/src/beta/components/Icon/Icons/editIcon.svg @@ -0,0 +1,3 @@ + + + diff --git a/web/src/beta/components/Icon/Icons/mdFile.svg b/web/src/beta/components/Icon/Icons/mdFile.svg new file mode 100644 index 0000000000..371470c386 --- /dev/null +++ b/web/src/beta/components/Icon/Icons/mdFile.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/web/src/beta/components/Icon/Icons/settings.svg b/web/src/beta/components/Icon/Icons/settings.svg new file mode 100644 index 0000000000..d4cee33d1d --- /dev/null +++ b/web/src/beta/components/Icon/Icons/settings.svg @@ -0,0 +1,3 @@ + + + diff --git a/web/src/beta/components/Icon/Icons/video.svg b/web/src/beta/components/Icon/Icons/video.svg new file mode 100644 index 0000000000..72082e6490 --- /dev/null +++ b/web/src/beta/components/Icon/Icons/video.svg @@ -0,0 +1,3 @@ + + + diff --git a/web/src/beta/components/Icon/icons.ts b/web/src/beta/components/Icon/icons.ts index b358fd6d56..63f2fcd4c5 100644 --- a/web/src/beta/components/Icon/icons.ts +++ b/web/src/beta/components/Icon/icons.ts @@ -35,6 +35,14 @@ import PlayRight from "./Icons/play-right.svg"; import PlayLeft from "./Icons/play-left.svg"; import Ellipse from "./Icons/ellipse.svg"; +// SettingsButton +import Audio from "./Icons/audio.svg"; +import EditIcon from "./Icons/editIcon.svg"; +import Settings from "./Icons/settings.svg"; +import ButtonBlock from "./Icons/buttonBlock.svg"; +import Camera from "./Icons/camera.svg"; +import MdFile from "./Icons/mdFile.svg"; + export default { file: File, dl: InfoTable, @@ -57,4 +65,10 @@ export default { playLeft: PlayLeft, timeline: Timeline, actionbutton: ActionButton, + audio: Audio, + editIcon: EditIcon, + settings: Settings, + buttonBlock: ButtonBlock, + camera: Camera, + mdFile: MdFile, }; diff --git a/web/src/beta/components/SettingsButtons/index.stories.tsx b/web/src/beta/components/SettingsButtons/index.stories.tsx new file mode 100644 index 0000000000..12e4db1bbe --- /dev/null +++ b/web/src/beta/components/SettingsButtons/index.stories.tsx @@ -0,0 +1,29 @@ +import { action } from "@storybook/addon-actions"; +import { Meta, StoryObj } from "@storybook/react"; +import React, { ReactNode } from "react"; + +import SettingsButtons from "."; + +export default { + component: SettingsButtons, +} as Meta; + +type Story = StoryObj; + +const Wrapper: React.FC<{ children: ReactNode }> = ({ children }) => ( +
{children}
+); + +export const Default: Story = { + render: () => ( + + + + ), +}; diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx new file mode 100644 index 0000000000..df607dc4b9 --- /dev/null +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -0,0 +1,64 @@ +import React from "react"; + +import { styled } from "@reearth/services/theme"; + +import Icon from "../Icon"; +import Text from "../Text"; + +export interface Props { + title: string; + icon: string; + onBlock?: () => void; + onEdit?: () => void; + onSetting?: () => void; +} + +const SettingsButtons: React.FC = ({ title, icon, onBlock, onEdit, onSetting }) => { + return ( + + + + {title} + + + + + ); +}; + +const Wrapper = styled.div` + display: flex; + flex-direction: row; + justify-content: space-around; + align-items: center; + padding: 0px; + + width: 100%; + height: 100%; + background: #3b3cd0; +`; + +export default SettingsButtons; From b95f951c2377c25ac991a28e8283d2136ecc7eca Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Tue, 13 Jun 2023 11:18:12 +0900 Subject: [PATCH 02/11] Chore(web): Modifying parts that are not necessary --- web/src/beta/components/SettingsButtons/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index df607dc4b9..3fb01c32bc 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -51,14 +51,12 @@ const SettingsButtons: React.FC = ({ title, icon, onBlock, onEdit, onSett const Wrapper = styled.div` display: flex; - flex-direction: row; justify-content: space-around; align-items: center; - padding: 0px; width: 100%; height: 100%; - background: #3b3cd0; + background: ${props => props.theme.infoBox.accent2}; `; export default SettingsButtons; From d1b8b98377bed667d26c3e92c429e2acfe5e6383 Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Wed, 14 Jun 2023 14:45:55 +0900 Subject: [PATCH 03/11] Fix(web): Render to args --- .../SettingsButtons/index.stories.tsx | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/web/src/beta/components/SettingsButtons/index.stories.tsx b/web/src/beta/components/SettingsButtons/index.stories.tsx index 12e4db1bbe..5c18108015 100644 --- a/web/src/beta/components/SettingsButtons/index.stories.tsx +++ b/web/src/beta/components/SettingsButtons/index.stories.tsx @@ -15,15 +15,18 @@ const Wrapper: React.FC<{ children: ReactNode }> = ({ children }) => ( ); export const Default: Story = { - render: () => ( - - - - ), + args: { + title: "Audio", + icon: "audio", + onBlock: action("onBlock"), + onEdit: action("onEdit"), + onSetting: action("onSetting"), + }, + render: args => { + return ( + + + + ); + }, }; From c52701a4bff71816ad15a65f8aeec0448ba6c3f1 Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Mon, 19 Jun 2023 18:15:00 +0900 Subject: [PATCH 04/11] Fix(web): modification by feedback --- web/src/beta/components/Icon/Icons/audio.svg | 4 ++-- web/src/beta/components/Icon/Icons/clock.svg | 4 ++++ web/src/beta/components/Icon/Icons/editIcon.svg | 4 ++-- web/src/beta/components/Icon/Icons/mdFile.svg | 6 +++--- web/src/beta/components/Icon/Icons/settings.svg | 4 ++-- web/src/beta/components/Icon/Icons/video.svg | 4 ++-- web/src/beta/components/Icon/icons.ts | 2 ++ .../components/SettingsButtons/index.stories.tsx | 6 +----- web/src/beta/components/SettingsButtons/index.tsx | 15 +++++++-------- 9 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 web/src/beta/components/Icon/Icons/clock.svg diff --git a/web/src/beta/components/Icon/Icons/audio.svg b/web/src/beta/components/Icon/Icons/audio.svg index e73c60548e..e6d09cd92e 100644 --- a/web/src/beta/components/Icon/Icons/audio.svg +++ b/web/src/beta/components/Icon/Icons/audio.svg @@ -1,3 +1,3 @@ - - + + diff --git a/web/src/beta/components/Icon/Icons/clock.svg b/web/src/beta/components/Icon/Icons/clock.svg new file mode 100644 index 0000000000..72e44bac3f --- /dev/null +++ b/web/src/beta/components/Icon/Icons/clock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/web/src/beta/components/Icon/Icons/editIcon.svg b/web/src/beta/components/Icon/Icons/editIcon.svg index 4f844cf905..dfdd179776 100644 --- a/web/src/beta/components/Icon/Icons/editIcon.svg +++ b/web/src/beta/components/Icon/Icons/editIcon.svg @@ -1,3 +1,3 @@ - - + + diff --git a/web/src/beta/components/Icon/Icons/mdFile.svg b/web/src/beta/components/Icon/Icons/mdFile.svg index 371470c386..0d349b4179 100644 --- a/web/src/beta/components/Icon/Icons/mdFile.svg +++ b/web/src/beta/components/Icon/Icons/mdFile.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/web/src/beta/components/Icon/Icons/settings.svg b/web/src/beta/components/Icon/Icons/settings.svg index d4cee33d1d..738cd914ec 100644 --- a/web/src/beta/components/Icon/Icons/settings.svg +++ b/web/src/beta/components/Icon/Icons/settings.svg @@ -1,3 +1,3 @@ - - + + diff --git a/web/src/beta/components/Icon/Icons/video.svg b/web/src/beta/components/Icon/Icons/video.svg index 72082e6490..354c544b73 100644 --- a/web/src/beta/components/Icon/Icons/video.svg +++ b/web/src/beta/components/Icon/Icons/video.svg @@ -1,3 +1,3 @@ - - + + diff --git a/web/src/beta/components/Icon/icons.ts b/web/src/beta/components/Icon/icons.ts index 63f2fcd4c5..b560bddd96 100644 --- a/web/src/beta/components/Icon/icons.ts +++ b/web/src/beta/components/Icon/icons.ts @@ -42,6 +42,7 @@ import Settings from "./Icons/settings.svg"; import ButtonBlock from "./Icons/buttonBlock.svg"; import Camera from "./Icons/camera.svg"; import MdFile from "./Icons/mdFile.svg"; +import Clock from "./Icons/clock.svg"; export default { file: File, @@ -71,4 +72,5 @@ export default { buttonBlock: ButtonBlock, camera: Camera, mdFile: MdFile, + clock: Clock, }; diff --git a/web/src/beta/components/SettingsButtons/index.stories.tsx b/web/src/beta/components/SettingsButtons/index.stories.tsx index 5c18108015..1484876a80 100644 --- a/web/src/beta/components/SettingsButtons/index.stories.tsx +++ b/web/src/beta/components/SettingsButtons/index.stories.tsx @@ -1,4 +1,3 @@ -import { action } from "@storybook/addon-actions"; import { Meta, StoryObj } from "@storybook/react"; import React, { ReactNode } from "react"; @@ -11,16 +10,13 @@ export default { type Story = StoryObj; const Wrapper: React.FC<{ children: ReactNode }> = ({ children }) => ( -
{children}
+
{children}
); export const Default: Story = { args: { title: "Audio", icon: "audio", - onBlock: action("onBlock"), - onEdit: action("onEdit"), - onSetting: action("onSetting"), }, render: args => { return ( diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index 3fb01c32bc..7d46b3e204 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -17,29 +17,30 @@ const SettingsButtons: React.FC = ({ title, icon, onBlock, onEdit, onSett return ( - + {title} = ({ title, icon, onBlock, onEdit, onSett const Wrapper = styled.div` display: flex; - justify-content: space-around; align-items: center; - width: 100%; height: 100%; background: ${props => props.theme.infoBox.accent2}; `; From 069e5c1a6f3f87e65fc4dffd9c1aeb8e05f07c84 Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Tue, 20 Jun 2023 18:26:00 +0900 Subject: [PATCH 05/11] Fix(web): changed color theme --- .../beta/components/SettingsButtons/index.tsx | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index 7d46b3e204..6164cb1a47 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { styled } from "@reearth/services/theme"; +import { styled, useTheme } from "@reearth/services/theme"; import Icon from "../Icon"; import Text from "../Text"; @@ -14,6 +14,8 @@ export interface Props { } const SettingsButtons: React.FC = ({ title, icon, onBlock, onEdit, onSetting }) => { + const theme = useTheme(); + return ( = ({ title, icon, onBlock, onEdit, onSett onClick={onBlock} icon={icon} /> - + {title} = ({ title, icon, onBlock, onEdit, onSett style={{ justifyItems: "center", padding: "4px", - borderLeft: "0.5px solid #ffffff", + borderLeft: `0.5px solid ${theme.general.content.strong}`, }} icon={"editIcon"} onClick={onEdit} @@ -41,7 +47,7 @@ const SettingsButtons: React.FC = ({ title, icon, onBlock, onEdit, onSett size={12} style={{ padding: "4px", - borderLeft: "0.5px solid #ffffff", + borderLeft: `0.5px solid ${theme.general.content.strong}`, }} icon={"settings"} onClick={onSetting} @@ -55,7 +61,7 @@ const Wrapper = styled.div` align-items: center; height: 100%; - background: ${props => props.theme.infoBox.accent2}; + background: ${props => props.theme.general.select}; `; export default SettingsButtons; From 43ec5967847731edcea3d5b459d7d55b3292973c Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:19:10 +0900 Subject: [PATCH 06/11] Fix(web): modification by feedback --- web/src/beta/components/Icon/Icons/audio.svg | 2 +- web/src/beta/components/Icon/Icons/buttonBlock.svg | 4 ++-- web/src/beta/components/Icon/Icons/camera.svg | 4 ++-- web/src/beta/components/Icon/Icons/clock.svg | 4 ++-- web/src/beta/components/Icon/Icons/editIcon.svg | 2 +- web/src/beta/components/Icon/Icons/mdFile.svg | 8 ++++---- web/src/beta/components/Icon/Icons/settings.svg | 2 +- web/src/beta/components/Icon/Icons/video.svg | 2 +- web/src/beta/components/SettingsButtons/index.stories.tsx | 2 +- web/src/beta/components/SettingsButtons/index.tsx | 2 -- 10 files changed, 15 insertions(+), 17 deletions(-) diff --git a/web/src/beta/components/Icon/Icons/audio.svg b/web/src/beta/components/Icon/Icons/audio.svg index e6d09cd92e..184805028f 100644 --- a/web/src/beta/components/Icon/Icons/audio.svg +++ b/web/src/beta/components/Icon/Icons/audio.svg @@ -1,3 +1,3 @@ - + diff --git a/web/src/beta/components/Icon/Icons/buttonBlock.svg b/web/src/beta/components/Icon/Icons/buttonBlock.svg index b922ecacb7..0cd886df41 100644 --- a/web/src/beta/components/Icon/Icons/buttonBlock.svg +++ b/web/src/beta/components/Icon/Icons/buttonBlock.svg @@ -1,4 +1,4 @@ - - + + diff --git a/web/src/beta/components/Icon/Icons/camera.svg b/web/src/beta/components/Icon/Icons/camera.svg index fbb8548d52..57416021dd 100644 --- a/web/src/beta/components/Icon/Icons/camera.svg +++ b/web/src/beta/components/Icon/Icons/camera.svg @@ -1,4 +1,4 @@ - - + + diff --git a/web/src/beta/components/Icon/Icons/clock.svg b/web/src/beta/components/Icon/Icons/clock.svg index 72e44bac3f..8b64acebce 100644 --- a/web/src/beta/components/Icon/Icons/clock.svg +++ b/web/src/beta/components/Icon/Icons/clock.svg @@ -1,4 +1,4 @@ - - + + diff --git a/web/src/beta/components/Icon/Icons/editIcon.svg b/web/src/beta/components/Icon/Icons/editIcon.svg index dfdd179776..a4dc4d018c 100644 --- a/web/src/beta/components/Icon/Icons/editIcon.svg +++ b/web/src/beta/components/Icon/Icons/editIcon.svg @@ -1,3 +1,3 @@ - + diff --git a/web/src/beta/components/Icon/Icons/mdFile.svg b/web/src/beta/components/Icon/Icons/mdFile.svg index 0d349b4179..6d94774b77 100644 --- a/web/src/beta/components/Icon/Icons/mdFile.svg +++ b/web/src/beta/components/Icon/Icons/mdFile.svg @@ -1,6 +1,6 @@ - - - - + + + + diff --git a/web/src/beta/components/Icon/Icons/settings.svg b/web/src/beta/components/Icon/Icons/settings.svg index 738cd914ec..797b59a6fd 100644 --- a/web/src/beta/components/Icon/Icons/settings.svg +++ b/web/src/beta/components/Icon/Icons/settings.svg @@ -1,3 +1,3 @@ - + diff --git a/web/src/beta/components/Icon/Icons/video.svg b/web/src/beta/components/Icon/Icons/video.svg index 354c544b73..9e17452865 100644 --- a/web/src/beta/components/Icon/Icons/video.svg +++ b/web/src/beta/components/Icon/Icons/video.svg @@ -1,3 +1,3 @@ - + diff --git a/web/src/beta/components/SettingsButtons/index.stories.tsx b/web/src/beta/components/SettingsButtons/index.stories.tsx index 1484876a80..2ad9e51839 100644 --- a/web/src/beta/components/SettingsButtons/index.stories.tsx +++ b/web/src/beta/components/SettingsButtons/index.stories.tsx @@ -10,7 +10,7 @@ export default { type Story = StoryObj; const Wrapper: React.FC<{ children: ReactNode }> = ({ children }) => ( -
{children}
+
{children}
); export const Default: Story = { diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index 6164cb1a47..83701ff7da 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -1,5 +1,3 @@ -import React from "react"; - import { styled, useTheme } from "@reearth/services/theme"; import Icon from "../Icon"; From 31e2bf3aa68141ad6e99f38a202aa437a3c5b341 Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:15:28 +0900 Subject: [PATCH 07/11] Fix(web): Modification by feedback --- .../beta/components/SettingsButtons/index.tsx | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index 83701ff7da..7cb380c5a9 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -16,14 +16,7 @@ const SettingsButtons: React.FC = ({ title, icon, onBlock, onEdit, onSett return ( - + = ({ title, icon, onBlock, onEdit, onSett onClick={onBlock}> {title} - - + + ); }; @@ -62,4 +38,14 @@ const Wrapper = styled.div` background: ${props => props.theme.general.select}; `; +const StyledMainIcon = styled(Icon)` + padding: 2px; +`; + +const StyledSubIcon = styled(Icon)` + padding: 4px; + justify-items: center; + border-left: 0.5px solid ${props => props.theme.general.content.strong}; +`; + export default SettingsButtons; From 56e1bddc80f6ac81ff2608f2b81db97d3d1655f5 Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:34:06 +0900 Subject: [PATCH 08/11] Fix(web): modification directory --- web/src/beta/components/SettingsButtons/index.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index 7cb380c5a9..f1dff8460b 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -1,8 +1,7 @@ +import Icon from "@reearth/beta/components/Icon"; +import Text from "@reearth/beta/components/Text"; import { styled, useTheme } from "@reearth/services/theme"; -import Icon from "../Icon"; -import Text from "../Text"; - export interface Props { title: string; icon: string; From 5c30ccf8f14ad48a3ada92705a82dd6ec7206880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=95=B7=E7=94=B0=E6=B7=B3=E5=8F=B2?= <> Date: Mon, 26 Jun 2023 15:28:30 +0900 Subject: [PATCH 09/11] Fix(web): Change icon comment --- web/src/beta/components/Icon/icons.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/beta/components/Icon/icons.ts b/web/src/beta/components/Icon/icons.ts index 33b9b533ac..0248120181 100644 --- a/web/src/beta/components/Icon/icons.ts +++ b/web/src/beta/components/Icon/icons.ts @@ -37,7 +37,7 @@ import PlayRight from "./Icons/play-right.svg"; import PlayLeft from "./Icons/play-left.svg"; import Ellipse from "./Icons/ellipse.svg"; -// SettingsButton +// Storytelling blocks import Audio from "./Icons/audio.svg"; import EditIcon from "./Icons/editIcon.svg"; import Settings from "./Icons/settings.svg"; From 3b581c5fbdd4bc9c8b6cc061be34c8abeaa805d7 Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <131335554+FabPARKJAESUNG@users.noreply.github.com> Date: Tue, 27 Jun 2023 10:01:48 +0900 Subject: [PATCH 10/11] Fix(web): Modification by feedback : cursor --- web/src/beta/components/SettingsButtons/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index f1dff8460b..20ede6385b 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -39,12 +39,14 @@ const Wrapper = styled.div` const StyledMainIcon = styled(Icon)` padding: 2px; + cursor: pointer; `; const StyledSubIcon = styled(Icon)` padding: 4px; justify-items: center; border-left: 0.5px solid ${props => props.theme.general.content.strong}; + cursor: pointer; `; export default SettingsButtons; From df0ea83fa3357fd7c3c01d9d9786e9399c44bbf7 Mon Sep 17 00:00:00 2001 From: JAESUNG_PARK <86940240+JAESUNGPARK2635@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:57:30 +0900 Subject: [PATCH 11/11] Fix(web): Modification by feedback --- web/src/beta/components/SettingsButtons/index.tsx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/web/src/beta/components/SettingsButtons/index.tsx b/web/src/beta/components/SettingsButtons/index.tsx index 20ede6385b..2fbd90ce9d 100644 --- a/web/src/beta/components/SettingsButtons/index.tsx +++ b/web/src/beta/components/SettingsButtons/index.tsx @@ -16,13 +16,9 @@ const SettingsButtons: React.FC = ({ title, icon, onBlock, onEdit, onSett return ( - + {title} - + @@ -37,6 +33,11 @@ const Wrapper = styled.div` background: ${props => props.theme.general.select}; `; +const StyledText = styled(Text)` + padding: 0px 4px; + cursor: pointer; +`; + const StyledMainIcon = styled(Icon)` padding: 2px; cursor: pointer;