Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix: Fix Appsmith logo in emails (#20030)

Browse Source 
SVG images don't load correctly in emails, so we're switching back to PNG.

Co-authored-by: Pawan Kumar <pawan.stardust@gmail.com>
This commit is contained in:
Shrikant Sharat Kandula 2023-01-26 14:13:24 +05:30 committed by GitHub
parent 6f6711856f
commit 0aa97324bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/ce/reducers/tenantReducer.ts
View File

@ -18,7 +18,7 @@ export const defaultBrandingConfig = {
brandColors: {
...createBrandColorsFromPrimaryColor("#F86A2B"),
},
brandLogoUrl: "https://assets.appsmith.com/appsmith-logo.svg",
brandLogoUrl: "https://assets.appsmith.com/appsmith-logo-no-margin.png",
};
export const initialState: TenantReduxState<any> = {

4
app/client/src/utils/BrandingUtils.ts
View File

@ -64,7 +64,7 @@ export function createBrandColorsFromPrimaryColor(
*
* checks:
* 1. file size max 2MB
* 2. file type - jpg, svg or png
* 2. file type - jpg, or png
*
* @param e
* @param callback
@ -90,7 +90,7 @@ export const logoImageValidator = (
}
// case 3: image selected
const validTypes = ["image/jpeg", "image/png", "image/svg+xml"];
const validTypes = ["image/jpeg", "image/png"];
if (!validTypes.includes(file.type)) {
Toaster.show({

1
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/AssetServiceCEImpl.java
View File

@ -42,7 +42,6 @@ public class AssetServiceCEImpl implements AssetServiceCE {
private static final Set<MediaType> ALLOWED_CONTENT_TYPES = Set.of(
MediaType.IMAGE_JPEG,
MediaType.IMAGE_PNG,
MediaType.valueOf("image/svg+xml"),
MediaType.valueOf("image/x-icon"),
MediaType.valueOf("image/vnd.microsoft.icon")
);

2
app/server/appsmith-server/src/main/resources/email/forgotPasswordTemplate.html
View File

@ -67,7 +67,7 @@
<![endif]--><div class="xc536 ogf c" style="font-size:0;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
<table border="0" cellpadding="0" cellspacing="0" role="none" width="100%"><tbody><tr><td style="background-color:#fffffe;border:none;vertical-align:top;padding:40px 24px 24px 24px;">
<table border="0" cellpadding="0" cellspacing="0" role="none" width="100%"><tbody><tr><td align="center" class="i m" style="font-size:0;padding:0;padding-bottom:16px;word-break:break-word;">
<table border="0" cellpadding="0" cellspacing="0" role="none" style="border-collapse:collapse;border-spacing:0;"><tbody><tr><td style="width:200px;"> <img alt="" height="auto" src="https://assets.appsmith.com/appsmith-logo.svg" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" title="" width="200">
<table border="0" cellpadding="0" cellspacing="0" role="none" style="border-collapse:collapse;border-spacing:0;"><tbody><tr><td style="width:200px;"> <img alt="" height="auto" src="https://assets.appsmith.com/appsmith-logo-no-margin.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" title="" width="200">
</td></tr></tbody></table>
</td></tr><tr><td class="s m" style="font-size:0;padding:0;padding-bottom:16px;word-break:break-word;"><div style="height:1px;line-height:1px;">&#8202;</div>
</td></tr><tr><td align="center" class="x m" style="font-size:0;padding-bottom:16px;word-break:break-word;"><div style="text-align:center;"><p style="Margin:0;text-align:center;"><span style="font-size:20px;font-family:SF Pro Text,Arial,sans-serif;font-weight:600;color:#000000;line-height:24px;">Password reset link for Appsmith apps</span></p></div>

2
app/server/appsmith-server/src/main/resources/email/inviteUserTemplate.html
View File

@ -67,7 +67,7 @@
<![endif]--><div class="xc536 ogf c" style="font-size:0;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
<table border="0" cellpadding="0" cellspacing="0" role="none" width="100%"><tbody><tr><td style="background-color:#fffffe;border:none;vertical-align:top;padding:40px 24px 24px 24px;">
<table border="0" cellpadding="0" cellspacing="0" role="none" width="100%"><tbody><tr><td align="center" class="i m" style="font-size:0;padding:0;padding-bottom:16px;word-break:break-word;">
<table border="0" cellpadding="0" cellspacing="0" role="none" style="border-collapse:collapse;border-spacing:0;"><tbody><tr><td style="width:200px;"> <img alt="" height="auto" src="https://assets.appsmith.com/appsmith-logo.svg" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" title="" width="200">
<table border="0" cellpadding="0" cellspacing="0" role="none" style="border-collapse:collapse;border-spacing:0;"><tbody><tr><td style="width:200px;"> <img alt="" height="auto" src="https://assets.appsmith.com/appsmith-logo-no-margin.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" title="" width="200">
</td></tr></tbody></table>
</td></tr><tr><td class="s m" style="font-size:0;padding:0;padding-bottom:16px;word-break:break-word;"><div style="height:1px;line-height:1px;">&#8202;</div>
</td></tr><tr><td align="center" class="x m" style="font-size:0;padding-bottom:16px;word-break:break-word;"><div style="text-align:center;"><p style="Margin:0;text-align:center;"><span style="font-size:20px;font-family:SF Pro Text,Arial,sans-serif;font-weight:600;color:#000000;line-height:24px;">{{inviterFirstName}} has invited you to collaborate on the workspace "{{inviterWorkspaceName}}"</span></p></div>

2
app/server/appsmith-server/src/main/resources/email/welcomeUserTemplate.html
View File

@ -218,7 +218,7 @@
<![endif]--><div class="xc536 ogf c" style="font-size:0;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
<table border="0" cellpadding="0" cellspacing="0" role="none" width="100%"><tbody><tr><td style="background-color:#fffffe;border:none;vertical-align:top;padding:40px 24px 24px 24px;">
<table border="0" cellpadding="0" cellspacing="0" role="none" width="100%"><tbody><tr><td align="center" class="i m" style="font-size:0;padding:0;padding-bottom:16px;word-break:break-word;">
<table border="0" cellpadding="0" cellspacing="0" role="none" style="border-collapse:collapse;border-spacing:0;"><tbody><tr><td style="width:200px;"> <img alt="" height="auto" src="https://assets.appsmith.com/appsmith-logo.svg" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" title="" width="200">
<table border="0" cellpadding="0" cellspacing="0" role="none" style="border-collapse:collapse;border-spacing:0;"><tbody><tr><td style="width:200px;"> <img alt="" height="auto" src="https://assets.appsmith.com/appsmith-logo-no-margin.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" title="" width="200">
</td></tr></tbody></table>
</td></tr><tr><td class="s m" style="font-size:0;padding:0;padding-bottom:16px;word-break:break-word;"><div style="height:1px;line-height:1px;">&#8202;</div>
</td></tr><tr><td align="center" class="x m" style="font-size:0;padding-bottom:16px;word-break:break-word;"><div style="text-align:center;"><p style="Margin:0;text-align:center;"><span style="font-size:20px;font-family:SF Pro Text,Arial,sans-serif;font-weight:600;color:#000000;line-height:24px;">Welcome to Appsmith</span></p></div>