Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JabRef/JabRefOnline
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99d91d260b19ff5181f5c1638b1525de9fe3df25
Choose a base ref
..
head repository: JabRef/JabRefOnline
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d34142aa8adb3e7bc36804024dd79c14c69621bf
Choose a head ref
Showing with 62 additions and 41 deletions.
  1. +5 −1 components/DownloadButton.vue
  2. +33 −25 components/LandingPageDownload.client.vue
  3. +0 −13 composables/downloads.ts
  4. +24 −2 pages/index.vue
6 changes: 5 additions & 1 deletion components/DownloadButton.vue
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
style="height: 3.2em"
>
<template #icon>
<n-icon>
<n-icon v-if="showIcon">
<Icon name="material-symbols:download" />
</n-icon>
</template>
@@ -26,5 +26,9 @@ defineProps({
type: String,
default: '',
},
showIcon: {
type: Boolean,
default: true,
},
})
</script>
58 changes: 33 additions & 25 deletions components/LandingPageDownload.client.vue
Original file line number Diff line number Diff line change
@@ -13,57 +13,45 @@
<span v-if="isWindows()">
<n-flex justify="center">
<DownloadButton
text=".msi"
text="Download for Windows"
href="/download/win_msi"
/>
<DownloadButton
text="Windows Portable"
href="/download/win_zip"
:showIcon="false"

Check warning on line 18 in components/LandingPageDownload.client.vue

GitHub Actions / Lint

Attribute ':showIcon' must be hyphenated
/>
</n-flex>
</span>

<span v-if="isLinux()">
<n-flex justify="center">
<DownloadButton
text=".deb"
text=".deb (Ubuntu, Debian)"
href="/download/linux_deb"
/>
<DownloadButton
text=".rpm"
text=".rpm (Fedora, RedHat)"
href="/download/linux_rpm"
/>
<DownloadButton
text="Linux Portable"
href="/download/linux_tar_gz"
/>
</n-flex>
</span>
<span v-if="isMac()">
<n-flex justify="center">
<DownloadButton
text="arm64 .dmg"
href="/download/mac_arm64_dmg"
/>
<DownloadButton
text="arm64 .dmg"
text="Apple Silicon (Arm)"
href="/download/mac_arm64_pkg"
/>
<DownloadButton
text="x86_64 .dmg"
href="/download/mac_x86_64_dmg"
/>
<DownloadButton
text="x86_64 .pkg"
text="macOS Intel (x64)"
href="/download/mac_x86_64_pkg"
/>
</n-flex>
</span>
</div>

<div class="text-center pt-8 text-sm">
<span v-if="isWindows()">
For Windows
<t-nuxtlink
class="text-primary-500"
href="/download/win_zip"
>Windows Portable</t-nuxtlink
>
<br />
Also available for
<t-nuxtlink
@@ -74,7 +62,23 @@
<br />
</span>
<span v-if="isMac()">
For mac OS X
<t-nuxtlink
class="text-primary-500"
href="/download/mac_arm64_dmg"
>Apple Silicon Portable (.dmg)</t-nuxtlink
>
or
<t-nuxtlink
class="text-primary-500"
href="/download/mac_x86_64_dmg"
>macOS Intel Portable (.dmg)</t-nuxtlink
>
<br />
<div class="text-xs text-wrap max-w-sm mx-auto pt-2">
Unsure about your Mac type? Click the Apple icon, select "About
This Mac". If it shows "Chip", you have Apple Silicon. Otherwise,
it's Intel.
</div>
<br />
Also available for
<t-nuxtlink
@@ -85,7 +89,11 @@
<br />
</span>
<span v-if="isLinux()">
For Linux
<t-nuxtlink
class="text-primary-500"
href="/download/linux_tar_gz"
>Linux Portable</t-nuxtlink
>
<br />
Also available for
<t-nuxtlink
13 changes: 0 additions & 13 deletions composables/downloads.ts

This file was deleted.

26 changes: 24 additions & 2 deletions pages/index.vue
Original file line number Diff line number Diff line change
@@ -76,12 +76,32 @@
>
<ClientOnly>
<a
v-if="isWindows()"
class="text-2xl"
href="/#download"
>Download JabRef</a
href="/download/win_msi"
>Download for Windows</a
>
<a
v-if="isLinux()"
class="text-2xl"
href="/download/linux_deb"
>Download for Linux (Ubuntu, Debian)</a
>
<a
v-if="isMac()"
class="text-2xl"
href="/download/mac_arm64_pkg"
>Download for macOS (Apple Silicon)</a
>
</ClientOnly>
</n-button>
<div class="text-center pt-4 text-sm">
<a
class="text-primary-500 text-sm"
href="/#download"
>Or see all download options</a
>
</div>
</div>
</div>
</div>
@@ -97,6 +117,8 @@
</template>

<script setup lang="ts">
import { isLinux, isMac, isWindows } from '~/composables/detectOs'
definePageMeta({ layout: false })
const links = [