Skip to content
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

Fix for #206, show authors, issues & articles editors in Dialog boxes on admin site #217

Merged
merged 9 commits into from
Oct 5, 2017
+91 −66
Merged

Fix for #206, show authors, issues & articles editors in Dialog boxes on admin site #217

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7dea9bf
fix for #206, add scroll to author & article pages
flakybot2077 Sep 25, 2017
d3498a1
move hash scroll to admin-client.js, add support for Issues page
flakybot2077 Sep 26, 2017
477d011
revert to 17c8d7a, cancel the scroll fix
flakybot2077 Sep 27, 2017
6c19b95
add material ui Dialog to admin articles page
flakybot2077 Sep 27, 2017
804300f
fix submit issue, enable page redirect in articles page
flakybot2077 Oct 2, 2017
651ec48
fix small problems with Dialog and add to Authors & Issues page
flakybot2077 Oct 4, 2017
dc3a2cc
Removed redundant style object from EditorArticleController
emilgoldsmith Oct 4, 2017
081fefe
remove Dialog from Issues page
flakybot2077 Oct 5, 2017
4b44343
Removed redundant Paper wrappers around modals
emilgoldsmith Oct 5, 2017
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
13 changes: 12 additions & 1 deletion src/components/editor/EditorArticleController.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,17 @@ export default class EditorArticleController extends FalcorController {
// The update wasn't due to a change in article
this.debouncedHandleFormStateChanges();
}
// scroll to article editor once page loads
const { hash } = window.location;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, you have good knowledge of ES6 :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with the comments. Didn't find the Router code at first glance, thanks for pointing me to it! Will update later tonight or tomorrow.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, just write a comment on the PR when you're ready for another review

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or even better, if we're trying to enforce the Zenhub workflow I just did what I should've done and moved the issue and PR back to in progress, and when you're ready for review just move them back into Review/QA

if (hash) {
setTimeout(() => {
const id = hash.replace('#', '');
const element = document.getElementById(id);
if (element) {
element.scrollIntoView();
}
}, 0);
}
}

handleSaveChanges(event) {
Expand Down Expand Up @@ -349,7 +360,7 @@ export default class EditorArticleController extends FalcorController {
}

return (
<div style={styles.innerPaper}>
<div style={styles.innerPaper} id="article-editor">
<h2>Article Editor: {article.title}</h2>
<Divider />
<TextField
Expand Down
4 changes: 2 additions & 2 deletions src/components/editor/EditorArticleListController.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ export default class EditorArticleListController extends FalcorController {

clickSearchSuggestion(article) {
const page = this.props.params.page;
const path = `/articles/page/${page}/slug/${article.slug}`;
const path = `/articles/page/${page}/slug/${article.slug}#article-editor`;
browserHistory.push(path);
}

createListElement(article) {
const page = this.props.params.page;
return (
<Link to={`/articles/page/${page}/slug/${article.slug}`} key={article.slug}>
<Link to={`/articles/page/${page}/slug/${article.slug}#article-editor`} key={article.slug}>
<ListItem
primaryText={article.title}
secondaryText={
Expand Down
13 changes: 12 additions & 1 deletion src/components/editor/EditorAuthorController.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,17 @@ export default class EditorAuthorController extends FalcorController {
// The update wasn't due to a change in article
this.debouncedHandleFormStateChanges();
}
// scroll to author profile once page loads
const { hash } = window.location;
if (hash) {
setTimeout(() => {
const id = hash.replace('#', '');
const element = document.getElementById(id);
if (element) {
element.scrollIntoView();
}
}, 0);
}
}

handleSaveChanges(event) {
Expand Down Expand Up @@ -245,7 +256,7 @@ export default class EditorAuthorController extends FalcorController {
}

return (
<div style={styles.authorProfile}>
<div style={styles.authorProfile} id="author-profile">
<h3>Author Profile: {this.state.name}</h3>
<Divider />
<form onSubmit={this.handleSaveChanges}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/editor/EditorAuthorListController.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default class EditorAuthorListController extends FalcorController {
}

handleClickAuthor(author) {
browserHistory.push(`/authors/${author.slug}`);
browserHistory.push(`/authors/${author.slug}#author-profile`);
}

handleCreateAuthorChange() {
Expand Down