Skip to content

Commit

Permalink
Merge pull request #1514 from jplag/report-viewer/demo-version-text
Browse files Browse the repository at this point in the history
Demo text in version info and page title
  • Loading branch information
tsaglam authored Feb 2, 2024
2 parents 3da1f57 + 71d25bd commit 45d0d2b
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 20 deletions.
48 changes: 29 additions & 19 deletions report-viewer/src/components/VersionInfoComponent.vue
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
<template>
<div class="text-sm font-bold">
<div v-if="reportViewerVersion.isInvalid()">Could not load version information</div>
<div v-else-if="reportViewerVersion.isDevVersion()">
You are using a development version of the JPlag Report Viewer.
</div>

<div v-else>
<div v-if="newestVersion.compareTo(reportViewerVersion) > 0" class="text-left text-error">
You are using an outdated version of the JPlag Report Viewer ({{
reportViewerVersion.toString()
}}).<br />
Version {{ newestVersion.toString() }} is available on
<a href="https://github.com/jplag/JPlag/releases/latest" class="text-link underline"
>GitHub</a
>.
<div v-if="!isDemo">
<div v-if="reportViewerVersion.isInvalid()">Could not load version information</div>
<div v-else-if="reportViewerVersion.isDevVersion()">
You are using a development version of the JPlag Report Viewer.
</div>

<div v-else>JPlag v{{ reportViewerVersion.toString() }}</div>
<div v-else>
<div v-if="newestVersion.compareTo(reportViewerVersion) > 0" class="text-left text-error">
You are using an outdated version of the JPlag Report Viewer ({{
reportViewerVersion.toString()
}}).<br />
Version {{ newestVersion.toString() }} is available on
<a href="https://github.com/jplag/JPlag/releases/latest" class="text-link underline"
>GitHub</a
>.
</div>

<div v-else>JPlag v{{ reportViewerVersion.toString() }}</div>

<div v-if="!minimalReportVersion.isInvalid()">
The minimal version of JPlag that is supported by the viewer is v{{
minimalReportVersion.toString()
}}.
<div v-if="!minimalReportVersion.isInvalid()">
The minimal version of JPlag that is supported by the viewer is v{{
minimalReportVersion.toString()
}}.
</div>
</div>
</div>

<div v-else>
<div v-if="reportViewerVersion.isInvalid()">Could not load version information</div>
<div v-else>Demo of JPlag v{{ reportViewerVersion.toString() }}</div>
<div>Displays the result of JPlag on the Progpedia dataset.</div>
</div>
</div>
</template>

Expand All @@ -33,6 +41,8 @@ import { ref } from 'vue'
import { minimalReportVersion, reportViewerVersion } from '@/model/Version'
const newestVersion = ref(new Version(-1, -1, -1))
const isDemo = import.meta.env.MODE == 'demo'
console.log('isDemo', isDemo)
fetch('https://api.github.com/repos/jplag/JPlag/releases/latest')
.then((response) => response.json())
Expand Down
2 changes: 1 addition & 1 deletion report-viewer/src/views/FileUploadView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ async function loadQueryFile(url: URL) {
* Handles click on Continue with local files.
*/
function continueWithLocal() {
store().state.uploadedFileName = 'results.zip'
store().state.uploadedFileName = exampleFiles.value ? 'progpedia.zip' : 'results.zip'
store().setLoadingType({
local: true,
zip: localFiles.value === 'zip',
Expand Down

0 comments on commit 45d0d2b

Please sign in to comment.