diff --git a/Data for the Google API b/Data for the Google API deleted file mode 100644 index 41f37cf..0000000 --- a/Data for the Google API +++ /dev/null @@ -1,2 +0,0 @@ -client id:768856011390-e6mlm3j8uompfqlm56eoo86e5gm80ipj.apps.googleusercontent.com -secret key: 7qyKIxyBCCNXBPSBQg3aMiAN diff --git a/db.sqlite3 b/db.sqlite3 index 639c21a..c958fb8 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/myapp/__pycache__/views.cpython-36.pyc b/myapp/__pycache__/views.cpython-36.pyc index 22210d4..7d46a8b 100644 Binary files a/myapp/__pycache__/views.cpython-36.pyc and b/myapp/__pycache__/views.cpython-36.pyc differ diff --git a/myapp/views.py b/myapp/views.py index 1ada31f..f4e2ec9 100644 --- a/myapp/views.py +++ b/myapp/views.py @@ -50,10 +50,14 @@ def l_out(request): def intro(request, filename): + if request.user.userdata.current_reality == 0: + return HttpResponseRedirect('/roulette') return render(request, filename) def quiz(request, filename, basename): + if request.user.userdata.current_reality == 0: + return HttpResponseRedirect('/roulette') return render(request, filename) diff --git a/qrious/settings.py b/qrious/settings.py index ffc5d4b..52b79e4 100644 --- a/qrious/settings.py +++ b/qrious/settings.py @@ -124,7 +124,7 @@ SITE_ID = 2 -CSRF_COOKIE_SECURE = True +CSRF_COOKIE_SECURE = False LANGUAGE_CODE = 'en-us' diff --git a/static/js/questions.js b/static/js/questions.js index 759b34f..d37858b 100644 --- a/static/js/questions.js +++ b/static/js/questions.js @@ -79,6 +79,7 @@ $(document).ready(function () { xhr.setRequestHeader("X-CSRFToken", csrftoken); } }); + if(counter%5==0 && counter!=0)window.location.href='roulette.html'; $.ajax({ type: "POST", url: "/answer/ajax/post",