Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add FacetWP services #372

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions inc/Framework.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use BEA\Theme\Framework\Services\Acf;
use BEA\Theme\Framework\Services\Assets;
use BEA\Theme\Framework\Services\Facet_WP;
use BEA\Theme\Framework\Services\Performance;
use BEA\Theme\Framework\Services\Assets_JS_Async;
use BEA\Theme\Framework\Services\Editor;
Expand Down Expand Up @@ -40,6 +41,7 @@ class Framework {
Svg::class,
Acf::class,
Menu::class,
Facet_WP::class,

// Services as Tools
Body_Class::class,
Expand Down
175 changes: 175 additions & 0 deletions inc/Services/Facet_WP.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
<?php

namespace BEA\Theme\Framework\Services;

use BEA\Theme\Framework\Service;
use BEA\Theme\Framework\Service_Container;

class Facet_WP implements Service {
public function register( Service_Container $container ): void {
}

public function boot( Service_Container $container ): void {
add_filter( 'facetwp_load_assets', '__return_true' );
MarieComet marked this conversation as resolved.
Show resolved Hide resolved
add_filter( 'facetwp_load_a11y', '__return_true' );
add_filter( 'facetwp_facets', [ $this, 'register_facets' ], 40 );
add_filter( 'facetwp_pager_html', [ $this, 'accessible_facetwp_pager_html' ], 10, 2 );
add_filter( 'facetwp_facet_html', [ $this, 'accessible_facetwp_labels' ], 10, 2 );
}

/**
* Get service name
*
* @return string
*/
public function get_service_name(): string {
return 'facetwp';
}

/**
* Register facets from config file.
*
* @param array $facets
*
* @return array
* @author Egidio CORICA
*/
public function register_facets( array $facets ): array {

$filename = get_theme_file_path( 'assets/facetwp/config.json' );
if ( ! is_readable( $filename ) ) {
return $facets;
}

$facet_content = file_get_contents( $filename ); // phpcs:ignore
if ( empty( $facet_content ) ) {
return $facets;
}

$facet_content = \json_decode( $facet_content, true );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Attention, on a deux appels à json_decode. Il faut retirer celui-ci.

if (
JSON_ERROR_NONE !== \json_last_error()
|| ! is_array( $facet_content )
|| empty( $facet_content['facets'] )
) {
return $facets;
}
MarieComet marked this conversation as resolved.
Show resolved Hide resolved

return wp_parse_args( $facet_content['facets'], $facets );
}

/**
* Add custom and accessible FacetWP pagination.
*
* @param $output
* @param $params
*
* @return string
*
* @author Egidio CORICA
*
*/
firestar300 marked this conversation as resolved.
Show resolved Hide resolved
public function accessible_facetwp_pager_html( $output, $params ): string {
$defaults = [
'page' => 1,
'per_page' => 10,
'total_rows' => 1,
];
$params = array_merge( $defaults, $params );
$output = '';
$page = (int) $params['page'];
$total_pages = (int) $params['total_pages'];

// Only show pagination when > 1 page
if ( 1 < $total_pages ) {

$text_page = esc_html__( 'Page', 'fwp-front' );
$text_of = esc_html__( 'of', 'fwp-front' );
$step = 10;

$output .= '<span class="facetwp-pager-label sr-only">' . "$text_page $page $text_of $total_pages</span>";

if ( $page > 1 ) {
$output .= '<a href="#" class="facetwp-page previouspostslink" data-page="' . ( $page - 1 ) . '">' . __( 'Previous', 'framework-textdomain' ) . '</a>';
} else {
$output .= '<span class="facetwp-page previouspostslink" aria-hidden="true" tabindex="-1" style="visibility: hidden"></span>';
}

if ( 3 < $page ) {
$output .= '<a href="#" class="facetwp-page first-page" data-page="1">
<span class="sr-only">Première page</span>
<span aria-hidden="true">1</span>
</a>';
}
if ( 1 < ( $page - $step ) ) {
$output .= '<span class="facetwp-page-more" aria-hidden="true">...</span>';
}

for ( $i = 2; $i > 0; $i -- ) {
if ( 0 < ( $page - $i ) ) {
$output .= '<a href="#" class="facetwp-page" data-page="' . ( $page - $i ) . '"><span class="sr-only">' . __( 'Page', 'framework-textdomain' ) . '</span> ' . ( $page - $i ) . '</a>';
}
}

// Current page
$output .= '<a href="#" class="facetwp-page active" aria-current="true" data-page="' . $page . '"><span class="sr-only">' . __( 'Current page', 'framework-textdomain' ) . '</span> ' . $page . '</a>';
MarieComet marked this conversation as resolved.
Show resolved Hide resolved

for ( $i = 1; $i <= 2; $i ++ ) {
if ( $total_pages >= ( $page + $i ) ) {
$output .= '<a href="#" class="facetwp-page" data-page="' . ( $page + $i ) . '"><span class="sr-only">' . __( 'Page', 'framework-textdomain' ) . '</span> ' . ( $page + $i ) . '</a>';
}
}

if ( $total_pages > ( $page + $step ) ) {
$output .= '<span class="facetwp-page-more" aria-hidden="true">...</span>';
}

if ( $total_pages > ( $page + 2 ) ) {
$output .= '<a href="#" class="facetwp-page last-page" data-page="' . $total_pages . '">
<span class="sr-only">' . __( 'Last page', 'framework-textdomain' ) . '</span>
<span aria-hidden="true">' . $total_pages . '</span>
</a>';
}

if ( $page < $total_pages && $total_pages > 1 ) {
$output .= '<a href="#" class="facetwp-page nextpostslink" data-page="' . ( $page + 1 ) . '">' . __( 'Next', 'framework-textdomain' ) . '</a>';
} else {
$output .= '<span class="facetwp-page nextpostslink" aria-hidden="true" style="visibility: hidden;" tabindex="-1"></span>';
}
}

return $output;
}

/**
* Fix Labels for supported facets.
* Put in show_label_not_empty the facets that only need to be visible in they have results.
*
* @param string $html
* @param array $args
*
* @return string
*/
public function accessible_facetwp_labels( string $html, array $args ): string {
$show_label_not_empty = [
'checkboxes',
'radio',
];

if ( ( true === in_array( $args['facet']['type'], $show_label_not_empty, true ) && ! empty( $args['values'] ) ) || false === in_array( $args['facet']['type'], $show_label_not_empty, true ) ) {
$label = $args['facet']['label'];
if ( function_exists( 'facetwp_i18n' ) ) {
$label = facetwp_i18n( $label );
}

$html = sprintf( '<label class="facetwp-label" for="%s">%s</label>%s', esc_attr( $args['facet']['name'] ), esc_html( $label ), $html );

// Add id attribute to per_page select
if ( 'per_page' === $args['facet']['name'] ) {
$html = str_replace( '<select class="facetwp-per-page-select">', '<select class="facetwp-per-page-select" id="per_page">', $html );
}
}

return $html;
}
}
131 changes: 20 additions & 111 deletions languages/beapi-frontend-framework.pot
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2022 BeAPI
# Copyright (C) 2024 BeAPI
# This file is distributed under the .
msgid ""
msgstr ""
Expand All @@ -9,10 +9,10 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2022-06-30T08:09:55+00:00\n"
"POT-Creation-Date: 2024-03-04T09:37:43+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.6.0\n"
"X-Domain: beapi-frontend-framework\n"
"X-Generator: WP-CLI 2.9.0\n"
"X-Domain: framework-textdomain\n"

#. Theme Name of the theme
#. Description of the theme
Expand All @@ -31,123 +31,32 @@ msgstr ""
msgid "http://www.beapi.fr"
msgstr ""

#: components/blocks/footer.php:4
#: components/blocks/skip-links.php:12
msgid "Footer"
#: inc/Services/Acf.php:55
msgid "This theme can't work without ACF plugin. <a href=\"%s\">Please login to admin</a>, and activate it !"
msgstr ""

#: components/blocks/header.php:4
msgid "Header"
#: inc/Services/Facet_WP.php:93
msgid "Previous"
msgstr ""

#: components/blocks/header.php:14
msgid "Open/Close the menu"
#: inc/Services/Facet_WP.php:110
#: inc/Services/Facet_WP.php:119
msgid "Page"
msgstr ""

#: components/blocks/header.php:17
msgid "Main navigation"
#: inc/Services/Facet_WP.php:115
msgid "Current page"
msgstr ""

#: components/blocks/skip-links.php:4
msgid "Fast access links"
#: inc/Services/Facet_WP.php:129
msgid "Last page"
msgstr ""

#: components/blocks/skip-links.php:6
msgid "Main navigation menu"
#: inc/Services/Facet_WP.php:135
msgid "Next"
msgstr ""

#: components/blocks/skip-links.php:9
#: header.php:26
msgid "Main content"
msgstr ""

#: inc/Helpers/Formatting/Link.php:144
msgid "New window"
msgstr ""

#: inc/Helpers/Formatting/Share.php:53
msgid "Share on Facebook"
msgstr ""

#: inc/Helpers/Formatting/Share.php:64
msgid "Share on Twitter"
msgstr ""

#: inc/Helpers/Formatting/Share.php:75
msgid "Share on Linkedin"
msgstr ""

#: inc/Helpers/Formatting/Share.php:86
msgid "Share on Email"
msgstr ""

#: inc/Helpers/Menu_Walker.php:26
msgid "Toggle menu"
msgstr ""

#: inc/Services/Editor.php:76
msgid "Dark"
msgstr ""

#: inc/Services/Editor.php:81
msgid "Light"
msgstr ""

#: inc/Services/Editor.php:86
msgid "Primary"
msgstr ""

#: inc/Services/Editor.php:91
msgid "Secondary"
msgstr ""

#: inc/Services/Editor.php:102
msgid "Title 6"
msgstr ""

#: inc/Services/Editor.php:108
msgid "Title 5"
msgstr ""

#: inc/Services/Editor.php:114
msgid "Title 4"
msgstr ""

#: inc/Services/Editor.php:120
msgid "Title 3"
msgstr ""

#: inc/Services/Editor.php:126
msgid "Title 2"
msgstr ""

#: inc/Services/Editor.php:132
msgid "Title 1"
msgstr ""

#: inc/Services/Editor_Patterns.php:40
msgid "Common"
msgstr ""

#. translators: %s: file name.
#: inc/Services/Editor_Patterns.php:125
msgid "Could not register file \"%s\" as a block pattern (\"Slug\" field missing)"
msgstr ""

#. translators: %1s: file name; %2s: slug value found.
#: inc/Services/Editor_Patterns.php:138
msgid "Could not register file \"%1$s\" as a block pattern (invalid slug \"%2$s\")"
msgstr ""

#. translators: %1s: file name; %2s: slug value found.
#: inc/Services/Editor_Patterns.php:155
msgid "Could not register file \"%s\" as a block pattern (\"Title\" field missing)"
msgstr ""

#: inc/Services/Menu.php:37
msgid "Main menu"
msgstr ""

#: inc/Services/Menu.php:38
msgid "Footer menu"
#: patterns/media-text.php
msgctxt "Pattern title"
msgid "Media Text"
msgstr ""
Binary file modified languages/fr_FR.mo
Binary file not shown.
Loading
Loading