Skip to content

Show save message when user is logged in and working on a unsaved pebl #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
komalahuwalia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show save message when user is logged in and working on a unsaved pebl #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions client/src/app/components/App/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,14 +243,26 @@ class App extends React.Component {
<Welcome />
</Modal>

{(this.showForkPromptPreference() && !this.props.isBrowsingPebl && !this.props.canEdit) && (
{this.showForkPrompt() && (
<Modal size="auto" isOpen={this.props.isForkPromptOpen} closeModal={this.props.closeForkPrompt}>
<ForkPrompt savePage={this.buildPageDataAndSavePage} />
<ForkPrompt savePage={this.buildPageDataAndSavePage} saveMode={false} />
</Modal>
)}

{this.showSavePrompt() && (
<Modal size="auto" isOpen={this.props.isForkPromptOpen} closeModal={this.props.closeForkPrompt}>
<ForkPrompt savePage={this.buildPageDataAndSavePage} saveMode />
</Modal>
)}
</React.Fragment>
)

showForkPrompt = () => this.showForkPromptPreference() && !this.props.isBrowsingPebl &&
!this.props.canEdit && !this.props.name

showSavePrompt = () => this.showForkPromptPreference() && !this.props.isBrowsingPebl &&
!this.props.canEdit && this.props.name

renderToolBar = () => (
<nav className="main-nav">
<MainToolbar
Expand Down
143 changes: 99 additions & 44 deletions client/src/app/components/App/Modal/ForkPrompt/ForkPrompt.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,60 +27,115 @@ class ForkPrompt extends React.Component {
}
}

render() {
return (
<div className="fork-prompt__content">
<div>
<h2 className="fork-prompt__title">
Would you like to remix the page?
</h2>
<p className="fork-prompt__subtitle">
Remixing this page will save a copy to your account and allow you to save your changes.
</p>
<div
className="fork-prompt__button-container"
renderRemixMessage = () => (
<div className="fork-prompt__content">
<div>
<h2 className="fork-prompt__title">
Would you like to remix the page?
</h2>
<p className="fork-prompt__subtitle">
Remixing this page will save a copy to your account and allow you to save your changes.
</p>
<div
className="fork-prompt__button-container"
>
<button
className="fork-prompt__just-browsing-button"
data-test="fork-prompt__just-browsing-button"
onClick={() => {
this.props.closeForkPrompt();
this.props.setUserBrowsingPebl();
}}
>
<button
className="fork-prompt__just-browsing-button"
data-test="fork-prompt__just-browsing-button"
onClick={() => {
this.props.closeForkPrompt();
this.props.setUserBrowsingPebl();
}}
>
Just Browsing
</button>
<button
className="fork-prompt__button"
onClick={() => {
this.props.closeForkPrompt();
this.props.savePage();
}}
>
Remix
</button>
</div>
<div className="fork-prompt__checkbox-container">
<input
id="fork-prompt__dont-ask"
name="fork-prompt__dont-ask"
type="checkbox"
className="fork-prompt__checkbox"
onChange={(e) => { this.setForkPromptPreference(e); }}
checked={this.state.isChecked}
/>
<label htmlFor="fork-prompt__dont-ask">Don‘t ask me again</label>
</div>
Just Browsing
</button>
<button
className="fork-prompt__button"
onClick={() => {
this.props.closeForkPrompt();
this.props.savePage();
}}
>
Remix
</button>
</div>
<div className="fork-prompt__checkbox-container">
<input
id="fork-prompt__dont-ask"
name="fork-prompt__dont-ask"
type="checkbox"
className="fork-prompt__checkbox"
onChange={(e) => { this.setForkPromptPreference(e); }}
checked={this.state.isChecked}
/>
<label htmlFor="fork-prompt__dont-ask">Don‘t ask me again</label>
</div>
</div>
</div>
)

renderSaveMessage = () => (
<div className="fork-prompt__content">
<div>
<h2 className="fork-prompt__title">
Would you like to save the page?
</h2>
<p className="fork-prompt__subtitle">
Saving this page will save the changes you have made to this pebl.
</p>
<div
className="fork-prompt__button-container"
>
<button
className="fork-prompt__just-browsing-button"
data-test="fork-prompt__just-browsing-button"
onClick={() => {
this.props.closeForkPrompt();
this.props.setUserBrowsingPebl();
}}
>
Just Browsing
</button>
<button
className="fork-prompt__button"
onClick={() => {
this.props.closeForkPrompt();
this.props.savePage();
}}
>
Save
</button>
</div>
<div className="fork-prompt__checkbox-container">
<input
id="fork-prompt__dont-ask"
name="fork-prompt__dont-ask"
type="checkbox"
className="fork-prompt__checkbox"
onChange={(e) => { this.setForkPromptPreference(e); }}
checked={this.state.isChecked}
/>
<label htmlFor="fork-prompt__dont-ask">Don‘t ask me again</label>
</div>
</div>
</div>
)

render() {
return (
<React.Fragment>
{!this.props.saveMode && this.renderRemixMessage()}
{this.props.saveMode && this.renderSaveMessage()}
</React.Fragment>
);
}
}

ForkPrompt.propTypes = {
closeForkPrompt: PropTypes.func.isRequired,
savePage: PropTypes.func.isRequired,
setUserBrowsingPebl: PropTypes.func.isRequired
setUserBrowsingPebl: PropTypes.func.isRequired,
saveMode: PropTypes.bool.isRequired
};

function mapStateToProps(state) {
Expand Down