From 440805726e25d627d7eeec43ad37dc2ae4e00f14 Mon Sep 17 00:00:00 2001
From: YousefQwasmeh <151037@ppu.edu.ps>
Date: Thu, 31 Oct 2019 09:27:29 +0200
Subject: [PATCH] fix skip & back buttons change margin disktop for skip button
 hidden back button in result page if you come from quiz page show dashbord
 button if you come from any where without dashbord page

---
 client/src/components/QuizInstructions/index.js | 1 +
 client/src/components/Results/index.js          | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/client/src/components/QuizInstructions/index.js b/client/src/components/QuizInstructions/index.js
index 3b40ddc..9b5cb63 100644
--- a/client/src/components/QuizInstructions/index.js
+++ b/client/src/components/QuizInstructions/index.js
@@ -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
diff --git a/client/src/components/Results/index.js b/client/src/components/Results/index.js
index 6d11d40..b35a6eb 100644
--- a/client/src/components/Results/index.js
+++ b/client/src/components/Results/index.js
@@ -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 />
@@ -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>
     )