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.

Sign up for GitHub

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

Jump to bottom

Feature/disable trim images for cards after 3rd anni #484

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Feature/disable trim images for cards after 3rd anni #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a9e2ab
feat: only return resource path if it exists
dnaroma Apr 3, 2024
50cd2ce
feat: hide trim image tabs if no trim images available
dnaroma Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 54 additions & 43 deletions src/pages/card/CardDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,29 +378,33 @@ const CardDetail: React.FC<unknown> = observer(() => {

const getCardImages: () => ImageDecorator[] = useCallback(
() =>
card
(card
? isTrainableCard
? [
{
alt: "card normal",
downloadUrl: normalImg.replace(".webp", ".png"),
src: normalImg,
},
{
alt: "card normal trim",
downloadUrl: normalTrimImg.replace(".webp", ".png"),
src: normalTrimImg,
},
normalTrimImg
? {
alt: "card normal trim",
downloadUrl: normalTrimImg.replace(".webp", ".png"),
src: normalTrimImg,
}
: undefined,
{
alt: "card after training",
downloadUrl: trainedImg.replace(".webp", ".png"),
src: trainedImg,
},
{
alt: "card after training trim",
downloadUrl: trainedTrimImg.replace(".webp", ".png"),
src: trainedTrimImg,
},
trainedTrimImg
? {
alt: "card after training trim",
downloadUrl: trainedTrimImg.replace(".webp", ".png"),
src: trainedTrimImg,
}
: undefined,
]
: [
{
Expand All @@ -414,7 +418,8 @@ const CardDetail: React.FC<unknown> = observer(() => {
src: normalTrimImg,
},
]
: [],
: []
).filter((img) => !!img) as ImageDecorator[],
[
card,
isTrainableCard,
Expand Down Expand Up @@ -449,13 +454,15 @@ const CardDetail: React.FC<unknown> = observer(() => {
scrollButtons
>
<Tab label={t("card:tab.title[0]")} value="0"></Tab>
<Tab label={t("card:tab.title[1]")} value="2"></Tab>
{isTrainableCard && !isBirthdayCard ? (
{!!normalTrimImg && (
<Tab label={t("card:tab.title[1]")} value="2"></Tab>
)}
{isTrainableCard && !isBirthdayCard && (
<Tab label={t("card:tab.title[2]")} value="1"></Tab>
) : null}
{isTrainableCard && !isBirthdayCard ? (
)}
{isTrainableCard && !isBirthdayCard && !!trainedTrimImg && (
<Tab label={t("card:tab.title[3]")} value="3"></Tab>
) : null}
)}
</Tabs>
<TabPanelPadding value="0">
<Card
Expand All @@ -477,32 +484,36 @@ const CardDetail: React.FC<unknown> = observer(() => {
<CardMediaCardImg image={trainedImg} />
</Card>
</TabPanelPadding>
<TabPanelPadding value="2">
<Card
onClick={() => {
setActiveIdx(1);
setVisible(true);
}}
>
<CardMediaCardImg
image={normalTrimImg}
sx={{ backgroundSize: "contain" }}
/>
</Card>
</TabPanelPadding>
<TabPanelPadding value="3">
<Card
onClick={() => {
setActiveIdx(3);
setVisible(true);
}}
>
<CardMediaCardImg
image={trainedTrimImg}
sx={{ backgroundSize: "contain" }}
/>
</Card>
</TabPanelPadding>
{!!normalTrimImg && (
<TabPanelPadding value="2">
<Card
onClick={() => {
setActiveIdx(1);
setVisible(true);
}}
>
<CardMediaCardImg
image={normalTrimImg}
sx={{ backgroundSize: "contain" }}
/>
</Card>
</TabPanelPadding>
)}
{!!trainedTrimImg && (
<TabPanelPadding value="3">
<Card
onClick={() => {
setActiveIdx(3);
setVisible(true);
}}
>
<CardMediaCardImg
image={trainedTrimImg}
sx={{ backgroundSize: "contain" }}
/>
</Card>
</TabPanelPadding>
)}
</Paper>
</TabContext>
<GridOut container direction="column">
Expand Down
26 changes: 7 additions & 19 deletions src/utils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,25 +335,13 @@ export async function getRemoteAssetURL(
// const isWebpSupported = Modernizr.webplossless;
const url = `${assetUrl[domainKey][server]}/${endpoint}`;

// if (endpoint.endsWith(".webp") && !isWebpSupported) {
// let dataUrl = await localforage.getItem<string>(url);
// if (!dataUrl) {
// const res = await Axios.get(url, { responseType: "arraybuffer" });
// dataUrl = await queue.add<string>(() =>
// webpMachine.decode(new Uint8Array(res.data))
// );
// await localforage.setItem(url, dataUrl);
// if (setFunc) setFunc(dataUrl);
// return dataUrl;
// } else {
// // await Axios.head(url);
// if (setFunc) setFunc(dataUrl);
// return dataUrl;
// }
// } else
// await Axios.head(url);
if (setFunc) setFunc(url);
return url;
const headRes = await Axios.head(url);
// console.log(headRes.status, url);
if (headRes.status <= 400) {
if (setFunc) setFunc(url);
return url;
}
return "";
}

// export async function getMovieUrl(stringVal: string) {
Expand Down