Skip to content

fix skip & back buttons #94

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
YousefQawasmeh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix skip & back buttons #94

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
1 change: 1 addition & 0 deletions client/src/components/QuizInstructions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class QuizInstructions extends Component {
fontSize="14px"
padding="2px 2px 0px 4px"
desktoppadding="2px 2px 0px 4px"
desktopmargin="22px 20px 0px 0px"
to="/quiz"
>
skip
Expand Down
8 changes: 5 additions & 3 deletions client/src/components/Results/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ class Results extends Component {
const id = this.calId()
return (
<Fragment>
<BackButton position="absolute" margin="22px" history={this.props.history}></BackButton>
{this.props.location.state && !this.props.location.state.flag ? (
<BackButton position="absolute" margin="22px" history={this.props.history}></BackButton>
) : null}
<Container>
<Header>Result</Header>
<backTop />
Expand All @@ -39,11 +41,11 @@ class Results extends Component {
) : null
)}
<SkillsLink to={`/skills/${this.random()}`}>See what might work for you</SkillsLink>
{this.props.location.state && this.props.location.state.flag ? (
{this.props.location.state && !this.props.location.state.flag ? null : (
<Button to="/dashboard" width="180px">
Dashboard
</Button>
) : null}
)}
</Container>
</Fragment>
)
Expand Down