diff --git a/README.md b/README.md index 33a198388..b0f418d3f 100644 --- a/README.md +++ b/README.md @@ -128,11 +128,13 @@ For the latest features and roadmap, please check the original Uptime Kuma proje PSS Uptime is based on [Uptime Kuma](https://github.com/louislam/uptime-kuma), an excellent open-source monitoring tool created by [louislam](https://github.com/louislam) and maintained by a dedicated community of contributors. We would like to express our gratitude to: + - [louislam](https://github.com/louislam) for creating and maintaining Uptime Kuma - All contributors to the Uptime Kuma project - The open-source community that makes projects like this possible If you find PSS Uptime useful, please consider supporting the original Uptime Kuma project: + - [GitHub Sponsors](https://github.com/sponsors/louislam) - [Open Collective](https://opencollective.com/uptime-kuma) @@ -161,6 +163,7 @@ PSS Uptime is a customized version of Uptime Kuma for the Marshall Islands Publi ### Original Uptime Kuma Motivation The original Uptime Kuma project was created with the following motivations: + - A need for a self-hosted monitoring tool like "Uptime Robot" - Building a fancy, modern UI - Learning Vue 3 and vite.js @@ -169,6 +172,7 @@ The original Uptime Kuma project was created with the following motivations: - Deploying Docker images to Docker Hub If you love this project, please consider: + - Giving the original [Uptime Kuma project](https://github.com/louislam/uptime-kuma) a ⭐ - Supporting the Uptime Kuma project through [GitHub Sponsors](https://github.com/sponsors/louislam) or [Open Collective](https://opencollective.com/uptime-kuma) @@ -177,6 +181,7 @@ If you love this project, please consider: For questions about PSS Uptime, please use the appropriate channels for this project. For questions about the original Uptime Kuma project, please refer to: + - [Uptime Kuma GitHub Issues](https://github.com/louislam/uptime-kuma/issues) - [Subreddit (r/UptimeKuma)](https://www.reddit.com/r/UptimeKuma/) diff --git a/server/notification-providers/bark.js b/server/notification-providers/bark.js index 39e33ae70..7b8096f6c 100644 --- a/server/notification-providers/bark.js +++ b/server/notification-providers/bark.js @@ -53,7 +53,9 @@ class Bark extends NotificationProvider { async additionalParameters(notification) { // set icon to PSS Uptime icon, 11kb should be fine const baseURL = await setting("primaryBaseURL"); - const iconUrl = baseURL ? baseURL + "/icon.png" : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; + const iconUrl = baseURL + ? baseURL + "/icon.png" + : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; let params = "?icon=" + iconUrl; // grouping all our notifications if (notification.barkGroup != null) { @@ -106,7 +108,9 @@ class Bark extends NotificationProvider { result = await axios.get(`${endpoint}/${title}/${subtitle}${params}`, config); } else { const baseURL = await setting("primaryBaseURL"); - const iconUrl = baseURL ? baseURL + "/icon.png" : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; + const iconUrl = baseURL + ? baseURL + "/icon.png" + : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; result = await axios.post( endpoint, { diff --git a/server/notification-providers/discord.js b/server/notification-providers/discord.js index c1c6561df..f8ef18256 100644 --- a/server/notification-providers/discord.js +++ b/server/notification-providers/discord.js @@ -43,7 +43,9 @@ class Discord extends NotificationProvider { }; if (!webhookHasAvatar) { const baseURL = await setting("primaryBaseURL"); - discordtestdata.avatar_url = baseURL ? baseURL + "/icon.png" : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; + discordtestdata.avatar_url = baseURL + ? baseURL + "/icon.png" + : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; } if (notification.discordChannelType === "createNewForumPost") { discordtestdata.thread_name = notification.postName; @@ -99,7 +101,9 @@ class Discord extends NotificationProvider { }; if (!webhookHasAvatar) { const baseURL = await setting("primaryBaseURL"); - discorddowndata.avatar_url = baseURL ? baseURL + "/icon.png" : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; + discorddowndata.avatar_url = baseURL + ? baseURL + "/icon.png" + : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; } if (notification.discordChannelType === "createNewForumPost") { discorddowndata.thread_name = notification.postName; @@ -173,7 +177,9 @@ class Discord extends NotificationProvider { }; if (!webhookHasAvatar) { const baseURL = await setting("primaryBaseURL"); - discordupdata.avatar_url = baseURL ? baseURL + "/icon.png" : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; + discordupdata.avatar_url = baseURL + ? baseURL + "/icon.png" + : "https://github.com/louislam/uptime-kuma/raw/master/public/icon.png"; } if (notification.discordChannelType === "createNewForumPost") { diff --git a/server/notification-providers/home-assistant.js b/server/notification-providers/home-assistant.js index d213d41c2..951cbebfd 100644 --- a/server/notification-providers/home-assistant.js +++ b/server/notification-providers/home-assistant.js @@ -32,7 +32,9 @@ class HomeAssistant extends NotificationProvider { name: monitorJSON?.name, status: heartbeatJSON?.status, channel: "PSS Uptime", - icon_url: (await setting("primaryBaseURL")) ? (await setting("primaryBaseURL")) + "/icon.png" : "https://github.com/louislam/uptime-kuma/blob/master/public/icon.png?raw=true", + icon_url: (await setting("primaryBaseURL")) + ? (await setting("primaryBaseURL")) + "/icon.png" + : "https://github.com/louislam/uptime-kuma/blob/master/public/icon.png?raw=true", }, }), }, diff --git a/src/pages/StatusPage.vue b/src/pages/StatusPage.vue index f53d97831..609881024 100644 --- a/src/pages/StatusPage.vue +++ b/src/pages/StatusPage.vue @@ -75,7 +75,9 @@ placeholder="/logo.png or data:image/..." data-testid="logo-url-input" /> -
{{ $t("Enter a logo URL (e.g., /logo.png) or upload using the logo above") }}
+
+ {{ $t("Enter a logo URL (e.g., /logo.png) or upload using the logo above") }} +