mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2024-11-27 06:01:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Indicate if a download is external

Browse Source
This commit is contained in:
Nassim Jahnke 2023-03-23 10:28:46 +01:00
parent b97fda7508
commit 1a26912714
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/src/components/projects/DownloadButton.vue
View File

@ -47,6 +47,11 @@ function downloadLink(platform: Platform | undefined, version: DownloadableVersi
return version.downloads[platform]?.externalUrl ? version.downloads[platform].externalUrl : version.downloads[platform].downloadUrl;
}
function isExternal(platform: Platform | undefined, version: DownloadableVersion | undefined): boolean {
if (!version || !platform) return false;
return !!version.downloads[platform]?.externalUrl;
}
const singlePlatform = computed<Platform | undefined>(() => {
if (props.project?.mainChannelVersions) {
const keys = Object.keys(props.project.mainChannelVersions);
@ -65,8 +70,6 @@ const singleVersion = computed<DownloadableVersion | undefined>(() => {
const platformDownloadLink = computed(() => downloadLink(singlePlatform.value, singleVersion.value));
const external = computed(() => false);
function trackDownload(platform: Platform, version: DownloadableVersion & { id?: number; versionId: number }) {
// hangar version has id, pinned version has versionId...
const id = version.id || version.versionId;
@ -81,7 +84,7 @@ function trackDownload(platform: Platform, version: DownloadableVersion & { id?:
<template #button-label>
<span class="items-center inline-flex">
<IconMdiDownloadOutline />
<span v-if="!small" class="ml-1">{{ external ? i18n.t("version.page.downloadExternal") : i18n.t("version.page.download") }}</span>
<span v-if="!small" class="ml-1">{{ i18n.t("version.page.download") }}</span>
</span>
</template>
<DropdownItem
@ -97,6 +100,7 @@ function trackDownload(platform: Platform, version: DownloadableVersion & { id?:
<PlatformLogo :platform="p" :size="24" class="mr-1 flex-shrink-0" />
{{ useBackendData.platforms.get(p)?.name }}
<span v-if="showVersions" class="ml-1">({{ v }})</span>
<IconMdiOpenInNew v-if="isExternal(p, pinnedVersion)" class="ml-0.5 text-sm pb-0.5" />
</DropdownItem>
</DropdownButton>
@ -112,7 +116,9 @@ function trackDownload(platform: Platform, version: DownloadableVersion & { id?:
<div class="flex flex-col" :class="{ '-mb-0.5': showSinglePlatform }">
<div class="inline-flex items-center">
<IconMdiDownloadOutline />
<span v-if="!small" class="ml-1">{{ external ? i18n.t("version.page.downloadExternal") : i18n.t("version.page.download") }}</span>
<span v-if="!small" class="ml-1">
{{ !!singleVersion.downloads[singlePlatform]?.externalUrl ? i18n.t("version.page.downloadExternal") : i18n.t("version.page.download") }}
</span>
</div>
<div v-if="showSinglePlatform" class="inline-flex justify-center items-center font-normal text-0.75rem">
<PlatformLogo :platform="singlePlatform" :size="15" class="mr-1 flex-shrink-0" />
@ -145,6 +151,7 @@ function trackDownload(platform: Platform, version: DownloadableVersion & { id?:
{{ useBackendData.platforms.get(p)?.name }}
<span v-if="showVersions && version.platformDependencies" class="ml-1">({{ version.platformDependenciesFormatted[p] }})</span>
<span v-if="v.fileInfo?.sizeBytes" class="ml-1"> ({{ formatSize(v.fileInfo.sizeBytes) }}) </span>
<IconMdiOpenInNew v-if="v.externalUrl" class="ml-0.5 text-sm pb-0.5" />
</DropdownItem>
</DropdownButton>
@ -168,6 +175,7 @@ function trackDownload(platform: Platform, version: DownloadableVersion & { id?:
<PlatformLogo :platform="p" :size="24" class="mr-1 flex-shrink-0" />
{{ useBackendData.platforms.get(p)?.name }}
<span v-if="v.platformDependencies && showVersions" class="ml-1">({{ v.platformDependenciesFormatted[p] }})</span>
<IconMdiOpenInNew v-if="v.downloads[p]?.externalUrl" class="ml-0.5 text-sm pb-0.5" />
</DropdownItem>
</DropdownButton>
</div>

5
frontend/src/components/projects/ProjectHeader.vue
View File

@ -78,10 +78,11 @@ enum ConfirmationType {
function requiresConfirmation(): ConfirmationType {
for (const platform in props.project.mainChannelVersions) {
const version = props.project.mainChannelVersions[platform as Platform];
const download = version.downloads[platform as Platform];
if (version.reviewState !== ReviewState.REVIEWED && version.reviewState !== ReviewState.PARTIALLY_REVIEWED) {
return ConfirmationType.REQUIRED;
}
const download = version.downloads[platform as Platform];
if (download && download.externalUrl !== null) {
return ConfirmationType.EXTERNAL_URL;
}
@ -138,7 +139,7 @@ function requiresConfirmation(): ConfirmationType {
<div class="flex flex-col justify-around lt-sm:items-center space-y-2 items-end justify-between flex-shrink-0">
<span v-if="Object.keys(project.mainChannelVersions).length !== 0" class="inline-flex items-center">
<Tooltip v-if="requiresConfirmation() !== ConfirmationType.NO" :content="i18n.t(requiresConfirmation())">
<IconMdiAlertCircleOutline class="mr-2 text-2xl" />
<IconMdiAlert class="mr-2 text-2xl" />
</Tooltip>
<DownloadButton :project="project" />
</span>

2
frontend/src/pages/[user]/[project]/versions/[version]/index.vue
View File

@ -167,7 +167,7 @@ async function restoreVersion() {
<div class="inline-flex items-center flex-grow space-x-2">
<div class="flex-grow" />
<Tooltip v-if="confirmationWarningKey" :content="i18n.t(confirmationWarningKey)">
<IconMdiAlertCircleOutline class="text-2xl" />
<IconMdiAlert class="text-2xl" />
</Tooltip>
<DownloadButton :version="projectVersion" :project="project" :show-single-platform="false" :show-versions="false" show-file-size />
</div>

1
frontend/src/types/generated/icons.d.ts vendored
View File

@ -75,6 +75,7 @@ declare module "@vue/runtime-core" {
IconMdiSend: typeof import("~icons/mdi/send")["default"];
IconMdiShape: typeof import("~icons/mdi/shape")["default"];
IconMdiShieldSun: typeof import("~icons/mdi/shield-sun")["default"];
IconMdiSignDirection: typeof import("~icons/mdi/sign-direction")["default"];
IconMdiSort: typeof import("~icons/mdi/sort")["default"];
IconMdiSortAscending: typeof import("~icons/mdi/sort-ascending")["default"];
IconMdiSortDescending: typeof import("~icons/mdi/sort-descending")["default"];