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

Use Sprig/Twig for Templating #9

Merged
merged 62 commits into from
Dec 7, 2018
Merged

Use Sprig/Twig for Templating #9

merged 62 commits into from
Dec 7, 2018

Conversation

kingkool68
Copy link
Owner

@kingkool68 kingkool68 commented Nov 6, 2018 •
edited
Loading

This pull request switches all HTML rendering to Twig via the Sprig for WordPress. Now there is a clearer separation between PHP and HTML.

Other Fixes

  • Took the time to add docblocks and clean up some unused code
  • Instead of calling instances of classes I switched to calling static methods instead
  • Post galleries work again and are snappy thanks to some smart JavaScript

Todo

  • Turn rsvp.php into a class
  • Cleanup class-daddio-instagram-locations.php
  • Cleanup class-daddio-instagram.php
  • Cleanup class-daddio-media.php (Handle helper functions)
  • Cleanup class-daddio-on-this-day.php
  • Cleanup class-daddio-post-galleries.php (Also figure out why it doesn't work anymore)
  • Cleanup actions for gallery. Instead just call the methods directly and reduce number of custom actions.
  • Daddio_Menus::action_daddio_footer() needs Twig
  • Refactor action_daddio_footer
  • Refactor action_daddio_before_content
  • Clean up 404-date-archive.php
  • Clean up 404-age-archive.php
  • Clean up archives.php
  • Clean up content-on-this-day-switch-date-form.php

@kingkool68
Move debugging functions to their own file.
b8e8767
@kingkool68
Remove dumb comment.
82959bb
@kingkool68
Move logic for getting CSS and JS suffix based on the environment to …
3cad5fd 
…their own methods

Now this can be reused for other scripts and styles registered in other classes. Yay for better modularizing.
@kingkool68
Add Daddio Helpers for helping functions.
408d7e8
@kingkool68
Create a base template
8825926
@kingkool68
Hook into wp_head to add extra <head> markup
ff18f4d 
We need some dynamic values so this is the only way we can pass dynamic values into a Twig template and still have it appear as part of base.twig.
@kingkool68
Add a pagination class.
8302171
@kingkool68
Making the loop work with Twig.
6682caf 
aka Sprig.
@kingkool68
Remove the Monster Insights Dashboard widget.
8cdd84a
@kingkool68
Rename things to conform with how other classes are setup and named.
5fe6830
@kingkool68
Docs blocks.
06ca379
@kingkool68
Add docblocks
902e54c
@kingkool68
Also filter get_the_time() which is used more now that I'm using Sp…
180e7ba 
…rig.
@kingkool68
Switch to static methods instead of using these weird helper functions.
863c5eb
@kingkool68
in to --> into
b5014fd
@kingkool68
Add docblock.
90aafa4
@kingkool68
Add docblocks.
f76ec2a
@kingkool68
Align array items.
1321d55
@kingkool68
Rename to conform with other class methods.
af3acf5
@kingkool68
Add docblocks.
16d1c33
@kingkool68
Cleanup docblocks.
be1c7f5
@kingkool68
Fix method name and add dock blocks for hooks and filters.
e187cbb
@kingkool68
Add docblocks to Instagram Location class.
326a22a 
Also convert one render method to use Sprig/Twig.
@kingkool68
Add docblocks.
2355e97
@kingkool68
Twigify and document On This Day functionality.
96bf361
@kingkool68
Remove the_instagram_media() function and replace it with a static me…
be03da4 
…thod instead.
@kingkool68
Just use the handy dandy __return_empty_array function.
484f358
@kingkool68
Spacing and alignment.
cc03012
@kingkool68
Move Daddio Get Attachment Link to the Post Galleries class where it …
3ec27e0 
…is used.
@kingkool68
Move the SVG icons function to the menu class where it is used.
c1fb5bf
@kingkool68
Alignment.
b67da62
@kingkool68
Formatting comment.
6b2bdfd
@kingkool68
Spacing.
0f0cd57
@kingkool68
Move post-gallery JavaScript registration and enqueing to the post-ga…
0c27ed2 
…llery class.

Also renamed `Daddio_Scripts_Styles` class to match the file name.
@kingkool68
Twigify attachment pages.
a768780
@kingkool68
Get rid of the global helper function.
65904a2 
Just use static methods instead.
@kingkool68
Adding in missing actions.
e2ecd79
@kingkool68
Typo.
8bd2c49
@kingkool68
Doc blocks and general clean up.
0c25417
@kingkool68
Finished adding docblocks.
9b56891
@kingkool68
Remove actions and instead call methods directly for different templa…
f8414ff 
…te parts.

Less abstract, just as effective, simpler.
@kingkool68
Remove daddio_content_header action.
de28738 
Nothing was using it.
@kingkool68
Remove daddio_content_footer action.
49c4055 
Nothing was using it.
@kingkool68
Aligning array items.
32643cc
@kingkool68
Remove old instagram-subscription template for use with the Instagram…
38cb43a 
… API that we don't use anymore.
@kingkool68
Don't need the old gulp file anymore.
69c54d3
@kingkool68
Output the more menu directly and ditch the custom daddio_footer ac…
418ebbe 
…tion
@kingkool68
No need for the daddio_before_content action.
eb29136 
We can just output what we need directly.
@kingkool68
Twigify the archives template.
b838cff
@kingkool68
Align array items.
ef00411
@kingkool68
If the header is empty return an empty string.
a014f70 
Prevents showing a count with no heading. Without this the homepage looks weird.
@kingkool68
Prevent a PHP warning about accessing a non-existent object.
b758e99
@kingkool68
Twigify 404-date-archive.php
a828229
@kingkool68
Twigify 404-age-archive.php
5a9a610
@kingkool68
Reorder methods to match action and filter order.
b79b49b 
Also need to register the on-this-day script on init so it can be called on the wp_enqueue_scripts action.
@kingkool68
Turns out we don't need this file anymore.
4ebb686 
`Daddio_On_This_Day::get_switch_date_form()` does the trick.
@kingkool68 kingkool68 changed the title [WIP] Use Sprig/Twig for Templating Use Sprig/Twig for Templating Dec 7, 2018
@kingkool68 kingkool68 merged commit f46912e into master Dec 7, 2018
@kingkool68 kingkool68 deleted the use-twig-for-templates branch December 7, 2018 04:00
@kingkool68 kingkool68 restored the use-twig-for-templates branch December 7, 2018 04:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@kingkool68