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 Sessions and Sponsor blocks, and required shared components #33

Closed
wants to merge 103 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
c042cae
Scaffold the Sessions block
coreymckrill Feb 18, 2019
764f850
Add schema, options, and PHP query functions for frontend rendering
coreymckrill Feb 20, 2019
295e3ee
Scaffold block controls & content, abstract some repeated code
coreymckrill Feb 21, 2019
9d58d75
Make the external data from `window.WordCampBlocks` a prop in Edit
coreymckrill Feb 21, 2019
c92afe2
Simplify the block mode values
coreymckrill Feb 21, 2019
d5718e2
WIP: Building the PHP frontend template
coreymckrill Feb 22, 2019
e7d6363
Load the shared include file
coreymckrill Feb 22, 2019
806b20c
PHPCS cleanup
coreymckrill Feb 22, 2019
c4aecdd
Don't render when a mode hasn't been set
coreymckrill Feb 22, 2019
e3a419e
Finish first draft of PHP front end template
coreymckrill Feb 22, 2019
4cb4913
Speakers: Don't render when a mode hasn't been set
coreymckrill Feb 22, 2019
b4a3b41
Add boolean option for date filtering
coreymckrill Feb 22, 2019
4645995
Fill out Inspector Controls... except image stuff
coreymckrill Feb 22, 2019
511dfda
Fix typo
coreymckrill Feb 23, 2019
fade121
WIP: Almost working Sessions block :D
coreymckrill Feb 23, 2019
624e1c9
Fix data parsing error in SessionsSelect
coreymckrill Feb 25, 2019
df72139
Session post type: Add excerpt support, tweak date_time REST field
coreymckrill Feb 26, 2019
d74d23b
Translation tweaks
coreymckrill Feb 26, 2019
f04f195
Sessions block with slightly functional content rendering
coreymckrill Feb 26, 2019
2ec37b1
WIP
vedanshujain Feb 25, 2019
5bbff17
WIP: Sponsors rendering plus added a Image block in shared
vedanshujain Feb 26, 2019
b771e48
WIP
vedanshujain Feb 26, 2019
21a9146
WIP: Added sponsor dropdown
vedanshujain Feb 27, 2019
b5089fb
Sponsor Block: Add custom select component which we will maybe later …
vedanshujain Mar 1, 2019
bd05d83
WIP on featured image component + added icon etc on sponsor list
vedanshujain Mar 1, 2019
cf23a7f
WIP: Working select button.
vedanshujain Mar 1, 2019
e7c2790
WIP: Featured image component. This is still work in progress and is …
vedanshujain Mar 1, 2019
1c7e242
Sessions: Fix non existant property error
coreymckrill Mar 1, 2019
bbe3ce8
Add functions to avoid stringifying HTML in translations with tokens
coreymckrill Mar 2, 2019
a37e18d
Blocks: Bug fixes and implementation in FeaturedImage component
vedanshujain Mar 4, 2019
9c3153d
WIP: Continued work on sponsor block
vedanshujain Mar 4, 2019
db88a0f
Continued work on sponsors.php
vedanshujain Mar 4, 2019
2efdf5a
Update public_html/wp-content/mu-plugins/blocks/assets/src/sponsors/b…
coreymckrill Mar 5, 2019
553244a
Contd work on sponsor block.
vedanshujain Mar 5, 2019
06fc053
Sessions: Change session_time label, make it default sort option
coreymckrill Mar 5, 2019
d28e469
Sessions: Fix sorting by Day & Time
coreymckrill Mar 5, 2019
bb62f7f
Shared: Add missing module import
coreymckrill Mar 5, 2019
812dc96
Sessions: Fix return value of placeholder loading parameter
coreymckrill Mar 5, 2019
6a38b5b
Sessions: Fix date filter
coreymckrill Mar 5, 2019
671246c
Sponsors: Preset values for block content
vedanshujain Mar 6, 2019
30a051e
Sponsors: Prefill selected options in select box
vedanshujain Mar 6, 2019
027defd
Sponsors: Fix bug in select all button
vedanshujain Mar 6, 2019
0526bed
Sponsors: Added and implemented multiple config settings
vedanshujain Mar 6, 2019
678f2cb
Sessions: Update some markup classes
coreymckrill Mar 7, 2019
c11a43d
Move translation helpers to separate i18n component
coreymckrill Mar 7, 2019
c3673c4
Sessions: Move tite and content blobs to shared components
coreymckrill Mar 7, 2019
6d96a33
Add styles for shared block content components
coreymckrill Mar 7, 2019
2d11949
ItemTitle: Fix variable tag
coreymckrill Mar 7, 2019
c1cff6f
I18n: Only match string tokens
coreymckrill Mar 7, 2019
833afc1
Sessions: Remove filter by date
coreymckrill Mar 7, 2019
ef47227
Block Controls: Add placeholder class names and some styles
coreymckrill Mar 7, 2019
57099d5
Sponsors: Added default and some styling
vedanshujain Mar 7, 2019
5abb29f
Sponsors: Working on front side view
vedanshujain Mar 7, 2019
7cdd473
Sponsors: Also start storing featured image urls
vedanshujain Mar 7, 2019
66fdae5
Sponsors: Multiple fixes + layout settings
vedanshujain Mar 7, 2019
0b53d83
Sponsor: Minor fixes for block
vedanshujain Mar 7, 2019
4c02534
Sponsors: Cache sponsor and sponsor level in componentWillMount preve…
vedanshujain Mar 8, 2019
417c356
Speakers: Use ItemTitle and ItemHTMLContent in block content
coreymckrill Mar 8, 2019
1d18b8b
Speakers: Pull speakers session markup out into separate component
coreymckrill Mar 8, 2019
4185247
Remove unused dependencies
coreymckrill Mar 8, 2019
076fc77
Speakers: Remove clearfix style, since it now lives in shared component
coreymckrill Mar 8, 2019
476cfca
Update classes in Speakers and Sessions
coreymckrill Mar 8, 2019
3820a7e
Speakers: Remove list/grid styles, since they are now in a shared com…
coreymckrill Mar 8, 2019
bad2798
Add new shared component ItemSelect
coreymckrill Mar 8, 2019
6501400
Sessions: Refactor SessionsSelect to use ItemSelect component
coreymckrill Mar 8, 2019
b2998a2
Sessions: Add missing depedency
coreymckrill Mar 8, 2019
c50cb5d
ItemSelect: Ensure null value isn't sent to onChange
coreymckrill Mar 8, 2019
ab3e3f0
Speakers: More refactor
coreymckrill Mar 8, 2019
435d180
Speakers: Remove edit styles, they're all in shared components now
coreymckrill Mar 8, 2019
8ace484
ItemSelect: Abstract most of the onChange callback
coreymckrill Mar 8, 2019
3e92674
Linting fixes
coreymckrill Mar 9, 2019
d6c45af
Sponsor: Refactor to use common item-select componentt
vedanshujain Mar 11, 2019
636fd93
Shared component for grid layout
vedanshujain Mar 11, 2019
0947430
Refactor sponsor block to use shared GirdLayoutComponent
vedanshujain Mar 11, 2019
7fe62b5
Blocks: Refactor sponsor to use other grid components as well
vedanshujain Mar 12, 2019
cc858ad
Blocks: Added shared backend for grid-layout and refactored sponsor b…
vedanshujain Mar 12, 2019
a2748ff
Blocks: Added shared featured-image render function and refactor spon…
vedanshujain Mar 12, 2019
e5eacd2
Blocks: Add featured image inspector control with many pre-defined sizes
vedanshujain Mar 12, 2019
489e680
Blocks: Use generic ItemTitle and ItemHTMLContent in sponsors block
vedanshujain Mar 13, 2019
e931154
Sponsors: WIP - Sorting for sponsor posts
vedanshujain Mar 13, 2019
52a8d83
Sponsor Block: Added support for sorting by sponsor levels
vedanshujain Mar 14, 2019
8f69ca1
WordCamp Blocks: Bump `scripts` to fix downstream vulnerabilties.
iandunn Mar 14, 2019
8ac7827
WordCamp Blocks: Remove unused `dompurify` dependency.
iandunn Mar 14, 2019
ee82912
Merge branch 'master' into feature/additional-blocks
iandunn Mar 14, 2019
203670e
Sponsors: Add count to sponsor level select option
vedanshujain Mar 15, 2019
906a53e
Session: Added support for Grid layout
vedanshujain Mar 15, 2019
cb04247
Sessions: Added featured image support to Sesisons block
vedanshujain Mar 15, 2019
2e72088
WordCamp Blocks: Don't pass `props` to `super()` unnecessarily.
iandunn Mar 15, 2019
f2751a5
WordCamp Blocks: Apply coding standards.
iandunn Mar 15, 2019
6560472
WordCamp Blocks: Add Organizers block definition [WIP].
iandunn Mar 19, 2019
71a5e7a
WordCamp Blocks: Set default heading at init to improve readability.
iandunn Mar 19, 2019
f2d9d4a
WordCamp Blocks: Run `build` in `production` mode to optimize size.
iandunn Mar 19, 2019
86fa3ca
WordCamp Blocks: Enable source maps to aid in troubleshooting.
iandunn Mar 19, 2019
101f876
WordCamp Post Types: Include avatars in speaker endpoint for consistency
iandunn Mar 20, 2019
80ed867
WordCamp Post Types: Add avatar URLs to Organizers endpoint.
iandunn Mar 20, 2019
1461fb1
Featured Image: Removed height configg
vedanshujain Mar 20, 2019
c04888c
WordCamp Post Types: Add `excerpt` for Organizers block.
iandunn Mar 20, 2019
d495e31
WordCamp Post Types: Show Organizer Teams in REST API for blocks.
iandunn Mar 20, 2019
33a51e9
WordCamp Blocks: Return early when no option selected to avoid error.
iandunn Mar 21, 2019
5ed3b1d
Sessions: Escape additional outputs in frontend template
coreymckrill Mar 22, 2019
b15755f
Shared: Remove VersatileSelect component
coreymckrill Mar 22, 2019
3347b32
FeaturedImage: Fix TypeError from missing `attributes`
coreymckrill Mar 22, 2019
c18f94a
Speakers: Fix issues with SpeakerSessions component
coreymckrill Mar 22, 2019
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
Original file line number Diff line number Diff line change
@@ -47,24 +47,28 @@ function SpeakerSessions( { speaker, tracks } ) {
{ decodeEntities( session.title.rendered.trim() ) || __( '(Untitled)', 'wordcamporg' ) }
</a>
<span className="wordcamp-speaker-session-info">
{ session.session_track.length &&
{ ( session.session_track.length && Array.isArray( tracks ) ) &&
arrayTokenReplace(
/* translators: 1: A date; 2: A time; 3: A location; */
tokenSplit( __( '%1$s at %2$s in %3$s', 'wordcamporg' ) ),
decodeEntities( session.session_date_time.date ),
decodeEntities( session.session_date_time.time ),
get( tracks.find( ( value ) => {
const [ firstTrackId ] = session.session_track;
return parseInt( value.id ) === firstTrackId;
} ), 'name' )
[
decodeEntities( session.session_date_time.date ),
decodeEntities( session.session_date_time.time ),
get( tracks.find( ( value ) => {
const [ firstTrackId ] = session.session_track;
return parseInt( value.id ) === firstTrackId;
} ), 'name' ),
]
)
}
{ ! session.session_track.length &&
{ ( ! session.session_track.length || ! Array.isArray( tracks ) ) &&
arrayTokenReplace(
/* translators: 1: A date; 2: A time; */
tokenSplit( __( '%1$s at %2$s', 'wordcamporg' ), ),
decodeEntities( session.session_date_time.date ),
decodeEntities( session.session_date_time.time )
[
decodeEntities( session.session_date_time.date ),
decodeEntities( session.session_date_time.time ),
]
)
}
</span>