Commit 54901914 authored by Lê Bảo Hồng Đức's avatar Lê Bảo Hồng Đức

fix

parent ddf84539
......@@ -154,9 +154,6 @@ const resolveAssetUrl = (value?: string | null) => {
if (!trimmed) return "/thumbnail.png";
if (trimmed.startsWith("http://") || trimmed.startsWith("https://")) return trimmed;
if (trimmed.startsWith("/")) {
return `${Links.imageEndpoint.replace(/\/+$/, "")}${trimmed}`;
}
return `${Links.imageEndpoint}${trimmed.replace(/^\/+/, "")}`;
};
......
......@@ -294,7 +294,6 @@ export function resolveDynamicPostImage(thumbnail?: DynamicPostThumbnail) {
if (!value) return "/thumbnail.png";
if (value.startsWith("http://") || value.startsWith("https://")) return value;
if (value.startsWith("/")) return `${Links.imageEndpoint.replace(/\/+$/, "")}${value}`;
return `${Links.imageEndpoint}${value.replace(/^\/+/, "")}`;
}
......
......@@ -22,8 +22,7 @@ const stripImagesAndHtml = (html?: string) => {
const resolveThumbnail = (thumbnail?: string) => {
if (!thumbnail) return "/img-error.png";
if (thumbnail.startsWith("http://") || thumbnail.startsWith("https://")) return thumbnail;
if (thumbnail.startsWith("/")) return `${Links.imageEndpoint.replace(/\/+$/, "")}${thumbnail}`;
return `${Links.imageEndpoint}${thumbnail}`;
return `${Links.imageEndpoint}${thumbnail.replace(/^\/+/, "")}`;
};
const CardNews = ({ news, link }: { news: NewsItem; link: string }) => {
......
......@@ -45,7 +45,6 @@ export const resolveCmsFileUrl = (path?: string | null) => {
if (!value) return "/img-error.png";
if (value.startsWith("http://") || value.startsWith("https://")) return value;
if (value.startsWith("/")) return `${Links.imageEndpoint.replace(/\/+$/, "")}${value}`;
return `${Links.imageEndpoint}${value.replace(/^\/+/, "")}`;
};
......
......@@ -37,7 +37,7 @@ const frontendUrl = toUrl(frontendOrigin);
const links = {
analyticsGoogle: "G-C9TEK9BS4C",
apiEndpoint: backendOrigin ? `${backendOrigin}/api/v1.0` : "/api/v1.0",
imageEndpoint: backendOrigin ? `${backendOrigin}/` : "/",
imageEndpoint: backendOrigin ? `${backendOrigin}/uploads/` : "/uploads/",
backendHost: backendUrl?.hostname || "",
backendProtocol: backendUrl?.protocol.replace(":", "") || "",
backendPathname: backendUrl?.pathname.replace(/\/+$/, "") || "/",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment