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

Restrict Content: Make properties public #580

Merged
merged 39 commits into from
Nov 15, 2023
Merged

Restrict Content: Make properties public #580

merged 39 commits into from
Nov 15, 2023

Conversation

n7studios
Copy link
Contributor

@n7studios n7studios commented Nov 10, 2023 •
edited
Loading

Summary

Makes some existing class properties public, and adds resource_type and resource_id public properties, instead of passing around variables between functions.

This allows AJAX calls via the login modals to be supported in this PR.

Testing

Existing tests pass.

Checklist

@n7studios
Started work on displaying content in modal
1de158f
@n7studios
Apply styling to modal
d798598
@n7studios
Started work on AJAX actions for auth flow
349db2d
@n7studios
Merge branch 'main' into restrict-content-modal
6d31f0f
@n7studios
Load modal view depending on whether disable scripts is on/off
ff6e949
@n7studios
Revert some changes
e6e2392
@n7studios
Coding standards
c41d7ca
@n7studios
Add AJAX actions back for email auth code process
b7ce0c1
@n7studios
Include Post ID in form submissions; use Post ID for redirect
1804d73 
This provides the correct Permalink whether the form is submitted via AJAX or not (otherwise the get_url() method returns the admin-ajax.php endpoint)
@n7studios
Wrap modal content in div
fa821ff
@n7studios
Store resource type, id and Post ID in class properties
1f8fb67
@n7studios
Merge branch 'main' into restrict-content-modal
87e8f74 
# Conflicts:
#	views/frontend/restrict-content/product-code.php
#	views/frontend/restrict-content/product.php
@n7studios
Move resource ID and type to class properties; make other class prope…
c753ecc 
…rties public
@n7studios
Merge remote-tracking branch 'origin/restrict-content-output-class-re…
6cc90a3 
…factor' into restrict-content-modal

# Conflicts:
#	includes/class-convertkit-output-restrict-content.php
@n7studios
Add required attribute to input fields
44ce7a3
@n7studios
First pass at code view in modal with automatic submission
cda2315
@n7studios
Separate out storing subscriber ID and redirecting; use class’ post_i…
72333e6 
…d property instead of `$post_id`
@n7studios
Merge branch 'main' into restrict-content-output-class-refactor
607e49c
@n7studios
Merge remote-tracking branch 'origin/restrict-content-output-class-re…
62d5524 
…factor' into restrict-content-modal

# Conflicts:
#	includes/class-convertkit-output-restrict-content.php
@n7studios
First pass of complete auth flow working
af1be43
@n7studios
Coding standards
164ad41
@n7studios
Coding standards
3cdb58e
@n7studios
Correct version numbers on new class properties
843b6c2
@n7studios
Remove modal code
ed0e6ec
@n7studios
Remove modal JS
8ef061f
@n7studios n7studios self-assigned this Nov 10, 2023
@n7studios
Merge remote-tracking branch 'origin/restrict-content-output-class-re…
58187a3 
…factor' into restrict-content-modal

# Conflicts:
#	includes/class-convertkit-output-restrict-content.php
@n7studios
Remove Verify button; auto submit on 6 digit OTP entry
87e8891
@n7studios
Coding standards
f1a432a
@n7studios n7studios requested review from a team, noelherrick and corydhmiller and removed request for a team November 13, 2023 17:06
@n7studios n7studios marked this pull request as ready for review November 13, 2023 17:06
@n7studios
Don’t run JS modal code on Restrict by Tag, which doesn’t use a modal
4577510
@n7studios
Merge remote-tracking branch 'origin/restrict-content-output-class-re…
efbf1cd 
…factor' into restrict-content-modal

# Conflicts:
#	views/frontend/restrict-content/notices.php
#	views/frontend/restrict-content/product-code.php
#	views/frontend/restrict-content/product.php
#	views/frontend/restrict-content/tag.php
@n7studios n7studios merged commit 76a5649 into main Nov 15, 2023
62 checks passed
@n7studios n7studios deleted the restrict-content-output-class-refactor branch November 20, 2023 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noelherrick noelherrick noelherrick approved these changes

@corydhmiller corydhmiller Awaiting requested review from corydhmiller corydhmiller was automatically assigned from Kit/wordpress

Assignees

@n7studios n7studios

Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@n7studios @noelherrick