Merge pull request #47 from jac-uk/feature/30-back-button-incorrect-dest

Change backlink to go back to a specific page
jac-uk · Jul 30, 2020 · b13c4e5 · b13c4e5
2 parents c6dc7e4 + 210771e
commit b13c4e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/views/Assessment/Edit.vue b/src/views/Assessment/Edit.vue
@@ -2,7 +2,12 @@
   <div class="govuk-grid-row">
     <form @submit.prevent="save">
       <div class="govuk-grid-column-two-thirds">
-        <BackLink />
+        <router-link
+          class="govuk-back-link"
+          to="/assessments"
+        >
+          View All Assessments
+        </router-link>
 
         <h1 class="govuk-heading-l">
           Upload Independent Assessment
@@ -86,15 +91,13 @@
   </div>
 </template>
 <script>
-import BackLink from '@/components/BackLink';
 import Form from '@/components/Form/Form';
 import ErrorSummary from '@/components/Form/ErrorSummary';
 import DownloadLink from '@/components/DownloadLink';
 import FileUpload from '@/components/Form/FileUpload';
 
 export default {
   components: {
-    BackLink,
     ErrorSummary,
     DownloadLink,
     FileUpload,

diff --git a/src/views/Assessment/View.vue b/src/views/Assessment/View.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds">
-      <BackLink />
+      <router-link
+        class="govuk-back-link"
+        to="/assessments"
+      >
+        View All Assessments
+      </router-link>
 
       <h1 class="govuk-heading-l">
         Review Assessment
@@ -71,12 +76,10 @@
 <script>
 import { mapState } from 'vuex';
 
-import BackLink from '@/components/BackLink';
 import DownloadLink from '@/components/DownloadLink';
 
 export default {
   components: {
-    BackLink,
     DownloadLink,
   },
   computed: {