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

Reduce lines of code on download page #34

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Reduce lines of code on download page #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions app/[locale]/download/Download.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
@apply list-decimal list-inside pl-4;
}

.cndownload{
.cndownload {
border-radius: 4px;
background: rgba(0, 92, 175, 0.1);
padding: 15px;
padding: 16px;
margin-top: 8px;
}
138 changes: 45 additions & 93 deletions app/[locale]/download/components/DownloadWebgalTerre.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,26 @@ const DownloadWebgalTerre = () => {
? webgalTerreAssets?.releaseNote[1]
: null

const platformMap = [
{ platform: 'windows', icon: <RiMicrosoftFill />, label: t('downloadWindows') },
{ platform: 'windowsSetup', icon: <RiMicrosoftFill />, label: t('downloadWindowsSetup') },
{ platform: 'windowsArm64', icon: <RiMicrosoftFill />, label: t('downloadWindowsArm64') },
{ platform: 'windowsArm64Setup', icon: <RiMicrosoftFill />, label: t('downloadWindowsArm64Setup') },
{ platform: 'macos', icon: <RiAppleFill />, label: t('downloadMacos') },
{ platform: 'linux', icon: <RiUbuntuFill />, label: t('downloadLinux') },
{ platform: 'linuxArm64', icon: <RiUbuntuFill />, label: t('downloadLinuxArm64') },
]

const downloadUrls = webgalTerreAssets?.downloadUrl
.map((item) => {
const test = platformMap.find(platform => item.platform === platform.platform)
if (test)
return { url: item.url, ...test }
})

const isZh = locale === 'zh-cn'
const ghproxyStr = 'https://ghproxy.com/'

return (
<div className={styles.card}>
<h2 className={`${styles['card-title']} border-terre`}>{t('webgalTerre')}</h2>
Expand All @@ -53,102 +71,36 @@ const DownloadWebgalTerre = () => {
<Link href={webgalTerreUrl} target={'_blank'}><RiGithubFill />{t('gitHubReleases')}</Link>
</Button>
{
(webgalTerreAssets?.downloadUrl.windows) &&
<Button terre>
<Link href={webgalTerreAssets?.downloadUrl.windows} target='_top'><RiMicrosoftFill />{t('downloadWindows')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.windowsSetup) &&
<Button terre>
<Link href={webgalTerreAssets?.downloadUrl.windowsSetup} target='_top'><RiMicrosoftFill />{t('downloadWindowsSetup')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.windowsArm64) &&
<Button terre>
<Link href={webgalTerreAssets?.downloadUrl.windowsArm64} target='_top'><RiMicrosoftFill />{t('downloadWindowsArm64')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.windowsArm64Setup) &&
<Button terre>
<Link href={webgalTerreAssets?.downloadUrl.windowsArm64Setup} target='_top'><RiMicrosoftFill />{t('downloadWindowsArm64Setup')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.macos) &&
<Button terre>
<Link href={webgalTerreAssets?.downloadUrl.macos} target='_top'><RiAppleFill />{t('downloadMacos')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.linux) &&
<Button terre>
<Link href={webgalTerreAssets?.downloadUrl.linux} target='_top'><RiUbuntuFill />{t('downloadLinux')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.linuxArm64) &&
<Button terre>
<Link href={webgalTerreAssets?.downloadUrl.linuxArm64} target='_top'><RiUbuntuFill />{t('downloadLinuxArm64')}</Link>
</Button>
downloadUrls &&
downloadUrls.map((item) =>
item?.url &&
<Button terre key={item.platform}>
<Link href={item.url} target='_top'>{item.icon}{item.label}</Link>
</Button>
)
}

</div>
{isZh&&<div className={styles.cndownload}>
<div style={{
marginBottom:'15px'
}}>
中国大陆（内地）地区的用户如果使用上面的链接下载速度较慢，可以使用以下代理链接：
</div>
<div className={styles['card-button-gourp']}>
<Button terre>
<Link href={webgalTerreUrl} target={'_blank'}><RiGithubFill />{t('gitHubReleases')}</Link>
</Button>
{
(webgalTerreAssets?.downloadUrl.windows) &&
<Button terre>
<Link href={ghproxyStr+webgalTerreAssets?.downloadUrl.windows} target='_top'><RiMicrosoftFill />{t('downloadWindows')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.windowsSetup) &&
<Button terre>
<Link href={ghproxyStr+webgalTerreAssets?.downloadUrl.windowsSetup} target='_top'><RiMicrosoftFill />{t('downloadWindowsSetup')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.windowsArm64) &&
<Button terre>
<Link href={ghproxyStr+webgalTerreAssets?.downloadUrl.windowsArm64} target='_top'><RiMicrosoftFill />{t('downloadWindowsArm64')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.windowsArm64Setup) &&
<Button terre>
<Link href={ghproxyStr+webgalTerreAssets?.downloadUrl.windowsArm64Setup} target='_top'><RiMicrosoftFill />{t('downloadWindowsArm64Setup')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.macos) &&
<Button terre>
<Link href={ghproxyStr+webgalTerreAssets?.downloadUrl.macos} target='_top'><RiAppleFill />{t('downloadMacos')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.linux) &&
<Button terre>
<Link href={ghproxyStr+webgalTerreAssets?.downloadUrl.linux} target='_top'><RiUbuntuFill />{t('downloadLinux')}</Link>
</Button>
}
{
(webgalTerreAssets?.downloadUrl.linuxArm64) &&
<Button terre>
<Link href={ghproxyStr+webgalTerreAssets?.downloadUrl.linuxArm64} target='_top'><RiUbuntuFill />{t('downloadLinuxArm64')}</Link>
</Button>
}
{
isZh && downloadUrls && <div className={styles.cndownload}>
<details className='space-y-4'>
<summary className='cursor-pointer text-terre select-none'>
中国大陆（内地）地区的用户如果使用上面的链接下载速度较慢，请点这里使用代理链接
</summary>
<div className={styles['card-button-gourp']}>
{
downloadUrls &&
downloadUrls.map((item) =>
item?.url &&
<Button terre key={item.platform}>
<Link href={ghproxyStr + item.url} target='_top'>{item.icon}{item.label}</Link>
</Button>
)
}
</div>
</details>
</div>
</div>}
}
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion app/components/Button/Button.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.btn {
@apply bg-webgal text-white px-2.5 py-2 rounded shadow
@apply bg-webgal text-white px-2.5 py-2 rounded shadow flex flex-row;
}

@media (any-hover:hover) {
Expand Down
19 changes: 10 additions & 9 deletions hooks/useWebgalTerreAssets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ const useWebgalTerreAssets = (webgalTerreApiUrl: string) => {
version: data.tag_name,
releaseTime: data.published_at,
releaseNote: parseReleaseNote(data.body),
downloadUrl: {
windows: findAssetsUrl(data.assets, 'Windows.*.zip'),
windowsSetup: findAssetsUrl(data.assets, 'Windows_Setup.*.exe'),
windowsArm64: findAssetsUrl(data.assets, 'Windows_Arm64.*.zip'),
windowsArm64Setup: findAssetsUrl(data.assets, 'Windows_Arm64_Setup.*.exe'),
macos: findAssetsUrl(data.assets, 'mac.*.zip'),
linux: findAssetsUrl(data.assets, 'Linux.*.zip'),
linuxArm64: findAssetsUrl(data.assets, 'Linux_Arm64.*.zip')
}
downloadUrl: [
{ platform: 'windows', url: findAssetsUrl(data.assets, 'Windows.*.zip') },
{ platform: 'windowsSetup', url: findAssetsUrl(data.assets, 'Windows_Setup.*.exe') },
{ platform: 'windowsArm64', url: findAssetsUrl(data.assets, 'Windows_Arm64.*.zip') },
{ platform: 'windowsArm64Setup', url: findAssetsUrl(data.assets, 'Windows_Arm64_Setup.*.exe') },
{ platform: 'macos', url: findAssetsUrl(data.assets, 'mac.*.zip') },
{ platform: 'linux', url: findAssetsUrl(data.assets, 'Linux.*.zip') },
{ platform: 'linuxArm64', url: findAssetsUrl(data.assets, 'Linux_Arm64.*.zip') },
]

}
))
} catch (error) {
Expand Down
10 changes: 1 addition & 9 deletions types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,7 @@ export type WebgalTerreAssets = {
version: string,
releaseTime: string,
releaseNote: string[][],
downloadUrl: {
windows?: string,
windowsSetup?: string,
windowsArm64?: string,
windowsArm64Setup?: string,
macos?: string,
linux?: string,
linuxArm64?: string
},
downloadUrl: { platform: string, url: string }[],
}

export type Person = {
Expand Down
Loading