feat!: Open Food Facts website redesign (#7414)

openfoodfacts · Oct 11, 2022 · 7e52e7a · 7e52e7a
1 parent 33e7baf
commit 7e52e7a
Show file tree

Hide file tree

Showing 116 changed files with 171,640 additions and 3,314 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -3,3 +3,6 @@ html/js/dist/
 html/js/datatables.*.js
 html/js/jquery*.js
 html/js/sigma.*.js
+html/js/hc-sticky.js
+html/js/scrollNav.js
+html/js/stikelem.js
diff --git a/cgi/login.pl b/cgi/login.pl
@@ -46,7 +46,7 @@
 my $redirect = single_param('redirect');
 $template_data_ref->{redirect} = $redirect;
 if (defined $User_id) {
-	my $loc = $redirect || $formatted_subdomain;
+	my $loc = $redirect || $formatted_subdomain . "/cgi/session.pl";
 	$r->headers_out->set(Location => $loc);
 	$r->err_headers_out->add('Set-Cookie' => $request_ref->{cookie});
 	$r->status(302);
@@ -85,8 +85,9 @@
 
 $template_data_ref->{errors} = \@errors;
 
+# Display the sign in form
 my $html;
-process_template('web/pages/login_form/login.tt.html', $template_data_ref, \$html) or $html = '';
+process_template('web/pages/session/sign_in_form.tt.html', $template_data_ref, \$html) or $html = '';
 if ($tt->error()) {
 	$html .= '<p>' . $tt->error() . '</p>';
 }

diff --git a/cgi/product_image.pl b/cgi/product_image.pl
@@ -170,7 +170,7 @@
 $template_data_ref->{attribution} = $attribution;
 
 my $html;
-process_template('product_image.tt.html', $template_data_ref, \$html) or $html = '';
+process_template('web/pages/product/includes/product_image.tt.html', $template_data_ref, \$html) or $html = '';
 $html .= "<p>" . $tt->error() . "</p>";
 
 $request_ref->{title} = $alt;

diff --git a/cgi/product_multilingual.pl b/cgi/product_multilingual.pl
@@ -731,7 +731,6 @@ ($product_ref, $field, $language)
 	$header .= <<HTML
 <link rel="stylesheet" type="text/css" href="/css/dist/cropper.css" />
 <link rel="stylesheet" type="text/css" href="/css/dist/tagify.css" />
-<link rel="stylesheet" type="text/css" href="/css/dist/product-multilingual.css?v=$file_timestamps{'css/dist/product-multilingual.css'}" />
 HTML
 	  ;
 
@@ -1435,6 +1434,8 @@ ($product_ref, $field, $language)
 	  or $html = "<p>" . $tt->error() . "</p>";
 	process_template('web/pages/product_edit/product_edit_form_display.tt.js', $template_data_ref_display, \$js);
 	$initjs .= $js;
+	$request_ref->{page_type} = "product_edit";
+	$request_ref->{page_format} = "banner";
 
 }
 elsif (($action eq 'display') and ($type eq 'delete') and ($User{moderator})) {

diff --git a/cgi/session.pl b/cgi/session.pl
@@ -82,9 +82,6 @@
 	}
 }
 
-process_template('web/pages/session/session.tt.html', $template_data_ref, \$html)
-  or $html = "<p>" . $tt->error() . "</p>";
-
 if (single_param('jqm')) {
 
 	my %response;
@@ -101,6 +98,24 @@
 
 }
 else {
+	my $template;
+
+	if ((defined param('length')) and (param('length') eq 'logout')) {
+		# The user is signing out
+		$template = "signed_out";
+	}
+	elsif (defined $User_id) {
+		# The user is signed in
+		$template = "signed_in";
+	}
+	else {
+		# The user is signing in: display the login form
+		$template = "sign_in_form";
+	}
+
+	process_template("web/pages/session/$template.tt.html", $template_data_ref, \$html)
+	  or $html = "<p>" . $tt->error() . "</p>";
+
 	$request_ref->{title} = lang('session_title');
 	$request_ref->{content_ref} = \$html;
 	display_page($request_ref);

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,7 +11,10 @@ const svgmin = require("gulp-svgmin");
 const jsSrc = [
   './html/js/display*.js',
   './html/js/product-multilingual.js',
-  './html/js/search.js'
+  './html/js/search.js',
+  './html/js/hc-sticky.js',
+  './html/js/stikelem.js',
+  './html/js/scrollNav.js'
 ];
 
 const sassSrc = "./scss/**/*.scss";
@@ -130,7 +133,6 @@ function copyCss() {
       "./node_modules/leaflet.markercluster/dist/MarkerCluster.css",
       "./node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css",
       "./node_modules/@yaireo/tagify/dist/tagify.css",
-      "./html/css/product-multilingual.css",
       "./node_modules/cropperjs/dist/cropper.css",
       "./node_modules/jvectormap-next/jquery-jvectormap.css",
       "./node_modules/select2/dist/css/select2.min.css"

diff --git a/html/images/illustrations/app-icon-in-the-clouds.svg b/html/images/illustrations/app-icon-in-the-clouds.svg
diff --git a/html/images/illustrations/donate-heart.svg b/html/images/illustrations/donate-heart.svg
diff --git a/html/images/illustrations/donut.svg b/html/images/illustrations/donut.svg
diff --git a/html/images/illustrations/footer-orange.svg b/html/images/illustrations/footer-orange.svg