Merge main into next #297
Open
Merge main into next #297
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
vivid-planet-bot
force-pushed
the
merge-main-into-next
branch
from
cea5f4f to
dd81c1e
Compare
This reverts commit 75edb77.
…not meant to be linted (#390) Demo implementation: vivid-planet/comet#2600
Refactor typography component to export only the styled component instead of the react function component. This allows to use the component with other styled components.
Changes on `main` after running the install.sh script. Possibly a remnant from #386.
Demo implementation: vivid-planet/comet#2595 and vivid-planet/comet#2617
<!-- PLEASE MAKE SURE TO KEEP THE PR SIZE AT A MINIMUM! Smaller PRs are easier to review and tend to get merged faster. Unrelated changes, refactorings, fixes etc. should be made in separate PRs. ---> ## Description Add deployment based on [DigitalOcean's app platform](https://www.digitalocean.com/products/app-platform). The apps are split per domain to be compatible with routing from the app platform. The preview does not work yet, as I'm waiting for vivid-planet/comet#2554. I decided to not commit the symlinks and copy the files instead to keep the required changes minimal. The secrets are [safe](https://docs.digitalocean.com/products/app-platform/how-to/use-environment-variables/) inside the repo as they are encrypted. This does not include a secondary site, but could be added later. <!-- The description should describe the change you're making. It will be used as the commit message for the squashed commit once the PR gets merged. Therefore, make sure to keep the description up-to-date as the PR changes. PLEASE DESCRIBE WHY YOU'RE MAKING THE CHANGE, NOT WHAT YOU'RE CHANGING. Reviewers see what you're changing when reviewing the code. However, they might not understand your motives as to why you're making the change. Your description should include: - The problem you're facing - Your solution to the problem - An example usage of your change ---> <!-- Everything below this is intended to help ease reviewing this PR. Remove all unrelated sections. WHEN MERGING THE PR, REMOVE THIS FROM THE COMMIT MESSAGE. --> ## Screenshots/screencasts <!-- When making a visual change, please provide either screenshots or screencasts. Hint: For before/after views, you can use a table: | Before | After | | -------- | ------- | | Link | Link | --> ## Related tasks and documents <!-- Link to related tasks and documents, for instance, https://vivid-planet.atlassian.net/browse/COM-XXX. MAKE SURE THAT EVERYTHING REQUIRED TO UNDERSTAND YOUR CHANGE IS IN THE PR DESCRIPTION. Reviewers shouldn't need to review tasks, JIRA conversations etc. to understand what you're doing. --> ## Open TODOs/questions (Future PR) - [ ] Remove dependency to dkarnutsch/oauth2-proxy (no really trustworthy image from Docker Hub found and GitHub registry does not work yet on DigitalOcean) - [ ] Replace domains with starter.comet-dxp.com and admin.starter.comet-dxp.com - [ ] Add CI/CD based on GitHub Actions ## Further information <!-- Further information that helps reviewing the PR, for instance: - Alternative solutions you have considered - Dependent PRs - Links to relevant documentation, blog posts etc. -->
Add mobile header styling according to Comet Starter Figma design.
Spell check all files with CSpell. Should prevent typos, which can be cumbersome for both parties during code review.
Links in the mobile header were highlighted (touched) when starting to scroll on the link. We fix this by removing the link highlighting on small devices.
Motivation: Keep package.json as slim as possible.
If a environment variable was already defined in `.env`, a different value in `.env.secrets` or `.env.local` wouldn't overwrite the value. Changing the order of the dotenv files resolves the issue.
Co-authored-by: Stefanie Kaltenhauser <[email protected]>
Currently, there is a layout file for the site and a layout file for the block preview in the project. These partially contain the same content, for example both of them define the html and body tags. To avoid code duplication, a root layout is created at the top-most level of the app directory. The existing layouts are used as child layouts of this one. This way, fonts and similar resources no longer need to be imported twice. Co-authored-by: Stefanie Kaltenhauser <[email protected]>
Adds a custom cache handler for caching in Redis based on vivid-planet/comet#2596 (and vivid-planet/comet#2634). Co-authored-by: Franz Unger <[email protected]>
To ensure that the font is loaded in the block preview and in the site a default font is imported in the `RootLayout`. This also simplifies the use of other fonts in the project, as the default font only needs to be replaced: To use a different font, the import in the `RootLayout` ``` import "@fontsource/roboto"; import "@fontsource/roboto/700.css"; ``` and the specification of the `fontFamily` in the `theme` ``` fontFamily: "Roboto, sans-serif", ``` must be adjusted. Co-authored-by: Stefanie Kaltenhauser <[email protected]>
Co-authored-by: Johannes Obermair <[email protected]> Co-authored-by: Johannes Obermair <[email protected]> Co-authored-by: Sebastian <[email protected]> Co-authored-by: SebiVPS <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Thomas Dax <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
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.
This is an automated pull request to merge changes from
mainintonext.