Compare commits

..
8 Commits
Author SHA1 Message Date
pvincent 9b94726d39 tagged as 1.16.0 2023-03-28 11:56:15 +04:00
pvincent 2704620b90 mentions legales from config 2023-03-28 11:56:06 +04:00
pvincent 784438c864 tagged as 1.15.1 2022-12-11 12:18:34 +04:00
pvincent 6494f92b54 meilleur consentement cookies 2022-12-11 12:18:23 +04:00
pvincent a7e75fb40b tagged as 1.15.0 2022-12-10 19:48:39 +04:00
pvincent 1b6fc0e646 tout accepter 2022-12-10 19:48:04 +04:00
pvincent 01612db559 tagged as 1.14.3 2022-12-10 19:36:44 +04:00
pvincent a0405e885d cookie consent OK 2022-12-10 19:36:21 +04:00
10 changed files with 280 additions and 109 deletions
+1 -1
View File
@@ -1 +1 @@
1.14.2 1.16.0
+12 -2
View File
@@ -4,11 +4,21 @@
default_email = "<EMAIL>" default_email = "<EMAIL>"
webmaster_email = "<EMAIL>" webmaster_email = "<EMAIL>"
key = "<SECRET_PHRASE>" key = "<SECRET_PHRASE>"
debug="0" debug="0"
sqllog="0" sqllog="0"
maintain="0" maintain="0"
cache="1" cache="1"
cachetpl="0" cachetpl="0"
legal.name="TODO"
legal.email="TODO"
legal.siren="TODO"
legal.siret="TODO"
legal.naf="TODO"
legal.juridique="TODO"
legal.responsable="TODO"
legal.hebergeur="<a href='mailto:TODO'>TODO</a>"
/> />
+101 -97
View File
@@ -1,33 +1,33 @@
//React lib // React lib
import react.ReactMacro.jsx; import react.ReactMacro.jsx;
import react.ReactDOM; import react.ReactDOM;
import react.*; import react.*;
import react.router.*; import react.router.*;
//custom components // custom components
import react.order.*; import react.order.*;
import react.product.*; import react.product.*;
import react.store.*; import react.store.*;
import react.map.*; import react.map.*;
import react.user.*; import react.user.*;
//require bootstrap JS since it's bundled with browserify // require bootstrap JS since it's bundled with browserify
//@:jsRequire('bootstrap') extern class Bootstrap{} // @:jsRequire('bootstrap') extern class Bootstrap{}
//@:jsRequire('jquery') extern class JQ extends js.jquery.JQuery{} // @:jsRequire('jquery') extern class JQ extends js.jquery.JQuery{}
class App { class App {
public static var instance:App;
public static var instance : App; public var LANG:String;
public var LANG : String; public var currency:String; // currency symbol like &euro; or $
public var currency : String; //currency symbol like &euro; or $ public var t:sugoi.i18n.GetText; // gettext translator
public var t : sugoi.i18n.GetText;//gettext translator
//i dont want to use redux now... saved state from react.OrderBox // i dont want to use redux now... saved state from react.OrderBox
public static var SAVED_ORDER_STATE : Dynamic; public static var SAVED_ORDER_STATE:Dynamic;
function new(?lang="fr",?currency="&euro;") { function new(?lang = "fr", ?currency = "&euro;") {
//singleton // singleton
instance = this; instance = this;
if(lang!=null) this.LANG = lang; if (lang != null)
this.LANG = lang;
this.currency = currency; this.currency = currency;
} }
@@ -39,7 +39,7 @@ class App {
return new js.JQuery(r); return new js.JQuery(r);
} }
public static inline function jq(r:Dynamic):js.jquery.JQuery{ public static inline function jq(r:Dynamic):js.jquery.JQuery {
return new js.jquery.JQuery(r); return new js.jquery.JQuery(r);
} }
@@ -47,8 +47,7 @@ class App {
* The JS App will be available as "_" in the document. * The JS App will be available as "_" in the document.
*/ */
public static function main() { public static function main() {
// untyped js.Browser.window.$ = js.Lib.require("jQuery");
//untyped js.Browser.window.$ = js.Lib.require("jQuery");
untyped js.Browser.window._ = new App(); untyped js.Browser.window._ = new App();
} }
@@ -56,32 +55,31 @@ class App {
return new ShopCart(); return new ShopCart();
} }
public function getTagger(cid:Int ) { public function getTagger(cid:Int) {
return new Tagger(cid); return new Tagger(cid);
} }
public function getTuto(name:String, step:Int) { public function getTuto(name:String, step:Int) {
new Tuto(name,step); new Tuto(name, step);
} }
/** /**
* remove method for IE compat * remove method for IE compat
*/ */
public function remove(el:js.html.Element){ public function remove(el:js.html.Element) {
if (el == null) return; if (el == null)
return;
el.parentElement.removeChild(el); el.parentElement.removeChild(el);
} }
public function getVATBox(ttcprice:Float,currency:String,rates:String,vat:Float,formName:String){ public function getVATBox(ttcprice:Float, currency:String, rates:String, vat:Float, formName:String) {
var input = js.Browser.document.querySelector('form input[name="${formName}_price"]'); var input = js.Browser.document.querySelector('form input[name="${formName}_price"]');
remove( js.Browser.document.querySelector('form input[name="${formName}_vat"]').parentElement.parentElement ); remove(js.Browser.document.querySelector('form input[name="${formName}_vat"]').parentElement.parentElement);
ReactDOM.render(jsx('<$VATBox ttc="$ttcprice" currency="$currency" vatRates="$rates" vat="$vat" formName="$formName"/>'), input.parentElement); ReactDOM.render(jsx('<$VATBox ttc="$ttcprice" currency="$currency" vatRates="$rates" vat="$vat" formName="$formName"/>'), input.parentElement);
//remove(input); // remove(input);
} }
/*public function getProductComposer(){ /*public function getProductComposer(){
@@ -89,7 +87,6 @@ class App {
//ReactDOM.render(jsx('<$ComposerApp/>'), js.Browser.document.getElementById("app")); //ReactDOM.render(jsx('<$ComposerApp/>'), js.Browser.document.getElementById("app"));
//}); //});
}*/ }*/
/** /**
* Removes the form element and replace it by a react js component * Removes the form element and replace it by a react js component
* @param divId * @param divId
@@ -97,72 +94,71 @@ class App {
* @param txpProductId * @param txpProductId
* @param formName * @param formName
*/ */
public function getProductInput(divId:String, productName:String, txpProductId:String, formName:String ){ public function getProductInput(divId:String, productName:String, txpProductId:String, formName:String) {
js.Browser.document.addEventListener("DOMContentLoaded", function(event) { 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();
//dirty stuff to remove "real" input, and replace it by the react one if (txpProductId == null)
App.j("form input[name='"+formName+"_name']").parent().parent().remove(); txpProductId = "";
App.j("form select[name='" + formName+"_txpProductId']").parent().parent().remove();
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));
}); });
} }
public function initReportHeader(){ public function initReportHeader() {
ReactDOM.render(jsx('<$ReportHeader />'), js.Browser.document.querySelector('div.reportHeaderContainer')); 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(); untyped App.j("#myModal").modal();
var onValidate = function() js.Browser.location.href = callbackUrl; var onValidate = function() js.Browser.location.href = callbackUrl;
var node = js.Browser.document.querySelector('#myModal .modal-body'); var node = js.Browser.document.querySelector('#myModal .modal-body');
ReactDOM.unmountComponentAtNode(node); //the previous modal DOM element is still there, so we need to destroy it ReactDOM.unmountComponentAtNode(node); // the previous modal DOM element is still there, so we need to destroy it
ReactDOM.render(jsx('<$OrderBox userId="$userId" distributionId="$distributionId" ReactDOM.render(jsx('<$OrderBox userId="$userId" distributionId="$distributionId"
contractId="$contractId" contractType="$contractType" date="$date" place="$place" userName="$userName" contractId="$contractId" contractType="$contractType" date="$date" place="$place" userName="$userName"
onValidate=$onValidate currency=$currency hasPayments=$hasPayments />'),node,postReact); onValidate=$onValidate currency=$currency hasPayments=$hasPayments />'), node, postReact);
} }
function postReact(){ function postReact() {
trace("post react"); trace("post react");
haxe.Timer.delay(function(){ haxe.Timer.delay(function() {
untyped jq('[data-toggle="tooltip"]').tooltip(); untyped jq('[data-toggle="tooltip"]').tooltip();
untyped jq('[data-toggle="popover"]').popover(); untyped jq('[data-toggle="popover"]').popover();
},500); }, 500);
} }
public static function roundTo(n:Float, r:Int):Float { public static function roundTo(n:Float, r:Int):Float {
return Math.round(n * Math.pow(10,r)) / Math.pow(10,r) ; return Math.round(n * Math.pow(10, r)) / Math.pow(10, r);
} }
/** /**
* Ajax loads a page and display it in a modal window * Ajax loads a page and display it in a modal window
* @param url * @param url
* @param title * @param title
*/ */
public function overlay(url:String,?title,?large=true) { public function overlay(url:String, ?title, ?large = true) {
if (title != null)
if (title != null) title = StringTools.urlDecode(title); title = StringTools.urlDecode(title);
var r = new haxe.Http(url); var r = new haxe.Http(url);
r.onData = function(data) { r.onData = function(data) {
// setup body and title
//setup body and title
var m = App.j("#myModal"); var m = App.j("#myModal");
m.find(".modal-body").html(data); m.find(".modal-body").html(data);
if (title != null) m.find(".modal-title").html(title); if (title != null)
m.find(".modal-title").html(title);
if (!large) m.find(".modal-dialog").removeClass("modal-lg"); if (!large)
m.find(".modal-dialog").removeClass("modal-lg");
untyped App.j('#myModal').modal(); //bootstrap 3 modal window
untyped App.j('#myModal').modal(); // bootstrap 3 modal window
} }
r.request(); r.request();
} }
@@ -170,52 +166,65 @@ class App {
/** /**
* Displays a login box * Displays a login box
*/ */
public function loginBox(redirectUrl:String,?message:String,?phoneRequired=false) { public function loginBox(redirectUrl:String, ?message:String, ?phoneRequired = false) {
var m = App.j("#myModal"); var m = App.j("#myModal");
m.find(".modal-title").html("S'identifier"); m.find(".modal-title").html("S'identifier");
m.find(".modal-dialog").removeClass("modal-lg"); m.find(".modal-dialog").removeClass("modal-lg");
untyped m.modal(); 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; return false;
} }
/** /**
* Displays a sign up box * Displays a sign up box
*/ */
public function registerBox(redirectUrl:String,?message:String,?phoneRequired=false) { public function registerBox(redirectUrl:String, ?message:String, ?phoneRequired = false) {
var m = App.j("#myModal"); var m = App.j("#myModal");
m.find(".modal-title").html("S'inscrire"); m.find(".modal-title").html("S'inscrire");
m.find(".modal-dialog").removeClass("modal-lg"); m.find(".modal-dialog").removeClass("modal-lg");
untyped m.modal(); 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 aux cookies");
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; return false;
} }
public function shop(place:Int, date:String) { public function shop(place:Int, date:String) {
ReactDOM.render(jsx('<$Store date=$date place=$place/>'), js.Browser.document.querySelector('#shop')); ReactDOM.render(jsx('<$Store date=$date place=$place/>'), js.Browser.document.querySelector('#shop'));
} }
public function groupMap(lat:String,lng:String,address:String) { public function groupMap(lat:String, lng:String, address:String) {
ReactDOM.render(jsx('<$GroupMapRoot lat="$lat" lng="$lng" address="$address"/>'), js.Browser.document.querySelector('#map')); ReactDOM.render(jsx('<$GroupMapRoot lat="$lat" lng="$lng" address="$address"/>'), js.Browser.document.querySelector('#map'));
} }
/** /**
* Helper to get values of a bunch of checked checkboxes * Helper to get values of a bunch of checked checkboxes
* @param formSelector * @param formSelector
*/ */
public function getCheckboxesId(formSelector:String):Array<String>{ public function getCheckboxesId(formSelector:String):Array<String> {
var out = []; var out = [];
var checkboxes = js.Browser.document.querySelectorAll(formSelector + " input[type=checkbox]"); var checkboxes = js.Browser.document.querySelectorAll(formSelector + " input[type=checkbox]");
for ( input in checkboxes ){ for (input in checkboxes) {
var input : js.html.InputElement = cast input; var input:js.html.InputElement = cast input;
if ( input.checked ) out.push(input.value); if (input.checked)
out.push(input.value);
} }
return out; return out;
} }
#if plugins #if plugins
public function getHostedPlugin(){ public function getHostedPlugin() {
return new hosted.js.App(); return new hosted.js.App();
} }
#end #end
@@ -223,40 +232,35 @@ class App {
/** /**
* set up a warning message when leaving the page * set up a warning message when leaving the page
*/ */
public function setWarningOnUnload(active:Bool, ?msg:String){ public function setWarningOnUnload(active:Bool, ?msg:String) {
if (active){ if (active) {
js.Browser.window.addEventListener("beforeunload", warn); js.Browser.window.addEventListener("beforeunload", warn);
}else{ } else {
js.Browser.window.removeEventListener("beforeunload", warn); js.Browser.window.removeEventListener("beforeunload", warn);
} }
} }
function warn(e:js.html.Event) { function warn(e:js.html.Event) {
var msg = "Voulez vous vraiment quitter cette page ?"; var msg = "Voulez vous vraiment quitter cette page ?";
//js.Browser.window.confirm(msg); // js.Browser.window.confirm(msg);
untyped e.returnValue = msg; //Gecko + IE untyped e.returnValue = msg; // Gecko + IE
e.preventDefault(); e.preventDefault();
return msg; //Gecko + Webkit, Safari, Chrome etc. return msg; // Gecko + Webkit, Safari, Chrome etc.
} }
/** /**
* Anti Doubleclick with btn elements. * Anti Doubleclick with btn elements.
* Can be bypassed by adding a .btn-noAntiDoubleClick class * Can be bypassed by adding a .btn-noAntiDoubleClick class
*/ */
public function antiDoubleClick(){ public function antiDoubleClick() {
for (n in js.Browser.document.querySelectorAll(".btn:not(.btn-noAntiDoubleClick)")) {
for( n in js.Browser.document.querySelectorAll(".btn:not(.btn-noAntiDoubleClick)") ){ n.addEventListener("click", function(e:js.html.MouseEvent) {
n.addEventListener("click",function(e:js.html.MouseEvent){
var x = untyped e.target; var x = untyped e.target;
x.classList.add("disabled"); x.classList.add("disabled");
haxe.Timer.delay(function(){ haxe.Timer.delay(function() {
x.classList.remove("disabled"); x.classList.remove("disabled");
},1000); }, 1000);
}); });
} }
} }
} }
+103
View File
@@ -0,0 +1,103 @@
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>Personnalisation du paramétrage</h4>
<p>L\'outil CagettePéi n\'utilise que des cookies nécessaires pour vous aider à naviguer efficacement et à exécuter certaines fonctionnalités. Pas de cookie publicitaire, en provenance de site tiers ou de mesure d\'audience.
</p>
<p>
Seuls 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" ><span className="glyphicon glyphicon-remove"></span> Tout Refuser</a>
&nbsp;
<a onClick={submit} className="btn btn-primary btn-lg" ><span className="glyphicon glyphicon-ok"></span> Tout 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();
}
}
+11
View File
@@ -185,6 +185,17 @@
</div> </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> </div>
::use 'footer.mtt':: ::use 'footer.mtt'::
::end:: ::end::
+12 -7
View File
@@ -7,6 +7,11 @@
<h4>Mentions Légales</h4> <h4>Mentions Légales</h4>
<p>
Ce site web est édité par <b>::name::</b>
</p>
<table class="table table-bordered table-condensed"> <table class="table table-bordered table-condensed">
<tbody><tr> <tbody><tr>
<th>Champ</th> <th>Champ</th>
@@ -15,37 +20,37 @@
<tr> <tr>
<td>Adresse de courrier électronique</td> <td>Adresse de courrier électronique</td>
<td>contact@mangue-et-solidaire.re</td> <td>::email::</td>
</tr> </tr>
<tr> <tr>
<td>Numéro Siren</td> <td>Numéro Siren</td>
<td>879178739</td> <td>::siren::</td>
</tr> </tr>
<tr> <tr>
<td>Numéro Siret</td> <td>Numéro Siret</td>
<td>87917873900022</td> <td>::siret::</td>
</tr> </tr>
<tr> <tr>
<td>Code NAF / APE</td> <td>Code NAF / APE</td>
<td>4711B</td> <td>::naf::</td>
</tr> </tr>
<tr> <tr>
<td>Forme juridique et capital</td> <td>Forme juridique et capital</td>
<td>Association Loi 1901</td> <td>::juridique::</td>
</tr> </tr>
<tr> <tr>
<td>Responsable éditorial</td> <td>Responsable éditorial</td>
<td>Yann Jacob</td> <td>::responsable::</td>
</tr> </tr>
<tr> <tr>
<td>Hébergeur</td> <td>Hébergeur</td>
<td><a href="www.artcode.re">Artcode</a></td> <td>::raw hebergeur::</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
+14
View File
@@ -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::
+1 -1
View File
@@ -1 +1 @@
{"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.16.0"}
+10 -1
View File
@@ -6,5 +6,14 @@ class MentionsLegales extends Controller {
} }
@tpl("mentions_legales/default.mtt") @tpl("mentions_legales/default.mtt")
function doDefault() {} function doDefault() {
view.name = App.config.get("legal.name");
view.email = App.config.get("legal.email");
view.siren = App.config.get("legal.siren");
view.siret = App.config.get("legal.siret");
view.naf = App.config.get("legal.naf");
view.juridique = App.config.get("legal.juridique");
view.responsable = App.config.get("legal.responsable");
view.hebergeur = App.config.get("legal.hebergeur");
}
} }
+15
View File
@@ -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. * Choose which group to connect to.
*/ */