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

LEDE-2612 Additional WordPress clean up #126

Merged
merged 6 commits into from
May 24, 2024
Merged

LEDE-2612 Additional WordPress clean up #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
62a1438
remove cutoff date from post block
cahdeemer May 23, 2024
11f4a57
use standard display for post picker results
cahdeemer May 23, 2024
fc377ef
fix list item styles
cahdeemer May 23, 2024
6beffde
remove ad fields from email types
cahdeemer May 23, 2024
ad79ce5
bump version
cahdeemer May 23, 2024
f9e7c03
lint
cahdeemer May 23, 2024
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
8 changes: 1 addition & 7 deletions blocks/post/edit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
*/
import { useBlockProps, InspectorControls, InnerBlocks } from '@wordpress/block-editor';

import PostPickerResult from '@/components/postPickerResult';
/**
* Lets webpack process CSS, SASS or SCSS files referenced in JavaScript files.
* Those files can contain any CSS code that gets applied to the editor.
Expand Down Expand Up @@ -78,9 +77,6 @@ export default function Edit({
[],
);

const cutoff = new Date();
cutoff.setMonth(cutoff.getMonth() - 3);

// TODO: Pass template and allowed blocks from PHP so they can be filtered.
const MY_TEMPLATE = [
['wp-newsletter-builder/post-featured-image', {}],
Expand Down Expand Up @@ -121,11 +117,9 @@ export default function Edit({
onUpdate={handleSelect}
allowedTypes={allowedPostTypes}
onReset={() => handleSelect(0)}
params={{ after: cutoff.toISOString(), per_page: 20 }}
params={{ per_page: 20 }}
title={__('Please select a post', 'wp-newsletter-builder')}
value={postId}
// @ts-ignore
searchRender={PostPickerResult}
/>
</div>
) : null}
Expand Down
4 changes: 4 additions & 0 deletions blocks/post/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,8 @@
table {
width: 100%;
}

li {
font-size: 16px;
}
}
1 change: 0 additions & 1 deletion components/postPickerResult/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.alley-scripts-post-picker__post-list .alley-scripts-post-picker__post {
height: auto;
padding: 0 5px 0 0;
width: 99%;
}

.nb-post-picker-result {
Expand Down
2 changes: 1 addition & 1 deletion plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Newsletter Builder
* Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
* Description: Interface to manage email newsletters
* Version: 0.3.12
* Version: 0.3.13
* Author: Alley Interactive
* Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
* Requires at least: 6.2
Expand Down
3 changes: 2 additions & 1 deletion scss/core-blocks/list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
li {
font-family: Geogria, serif;
font-family: Georgia, serif;
font-size: 16px;
}
60 changes: 5 additions & 55 deletions src/class-email-types.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function register_fields(): void {
[
'name' => static::SETTINGS_KEY,
'children' => [
'uuid4' => new class() extends \Fieldmanager_Hidden {
'uuid4' => new class() extends \Fieldmanager_Hidden {
/**
* Ensure that each group has a unique ID.
*
Expand All @@ -64,14 +64,14 @@ public function presave( $value, $current_value = [] ) {
return $current_value ?: wp_generate_uuid4();
}
},
'label' => new \Fieldmanager_TextField( __( 'Label', 'wp-newsletter-builder' ) ),
'image' => new \Fieldmanager_Media(
'label' => new \Fieldmanager_TextField( __( 'Label', 'wp-newsletter-builder' ) ),
'image' => new \Fieldmanager_Media(
[
'label' => __( 'Image', 'wp-newsletter-builder' ),
'preview_size' => 'full',
]
),
'templates' => new \Fieldmanager_Checkboxes(
'templates' => new \Fieldmanager_Checkboxes(
'Checkboxes',
[
'datasource' => new \Fieldmanager_Datasource_Post(
Expand All @@ -86,62 +86,12 @@ public function presave( $value, $current_value = [] ) {
),
]
),
'from_name' => new \Fieldmanager_Select(
'from_name' => new \Fieldmanager_Select(
__( 'From Name', 'wp-newsletter-builder' ),
[
'options' => $from_names,
]
),
'safe_rtb' => new \Fieldmanager_TextArea(
[
'label' => __( 'SafeRTB Ad Tag', 'wp-newsletter-builder' ),
'sanitize' => function ( $value ) {
return $value;
},
],
),
'ad_tags' => new \Fieldmanager_Group(
[
'label' => __( 'Tags', 'wp-newsletter-builder' ),
'children' => [
'tag_code' => new \Fieldmanager_TextArea(
[
'label' => __( 'Ad Tag', 'wp-newsletter-builder' ),
'sanitize' => function ( $value ) {
return $value;
},
],
),
],
'limit' => 0,
'add_more_label' => __( 'Add another tag', 'wp-newsletter-builder' ),
]
),
'roadblock' => new \Fieldmanager_Checkbox(
[
'label' => __( 'Enable Ad Roadblock', 'wp-newsletter-builder' ),
]
),
'key_values' => new \Fieldmanager_Group(
[
'label' => __( 'Key/Value Pairs', 'wp-newsletter-builder' ),
'children' => [
'key' => new \Fieldmanager_TextField(
[
'label' => __( 'Key', 'wp-newsletter-builder' ),
]
),
'value' => new \Fieldmanager_TextField(
[
'label' => __( 'Value', 'wp-newsletter-builder' ),
]
),
],
'limit' => 0,
'add_more_label' => __( 'Add another key/value pair', 'wp-newsletter-builder' ),
'one_label_per_item' => false,
]
),
],
'limit' => 0,
'add_more_label' => __( 'Add Another Email Type', 'wp-newsletter-builder' ),
Expand Down