From 7fbc9914de12c7b8dbf236c3844594397f2c8109 Mon Sep 17 00:00:00 2001
From: Hugh Rundle <hugh@hughrundle.net>
Date: Mon, 13 Jun 2022 20:25:42 +1000
Subject: [PATCH] change cancel buttons for guided tour

The first pop up in the guided tour on each page should provide a button to switch off the guided tour altogether, not simply cancel the current iteration.
If we don't do this, then the only way to turn off the guided tour is to go right to the end, which could be really irritating, especially for people who star the tour and then start exploring on their own.
---
 bookwyrm/templates/guided_tour/home.html       | 10 +---------
 .../templates/guided_tour/user_profile.html    | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/guided_tour/home.html b/bookwyrm/templates/guided_tour/home.html
index 0ae15a56c..f0aef4667 100644
--- a/bookwyrm/templates/guided_tour/home.html
+++ b/bookwyrm/templates/guided_tour/home.html
@@ -4,7 +4,7 @@
 <script>
     const csrftoken = document.querySelector('[name=csrfmiddlewaretoken]').value;
     function disableTour() {
-        fetch('guided-tour/False', {
+        fetch('/guided-tour/False', {
             headers: {
                 'X-CSRFToken': csrftoken,
             },
@@ -76,14 +76,6 @@
                 on: "bottom",
             },
             buttons: [
-                {
-                    action() {
-                        return this.cancel();
-                    },
-                    secondary: true,
-                    text: "{% trans 'Cancel' %}",
-                    classes: "is-danger",
-                },
                 {
                     action() {
                         return this.next();
diff --git a/bookwyrm/templates/guided_tour/user_profile.html b/bookwyrm/templates/guided_tour/user_profile.html
index 3e2bc3f2f..e68e7fde5 100644
--- a/bookwyrm/templates/guided_tour/user_profile.html
+++ b/bookwyrm/templates/guided_tour/user_profile.html
@@ -1,6 +1,19 @@
 {% load i18n %}
+{% csrf_token %}
 
 <script>
+    const csrftoken = document.querySelector('[name=csrfmiddlewaretoken]').value;
+    function disableTour() {
+        fetch('/guided-tour/False', {
+            headers: {
+                'X-CSRFToken': csrftoken,
+            },
+            method: 'POST', 
+            redirect: 'follow',
+            mode: 'same-origin',
+        })
+        .then( resp => {console.log(resp.statusText) })
+    }
     const tour = new Shepherd.Tour({
         exitOnEsc: true,
     });
@@ -12,10 +25,11 @@
             buttons: [
                 {
                     action() {
-                        return this.cancel();
+                        disableTour();
+                        return this.complete();
                     },
                     secondary: true,
-                    text: "{% trans 'Cancel' %}",
+                    text: "{% trans 'End Tour' %}",
                     classes: "is-danger",
                 },
                 {