Skip to content

Commit

Permalink
Merge branch 'develop' into feature/vimeo-player
Browse files Browse the repository at this point in the history
  • Loading branch information
tuj authored Sep 26, 2024
2 parents a61e221 + 5b3b9de commit 2cc4e57
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:

- name: Archive screenshots
if: ${{ failure() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: cypress-screenhosts-${{ matrix.browser }}
path: cypress/screenshots
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
All notable changes to this project will be documented in this file.

## [Unreleased]

- [#157](https://github.com/os2display/display-templates/pull/157)
- Add Vimeo player template.
- [#156](https://github.com/os2display/display-templates/pull/156)
- Clarified template creation.
- [#155](https://github.com/os2display/display-templates/pull/155)
- Added single-booking layout to calendar template.
- Removed defaultProps.
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ To add a template:
* `my-template-content-example.json` - An example content.
* `my-template-schema.json` - Json Schema description of the content for the slide.

Also add one or more entries to `src/slides.js` with examples of the data required for the template.
Add one or more entries to `src/slides.js` with examples of the data required for the template.

To compile the template it is necessary to add it to the webpack setup.
Also import the template in `src/index.js` and add the template to `const renderSlide = {}` in `src/index.js`.

To compile the template it is necessary to add it to the webpack setup. This is done in `webpack.config.js`.

Add it to `const entry = {}`:

Expand Down

0 comments on commit 2cc4e57

Please sign in to comment.