Merge branch 'master' of artcode.re:cagetters/cagette

.gitignore

@@ -32,5 +32,6 @@ www/js/libs.js
 
 www/css/.sass-cache
 www/css/*.css
+!www/css/bootstrap.min.css
 
 

Makefile

@@ -7,7 +7,7 @@ ENV?="dev"
 
 install:
 	#copy config file from template
-	cp config.xml.dist config.xml	
+	#cp config.xml.dist config.xml	
 	@if [ $(ENV) = "dev" ]; then \
 	make install_dev; \
 	fi
@@ -37,6 +37,7 @@ install_dev:
 	@make css
 	@make compile
 	@make frontend
+	@make templates
 	@echo "Well, it looks like everything is fine : librairies are installed, backend and frontend has been compiled !"
 
 
@@ -62,6 +63,8 @@ frontend:
 	else \
 	haxe cagetteJs.hxml; \
 	fi
+	mkdir -p tmp
+	chown www-data:www-data tmp
 
 #update POT file from source
 i18n:	
@@ -69,11 +72,11 @@ i18n:
 
 #compile templates in each language, required for production env.
 templates:	
+	mkdir -p lang/master/tmp
 	haxe cagette.hxml -D i18n_generation
 	@make LANG=fr ctemplates
-	#@make LANG=en ctemplates
-	#@make LANG=de ctemplates
 	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo 
+	chown www-data:www-data -R www
 
 ctemplates:
 #	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt */*/*/*.mtt */*/*/*/*.mtt)

README.md

@@ -1,17 +1,4 @@
-# Cagette.net
-Le logiciel libre des circuits courts.
+# Cagette péi
 
-[![Build Status](https://travis-ci.org/bablukid/cagette.svg?branch=master)](https://travis-ci.org/bablukid/cagette)
+Fourche du logiciel Cagette.net à partir de la version 0.9.2 Novembre 2018
 
-http://www.cagette.net
-
-Documentation : http://www.cagette.net/wiki
-
-English : 
-
-Cagette.net is an open source web app to help people build a better and sustainable food system.
-Some people call it a "foodhub" : A mix between a groupware and a marketplace, helping consumers to order food from local farmers and producers.
-
-## Build & install 
-
-Read the Developer page on the wiki to know more about this : http://wiki.cagette.net/dev:index

cagette.hxml

@@ -1,16 +1,33 @@
--lib templo:3.0.0
--lib hxevents:0.4.0
--lib thx.semver:0.2.2
--lib thx.csv:0.2.0
+# LOCKED LIBS
+-lib asys:0.3.0
 -lib datetime:3.1.1
+-lib history:0.0.1
 -lib hscript:2.3.0
+-lib hxevents:0.4.0
+-lib mime:0.1.2
+-lib modular:0.10.15
 -lib smtpmailer:0.4.0
+-lib templo:3.0.0
+-lib thx.core:0.43.0
+-lib thx.csv:0.2.0
+-lib thx.semver:0.2.2
+-lib tink_await:0.6.0
+-lib tink_chunk:0.3.1
+-lib tink_core:1.18.0
+-lib tink_io:0.5.0
 -lib tink_json:0.9.0
+-lib tink_macro:0.21.1
+-lib tink_priority:0.1.4
+-lib tink_streams:0.2.1
+-lib tink_syntaxhub:0.4.3
+-lib tink_typecrawler:0.7.0
 
+## GIT
 -lib sugoi:git:git@artcode.re:cagetters/sugoi.git
 -lib record-macros:git:git@artcode.re:cagetters/record-macros.git
 -lib dbadmin:git:git@artcode.re:cagetters/dbadmin.git
 
+## SCRIPT
 -cp common
 -cp src
 -cp lang/master/tpl

cagetteJs.hxml

@@ -7,6 +7,11 @@
 -lib react-router-4:0.2.3
 -lib modular:0.10.15
 -lib tink_json:0.9.0
+-lib tink_core:1.18.0
+-lib tink_io:0.5.0
+-lib tink_streams:0.2.1
+-lib thx.core:0.43.0
+-lib asys:0.3.0
 -main App
 -debug
 -js www/js/app.js

js/ShopCart.hx

@@ -164,7 +164,13 @@ class ShopCart
 		var groups = new Map<Int,{name:String,products:Array<ProductInfo>}>();
 		var pinned = new Map<Int,{name:String,products:Array<ProductInfo>}>();
 
-		var firstCategGroup = this.categories[0].categs;
+
+		trace(this.categories);
+		var firstCategGroup = null;
+		if (this.categories.length > 0){
+			firstCategGroup = this.categories[0].categs;
+		}
+		
 
 		//trace(firstCategGroup);
 		//trace(pinnedCategories);
@@ -181,7 +187,7 @@ class ShopCart
 
 			for ( categ in p.categories){
 
-				if (Lambda.find(firstCategGroup, function(c) return c.id == categ) != null){
+				if (firstCategGroup != null && Lambda.find(firstCategGroup, function(c) return c.id == categ) != null){
 
 					//is in this category group
 					var g = groups.get(categ);

lang/master/tpl/base.mtt

@@ -112,17 +112,6 @@
 			  
 			})
 
-			//tracking 24x7
-			var rumMOKey='1d36c37d438ba069db210c73cb74308d';
-			(function(){
-				if(window.performance && window.performance.timing && window.performance.navigation) {
-					var site24x7_rum_beacon=document.createElement('script');
-					site24x7_rum_beacon.async=true;
-					site24x7_rum_beacon.setAttribute('src','//static.site24x7rum.com/beacon/site24x7rum-min.js?appKey='+rumMOKey);
-					document.getElementsByTagName('head')[0].appendChild(site24x7_rum_beacon);
-				}
-			})(window)
-
 		</script>
 		
 	</body>