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

[4.4.x] Put default logo and favicon in default portal next theme #8579

Merged
merged 2 commits into from
Aug 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 1, 2024

This is an automatic copy of pull request #8572 done by Mergify.


Issue

gravitee.atlassian.net/browse/APIM-5453

Description

Put default logo and favicon in default portal next theme. The current theme will be initiated with these default value, and links to logo and favicon point to real images.


Cherry-pick of 4a3b812 has failed:

On branch mergify/bp/4.4.x/pr-8572
Your branch is up to date with 'origin/4.4.x'.

You are currently cherry-picking commit 4a3b812e11.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/theme/domain_service/DefaultThemeDomainService.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/theme/domain_service/ThemePortalNextAssetsDomainService.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/infra/domain_service/theme/ThemePortalNextAssetsDomainServiceImpl.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/inmemory/ThemePortalNextAssetsDomainServiceInMemory.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/theme/domain_service/DefaultThemeDomainServiceTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/theme/use_case/GetCurrentThemeUseCaseTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/theme/use_case/GetDefaultThemeUseCaseTest.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/infra/domain_service/theme/ThemePortalNextAssetsDomainServiceImplTest.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-standalone/gravitee-apim-rest-api-standalone-distribution/src/main/resources/themes/next/favicon.png
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-standalone/gravitee-apim-rest-api-standalone-distribution/src/main/resources/themes/next/logo.png

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/inmemory/spring/InMemoryConfiguration.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


📚  View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner August 1, 2024 16:06
@mergify mergify bot added the conflicts label Aug 1, 2024
@mergify mergify bot assigned phiz71 Aug 1, 2024
Copy link
Contributor Author

mergify bot commented Aug 1, 2024

Cherry-pick of 4a3b812 has failed:

On branch mergify/bp/4.4.x/pr-8572
Your branch is up to date with 'origin/4.4.x'.

You are currently cherry-picking commit 4a3b812e11.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/theme/domain_service/DefaultThemeDomainService.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/theme/domain_service/ThemePortalNextAssetsDomainService.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/infra/domain_service/theme/ThemePortalNextAssetsDomainServiceImpl.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/inmemory/ThemePortalNextAssetsDomainServiceInMemory.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/theme/domain_service/DefaultThemeDomainServiceTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/theme/use_case/GetCurrentThemeUseCaseTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/theme/use_case/GetDefaultThemeUseCaseTest.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/infra/domain_service/theme/ThemePortalNextAssetsDomainServiceImplTest.java
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-standalone/gravitee-apim-rest-api-standalone-distribution/src/main/resources/themes/next/favicon.png
	new file:   gravitee-apim-rest-api/gravitee-apim-rest-api-standalone/gravitee-apim-rest-api-standalone-distribution/src/main/resources/themes/next/logo.png

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/inmemory/spring/InMemoryConfiguration.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

gravitee.atlassian.net/browse/APIM-5453

(cherry picked from commit 4a3b812)
@phiz71 phiz71 force-pushed the mergify/bp/4.4.x/pr-8572 branch from 3db21ba to 005d25c Compare August 1, 2024 16:09
@phiz71 phiz71 removed the conflicts label Aug 1, 2024
@phiz71 phiz71 enabled auto-merge (rebase) August 1, 2024 16:10
@phiz71 phiz71 force-pushed the mergify/bp/4.4.x/pr-8572 branch from 005d25c to a00ff74 Compare August 1, 2024 16:26
@phiz71 phiz71 merged commit b7ab373 into 4.4.x Aug 1, 2024
18 of 19 checks passed
@phiz71 phiz71 deleted the mergify/bp/4.4.x/pr-8572 branch August 1, 2024 16:43
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.

1 participant