GDPR terms popup consent #180

Lullebullelukas · 2019-03-29T13:19:56Z

Added function that prompts user to accept terms of use, also made it so that terms version and api is fetched from server at app start. Changed version_check to use the api that is fetched.

houndci-bot · 2019-03-29T13:20:04Z

www/js/version_check.js

-  $.getJSON(API + '/versions')
-    .done(function(resp) {
-      if (resp.current_version !== appAPIVersion) {
+function checkAPIVersion() {


'checkAPIVersion' is defined but never used no-unused-vars

houndci-bot · 2019-03-29T13:20:04Z

www/js/index.js

+      checkAPIVersion();
+    })
+    .fail(function(resp) {
+      console.log(resp.statusText);


Unexpected console statement no-console

houndci-bot · 2019-03-29T13:20:04Z

www/js/index.js

@@ -42,6 +42,10 @@ const AC_URL = 'wss://stage.fsektionen.se/cable';
 // ActionCable Token URL
 const AC_TOKEN_URL = API + '/messages/new_token';

+// GDPR terms version
+var termsVersion;
+var apiVersion;


'apiVersion' is assigned a value but never used no-unused-vars

houndci-bot · 2019-03-29T13:20:05Z

www/js/index.js

@@ -42,6 +42,10 @@ const AC_URL = 'wss://stage.fsektionen.se/cable';
 // ActionCable Token URL
 const AC_TOKEN_URL = API + '/messages/new_token';

+// GDPR terms version
+var termsVersion;


'termsVersion' is assigned a value but never used no-unused-vars

houndci-bot · 2019-03-29T13:20:05Z

www/js/check_terms_version.js

+          $.auth.user.terms_version = termsVersion;
+        })
+        .fail(function() {
+          console.log("Terms_version ändrades inte")


Missing semicolon semi
Strings must use singlequote quotes
Unexpected console statement no-console

houndci-bot · 2019-03-29T13:20:05Z

www/js/check_terms_version.js

@@ -0,0 +1,30 @@
+function checkTermsVersion (termsVersion) {


'checkTermsVersion' is defined but never used no-unused-vars

FredrikLastow

Veri nice my man! Have a few comments that you should fix though:

Combine both version checks (checkAPIVersion() and checkTermsVersion()) in the same js file which could be called version_checks.js
Change the template name for the api to APIVersionTemplate

FredrikLastow · 2019-04-05T12:55:22Z

www/index.html

+             <div class="popup-text">För att fortsätta använda f-appen och vår hemsida måste du acceptera att vi använder din användardata.
+               <a class="item-link external" target="_blank"
+                           href="https://fsektionen.se/sekretess">läs mer här</a>
+                  <p><a class="link button button-fill GDPRaccept popup-close" href="#">Jag accepterar</a></p>


Remove the <p> tag and change the class name. See comment below for the name change.

Suggested change

<p><a class="link button button-fill GDPRaccept popup-close" href="#">Jag accepterar</a></p>

<a class="link button button-fill accept-terms popup-close" href="#">Jag accepterar</a>

FredrikLastow · 2019-04-05T12:58:46Z

www/js/check_terms_version.js

+    });
+    popup.open();
+    //Changes user data to make sure they only have to accept GDPR once
+    $('.GDPRaccept').on('click', function () {


Try to be consistent with names and stick to terms rather than GDRP. Something like this would be better:

Suggested change

$('.GDPRaccept').on('click', function () {

$('.accept-terms').on('click', function () {

FredrikLastow · 2019-04-05T13:00:20Z

www/js/check_terms_version.js

+      })
+        .done(function() {
+          $.auth.user.terms_version = termsVersion;
+        });


Indent properly. .done should have the same tabbing as $.ajax

FredrikLastow · 2019-04-05T13:03:04Z

www/index.html

-</body>
+  <script type="text/javascript" src="js/adventures.js"></script>
+  <script type="text/javascript" src="js/nollning.js"></script>-->
+  </body>


Remove this indent.

Suggested change

</body>

</body>

FredrikLastow · 2019-04-05T13:05:05Z

www/index.html

+        <div class="popup popup-terms">
+          <div class="background-overlay"></div>
+           <div class="block">
+             <div class="popup-text">För att fortsätta använda f-appen och vår hemsida måste du acceptera att vi använder din användardata.


Change the text to match the website

Suggested change

<div class="popup-text">För att fortsätta använda f-appen och vår hemsida måste du acceptera att vi använder din användardata.

<div class="popup-text">Du behöver läsa igenom och godkänna den senaste versionen av F-sektionens sekretessvillkor innan du kan fortsätta. Sekretessvillkoren finns att läsa

FredrikLastow · 2019-04-05T13:07:16Z

www/js/version_check.js

-    .done(function(resp) {
-      if (resp.current_version !== appAPIVersion) {
+function checkAPIVersion() {
+  const appAPIVersion = 1.1;


Thinks this name makes more sense.

Suggested change

const appAPIVersion = 1.1;

const localAPIVersion = 1.1;

FredrikLastow · 2019-04-05T13:08:04Z

www/js/check_terms_version.js

@@ -0,0 +1,26 @@
+function checkTermsVersion (termsVersion) {
+
+  var templateHTML = app.templates.checkTermsVersionTemplate({});


Think this name makes more sense.

Suggested change

var templateHTML = app.templates.checkTermsVersionTemplate({});

var templateHTML = app.templates.termsVersionTemplate({});

FredrikLastow · 2019-04-05T13:09:22Z

www/index.html

@@ -977,7 +977,22 @@
          {{/each image}}
        </div>
      </script>
-  </section>
+
+      <script type="text/template7" id="checkTermsVersionTemplate">


Think this name makes more sense.

Suggested change

<script type="text/template7" id="checkTermsVersionTemplate">

<script type="text/template7" id="termsVersionTemplate">

FredrikLastow · 2019-04-05T13:11:05Z

www/js/index.js

 document.addEventListener('deviceready', function() {
  document.addEventListener('backbutton', onBackKey, false);
+  $.getJSON(API + '/versions')
+    .done(function(resp) {



Remove empty line.

FredrikLastow · 2019-04-05T13:12:56Z

www/js/version_check.js

-    })
-    .fail(function(resp) {
-      console.log(resp.statusText);
+    var templateHTML = app.templates.versionCheckTemplate({


Suggested change

var templateHTML = app.templates.versionCheckTemplate({

var templateHTML = app.templates.APIVersionTemplate({

FredrikLastow · 2019-04-05T13:14:48Z

www/js/login.js

+  //Checks if user has accepted the latest terms and prompts them if they have not
+  checkTermsVersion(termsVersion);
+
+


Remove empty line here as well.

houndci-bot · 2019-04-08T16:03:25Z

www/js/version_check.js

+          terms_version: termsVersion
+        }}
+      })
+      .done(function() {


Expected indentation of 8 spaces but found 6 indent

houndci-bot · 2019-04-08T16:03:25Z

www/js/version_check.js

+ * they have not.
+ */
+
+function checkTermsVersion (termsVersion) {


'checkTermsVersion' is defined but never used no-unused-vars

houndci-bot · 2019-04-08T16:03:26Z

www/js/version_check.js

+      appLink = androidAppLink;
+    }
+
+    var templateHTML = app.templates.APIVersionTemplate({


A function with a name starting with an uppercase letter should only be used as a constructor new-cap

houndci-bot · 2019-04-08T16:03:26Z

www/js/version_check.js

-          appLink: appLink, 
-          easter: false
-        });
+function checkAPIVersion() {


'checkAPIVersion' is defined but never used no-unused-vars

houndci-bot · 2019-04-08T17:30:52Z

www/scss/partials/_version_check.scss

+  }
+
+  .button.accept-terms {
+    margin-top: 45px;


Properties should be ordered background-color, color, font-size, height, margin-top, padding-top

houndci-bot · 2019-04-08T17:30:52Z

www/scss/partials/_version_check.scss

+    font-weight: bold;
+  }
+
+  a.item-link {


Avoid qualifying class selectors with an element.

houndci-bot · 2019-04-08T17:30:52Z

www/scss/partials/_version_check.scss

@@ -20,6 +20,29 @@
  color: white;
 }

+.popup-terms {
+  .block-title {
+    font-size: 22px;


Properties should be ordered color, font-size, font-weight, margin-top

www/js/version_check.js

houndci-bot · 2019-05-06T17:13:03Z

www/js/version_check.js

+function checkTermsVersion (termsVersion) {
+
+  var templateHTML = app.templates.termsVersionTemplate({});
+  console.log($.auth.user.terms_version);


Unexpected console statement no-console

houndci-bot · 2019-05-06T17:13:04Z

www/js/index.js

+      console.log(termsVersion);
+      apiVersion = resp.api_version;
+      console.log(apiVersion);
+      console.log(resp);


Unexpected console statement no-console

houndci-bot · 2019-05-06T17:13:04Z

www/js/index.js

+      termsVersion = resp.terms_version;
+      console.log(termsVersion);
+      apiVersion = resp.api_version;
+      console.log(apiVersion);


Unexpected console statement no-console

houndci-bot · 2019-05-06T17:13:04Z

www/js/index.js

+  $.getJSON(API + '/versions')
+    .done(function(resp) {
+      termsVersion = resp.terms_version;
+      console.log(termsVersion);


Unexpected console statement no-console

FredrikLastow

U DA MAN, MAN! +1

houndci-bot reviewed Mar 29, 2019

View reviewed changes

Lullebullelukas force-pushed the lukas-GDPRpopupyey branch from 563710a to 070b04b Compare April 1, 2019 15:22

FredrikLastow requested changes Apr 5, 2019

View reviewed changes

FredrikLastow reviewed Apr 5, 2019

View reviewed changes

Lullebullelukas force-pushed the lukas-GDPRpopupyey branch from 070b04b to b431ffe Compare April 8, 2019 16:03

houndci-bot reviewed Apr 8, 2019

View reviewed changes

Lullebullelukas force-pushed the lukas-GDPRpopupyey branch from b431ffe to 1b869ca Compare April 8, 2019 17:30

houndci-bot reviewed Apr 8, 2019

View reviewed changes

Lullebullelukas force-pushed the lukas-GDPRpopupyey branch from 1b869ca to 7195456 Compare April 12, 2019 11:53

GDPR terms popup

1bbd929

Lullebullelukas force-pushed the lukas-GDPRpopupyey branch from 7195456 to 1bbd929 Compare May 6, 2019 17:12

houndci-bot reviewed May 6, 2019

View reviewed changes

FredrikLastow approved these changes May 6, 2019

View reviewed changes

Lullebullelukas merged commit f55d851 into master May 6, 2019

Lullebullelukas deleted the lukas-GDPRpopupyey branch May 6, 2019 17:15

Lullebullelukas mentioned this pull request Aug 12, 2019

GDPR consent in the app #164

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GDPR terms popup consent #180

GDPR terms popup consent #180

Lullebullelukas commented Mar 29, 2019

houndci-bot Mar 29, 2019

houndci-bot Mar 29, 2019

houndci-bot Mar 29, 2019

houndci-bot Mar 29, 2019

houndci-bot Mar 29, 2019

houndci-bot Mar 29, 2019

FredrikLastow left a comment •

edited

Loading

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

FredrikLastow Apr 5, 2019

houndci-bot Apr 8, 2019

houndci-bot Apr 8, 2019

houndci-bot Apr 8, 2019

houndci-bot Apr 8, 2019

houndci-bot Apr 8, 2019

houndci-bot Apr 8, 2019

houndci-bot Apr 8, 2019

houndci-bot May 6, 2019

houndci-bot May 6, 2019

houndci-bot May 6, 2019

houndci-bot May 6, 2019

FredrikLastow left a comment

	<p><a class="link button button-fill GDPRaccept popup-close" href="#">Jag accepterar</a></p>
	<a class="link button button-fill accept-terms popup-close" href="#">Jag accepterar</a>

	$('.GDPRaccept').on('click', function () {
	$('.accept-terms').on('click', function () {

	<div class="popup-text">För att fortsätta använda f-appen och vår hemsida måste du acceptera att vi använder din användardata.
	<div class="popup-text">Du behöver läsa igenom och godkänna den senaste versionen av F-sektionens sekretessvillkor innan du kan fortsätta. Sekretessvillkoren finns att läsa

		@@ -0,0 +1,26 @@
		function checkTermsVersion (termsVersion) {

		var templateHTML = app.templates.checkTermsVersionTemplate({});

	var templateHTML = app.templates.checkTermsVersionTemplate({});
	var templateHTML = app.templates.termsVersionTemplate({});

	<script type="text/template7" id="checkTermsVersionTemplate">
	<script type="text/template7" id="termsVersionTemplate">

	var templateHTML = app.templates.versionCheckTemplate({
	var templateHTML = app.templates.APIVersionTemplate({

		//Checks if user has accepted the latest terms and prompts them if they have not
		checkTermsVersion(termsVersion);

GDPR terms popup consent #180

GDPR terms popup consent #180

Conversation

Lullebullelukas commented Mar 29, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FredrikLastow left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FredrikLastow left a comment

Choose a reason for hiding this comment

FredrikLastow left a comment •

edited

Loading