Redesign#28
Open
apust wants to merge 1 commit intoPixelogicDev:masterfrom
Open
Conversation
adilanchian
requested changes
Nov 12, 2018
Contributor
adilanchian
left a comment
There was a problem hiding this comment.
GREAT stuff, but some changes should be made before committing this to master. Other then the comments inline, please do the following:
- Integrate SCSS with WebPack, Gulp is not needed.
- We should include a global ESLint file for better styling (I can do this if you don't have time/want to)
- Any required images should be done at the top of each component and should reference the property name
- Change App.js to be called something like Root.js
- Change Website.js to be called App.js
ActiveBlock.js
- Do not need to hold state for multiple properties if not needed
- Bring out all helper methods to another file, that file is pretty massive and could be helpful
- General note about indentation, this should be fixed with proper ESLint file
- For the pop up section, we should include a Modal component and create sub components to include in that parent modal component
Landing.js
- ADD CREDIT FOR YOUR WORK SOMEWHERE!
| Learn how to configure a non-root public URL by running `npm run build`. | ||
| --> | ||
| <title>FocusBlock</title> | ||
| <title>FocusBlock — Don't Get Stuck!</title> |
Contributor
There was a problem hiding this comment.
Can we change to change this to something along the lines of Focus Better, Focus Smarter, etc
| }); | ||
| } | ||
|
|
||
| timerTick = () => { |
Contributor
There was a problem hiding this comment.
Many of these properties are are already set in state. We should keep that instead of creating more properties that do the same thing.
let timerIsActive;
let timerStatus;
let isAltLogoColor;
let isRedOutline;
| } | ||
|
|
||
| // This function is not used in this version | ||
| restartTimer = () => { |
| errorMessage={this.state.helpEmailErrorMessage} /> | ||
| <div className="app-form__actions"> | ||
| <button className="btn btn--primary" onClick={this.saveEditEmail}>Save</button> | ||
| <button className="btn btn--secondary" onClick={this.dontSaveEditEmail}>Don't save</button> |
Contributor
There was a problem hiding this comment.
Change to "Cancel" instead of "Don't Save"
|
|
||
| helpEmailChangeHandler = (event) => { | ||
| let helpEmailValue = event.target.value; | ||
| let validContact = helpEmailValue.match(/^([\w.%+-]+)@([\w-]+\.)+([\w]{2,})$/i); |
Contributor
There was a problem hiding this comment.
Lets add this regex as a property, maybe even a global one. This seems to be used in multiple spots.
Contributor
|
Hiya @apust :) Any updates on this? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.