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

feat: Dynamically Link back to the Goose homepage from the extensions site #953

Merged

Conversation

nick-w-nick
Copy link
Contributor

I noticed that if you're on the extensions site homepage and click the goose icon in the top left corner, it doesn't go anywhere. That's because it's meant to be clicked while on an extensions detail page so it takes you back to the main extensions page.

This has a downside due to this link being hardcoded to "/", and since the extensions site and the main site are separate projects, the extensions site treats the "/" path (its' homepage) as the root instead of the actual goose homepage.

To get the best of both worlds, I've made it so that if you're on an extension detail page, the goose icon will still redirect you back to the extension site homepage, but if you click the icon while you're on the extension home page, it will redirect you back to the main goose site, as you would normally expect since they are on the same domain.

@nick-w-nick nick-w-nick changed the title Dynamically Link back to the Goose homepage from the extensions site feat: Dynamically Link back to the Goose homepage from the extensions site Jan 30, 2025
Copy link
Collaborator

@lily-de lily-de left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi!

Thank you for your contribution! Before we can proceed with merging your pull request, it needs to be updated with the latest changes from the main branch to ensure compatibility and ease of integration. Here are the steps you can follow to update your branch:

  1. Ensure Your Local Main Branch is Up to Date:
    First, make sure you have the latest changes from the main repository:

    git checkout main
    git pull upstream main

    Replace upstream with the remote name of the main repository if you've used a different one.

  2. Checkout Your PR Branch:
    Switch back to your branch associated with the pull request:

    git checkout [your-branch-name]
  3. Merge or Rebase Main into Your Branch:
    You can either merge the main branch into your PR branch to maintain the history, or rebase for a cleaner commit history. Here’s how you can do both:

    • Merge:

      git merge main

      This command will bring your branch up to date with the main branch while preserving the history of changes.

    • Rebase:

      git rebase main

      Rebasing will linearize your commit history based on the main branch. If you encounter conflicts during rebase, you’ll need to resolve them and then continue the rebase with git rebase --continue.

  4. Push the Updated Branch:
    After merging or rebasing, push your branch to update the pull request:

    git push origin [your-branch-name] --force

    Use the --force flag if you've performed a rebase or otherwise rewritten the history.

Once you've updated your branch, please let me know by commenting on the pull request, and I'll take another look.

Thank you!

@nick-w-nick
Copy link
Contributor Author

@lily-de The branch has been updated with the latest changes from main.

Let me know if you need any additional changes.

Thanks!

@lily-de lily-de merged commit 01aeeaf into block:main Feb 11, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants