cookie consent OK
This commit is contained in:
pvincent
@@ -13,10 +13,9 @@ import react.user.*;
|
||||
// require bootstrap JS since it's bundled with browserify
|
||||
// @:jsRequire('bootstrap') extern class Bootstrap{}
|
||||
// @:jsRequire('jquery') extern class JQ extends js.jquery.JQuery{}
|
||||
|
||||
class App {
|
||||
|
||||
public static var instance:App;
|
||||
|
||||
public var LANG:String;
|
||||
public var currency:String; // currency symbol like € or $
|
||||
public var t:sugoi.i18n.GetText; // gettext translator
|
||||
@@ -27,7 +26,8 @@ class App {
|
||||
function new(?lang = "fr", ?currency = "€") {
|
||||
// singleton
|
||||
instance = this;
|
||||
if(lang!=null) this.LANG = lang;
|
||||
if (lang != null)
|
||||
this.LANG = lang;
|
||||
this.currency = currency;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,6 @@ class App {
|
||||
* The JS App will be available as "_" in the document.
|
||||
*/
|
||||
public static function main() {
|
||||
|
||||
// untyped js.Browser.window.$ = js.Lib.require("jQuery");
|
||||
untyped js.Browser.window._ = new App();
|
||||
}
|
||||
@@ -68,12 +67,12 @@ class App {
|
||||
* remove method for IE compat
|
||||
*/
|
||||
public function remove(el:js.html.Element) {
|
||||
if (el == null) return;
|
||||
if (el == null)
|
||||
return;
|
||||
el.parentElement.removeChild(el);
|
||||
}
|
||||
|
||||
public function getVATBox(ttcprice:Float, currency:String, rates:String, vat:Float, formName:String) {
|
||||
|
||||
var input = js.Browser.document.querySelector('form input[name="${formName}_price"]');
|
||||
|
||||
remove(js.Browser.document.querySelector('form input[name="${formName}_vat"]').parentElement.parentElement);
|
||||
@@ -81,7 +80,6 @@ class App {
|
||||
ReactDOM.render(jsx('<$VATBox ttc="$ttcprice" currency="$currency" vatRates="$rates" vat="$vat" formName="$formName"/>'), input.parentElement);
|
||||
|
||||
// remove(input);
|
||||
|
||||
}
|
||||
|
||||
/*public function getProductComposer(){
|
||||
@@ -89,7 +87,6 @@ class App {
|
||||
//ReactDOM.render(jsx('<$ComposerApp/>'), js.Browser.document.getElementById("app"));
|
||||
//});
|
||||
}*/
|
||||
|
||||
/**
|
||||
* Removes the form element and replace it by a react js component
|
||||
* @param divId
|
||||
@@ -98,16 +95,19 @@ class App {
|
||||
* @param formName
|
||||
*/
|
||||
public function getProductInput(divId:String, productName:String, txpProductId:String, formName:String) {
|
||||
|
||||
js.Browser.document.addEventListener("DOMContentLoaded", function(event) {
|
||||
|
||||
// dirty stuff to remove "real" input, and replace it by the react one
|
||||
App.j("form input[name='" + formName + "_name']").parent().parent().remove();
|
||||
App.j("form select[name='" + formName+"_txpProductId']").parent().parent().remove();
|
||||
App.j("form select[name='" + formName + "_txpProductId']")
|
||||
.parent()
|
||||
.parent()
|
||||
.remove();
|
||||
|
||||
if (txpProductId == null) txpProductId = "";
|
||||
if (txpProductId == null)
|
||||
txpProductId = "";
|
||||
|
||||
ReactDOM.render(jsx('<$ProductInput productName="$productName" txpProductId="$txpProductId" formName="$formName"/>'), js.Browser.document.getElementById(divId));
|
||||
ReactDOM.render(jsx('<$ProductInput productName="$productName" txpProductId="$txpProductId" formName="$formName"/>'),
|
||||
js.Browser.document.getElementById(divId));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -115,8 +115,8 @@ class App {
|
||||
ReactDOM.render(jsx('<$ReportHeader />'), js.Browser.document.querySelector('div.reportHeaderContainer'));
|
||||
}
|
||||
|
||||
public function initOrderBox(userId:Int, distributionId:Int, contractId:Int, contractType:Int, date:String, place:String, userName:String, currency:String, hasPayments:Bool,callbackUrl:String){
|
||||
|
||||
public function initOrderBox(userId:Int, distributionId:Int, contractId:Int, contractType:Int, date:String, place:String, userName:String,
|
||||
currency:String, hasPayments:Bool, callbackUrl:String) {
|
||||
untyped App.j("#myModal").modal();
|
||||
var onValidate = function() js.Browser.location.href = callbackUrl;
|
||||
var node = js.Browser.document.querySelector('#myModal .modal-body');
|
||||
@@ -124,7 +124,6 @@ class App {
|
||||
ReactDOM.render(jsx('<$OrderBox userId="$userId" distributionId="$distributionId"
|
||||
contractId="$contractId" contractType="$contractType" date="$date" place="$place" userName="$userName"
|
||||
onValidate=$onValidate currency=$currency hasPayments=$hasPayments />'), node, postReact);
|
||||
|
||||
}
|
||||
|
||||
function postReact() {
|
||||
@@ -133,36 +132,33 @@ class App {
|
||||
untyped jq('[data-toggle="tooltip"]').tooltip();
|
||||
untyped jq('[data-toggle="popover"]').popover();
|
||||
}, 500);
|
||||
|
||||
}
|
||||
|
||||
public static function roundTo(n:Float, r:Int):Float {
|
||||
return Math.round(n * Math.pow(10, r)) / Math.pow(10, r);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Ajax loads a page and display it in a modal window
|
||||
* @param url
|
||||
* @param title
|
||||
*/
|
||||
public function overlay(url:String, ?title, ?large = true) {
|
||||
|
||||
if (title != null) title = StringTools.urlDecode(title);
|
||||
if (title != null)
|
||||
title = StringTools.urlDecode(title);
|
||||
|
||||
var r = new haxe.Http(url);
|
||||
r.onData = function(data) {
|
||||
|
||||
// setup body and title
|
||||
var m = App.j("#myModal");
|
||||
m.find(".modal-body").html(data);
|
||||
if (title != null) m.find(".modal-title").html(title);
|
||||
|
||||
if (!large) m.find(".modal-dialog").removeClass("modal-lg");
|
||||
if (title != null)
|
||||
m.find(".modal-title").html(title);
|
||||
|
||||
if (!large)
|
||||
m.find(".modal-dialog").removeClass("modal-lg");
|
||||
|
||||
untyped App.j('#myModal').modal(); // bootstrap 3 modal window
|
||||
|
||||
}
|
||||
r.request();
|
||||
}
|
||||
@@ -175,7 +171,8 @@ class App {
|
||||
m.find(".modal-title").html("S'identifier");
|
||||
m.find(".modal-dialog").removeClass("modal-lg");
|
||||
untyped m.modal();
|
||||
ReactDOM.render(jsx('<$LoginBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'), js.Browser.document.querySelector('#myModal .modal-body'));
|
||||
ReactDOM.render(jsx('<$LoginBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),
|
||||
js.Browser.document.querySelector('#myModal .modal-body'));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -187,7 +184,19 @@ class App {
|
||||
m.find(".modal-title").html("S'inscrire");
|
||||
m.find(".modal-dialog").removeClass("modal-lg");
|
||||
untyped m.modal();
|
||||
ReactDOM.render(jsx('<$RegisterBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'), js.Browser.document.querySelector('#myModal .modal-body'));
|
||||
ReactDOM.render(jsx('<$RegisterBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),
|
||||
js.Browser.document.querySelector('#myModal .modal-body'));
|
||||
return false;
|
||||
}
|
||||
|
||||
public function cookieConsentBox(redirectUrl:String, ?message:String, ?phoneRequired = false) {
|
||||
js.Browser.console.log("cookieConsentBox should load modal...");
|
||||
var m = App.j("#myModal");
|
||||
m.find(".modal-title").html("Consentement RGPD");
|
||||
m.find(".modal-dialog").removeClass("modal-lg");
|
||||
untyped m.modal();
|
||||
ReactDOM.render(jsx('<$CookieConsentBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),
|
||||
js.Browser.document.querySelector('#myModal .modal-body'));
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -208,12 +217,12 @@ class App {
|
||||
var checkboxes = js.Browser.document.querySelectorAll(formSelector + " input[type=checkbox]");
|
||||
for (input in checkboxes) {
|
||||
var input:js.html.InputElement = cast input;
|
||||
if ( input.checked ) out.push(input.value);
|
||||
if (input.checked)
|
||||
out.push(input.value);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
#if plugins
|
||||
public function getHostedPlugin() {
|
||||
return new hosted.js.App();
|
||||
@@ -229,7 +238,6 @@ class App {
|
||||
} else {
|
||||
js.Browser.window.removeEventListener("beforeunload", warn);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function warn(e:js.html.Event) {
|
||||
@@ -245,7 +253,6 @@ class App {
|
||||
* Can be bypassed by adding a .btn-noAntiDoubleClick class
|
||||
*/
|
||||
public function antiDoubleClick() {
|
||||
|
||||
for (n in js.Browser.document.querySelectorAll(".btn:not(.btn-noAntiDoubleClick)")) {
|
||||
n.addEventListener("click", function(e:js.html.MouseEvent) {
|
||||
var x = untyped e.target;
|
||||
@@ -255,8 +262,5 @@ class App {
|
||||
}, 1000);
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
package react.user;
|
||||
|
||||
import react.ReactComponent;
|
||||
import react.ReactMacro.jsx;
|
||||
import Common;
|
||||
|
||||
typedef CookieConsentBoxProps = {
|
||||
redirectUrl:String,
|
||||
message:String,
|
||||
?phoneRequired:Bool
|
||||
}
|
||||
|
||||
typedef CookieConsentBoxState = {
|
||||
email:String,
|
||||
password:String,
|
||||
error:String
|
||||
}
|
||||
|
||||
/**
|
||||
* CookieConsent Box
|
||||
* @author fbarbut
|
||||
*/
|
||||
class CookieConsentBox extends react.ReactComponentOfPropsAndState<CookieConsentBoxProps, CookieConsentBoxState> {
|
||||
public function new(props:CookieConsentBoxProps) {
|
||||
if (props.redirectUrl == null || props.redirectUrl == "null")
|
||||
props.redirectUrl = "/";
|
||||
if (props.message == "")
|
||||
props.message = null;
|
||||
super(props);
|
||||
|
||||
this.state = {email: "", password: "", error: null};
|
||||
}
|
||||
|
||||
function setError(err:String) {
|
||||
this.setState(cast {error: err});
|
||||
}
|
||||
|
||||
override public function render() {
|
||||
return jsx('<div onKeyPress=$onKeyPress>
|
||||
<$Error error="${state.error}" />
|
||||
<$Message message="${props.message}" />
|
||||
<form action="" method="post" className="form-horizontal">
|
||||
<h4>Personnaliser les préférences en matière de consentement</h4>
|
||||
<p>
|
||||
Nous n\'utilisons que des cookies nécessaires pour vous aider à naviguer efficacement et à exécuter certaines fonctionnalités. Les cookies nécessaires sont cruciaux pour les fonctions de base du site Web et celui-ci ne fonctionnera pas comme prévu sans eux. Ces cookies ne stockent aucune donnée personnellement identifiable.
|
||||
</p>
|
||||
|
||||
<p className="text-center">
|
||||
<a onClick={deny} className="btn btn-secondary btn-lg" >Refuser</a>
|
||||
|
||||
<a onClick={submit} className="btn btn-primary btn-lg" ><span className="glyphicon glyphicon-user"></span> Accepter</a>
|
||||
</p>
|
||||
</form>
|
||||
</div>');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @doc https://facebook.github.io/react/docs/forms.html
|
||||
*/
|
||||
function onChange(e:js.html.Event) {
|
||||
e.preventDefault();
|
||||
|
||||
var name:String = untyped e.target.name;
|
||||
var value:String = untyped /*(e.target.value == "") ? null :*/ e.target.value;
|
||||
Reflect.setField(state, name, value);
|
||||
this.setState(this.state);
|
||||
}
|
||||
|
||||
public function submit(?e:js.html.Event) {
|
||||
// lock button
|
||||
var el:js.html.Element = null;
|
||||
if (e != null) {
|
||||
el = cast e.target;
|
||||
el.classList.add("disabled");
|
||||
}
|
||||
// var cookie = js.Browser.document.cookie;
|
||||
var newCookie = "rgpd=true; SameSite=Lax";
|
||||
js.Browser.document.cookie = newCookie;
|
||||
// js.Browser.window.location.href = props.redirectUrl;
|
||||
js.Browser.window.location.href = '/';
|
||||
}
|
||||
|
||||
public function deny(?e:js.html.Event) {
|
||||
// lock button
|
||||
var el:js.html.Element = null;
|
||||
if (e != null) {
|
||||
el = cast e.target;
|
||||
el.classList.add("disabled");
|
||||
}
|
||||
var newCookie = "rgpd=false; SameSite=Lax";
|
||||
js.Browser.document.cookie = newCookie;
|
||||
// js.Browser.window.location.href = props.redirectUrl;
|
||||
js.Browser.window.location.href = '/';
|
||||
}
|
||||
|
||||
function onKeyPress(e:js.html.KeyboardEvent) {
|
||||
if (e.key == "Enter")
|
||||
submit();
|
||||
}
|
||||
}
|
||||
@@ -185,6 +185,17 @@
|
||||
|
||||
</div>
|
||||
|
||||
::if user == null::
|
||||
<script language="javascript">
|
||||
if (document.cookie.includes("rgpd=true")) console.log("RGPD consent OK");
|
||||
else {
|
||||
console.log("no consent YET");
|
||||
_.cookieConsentBox('::redirect::');
|
||||
}
|
||||
</script>
|
||||
::end::
|
||||
|
||||
|
||||
</div>
|
||||
::use 'footer.mtt'::
|
||||
::end::
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
::use 'design.mtt'::
|
||||
|
||||
<div class="col-md-12" style="height:500px;">
|
||||
|
||||
::if user != null::
|
||||
consent agreed
|
||||
::else::
|
||||
<script language="javascript">
|
||||
_.cookieConsentBox('::redirect::');
|
||||
</script>
|
||||
::end::
|
||||
|
||||
</div>
|
||||
::end::
|
||||
+51
-1
@@ -1 +1,51 @@
|
||||
{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.14.2"}
|
||||
{
|
||||
"name": "cagette-pei",
|
||||
"description": "le logiciel libre du circuit court",
|
||||
"license": "AGPL-3.0",
|
||||
"dependencies": {
|
||||
"bootstrap": "^3.3.4",
|
||||
"eonasdan-bootstrap-datetimepicker": "^4.7.14",
|
||||
"geolib": "^2.0.24",
|
||||
"haxe-modular": "^0.7.0",
|
||||
"jquery": "^2.2.4",
|
||||
"leaflet": "^1.3.1",
|
||||
"react": "^15.6.1",
|
||||
"react-bootstrap-typeahead": "1.4.2",
|
||||
"react-datetime": "^2.9.0",
|
||||
"react-dom": "^15.6.1",
|
||||
"react-leaflet": "^1.8.0",
|
||||
"react-places-autocomplete": "^6.0.2",
|
||||
"react-router": "^4.2.0",
|
||||
"react-router-dom": "^4.2.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-preset-es2015": "^6.24.1",
|
||||
"babel-preset-react": "^6.24.1",
|
||||
"babelify": "^7.3.0",
|
||||
"browserify": "^14.4.0",
|
||||
"cross-env": "^5.1.1",
|
||||
"node-sass": "^4.5.3",
|
||||
"npm-run-all": "^4.1.2",
|
||||
"uglify-js": "^3.1.9",
|
||||
"watchify": "^3.9.0"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "npm-run-all --parallel build:*",
|
||||
"build:js": "haxe cagetteJs.hxml",
|
||||
"build:sass": "node-sass www/css -o www/css",
|
||||
"watch:sass": "npm run build:sass -- --watch",
|
||||
"build2": "babel src -d lib",
|
||||
"libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d",
|
||||
"libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js",
|
||||
"test": "haxe testsJS.hxml && node js/test/tests.js",
|
||||
"prepush": "npm test"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/bablukid/cagette.git"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/bablukid/cagette/issues"
|
||||
},
|
||||
"version": "1.14.2"
|
||||
}
|
||||
|
||||
@@ -30,6 +30,21 @@ class User extends Controller {
|
||||
}
|
||||
}
|
||||
|
||||
@tpl("user/cookieConsent.mtt")
|
||||
function doCookieConsent() {
|
||||
App.log("Cookie Consent called!");
|
||||
// if (App.current.user != null) {
|
||||
// throw Redirect('/');
|
||||
// }
|
||||
|
||||
// if its needed to redirect after login
|
||||
if (app.params.exists("redirect")) {
|
||||
view.redirect = app.params.exists("redirect");
|
||||
} else {
|
||||
view.redirect = "/";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Choose which group to connect to.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user