Fix URL and show it in the about dialog

This commit is contained in:
Martchus 2022-06-09 19:50:43 +02:00
parent d26c911fd6
commit 294dba0e2a
5 changed files with 9 additions and 2 deletions

View File

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
set(META_PROJECT_NAME repomgr)
set(META_PROJECT_TYPE application)
set(META_APP_AUTHOR "Martchus")
set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/${META_PROJECT_NAME}")
set(META_APP_URL "https://github.com/${META_APP_AUTHOR}/arch-repo-manager")
set(META_APP_DESCRIPTION "Repository manager and package builder for Arch Linux")
set(META_APP_CATEGORIES "System;Utility;Network;FileTransfer")
set(META_VERSION_MAJOR 0)

View File

@ -873,6 +873,7 @@ std::string ServiceSetup::Locks::forDatabase(const LibPkg::Database &db)
ServiceStatus::ServiceStatus(ServiceSetup &setup)
: version(applicationInfo.version)
, url(applicationInfo.url)
, config(setup.config.computeStatus())
, actions(setup.building.metaInfo)
, presets(setup.building.presets)

View File

@ -216,9 +216,10 @@ inline std::pair<ServiceSetup::Locks::LockTable *, std::unique_lock<std::shared_
}
struct LIBREPOMGR_EXPORT ServiceStatus : public ReflectiveRapidJSON::JsonSerializable<ServiceStatus> {
ServiceStatus(ServiceSetup &setup);
explicit ServiceStatus(ServiceSetup &setup);
const char *const version = nullptr;
const char *const url = nullptr;
const LibPkg::Status config;
const BuildActionMetaInfo &actions;
const BuildPresets &presets;

View File

@ -256,6 +256,7 @@
<h1>Repository Manager for Arch Linux</h1>
<p><img src="img/logo.svg" alt="Logo" /></p>
<p id="application-version">unknown version</p>
<p><a id="source-code-repo-link" href="" target="blank">Source code repository</a></p>
<p>Icons from <a href="https://materialdesignicons.com" target="blank">Material Design Icons</a></p>
</div>
</div>

View File

@ -29,6 +29,10 @@ function handleGlobalStatusUpdate(ajaxRequest)
if (applicationVersion) {
Utils.getAndEmptyElement('application-version').appendChild(document.createTextNode(applicationVersion));
}
const applicationURL = responseJson.url;
if (applicationURL) {
document.getElementById('source-code-repo-link').href = applicationURL;
}
const dbStats = responseJson.config.dbStats;
const dbTable = GenericRendering.renderTableFromJsonArray({
rows: dbStats,