diff --git a/__tests__/app/containers/__snapshots__/CodeStatus.test.tsx.snap b/__tests__/app/containers/__snapshots__/CodeStatus.test.tsx.snap index 3020399a..4ffc3284 100644 --- a/__tests__/app/containers/__snapshots__/CodeStatus.test.tsx.snap +++ b/__tests__/app/containers/__snapshots__/CodeStatus.test.tsx.snap @@ -2,8 +2,10 @@ exports[`CodeStatus Container Should render 1`] = `
SAVE - + + +

{currentState} @@ -104,4 +130,22 @@ export class CodeStatus extends React.Component< ); } + private toggleCommitMessageBox = (isCommitMessageBoxOpen: boolean) => { + this.setState({ + isCommitMessageBoxOpen, + }); + }; + + private handleCommit = async () => { + const { commitMessage } = this.state; + const { commit, getCommitLog } = this.props; + await commit(commitMessage); + await this.toggleCommitMessageBox(false); + await getCommitLog(); + }; + private updateCommitMessage = (commitMessage: string) => { + this.setState({ + commitMessage, + }); + }; } diff --git a/src/app/containers/code/CodeStatus.ts b/src/app/containers/code/CodeStatus.ts index b40ee69b..8ab28701 100644 --- a/src/app/containers/code/CodeStatus.ts +++ b/src/app/containers/code/CodeStatus.ts @@ -1,3 +1,4 @@ +import { CodeActions } from 'app/actions'; import { CodeStatus } from 'app/components/code/CodeStatus'; import { RootState } from 'app/reducers'; import * as CodeStatusInterfaces from 'app/types/code/CodeStatus'; @@ -47,11 +48,11 @@ const mapStateToProps = (rootState: RootState) => { const codeStatusContainer = connect< CodeStatusInterfaces.StateProps, - {}, + CodeStatusInterfaces.DispatchProps, CodeStatusInterfaces.OwnProps ->( - mapStateToProps, - {}, -)(CodeStatus); +>(mapStateToProps, { + commit: CodeActions.commit, + getCommitLog: CodeActions.getCommitLog, +})(CodeStatus); export default codeStatusContainer; diff --git a/src/app/styles/CodeStatus.module.css b/src/app/styles/CodeStatus.module.css index 8012806a..4b3fffb6 100755 --- a/src/app/styles/CodeStatus.module.css +++ b/src/app/styles/CodeStatus.module.css @@ -1,6 +1,6 @@ .CodeStatusRow { background-color: #202020; - height: 22px; + height: 50px; margin: 0px; } diff --git a/src/app/styles/CommitMessageBox.module.css b/src/app/styles/CommitMessageBox.module.css index ee5253e7..41d8d166 100755 --- a/src/app/styles/CommitMessageBox.module.css +++ b/src/app/styles/CommitMessageBox.module.css @@ -1,9 +1,11 @@ .CommitMessageBox { position: absolute; - left: 15px; - top: 45px; + left: 115px; + top: 40px; width: 350px; - background-color: rgb(41, 41, 41); + background-color: white; + border: 2px solid royalblue; + border-radius: 5px !important; color: #ddd; border-radius: 3px; z-index: 1000; @@ -15,13 +17,25 @@ .customBtn:hover { color: #fff; + background-color: royalblue; +} +.customBtn { + background-color: royalblue; } .customBtn:active { transform: scale(1.04); + background-color: royalblue; } .customBtn:focus { outline: none; box-shadow: none; + background-color: royalblue; +} + +.commit-input:focus, +.commit-input:active { + box-shadow: none; + outline: none; } diff --git a/src/app/types/code/CodeStatus.ts b/src/app/types/code/CodeStatus.ts index 88d1ab94..05f95e5c 100644 --- a/src/app/types/code/CodeStatus.ts +++ b/src/app/types/code/CodeStatus.ts @@ -9,8 +9,15 @@ export interface OwnProps { width: number; } +export interface DispatchProps { + commit: (commitMessage: string) => void; + getCommitLog: () => void; +} + export interface State { + commitMessage: string; + isCommitMessageBoxOpen: boolean; lastSaveMessage: string; } -export type Props = OwnProps & StateProps & {}; +export type Props = OwnProps & StateProps & DispatchProps;