From 6420e20cfe521dd5bde24f3dc2aa8dcd543fdd7a Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Tue, 29 Jan 2019 11:06:11 +0100 Subject: [PATCH 1/5] added ButtonGroup component --- .../ui-components/src/buttons/ButtonGroup.js | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js diff --git a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js new file mode 100644 index 0000000000..9997e68a53 --- /dev/null +++ b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js @@ -0,0 +1,46 @@ +// @flow +import React from "react"; +import Button from "./Button"; + +type Props = { + firstlabel: string, + secondlabel: string, + firstColor: string, + secondColor: string, + firstAction?: (event: Event) => void, + secondAction?: (event: Event) => void, + firstIsSelected: boolean +}; + +class ButtonGroup extends React.Component { + + render() { + const { firstlabel, secondlabel, firstColor, secondColor, firstAction, secondAction, firstIsSelected } = this.props; + + let showFirstColor = firstColor; + let showSecondColor = secondColor; + + if (firstIsSelected) { + showFirstColor += " is-selected"; + } else { + showSecondColor += " is-selected"; + } + + return ( +
+
+ ); + } +} + +export default ButtonGroup; From c331aa55e375b47462b43725df047e2dbdddd48e Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Tue, 29 Jan 2019 14:02:36 +0100 Subject: [PATCH 2/5] used new Component --- .../ui-components/src/buttons/ButtonGroup.js | 4 +-- .../ui-components/src/buttons/index.js | 7 ++-- .../{ButtonGroup.js => FileButtonGroup.js} | 36 +++++++------------ .../src/repos/sources/containers/Content.js | 4 +-- 4 files changed, 21 insertions(+), 30 deletions(-) rename scm-ui/src/repos/sources/components/content/{ButtonGroup.js => FileButtonGroup.js} (58%) diff --git a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js index 9997e68a53..6921534ad3 100644 --- a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js +++ b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js @@ -21,9 +21,9 @@ class ButtonGroup extends React.Component { let showSecondColor = secondColor; if (firstIsSelected) { - showFirstColor += " is-selected"; + showFirstColor += "link is-selected"; } else { - showSecondColor += " is-selected"; + showSecondColor += "link is-selected"; } return ( diff --git a/scm-ui-components/packages/ui-components/src/buttons/index.js b/scm-ui-components/packages/ui-components/src/buttons/index.js index 2e166e1d93..014d92958d 100644 --- a/scm-ui-components/packages/ui-components/src/buttons/index.js +++ b/scm-ui-components/packages/ui-components/src/buttons/index.js @@ -5,6 +5,9 @@ export { default as Button } from "./Button.js"; export { default as CreateButton } from "./CreateButton.js"; export { default as DeleteButton } from "./DeleteButton.js"; export { default as EditButton } from "./EditButton.js"; -export { default as RemoveEntryOfTableButton } from "./RemoveEntryOfTableButton.js"; export { default as SubmitButton } from "./SubmitButton.js"; -export {default as DownloadButton} from "./DownloadButton.js"; +export { default as DownloadButton } from "./DownloadButton.js"; +export { default as ButtonGroup } from "./ButtonGroup.js"; +export { + default as RemoveEntryOfTableButton +} from "./RemoveEntryOfTableButton.js"; diff --git a/scm-ui/src/repos/sources/components/content/ButtonGroup.js b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js similarity index 58% rename from scm-ui/src/repos/sources/components/content/ButtonGroup.js rename to scm-ui/src/repos/sources/components/content/FileButtonGroup.js index 055ee115a5..6f7c7230ef 100644 --- a/scm-ui/src/repos/sources/components/content/ButtonGroup.js +++ b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js @@ -1,7 +1,7 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import { Button } from "@scm-manager/ui-components"; +import { ButtonGroup } from "@scm-manager/ui-components"; type Props = { t: string => string, @@ -9,7 +9,7 @@ type Props = { showHistory: boolean => void }; -class ButtonGroup extends React.Component { +class FileButtonGroup extends React.Component { showHistory = () => { this.props.showHistory(true); }; @@ -21,15 +21,6 @@ class ButtonGroup extends React.Component { render() { const { t, historyIsSelected } = this.props; - let sourcesColor = ""; - let historyColor = ""; - - if (historyIsSelected) { - historyColor = "link is-selected"; - } else { - sourcesColor = "link is-selected"; - } - const sourcesLabel = ( <> @@ -53,20 +44,17 @@ class ButtonGroup extends React.Component { ); return ( -
-
+ ); } } -export default translate("repos")(ButtonGroup); +export default translate("repos")(FileButtonGroup); diff --git a/scm-ui/src/repos/sources/containers/Content.js b/scm-ui/src/repos/sources/containers/Content.js index 6339c49a3d..a7e9874058 100644 --- a/scm-ui/src/repos/sources/containers/Content.js +++ b/scm-ui/src/repos/sources/containers/Content.js @@ -6,7 +6,7 @@ import { DateFromNow } from "@scm-manager/ui-components"; import FileSize from "../components/FileSize"; import injectSheet from "react-jss"; import classNames from "classnames"; -import ButtonGroup from "../components/content/ButtonGroup"; +import FileButtonGroup from "../components/content/FileButtonGroup"; import SourcesView from "./SourcesView"; import HistoryView from "./HistoryView"; import { getSources } from "../modules/sources"; @@ -76,7 +76,7 @@ class Content extends React.Component { const icon = collapsed ? "fa-angle-right" : "fa-angle-down"; const selector = file._links.history ? ( - From 554b24a19976492babc509b1ee9f5f7c05dbf114 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Tue, 29 Jan 2019 14:55:10 +0100 Subject: [PATCH 3/5] prettier --- .../packages/ui-components/src/BranchSelector.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/BranchSelector.js b/scm-ui-components/packages/ui-components/src/BranchSelector.js index d03011bfdd..99c93fd677 100644 --- a/scm-ui-components/packages/ui-components/src/BranchSelector.js +++ b/scm-ui-components/packages/ui-components/src/BranchSelector.js @@ -1,7 +1,7 @@ // @flow import React from "react"; -import type {Branch} from "@scm-manager/ui-types"; +import type { Branch } from "@scm-manager/ui-types"; import injectSheet from "react-jss"; import classNames from "classnames"; import DropDown from "./forms/DropDown"; @@ -39,7 +39,9 @@ class BranchSelector extends React.Component { } componentDidMount() { - const selectedBranch = this.props.branches.find(branch => branch.name === this.props.selectedBranch); + const selectedBranch = this.props.branches.find( + branch => branch.name === this.props.selectedBranch + ); this.setState({ selectedBranch }); } From e878fac686469162c608297513c3d0dc3f9557e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Wed, 30 Jan 2019 15:58:55 +0100 Subject: [PATCH 4/5] remove color props --- .../packages/ui-components/src/buttons/ButtonGroup.js | 8 +++----- .../repos/sources/components/content/FileButtonGroup.js | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js index 6921534ad3..56ef66522a 100644 --- a/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js +++ b/scm-ui-components/packages/ui-components/src/buttons/ButtonGroup.js @@ -5,8 +5,6 @@ import Button from "./Button"; type Props = { firstlabel: string, secondlabel: string, - firstColor: string, - secondColor: string, firstAction?: (event: Event) => void, secondAction?: (event: Event) => void, firstIsSelected: boolean @@ -15,10 +13,10 @@ type Props = { class ButtonGroup extends React.Component { render() { - const { firstlabel, secondlabel, firstColor, secondColor, firstAction, secondAction, firstIsSelected } = this.props; + const { firstlabel, secondlabel, firstAction, secondAction, firstIsSelected } = this.props; - let showFirstColor = firstColor; - let showSecondColor = secondColor; + let showFirstColor = ""; + let showSecondColor = ""; if (firstIsSelected) { showFirstColor += "link is-selected"; diff --git a/scm-ui/src/repos/sources/components/content/FileButtonGroup.js b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js index 6f7c7230ef..c56df2e5a1 100644 --- a/scm-ui/src/repos/sources/components/content/FileButtonGroup.js +++ b/scm-ui/src/repos/sources/components/content/FileButtonGroup.js @@ -47,8 +47,6 @@ class FileButtonGroup extends React.Component { Date: Wed, 30 Jan 2019 15:26:46 +0000 Subject: [PATCH 5/5] Close branch feature/btn_spacing