[Spritelab] Make instructions icon configurable #41772
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
apps/src/p5lab/P5Lab.js
Outdated
Comment on lines
216
to
220
| const avatar = config.level.instructionsIcon || 'avatar'; | ||
| this.skin.smallStaticAvatar = `${MEDIA_URL}${avatar}.png`; | ||
| this.skin.staticAvatar = `${MEDIA_URL}${avatar}.png`; | ||
| this.skin.winAvatar = `${MEDIA_URL}${avatar}.png`; | ||
| this.skin.failureAvatar = `${MEDIA_URL}${avatar}.png`; |
There was a problem hiding this comment.
nit: i think this would be more readable if we set ${MEDIA_URL}${avatar}.png to a variable and reused that. something like
const avatarUrl = `${MEDIA_URL}${config.level.instructionsIcon || 'avatar'}.png`
this.skin.smallStaticAvatar = avatarUrl;
// set other avatar skins| @@ -13,7 +13,26 @@ | |||
| %div{ style: 'background-color: rgb(239, 239, 239); padding-top: 12px' } | |||
| ~ f.text_area :long_instructions, rows: 4 | |||
|
|
|||
| - if @level.is_a? GamelabJr | |||
| = f.label :instructions_icon,'Instructions Icon' | |||
| %p Please refer to #{link_to 'Sprite Lab Static Assets', 'https://github.com/code-dot-org/code-dot-org/tree/staging/apps/static/spritelab'} for available assets, then enter the name of the image to use as the instructions icon for this level. | |||
There was a problem hiding this comment.
not sure how likely this is, but we could run into a situation where the assets listed in apps/static/spritelab/ on the staging branch aren't available on levelbuilder yet. we could point this URL to the production (or levelbuilder) branch instead of staging?
Comment on lines
26
to
31
| var iconName = $('#level_instructions_icon')[0].value; | ||
| if (iconName) { | ||
| $('.instructions-icon-preview').attr('src', 'https://studio.code.org/blockly/media/spritelab/' + iconName + '.png'); | ||
| } else { | ||
| $('.instructions-icon-preview').attr('src', 'https://studio.code.org/blockly/media/spritelab/avatar.png'); | ||
| } |
There was a problem hiding this comment.
nit: i think this would be more readable if we set a fallback for iconName, which is essentially what we're doing below, but would allow us to set the src attribute once
var iconName = $('#level_instructions_icon')[0].value || 'avatar';
$('.instructions-icon-preview').attr('src', 'https://studio.code.org/blockly/media/spritelab/' + iconName + '.png');
maddiedierker
approved these changes
Jul 28, 2021
This was referenced Jul 28, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make the instructions icon configurable per level. This will only work for assets in https://github.com/code-dot-org/code-dot-org/tree/staging/apps/static/spritelab but it's easy enough to add new assets there as needed. Having all the assets served from there seems preferable over using any URL for two reasons:
Edit page:
Before (always turtle)
After (configurable per level)
Links
jira
Testing story
Deployment strategy
Follow-up work
Privacy
Security
Caching
PR Checklist: