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.

Sign up for GitHub

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

Jump to bottom

Additional Data #8

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Additional Data #8

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a7ce90
Change Layout Tags to Niches
AlexGStapleton Sep 17, 2023
6aee4ef
Enable Category Support For Layouts & Adjust Post Type Supports
AlexGStapleton Sep 17, 2023
d5de4cc
Return Categoty, Niches, and layout type
AlexGStapleton Sep 17, 2023
975200d
Re-add `excerpt` Support for Layouts Post Type
AlexGStapleton Sep 17, 2023
4b1b231
Switch to Custom Taxonomy For Categories & Allow Filtering of Enabled…
AlexGStapleton Sep 24, 2023
9fa15d5
Improve Niche & Data Values
AlexGStapleton Sep 24, 2023
f6d77c4
Return All Layouts For Newer Versions of PB While Maintaining BC
AlexGStapleton Sep 24, 2023
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
83 changes: 66 additions & 17 deletions inc/directory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,31 @@ public function register_post_type() {
'has_archive' => true,
'hierarchical' => false,
'menu_position' => null,
'taxonomies' => array( 'post_tag' ),
'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'revisions' ),
'supports' => array( 'title', 'editor', 'excerpt', 'thumbnail', 'revisions' ),
);

register_post_type( 'layout', $args );

$types = apply_filters( 'siteorigin_layout_viewer_post_types', array( 'layout' ) );
register_taxonomy(
'layout_tag',
'layout',
'niches',
$types,
array(
'label' => __( 'Layout Tags' ),
'label' => __( 'Niches' ),
'public' => true,
'hierarchical' => false,
)
);

register_taxonomy(
'category_layouts',
$types,
array(
'label' => __( 'Categories' ),
'public' => true,
'hierarchical' => true,
)
);
}

/**
Expand Down Expand Up @@ -152,7 +162,6 @@ public function convert_widget_fields_to_fallback( $form, $instance, $level = 0
if ( $level > 10 ) {
return $instance;
}

foreach ( $form as $id => $field ) {
if ( $field['type'] == 'repeater' ) {
if ( ! empty( $instance[ $id ] ) ) {
Expand Down Expand Up @@ -225,16 +234,24 @@ public function query_layouts() {
$query = array(
'post_status' => 'publish',
'post_type' => 'layout',
'posts_per_page' => 16,
'nopaging ' => true,
'load_posts' => true,
);

if ( ! empty( $_GET['search'] ) ) {
$query['s'] = stripslashes( $_GET['search'] );
}

if ( ! empty( $_GET['page'] ) ) {
$query['paged'] = intval( $_GET['page'] );
// Backwards compatibility check.
if ( ! empty( $_GET['all'] ) ) {
// We now return all layouts rather than just 16.
$query['nopaging'] = true;
} else {
$query['posts_per_page'] = 16;
if ( ! empty( $_GET['search'] ) ) {
$query['s'] = stripslashes( $_GET['search'] );
}

// BC.
if ( ! empty( $_GET['page'] ) ) {
$query['paged'] = intval( $_GET['page'] );
}
}

$query = apply_filters( 'siteorigin_layout_viewer_query', $query );
Expand All @@ -244,23 +261,37 @@ public function query_layouts() {
);

if ( ! empty( $query ) ) {
if ( class_exists( 'SWP_Query' ) && ! empty( $query['s'] ) ) {
$layouts_query = new SWP_Query( $query );
// Backwards compatibility check.
if ( empty( $_GET['all'] ) ) {
if ( class_exists( 'SWP_Query' ) && ! empty( $query['s'] ) ) { // BC.
$layouts_query = new SWP_Query( $query );
} else {
$layouts_query = new WP_Query( $query );
}
$results['found'] = $layouts_query->found_posts;
$results['max_num_pages'] = $layouts_query->max_num_pages;
} else {
$layouts_query = new WP_Query( $query );
}

$results[ 'found' ] = $layouts_query->found_posts;
$results[ 'max_num_pages' ] = $layouts_query->max_num_pages;
$results['found'] = $layouts_query->found_posts;
$results['niches'] = self::get_type_terms( 'niches' );
$results['categories'] = self::get_type_terms( 'category_layouts' );

foreach ( $layouts_query->posts as $post ) {
$category = wp_get_post_terms( $post->ID, 'category_layouts', array( 'fields' => 'names' ) );
$niches = wp_get_post_terms( $post->ID, 'niches', array( 'fields' => 'names' ) );

$results['items'][] = array(
'id' => $post->ID,
'slug' => $post->post_name,
'title' => $post->post_title,
'description' => $post->post_excerpt,
'preview' => get_permalink( $post ),
'screenshot' => get_the_post_thumbnail_url( $post ),
'access' => $post->post_type == 'premium_layouts' ? 'premium' : 'free',
'category' => ! empty( $category ) ? $category[0] : '',
'niches' => ! empty( $niches ) ? json_encode( $niches ) : '',
);
}
}
Expand All @@ -271,6 +302,24 @@ public function query_layouts() {
echo json_encode( $results );
wp_die();
}

public static function get_type_terms( $term_type ) {
$terms = get_terms( array(
'taxonomy' => $term_type,
'hide_empty' => false,
) );

if ( empty( $terms ) || is_wp_error( $terms ) ) {
return null;
}

$return = array();
foreach ( $terms as $term ) {
$return[ $term->slug ] = $term->name;
}

return apply_filters( 'siteorigin_layout_viewer_type_terms', $return );
}
}

SiteOrigin_Layout_Directory::single();