Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: scratchfoundation/scratch-gui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: RaspberryPiFoundation/scratch-gui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: code-club-world
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 11 files changed
  • 4 contributors

Commits on Aug 23, 2021

  1. Allow MenuBar to be hidden

    The MenuBar is quite specific to the canonical version of the online
    Scratch editor [1]. We want to make use of the scratch-gui package
    without displaying the MenuBar.
    
    Since the height of the menu bar is hard-coded as a CSS variable, I've
    had to override the height calculation for the body wrapper when the
    menu bar is not visible. Ideally the height of the menu bar wouldn't be
    hard-coded and this wouldn't be necessary.
    
    [1]: https://scratch.mit.edu/projects/editor
    floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    539e54a View commit details
    Browse the repository at this point in the history
  2. Configure CircleCI builds to deploy code-club-world branch to GH Pages

    This is specific to the RPF CodeClubWorld app and should not be merged
    into the main "develop" branch or pushed to the upstream repo.
    
    I don't think we need the deploy-npm or push-translations workflows.
    
    The `npm run deploy -- -e $CIRCLE_BRANCH` step in the deploy-gh-pages
    job appears to make use of the gh-pages `-e` option [1] to publish the
    changes to the gh-pages branch within a sub-directory named after the
    current branch. I've retained this functionality given that it may well
    be useful if we want to try out changes without affecting production.
    
    [1]: scratchfoundation/gh-pages@e0dd4ea#diff-558572b6f7bd7068bbbd3db502651a5a313bfc3901d72eb2995833592e4434edR30
    floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    adc052a View commit details
    Browse the repository at this point in the history
  3. Add deploy key with write access to repo for deploying to GH Pages

    I followed these instructions [1] to create the key and add it to GitHub
    and CircleCI.
    
    [1]: https://circleci.com/docs/2.0/gh-bb-integration/#creating-a-github-deploy-key
    floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    94f268e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ff77f18 View commit details
    Browse the repository at this point in the history
  5. Export saveProjectToServer & add support for extra HTTP headers

    I want to be able to send an X-CSRF-Token HTTP header when sending a
    POST or PUT request to create or update the project.
    
    * Exporting saveProjectToServer means that I can set the
    onUpdateProjectData property to a function which wraps
    saveProjectToServer.
    
    * Adding the optional headers parameter to the saveProjectToServer
    function means that the wrapping function can pass in extra HTTP headers
    to be sent in any request.
    floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    97f7c9e View commit details
    Browse the repository at this point in the history
  6. Publish scoped package on successful builds

    This reinstates the deploy-npm CircleCI job and tweaks it slightly:
    
    * Scope the package name by organisation. This ties the package to the
    RPF organisation rather than just to my user and means that, for
    example, any member of the organisation can publish the package.
    
    * Only publish package on successful builds of the code-club-world
    branch.
    
    * Use organisation-specific release version and git tag to avoid
    confusion with versions in the canonical package and tags in upstream
    repo.
    
    * Always publish using "latest" npm tag; not "hotfix" or "stable".
    
    * Add `--access public` option to `npm publish` command, because scoped
    packages only allow "restricted" access by default.
    
    * I've added the access token from my npmjs.org account as the NPM_TOKEN
    env var in the CircleCI project settings.
    
    * Add ssh key fingerprint to allow `git push`.
    floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    5a82c84 View commit details
    Browse the repository at this point in the history
  7. Change homepage & repo metadata for forked package

    These are used by npmjs.org to display links on the package page. Since
    this is a public package I think it's sensible to point at our fork of
    the canonical repo.
    floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    7cef984 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2bb6725 View commit details
    Browse the repository at this point in the history
  9. Fix prop type validation warning in SpriteSelectorItem

    In ./src/containers/costume-tab.jsx:271 the SpriteSelctorItem
    `dragPayload` prop is set to be an object. To supress the prop type
    warning, I've added `propTypes.object` to the array of allowed types.
    chrislo authored and floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    fa974ec View commit details
    Browse the repository at this point in the history
  10. Fix proptype validation warning in SpriteList

    We've seen a PropType warning for this prop in development. It seems
    that when the SpriteList component is used to manage the costumes in
    the left hand side of the Costumes tab, numeric identifiers are used
    for `sprite`. When the SpriteList is used in the sprite selection area
    under the stage, strings are used. There's probably a way of fixing
    this at source, but for now being a bit more permissive with the
    validation removes the warning. As far as I can tell from reading the
    source, we use this id for comparison with the `===` operator, so I
    think numbers or strings are functionally equivalent.
    chrislo authored and floehopper committed Aug 23, 2021
    Configuration menu
    Copy the full SHA
    bba18ce View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Bump color shade

    Magdalena Jadach committed May 19, 2023
    Configuration menu
    Copy the full SHA
    3baff16 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Merge pull request #4 from RaspberryPiFoundation/tweak-color-block

    Bump color shade
    MagdalenaJadach authored May 22, 2023
    Configuration menu
    Copy the full SHA
    f088086 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Fix nav images alt

    Magdalena Jadach committed May 30, 2023
    Configuration menu
    Copy the full SHA
    5e2d980 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. fix(gui.jsx): linting

    Scott committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    c5b8727 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #5 from RaspberryPiFoundation/alt-images

    Fix nav images alt
    MagdalenaJadach authored Jun 6, 2023
    Configuration menu
    Copy the full SHA
    8c1fa78 View commit details
    Browse the repository at this point in the history
Loading