Merge branch 'master' into mqtt

# Conflicts:
#	package-lock.json
#	server/database.js

.github/ISSUE_TEMPLATE/ask-for-help.yaml

@@ -1,6 +1,6 @@
 name: "❓ Ask for help"
 description: "Submit any question related to Uptime Kuma"
-title: "[Help] "
+#title: "[Help] "
 labels: [help]
 body:
   - type: checkboxes

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,6 +1,6 @@
 name: "🐛 Bug Report"
 description: "Submit a bug report to help us improve"
-title: "[Bug] "
+#title: "[Bug] "
 labels: [bug]
 body:
   - type: checkboxes

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,7 +1,7 @@
 name: 🚀 Feature Request
 description: "Submit a proposal for a new feature"
-title: "[Feature] "
+#title: "[Feature] "
-labels: [enhancement]
+labels: [feature-request]
 body:
   - type: checkboxes
     id: no-duplicate-issues

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,10 +4,10 @@ Fixes #(issue)
 
 ## Type of change
 
-Please delete options that are not relevant.
+Please delete any options that are not relevant.
 
 - Bug fix (non-breaking change which fixes an issue)
-- User Interface
+- User interface (UI)
 - New feature (non-breaking change which adds functionality)
 - Breaking change (fix or feature that would cause existing functionality to not work as expected)
 - Translation update
@@ -18,9 +18,11 @@ Please delete options that are not relevant.
 
 - [ ] My code follows the style guidelines of this project
 - [ ] I ran ESLint and other linters for modified files
-- [ ] I have performed a self-review of my own code and test it
+- [ ] I have performed a self-review of my own code and tested it
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] My changes generate no new warnings
 - [ ] My code needed automated testing. I have added them (this is optional task)
 
 ## Screenshots (if any)
+
+Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically.

.github/workflows/close-incorrect-issue.yml

@@ -0,0 +1,26 @@
+
+name: Close Incorrect Issue
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  close-incorrect-issue:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        node-version: [16.x]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: npm ci
+    - run: node extra/close-incorrect-issue.js ${{ secrets.GITHUB_TOKEN }} ${{ github.event.issue.number }} ${{ github.event.issue.user.login }}

CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # Project Info
 
-First of all, thank you everyone who made pull requests for Uptime Kuma, I never thought GitHub Community can be that nice! And also because of this, I also never thought other people actually read my code and edit my code. It is not structed and commented so well, lol. Sorry about that.
+First of all, thank you everyone who made pull requests for Uptime Kuma, I never thought GitHub Community can be that nice! And also because of this, I also never thought other people actually read my code and edit my code. It is not structured and commented so well, lol. Sorry about that.
 
-The project was created with vite.js (vue3). Then I created a sub-directory called "server" for server part. Both frontend and backend share the same package.json.
+The project was created with vite.js (vue3). Then I created a subdirectory called "server" for server part. Both frontend and backend share the same package.json.
 
 The frontend code build into "dist" directory. The server (express.js) exposes the "dist" directory as root of the endpoint. This is how production is working.
 
@@ -27,11 +27,10 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
 
 ## Can I create a pull request for Uptime Kuma?
 
-Generally, if the pull request is working fine and it do not affect any existing logic, workflow and perfomance, I will merge into the master branch once it is tested.
+Generally, if the pull request is working fine, and it does not affect any existing logic, workflow and performance, I will merge into the master branch once it is tested.
 
 If you are not sure whether I will accept your pull request, feel free to create an empty pull request draft first.
 
-
 ### Recommended Pull Request Guideline
 
 1. Fork the project
@@ -41,7 +40,7 @@ If you are not sure whether I will accept your pull request, feel free to create
    `git commit -m "[empty commit] pull request for <YOUR TASK NAME>" --allow-empty`
 1. Push to your fork repo
 1. Create a pull request: https://github.com/louislam/uptime-kuma/compare
-1. Write a proper description   
+1. Write a proper description
 1. Click "Change to draft"
 
 ### Pull Request Examples
@@ -66,14 +65,13 @@ I do not have such knowledge to test it.
 
 #### ⚠ Low Priority - Harsh Mode
 
-Some pull requests are required to modifiy the core. To be honest, I do not want anyone to try to do that, because it would spend a lot of your time. I will review your pull request harshly. Also you may need to write a lot of unit tests to ensure that there is no breaking change.
+Some pull requests are required to modify the core. To be honest, I do not want anyone to try to do that, because it would spend a lot of your time. I will review your pull request harshly. Also, you may need to write a lot of unit tests to ensure that there is no breaking change.
 
 - Touch large parts of code of any very important features
 - Touch monitoring logic
 - Drop a table or drop a column for any reason
 - Touch the entry point of Docker or Node.js
-- Modifiy auth
+- Modify auth
-
 
 #### *️⃣ Low Priority
 
@@ -114,7 +112,7 @@ I personally do not like something need to learn so much and need to config so m
 
 - Node.js >= 14
 - Git
-- IDE that supports ESLint and EditorConfig (I am using Intellji Idea)
+- IDE that supports ESLint and EditorConfig (I am using IntelliJ IDEA)
 - A SQLite tool (SQLite Expert Personal is suggested)
 
 ## Install dependencies
@@ -141,9 +139,9 @@ express.js is just used for serving the frontend built files (index.html, .js an
 
 - model/ (Object model, auto mapping to the database table name)
 - modules/ (Modified 3rd-party modules)
-- notification-providers/ (indivdual notification logic)
+- notification-providers/ (individual notification logic)
 - routers/ (Express Routers)
-- scoket-handler (Socket.io Handlers)
+- socket-handler (Socket.io Handlers)
 - server.js (Server main logic)
 
 ## How to start the Frontend Dev Server
@@ -201,7 +199,7 @@ ncu -u -t patch
 npm install
 ```
 
-Since previously updating vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only.
+Since previously updating Vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only.
 
 Patch release = the third digit ([Semantic Versioning](https://semver.org/))
 
@@ -209,20 +207,19 @@ Patch release = the third digit ([Semantic Versioning](https://semver.org/))
 
 Please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages
 
-
 ## Wiki
 
-Since there is no way to make a pull request to wiki's repo, I have setup another repo to do that.
+Since there is no way to make a pull request to wiki's repo, I have set up another repo to do that.
 
 https://github.com/louislam/uptime-kuma-wiki
 
-
+## Maintainer
-## Maintainer 
 
 Check the latest issues and pull requests:
 https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
 
 ### Release Procedures
+
 1. Draft a release note
 1. Make sure the repo is cleared
 1. `npm run update-version 1.X.X`
@@ -234,22 +231,24 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
 1. SSH to demo site server and update to 1.X.X
 
 Checking:
+
 - Check all tags is fine on https://hub.docker.com/r/louislam/uptime-kuma/tags
 - Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 / armv7)
-- Try clean install with Node.js 
+- Try clean installation with Node.js
 
 ### Release Wiki
 
 #### Setup Repo
-```
+
+```bash
 git clone https://github.com/louislam/uptime-kuma-wiki.git
 cd uptime-kuma-wiki
 git remote add production https://github.com/louislam/uptime-kuma.wiki.git
 ```
 
 #### Push to Production Wiki
-```
+
+```bash
 git pull
 git push production master
 ```
-

README.md

@@ -17,13 +17,13 @@ Try it!
 
 https://demo.uptime.kuma.pet
 
-It is a temporary live demo, all data will be deleted after 10 minutes. The server is located at Tokyo, so if you live far from there it may affect your experience. I suggest that you should install and try it out for the best demo experience.
+It is a temporary live demo, all data will be deleted after 10 minutes. The server is located in Tokyo, so if you live far from there, it may affect your experience. I suggest that you should install and try it out for the best demo experience.
 
 VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
 
 ## ⭐ Features
 
-* Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record / Push.
+* Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / Ping / DNS Record / Push / Steam Game Server.
 * Fancy, Reactive, Fast UI/UX.
 * Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and [70+ notification services, click here for the full list](https://github.com/louislam/uptime-kuma/tree/master/src/components/notifications).
 * 20 second intervals.
@@ -41,6 +41,8 @@ docker volume create uptime-kuma
 docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma:1
 ```
 
+⚠️ Please use a **local volume** only. Other types such as NFS are not supported.
+
 Browse to http://localhost:3001 after starting.
 
 ### 💪🏻 Non-Docker
@@ -67,7 +69,7 @@ Browse to http://localhost:3001 after starting.
 
 ### Advanced Installation
 
-If you need more options or need to browse via a reserve proxy, please read:
+If you need more options or need to browse via a reverse proxy, please read:
 
 https://github.com/louislam/uptime-kuma/wiki/%F0%9F%94%A7-How-to-Install
 
@@ -87,6 +89,12 @@ Project Plan:
 
 https://github.com/louislam/uptime-kuma/projects/1
 
+## ❤️ Sponsors
+
+Thank you so much! (GitHub Sponsors will be updated manually. OpenCollective sponsors will be updated automatically, the list will be cached by GitHub though. It may need some time to be updated)
+
+<img src="https://uptime.kuma.pet/sponsors?v=3" alt />
+
 ## 🖼 More Screenshots
 
 Light Mode:
@@ -120,7 +128,7 @@ If you love this project, please consider giving me a ⭐.
 
 ### Issues Page
 
-You can discuss or ask for help in [Issues](https://github.com/louislam/uptime-kuma/issues).
+You can discuss or ask for help in [issues](https://github.com/louislam/uptime-kuma/issues).
 
 ### Subreddit
 
@@ -132,8 +140,8 @@ https://www.reddit.com/r/UptimeKuma/
 
 If you want to report a bug or request a new feature. Free feel to open a [new issue](https://github.com/louislam/uptime-kuma/issues).
 
-If you want to translate Uptime Kuma into your langauge, please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages
+If you want to translate Uptime Kuma into your language, please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages
 
 If you want to modify Uptime Kuma, this guideline may be useful for you: https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md
 
-English proofreading is needed too because my grammar is not that great sadly. Feel free to correct my grammar in this readme, source code, or wiki.
+English proofreading is needed too because my grammar is not that great, sadly. Feel free to correct my grammar in this README, source code, or wiki.

config/jest-debug-env.js

@@ -0,0 +1,33 @@
+const PuppeteerEnvironment = require("jest-environment-puppeteer");
+const util = require("util");
+
+class DebugEnv extends PuppeteerEnvironment {
+    async handleTestEvent(event, state) {
+        const ignoredEvents = [
+            "setup",
+            "add_hook",
+            "start_describe_definition",
+            "add_test",
+            "finish_describe_definition",
+            "run_start",
+            "run_describe_start",
+            "test_start",
+            "hook_start",
+            "hook_success",
+            "test_fn_start",
+            "test_fn_success",
+            "test_done",
+            "run_describe_finish",
+            "run_finish",
+            "teardown",
+            "test_fn_failure",
+        ];
+        if (!ignoredEvents.includes(event.name)) {
+            console.log(
+                new Date().toString() + ` Unhandled event [${event.name}] ` + util.inspect(event)
+            );
+        }
+    }
+}
+
+module.exports = DebugEnv;

config/jest-puppeteer.config.js

@@ -1,6 +1,20 @@
 module.exports = {
     "launch": {
+        "dumpio": true,
+        "slowMo": 500,
         "headless": process.env.HEADLESS_TEST || false,
         "userDataDir": "./data/test-chrome-profile",
+        args: [
+            "--disable-setuid-sandbox",
+            "--disable-gpu",
+            "--disable-dev-shm-usage",
+            "--no-default-browser-check",
+            "--no-experiments",
+            "--no-first-run",
+            "--no-pings",
+            "--no-sandbox",
+            "--no-zygote",
+            "--single-process",
+        ],
     }
 };

config/jest.config.js

@@ -5,6 +5,7 @@ module.exports = {
         "__DEV__": true
     },
     "testRegex": "./test/e2e.spec.js",
+    "testEnvironment": "./config/jest-debug-env.js",
     "rootDir": "..",
     "testTimeout": 30000,
 };

db/patch-monitor-basic-auth.sql

@@ -0,0 +1,10 @@
+-- You should not modify if this have pushed to Github, unless it does serious wrong with the db.
+BEGIN TRANSACTION;
+
+ALTER TABLE monitor
+    ADD basic_auth_user TEXT default null;
+
+ALTER TABLE monitor
+    ADD basic_auth_pass TEXT default null;
+
+COMMIT;

docker/alpine-base.dockerfile

@@ -4,5 +4,5 @@ WORKDIR /app
 
 # Install apprise, iputils for non-root ping, setpriv
 RUN apk add --no-cache iputils setpriv dumb-init python3 py3-cryptography py3-pip py3-six py3-yaml py3-click py3-markdown py3-requests py3-requests-oauthlib && \
-    pip3 --no-cache-dir install apprise && \
+    pip3 --no-cache-dir install apprise==0.9.6 && \
     rm -rf /root/.cache

docker/debian-base.dockerfile

@@ -4,9 +4,9 @@ FROM node:14-buster-slim
 WORKDIR /app
 
 # Install Apprise, add sqlite3 cli for debugging in the future, iputils-ping for ping, util-linux for setpriv
-# Stupid python3 and python3-pip actually install a lot of useless things into Debian, specific --no-install-recommends to skip them, make the base even smaller than alpine!
+# Stupid python3 and python3-pip actually install a lot of useless things into Debian, specify --no-install-recommends to skip them, make the base even smaller than alpine!
 RUN apt update && \
     apt --yes --no-install-recommends install python3 python3-pip python3-cryptography python3-six python3-yaml python3-click python3-markdown python3-requests python3-requests-oauthlib \
         sqlite3 iputils-ping util-linux dumb-init && \
-    pip3 --no-cache-dir install apprise && \
+    pip3 --no-cache-dir install apprise==0.9.6 && \
     rm -rf /var/lib/apt/lists/*

docker/dockerfile

@@ -33,7 +33,7 @@ RUN apt update && \
 
 COPY --from=build /app /app
 
-ARG VERSION=1.9.1
+ARG VERSION
 ARG GITHUB_TOKEN
 ARG TARGETARCH
 ARG PLATFORM=debian

extra/close-incorrect-issue.js

@@ -0,0 +1,57 @@
+const github = require("@actions/github");
+
+(async () => {
+    try {
+        const token = process.argv[2];
+        const issueNumber = process.argv[3];
+        const username = process.argv[4];
+
+        const client = github.getOctokit(token).rest;
+
+        const issue = {
+            owner: "louislam",
+            repo: "uptime-kuma",
+            number: issueNumber,
+        };
+
+        const labels = (
+            await client.issues.listLabelsOnIssue({
+                owner: issue.owner,
+                repo: issue.repo,
+                issue_number: issue.number
+            })
+        ).data.map(({ name }) => name);
+
+        if (labels.length === 0) {
+            console.log("Bad format here");
+
+            await client.issues.addLabels({
+                owner: issue.owner,
+                repo: issue.repo,
+                issue_number: issue.number,
+                labels: ["invalid-format"]
+            });
+
+            // Add the issue closing comment
+            await client.issues.createComment({
+                owner: issue.owner,
+                repo: issue.repo,
+                issue_number: issue.number,
+                body: `@${username}: Hello! :wave:\n\nThis issue is being automatically closed because it does not follow the issue template. Please DO NOT open a blank issue.`
+            });
+
+            // Close the issue
+            await client.issues.update({
+                owner: issue.owner,
+                repo: issue.repo,
+                issue_number: issue.number,
+                state: "closed"
+            });
+        } else {
+            console.log("Pass!");
+        }
+    } catch (e) {
+        console.log(e);
+    }
+
+})();

extra/healthcheck.js

@@ -1,7 +1,7 @@
 /*
  * This script should be run after a period of time (180s), because the server may need some time to prepare.
  */
-const { FBSD } = require("../server/util-server");
+const { BSD } = require("../server/util-server");
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 
@@ -21,7 +21,7 @@ if (sslKey && sslCert) {
 let hostname = process.env.UPTIME_KUMA_HOST;
 
 // Also read HOST if not FreeBSD, as HOST is a system environment variable in FreeBSD
-if (!hostname && !FBSD) {
+if (!hostname && !BSD) {
     hostname = process.env.HOST;
 }
 

extra/remove-2fa.js

@@ -0,0 +1,60 @@
+console.log("== Uptime Kuma Remove 2FA Tool ==");
+console.log("Loading the database");
+
+const Database = require("../server/database");
+const { R } = require("redbean-node");
+const readline = require("readline");
+const TwoFA = require("../server/2fa");
+const args = require("args-parser")(process.argv);
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+});
+
+const main = async () => {
+    Database.init(args);
+    await Database.connect();
+
+    try {
+        // No need to actually reset the password for testing, just make sure no connection problem. It is ok for now.
+        if (!process.env.TEST_BACKEND) {
+            const user = await R.findOne("user");
+            if (! user) {
+                throw new Error("user not found, have you installed?");
+            }
+
+            console.log("Found user: " + user.username);
+
+            let ans = await question("Are you sure want to remove 2FA? [y/N]");
+
+            if (ans.toLowerCase() === "y") {
+                await TwoFA.disable2FA(user.id);
+                console.log("2FA has been removed successfully.");
+            }
+
+        }
+    } catch (e) {
+        console.error("Error: " + e.message);
+    }
+
+    await Database.close();
+    rl.close();
+
+    console.log("Finished.");
+};
+
+function question(question) {
+    return new Promise((resolve) => {
+        rl.question(question, (answer) => {
+            resolve(answer);
+        });
+    });
+}
+
+if (!process.env.TEST_BACKEND) {
+    main();
+}
+
+module.exports = {
+    main,
+};

package.json

@@ -1,13 +1,13 @@
 {
     "name": "uptime-kuma",
-    "version": "1.10.0",
+    "version": "1.11.3",
     "license": "MIT",
     "repository": {
         "type": "git",
         "url": "https://github.com/louislam/uptime-kuma.git"
     },
     "engines": {
-        "node": "14.*"
+        "node": "14.* || >=16.*"
     },
     "scripts": {
         "install-legacy": "npm install --legacy-peer-deps",
@@ -22,25 +22,26 @@
         "build": "vite build --config ./config/vite.config.js",
         "test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
         "test-with-build": "npm run build && npm test",
-        "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend && jest --config=./config/jest.config.js",
+        "jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend",
         "jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js",
         "jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js",
         "tsc": "tsc",
         "vite-preview-dist": "vite preview --host --config ./config/vite.config.js",
-        "build-docker": "npm run build-docker-debian && npm run build-docker-alpine",
+        "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine",
         "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push",
         "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push",
-        "build-docker-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.10.0-alpine --target release . --push",
+        "build-docker-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.11.3-alpine --target release . --push",
-        "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.10.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.10.0-debian --target release . --push",
+        "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.11.3 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.11.3-debian --target release . --push",
-        "build-docker-nightly": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
+        "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push",
         "build-docker-nightly-alpine": "docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push",
         "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain",
-        "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
+        "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain",
-        "setup": "git checkout 1.10.0 && npm ci --production && npm run download-dist",
+        "setup": "git checkout 1.11.3 && npm ci --production && npm run download-dist",
         "download-dist": "node extra/download-dist.js",
         "update-version": "node extra/update-version.js",
         "mark-as-nightly": "node extra/mark-as-nightly.js",
         "reset-password": "node extra/reset-password.js",
+        "remove-2fa": "node extra/remove-2fa.js",
         "compile-install-script": "@powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./extra/compile-install-script.ps1",
         "test-install-script-centos7": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/centos7.dockerfile .",
         "test-install-script-alpine3": "npm run compile-install-script && docker build --progress plain -f test/test_install_script/alpine3.dockerfile .",
@@ -49,20 +50,21 @@
         "test-nodejs16": "docker build --progress plain -f test/ubuntu-nodejs16.dockerfile .",
         "simple-dns-server": "node extra/simple-dns-server.js",
         "update-language-files-with-base-lang": "cd extra/update-language-files && node index.js %npm_config_base_lang% && eslint ../../src/languages/**.js --fix",
-        "update-language-files": "cd extra/update-language-files && node index.js && eslint ../../src/languages/**.js --fix"
+        "update-language-files": "cd extra/update-language-files && node index.js && eslint ../../src/languages/**.js --fix",
+        "ncu-patch": "ncu -u -t patch"
     },
     "dependencies": {
         "@fortawesome/fontawesome-svg-core": "~1.2.36",
         "@fortawesome/free-regular-svg-icons": "~5.15.4",
         "@fortawesome/free-solid-svg-icons": "~5.15.4",
-        "@fortawesome/vue-fontawesome": "~3.0.0-4",
+        "@fortawesome/vue-fontawesome": "~3.0.0-5",
-        "@louislam/sqlite3": "~6.0.0",
+        "@louislam/sqlite3": "~6.0.1",
         "@popperjs/core": "~2.10.2",
         "args-parser": "~1.3.0",
         "axios": "~0.21.4",
         "bcryptjs": "~2.4.3",
         "bootstrap": "5.1.3",
-        "bree": "~6.3.1",
+        "bree": "~7.1.0",
         "chardet": "^1.3.0",
         "chart.js": "~3.6.0",
         "chartjs-adapter-dayjs": "~1.0.0",
@@ -73,7 +75,7 @@
         "express": "~4.17.1",
         "express-basic-auth": "~1.2.0",
         "form-data": "~4.0.0",
-        "http-graceful-shutdown": "~3.1.4",
+        "http-graceful-shutdown": "~3.1.5",
         "iconv-lite": "^0.6.3",
         "jsonwebtoken": "~8.5.1",
         "jwt-decode": "^3.1.2",
@@ -83,10 +85,10 @@
         "notp": "~2.0.3",
         "password-hash": "~1.2.2",
         "postcss-rtlcss": "~3.4.1",
-        "postcss-scss": "~4.0.1",
+        "postcss-scss": "~4.0.2",
         "prom-client": "~13.2.0",
         "prometheus-api-metrics": "~3.2.0",
-        "qrcode": "~1.4.4",
+        "qrcode": "~1.5.0",
         "redbean-node": "0.1.3",
         "socket.io": "~4.2.0",
         "socket.io-client": "~4.2.0",
@@ -103,30 +105,31 @@
         "vue-image-crop-upload": "~3.0.3",
         "vue-multiselect": "~3.0.0-alpha.2",
         "vue-qrcode": "~1.0.0",
-        "vue-router": "~4.0.11",
+        "vue-router": "~4.0.12",
-        "vue-toastification": "~2.0.0-rc.1",
+        "vue-toastification": "~2.0.0-rc.5",
         "vuedraggable": "~4.1.0"
     },
     "devDependencies": {
-        "@babel/eslint-parser": "~7.15.7",
+        "@actions/github": "~5.0.0",
+        "@babel/eslint-parser": "~7.15.8",
         "@babel/preset-env": "^7.15.8",
         "@types/bootstrap": "~5.1.6",
-        "@vitejs/plugin-legacy": "~1.6.2",
+        "@vitejs/plugin-legacy": "~1.6.3",
         "@vitejs/plugin-vue": "~1.9.4",
-        "@vue/compiler-sfc": "~3.2.20",
+        "@vue/compiler-sfc": "~3.2.22",
         "babel-plugin-rewire": "~1.2.0",
-        "core-js": "~3.18.1",
+        "core-js": "~3.18.3",
         "cross-env": "~7.0.3",
         "dns2": "~2.0.1",
         "eslint": "~7.32.0",
         "eslint-plugin-vue": "~7.18.0",
-        "jest": "~27.2.4",
+        "jest": "~27.2.5",
         "jest-puppeteer": "~6.0.0",
         "puppeteer": "~10.4.0",
         "sass": "~1.42.1",
         "stylelint": "~13.13.1",
         "stylelint-config-standard": "~22.0.0",
-        "typescript": "~4.4.3",
+        "typescript": "~4.4.4",
-        "vite": "~2.6.13"
+        "vite": "~2.6.14"
     }
 }

server/2fa.js

@@ -0,0 +1,14 @@
+const { checkLogin } = require("./util-server");
+const { R } = require("redbean-node");
+
+class TwoFA {
+
+    static async disable2FA(userID) {
+        return await R.exec("UPDATE `user` SET twofa_status = 0 WHERE id = ? ", [
+            userID,
+        ]);
+    }
+
+}
+
+module.exports = TwoFA;

server/database.js

@@ -52,6 +52,7 @@ class Database {
         "patch-http-monitor-method-body-and-headers.sql": true,
         "patch-2fa-invalidate-used-token.sql": true,
         "patch-notification_sent_history.sql": true,
+        "patch-monitor-basic-auth.sql": true,
         "patch-added-mqtt-monitor.sql": true,
     }
 
@@ -80,7 +81,7 @@ class Database {
         console.log(`Data Dir: ${Database.dataDir}`);
     }
 
-    static async connect() {
+    static async connect(testMode = false) {
         const acquireConnectionTimeout = 120 * 1000;
 
         const Dialect = require("knex/lib/dialects/sqlite3/index.js");
@@ -113,8 +114,13 @@ class Database {
         await R.autoloadModels("./server/model");
 
         await R.exec("PRAGMA foreign_keys = ON");
-        // Change to WAL
+        if (testMode) {
-        await R.exec("PRAGMA journal_mode = WAL");
+            // Change to MEMORY
+            await R.exec("PRAGMA journal_mode = MEMORY");
+        } else {
+            // Change to WAL
+            await R.exec("PRAGMA journal_mode = WAL");
+        }
         await R.exec("PRAGMA cache_size = -12000");
         await R.exec("PRAGMA auto_vacuum = FULL");
 

server/model/monitor.js

@@ -58,6 +58,8 @@ class Monitor extends BeanModel {
             method: this.method,
             body: this.body,
             headers: this.headers,
+            basic_auth_user: this.basic_auth_user,
+            basic_auth_pass: this.basic_auth_pass,
             hostname: this.hostname,
             port: this.port,
             maxretries: this.maxretries,
@@ -85,6 +87,15 @@ class Monitor extends BeanModel {
         };
     }
 
+    /**
+     * Encode user and password to Base64 encoding
+     * for HTTP "basic" auth, as per RFC-7617
+     * @returns {string}
+     */
+    encodeBase64(user, pass) {
+        return Buffer.from(user + ":" + pass).toString("base64");
+    }
+
     /**
      * Parse to boolean
      * @returns {boolean}
@@ -146,15 +157,26 @@ class Monitor extends BeanModel {
                     // Do not do any queries/high loading things before the "bean.ping"
                     let startTime = dayjs().valueOf();
 
+                    // HTTP basic auth
+                    let basicAuthHeader = {};
+                    if (this.basic_auth_user) {
+                        basicAuthHeader = {
+                            "Authorization": "Basic " + this.encodeBase64(this.basic_auth_user, this.basic_auth_pass),
+                        };
+                    }
+
+                    debug(`[${this.name}] Prepare Options for axios`);
+
                     const options = {
                         url: this.url,
                         method: (this.method || "get").toLowerCase(),
                         ...(this.body ? { data: JSON.parse(this.body) } : {}),
                         timeout: this.interval * 1000 * 0.8,
                         headers: {
-                            "Accept": "*/*",
+                            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9",
                             "User-Agent": "Uptime-Kuma/" + version,
                             ...(this.headers ? JSON.parse(this.headers) : {}),
+                            ...(basicAuthHeader),
                         },
                         httpsAgent: new https.Agent({
                             maxCachedSessions: 0,      // Use Custom agent to disable session reuse (https://github.com/nodejs/node/issues/3940)
@@ -165,6 +187,8 @@ class Monitor extends BeanModel {
                             return checkStatusCode(status, this.getAcceptedStatuscodes());
                         },
                     };
+
+                    debug(`[${this.name}] Axios Request`);
                     let res = await axios.request(options);
                     bean.msg = `${res.status} - ${res.statusText}`;
                     bean.ping = dayjs().valueOf() - startTime;
@@ -172,12 +196,13 @@ class Monitor extends BeanModel {
                     // Check certificate if https is used
                     let certInfoStartTime = dayjs().valueOf();
                     if (this.getUrl()?.protocol === "https:") {
+                        debug(`[${this.name}] Check cert`);
                         try {
                             let tlsInfoObject = checkCertificate(res);
                             tlsInfo = await this.updateTlsInfo(tlsInfoObject);
 
                             if (!this.getIgnoreTls()) {
-                                debug("call sendCertNotification");
+                                debug(`[${this.name}] call sendCertNotification`);
                                 await this.sendCertNotification(tlsInfoObject);
                             }
 
@@ -276,6 +301,9 @@ class Monitor extends BeanModel {
                     debug("heartbeatCount" + heartbeatCount + " " + time);
 
                     if (heartbeatCount <= 0) {
+                        // Fix #922, since previous heartbeat could be inserted by api, it should get from database
+                        previousBeat = await Monitor.getPreviousHeartbeat(this.id);
+
                         throw new Error("No heartbeat in the time window");
                     } else {
                         // No need to insert successful heartbeat for push type, so end here
@@ -368,15 +396,19 @@ class Monitor extends BeanModel {
 
             let beatInterval = this.interval;
 
+            debug(`[${this.name}] Check isImportant`);
             let isImportant = Monitor.isImportantBeat(isFirstBeat, previousBeat?.status, bean.status);
 
             // Mark as important if status changed, ignore pending pings,
             // Don't notify if disrupted changes to up
             if (isImportant) {
                 bean.important = true;
+
+                debug(`[${this.name}] sendNotification`);
                 await Monitor.sendNotification(isFirstBeat, this, bean);
 
                 // Clear Status Page Cache
+                debug(`[${this.name}] apicache clear`);
                 apicache.clear();
 
             } else {
@@ -394,10 +426,14 @@ class Monitor extends BeanModel {
                 console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Interval: ${beatInterval} seconds | Type: ${this.type}`);
             }
 
+            debug(`[${this.name}] Send to socket`);
             io.to(this.user_id).emit("heartbeat", bean.toJSON());
             Monitor.sendStats(io, this.id, this.user_id);
 
+            debug(`[${this.name}] Store`);
             await R.store(bean);
+
+            debug(`[${this.name}] prometheus.update`);
             prometheus.update(bean, tlsInfo);
 
             previousBeat = bean;
@@ -411,7 +447,10 @@ class Monitor extends BeanModel {
                     }
                 }
 
+                debug(`[${this.name}] SetTimeout for next check.`);
                 this.heartbeatInterval = setTimeout(safeBeat, beatInterval * 1000);
+            } else {
+                console.log(`[${this.name}] isStop = true, no next check.`);
             }
 
         };
@@ -732,6 +771,15 @@ class Monitor extends BeanModel {
             debug("No notification, no need to send cert notification");
         }
     }
+
+    static async getPreviousHeartbeat(monitorID) {
+        return await R.getRow(`
+            SELECT status, time FROM heartbeat
+            WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
+        `, [
+            monitorID
+        ]);
+    }
 }
 
 module.exports = Monitor;

server/notification-providers/dingding.js

@@ -14,8 +14,8 @@ class DingDing extends NotificationProvider {
                 let params = {
                     msgtype: "markdown",
                     markdown: {
-                        title: monitorJSON["name"],
+                        title: `[${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]}`,
-                        text: `## [${this.statusToString(heartbeatJSON["status"])}] \n > ${heartbeatJSON["msg"]}  \n > Time(UTC):${heartbeatJSON["time"]}`,
+                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n > ${heartbeatJSON["msg"]}  \n > Time(UTC):${heartbeatJSON["time"]}`,
                     }
                 };
                 if (this.sendToDingDing(notification, params)) {

server/notification-providers/google-chat.js

@@ -0,0 +1,47 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { setting } = require("../util-server");
+const { getMonitorRelativeURL } = require("../../src/util");
+const { DOWN, UP } = require("../../src/util");
+
+class GoogleChat extends NotificationProvider {
+
+    name = "GoogleChat";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            // Google Chat message formatting: https://developers.google.com/chat/api/guides/message-formats/basic
+
+            let textMsg = ''
+            if (heartbeatJSON && heartbeatJSON.status === UP) {
+                textMsg = `✅ Application is back online\n`;
+            } else if (heartbeatJSON && heartbeatJSON.status === DOWN) {
+                textMsg = `🔴 Application went down\n`;
+            }
+
+            if (monitorJSON && monitorJSON.name) {
+                textMsg += `*${monitorJSON.name}*\n`;
+            }
+
+            textMsg += `${msg}`;
+
+            const baseURL = await setting("primaryBaseURL");
+            if (baseURL && monitorJSON) {
+                textMsg += `\n${baseURL + getMonitorRelativeURL(monitorJSON.id)}`;
+            }
+
+            const data = {
+                "text": textMsg,
+            };
+
+            await axios.post(notification.googleChatWebhookURL, data);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+    }
+}
+
+module.exports = GoogleChat;

server/notification-providers/pushover.js

@@ -7,12 +7,12 @@ class Pushover extends NotificationProvider {
 
     async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
         let okMsg = "Sent Successfully.";
-        let pushoverlink = "https://api.pushover.net/1/messages.json"
+        let pushoverlink = "https://api.pushover.net/1/messages.json";
 
         try {
             if (heartbeatJSON == null) {
                 let data = {
-                    "message": "<b>Uptime Kuma Pushover testing successful.</b>",
+                    "message": msg,
                     "user": notification.pushoveruserkey,
                     "token": notification.pushoverapptoken,
                     "sound": notification.pushoversounds,
@@ -21,8 +21,8 @@ class Pushover extends NotificationProvider {
                     "retry": "30",
                     "expire": "3600",
                     "html": 1,
-                }
+                };
-                await axios.post(pushoverlink, data)
+                await axios.post(pushoverlink, data);
                 return okMsg;
             }
 
@@ -36,11 +36,11 @@ class Pushover extends NotificationProvider {
                 "retry": "30",
                 "expire": "3600",
                 "html": 1,
-            }
+            };
-            await axios.post(pushoverlink, data)
+            await axios.post(pushoverlink, data);
             return okMsg;
         } catch (error) {
-            this.throwGeneralAxiosError(error)
+            this.throwGeneralAxiosError(error);
         }
 
     }

server/notification-providers/serwersms.js

@@ -0,0 +1,44 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+
+class SerwerSMS extends NotificationProvider {
+
+    name = "serwersms";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        try {
+            let config = {
+                headers: {
+                    "Content-Type": "application/json",
+                }
+            };
+            let data = {
+                "username": notification.serwersmsUsername,
+                "password": notification.serwersmsPassword,
+                "phone": notification.serwersmsPhoneNumber,
+                "text": msg.replace(/[^\x00-\x7F]/g, ""),
+                "sender": notification.serwersmsSenderName,
+            };
+
+            let resp = await axios.post("https://api2.serwersms.pl/messages/send_sms", data, config);
+
+            if (!resp.data.success) {
+                if (resp.data.error) {
+                    let error = `SerwerSMS.pl API returned error code ${resp.data.error.code} (${resp.data.error.type}) with error message: ${resp.data.error.message}`;
+                    this.throwGeneralAxiosError(error);
+                } else {
+                    let error = "SerwerSMS.pl API returned an unexpected response";
+                    this.throwGeneralAxiosError(error);
+                }
+            }
+
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+}
+
+module.exports = SerwerSMS;

server/notification-providers/smtp.js

@@ -14,9 +14,21 @@ class SMTP extends NotificationProvider {
             secure: notification.smtpSecure,
             tls: {
                 rejectUnauthorized: notification.smtpIgnoreTLSError || false,
-            },
+            }
         };
 
+        // Fix #1129
+        if (notification.smtpDkimDomain) {
+            config.dkim = {
+                domainName: notification.smtpDkimDomain,
+                keySelector: notification.smtpDkimKeySelector,
+                privateKey: notification.smtpDkimPrivateKey,
+                hashAlgo: notification.smtpDkimHashAlgo,
+                headerFieldNames: notification.smtpDkimheaderFieldNames,
+                skipFields: notification.smtpDkimskipFields,
+            };
+        }
+
         // Should fix the issue in https://github.com/louislam/uptime-kuma/issues/26#issuecomment-896373904
         if (notification.smtpUsername || notification.smtpPassword) {
             config.auth = {

server/notification-providers/stackfield.js

@@ -0,0 +1,41 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { setting } = require("../util-server");
+const { getMonitorRelativeURL } = require("../../src/util");
+
+class Stackfield extends NotificationProvider {
+
+    name = "stackfield";
+
+    async send(notification, msg, monitorJSON = null) {
+        let okMsg = "Sent Successfully.";
+        try {
+            // Stackfield message formatting: https://www.stackfield.com/help/formatting-messages-2001
+
+            let textMsg = "+Uptime Kuma Alert+";
+
+            if (monitorJSON && monitorJSON.name) {
+                textMsg += `\n*${monitorJSON.name}*`;
+            }
+
+            textMsg += `\n${msg}`;
+
+            const baseURL = await setting("primaryBaseURL");
+            if (baseURL) {
+                textMsg += `\n${baseURL + getMonitorRelativeURL(monitorJSON.id)}`;
+            }
+
+            const data = {
+                "Title": textMsg,
+            };
+
+            await axios.post(notification.stackfieldwebhookURL, data);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+
+    }
+}
+
+module.exports = Stackfield;

server/notification-providers/wecom.js

@@ -0,0 +1,47 @@
+const NotificationProvider = require("./notification-provider");
+const axios = require("axios");
+const { DOWN, UP } = require("../../src/util");
+
+class WeCom extends NotificationProvider {
+
+    name = "WeCom";
+
+    async send(notification, msg, monitorJSON = null, heartbeatJSON = null) {
+        let okMsg = "Sent Successfully.";
+
+        try {
+            let WeComUrl = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=" + notification.weComBotKey;
+            let config = {
+                headers: {
+                    "Content-Type": "application/json"
+                }
+            };
+            let body = this.composeMessage(heartbeatJSON, msg);
+            await axios.post(WeComUrl, body, config);
+            return okMsg;
+        } catch (error) {
+            this.throwGeneralAxiosError(error);
+        }
+    }
+
+    composeMessage(heartbeatJSON, msg) {
+        let title;
+        if (msg != null && heartbeatJSON != null && heartbeatJSON['status'] == UP) {
+            title = "UptimeKuma Monitor Up";
+        }
+        if (msg != null && heartbeatJSON != null && heartbeatJSON["status"] == DOWN) {
+            title = "UptimeKuma Monitor Down";
+        }
+        if (msg != null) {
+            title = "UptimeKuma Message";
+        }
+        return {
+            msgtype: "text",
+            text: {
+                content: title + msg
+            }
+        };
+    }
+}
+
+module.exports = WeCom;

server/notification.js

@@ -23,6 +23,10 @@ const Feishu = require("./notification-providers/feishu");
 const AliyunSms = require("./notification-providers/aliyun-sms");
 const DingDing = require("./notification-providers/dingding");
 const Bark = require("./notification-providers/bark");
+const SerwerSMS = require("./notification-providers/serwersms");
+const Stackfield = require("./notification-providers/stackfield");
+const WeCom = require("./notification-providers/wecom");
+const GoogleChat = require("./notification-providers/google-chat");
 
 class Notification {
 
@@ -58,6 +62,10 @@ class Notification {
             new Telegram(),
             new Webhook(),
             new Bark(),
+            new SerwerSMS(),
+            new Stackfield(),
+            new WeCom(),
+            new GoogleChat()
         ];
 
         for (let item of list) {

server/ping-lite.js

@@ -48,7 +48,7 @@ function Ping(host, options) {
         this._args = (options.args) ? options.args : [ "-n", "-t", timeout, "-c", "1", host ];
         this._regmatch = /=([0-9.]+?) ms/;
 
-    } else if (util.FBSD) {
+    } else if (util.BSD) {
         this._bin = "/sbin/ping";
 
         const defaultArgs = [ "-n", "-t", timeout, "-c", "1", host ];

server/routers/api-router.js

@@ -31,12 +31,7 @@ router.get("/api/push/:pushToken", async (request, response) => {
             throw new Error("Monitor not found or not active.");
         }
 
-        const previousHeartbeat = await R.getRow(`
+        const previousHeartbeat = await Monitor.getPreviousHeartbeat(monitor.id);
-            SELECT status, time FROM heartbeat
-            WHERE id = (select MAX(id) from heartbeat where monitor_id = ?)
-        `, [
-            monitor.id
-        ]);
 
         let status = UP;
         if (monitor.isUpsideDown()) {
@@ -101,6 +96,10 @@ router.get("/api/status-page/config", async (_request, response) => {
         config.statusPagePublished = true;
     }
 
+    if (! config.statusPageTags) {
+        config.statusPageTags = false;
+    }
+
     if (! config.title) {
         config.title = "Uptime Kuma";
     }
@@ -140,10 +139,28 @@ router.get("/api/status-page/monitor-list", cache("5 minutes"), async (_request,
     try {
         await checkPublished();
         const publicGroupList = [];
-        let list = await R.find("group", " public = 1 ORDER BY weight ");
+        const tagsVisible = (await getSettings("statusPage")).statusPageTags;
-
+        const list = await R.find("group", " public = 1 ORDER BY weight ");
         for (let groupBean of list) {
-            publicGroupList.push(await groupBean.toPublicJSON());
+            let monitorGroup = await groupBean.toPublicJSON();
+            if (tagsVisible) {
+                monitorGroup.monitorList = await Promise.all(monitorGroup.monitorList.map(async (monitor) => {
+                    // Includes tags as an array in response, allows for tags to be displayed on public status page
+                    const tags = await R.getAll(
+                            `SELECT monitor_tag.monitor_id, monitor_tag.value, tag.name, tag.color
+                            FROM monitor_tag
+                            JOIN tag
+                            ON monitor_tag.tag_id = tag.id
+                            WHERE monitor_tag.monitor_id = ?`, [monitor.id]
+                    );
+                    return {
+                        ...monitor,
+                        tags: tags
+                    };
+                }));
+            }
+
+            publicGroupList.push(monitorGroup);
         }
 
         response.json(publicGroupList);

server/server.js

@@ -41,7 +41,7 @@ console.log("Importing this project modules");
 debug("Importing Monitor");
 const Monitor = require("./model/monitor");
 debug("Importing Settings");
-const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, FBSD, errorLog } = require("./util-server");
+const { getSettings, setSettings, setting, initJWTSecret, checkLogin, startUnitTest, BSD, errorLog } = require("./util-server");
 
 debug("Importing Notification");
 const { Notification } = require("./notification");
@@ -120,6 +120,7 @@ module.exports.io = io;
 const { sendNotificationList, sendHeartbeatList, sendImportantHeartbeatList, sendInfo } = require("./client");
 const { statusPageSocketHandler } = require("./socket-handlers/status-page-socket-handler");
 const databaseSocketHandler = require("./socket-handlers/database-socket-handler");
+const TwoFA = require("./2fa");
 
 app.use(express.json());
 
@@ -176,7 +177,7 @@ exports.entryPage = "dashboard";
 
 (async () => {
     Database.init(args);
-    await initDatabase();
+    await initDatabase(testMode);
 
     exports.entryPage = await setting("entryPage");
 
@@ -420,10 +421,7 @@ exports.entryPage = "dashboard";
         socket.on("disable2FA", async (callback) => {
             try {
                 checkLogin(socket);
-
+                await TwoFA.disable2FA(socket.userID);
-                await R.exec("UPDATE `user` SET twofa_status = 0 WHERE id = ? ", [
-                    socket.userID,
-                ]);
 
                 callback({
                     ok: true,
@@ -541,8 +539,8 @@ exports.entryPage = "dashboard";
 
                 await updateMonitorNotification(bean.id, notificationIDList);
 
-                await startMonitor(socket.userID, bean.id);
                 await sendMonitorList(socket);
+                await startMonitor(socket.userID, bean.id);
 
                 callback({
                     ok: true,
@@ -575,6 +573,8 @@ exports.entryPage = "dashboard";
                 bean.method = monitor.method;
                 bean.body = monitor.body;
                 bean.headers = monitor.headers;
+                bean.basic_auth_user = monitor.basic_auth_user;
+                bean.basic_auth_pass = monitor.basic_auth_pass;
                 bean.interval = monitor.interval;
                 bean.retryInterval = monitor.retryInterval;
                 bean.hostname = monitor.hostname;
@@ -1143,6 +1143,8 @@ exports.entryPage = "dashboard";
                                 method: monitorListData[i].method || "GET",
                                 body: monitorListData[i].body,
                                 headers: monitorListData[i].headers,
+                                basic_auth_user: monitorListData[i].basic_auth_user,
+                                basic_auth_pass: monitorListData[i].basic_auth_pass,
                                 interval: monitorListData[i].interval,
                                 retryInterval: retryInterval,
                                 hostname: monitorListData[i].hostname,
@@ -1421,14 +1423,14 @@ async function getMonitorJSONList(userID) {
     return result;
 }
 
-async function initDatabase() {
+async function initDatabase(testMode = false) {
     if (! fs.existsSync(Database.path)) {
         console.log("Copying Database");
         fs.copyFileSync(Database.templatePath, Database.path);
     }
 
     console.log("Connecting to the Database");
-    await Database.connect();
+    await Database.connect(testMode);
     console.log("Connected");
 
     // Patch the database

server/util-server.js

@@ -17,7 +17,7 @@ const mqtt = require("mqtt");
 exports.WIN = /^win/.test(process.platform);
 exports.LIN = /^linux/.test(process.platform);
 exports.MAC = /^darwin/.test(process.platform);
-exports.FBSD = /^freebsd/.test(process.platform);
+exports.BSD = /bsd$/.test(process.platform);
 
 /**
  * Init or reset JWT secret
@@ -239,8 +239,13 @@ const getDaysRemaining = (validFrom, validTo) => {
 // param: info -  the chain obtained from getPeerCertificate()
 const parseCertificateInfo = function (info) {
     let link = info;
+    let i = 0;
+
+    const existingList = {};
 
     while (link) {
+        debug(`[${i}] ${link.fingerprint}`);
+
         if (!link.valid_from || !link.valid_to) {
             break;
         }
@@ -248,15 +253,24 @@ const parseCertificateInfo = function (info) {
         link.validFor = link.subjectaltname?.replace(/DNS:|IP Address:/g, "").split(", ");
         link.daysRemaining = getDaysRemaining(new Date(), link.validTo);
 
+        existingList[link.fingerprint] = true;
+
         // Move up the chain until loop is encountered
         if (link.issuerCertificate == null) {
             break;
-        } else if (link.fingerprint == link.issuerCertificate.fingerprint) {
+        } else if (link.issuerCertificate.fingerprint in existingList) {
+            debug(`[Last] ${link.issuerCertificate.fingerprint}`);
             link.issuerCertificate = null;
             break;
         } else {
             link = link.issuerCertificate;
         }
+
+        // Should be no use, but just in case.
+        if (i > 500) {
+            throw new Error("Dead loop occurred in parseCertificateInfo");
+        }
+        i++;
     }
 
     return info;
@@ -266,6 +280,7 @@ exports.checkCertificate = function (res) {
     const info = res.request.res.socket.getPeerCertificate(true);
     const valid = res.request.res.socket.authorized || false;
 
+    debug("Parsing Certificate Info");
     const parsedInfo = parseCertificateInfo(info);
 
     return {

src/assets/app.scss

@@ -313,6 +313,20 @@ textarea.form-control {
     opacity: 0;
 }
 
+.slide-fade-up-enter-active {
+    transition: all 0.2s $easing-in;
+}
+
+.slide-fade-up-leave-active {
+    transition: all 0.2s $easing-in;
+}
+
+.slide-fade-up-enter-from,
+.slide-fade-up-leave-to {
+    transform: translateY(-50px);
+    opacity: 0;
+}
+
 .monitor-list {
     &.scrollbar {
         min-height: calc(100vh - 240px);
@@ -346,6 +360,10 @@ textarea.form-control {
         &.active {
             background-color: #cdf8f4;
         }
+        .tags {
+            // Removes margin to line up tags list with uptime percentage
+            margin-left: -0.25rem;
+        }
     }
 }
 

src/assets/vars.scss

@@ -12,6 +12,7 @@ $dark-font-color2: #020b05;
 $dark-bg: #0d1117;
 $dark-bg2: #070a10;
 $dark-border-color: #1d2634;
+$dark-header-bg: #161b22;
 
 $easing-in: cubic-bezier(0.54, 0.78, 0.55, 0.97);
 $easing-out: cubic-bezier(0.25, 0.46, 0.45, 0.94);

src/components/MonitorList.vue

@@ -137,7 +137,7 @@ export default {
     justify-content: space-between;
 
     .dark & {
-        background-color: #161b22;
+        background-color: $dark-header-bg;
         border-bottom: 0;
     }
 }

src/components/PublicGroupList.vue

@@ -41,6 +41,9 @@
                                             <Uptime :monitor="monitor.element" type="24" :pill="true" />
                                             {{ monitor.element.name }}
                                         </div>
+                                        <div class="tags">
+                                            <Tag v-for="tag in monitor.element.tags" :key="tag" :item="tag" :size="'sm'" />
+                                        </div>
                                     </div>
                                     <div :key="$root.userHeartbeatBar" class="col-3 col-md-4">
                                         <HeartbeatBar size="small" :monitor-id="monitor.element.id" />
@@ -59,12 +62,14 @@
 import Draggable from "vuedraggable";
 import HeartbeatBar from "./HeartbeatBar.vue";
 import Uptime from "./Uptime.vue";
+import Tag from "./Tag.vue";
 
 export default {
     components: {
         Draggable,
         HeartbeatBar,
         Uptime,
+        Tag,
     },
     props: {
         editMode: {

src/components/ToggleSection.vue

@@ -0,0 +1,67 @@
+<template>
+    <div class="my-3 py-3">
+        <h5 @click="isOpen = !isOpen">
+            <div
+                class="
+                    w-50
+                    d-flex
+                    justify-content-between
+                    align-items-center
+                    pe-2
+                "
+            >
+                <span class="pb-2">{{ heading }}</span>
+                <font-awesome-icon
+                    icon="chevron-down"
+                    class="animated"
+                    :class="{ open: isOpen }"
+                />
+            </div>
+        </h5>
+        <transition name="slide-fade-up">
+            <div v-if="isOpen" class="mt-3">
+                <slot></slot>
+            </div>
+        </transition>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        heading: {
+            type: String,
+            default: "",
+        },
+        defaultOpen: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    data() {
+        return {
+            isOpen: this.defaultOpen,
+        };
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../assets/vars.scss";
+
+h5:after {
+    content: "";
+    display: block;
+    width: 50%;
+    padding-top: 8px;
+    border-bottom: 1px solid $dark-border-color;
+}
+
+.open {
+    transform: rotate(180deg);
+}
+
+.animated {
+    transition: all 0.2s $easing-in;
+}
+</style>

src/components/Uptime.vue

@@ -1,5 +1,5 @@
 <template>
-    <span :class="className">{{ uptime }}</span>
+    <span :class="className" :title="24 + $t('-hour')">{{ uptime }}</span>
 </template>
 
 <script>

src/components/notifications/ClickSendSMS.vue

@@ -3,7 +3,7 @@
         <label for="clicksendsms-login" class="form-label">API Username</label>
         <div class="form-text">
             {{ $t("apiCredentials") }}
-            <a href="http://dashboard.clicksend.com/account/subaccounts" target="_blank">here</a>
+            <a href="http://dashboard.clicksend.com/account/subaccounts" target="_blank">{{ $t("here") }}</a>
         </div>
         <input id="clicksendsms-login" v-model="$parent.notification.clicksendsmsLogin" type="text" class="form-control" required>
         <label for="clicksendsms-key" class="form-label">API Key</label>

src/components/notifications/GoogleChat.vue

@@ -0,0 +1,13 @@
+<template>
+    <div class="mb-3">
+        <label for="google-chat-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="google-chat-webhook-url" v-model="$parent.notification.googleChatWebhookURL" type="text" class="form-control" required>
+
+        <div class="form-text">
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+                <a href="https://developers.google.com/chat/how-tos/webhooks" target="_blank">https://developers.google.com/chat/how-tos/webhooks</a>
+            </i18n-t>
+        </div>
+    </div>
+</template>

src/components/notifications/SMTP.vue

@@ -1,82 +1,117 @@
 <template>
-    <div class="mb-3">
+    <div>
-        <label for="hostname" class="form-label">{{ $t("Hostname") }}</label>
+        <div class="mb-3">
-        <input id="hostname" v-model="$parent.notification.smtpHost" type="text" class="form-control" required>
+            <label for="hostname" class="form-label">{{ $t("Hostname") }}</label>
-    </div>
+            <input id="hostname" v-model="$parent.notification.smtpHost" type="text" class="form-control" required>
-
-    <div class="mb-3">
-        <label for="port" class="form-label">{{ $t("Port") }}</label>
-        <input id="port" v-model="$parent.notification.smtpPort" type="number" class="form-control" required min="0" max="65535" step="1">
-    </div>
-
-    <div class="mb-3">
-        <label for="secure" class="form-label">Secure</label>
-        <select id="secure" v-model="$parent.notification.smtpSecure" class="form-select">
-            <option :value="false">{{ $t("secureOptionNone") }}</option>
-            <option :value="true">{{ $t("secureOptionTLS") }}</option>
-        </select>
-    </div>
-
-    <div class="mb-3">
-        <div class="form-check">
-            <input id="ignore-tls-error" v-model="$parent.notification.smtpIgnoreTLSError" class="form-check-input" type="checkbox" value="">
-            <label class="form-check-label" for="ignore-tls-error">
-                {{ $t("Ignore TLS Error") }}
-            </label>
         </div>
-    </div>
 
-    <div class="mb-3">
+        <div class="mb-3">
-        <label for="username" class="form-label">{{ $t("Username") }}</label>
+            <label for="port" class="form-label">{{ $t("Port") }}</label>
-        <input id="username" v-model="$parent.notification.smtpUsername" type="text" class="form-control" autocomplete="false">
+            <input id="port" v-model="$parent.notification.smtpPort" type="number" class="form-control" required min="0" max="65535" step="1">
-    </div>
-
-    <div class="mb-3">
-        <label for="password" class="form-label">{{ $t("Password") }}</label>
-        <HiddenInput id="password" v-model="$parent.notification.smtpPassword" :required="false" autocomplete="one-time-code"></HiddenInput>
-    </div>
-
-    <div class="mb-3">
-        <label for="from-email" class="form-label">{{ $t("From Email") }}</label>
-        <input id="from-email" v-model="$parent.notification.smtpFrom" type="text" class="form-control" required autocomplete="false" placeholder="&quot;Uptime Kuma&quot; &lt;example@kuma.pet&gt;">
-        <div class="form-text">
         </div>
-    </div>
 
-    <div class="mb-3">
+        <div class="mb-3">
-        <label for="to-email" class="form-label">{{ $t("To Email") }}</label>
+            <label for="secure" class="form-label">{{ $t("Security") }}</label>
-        <input id="to-email" v-model="$parent.notification.smtpTo" type="text" class="form-control" autocomplete="false" placeholder="example2@kuma.pet, example3@kuma.pet" :required="!hasRecipient">
+            <select id="secure" v-model="$parent.notification.smtpSecure" class="form-select">
-    </div>
+                <option :value="false">{{ $t("secureOptionNone") }}</option>
+                <option :value="true">{{ $t("secureOptionTLS") }}</option>
+            </select>
+        </div>
 
-    <div class="mb-3">
+        <div class="mb-3">
-        <label for="to-cc" class="form-label">{{ $t("smtpCC") }}</label>
+            <div class="form-check">
-        <input id="to-cc" v-model="$parent.notification.smtpCC" type="text" class="form-control" autocomplete="false" :required="!hasRecipient">
+                <input id="ignore-tls-error" v-model="$parent.notification.smtpIgnoreTLSError" class="form-check-input" type="checkbox" value="">
-    </div>
+                <label class="form-check-label" for="ignore-tls-error">
+                    {{ $t("Ignore TLS Error") }}
+                </label>
+            </div>
+        </div>
 
-    <div class="mb-3">
+        <div class="mb-3">
-        <label for="to-bcc" class="form-label">{{ $t("smtpBCC") }}</label>
+            <label for="username" class="form-label">{{ $t("Username") }}</label>
-        <input id="to-bcc" v-model="$parent.notification.smtpBCC" type="text" class="form-control" autocomplete="false" :required="!hasRecipient">
+            <input id="username" v-model="$parent.notification.smtpUsername" type="text" class="form-control" autocomplete="false">
-    </div>
+        </div>
 
-    <div class="mb-3">
+        <div class="mb-3">
-        <label for="subject-email" class="form-label">{{ $t("emailCustomSubject") }}</label>
+            <label for="password" class="form-label">{{ $t("Password") }}</label>
-        <input id="subject-email" v-model="$parent.notification.customSubject" type="text" class="form-control" autocomplete="false" placeholder="">
+            <HiddenInput id="password" v-model="$parent.notification.smtpPassword" :required="false" autocomplete="one-time-code"></HiddenInput>
-        <div v-pre class="form-text">
+        </div>
-            (leave blank for default one)<br />
+
-            {{NAME}}: Service Name<br />
+        <div class="mb-3">
-            {{HOSTNAME_OR_URL}}: Hostname or URL<br />
+            <label for="from-email" class="form-label">{{ $t("From Email") }}</label>
-            {{URL}}: URL<br />
+            <input id="from-email" v-model="$parent.notification.smtpFrom" type="text" class="form-control" required autocomplete="false" placeholder="&quot;Uptime Kuma&quot; &lt;example@kuma.pet&gt;">
-            {{STATUS}}: Status<br />
+            <div class="form-text">
+            </div>
+        </div>
+
+        <div class="mb-3">
+            <label for="to-email" class="form-label">{{ $t("To Email") }}</label>
+            <input id="to-email" v-model="$parent.notification.smtpTo" type="text" class="form-control" autocomplete="false" placeholder="example2@kuma.pet, example3@kuma.pet" :required="!hasRecipient">
+        </div>
+
+        <div class="mb-3">
+            <label for="to-cc" class="form-label">{{ $t("smtpCC") }}</label>
+            <input id="to-cc" v-model="$parent.notification.smtpCC" type="text" class="form-control" autocomplete="false" :required="!hasRecipient">
+        </div>
+
+        <div class="mb-3">
+            <label for="to-bcc" class="form-label">{{ $t("smtpBCC") }}</label>
+            <input id="to-bcc" v-model="$parent.notification.smtpBCC" type="text" class="form-control" autocomplete="false" :required="!hasRecipient">
+        </div>
+
+        <ToggleSection :heading="$t('smtpDkimSettings')">
+            <i18n-t tag="div" keypath="smtpDkimDesc" class="form-text mb-3">
+                <a href="https://nodemailer.com/dkim/" target="_blank">{{ $t("documentation") }}</a>
+            </i18n-t>
+
+            <div class="mb-3">
+                <label for="dkim-domain" class="form-label">{{ $t("smtpDkimDomain") }}</label>
+                <input id="dkim-domain" v-model="$parent.notification.smtpDkimDomain" type="text" class="form-control" autocomplete="false" placeholder="example.com">
+            </div>
+            <div class="mb-3">
+                <label for="dkim-key-selector" class="form-label">{{ $t("smtpDkimKeySelector") }}</label>
+                <input id="dkim-key-selector" v-model="$parent.notification.smtpDkimKeySelector" type="text" class="form-control" autocomplete="false" placeholder="2017">
+            </div>
+            <div class="mb-3">
+                <label for="dkim-private-key" class="form-label">{{ $t("smtpDkimPrivateKey") }}</label>
+                <textarea id="dkim-private-key" v-model="$parent.notification.smtpDkimPrivateKey" rows="5" type="text" class="form-control" autocomplete="false" placeholder="-----BEGIN PRIVATE KEY-----"></textarea>
+            </div>
+            <div class="mb-3">
+                <label for="dkim-hash-algo" class="form-label">{{ $t("smtpDkimHashAlgo") }}</label>
+                <input id="dkim-hash-algo" v-model="$parent.notification.smtpDkimHashAlgo" type="text" class="form-control" autocomplete="false" placeholder="sha256">
+            </div>
+            <div class="mb-3">
+                <label for="dkim-header-fields" class="form-label">{{ $t("smtpDkimheaderFieldNames") }}</label>
+                <input id="dkim-header-fields" v-model="$parent.notification.smtpDkimheaderFieldNames" type="text" class="form-control" autocomplete="false" placeholder="message-id:date:from:to">
+            </div>
+            <div class="mb-3">
+                <label for="dkim-skip-fields" class="form-label">{{ $t("smtpDkimskipFields") }}</label>
+                <input id="dkim-skip-fields" v-model="$parent.notification.smtpDkimskipFields" type="text" class="form-control" autocomplete="false" placeholder="message-id:date">
+            </div>
+        </ToggleSection>
+
+        <div class="mb-3">
+            <label for="subject-email" class="form-label">{{ $t("emailCustomSubject") }}</label>
+            <input id="subject-email" v-model="$parent.notification.customSubject" type="text" class="form-control" autocomplete="false" placeholder="">
+            <div v-pre class="form-text">
+                (leave blank for default one)<br />
+                {{NAME}}: Service Name<br />
+                {{HOSTNAME_OR_URL}}: Hostname or URL<br />
+                {{URL}}: URL<br />
+                {{STATUS}}: Status<br />
+            </div>
         </div>
     </div>
 </template>
 
 <script>
 import HiddenInput from "../HiddenInput.vue";
+import ToggleSection from "../ToggleSection.vue";
 
 export default {
     components: {
         HiddenInput,
+        ToggleSection,
     },
     computed: {
         hasRecipient() {

src/components/notifications/SerwerSMS.vue

@@ -0,0 +1,28 @@
+<template>
+    <div class="mb-3">
+        <label for="serwersms-username" class="form-label">{{ $t('serwersmsAPIUser') }}</label>
+        <input id="serwersms-username" v-model="$parent.notification.serwersmsUsername" type="text" class="form-control" required>
+    </div>
+    <div class="mb-3">
+        <label for="serwersms-key" class="form-label">{{ $t('serwersmsAPIPassword') }}</label>
+        <HiddenInput id="serwersms-key" v-model="$parent.notification.serwersmsPassword" :required="true" autocomplete="one-time-code"></HiddenInput>
+    </div>
+    <div class="mb-3">
+        <label for="serwersms-phone-number" class="form-label">{{ $t("serwersmsPhoneNumber") }}</label>
+        <input id="serwersms-phone-number" v-model="$parent.notification.serwersmsPhoneNumber" type="text" class="form-control" required>
+    </div>
+    <div class="mb-3">
+        <label for="serwersms-sender-name" class="form-label">{{ $t("serwersmsSenderName") }}</label>
+        <input id="serwersms-sender-name" v-model="$parent.notification.serwersmsSenderName" type="text" minlength="3" maxlength="11" class="form-control">
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../HiddenInput.vue";
+
+export default {
+    components: {
+        HiddenInput,
+    },
+};
+</script>

src/components/notifications/Stackfield.vue

@@ -0,0 +1,13 @@
+<template>
+    <div class="mb-3">
+        <label for="stackfield-webhook-url" class="form-label">{{ $t("Webhook URL") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="stackfield-webhook-url" v-model="$parent.notification.stackfieldwebhookURL" type="text" class="form-control" required>
+
+        <div class="form-text">
+            <span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}
+            <i18n-t tag="p" keypath="aboutWebhooks" style="margin-top: 8px;">
+                <a href="https://www.stackfield.com/developer-api#AnchorAPI2" target="_blank">https://www.stackfield.com/developer-api#AnchorAPI2</a>
+            </i18n-t>
+        </div>
+    </div>
+</template>

src/components/notifications/Telegram.vue

@@ -25,13 +25,7 @@
             </p>
 
             <p style="margin-top: 8px;">
-                <template v-if="$parent.notification.telegramBotToken">
+                <a :href="telegramGetUpdatesURL('withToken')" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL("masked") }}</a>
-                    <a :href="telegramGetUpdatesURL" target="_blank" style="word-break: break-word;">{{ telegramGetUpdatesURL }}</a>
-                </template>
-
-                <template v-else>
-                    {{ telegramGetUpdatesURL }}
-                </template>
             </p>
         </div>
     </div>
@@ -40,49 +34,51 @@
 <script>
 import HiddenInput from "../HiddenInput.vue";
 import axios from "axios";
-import { useToast } from "vue-toastification"
+import { useToast } from "vue-toastification";
 const toast = useToast();
 
 export default {
     components: {
         HiddenInput,
     },
-    computed: {
+    methods: {
-        telegramGetUpdatesURL() {
+        telegramGetUpdatesURL(mode = "masked") {
-            let token = `<${this.$t("YOUR BOT TOKEN HERE")}>`
+            let token = `<${this.$t("YOUR BOT TOKEN HERE")}>`;
 
             if (this.$parent.notification.telegramBotToken) {
-                token = this.$parent.notification.telegramBotToken;
+                if (mode === "withToken") {
+                    token = this.$parent.notification.telegramBotToken;
+                } else if (mode === "masked") {
+                    token = "*".repeat(this.$parent.notification.telegramBotToken.length);
+                }
             }
 
             return `https://api.telegram.org/bot${token}/getUpdates`;
         },
-    },
-    methods: {
         async autoGetTelegramChatID() {
             try {
-                let res = await axios.get(this.telegramGetUpdatesURL)
+                let res = await axios.get(this.telegramGetUpdatesURL("withToken"));
 
                 if (res.data.result.length >= 1) {
-                    let update = res.data.result[res.data.result.length - 1]
+                    let update = res.data.result[res.data.result.length - 1];
 
                     if (update.channel_post) {
                         this.notification.telegramChatID = update.channel_post.chat.id;
                     } else if (update.message) {
                         this.notification.telegramChatID = update.message.chat.id;
                     } else {
-                        throw new Error(this.$t("chatIDNotFound"))
+                        throw new Error(this.$t("chatIDNotFound"));
                     }
 
                 } else {
-                    throw new Error(this.$t("chatIDNotFound"))
+                    throw new Error(this.$t("chatIDNotFound"));
                 }
 
             } catch (error) {
-                toast.error(error.message)
+                toast.error(error.message);
             }
 
         },
     }
-}
+};
 </script>

src/components/notifications/WeCom.vue

@@ -0,0 +1,12 @@
+<template>
+    <div class="mb-3">
+        <label for="WeCom Bot Key" class="form-label">{{ $t("WeCom Bot Key") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="WeCom Bot Key" v-model="$parent.notification.weComBotKey" type="text" class="form-control" required>
+        <div class="form-text">
+            <p><span style="color: red;"><sup>*</sup></span>{{ $t("Required") }}</p>
+        </div>
+        <i18n-t tag="p" keypath="Read more:">
+            <a href="https://work.weixin.qq.com/api/doc/90000/90136/91770" target="_blank">https://work.weixin.qq.com/api/doc/90000/90136/91770</a>
+        </i18n-t>
+    </div>
+</template>

src/components/notifications/index.js

@@ -1,4 +1,4 @@
-import STMP from "./SMTP.vue"
+import STMP from "./SMTP.vue";
 import Telegram from "./Telegram.vue";
 import Discord from "./Discord.vue";
 import Webhook from "./Webhook.vue";
@@ -22,6 +22,10 @@ import Matrix from "./Matrix.vue";
 import AliyunSMS from "./AliyunSms.vue";
 import DingDing from "./DingDing.vue";
 import Bark from "./Bark.vue";
+import SerwerSMS from "./SerwerSMS.vue";
+import Stackfield from './Stackfield.vue';
+import WeCom from "./WeCom.vue";
+import GoogleChat from "./GoogleChat.vue";
 
 /**
  * Manage all notification form.
@@ -52,7 +56,11 @@ const NotificationFormList = {
     "mattermost": Mattermost,
     "matrix": Matrix,
     "DingDing": DingDing,
-    "Bark": Bark
+    "Bark": Bark,
-}
+    "serwersms": SerwerSMS,
+    "stackfield": Stackfield,
+    "WeCom": WeCom,
+    "GoogleChat": GoogleChat
+};
 
-export default NotificationFormList
+export default NotificationFormList;

src/components/settings/About.vue

@@ -0,0 +1,25 @@
+<template>
+    <div class="d-flex justify-content-center align-items-center">
+        <div class="logo d-flex flex-column justify-content-center align-items-center">
+            <object class="my-4" width="200" height="200" data="/icon.svg" />
+            <div class="fs-4 fw-bold">Uptime Kuma</div>
+            <div>{{ $t("Version") }}: {{ $root.info.version }}</div>
+            <div class="my-1 update-link"><a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">{{ $t("Check Update On GitHub") }}</a></div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+
+};
+</script>
+
+<style lang="scss" scoped>
+.logo {
+    margin: 4em 1em;
+}
+.update-link {
+    font-size: 0.9em;
+}
+</style>

src/components/settings/Appearance.vue

@@ -0,0 +1,143 @@
+<template>
+    <div>
+        <div class="my-4">
+            <label for="language" class="form-label">
+                {{ $t("Language") }}
+            </label>
+            <select id="language" v-model="$root.language" class="form-select">
+                <option
+                    v-for="(lang, i) in $i18n.availableLocales"
+                    :key="`Lang${i}`"
+                    :value="lang"
+                >
+                    {{ $i18n.messages[lang].languageName }}
+                </option>
+            </select>
+        </div>
+        <div class="my-4">
+            <label for="timezone" class="form-label">{{ $t("Theme") }}</label>
+            <div>
+                <div
+                    class="btn-group"
+                    role="group"
+                    aria-label="Basic checkbox toggle button group"
+                >
+                    <input
+                        id="btncheck1"
+                        v-model="$root.userTheme"
+                        type="radio"
+                        class="btn-check"
+                        name="theme"
+                        autocomplete="off"
+                        value="light"
+                    />
+                    <label class="btn btn-outline-primary" for="btncheck1">
+                        {{ $t("Light") }}
+                    </label>
+
+                    <input
+                        id="btncheck2"
+                        v-model="$root.userTheme"
+                        type="radio"
+                        class="btn-check"
+                        name="theme"
+                        autocomplete="off"
+                        value="dark"
+                    />
+                    <label class="btn btn-outline-primary" for="btncheck2">
+                        {{ $t("Dark") }}
+                    </label>
+
+                    <input
+                        id="btncheck3"
+                        v-model="$root.userTheme"
+                        type="radio"
+                        class="btn-check"
+                        name="theme"
+                        autocomplete="off"
+                        value="auto"
+                    />
+                    <label class="btn btn-outline-primary" for="btncheck3">
+                        {{ $t("Auto") }}
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="my-4">
+            <label class="form-label">{{ $t("Theme - Heartbeat Bar") }}</label>
+            <div>
+                <div
+                    class="btn-group"
+                    role="group"
+                    aria-label="Basic checkbox toggle button group"
+                >
+                    <input
+                        id="btncheck4"
+                        v-model="$root.userHeartbeatBar"
+                        type="radio"
+                        class="btn-check"
+                        name="heartbeatBarTheme"
+                        autocomplete="off"
+                        value="normal"
+                    />
+                    <label class="btn btn-outline-primary" for="btncheck4">
+                        {{ $t("Normal") }}
+                    </label>
+
+                    <input
+                        id="btncheck5"
+                        v-model="$root.userHeartbeatBar"
+                        type="radio"
+                        class="btn-check"
+                        name="heartbeatBarTheme"
+                        autocomplete="off"
+                        value="bottom"
+                    />
+                    <label class="btn btn-outline-primary" for="btncheck5">
+                        {{ $t("Bottom") }}
+                    </label>
+
+                    <input
+                        id="btncheck6"
+                        v-model="$root.userHeartbeatBar"
+                        type="radio"
+                        class="btn-check"
+                        name="heartbeatBarTheme"
+                        autocomplete="off"
+                        value="none"
+                    />
+                    <label class="btn btn-outline-primary" for="btncheck6">
+                        {{ $t("None") }}
+                    </label>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/vars.scss";
+
+.btn-check:active + .btn-outline-primary,
+.btn-check:checked + .btn-outline-primary,
+.btn-check:hover + .btn-outline-primary {
+    color: #fff;
+
+    .dark & {
+        color: #000;
+    }
+}
+
+.dark {
+    .list-group-item {
+        background-color: $dark-bg2;
+        color: $dark-font-color;
+    }
+}
+</style>

src/components/settings/Backup.vue

@@ -0,0 +1,213 @@
+<template>
+    <div>
+        <div class="my-4">
+            <h4 class="mt-4 mb-2">{{ $t("Export Backup") }}</h4>
+
+            <p>
+                {{ $t("backupDescription") }} <br />
+                ({{ $t("backupDescription2") }}) <br />
+            </p>
+
+            <div class="mb-2">
+                <button class="btn btn-primary" @click="downloadBackup">
+                    {{ $t("Export") }}
+                </button>
+            </div>
+
+            <p>
+                <strong>{{ $t("backupDescription3") }}</strong>
+            </p>
+        </div>
+
+        <div class="my-4">
+            <h4 class="mt-4 mb-2">{{ $t("Import Backup") }}</h4>
+
+            <label class="form-label">{{ $t("Options") }}:</label>
+            <br />
+            <div class="form-check form-check-inline">
+                <input
+                    id="radioKeep"
+                    v-model="importHandle"
+                    class="form-check-input"
+                    type="radio"
+                    name="radioImportHandle"
+                    value="keep"
+                />
+                <label class="form-check-label" for="radioKeep">
+                    {{ $t("Keep both") }}
+                </label>
+            </div>
+            <div class="form-check form-check-inline">
+                <input
+                    id="radioSkip"
+                    v-model="importHandle"
+                    class="form-check-input"
+                    type="radio"
+                    name="radioImportHandle"
+                    value="skip"
+                />
+                <label class="form-check-label" for="radioSkip">
+                    {{ $t("Skip existing") }}
+                </label>
+            </div>
+            <div class="form-check form-check-inline">
+                <input
+                    id="radioOverwrite"
+                    v-model="importHandle"
+                    class="form-check-input"
+                    type="radio"
+                    name="radioImportHandle"
+                    value="overwrite"
+                />
+                <label class="form-check-label" for="radioOverwrite">
+                    {{ $t("Overwrite") }}
+                </label>
+            </div>
+            <div class="form-text mb-2">
+                {{ $t("importHandleDescription") }}
+            </div>
+
+            <div class="mb-2">
+                <input
+                    id="importBackup"
+                    type="file"
+                    class="form-control"
+                    accept="application/json"
+                />
+            </div>
+
+            <div class="input-group mb-2 justify-content-end">
+                <button
+                    type="button"
+                    class="btn btn-outline-primary"
+                    :disabled="processing"
+                    @click="confirmImport"
+                >
+                    <div
+                        v-if="processing"
+                        class="spinner-border spinner-border-sm me-1"
+                    ></div>
+                    {{ $t("Import") }}
+                </button>
+            </div>
+
+            <div
+                v-if="importAlert"
+                class="alert alert-danger mt-3"
+                style="padding: 6px 16px"
+            >
+                {{ importAlert }}
+            </div>
+        </div>
+
+        <Confirm
+            ref="confirmImport"
+            btn-style="btn-danger"
+            :yes-text="$t('Yes')"
+            :no-text="$t('No')"
+            @yes="importBackup"
+        >
+            {{ $t("confirmImportMsg") }}
+        </Confirm>
+    </div>
+</template>
+
+<script>
+import Confirm from "../../components/Confirm.vue";
+import dayjs from "dayjs";
+import { useToast } from "vue-toastification";
+
+const toast = useToast();
+
+export default {
+    components: {
+        Confirm,
+    },
+
+    data() {
+        return {
+            processing: false,
+            importHandle: "skip",
+            importAlert: null,
+        };
+    },
+
+    methods: {
+        confirmImport() {
+            this.$refs.confirmImport.show();
+        },
+
+        downloadBackup() {
+            let time = dayjs().format("YYYY_MM_DD-hh_mm_ss");
+            let fileName = `Uptime_Kuma_Backup_${time}.json`;
+            let monitorList = Object.values(this.$root.monitorList);
+            let exportData = {
+                version: this.$root.info.version,
+                notificationList: this.$root.notificationList,
+                monitorList: monitorList,
+            };
+            exportData = JSON.stringify(exportData, null, 4);
+            let downloadItem = document.createElement("a");
+            downloadItem.setAttribute(
+                "href",
+                "data:application/json;charset=utf-8," +
+                    encodeURIComponent(exportData)
+            );
+            downloadItem.setAttribute("download", fileName);
+            downloadItem.click();
+        },
+
+        importBackup() {
+            this.processing = true;
+            let uploadItem = document.getElementById("importBackup").files;
+
+            if (uploadItem.length <= 0) {
+                this.processing = false;
+                return (this.importAlert = this.$t("alertNoFile"));
+            }
+
+            if (uploadItem.item(0).type !== "application/json") {
+                this.processing = false;
+                return (this.importAlert = this.$t("alertWrongFileType"));
+            }
+
+            let fileReader = new FileReader();
+            fileReader.readAsText(uploadItem.item(0));
+
+            fileReader.onload = (item) => {
+                this.$root.uploadBackup(
+                    item.target.result,
+                    this.importHandle,
+                    (res) => {
+                        this.processing = false;
+
+                        if (res.ok) {
+                            toast.success(res.msg);
+                        } else {
+                            toast.error(res.msg);
+                        }
+                    }
+                );
+            };
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/vars.scss";
+
+.dark {
+    #importBackup {
+        &::file-selector-button {
+            color: $primary;
+            background-color: $dark-bg;
+        }
+
+        &:hover:not(:disabled):not([readonly])::file-selector-button {
+            color: $dark-font-color2;
+            background-color: $primary;
+        }
+    }
+}
+</style>

src/components/settings/General.vue

@@ -0,0 +1,192 @@
+<template>
+    <div>
+        <form class="my-4" @submit.prevent="saveGeneral">
+            <!-- Timezone -->
+            <div class="mb-4">
+                <label for="timezone" class="form-label">
+                    {{ $t("Timezone") }}
+                </label>
+                <select id="timezone" v-model="$root.userTimezone" class="form-select">
+                    <option value="auto">
+                        {{ $t("Auto") }}: {{ guessTimezone }}
+                    </option>
+                    <option
+                        v-for="(timezone, index) in timezoneList"
+                        :key="index"
+                        :value="timezone.value"
+                    >
+                        {{ timezone.name }}
+                    </option>
+                </select>
+            </div>
+
+            <!-- Search Engine -->
+            <div class="mb-4">
+                <label class="form-label">
+                    {{ $t("Search Engine Visibility") }}
+                </label>
+
+                <div class="form-check">
+                    <input
+                        id="searchEngineIndexYes"
+                        v-model="settings.searchEngineIndex"
+                        class="form-check-input"
+                        type="radio"
+                        name="flexRadioDefault"
+                        :value="true"
+                        required
+                    />
+                    <label class="form-check-label" for="searchEngineIndexYes">
+                        {{ $t("Allow indexing") }}
+                    </label>
+                </div>
+                <div class="form-check">
+                    <input
+                        id="searchEngineIndexNo"
+                        v-model="settings.searchEngineIndex"
+                        class="form-check-input"
+                        type="radio"
+                        name="flexRadioDefault"
+                        :value="false"
+                        required
+                    />
+                    <label class="form-check-label" for="searchEngineIndexNo">
+                        {{ $t("Discourage search engines from indexing site") }}
+                    </label>
+                </div>
+            </div>
+
+            <!-- Entry Page -->
+            <div class="mb-4">
+                <label class="form-label">{{ $t("Entry Page") }}</label>
+
+                <div class="form-check">
+                    <input
+                        id="entryPageYes"
+                        v-model="settings.entryPage"
+                        class="form-check-input"
+                        type="radio"
+                        name="statusPage"
+                        value="dashboard"
+                        required
+                    />
+                    <label class="form-check-label" for="entryPageYes">
+                        {{ $t("Dashboard") }}
+                    </label>
+                </div>
+
+                <div class="form-check">
+                    <input
+                        id="entryPageNo"
+                        v-model="settings.entryPage"
+                        class="form-check-input"
+                        type="radio"
+                        name="statusPage"
+                        value="statusPage"
+                        required
+                    />
+                    <label class="form-check-label" for="entryPageNo">
+                        {{ $t("Status Page") }}
+                    </label>
+                </div>
+            </div>
+
+            <!-- Primary Base URL -->
+            <div class="mb-4">
+                <label class="form-label" for="primaryBaseURL">
+                    {{ $t("Primary Base URL") }}
+                </label>
+
+                <div class="input-group mb-3">
+                    <input
+                        id="primaryBaseURL"
+                        v-model="settings.primaryBaseURL"
+                        class="form-control"
+                        name="primaryBaseURL"
+                        placeholder="https://"
+                        pattern="https?://.+"
+                    />
+                    <button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryBaseURL">
+                        {{ $t("Auto Get") }}
+                    </button>
+                </div>
+
+                <div class="form-text"></div>
+            </div>
+
+            <!-- Steam API Key -->
+            <div class="mb-4">
+                <label class="form-label" for="steamAPIKey">
+                    {{ $t("Steam API Key") }}
+                </label>
+                <HiddenInput
+                    id="steamAPIKey"
+                    v-model="settings.steamAPIKey"
+                    autocomplete="one-time-code"
+                />
+                <div class="form-text">
+                    {{ $t("steamApiKeyDescription") }}
+                    <a href="https://steamcommunity.com/dev" target="_blank">
+                        https://steamcommunity.com/dev
+                    </a>
+                </div>
+            </div>
+
+            <!-- Save Button -->
+            <div>
+                <button class="btn btn-primary" type="submit">
+                    {{ $t("Save") }}
+                </button>
+            </div>
+        </form>
+    </div>
+</template>
+
+<script>
+import HiddenInput from "../../components/HiddenInput.vue";
+import dayjs from "dayjs";
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+import { timezoneList } from "../../util-frontend";
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
+export default {
+    components: {
+        HiddenInput,
+    },
+
+    data() {
+        return {
+            timezoneList: timezoneList(),
+        };
+    },
+
+    computed: {
+        settings() {
+            return this.$parent.$parent.$parent.settings;
+        },
+        saveSettings() {
+            return this.$parent.$parent.$parent.saveSettings;
+        },
+        settingsLoaded() {
+            return this.$parent.$parent.$parent.settingsLoaded;
+        },
+        guessTimezone() {
+            return dayjs.tz.guess();
+        }
+    },
+
+    methods: {
+        saveGeneral() {
+            localStorage.timezone = this.$root.userTimezone;
+            this.saveSettings();
+        },
+        autoGetPrimaryBaseURL() {
+            this.settings.primaryBaseURL = location.protocol + "//" + location.host;
+        },
+    },
+};
+</script>
+
+<style></style>

src/components/settings/MonitorHistory.vue

@@ -0,0 +1,133 @@
+<template>
+    <div>
+        <div class="my-4">
+            <label for="keepDataPeriodDays" class="form-label">
+                {{
+                    $t("clearDataOlderThan", [
+                        settings.keepDataPeriodDays,
+                    ])
+                }}
+            </label>
+            <input
+                id="keepDataPeriodDays"
+                v-model="settings.keepDataPeriodDays"
+                type="number"
+                class="form-control"
+                required
+                min="1"
+                step="1"
+            />
+        </div>
+        <div class="my-4">
+            <button class="btn btn-primary" type="button" @click="saveSettings()">
+                {{ $t("Save") }}
+            </button>
+        </div>
+        <div class="my-4">
+            <div class="my-3">
+                <button class="btn btn-outline-info me-2" @click="shrinkDatabase">
+                    {{ $t("Shrink Database") }} ({{ databaseSizeDisplay }})
+                </button>
+                <div class="form-text mt-2 mb-4 ms-2">{{ $t("shrinkDatabaseDescription") }}</div>
+            </div>
+            <button
+                id="clearAllStats-btn"
+                class="btn btn-outline-danger me-2 mb-2"
+                @click="confirmClearStatistics"
+            >
+                {{ $t("Clear all statistics") }}
+            </button>
+        </div>
+        <Confirm
+            ref="confirmClearStatistics"
+            btn-style="btn-danger"
+            :yes-text="$t('Yes')"
+            :no-text="$t('No')"
+            @yes="clearStatistics"
+        >
+            {{ $t("confirmClearStatisticsMsg") }}
+        </Confirm>
+    </div>
+</template>
+
+<script>
+import Confirm from "../../components/Confirm.vue";
+import { debug } from "../../util.ts";
+import { useToast } from "vue-toastification";
+
+const toast = useToast();
+
+export default {
+    components: {
+        Confirm,
+    },
+
+    data() {
+        return {
+            databaseSize: 0,
+        };
+    },
+
+    computed: {
+        settings() {
+            return this.$parent.$parent.$parent.settings;
+        },
+        saveSettings() {
+            return this.$parent.$parent.$parent.saveSettings;
+        },
+        settingsLoaded() {
+            return this.$parent.$parent.$parent.settingsLoaded;
+        },
+        databaseSizeDisplay() {
+            return (
+                Math.round((this.databaseSize / 1024 / 1024) * 10) / 10 + " MB"
+            );
+        },
+    },
+
+    mounted() {
+        this.loadDatabaseSize();
+    },
+
+    methods: {
+        loadDatabaseSize() {
+            debug("load database size");
+            this.$root.getSocket().emit("getDatabaseSize", (res) => {
+                if (res.ok) {
+                    this.databaseSize = res.size;
+                    debug("database size: " + res.size);
+                } else {
+                    debug(res);
+                }
+            });
+        },
+
+        shrinkDatabase() {
+            this.$root.getSocket().emit("shrinkDatabase", (res) => {
+                if (res.ok) {
+                    this.loadDatabaseSize();
+                    toast.success("Done");
+                } else {
+                    debug(res);
+                }
+            });
+        },
+
+        confirmClearStatistics() {
+            this.$refs.confirmClearStatistics.show();
+        },
+
+        clearStatistics() {
+            this.$root.clearStatistics((res) => {
+                if (res.ok) {
+                    this.$router.go();
+                } else {
+                    toast.error(res.msg);
+                }
+            });
+        },
+    },
+};
+</script>
+
+<style></style>

src/components/settings/Notifications.vue

@@ -0,0 +1,46 @@
+<template>
+    <div>
+        <div class="notification-list my-4">
+            <p v-if="$root.notificationList.length === 0">
+                {{ $t("Not available, please setup.") }}
+            </p>
+            <p v-else>
+                {{ $t("notificationDescription") }}
+            </p>
+
+            <ul class="list-group mb-3" style="border-radius: 1rem;">
+                <li v-for="(notification, index) in $root.notificationList" :key="index" class="list-group-item">
+                    {{ notification.name }}<br>
+                    <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
+                </li>
+            </ul>
+
+            <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
+                {{ $t("Setup Notification") }}
+            </button>
+        </div>
+
+        <NotificationDialog ref="notificationDialog" />
+    </div>
+</template>
+
+<script>
+import NotificationDialog from "../../components/NotificationDialog.vue";
+
+export default {
+    components: {
+        NotificationDialog
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/vars.scss";
+
+.dark {
+    .list-group-item {
+        background-color: $dark-bg2;
+        color: $dark-font-color;
+    }
+}
+</style>

src/components/settings/Security.vue

@@ -0,0 +1,329 @@
+<template>
+    <div>
+        <div v-if="settingsLoaded" class="my-4">
+            <!-- Change Password -->
+            <template v-if="!settings.disableAuth">
+                <p>
+                    {{ $t("Current User") }}: <strong>{{ username }}</strong>
+                    <button v-if="! settings.disableAuth" id="logout-btn" class="btn btn-danger ms-4 me-2 mb-2" @click="$root.logout">{{ $t("Logout") }}</button>
+                </p>
+
+                <h5 class="my-4">{{ $t("Change Password") }}</h5>
+                <form class="mb-3" @submit.prevent="savePassword">
+                    <div class="mb-3">
+                        <label for="current-password" class="form-label">
+                            {{ $t("Current Password") }}
+                        </label>
+                        <input
+                            id="current-password"
+                            v-model="password.currentPassword"
+                            type="password"
+                            class="form-control"
+                            required
+                        />
+                    </div>
+
+                    <div class="mb-3">
+                        <label for="new-password" class="form-label">
+                            {{ $t("New Password") }}
+                        </label>
+                        <input
+                            id="new-password"
+                            v-model="password.newPassword"
+                            type="password"
+                            class="form-control"
+                            required
+                        />
+                    </div>
+
+                    <div class="mb-3">
+                        <label for="repeat-new-password" class="form-label">
+                            {{ $t("Repeat New Password") }}
+                        </label>
+                        <input
+                            id="repeat-new-password"
+                            v-model="password.repeatNewPassword"
+                            type="password"
+                            class="form-control"
+                            :class="{ 'is-invalid': invalidPassword }"
+                            required
+                        />
+                        <div class="invalid-feedback">
+                            {{ $t("passwordNotMatchMsg") }}
+                        </div>
+                    </div>
+
+                    <div>
+                        <button class="btn btn-primary" type="submit">
+                            {{ $t("Update Password") }}
+                        </button>
+                    </div>
+                </form>
+            </template>
+
+            <div v-if="! settings.disableAuth" class="mt-5 mb-3">
+                <h5 class="my-4">
+                    {{ $t("Two Factor Authentication") }}
+                </h5>
+                <div class="mb-4">
+                    <button
+                        class="btn btn-primary me-2"
+                        type="button"
+                        @click="$refs.TwoFADialog.show()"
+                    >
+                        {{ $t("2FA Settings") }}
+                    </button>
+                </div>
+            </div>
+
+            <div class="my-4">
+                <!-- Advanced -->
+                <h5 class="my-4">{{ $t("Advanced") }}</h5>
+
+                <div class="mb-4">
+                    <button v-if="settings.disableAuth" id="enableAuth-btn" class="btn btn-outline-primary me-2 mb-2" @click="enableAuth">{{ $t("Enable Auth") }}</button>
+                    <button v-if="! settings.disableAuth" id="disableAuth-btn" class="btn btn-primary me-2 mb-2" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
+                </div>
+            </div>
+        </div>
+
+        <TwoFADialog ref="TwoFADialog" />
+
+        <Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('I understand, please disable')" :no-text="$t('Leave')" @yes="disableAuth">
+            <template v-if="$i18n.locale === 'es-ES' ">
+                <p>Seguro que deseas <strong>deshabilitar la autenticación</strong>?</p>
+                <p>Es para <strong>quien implementa autenticación de terceros</strong> ante Uptime Kuma como por ejemplo Cloudflare Access.</p>
+                <p>Por favor usar con cuidado.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'pt-BR' ">
+                <p>Você tem certeza que deseja <strong>desativar a autenticação</strong>?</p>
+                <p>Isso é para <strong>alguém que tem autenticação de terceiros</strong> na frente do 'UpTime Kuma' como o Cloudflare Access.</p>
+                <p>Por favor, utilize isso com cautela.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'zh-HK' ">
+                <p>你是否確認<strong>取消登入認証</strong>？</p>
+                <p>這個功能是設計給已有<strong>第三方認証</strong>的用家，例如 Cloudflare Access。</p>
+                <p>請小心使用。</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'zh-CN' ">
+                <p>是否确定 <strong>取消登录验证</strong>？</p>
+                <p>这是为 <strong>有第三方认证</strong> 的用户提供的功能，如 Cloudflare Access</p>
+                <p>请谨慎使用！</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'zh-TW' ">
+                <p>你是否要<strong>取消登入驗證</strong>？</p>
+                <p>此功能是設計給已有<strong>第三方認證</strong>的使用者，例如 Cloudflare Access。</p>
+                <p>請謹慎使用。</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'de-DE' ">
+                <p>Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?</p>
+                <p>Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.</p>
+                <p>Bitte mit Vorsicht nutzen.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'sl-SI' ">
+                <p>Ali ste prepričani, da želite onemogočiti <strong>avtentikacijo</strong>?</p>
+                <p>Namenjen je <strong>nekomu, ki ima pred programom Uptime Kuma vklopljeno zunanje preverjanje pristnosti</strong>, na primer Cloudflare Access.</p>
+                <p>Uporabljajte previdno.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'sr' ">
+                <p>Да ли сте сигурни да желите да <strong>искључите аутентификацију</strong>?</p>
+                <p>То је за <strong>оне који имају додату аутентификацију</strong> испред Uptime Kuma као на пример Cloudflare Access.</p>
+                <p>Молим Вас користите ово са пажњом.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'sr-latn' ">
+                <p>Da li ste sigurni da želite da <strong>isključite autentifikaciju</strong>?</p>
+                <p>To je za <strong>one koji imaju dodatu autentifikaciju</strong> ispred Uptime Kuma kao na primer Cloudflare Access.</p>
+                <p>Molim Vas koristite ovo sa pažnjom.</p>
+            </template>
+
+            <template v-if="$i18n.locale === 'hr-HR' ">
+                <p>Jeste li sigurni da želite <strong>isključiti autentikaciju</strong>?</p>
+                <p>To je za <strong>korisnike koji imaju vanjsku autentikaciju stranice</strong> ispred Uptime Kume, poput usluge Cloudflare Access.</p>
+                <p>Pažljivo koristite ovu opciju.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'tr-TR' ">
+                <p><strong>Şifreli girişi devre dışı bırakmak istediğinizden</strong>emin misiniz?</p>
+                <p>Bu, Uptime Kuma'nın önünde Cloudflare Access gibi <strong>üçüncü taraf yetkilendirmesi olan</strong> kişiler içindir.</p>
+                <p>Lütfen dikkatli kullanın.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'ko-KR' ">
+                <p>정말로 <strong>인증 기능을 끌까요</strong>?</p>
+                <p>이 기능은 <strong>Cloudflare Access와 같은 서드파티 인증</strong>을 Uptime Kuma 앞에 둔 사용자를 위한 기능이에요.</p>
+                <p>신중하게 사용하세요.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'pl' ">
+                <p>Czy na pewno chcesz <strong>wyłączyć autoryzację</strong>?</p>
+                <p>Jest przeznaczony dla <strong>kogoś, kto ma autoryzację zewnętrzną</strong> przed Uptime Kuma, taką jak Cloudflare Access.</p>
+                <p>Proszę używać ostrożnie.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'et-EE' ">
+                <p>Kas soovid <strong>lülitada autentimise välja</strong>?</p>
+                <p>Kastuamiseks <strong>välise autentimispakkujaga</strong>, näiteks Cloudflare Access.</p>
+                <p>Palun kasuta vastutustundlikult.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'it-IT' ">
+                <p><strong>Disabilitare l'autenticazione?</strong></p>
+                <p><strong>Questa opzione è per chi un sistema di autenticazione gestito da terze parti</strong> messo davanti ad Uptime Kuma, ad esempio Cloudflare Access.</p>
+                <p>Utilizzare con attenzione!</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'id-ID' ">
+                <p>Apakah Anda yakin ingin <strong>menonaktifkan autentikasi</strong>?</p>
+                <p>Ini untuk <strong>mereka yang memiliki autentikasi pihak ketiga</strong> diletakkan di depan Uptime Kuma, misalnya akses Cloudflare.</p>
+                <p>Gunakan dengan hati-hati.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'ru-RU' ">
+                <p>Вы уверены, что хотите <strong>отключить авторизацию</strong>?</p>
+                <p>Это подходит для <strong>тех, у кого стоит другая авторизация</strong> перед открытием Uptime Kuma, например Cloudflare Access.</p>
+                <p>Пожалуйста, используйте с осторожностью.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'fa' ">
+                <p>آیا مطمئن هستید که میخواهید <strong>احراز هویت را غیر فعال کنید</strong>?</p>
+                <p>این ویژگی برای کسانی است که <strong> لایه امنیتی شخص ثالث دیگر بر روی این آدرس فعال کرده‌اند</strong>، مانند Cloudflare Access.</p>
+                <p>لطفا از این امکان با دقت استفاده کنید.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'bg-BG' ">
+                <p>Сигурни ли сте, че желаете да <strong>изключите удостоверяването</strong>?</p>
+                <p>Използва се в случаите, когато <strong>има настроен алтернативен метод за удостоверяване</strong> преди Uptime Kuma, например Cloudflare Access.</p>
+                <p>Моля, използвайте с повишено внимание.</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'hu' ">
+                <p>Biztos benne, hogy <strong>kikapcsolja a hitelesítést</strong>?</p>
+                <p>Akkor érdemes, ha <strong>van 3rd-party hitelesítés</strong> az Uptime Kuma-t megelőzően mint a Cloudflare Access.</p>
+                <p>Használja megfontoltan!</p>
+            </template>
+
+            <template v-else-if="$i18n.locale === 'nb-NO' ">
+                <p>Er du sikker på at du vil <strong>deaktiver autentisering</strong>?</p>
+                <p>Dette er for <strong>de som har tredjepartsautorisering</strong> foran Uptime Kuma, for eksempel Cloudflare Access.</p>
+                <p>Vennligst vær forsiktig.</p>
+            </template>
+
+            <!-- English (en) -->
+            <template v-else>
+                <p>Are you sure want to <strong>disable auth</strong>?</p>
+                <p>It is for <strong>someone who have 3rd-party auth</strong> in front of Uptime Kuma such as Cloudflare Access.</p>
+                <p>Please use it carefully.</p>
+            </template>
+        </Confirm>
+    </div>
+</template>
+
+<script>
+import Confirm from "../../components/Confirm.vue";
+import TwoFADialog from "../../components/TwoFADialog.vue";
+
+export default {
+    components: {
+        Confirm,
+        TwoFADialog
+    },
+
+    data() {
+        return {
+            username: "",
+            invalidPassword: false,
+            password: {
+                currentPassword: "",
+                newPassword: "",
+                repeatNewPassword: "",
+            }
+        };
+    },
+
+    computed: {
+        settings() {
+            return this.$parent.$parent.$parent.settings;
+        },
+        saveSettings() {
+            return this.$parent.$parent.$parent.saveSettings;
+        },
+        settingsLoaded() {
+            return this.$parent.$parent.$parent.settingsLoaded;
+        }
+    },
+
+    watch: {
+        "password.repeatNewPassword"() {
+            this.invalidPassword = false;
+        },
+    },
+
+    mounted() {
+        this.loadUsername();
+    },
+
+    methods: {
+        savePassword() {
+            if (this.password.newPassword !== this.password.repeatNewPassword) {
+                this.invalidPassword = true;
+            } else {
+                this.$root
+                    .getSocket()
+                    .emit("changePassword", this.password, (res) => {
+                        this.$root.toastRes(res);
+                        if (res.ok) {
+                            this.password.currentPassword = "";
+                            this.password.newPassword = "";
+                            this.password.repeatNewPassword = "";
+                        }
+                    });
+            }
+        },
+
+        loadUsername() {
+            const jwtPayload = this.$root.getJWTPayload();
+
+            if (jwtPayload) {
+                this.username = jwtPayload.username;
+            }
+        },
+
+        disableAuth() {
+            this.settings.disableAuth = true;
+            this.saveSettings();
+        },
+
+        enableAuth() {
+            this.settings.disableAuth = false;
+            this.saveSettings();
+            this.$root.storage().removeItem("token");
+            location.reload();
+        },
+
+        confirmDisableAuth() {
+            this.$refs.confirmDisableAuth.show();
+        },
+
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../assets/vars.scss";
+
+h5:after {
+    content: "";
+    display: block;
+    width: 50%;
+    padding-top: 8px;
+    border-bottom: 1px solid $dark-border-color;
+}
+</style>

src/i18n.js

@@ -1,62 +1,46 @@
 import { createI18n } from "vue-i18n/index";
-import daDK from "./languages/da-DK";
-import deDE from "./languages/de-DE";
 import en from "./languages/en";
-import esEs from "./languages/es-ES";
-import etEE from "./languages/et-EE";
-import fa from "./languages/fa";
-import frFR from "./languages/fr-FR";
-import hu from "./languages/hu";
-import hrHR from "./languages/hr-HR";
-import itIT from "./languages/it-IT";
-import idID from "./languages/id-ID";
-import ja from "./languages/ja";
-import koKR from "./languages/ko-KR";
-import nlNL from "./languages/nl-NL";
-import nbNO from "./languages/nb-NO";
-import pl from "./languages/pl";
-import ptBR from "./languages/pt-BR";
-import bgBG from "./languages/bg-BG";
-import ruRU from "./languages/ru-RU";
-import sr from "./languages/sr";
-import srLatn from "./languages/sr-latn";
-import svSE from "./languages/sv-SE";
-import trTR from "./languages/tr-TR";
-import vi from "./languages/vi";
-import zhCN from "./languages/zh-CN";
-import zhHK from "./languages/zh-HK";
-import zhTW from "./languages/zh-TW";
 
 const languageList = {
-    en,
+    "zh-HK": "繁體中文 (香港)",
-    "zh-HK": zhHK,
+    "bg-BG": "Български",
-    "bg-BG": bgBG,
+    "de-DE": "Deutsch (Deutschland)",
-    "de-DE": deDE,
+    "nl-NL": "Nederlands",
-    "nl-NL": nlNL,
+    "nb-NO": "Norsk",
-    "nb-NO": nbNO,
+    "es-ES": "Español",
-    "es-ES": esEs,
+    "fa": "Farsi",
-    "fa": fa,
+    "pt-BR": "Português (Brasileiro)",
-    "pt-BR": ptBR,
+    "fr-FR": "Français (France)",
-    "fr-FR": frFR,
+    "hu": "Magyar",
-    "hu": hu,
+    "hr-HR": "Hrvatski",
-    "hr-HR": hrHR,
+    "it-IT": "Italiano (Italian)",
-    "it-IT": itIT,
+    "id-ID": "Bahasa Indonesia (Indonesian)",
-    "id-ID" : idID,
+    "ja": "日本語",
-    "ja": ja,
+    "da-DK": "Danish (Danmark)",
-    "da-DK": daDK,
+    "sr": "Српски",
-    "sr": sr,
+    "sl-SI": "Slovenščina",
-    "sr-latn": srLatn,
+    "sr-latn": "Srpski",
-    "sv-SE": svSE,
+    "sv-SE": "Svenska",
-    "tr-TR": trTR,
+    "tr-TR": "Türkçe",
-    "ko-KR": koKR,
+    "ko-KR": "한국어",
-    "ru-RU": ruRU,
+    "ru-RU": "Русский",
-    "zh-CN": zhCN,
+    "zh-CN": "简体中文",
-    "pl": pl,
+    "pl": "Polski",
-    "et-EE": etEE,
+    "et-EE": "eesti",
-    "vi": vi,
+    "vi": "Vietnamese",
-    "zh-TW": zhTW
+    "zh-TW": "繁體中文 (台灣)"
 };
 
+let messages = {
+    en,
+};
+
+for (let lang in languageList) {
+    messages[lang] = {
+        languageName: languageList[lang]
+    };
+}
+
 const rtlLangs = ["fa"];
 
 export const currentLocale = () => localStorage.locale
@@ -73,5 +57,5 @@ export const i18n = createI18n({
     fallbackLocale: "en",
     silentFallbackWarn: true,
     silentTranslationWarn: true,
-    messages: languageList,
+    messages: messages,
 });

src/icon.js

@@ -33,6 +33,7 @@ import {
     faFile,
     faAward,
     faLink,
+    faChevronDown,
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
@@ -65,6 +66,7 @@ library.add(
     faFile,
     faAward,
     faLink,
+    faChevronDown,
 );
 
 export { FontAwesomeIcon };

src/languages/README.md

@@ -4,11 +4,8 @@
 2. Create a language file (e.g. `zh-TW.js`). The filename must be ISO language code: http://www.lingoes.net/en/translator/langcode.htm
 3. Run `npm run update-language-files`. You can also use this command to check if there are new strings to translate for your language.
 4. Your language file should be filled in. You can translate now.
-5. Translate `src/pages/Settings.vue` (search for a `Confirm` component with `rel="confirmDisableAuth"`).
+5. Translate `src/components/settings/Security.vue` (search for a `Confirm` component with `rel="confirmDisableAuth"`).
-6. Import your language file in `src/i18n.js` and add it to `languageList` constant.
+6. Add it into `languageList` constant.
 7. Make a [pull request](https://github.com/louislam/uptime-kuma/pulls) when you have done.
 
-One of good examples:
+If you do not have programming skills, let me know in [the issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏
-https://github.com/louislam/uptime-kuma/pull/316/files
-
-If you do not have programming skills, let me know in [Issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏

src/languages/bg-BG.js

@@ -77,7 +77,7 @@ export default {
     "Accepted Status Codes": "Допустими статус кодове",
     Save: "Запази",
     Notifications: "Известявания",
-    "Not available, please setup.": "Не е налично. Моля, настройте.",
+    "Not available, please setup.": "Не са налични. Моля, настройте.",
     "Setup Notification": "Настройки за известявания",
     Light: "Светла",
     Dark: "Тъмна",
@@ -89,7 +89,7 @@ export default {
     Timezone: "Часова зона",
     "Search Engine Visibility": "Видимост за търсачки",
     "Allow indexing": "Разреши индексиране",
-    "Discourage search engines from indexing site": "Обезкуражи индексирането на сайта от търсачките",
+    "Discourage search engines from indexing site": "Не позволявай на търсачките да индексират този сайт",
     "Change Password": "Промени парола",
     "Current Password": "Текуща парола",
     "New Password": "Нова парола",
@@ -131,8 +131,8 @@ export default {
     Events: "Събития",
     Heartbeats: "Проверки",
     "Auto Get": "Авт. попълване",
-    backupDescription: "Можете да архивирате всички монитори и всички известия в JSON файл.",
+    backupDescription: "Можете да архивирате всички монитори и всички известявания в JSON файл.",
-    backupDescription2: "PS: Данни за история и събития не са включени.",
+    backupDescription2: "PS: Имайте предвид, че данните за история и събития няма да бъдат включени.",
     backupDescription3: "Чувствителни данни, като токен кодове за известяване, се съдържат в експортирания файл. Моля, бъдете внимателни с неговото съхранение.",
     alertNoFile: "Моля, изберете файл за импортиране.",
     alertWrongFileType: "Моля, изберете JSON файл.",
@@ -141,7 +141,7 @@ export default {
     Overwrite: "Презапиши",
     Options: "Опции",
     "Keep both": "Запази двете",
-    "Verify Token": "Проверка на токен код",
+    "Verify Token": "Провери токен код",
     "Setup 2FA": "Настройка 2FA",
     "Enable 2FA": "Включи 2FA",
     "Disable 2FA": "Изключи 2FA",
@@ -200,7 +200,7 @@ export default {
     "Primary Base URL": "Основен базов URL адрес",
     "Push URL": "Генериран Push URL адрес",
     needPushEvery: "Необходимо е да извършвате заявка към този URL адрес на всеки {0} секунди",
-    pushOptionalParams: "Допълнителни, но незадължителни параметри: {0}",
+    pushOptionalParams: "Допълнителни, но не задължителни параметри: {0}",
     defaultNotificationName: "Моето {notification} известяване ({number})",
     here: "тук",
     Required: "Задължително поле",
@@ -298,8 +298,66 @@ export default {
     HeadersInvalidFormat: "Заявените хедъри не са валидни JSON: ",
     BodyInvalidFormat: "Заявеното съобщение не е валиден JSON: ",
     "Monitor History": "История на мониторите",
-    clearDataOlderThan: "Ще се съхранява за {0} дни.",
+    clearDataOlderThan: "Ще се съхранява {0} дни.",
     records: "записа",
     "One record": "Един запис",
     steamApiKeyDescription: "За да мониторирате Steam Gameserver се нуждаете от Steam Web-API ключ. Може да регистрирате Вашия API ключ тук: ",
+    clicksendsms: "ClickSend SMS",
+    apiCredentials: "API удостоверяване",
+    PasswordsDoNotMatch: "Паролите не съвпадат.",
+    "Current User": "Текущ потребител",
+    recent: "Скорошни",
+    shrinkDatabaseDescription: "Инициира \"VACUUM\" за \"SQLite\" база данни. Ако Вашата база данни е създадена след версия 1.10.0, \"AUTO_VACUUM\" функцията е активна и това действие не нужно.",
+    Done: "Готово",
+    Info: "Информация",
+    Security: "Сигурност",
+    "Steam API Key": "Steam API ключ",
+    "Shrink Database": "Редуциране база данни",
+    "Pick a RR-Type...": "Изберете вида на ресурсния запис за мониторитане...",
+    "Pick Accepted Status Codes...": "Изберете статус кодове, които да се считат за успешен отговор...",
+    Default: "По подразбиране",
+    "HTTP Options": "HTTP Опции",
+    "Create Incident": "Създаване на инцидент",
+    Title: "Заглавие",
+    Content: "Съдържание",
+    Style: "Стил",
+    info: "информация",
+    warning: "предупреждение",
+    danger: "опасност",
+    primary: "основен",
+    light: "светъл",
+    dark: "тъмен",
+    Post: "Публикувай",
+    "Please input title and content": "Моля, въведете заглавие и съдържание",
+    Created: "Създаден",
+    "Last Updated": "Последно обновен",
+    Unpin: "Откачи",
+    "Switch to Light Theme": "Превключи към светла тема",
+    "Switch to Dark Theme": "Превключи към тъмна тема",
+    "Show Tags": "Покажи етикети",
+    "Hide Tags": "Скрий етикети",
+    Description: "Описание",
+    "No monitors available.": "Няма налични монитори.",
+    "Add one": "Добави един",
+    "No Monitors": "Няма монитори",
+    "Untitled Group": "Група без заглавие",
+    Services: "Услуги",
+    Discard: "Премахни",
+    Cancel: "Отмени",
+    "Powered by": "Създадено чрез",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Потребителско име (вкл. webapi_ prefix)",
+    serwersmsAPIPassword: "API Парола",
+    serwersmsPhoneNumber: "Телефон номер",
+    serwersmsSenderName: "SMS Подател име (регистриран през клиентския портал)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "DKIM Настройки",
+    smtpDkimDesc: "Моля, вижте Nodemailer DKIM {0} за инструкции.",
+    documentation: "документация",
+    smtpDkimDomain: "Домейн",
+    smtpDkimKeySelector: "Селектор на ключ",
+    smtpDkimPrivateKey: "Частен ключ",
+    smtpDkimHashAlgo: "Хеш алгоритъм (по желание)",
+    smtpDkimheaderFieldNames: "Хедър ключове за подписване (по желание)",
+    smtpDkimskipFields: "Хедър ключове, които да не се подписват (по желание)",
 };

src/languages/da-DK.js

@@ -1,7 +1,7 @@
 export default {
     languageName: "Danish (Danmark)",
     Settings: "Indstillinger",
-    Dashboard: "Dashboard",
+    Dashboard: "Betjeningspanel",
     "New Update": "Opdatering tilgængelig",
     Language: "Sprog",
     Appearance: "Udseende",
@@ -110,11 +110,11 @@ export default {
     notAvailableShort: "N/A",
     Create: "Opret",
     clearEventsMsg: "Er du sikker på vil slette alle events for denne Overvåger?",
-    clearHeartbeatsMsg: "Er du sikker på vil slette alle heartbeats for denne Overvåger?",
+    clearHeartbeatsMsg: "Er du sikker på vil slette alle hjerteslag for denne Overvåger?",
     confirmClearStatisticsMsg: "Vil du helt sikkert slette ALLE statistikker?",
     "Clear Data": "Ryd Data",
     Events: "Events",
-    Heartbeats: "Heartbeats",
+    Heartbeats: "Hjerteslag",
     "Auto Get": "Auto-hent",
     enableDefaultNotificationDescription: "For hver ny overvåger aktiveres denne underretning som standard. Du kan stadig deaktivere underretningen separat for hver skærm.",
     "Default enabled": "Standard aktiveret",
@@ -145,14 +145,14 @@ export default {
     retryCheckEverySecond: "Prøv igen hvert {0} sekund.",
     importHandleDescription: "Vælg 'Spring over eksisterende', hvis du vil springe over hver overvåger eller underretning med samme navn. 'Overskriv' sletter alle eksisterende overvågere og underretninger.",
     confirmImportMsg: "Er du sikker på at importere sikkerhedskopien? Sørg for, at du har valgt den rigtige importindstilling.",
-    "Heartbeat Retry Interval": "Heartbeat Gentagelsesinterval",
+    "Heartbeat Retry Interval": "Hjerteslag Gentagelsesinterval",
     "Import Backup": "Importer Backup",
     "Export Backup": "Eksporter Backup",
     "Skip existing": "Spring over eksisterende",
     Overwrite: "Overskriv",
     Options: "Valgmuligheder",
     "Keep both": "Behold begge",
-    Tags: "Tags",
+    Tags: "Etiketter",
     "Add New below or Select...": "Tilføj Nyt nedenfor eller Vælg ...",
     "Tag with this name already exist.": "Et Tag med dette navn findes allerede.",
     "Tag with this value already exist.": "Et Tag med denne værdi findes allerede.",
@@ -178,8 +178,8 @@ export default {
     "Add Group": "Tilføj Gruppe",
     "Add a monitor": "Tilføj en Overvåger",
     "Edit Status Page": "Rediger Statusside",
-    "Go to Dashboard": "Gå til Dashboard",
+    "Go to Dashboard": "Gå til Betjeningspanel",
-    "Status Page": "Status Page",
+    "Status Page": "Statusside",
     telegram: "Telegram",
     webhook: "Webhook",
     smtp: "Email (SMTP)",
@@ -194,8 +194,162 @@ export default {
     octopush: "Octopush",
     promosms: "PromoSMS",
     lunasea: "LunaSea",
-    apprise: "Apprise (Support 50+ Notification services)",
+    apprise: "Apprise (Understøtter 50+ Notifikationstjenester)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
+    "Primary Base URL": "Primær Basis-URL",
+    "Push URL": "Push URL",
+    needPushEvery: "Du bør kalde denne webadresse hvert {0} sekund.",
+    pushOptionalParams: "Valgfrie parametre: {0}",
+    defaultNotificationName: "Min {notification} Advarsel ({number})",
+    here: "her",
+    Required: "Påkrævet",
+    "Bot Token": "Bot Token",
+    wayToGetTelegramToken: "Du kan få et token fra {0}.",
+    "Chat ID": "Chat ID",
+    supportTelegramChatID: "Support Direct Chat / Group / Channel's Chat ID",
+    wayToGetTelegramChatID: "Du kan få dit chat-ID ved at sende en besked til bot'en og gå til denne URL for at se chat_id'et:",
+    "YOUR BOT TOKEN HERE": "DIT BOT TOKEN HER",
+    chatIDNotFound: "Chat-ID blev ikke fundet; send venligst en besked til denne bot først ",
+    "Post URL": "Post URL",
+    "Content Type": "Indholdstype",
+    webhookJsonDesc: "{0} er god til alle moderne HTTP-servere som f.eks Express.js",
+    webhookFormDataDesc: "{multipart} er god til PHP. JSON'en skal parses med {decodeFunction}",
+    secureOptionNone: "Ingen / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "Ignorer TLS-fejl",
+    "From Email": "Afsender Email",
+    emailCustomSubject: "Brugerdefineret Emne",
+    "To Email": "Modtager Email",
+    smtpCC: "CC",
+    smtpBCC: "BCC",
+    "Discord Webhook URL": "Discord Webhook URL",
+    wayToGetDiscordURL: "Du kan få dette ved at gå til Serverindstillinger -> Integrationer -> Opret webhook ",
+    "Bot Display Name": "Bot Visningsnavn",
+    "Prefix Custom Message": "Præfiks Brugerdefineret Besked",
+    "Hello @everyone is...": "Hello {'@'}everyone is...",
+    "Webhook URL": "Webhook URL",
+    wayToGetTeamsURL: "Du kan lære, hvordan du laver en webhook URL {0}.",
+    Number: "Nummer",
+    Recipients: "Modtagere",
+    needSignalAPI: "Du skal have en Signal-klient med REST API.",
+    wayToCheckSignalURL: "Du kan tjekke denne URL for at se, hvordan du konfigurerer en:",
+    signalImportant: "VIGTIGT: Du kan ikke blande grupper og numre i modtagere!",
+    "Application Token": "Program Token",
+    "Server URL": "Server URL",
+    Priority: "Prioritet",
+    "Icon Emoji": "Icon Emoji",
+    "Channel Name": "Kanalnavn",
+    "Uptime Kuma URL": "Uptime Kuma URL",
+    aboutWebhooks: "Mere info om Webhooks på: {0}",
+    aboutChannelName: "Indtast kanalnavnet i {0} Kanalnavn feltet, hvis du vil omgå Webhook-kanalen. Eks: #anden-kanal",
+    aboutKumaURL: "Hvis du efterlader Uptime Kuma URL-feltet tomt, vil det som standard gå til projektets GitHub-siden.",
+    emojiCheatSheet: "Emoji cheat sheet: {0}",
+    clicksendsms: "ClickSend SMS",
+    "User Key": "Bruger-Nøgle",
+    Device: "Enhed",
+    "Message Title": "Besked Titel",
+    "Notification Sound": "Notifikationslyd",
+    "More info on:": "Mere info på: {0}",
+    pushoverDesc1: "Nødprioritet (2) har som standard 30 sekunders timeout mellem genforsøg og udløber efter 1 time.",
+    pushoverDesc2: "Hvis du vil sende meddelelser til forskellige enheder, skal du udfylde feltet Enhed.",
+    "SMS Type": "SMS Type",
+    octopushTypePremium: "Premium (Hurtig - anbefales til advarsel)",
+    octopushTypeLowCost: "Lavpris (Langsom - nogle gange blokeret af operatøren)",
+    checkPrice: "Tjek {0} priser:",
+    apiCredentials: "API legitimationsoplysninger",
+    octopushLegacyHint: "Bruger du den ældre version af Octopush (2011-2020) eller den nye version?",
+    "Check octopush prices": "Tjek octopush priser {0}.",
+    octopushPhoneNumber: "Telefonnummer (intl format, f.eks : +4512345678) ",
+    octopushSMSSender: "SMS Afsender Navn : 3-11 alfanumeriske tegn og mellemrum (a-zA-Z0-9)",
+    "LunaSea Device ID": "LunaSea Enhed-ID",
+    "Apprise URL": "Apprise URL",
+    "Example:": "Eksempel: {0}",
+    "Read more:": "Læs mere: {0}",
+    "Status:": "Status: {0}",
+    "Read more": "Læs mere",
+    appriseInstalled: "Apprise er installeret.",
+    appriseNotInstalled: "Apprise er ikke installeret. {0}",
+    "Access Token": "Access Token",
+    "Channel access token": "kanaladgangstoken",
+    "Line Developers Console": "Line Udviklerkonsol",
+    lineDevConsoleTo: "Line Udviklerkonsol - {0}",
+    "Basic Settings": "Basisindstillinger",
+    "User ID": "Bruger-ID",
+    "Messaging API": "Messaging API",
+    wayToGetLineChannelToken: "Tilgå først {0}, opret en udbyder og kanal (Messaging API), så kan du få kanaladgangstoken'et og bruger-ID'et fra de ovennævnte menupunkter.",
+    "Icon URL": "Ikon URL",
+    aboutIconURL: "Du kan angive et link til et billede i \"Ikon URL\" for at tilsidesætte standardprofilbilledet. Vil ikke blive brugt, hvis Ikon Emoji er angivet.",
+    aboutMattermostChannelName: "Du kan tilsidesætte standardkanalen, som Webhoo'en sender til ved at indtaste kanalnavnet i feltet \"Kanalnavn\". Dette skal aktiveres i Mattermost Webhook-indstillingerne. Eks: #anden-kanal",
+    matrix: "Matrix",
+    promosmsTypeEco: "SMS ECO - billig, men langsom og ofte overbelastet. Begrænset kun til polske modtagere.",
+    promosmsTypeFlash: "SMS FLASH - Beskeden vises automatisk på modtagerenheden. Begrænset kun til polske modtagere.",
+    promosmsTypeFull: "SMS FULL - Premium-niveau af SMS, Du kan bruge dit \"Sender Name\" (Du skal først registrere navn). Pålidelig til advarsler.",
+    promosmsTypeSpeed: "SMS SPEED - Højeste prioritet i systemet. Meget hurtig og pålidelig, men dyr (ca. to gange af SMS FULL pris).",
+    promosmsPhoneNumber: "Telefonnummer (polske numre behøver ikke angive områdenumre)",
+    promosmsSMSSender: "SMS Sender Name : Forudregistreret navn eller en af standarderne: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    "Feishu WebHookUrl": "Feishu WebHookURL",
+    matrixHomeserverURL: "Hjemmeserver-URL (med http(s):// og eventuel port)",
+    "Internal Room Id": "Intern Rum-ID",
+    matrixDesc1: "Du kan finde det interne rum-ID ved at se i det avancerede afsnit af rumindstillingerne i din Matrix-klient. Det skulle ligne !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "Det anbefales stærkt, at du opretter en ny bruger og ikke bruger din egen Matrix-brugers adgangstoken, da det giver fuld adgang til din konto og alle de rum, du har tilsluttet dig. I stedet skal du oprette en ny bruger og kun invitere den til det rum, du vil modtage meddelelsen i. Du kan få adgangstokenet ved at køre {0}",
+    Method: "Metode",
+    Body: "Body",
+    Headers: "Headers",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "\"request headers\"-erne er ikke gyldige JSON: ",
+    BodyInvalidFormat: "\"request body\"-en er ikke gyldige JSON: ",
+    "Monitor History": "Overvåger Historik",
+    clearDataOlderThan: "Gem overvågningshistorikdata i {0} dage.",
+    PasswordsDoNotMatch: "Adgangskoderne stemmer ikke overens.",
+    records: "forekomster",
+    "One record": "Én forekomst",
+    steamApiKeyDescription: "For at overvåge en Steam Game Server skal du bruge en Steam Web-API nøgle. Du kan registrere din API-nøgle her: ",
+    "Current User": "Nuværende Bruger",
+    recent: "Seneste",
+    Done: "Færdig",
+    Info: "Info",
+    Security: "Sikkerhed",
+    "Steam API Key": "Steam API-nøgle",
+    "Shrink Database": "Krymp Database",
+    "Pick a RR-Type...": "Vælg en RR-Type...",
+    "Pick Accepted Status Codes...": "Vælg Accepterede Statuskoder...",
+    Default: "Standard",
+    "HTTP Options": "HTTP Valgmuligheder",
+    "Create Incident": "Opret Annoncering",
+    Title: "Titel",
+    Content: "Indhold",
+    Style: "Type",
+    info: "info",
+    warning: "advarsel",
+    danger: "fare",
+    primary: "primær",
+    light: "lys",
+    dark: "mørk",
+    Post: "Udgiv",
+    "Please input title and content": "Indtast venligst titel og indhold",
+    Created: "Oprettet",
+    "Last Updated": "Sidst Opdateret",
+    Unpin: "Frigør",
+    "Switch to Light Theme": "Skift til Lys Tema",
+    "Switch to Dark Theme": "Skift til Mørkt Tema",
+    "Show Tags": "Vis Etiketter",
+    "Hide Tags": "Skjul Etiketter",
+    Description: "Beskrivelse",
+    "No monitors available.": "No monitors available.",
+    "Add one": "Tilføj en",
+    "No Monitors": "Ingen Overvågere",
+    "Untitled Group": "Unavngivet Gruppe",
+    Services: "Tjenester",
+    Discard: "Kassér",
+    Cancel: "Annullér",
+    "Powered by": "Drevet af",
+    shrinkDatabaseDescription: "Udfør database VACUUM for SQLite. Hvis din database er oprettet efter 1.10.0, er AUTO_VACUUM allerede aktiveret, og denne handling er ikke nødvendig.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Brugernavn (inkl. webapi_ prefix)",
+    serwersmsAPIPassword: "API Adgangskode",
+    serwersmsPhoneNumber: "Telefonnummer",
+    serwersmsSenderName: "SMS Afsender Navn (registreret via kundeportal)",
+    stackfield: "Stackfield",
 };

src/languages/de-DE.js

@@ -194,6 +194,7 @@ export default {
     promosms: "PromoSMS",
     lunasea: "LunaSea",
     apprise: "Apprise (Unterstützung für 50+ Benachrichtigungsdienste)",
+    GoogleChat: "Google Chat (nur Google Workspace)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
@@ -304,4 +305,49 @@ export default {
     "One record": "Ein Eintrag",
     steamApiKeyDescription: "Um einen Steam Game Server zu überwachen, wird ein Steam Web-API-Schlüssel benötigt. Dieser kann hier registriert werden: ",
     "Current User": "Aktueller Benutzer",
+    recent: "Letzte",
+    Done: "Fertig",
+    Info: "Info",
+    Security: "Sicherheit",
+    "Steam API Key": "Steam API Key",
+    "Shrink Database": "Datenbank verkleinern",
+    "Pick a RR-Type...": "Wähle ein RR-Typ aus...",
+    "Pick Accepted Status Codes...": "Wähle akzeptierte Statuscodes aus...",
+    Default: "Standard",
+    "HTTP Options": "HTTP Optionen",
+    "Create Incident": "Vorfall erstellen",
+    Title: "Titel",
+    Content: "Inhalt",
+    Style: "Stil",
+    info: "info",
+    warning: "warnung",
+    danger: "gefahr",
+    primary: "primär",
+    light: "hell",
+    dark: "dunkel",
+    Post: "Eintrag",
+    "Please input title and content": "Bitte Titel und Inhalt eingeben",
+    Created: "Erstellt",
+    "Last Updated": "Zuletzt aktualisiert",
+    Unpin: "Loslösen",
+    "Switch to Light Theme": "Zu hellem Thema wechseln",
+    "Switch to Dark Theme": "Zum dunklen Thema wechseln",
+    "Show Tags": "Tags anzeigen",
+    "Hide Tags": "Tags ausblenden",
+    Description: "Beschreibung",
+    "No monitors available.": "Keine Monitore verfügbar.",
+    "Add one": "Füge eins hinzu",
+    "No Monitors": "Keine Monitore",
+    "Untitled Group": "Gruppe ohne Titel",
+    Services: "Dienste",
+    Discard: "Verwerfen",
+    Cancel: "Abbrechen",
+    "Powered by": "Powered by",
+    shrinkDatabaseDescription: "Löse VACUUM für die SQLite Datenbank aus. Wenn die Datenbank nach 1.10.0 erstellt wurde, ist AUTO_VACUUM bereits aktiviert und diese Aktion ist nicht erforderlich.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Benutzername (inkl. webapi_ prefix)",
+    serwersmsAPIPassword: "API Passwort",
+    serwersmsPhoneNumber: "Telefonnummer",
+    serwersmsSenderName: "Name des SMS-Absenders (über Kundenportal registriert)",
+    "stackfield": "Stackfield",
 };

src/languages/en.js

@@ -243,6 +243,7 @@ export default {
     clicksendsms: "ClickSend SMS",
     lunasea: "LunaSea",
     apprise: "Apprise (Support 50+ Notification services)",
+    GoogleChat: "Google Chat (Google Workspace only)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
@@ -311,4 +312,57 @@ export default {
     successMessage: "Success Message",
     successMessageExplanation: "MQTT message that will be considered as success",
     recent: "Recent",
+    Done: "Done",
+    Info: "Info",
+    Security: "Security",
+    "Steam API Key": "Steam API Key",
+    "Shrink Database": "Shrink Database",
+    "Pick a RR-Type...": "Pick a RR-Type...",
+    "Pick Accepted Status Codes...": "Pick Accepted Status Codes...",
+    Default: "Default",
+    "HTTP Options": "HTTP Options",
+    "Create Incident": "Create Incident",
+    Title: "Title",
+    Content: "Content",
+    Style: "Style",
+    info: "info",
+    warning: "warning",
+    danger: "danger",
+    primary: "primary",
+    light: "light",
+    dark: "dark",
+    Post: "Post",
+    "Please input title and content": "Please input title and content",
+    Created: "Created",
+    "Last Updated": "Last Updated",
+    Unpin: "Unpin",
+    "Switch to Light Theme": "Switch to Light Theme",
+    "Switch to Dark Theme": "Switch to Dark Theme",
+    "Show Tags": "Show Tags",
+    "Hide Tags": "Hide Tags",
+    Description: "Description",
+    "No monitors available.": "No monitors available.",
+    "Add one": "Add one",
+    "No Monitors": "No Monitors",
+    "Untitled Group": "Untitled Group",
+    Services: "Services",
+    Discard: "Discard",
+    Cancel: "Cancel",
+    "Powered by": "Powered by",
+    shrinkDatabaseDescription: "Trigger database VACUUM for SQLite. If your database is created after 1.10.0, AUTO_VACUUM is already enabled and this action is not needed.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Username (incl. webapi_ prefix)",
+    serwersmsAPIPassword: "API Password",
+    serwersmsPhoneNumber: "Phone number",
+    serwersmsSenderName: "SMS Sender Name (registered via customer portal)",
+    "stackfield": "Stackfield",
+    smtpDkimSettings: "DKIM Settings",
+    smtpDkimDesc: "Please refer to the Nodemailer DKIM {0} for usage.",
+    documentation: "documentation",
+    smtpDkimDomain: "Domain Name",
+    smtpDkimKeySelector: "Key Selector",
+    smtpDkimPrivateKey: "Private Key",
+    smtpDkimHashAlgo: "Hash Algorithm (Optional)",
+    smtpDkimheaderFieldNames: "Header Keys to sign (Optional)",
+    smtpDkimskipFields: "Header Keys not to sign (Optional)",
 };

src/languages/fr-FR.js

@@ -1,5 +1,5 @@
 export default {
-    languageName: "Français (France)",
+    languageName: "Français",
     checkEverySecond: "Vérifier toutes les {0} secondes",
     retryCheckEverySecond: "Réessayer toutes les {0} secondes.",
     retriesDescription: "Nombre d'essais avant que le service soit déclaré hors-ligne.",
@@ -13,17 +13,17 @@ export default {
     pauseDashboardHome: "En pause",
     deleteMonitorMsg: "Êtes-vous sûr de vouloir supprimer cette sonde ?",
     deleteNotificationMsg: "Êtes-vous sûr de vouloir supprimer ce type de notifications ? Une fois désactivée, les services qui l'utilisent ne pourront plus envoyer de notifications.",
-    resoverserverDescription: "Le DNS de cloudflare est utilisé par défaut, mais vous pouvez le changer si vous le souhaitez.",
+    resoverserverDescription: "Le DNS de Cloudflare est utilisé par défaut, mais vous pouvez le changer si vous le souhaitez.",
-    rrtypeDescription: "Veuillez séléctionner un type d'enregistrement DNS",
+    rrtypeDescription: "Veuillez sélectionner un type d'enregistrement DNS",
     pauseMonitorMsg: "Êtes-vous sûr de vouloir mettre en pause cette sonde ?",
     enableDefaultNotificationDescription: "Pour chaque nouvelle sonde, cette notification sera activée par défaut. Vous pouvez toujours désactiver la notification séparément pour chaque sonde.",
     clearEventsMsg: "Êtes-vous sûr de vouloir supprimer tous les événements pour cette sonde ?",
-    clearHeartbeatsMsg: "Êtes-vous sûr de vouloir supprimer tous les vérifications pour cette sonde ?",
+    clearHeartbeatsMsg: "Êtes-vous sûr de vouloir supprimer toutes les vérifications pour cette sonde ?",
-    confirmClearStatisticsMsg: "Êtes-vous sûr de vouloir supprimer tous les statistiques ?",
+    confirmClearStatisticsMsg: "Êtes-vous sûr de vouloir supprimer toutes les statistiques ?",
     importHandleDescription: "Choisissez 'Ignorer l'existant' si vous voulez ignorer chaque sonde ou notification portant le même nom. L'option 'Écraser' supprime toutes les sondes et notifications existantes.",
     confirmImportMsg: "Êtes-vous sûr de vouloir importer la sauvegarde ? Veuillez vous assurer que vous avez sélectionné la bonne option d'importation.",
     twoFAVerifyLabel: "Veuillez saisir votre jeton pour vérifier que le système 2FA fonctionne.",
-    tokenValidSettingsMsg: "Le jeton est valide ; Vous pouvez maintenant sauvegarder les paramètres 2FA.",
+    tokenValidSettingsMsg: "Le jeton est valide. Vous pouvez maintenant sauvegarder les paramètres 2FA.",
     confirmEnableTwoFAMsg: "Êtes-vous sûr de vouloir activer le 2FA ?",
     confirmDisableTwoFAMsg: "Êtes-vous sûr de vouloir désactiver le 2FA ?",
     Settings: "Paramètres",
@@ -68,9 +68,9 @@ export default {
     URL: "URL",
     Hostname: "Nom d'hôte / adresse IP",
     Port: "Port",
-    "Heartbeat Interval": "Intervale de vérification",
+    "Heartbeat Interval": "Intervalle de vérification",
     Retries: "Essais",
-    "Heartbeat Retry Interval": "Réessayer l'intervale de vérification",
+    "Heartbeat Retry Interval": "Réessayer l'intervalle de vérification",
     Advanced: "Avancé",
     "Upside Down Mode": "Mode inversé",
     "Max. Redirects": "Nombre maximum de redirections",
@@ -107,8 +107,8 @@ export default {
     Password: "Mot de passe",
     "Remember me": "Se souvenir de moi",
     Login: "Se connecter",
-    "No Monitors, please": "Pas de sondes, veuillez ",
+    "No Monitors, please": "Pas de sondes, veuillez",
-    "add one": "en ajouter une.",
+    "add one": "en ajouter une",
     "Notification Type": "Type de notification",
     Email: "Email",
     Test: "Tester",
@@ -129,10 +129,10 @@ export default {
     Create: "Créer",
     "Clear Data": "Effacer les données",
     Events: "Evénements",
-    Heartbeats: "Vérfications",
+    Heartbeats: "Vérifications",
     "Auto Get": "Récuperer automatiquement",
     backupDescription: "Vous pouvez sauvegarder toutes les sondes et toutes les notifications dans un fichier JSON.",
-    backupDescription2: "PS: Les données relatives à l'historique et aux événements ne sont pas incluses.",
+    backupDescription2: "PS : Les données relatives à l'historique et aux événements ne sont pas incluses.",
     backupDescription3: "Les données sensibles telles que les jetons de notification sont incluses dans le fichier d'exportation, veuillez les conserver soigneusement.",
     alertNoFile: "Veuillez sélectionner un fichier à importer.",
     alertWrongFileType: "Veuillez sélectionner un fichier JSON à importer.",
@@ -196,7 +196,7 @@ export default {
     webhookJsonDesc: "{0} est bien/bon pour tous les serveurs HTTP modernes comme express.js",
     webhookFormDataDesc: "{multipart} est bien/bon pour du PHP, vous avez juste besoin de mettre le json via/depuis {decodeFunction}",
     smtp: "Email (SMTP)",
-    secureOptionNone: "Aucun / STARTTLS (25, 587)",
+    secureOptionNone: "Aucun/STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",
     "Ignore TLS Error": "Ignorer les erreurs TLS",
     "From Email": "Depuis l'Email",
@@ -207,7 +207,7 @@ export default {
     "Discord Webhook URL": "Discord Webhook URL",
     wayToGetDiscordURL: "Vous pouvez l'obtenir en allant dans 'Paramètres du Serveur' -> 'Intégrations' -> 'Créer un Webhook'",
     "Bot Display Name": "Nom du bot (affiché)",
-    "Prefix Custom Message": "Prefix Custom Message",
+    "Prefix Custom Message": "Prefixe du message personnalisé",
     "Hello @everyone is...": "Bonjour {'@'}everyone il...",
     teams: "Microsoft Teams",
     "Webhook URL": "Webhook URL",
@@ -217,7 +217,7 @@ export default {
     Recipients: "Destinataires",
     needSignalAPI: "Vous avez besoin d'un client Signal avec l'API REST.",
     wayToCheckSignalURL: "Vous pouvez regarder l'URL sur comment le mettre en place :",
-    signalImportant: "IMPORTANT: Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
+    signalImportant: "IMPORTANT : Vous ne pouvez pas mixer les groupes et les numéros en destinataires !",
     gotify: "Gotify",
     "Application Token": "Application Token",
     "Server URL": "Server URL",
@@ -226,10 +226,10 @@ export default {
     "Icon Emoji": "Icon Emoji",
     "Channel Name": "Nom du salon",
     "Uptime Kuma URL": "Uptime Kuma URL",
-    aboutWebhooks: "Plus d'informations sur les Webhooks ici: {0}",
+    aboutWebhooks: "Plus d'informations sur les Webhooks ici : {0}",
     aboutChannelName: "Mettez le nom du salon dans {0} dans 'Channel Name' si vous voulez bypass le salon Webhook. Ex : #autre-salon",
     aboutKumaURL: "Si vous laissez l'URL d'Uptime Kuma vierge, elle redirigera vers la page du projet GitHub.",
-    emojiCheatSheet: "Emoji cheat sheet : {0}",
+    emojiCheatSheet: "Aide emoji : {0}",
     "rocket.chat": "Rocket.chat",
     pushover: "Pushover",
     pushy: "Pushy",
@@ -244,14 +244,14 @@ export default {
     Device: "Appareil",
     "Message Title": "Titre du message",
     "Notification Sound": "Son de notification",
-    "More info on:": "Plus d'informations sur: {0}",
+    "More info on:": "Plus d'informations sur : {0}",
     pushoverDesc1: "Priorité d'urgence (2) a par défaut 30 secondes de délai dépassé entre les tentatives et expierera après 1 heure.",
     pushoverDesc2: "Si vous voulez envoyer des notifications sur différents Appareils, remplissez le champ 'Device'.",
     "SMS Type": "SMS Type",
     octopushTypePremium: "Premium (Rapide - recommandé pour les alertes)",
-    octopushTypeLowCost: "A bas prix (Lent, bloqué de temps en temps par l'opérateur)",
+    octopushTypeLowCost: "À bas prix (Lent, bloqué de temps en temps par l'opérateur)",
     "Check octopush prices": "Vérifier les prix d'octopush {0}.",
-    octopushPhoneNumber: "Numéro de téléphone (format intérn., ex : +33612345678) ",
+    octopushPhoneNumber: "Numéro de téléphone (format int., ex : +33612345678) ",
     octopushSMSSender: "Nom de l'envoyer : 3-11 caractères alphanumériques avec espace (a-zA-Z0-9)",
     "LunaSea Device ID": "LunaSea Device ID",
     "Apprise URL": "Apprise URL",
@@ -259,12 +259,12 @@ export default {
     "Read more:": "En savoir plus : {0}",
     "Status:": "Status : {0}",
     "Read more": "En savoir plus",
-    appriseInstalled: "Apprise est intallé.",
+    appriseInstalled: "Apprise est installé.",
-    appriseNotInstalled: "Apprise n'est pas intallé. {0}",
+    appriseNotInstalled: "Apprise n'est pas installé. {0}",
     "Access Token": "Access Token",
-    "Channel access token": "Channel access token",
+    "Channel access token": "Token d'accès au canal",
-    "Line Developers Console": "Line Developers Console",
+    "Line Developers Console": "Ligne console de développeurs",
-    lineDevConsoleTo: "Line Developers Console - {0}",
+    lineDevConsoleTo: "Ligne console de développeurs - {0}",
     "Basic Settings": "Paramètres de base",
     "User ID": "Identifiant utilisateur",
     "Messaging API": "Messaging API",
@@ -278,5 +278,30 @@ export default {
     promosmsTypeFull: "SMS FULL - Version Premium des SMS, Vous pouvez mettre le nom de l'expéditeur (Vous devez vous enregistrer avant). Fiable pour les alertes.",
     promosmsTypeSpeed: "SMS SPEED - La plus haute des priorités dans le système. Très rapide et fiable mais cher (environ le double du prix d'un SMS FULL).",
     promosmsPhoneNumber: "Numéro de téléphone (Poiur les déstinataires Polonais, vous pouvez enlever les codes interna.)",
-    promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    promosmsSMSSender: "SMS Expéditeur : Nom pré-enregistré ou l'un de base : InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    "Primary Base URL": "Primary Base URL",
+    emailCustomSubject: "Sujet personalisé",
+    clicksendsms: "ClickSend SMS",
+    checkPrice: "Vérification {0} tarifs :",
+    apiCredentials: "Crédentials de l'API",
+    octopushLegacyHint: "Vous utilisez l'ancienne version d'Octopush (2011-2020) ou la nouvelle version ?",
+    "Feishu WebHookUrl": "Feishu WebHookURL",
+    matrixHomeserverURL: "L'URL du serveur (avec http(s):// et le port de manière facultatif)",
+    "Internal Room Id": "ID de la salle interne",
+    matrixDesc1: "Vous pouvez trouver l'ID de salle interne en regardant dans la section avancée des paramètres dans le client Matrix. C'est censé ressembler à !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "Il est fortement recommandé de créer un nouvel utilisateur et de ne pas utiliser le jeton d'accès de votre propre utilisateur Matrix, car il vous donnera un accès complet à votre compte et à toutes les salles que vous avez rejointes. Au lieu de cela, créez un nouvel utilisateur et invitez-le uniquement dans la salle dans laquelle vous souhaitez recevoir la notification. Vous pouvez obtenir le jeton d'accès en exécutant {0}",
+    Method: "Méthode",
+    Body: "Le corps",
+    Headers: "En-têtes",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "Les en-têtes de la requête ne sont pas dans un format JSON valide: ",
+    BodyInvalidFormat: "Le corps de la requête n'est pas dans un format JSON valide: ",
+    "Monitor History": "Historique de la sonde",
+    clearDataOlderThan: "Garder l'historique des données de la sonde durant {0} jours.",
+    PasswordsDoNotMatch: "Les mots de passe ne correspondent pas.",
+    records: "Enregistrements",
+    "One record": "Un enregistrement",
+    steamApiKeyDescription: "Pour surveiller un serveur Steam, vous avez besoin  d'une clé Steam Web-API. Vous pouvez enregistrer votre clé ici : ",
+    "Current User": "Utilisateur actuel",
+    recent: "Récent",
 };

src/languages/hr-HR.js

@@ -2,15 +2,14 @@ export default {
     languageName: "Hrvatski",
     checkEverySecond: "Provjera svake {0} sekunde",
     retryCheckEverySecond: "Ponovni pokušaj svake {0} sekunde",
-    retriesDescription: "Broj ponovnih pokušaja prije nego će se servis označiti kao DOWN te poslati obavijest",
+    retriesDescription: "Broj ponovnih pokušaja prije nego će se servis označiti kao nedostupan te poslati obavijest",
     ignoreTLSError: "Ignoriraj TLS/SSL pogreške za HTTPS web stranice",
-    upsideDownModeDescription: "Preokreni logiku statusa. Ako je usluga dostupna, smatra se da je DOWN.",
+    upsideDownModeDescription: "Preokreni logiku statusa. Ako se primi pozitivan odgovor, smatra se da je usluga nedostupna.",
     maxRedirectDescription: "Maksimalan broj preusmjeravanja. Postaviti na 0 kako bi se preusmjeravanja onemogućila.",
     acceptedStatusCodesDescription: "Odaberite statusne kodove koji se smatraju uspješnim odgovorom.",
     passwordNotMatchMsg: "Lozinke se ne poklapaju.",
     notificationDescription: "Obavijesti će funkcionirati samo ako su dodijeljene monitoru.",
-    keywordDescription: "Ključna riječ za pretragu kao običan HTML ili u JSON formatu. Pretraga je case-sensitive.",
+    keywordDescription: "Ključna riječ za pretragu, u obliku običnog HTML-a ili u JSON formatu. Pretraga je osjetljiva na velika i mala slova.",
-    pauseDashboardHome: "Pauziraj",
     deleteMonitorMsg: "Jeste li sigurni da želite izbrisati monitor?",
     deleteNotificationMsg: "Jeste li sigurni da želite izbrisati ovu obavijest za sve monitore?",
     resoverserverDescription: "Cloudflare je zadani DNS poslužitelj. Možete to promijeniti u bilo kojem trenutku.",
@@ -25,7 +24,7 @@ export default {
     twoFAVerifyLabel: "Unesite svoj 2FA token:",
     tokenValidSettingsMsg: "Token je važeći! Sada možete spremiti postavke dvofaktorske autentikacije.",
     confirmEnableTwoFAMsg: "Želite li omogućiti dvofaktorsku autentikaciju?",
-    confirmDisableTwoFAMsg: "Are you sure you want to disable dvofaktorsku autentikaciju?",
+    confirmDisableTwoFAMsg: "Jeste li sigurni da želite onemogućiti dvofaktorsku autentikaciju?",
     Settings: "Postavke",
     Dashboard: "Kontrolna ploča",
     "New Update": "Novo ažuriranje",
@@ -44,17 +43,18 @@ export default {
     Down: "Nedostupno",
     Pending: "U tijeku",
     Unknown: "Nepoznato",
-    Pause: "Pauzirano",
+    pauseDashboardHome: "Pauzirano",
-    Name: "Naziv monitora",
+    Name: "Naziv",
     Status: "Status",
     DateTime: "Vremenska oznaka",
     Message: "Izvještaj",
     "No important events": "Nema važnih događaja",
+    Pause: "Pauziraj",
     Resume: "Nastavi",
     Edit: "Uredi",
     Delete: "Obriši",
     Current: "Trenutno",
-    Uptime: "Uptime",
+    Uptime: "Dostupnost",
     "Cert Exp.": "Istek cert.",
     days: "dana",
     day: "dan",
@@ -65,12 +65,12 @@ export default {
     Ping: "Odziv",
     "Monitor Type": "Vrsta Monitora",
     Keyword: "Ključna riječ",
-    "Friendly Name": "Lijep naziv",
+    "Friendly Name": "Prilagođen naziv",
     URL: "URL",
     Hostname: "Domaćin",
     Port: "Port",
     "Heartbeat Interval": "Interval provjere",
-    Retries: "Ponovnih pokušaja",
+    Retries: "Broj ponovnih pokušaja",
     "Heartbeat Retry Interval": "Interval ponovnih pokušaja",
     Advanced: "Napredne postavke",
     "Upside Down Mode": "Obrnuti način",
@@ -86,14 +86,14 @@ export default {
     Light: "Svijetli način",
     Dark: "Tamni način",
     Auto: "Automatski",
-    "Theme - Heartbeat Bar": "Tema - Statusna traka",
+    "Theme - Heartbeat Bar": "Tema za traku dostupnosti",
     Normal: "Normalno",
     Bottom: "Ispod",
     None: "Isključeno",
     Timezone: "Vremenska zona",
-    "Search Engine Visibility": "Vidljivost pretraživačima",
+    "Search Engine Visibility": "Vidljivost tražilicama",
     "Allow indexing": "Dopusti indeksiranje",
-    "Discourage search engines from indexing site": "Sprječavanje indeksiranja stranice",
+    "Discourage search engines from indexing site": "Sprječavanje indeksiranja",
     "Change Password": "Promjena lozinke",
     "Current Password": "Trenutna lozinka",
     "New Password": "Nova lozinka",
@@ -103,7 +103,7 @@ export default {
     "Enable Auth": "Omogući autentikaciju",
     Logout: "Odjava",
     Leave: "Poništi",
-    "I understand, please disable": "Razumijem, onemogući",
+    "I understand, please disable": "Razumijem, svejedno onemogući",
     Confirm: "Potvrda",
     Yes: "Da",
     No: "Ne",
@@ -112,10 +112,10 @@ export default {
     "Remember me": "Zapamti me",
     Login: "Prijava",
     "No Monitors, please": "Nema monitora, ",
-    "add one": "dodaj jednog",
+    "add one": "dodaj jedan",
     "Notification Type": "Tip obavijesti",
     Email: "E-pošta",
-    Test: "Test",
+    Test: "Testiraj",
     "Certificate Info": "Informacije o certifikatu",
     "Resolver Server": "DNS poslužitelj",
     "Resource Record Type": "Vrsta DNS zapisa",
@@ -130,14 +130,14 @@ export default {
     notAvailableShort: "N/A",
     "Default enabled": "Omogući za nove monitore",
     "Apply on all existing monitors": "Primijeni na postojeće monitore",
-    Create: "Create",
+    Create: "Kreiraj",
-    "Clear Data": "Clear Data",
+    "Clear Data": "Obriši podatke",
-    Events: "Events",
+    Events: "Događaji",
     Heartbeats: "Provjere",
     "Auto Get": "Automatski dohvat",
     backupDescription: "Moguće je napraviti sigurnosnu kopiju svih monitora i obavijesti koja će biti spremljena kao JSON datoteka.",
     backupDescription2: "Napomena: povijest i podaci o događajima nisu uključeni u sigurnosnu kopiju.",
-    backupDescription3: "Osjetljivi podaci poput tokena za obavijesti jesu uključeni u sigurnosnu kopiju. Zato je potrebno čuvati izvoz na sigurnom mjestu.",
+    backupDescription3: "Osjetljivi podaci poput tokena za obavijesti uključeni su u sigurnosnu kopiju. Zato je potrebno čuvati izvoz na sigurnom mjestu.",
     alertNoFile: "Datoteka za uvoz nije odabrana.",
     alertWrongFileType: "Datoteka za uvoz nije u JSON formatu.",
     "Clear all statistics": "Obriši sve statistike",
@@ -152,7 +152,7 @@ export default {
     "2FA Settings": "Postavke 2FA",
     "Two Factor Authentication": "Dvofaktorska autentikacija",
     Active: "Aktivna",
-    Inactive: "Neaktivna",
+    Inactive: "Neaktivno",
     Token: "Token",
     "Show URI": "Pokaži URI",
     Tags: "Oznake",
@@ -172,7 +172,7 @@ export default {
     "Search...": "Pretraga...",
     "Avg. Ping": "Prosječni odziv",
     "Avg. Response": "Prosječni odgovor",
-    "Entry Page": "Entry Page",
+    "Entry Page": "Početna stranica",
     statusPageNothing: "Ovdje nema ničega, dodajte grupu ili monitor.",
     "No Services": "Nema usluga",
     "All Systems Operational": "Svi sustavi su operativni",
@@ -183,7 +183,7 @@ export default {
     "Edit Status Page": "Uredi Statusnu stranicu",
     "Go to Dashboard": "Na Kontrolnu ploču",
     "Status Page": "Statusna stranica",
-    defaultNotificationName: "Moja {notification} obavijest ({number})",
+    defaultNotificationName: "Moja {number}. {notification} obavijest",
     here: "ovdje",
     Required: "Potrebno",
     telegram: "Telegram",
@@ -195,11 +195,11 @@ export default {
     "YOUR BOT TOKEN HERE": "OVDJE IDE TOKEN BOTA",
     chatIDNotFound: "ID razgovora nije pronađen; prvo morate poslati poruku botu",
     webhook: "Webhook",
-    "Post URL": "Post URL",
+    "Post URL": "URL Post zahtjeva",
     "Content Type": "Tip sadržaja (Content Type)",
     webhookJsonDesc: "{0} je dobra opcija za moderne HTTP poslužitelje poput Express.js-a",
     webhookFormDataDesc: "{multipart} je moguća alternativa za PHP, samo je potrebno parsirati JSON koristeći {decodeFunction}",
-    smtp: "E-pošta (SMTP)",
+    smtp: "E-mail (SMTP)",
     secureOptionNone: "Bez sigurnosti / STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",
     "Ignore TLS Error": "Ignoriraj greške TLS-a",
@@ -215,7 +215,7 @@ export default {
     "Prefix Custom Message": "Prefiks prilagođene poruke",
     "Hello @everyone is...": "Pozdrav {'@'}everyone...",
     teams: "Microsoft Teams",
-    "Webhook URL": "URL Teams webhooka",
+    "Webhook URL": "URL webhooka",
     wayToGetTeamsURL: "Više informacija o Teams webhookovima možete pročitati {0}.",
     signal: "Signal",
     Number: "Broj",
@@ -242,7 +242,7 @@ export default {
     promosms: "PromoSMS",
     clicksendsms: "ClickSend SMS",
     lunasea: "LunaSea",
-    apprise: "Apprise (Support 50+ Notification services)",
+    apprise: "Apprise (Podržava preko 50 usluga za obavijesti)",
     pushbullet: "Pushbullet",
     line: "LINE",
     mattermost: "Mattermost",
@@ -307,4 +307,44 @@ export default {
     "Showing {from} to {to} of {count} records": "Prikaz zapisa {from}-{to} od sveukupno {count}",
     steamApiKeyDescription: "Za praćenje Steam poslužitelja za igru, potrebno je imati Steam Web-API ključ. Možete registrirati vlastiti ključ ovdje: ",
     "Current User": "Trenutni korisnik",
+    recent: "Nedavno",
+    Done: "Gotovo",
+    Info: "Informacije",
+    Security: "Sigurnost",
+    "Shrink Database": "Smanji bazu podataka",
+    "Pick a RR-Type...": "Odaberite vrstu DNS zapisa od navedenih...",
+    "Pick Accepted Status Codes...": "Odaberite HTTP statusne kodove koji će biti prihvaćeni...",
+    "Steam API Key": "Steam API ključ",
+    Default: "Zadano",
+    "HTTP Options": "HTTP Postavke",
+    "Create Incident": "Novi izvještaj o incidentu",
+    Title: "Naslov",
+    Content: "Sadržaj",
+    Style: "Stil",
+    info: "informacija",
+    warning: "upozorenje",
+    danger: "opasnost",
+    primary: "primarno",
+    light: "svijetlo",
+    dark: "tamno",
+    Post: "Objavi",
+    Created: "Stvoreno",
+    "Last Updated": "Uređeno",
+    "Please input title and content": "Naslov i sadržaj ne mogu biti prazni",
+    Unpin: "Ukloni",
+    "Switch to Light Theme": "Prebaci na svijetli način",
+    "Switch to Dark Theme": "Prebaci na tamni način",
+    "Show Tags": "Pokaži oznake",
+    "Hide Tags": "Sakrij oznake",
+    Description: "Opis",
+    "No monitors available.": "Nema dostupnih monitora.",
+    "Add one": "Add one",
+    "No Monitors": "Bez monitora",
+    "Add one": "Stvori jednog",
+    "Untitled Group": "Bezimena grupa",
+    Services: "Usluge",
+    Discard: "Odbaci",
+    Cancel: "Otkaži",
+    "Powered by": "Pokreće",
+    Saved: "Spremljeno",
 };

src/languages/hu.js

@@ -2,26 +2,26 @@ export default {
     languageName: "Magyar",
     checkEverySecond: "Ellenőrzés {0} másodpercenként",
     retryCheckEverySecond: "Újrapróbál {0} másodpercenként.",
-    retriesDescription: "Maximális próbálkozás mielőtt a szolgáltatás leállt jelőlést kap és értesítés kerül kiküldésre",
+    retriesDescription: "Maximális próbálkozás mielőtt a szolgáltatás 'Leállt' jelölést kap és értesítés kerül kiküldésre",
-    ignoreTLSError: "TLS/SSL hibák figyelnen kívül hagyása HTTPS weboldalaknál",
+    ignoreTLSError: "TLS/SSL hibák figyelmen kívül hagyása HTTPS weboldalaknál",
     upsideDownModeDescription: "Az állapot megfordítása. Ha a szolgáltatás elérhető, akkor lesz leállt állapotú.",
     maxRedirectDescription: "Az átirányítások maximális száma. állítsa 0-ra az átirányítás tiltásához.",
     acceptedStatusCodesDescription: "Válassza ki az állapot kódokat amelyek sikeres válasznak fognak számítani.",
     passwordNotMatchMsg: "A megismételt jelszó nem egyezik.",
     notificationDescription: "Kérem, rendeljen egy értesítést a figyeléshez, hogy működjön.",
-    keywordDescription: "Kulcsszó keresése a html-ben vagy a JSON válaszban. (kis-nagybetű érzékeny)",
+    keywordDescription: "Kulcsszó keresése a HTML-ben vagy a JSON válaszban. (kis-nagybetű érzékeny)",
     pauseDashboardHome: "Szünetel",
     deleteMonitorMsg: "Biztos, hogy törölni akarja ezt a figyelőt?",
     deleteNotificationMsg: "Biztos, hogy törölni akarja ezt az értesítést az összes figyelőnél?",
     resoverserverDescription: "A Cloudflare az alapértelmezett szerver, bármikor meg tudja változtatni a resolver server-t.",
-    rrtypeDescription: "Válassza ki az RR-Típust a figyelőhöz",
+    rrtypeDescription: "Válassza ki az RR-típust a figyelőhöz",
     pauseMonitorMsg: "Biztos, hogy szüneteltetni akarja?",
     enableDefaultNotificationDescription: "Minden új figyelőhöz ez az értesítés engedélyezett lesz alapértelmezetten. Kikapcsolhatja az értesítést külön minden figyelőnél.",
     clearEventsMsg: "Biztos, hogy törölni akar miden eseményt ennél a figyelnél?",
-    clearHeartbeatsMsg: "Biztos, hogy törölni akar minden heartbeat-et ennél a figyelőnél?",
+    clearHeartbeatsMsg: "Biztos, hogy törölni akar minden életjelet ennél a figyelőnél?",
-    confirmClearStatisticsMsg: "Biztos, hogy törölni akat MINDEN statisztikát?",
+    confirmClearStatisticsMsg: "Biztos, hogy törölni akar MINDEN statisztikát?",
     importHandleDescription: "Válassza a 'Meglévő kihagyását', ha ki szeretné hagyni az azonos nevő figyelőket vagy értesítésket. A 'Felülírás' törölni fog minden meglévő figyelőt és értesítést.",
-    confirmImportMsg: "Biztos, hogy importálja a mentést? Győzödjön meg róla, hogy jól választotta ki az importálás opciót.",
+    confirmImportMsg: "Biztos, hogy importálja a mentést? Győződjön meg róla, hogy jól választotta ki az importálás opciót.",
     twoFAVerifyLabel: "Kérem, adja meg a token-t, hogy a 2FA működését ellenőrizzük",
     tokenValidSettingsMsg: "A token érvényes! El tudja menteni a 2FA beállításait.",
     confirmEnableTwoFAMsg: "Biztosan engedélyezi a 2FA-t?",
@@ -54,23 +54,23 @@ export default {
     Delete: "Törlés",
     Current: "Aktuális",
     Uptime: "Uptime",
-    "Cert Exp.": "Tanúsítvány lejár",
+    "Cert Exp.": "SSL lejárat",
-    days: "napok",
+    days: "nap",
     day: "nap",
-    "-day": "-nap",
+    "-day": " nap",
     hour: "óra",
-    "-hour": "-óra",
+    "-hour": " óra",
     Response: "Válasz",
     Ping: "Ping",
     "Monitor Type": "Figyelő típusa",
     Keyword: "Kulcsszó",
     "Friendly Name": "Rövid név",
     URL: "URL",
-    Hostname: "Hostnév",
+    Hostname: "Hosztnév",
     Port: "Port",
-    "Heartbeat Interval": "Heartbeat időköz",
+    "Heartbeat Interval": "Életjel időköz",
     Retries: "Újrapróbálkozás",
-    "Heartbeat Retry Interval": "Heartbeat újrapróbálkozások időköze",
+    "Heartbeat Retry Interval": "Életjel újrapróbálkozások időköze",
     Advanced: "Haladó",
     "Upside Down Mode": "Fordított mód",
     "Max. Redirects": "Max. átirányítás",
@@ -82,8 +82,8 @@ export default {
     Light: "Világos",
     Dark: "Sötét",
     Auto: "Auto",
-    "Theme - Heartbeat Bar": "Téma - Heartbeat Bar",
+    "Theme - Heartbeat Bar": "Téma - Életjel sáv",
-    Normal: "Normal",
+    Normal: "Normál",
     Bottom: "Nyomógomb",
     None: "Nincs",
     Timezone: "Időzóna",
@@ -97,9 +97,9 @@ export default {
     "Update Password": "Jelszó módosítása",
     "Disable Auth": "Hitelesítés tiltása",
     "Enable Auth": "Hitelesítés engedélyezése",
-    Logout: "Kijelenetkezés",
+    Logout: "Kijelentkezés",
     Leave: "Elhagy",
-    "I understand, please disable": "Megértettem, kérem tilsa le",
+    "I understand, please disable": "Megértettem, kérem tiltsa le",
     Confirm: "Megerősítés",
     Yes: "Igen",
     No: "Nem",
@@ -113,7 +113,7 @@ export default {
     Email: "Email",
     Test: "Teszt",
     "Certificate Info": "Tanúsítvány információk",
-    "Resolver Server": "Resolver szerver",
+    "Resolver Server": "DNS szerver",
     "Resource Record Type": "Resource Record típusa",
     "Last Result": "Utolsó eredmény",
     "Create your admin account": "Hozza létre az adminisztrátor felhasználót",
@@ -129,11 +129,11 @@ export default {
     Create: "Létrehozás",
     "Clear Data": "Adatok törlése",
     Events: "Események",
-    Heartbeats: "Heartbeats",
+    Heartbeats: "Életjelek",
-    "Auto Get": "Auto Get",
+    "Auto Get": "Auto lekérd.",
-    backupDescription: "Ki tudja menteni az összes figyelőt és értesítést egy JSON fájlba.",
+    backupDescription: "Mentheti az összes figyelőt és értesítést egy JSON fájlba.",
-    backupDescription2: "Ui.: Történeti és esemény adatokat nem tartalmaz.",
+    backupDescription2: "Megj: Történeti és esemény adatokat nem tartalmaz.",
-    backupDescription3: "Érzékeny adatok, pl. szolgáltatás kulcsok is vannak az export fájlban. Figyelmesen őrizze!",
+    backupDescription3: "Érzékeny adatok, pl. szolgáltatás kulcsok is vannak az export fájlban. Figyeljen erre!",
     alertNoFile: "Válaszzon ki egy fájlt az importáláshoz.",
     alertWrongFileType: "Válasszon egy JSON fájlt.",
     "Clear all statistics": "Összes statisztika törlése",
@@ -144,17 +144,17 @@ export default {
     "Verify Token": "Token ellenőrzése",
     "Setup 2FA": "2FA beállítása",
     "Enable 2FA": "2FA engedélyezése",
-    "Disable 2FA": "2FA toltása",
+    "Disable 2FA": "2FA tiltása",
     "2FA Settings": "2FA beállítások",
-    "Two Factor Authentication": "Two Factor Authentication",
+    "Two Factor Authentication": "Kétfaktoros hitelesítés",
     Active: "Aktív",
     Inactive: "Inaktív",
     Token: "Token",
     "Show URI": "URI megmutatása",
-    Tags: "Cimkék",
+    Tags: "Címkék",
     "Add New below or Select...": "Adjon hozzá lentre vagy válasszon...",
-    "Tag with this name already exist.": "Ilyen nevű cimke már létezik.",
+    "Tag with this name already exist.": "Ilyen nevű címke már létezik.",
-    "Tag with this value already exist.": "Ilyen értékű cimke már létezik.",
+    "Tag with this value already exist.": "Ilyen értékű címke már létezik.",
     color: "szín",
     "value (optional)": "érték (opcionális)",
     Gray: "Szürke",
@@ -169,15 +169,15 @@ export default {
     "Avg. Ping": "Átl. ping",
     "Avg. Response": "Átl. válasz",
     "Entry Page": "Nyitólap",
-    statusPageNothing: "Semmi nincs itt, kérem, adjon hozzá egy figyelőt.",
+    statusPageNothing: "Semmi nincs itt. Adjon hozzá egy vagy több figyelőt.",
     "No Services": "Nincs szolgáltatás",
     "All Systems Operational": "Minden rendszer működik",
     "Partially Degraded Service": "Részlegesen leállt szolgáltatás",
     "Degraded Service": "Leállt szolgáltatás",
     "Add Group": "Csoport hozzáadása",
     "Add a monitor": "Figyelő hozzáadása",
-    "Edit Status Page": "Sátusz oldal szerkesztése",
+    "Edit Status Page": "Státusz oldal szerkesztése",
-    "Go to Dashboard": "Menj az irányítópulthoz",
+    "Go to Dashboard": "Irányítópulthoz",
     telegram: "Telegram",
     webhook: "Webhook",
     smtp: "Email (SMTP)",
@@ -192,9 +192,162 @@ export default {
     octopush: "Octopush",
     promosms: "PromoSMS",
     lunasea: "LunaSea",
-    apprise: "Apprise (Support 50+ Notification services)",
+    apprise: "Apprise (50+ értesítési szolgáltatás)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
-    "Status Page": "Status Page",
+    "Status Page": "Státusz oldal",
+    "Primary Base URL": "Elsődleges URL",
+    "Push URL": "Meghívandó URL",
+    needPushEvery: "Ezt az URL-t kell meghívni minden {0} másodpercben.",
+    pushOptionalParams: "Opcionális paraméterek: {0}",
+    defaultNotificationName: "{notification} értesítésem ({number})",
+    here: "itt",
+    Required: "Kötelező",
+    "Bot Token": "BOT token",
+    wayToGetTelegramToken: "Innen kaphat token-t: {0}.",
+    "Chat ID": "Csevegés ID",
+    supportTelegramChatID: "Támogatja a közvetlen csevegést, csoportnak küldést és csatona ID-t is",
+    wayToGetTelegramChatID: "A csevegés ID-t kinyerheti azzal, hogy küld egy üzenetet a bot-nak és erre az URL-re ellátogat, ahol láthatja a chat_id:-t",
+    "YOUR BOT TOKEN HERE": "AZ ÖN BOT TOKENJE ITT",
+    chatIDNotFound: "Csevegés ID nem található, küldjön egy első üzenetet a bot-nak",
+    "Post URL": "Cél URL (Post)",
+    "Content Type": "Tartalom típus (Content Type)",
+    webhookJsonDesc: "{0} ideális a moderh HTTP szerverekhez, mint az Express.js",
+    webhookFormDataDesc: "{multipart} ideális a PHP-hez. A JSON értelmezhető ezzel: {decodeFunction}",
+    secureOptionNone: "Nincs / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "TLS hiba figyelmen kívül hagyása",
+    "From Email": "Feladó email",
+    emailCustomSubject: "Egyedi tárgy",
+    "To Email": "Cél email",
+    smtpCC: "Másolat",
+    smtpBCC: "Titkos másolat",
+    "Discord Webhook URL": "Discord cím (webhook URL)",
+    wayToGetDiscordURL: "Kaphat egy ilyet, ha ellátogat a Server Settings -> Integrations -> Create Webhook oldalra",
+    "Bot Display Name": "Bot megjelenő neve",
+    "Prefix Custom Message": "Egyedi előtét üzenet",
+    "Hello @everyone is...": "Hello {'@'}mindenki...",
+    "Webhook URL": "Cím (webhook URL)",
+    wayToGetTeamsURL: "Itt megnézheti, hogy kell ilyen URL-t készíteni: {0}.",
+    Number: "Szám",
+    Recipients: "Címzettek",
+    needSignalAPI: "Egy Signal kliensre van szüksége, amihez REST API tartozik.",
+    wayToCheckSignalURL: "Itt megnézheti, hogy hozhat létre egyet:",
+    signalImportant: "FONTOS! Nem keverheti a csoportokat és számokat a címzetteknél.",
+    "Application Token": "Alkalmazás token",
+    "Server URL": "Szerver URL",
+    Priority: "Prioritás",
+    "Icon Emoji": "Emoji ikonok",
+    "Channel Name": "Csatorna neve",
+    "Uptime Kuma URL": "Uptime Kuma cím",
+    aboutWebhooks: "Webhook-okról több info: {0}",
+    aboutChannelName: "Adja meg a {0} csatorna nevét ha szeretné elkerülni a webhook-ot. Pl: #masik-csatorna",
+    aboutKumaURL: "Ha üresen hagyja a Uptime Kuma cím mezőt, akkor a projekt GitHub oldala lesz az alapértelmezett.",
+    emojiCheatSheet: "Emoji csalás: {0}",
+    clicksendsms: "ClickSend SMS",
+    "User Key": "Felhasználói kulcs",
+    Device: "Eszköz",
+    "Message Title": "Üzenet címe",
+    "Notification Sound": "Értesítési hang",
+    "More info on:": "További információ: {0}",
+    pushoverDesc1: "A vészhelyzeti prioritásnak (2) 30 másodperc az újrapróbálkozási alapértéke és egy óra után lejár.",
+    pushoverDesc2: "Ha különböző eszközökre szeretne értesítést küldeni, töltse ki az Eszköz mezőt.",
+    "SMS Type": "SMS típusa",
+    octopushTypePremium: "Premium (Fast - recommended for alerting)",
+    octopushTypeLowCost: "Low Cost (Slow - sometimes blocked by operator)",
+    checkPrice: "Nézze meg az {0} féle árat:",
+    apiCredentials: "API kulcsok",
+    octopushLegacyHint: "Az Octopush régi (2011-2020) verzióját használja vagy az újat?",
+    "Check octopush prices": "Nézze meg az Octopush {0} féle árát.",
+    octopushPhoneNumber: "Telefonszám (nemz. formátum, pl : +36705554433) ",
+    octopushSMSSender: "SMS küldő neve : 3-11 betű/szám (a-zA-Z0-9) vagy szóköz",
+    "LunaSea Device ID": "LunaSea eszköz ID",
+    "Apprise URL": "Apprise cím (URL)",
+    "Example:": "Például: {0}",
+    "Read more:": "Itt olvashat róla: {0}",
+    "Status:": "Állapot: {0}",
+    "Read more": "Tovább olvasom",
+    appriseInstalled: "Apprise telepítve.",
+    appriseNotInstalled: "Apprise nincs telepítve. {0}",
+    "Access Token": "Elérési token",
+    "Channel access token": "Csatorna elérési token",
+    "Line Developers Console": "Line Developers konzol",
+    lineDevConsoleTo: "Line Developers konzol - {0}",
+    "Basic Settings": "Alap beállítások",
+    "User ID": "Felhasználó ID",
+    "Messaging API": "Üzenet API",
+    wayToGetLineChannelToken: "{0} első eléréséhez készítsen egy Provider-t és csatornát (Messaging API), utána kaphatja meg a csatorna elérési token-t és felhasználó ID-t az alábbi menüpontban.",
+    "Icon URL": "Ikon cím (URL)",
+    aboutIconURL: "Megadhat egy webcímet az Ikon cím mezőben, ezzel felülírva az alapértelmezet képet. Nem kerül felhasználásra, ha az Emoji-k be vannak állítva.",
+    aboutMattermostChannelName: "Felülírhatja az alapértelmezett csatornát, ahova a webhook az adatokat küldi. Ehhez töltse ki a \"Csatorna neve\" mezőt (pl: #egyeb-csatorna). A Mattermost webhook beállításaiban további engedélyek szükségesek",
+    matrix: "Matrix",
+    promosmsTypeEco: "SMS ECO - olcsó, de lassú, gyakran túlterhelt. Csak lengyel címzettekhez.",
+    promosmsTypeFlash: "SMS FLASH - Az üzenet automatikusan megjelenik a fogadó eszközön. Csak lengyel címzettekhez.",
+    promosmsTypeFull: "SMS FULL - Prémium szintje az SMS-nek. Megadható a feladó neve, de előtte jóváhagyás szükséges. Ideális értesítésekhez.",
+    promosmsTypeSpeed: "SMS SPEED - A legmagasabb prioritás a rendszerben. Nagyon gyors és pontos, de költséges (kb. duplája a hagyományos SMS-nek).",
+    promosmsPhoneNumber: "Telefonszám (lengyel címzett esetén az országkód elhagyható)",
+    promosmsSMSSender: "SMS feladónév: Előre beállított név vagy az alábbiak egyike: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    "Feishu WebHookUrl": "Feishu webhook cím (URL)",
+    matrixHomeserverURL: "Homeserver cím (URL http(s):// előtaggal és opcionálisan port-tal)",
+    "Internal Room Id": "Belső Szoba ID",
+    matrixDesc1: "A belső szoba ID-t a szpbák speciális beállítások között találja meg a Matrix kliens programban. Így kell kinéznie: !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "Erősen ajánlott készíteni egy új felhasználót és nem a teljes joggal rendelkező felhasználót használni. Az új felhasználó létrehozása után csak azokba a szobákba kell megjhívni a felhasználót, ahol értesítéseket szeretne kapni. Ezzel a művelettel lehet elérési token-t kérni: {0}",
+    Method: "Metódus",
+    Body: "Törzs",
+    Headers: "Fejlécek",
+    PushUrl: "Push cím (URL)",
+    HeadersInvalidFormat: "A kérés fejléc nem egy valós JSON: ",
+    BodyInvalidFormat: "A kérés törzse nem egy valós JSON: ",
+    "Monitor History": "Vizsgálatok előzményei",
+    clearDataOlderThan: "Előzmények megtartása {0} napig.",
+    PasswordsDoNotMatch: "Jelszó nem egyezik.",
+    records: "sorok",
+    "One record": "Egy sor",
+    steamApiKeyDescription: "Steam Game Server ellenőrzéséhez szükséges egy Steam Web-API kulcs. Itt létrehozhat egy API kulcsot: ",
+    "Current User": "Felhasználó",
+    recent: "Legújabb",
+    Done: "Kész",
+    Info: "Infó",
+    Security: "Biztonság",
+    "Steam API Key": "Steam API kulcs",
+    "Shrink Database": "Adatbázis tömörítése",
+    "Pick a RR-Type...": "Válasszon egy RR-típust...",
+    "Pick Accepted Status Codes...": "Válasszon olyan kódot, ami elfogadottnak számít...",
+    Default: "Alapért.",
+    "HTTP Options": "HTTP beállítások",
+    "Create Incident": "Incidens létrehozása",
+    Title: "Cím",
+    Content: "Tartalom",
+    Style: "Stílus",
+    info: "info",
+    warning: "warning",
+    danger: "danger",
+    primary: "primary",
+    light: "light",
+    dark: "dark",
+    Post: "Bejegyzés",
+    "Please input title and content": "Adjon meg címet és tartalmat",
+    Created: "Létrehozva",
+    "Last Updated": "Utolsó mód.",
+    Unpin: "Leválaszt",
+    "Switch to Light Theme": "Világos témára váltás",
+    "Switch to Dark Theme": "Sötét témára váltás",
+    "Show Tags": "Címkék mutatása",
+    "Hide Tags": "Címkék elrejtése",
+    Description: "Leírás",
+    "No monitors available.": "Nincs még figyelő beállítva.",
+    "Add one": "Adjon hozzá egyet",
+    "No Monitors": "Nincs figyelő",
+    "Untitled Group": "Névtelen csoport",
+    Services: "Szolgáltatások",
+    Discard: "Elvet",
+    Cancel: "Mégsem",
+    "Powered by": "A megoldást szállítja az",
+    shrinkDatabaseDescription: "VACUUM futtatása az SQLite-on. Ha az adatbázisod 1.10.0-nál újabb, akkor az AUTO_VACUUM engedélyezve van, nincs szükség a műveletre.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API felhasználónév (webapi_ előtaggal együtt)",
+    serwersmsAPIPassword: "API jelszó",
+    serwersmsPhoneNumber: "Telefonszám",
+    serwersmsSenderName: "SMS feladó neve (regisztrált név az oldalon)",
 };

src/languages/it-IT.js

@@ -2,48 +2,49 @@ export default {
     languageName: "Italiano (Italian)",
     checkEverySecond: "controlla ogni {0} secondi",
     retryCheckEverySecond: "Riprova ogni {0} secondi.",
-    retriesDescription: "Tentativi da fare prima che il servizio venga marcato come \"giù\" e che una notifica venga inviata.",
+    retriesDescription: "Tentativi prima che il servizio venga marcato come \"DOWN\" e che una notifica venga inviata.",
-    ignoreTLSError: "Ignora gli errori TLS/SSL per i siti in HTTPS.",
+    ignoreTLSError: "Ignora gli errori TLS/SSL per i siti HTTPS.",
-    upsideDownModeDescription: "Capovolgi lo stato. Se il servizio è raggiungibile viene marcato come \"GIÙ\".",
+    upsideDownModeDescription: "Se il servizio risulta raggiungibile viene marcato come \"DOWN\".",
-    maxRedirectDescription: "Numero massimo di redirezionamenti consentito. Per disabilitare impostare \"0\".",
+    maxRedirectDescription: "Numero massimo di redirezionamenti consentito. Per disabilitare, impostare \"0\".",
-    acceptedStatusCodesDescription: "Inserire i codici di stato considerati come risposte corrette.",
+    acceptedStatusCodesDescription: "Elenco di codici di stato HTTP che sono considerati validi.",
     passwordNotMatchMsg: "La password non coincide.",
-    notificationDescription: "Assegnare la notifica a uno o più elementi monitorati per metterla in funzione.",
+    notificationDescription: "Assegnare la notifica a uno o più oggetti monitorati per metterla in funzione.",
     keywordDescription: "Cerca la parola chiave nella risposta in html o JSON e fai distinzione tra maiuscole e minuscole",
     pauseDashboardHome: "In Pausa",
-    deleteMonitorMsg: "Si è certi di voler eliminare questo monitoraggio?",
+    deleteMonitorMsg: "Si è certi di voler eliminare questo oggetto monitorato?",
     deleteNotificationMsg: "Si è certi di voler eliminare questa notifica per tutti gli oggetti monitorati?",
     resoverserverDescription: "Cloudflare è il server predefinito, è possibile cambiare il server DNS.",
     rrtypeDescription: "Scegliere il tipo di RR che si vuole monitorare",
     pauseMonitorMsg: "Si è certi di voler mettere in pausa?",
-    enableDefaultNotificationDescription: "Per ogni nuovo monitoraggio questa notifica sarà abilitata di default. È comunque possibile disabilitare la notifica separatamente per ogni monitoraggio.",
+    enableDefaultNotificationDescription: "Per ogni nuovo monitor questa notifica sarà abilitata di default. È comunque possibile disabilitare la notifica singolarmente.",
     clearEventsMsg: "Si è certi di voler eliminare tutti gli eventi per questo servizio?",
     clearHeartbeatsMsg: "Si è certi di voler eliminare tutti gli intervalli di controllo per questo servizio?",
     confirmClearStatisticsMsg: "Si è certi di voler eliminare TUTTE le statistiche?",
-    importHandleDescription: "Selezionare 'Ignora gli esistenti' si vuole ignorare l'importazione dei monitoraggi o delle notifiche con lo stesso nome. 'Sovrascrivi' eliminerà ogni monitoraggio e notifica esistente.",
+    importHandleDescription: "Selezionare \"Ignora esistenti\" se si vuole ignorare l'importazione dei monitor o delle notifiche con lo stesso nome. \"Sovrascrivi\" rimpiazzerà tutti i monitor e le notifiche presenti con quelli nel backup.",
     confirmImportMsg: "Si è certi di voler importare il backup? Essere certi di aver selezionato l'opzione corretta di importazione.",
-    twoFAVerifyLabel: "Scrivi il token per verificare che l'autenticazione a due fattori funzioni",
+    twoFAVerifyLabel: "Digita il token per verificare che l'autenticazione a due fattori funzioni correttamente:",
     tokenValidSettingsMsg: "Il token è valido! È ora possibile salvare le impostazioni.",
     confirmEnableTwoFAMsg: "Si è certi di voler abilitare l'autenticazione a due fattori?",
     confirmDisableTwoFAMsg: "Si è certi di voler disabilitare l'autenticazione a due fattori?",
     Settings: "Impostazioni",
-    Dashboard: "Cruscotto",
+    Dashboard: "Dashboard",
-    "New Update": "Nuovo Aggiornamento Disponibile",
+    "New Update": "Nuovo aggiornamento disponibile!",
     Language: "Lingua",
     Appearance: "Aspetto",
     Theme: "Tema",
-    General: "Generali",
+    General: "Generale",
+    "Primary Base URL": "URL base primario",
     Version: "Versione",
     "Check Update On GitHub": "Controlla aggiornamenti su GitHub",
     List: "Lista",
     Add: "Aggiungi",
-    "Add New Monitor": "Aggiungi un nuovo monitoraggio",
+    "Add New Monitor": "Aggiungi nuovo monitor",
     "Quick Stats": "Statistiche rapide",
-    Up: "Su",
+    Up: "Up",
-    Down: "Giù",
+    Down: "Down",
-    Pending: "Pendente",
+    Pending: "In attesa",
     Unknown: "Sconosciuti",
-    Pause: "Metti in Pausa",
+    Pause: "Metti in pausa",
     Name: "Nome",
     Status: "Stato",
     DateTime: "Data e Ora",
@@ -62,67 +63,70 @@ export default {
     "-hour": "-ore",
     Response: "Risposta",
     Ping: "Ping",
-    "Monitor Type": "Tipo di Monitoraggio",
+    "Monitor Type": "Modalità di monitoraggio",
     Keyword: "Parola chiave",
-    "Friendly Name": "Nome Amichevole",
+    "Friendly Name": "Nome",
     URL: "URL",
     Hostname: "Nome Host",
     Port: "Porta",
     "Heartbeat Interval": "Intervallo di controllo",
     Retries: "Tentativi",
-    "Heartbeat Retry Interval": "Intervallo tra un tentativo di controllo e l'altro",
+    "Heartbeat Retry Interval": "Intervallo tra i tentativo di controllo",
     Advanced: "Avanzate",
-    "Upside Down Mode": "Modalità capovolta",
+    "Upside Down Mode": "Modalità invertita",
     "Max. Redirects": "Reindirizzamenti massimi",
     "Accepted Status Codes": "Codici di stato accettati",
+    "Push URL": "Push URL",
+    needPushEvery: "Notificare questo URL ogni {0} secondi.",
+    pushOptionalParams: "Parametri aggiuntivi: {0}",
     Save: "Salva",
     Notifications: "Notifiche",
-    "Not available, please setup.": "Non disponibili, da impostare.",
+    "Not available, please setup.": "Non disponibili, da configurare.",
-    "Setup Notification": "Imposta le notifiche",
+    "Setup Notification": "Configura le notifiche",
     Light: "Chiaro",
     Dark: "Scuro",
     Auto: "Automatico",
-    "Theme - Heartbeat Bar": "Tema - Barra di Stato",
+    "Theme - Heartbeat Bar": "Tema (barra di stato)",
     Normal: "Normale",
     Bottom: "Sotto",
     None: "Nessuna",
     Timezone: "Fuso Orario",
     "Search Engine Visibility": "Visibilità ai motori di ricerca",
-    "Allow indexing": "Permetti l'indicizzazione",
+    "Allow indexing": "Consenti l'indicizzazione",
-    "Discourage search engines from indexing site": "Scoraggia l'indicizzazione da parte dei motori di ricerca",
+    "Discourage search engines from indexing site": "Evita l'indicizzazione ai motori di ricerca",
-    "Change Password": "Cambio Password",
+    "Change Password": "Cambia password",
-    "Current Password": "Password Corrente",
+    "Current Password": "Password corrente",
-    "New Password": "Nuova Password",
+    "New Password": "Nuova password",
-    "Repeat New Password": "Ripetere la nuova Password",
+    "Repeat New Password": "Ripeti nuova password",
-    "Update Password": "Modifica Password",
+    "Update Password": "Modifica password",
-    "Disable Auth": "Disabilita l'autenticazione",
+    "Disable Auth": "Disabilita autenticazione",
-    "Enable Auth": "Abilita Autenticazione",
+    "Enable Auth": "Abilita autenticazione",
     Logout: "Esci",
     Leave: "Annulla",
     "I understand, please disable": "Lo capisco, disabilitare l'autenticazione.",
     Confirm: "Conferma",
     Yes: "Sì",
     No: "No",
-    Username: "Nome Utente",
+    Username: "Nome utente",
     Password: "Password",
-    "Remember me": "Ricordami",
+    "Remember me": "Ricorda credenziali",
     Login: "Accesso",
-    "No Monitors, please": "Nessun monitoraggio, cortesemente",
+    "No Monitors, please": "Nessun monitor presente,",
-    "add one": "aggiungerne uno",
+    "add one": "aggiungine uno!",
-    "Notification Type": "Tipo di notifica",
+    "Notification Type": "Servizio di notifica",
     Email: "E-mail",
-    Test: "Prova",
+    Test: "Fai una prova",
     "Certificate Info": "Informazioni sul certificato",
     "Resolver Server": "Server DNS",
     "Resource Record Type": "Tipo di Resource Record",
     "Last Result": "Ultimo risultato",
     "Create your admin account": "Crea l'account amministratore",
-    "Repeat Password": "Ripeti Password",
+    "Repeat Password": "Ripeti password",
-    "Import Backup": "Importa Backup",
+    "Import Backup": "Importa backup",
-    "Export Backup": "Esporta Backup",
+    "Export Backup": "Esporta backup",
     Export: "Esporta",
     Import: "Importa",
-    respTime: "Tempo di Risposta (ms)",
+    respTime: "Tempo di risposta (ms)",
     notAvailableShort: "N/D",
     "Default enabled": "Abilitato di default",
     "Apply on all existing monitors": "Applica su tutti i monitoraggi",
@@ -130,71 +134,231 @@ export default {
     "Clear Data": "Cancella dati",
     Events: "Eventi",
     Heartbeats: "Controlli",
-    "Auto Get": "Auto Get",
+    "Auto Get": "Rileva",
     backupDescription: "È possibile fare il backup di tutti i monitoraggi e di tutte le notifiche in un file JSON.",
-    backupDescription2: "P.S.: lo storico e i dati relativi agli eventi non saranno inclusi.",
+    backupDescription2: "NOTA: lo storico e i dati relativi agli eventi non saranno inclusi nel backup",
-    backupDescription3: "Dati sensibili come i token di autenticazione saranno inclusi nel backup, tenere quindi in un luogo sicuro.",
+    backupDescription3: "Dati sensibili come i token di autenticazione saranno inclusi nel backup, custodisci il file in un luogo sicuro!",
     alertNoFile: "Selezionare il file da importare.",
     alertWrongFileType: "Selezionare un file JSON.",
-    "Clear all statistics": "Pulisci tutte le statistiche",
+    "Clear all statistics": "Cancella tutte le statistiche",
-    "Skip existing": "Ignora gli esistenti",
+    "Skip existing": "Ignora esistenti",
     Overwrite: "Sovrascrivi",
     Options: "Opzioni",
     "Keep both": "Mantieni entrambi",
-    "Verify Token": "Verifica Token",
+    "Verify Token": "Verifica token",
-    "Setup 2FA": "Imposta  l'autenticazione a due fattori",
+    "Setup 2FA": "Configura 2FA",
-    "Enable 2FA": "Abilita  l'autenticazione a due fattori",
+    "Enable 2FA": "Abilita 2FA",
-    "Disable 2FA": "Disabilita  l'autenticazione a due fattori",
+    "Disable 2FA": "Disabilita 2FA",
-    "2FA Settings": "Impostazioni autenticazione a due fattori",
+    "2FA Settings": "Gestisci l'autenticazione a due fattori",
-    "Two Factor Authentication": "Autenticazione a due fattori",
+    "Two Factor Authentication": "Autenticazione a due fattori (2FA)",
     Active: "Attivata",
     Inactive: "Disattivata",
     Token: "Token",
     "Show URI": "Mostra URI",
     Tags: "Etichette",
-    "Add New below or Select...": "Aggiungine una oppure scegli...",
+    "Add New below or Select...": "Aggiungi oppure scegli...",
     "Tag with this name already exist.": "Un'etichetta con questo nome già esiste.",
     "Tag with this value already exist.": "Un'etichetta con questo valore già esiste.",
-    color: "colori",
+    color: "colore",
-    "value (optional)": "valore (opzionale)",
+    "value (optional)": "descrizione (opzionale)",
     Gray: "Grigio",
     Red: "Rosso",
     Orange: "Arancione",
     Green: "Verde",
     Blue: "Blu",
-    Indigo: "Indigo",
+    Indigo: "Indaco",
     Purple: "Viola",
     Pink: "Rosa",
     "Search...": "Cerca...",
-    "Avg. Ping": "Ping medio",
+    "Avg. Ping": "Tempo medio di risposta al ping",
-    "Avg. Response": "Risposta media",
+    "Avg. Response": "Tempo medio di risposta",
-    "Entry Page": "Entry Page",
+    "Entry Page": "Pagina Principale",
-    statusPageNothing: "Non c'è nulla qui, aggiungere un gruppo oppure un monitoraggio.",
+    statusPageNothing: "Non c'è nulla qui, aggiungi un gruppo oppure un monitor.",
-    "No Services": "Nessun Servizio",
+    "No Services": "Nessun servizio",
-    "All Systems Operational": "Tutti i sistemi sono operativi",
+    "All Systems Operational": "Tutti i sistemi sono funzionali",
     "Partially Degraded Service": "Servizio parzialmente degradato",
     "Degraded Service": "Servizio degradato",
-    "Add Group": "Aggiungi Gruppo",
+    "Add Group": "Aggiungi gruppo",
-    "Add a monitor": "Aggiungi un monitoraggio",
+    "Add a monitor": "Aggiungi monitor",
     "Edit Status Page": "Modifica pagina di stato",
-    "Go to Dashboard": "Vai al Cruscotto",
+    "Go to Dashboard": "Vai alla dashboard",
-    "Status Page": "Status Page",
+    "Status Page": "Pagina di stato",
+    defaultNotificationName: "Notifica {notification} ({number})",
+    here: "qui",
+    Required: "Obbligatorio",
     telegram: "Telegram",
+    "Bot Token": "Token del bot",
+    wayToGetTelegramToken: "Puoi ottenere il token da {0}.",
+    "Chat ID": "ID Chat",
+    supportTelegramChatID: "Supporta chat private, gruppi e canali.",
+    wayToGetTelegramChatID: "È possibile ricereve l'ID chat mandando un messaggio al bot e poi andando in questo URL per visualizzare il chat_id:",
+    "YOUR BOT TOKEN HERE": "QUI IL TOKEN DEL BOT",
+    chatIDNotFound: "Non trovo l'ID chat. Prima bisogna mandare un messaggio al bot",
     webhook: "Webhook",
-    smtp: "Email (SMTP)",
+    "Post URL": "Post URL",
+    "Content Type": "Content Type",
+    webhookJsonDesc: "{0} va bene per qualsiasi server HTTP moderno ad esempio express.js",
+    webhookFormDataDesc: "{multipart} va bene per PHP, c'è solo bisogno di analizzare il json con {decodeFunction}",
+    smtp: "E-mail (SMTP)",
+    secureOptionNone: "Nessuno / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "Ignora gli errori TLS",
+    "From Email": "Mittente",
+    emailCustomSubject: "Oggetto personalizzato",
+    "To Email": "Destinatario",
+    smtpCC: "CC",
+    smtpBCC: "CCn",
     discord: "Discord",
+    "Discord Webhook URL": "URL Webhook di Discord",
+    wayToGetDiscordURL: "È possibile recuperarlo da Impostazioni server -> Integrazioni -> Creare Webhook",
+    "Bot Display Name": "Nome del Bot",
+    "Prefix Custom Message": "Prefisso per il messaggio personalizzato",
+    "Hello @everyone is...": "Ciao a {'@'}everyone ...",
     teams: "Microsoft Teams",
+    "Webhook URL": "URL Webhook",
+    wayToGetTeamsURL: "È possibile imparare a creare un URL Webhook {0}.",
     signal: "Signal",
+    Number: "Numero",
+    Recipients: "Destinatari",
+    needSignalAPI: "È necessario avere un client Signal con le API REST.",
+    wayToCheckSignalURL: "Controllare questo url per capire come impostarne uno:",
+    signalImportant: "IMPORTANTE: Non è possibile mischiare gruppi e numeri all'interno dei destinatari!",
     gotify: "Gotify",
+    "Application Token": "Token Applicazione",
+    "Server URL": "URL Server",
+    Priority: "Priorità",
     slack: "Slack",
+    "Icon Emoji": "Icona Emoji",
+    "Channel Name": "Nome Canale",
+    "Uptime Kuma URL": "Indirizzo Uptime Kuma",
+    aboutWebhooks: "Maggiori informazioni riguardo ai webhooks su: {0}",
+    aboutChannelName: "Inserire il nome del canale nel campo \"Nome Canale\" {0} se si vuole bypassare il canale webhook. Ad esempio: #altro-canale",
+    aboutKumaURL: "Se si lascia bianco il campo Indirizzo Uptime Kuma, la pagina GitHub sarà il valore predefinito.",
+    emojiCheatSheet: "Lista Emoji: {0}",
     "rocket.chat": "Rocket.chat",
     pushover: "Pushover",
     pushy: "Pushy",
     octopush: "Octopush",
     promosms: "PromoSMS",
+    clicksendsms: "ClickSend SMS",
     lunasea: "LunaSea",
-    apprise: "Apprise (Support 50+ Notification services)",
+    apprise: "Apprise (Supporta più di 50 servizi di notifica)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
+    "User Key": "Chiave Utente",
+    Device: "Dispositivo",
+    "Message Title": "Titolo Messaggio",
+    "Notification Sound": "Suono di Notifica",
+    "More info on:": "Maggiori informazioni su: {0}",
+    pushoverDesc1: "Priorità di Emergenza (2) ha 30 secondi di timeout tra un tentativo e l'altro e scadrà dopo un'ora.",
+    pushoverDesc2: "Se si vuole inviare la notifica a dispositivi differenti, riempire il campo Dispositivi.",
+    "SMS Type": "Tipo di SMS",
+    octopushTypePremium: "Premium (Veloce - raccomandato per allertare)",
+    octopushTypeLowCost: "A Basso Costo (Lento - talvolta bloccato dall'operatore)",
+    checkPrice: "Controlla {0} prezzi:",
+    apiCredentials: "Credenziali API",
+    octopushLegacyHint: "Si vuole utilizzare la vecchia versione (2011-2020) oppure la nuova versione di Octopush?",
+    "Check octopush prices": "Controlla i prezzi di Octopush {0}.",
+    octopushPhoneNumber: "Numero di telefono (formato internazionale (p.e.): +33612345678) ",
+    octopushSMSSender: "Nome del mittente: 3-11 caratteri alfanumerici e spazi (a-zA-Z0-9)",
+    "LunaSea Device ID": "ID dispositivo LunaSea",
+    "Apprise URL": "URL Apprise",
+    "Example:": "Esempio: {0}",
+    "Read more:": "Maggiori informazioni: {0}",
+    "Status:": "Stato: {0}",
+    "Read more": "Maggiori informazioni",
+    appriseInstalled: "Apprise è installato.",
+    appriseNotInstalled: "Apprise non è installato. {0}",
+    "Access Token": "Token di accesso",
+    "Channel access token": "Token di accesso al canale",
+    "Line Developers Console": "Console sviluppatori Line",
+    lineDevConsoleTo: "Console sviluppatori Line - {0}",
+    "Basic Settings": "Impostazioni Base",
+    "User ID": "ID Utente",
+    "Messaging API": "API di Messaggistica",
+    wayToGetLineChannelToken: "Prima accedi a {0}, crea un provider e un canale (API di Messaggistica), dopodiché puoi avere il token di accesso e l'id utente dal menù sopra.",
+    "Icon URL": "URL Icona",
+    aboutIconURL: "È possibile impostare un collegameno a una immagine in \"URL Icona\" per modificare l'immagine di profilo. Non verrà utilizzata se è impostata l'Icona Emoji.",
+    aboutMattermostChannelName: "È possibile modificare il canale predefinito che dove il webhook manda messaggi immettendo il nome del canale nel campo \"Nome Canale\". Questo va abilitato nelle impostazioni webhook di Mattermost webhook. P.E.: #altro-canale",
+    matrix: "Matrix",
+    promosmsTypeEco: "SMS ECO - economico, ma lento e spesso sovraccarico. Limitato solamente a destinatari Polacchi.",
+    promosmsTypeFlash: "SMS FLASH - Il messaggio sarà automaticamente mostrato sul dispositivo dei destinatari. Limitato solo a destinatari Polacchi.",
+    promosmsTypeFull: "SMS FULL - Premium, È possibile utilizzare il proprio come come mittente (è necessario prima registrare il nome). Affidabile per gli allarmi.",
+    promosmsTypeSpeed: "SMS SPEED - Maggior priorità. Rapido, affidabile, ma costoso (costa il doppio di SMS FULL).",
+    promosmsPhoneNumber: "Numero di Telefono (per destinatari Polacchi si può omettere il codice area)",
+    promosmsSMSSender: "Mittente SMS : Nome preregistrato oppure uno dei seguenti: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    "Feishu WebHookUrl": "URL WebHook di Feishu",
+    matrixHomeserverURL: "URL Server (con http(s):// e opzionalmente la porta)",
+    "Internal Room Id": "ID Stanza Interna",
+    matrixDesc1: "È possibile recuperare l'ID della stanza all'interno delle impostazioni avanzate della stanza nel client Matrix. Dovrebbe essere simile a !QMdRCpUIfLwsfjxye6:server.di.casa.",
+    matrixDesc2: "È altamente raccomandata la creazione di un nuovo utente e di non utilizare il proprio token di accesso Matrix poiché darà pieno controllo al proprio account e a tutte le stanze in cui si ha accesso. Piuttosto, si crei un nuovo utente per invitarlo nella stanza dove si vuole ricevere le notifiche. Si può accedere al token eseguendo {0}",
+    Method: "Metodo",
+    Body: "Body",
+    Headers: "Intestazioni",
+    PushUrl: "URL di Push",
+    HeadersInvalidFormat: "L'intestazione di richiesta non è un JSON valido: ",
+    BodyInvalidFormat: "Il corpo di richiesta non è un JSON valido: ",
+    "Monitor History": "Storico monitor",
+    clearDataOlderThan: "Mantieni lo storico per {0} giorni.",
+    PasswordsDoNotMatch: "Le password non corrispondono!",
+    records: "records",
+    "One record": "One record",
+    steamApiKeyDescription: "Per monitorare un server di gioco Steam è necessaria una Web-API Key di Steam. È possibile registrarne una qui: ",
+    "Current User": "Utente corrente",
+    recent: "Recenti",
+    Done: "Fatto",
+    Info: "Info",
+    Security: "Sicurezza",
+    "Steam API Key": "API Key di Steam",
+    "Shrink Database": "Comprimi database",
+    "Pick a RR-Type...": "Scegli un tipo di RR...",
+    "Pick Accepted Status Codes...": "Scegli i codici di Stato Accettati...",
+    Default: "Predefinito",
+    "HTTP Options": "Opzioni HTTP",
+    "Create Incident": "Segnala incidente",
+    Title: "Titolo",
+    Content: "Contenuto",
+    Style: "Stile",
+    info: "informativo",
+    warning: "attenzione",
+    danger: "critico",
+    primary: "predefinito",
+    light: "chiaro",
+    dark: "scuro",
+    Post: "Posta",
+    "Please input title and content": "Inserire il titolo e il contenuto",
+    Created: "Creato",
+    "Last Updated": "Ultima modifica",
+    Unpin: "Rimuovi",
+    "Switch to Light Theme": "Utilizza il tema chiaro",
+    "Switch to Dark Theme": "Utilizza il tema scuro",
+    "Show Tags": "Mostra etichette",
+    "Hide Tags": "Nascondi etichette",
+    Description: "Descrizione",
+    "No monitors available.": "Nessun monitor disponibile.",
+    "Add one": "Aggiungine uno!",
+    "No Monitors": "Nessun monitor presente.",
+    "Untitled Group": "Gruppo senza titolo",
+    Services: "Servizi",
+    Discard: "Scarta modifiche",
+    Cancel: "Annulla",
+    "Powered by": "Powered by",
+    shrinkDatabaseDescription: "Lancia il comando \"VACUUM\" sul database SQLite. Se il database è stato creato dopo la versione 1.10.0, la funzione \"AUTO_VACUUM\" è già abilitata di default e quindi questa azione non è necessaria.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "Nome utente API (incl. prefisso webapi_)",
+    serwersmsAPIPassword: "Password API",
+    serwersmsPhoneNumber: "Numero di Telefono",
+    serwersmsSenderName: "Nome del mittente SMS (registrato via portale cliente)",
+    stackfield: "Stackfield",
+    smtpDkimSettings: "Impostazioni DKIM",
+    smtpDkimDesc: "Fare riferimento a Nodemailer DKIM {0} per l'utilizzo.",
+    documentation: "documentazione",
+    smtpDkimDomain: "Dominio",
+    smtpDkimKeySelector: "Selettore Chiave",
+    smtpDkimPrivateKey: "Chiave Privata",
+    smtpDkimHashAlgo: "Algoritmo di hashing (opzionale)",
+    smtpDkimheaderFieldNames: "Campi Intestazione da firmare (opzionale)",
+    smtpDkimskipFields: "Campi Intestazione da non firmare (opzionale)",
+    GoogleChat: "Google Chat (solo per Google Workspace)",
 };

src/languages/ja.js

@@ -17,7 +17,7 @@ export default {
     pauseMonitorMsg: "一時停止しますか？",
     Settings: "設定",
     Dashboard: "ダッシュボード",
-    "New Update": "New Update",
+    "New Update": "新しいアップデート",
     Language: "言語",
     Appearance: "外観",
     Theme: "テーマ",
@@ -53,7 +53,7 @@ export default {
     Ping: "Ping",
     "Monitor Type": "監視タイプ",
     Keyword: "キーワード",
-    "Friendly Name": "Friendly Name",
+    "Friendly Name": "分かりやすい名前",
     URL: "URL",
     Hostname: "ホスト名",
     Port: "ポート",
@@ -104,60 +104,60 @@ export default {
     "Resolver Server": "問い合わせ先DNSサーバ",
     "Resource Record Type": "DNSレコード設定",
     "Last Result": "最終結果",
-    "Create your admin account": "Create your admin account",
+    "Create your admin account": "Adminアカウントの作成",
-    "Repeat Password": "Repeat Password",
+    "Repeat Password": "パスワード確認",
-    respTime: "Resp. Time (ms)",
+    respTime: "応答時間 (ms)",
     notAvailableShort: "N/A",
-    Create: "Create",
+    Create: "作成",
-    clearEventsMsg: "Are you sure want to delete all events for this monitor?",
+    clearEventsMsg: "この監視のすべての記録を削除してもよろしいですか？",
-    clearHeartbeatsMsg: "Are you sure want to delete all heartbeats for this monitor?",
+    clearHeartbeatsMsg: "この監視のすべての異常記録を削除してもよろしいですか？",
-    confirmClearStatisticsMsg: "Are you sure want to delete ALL statistics?",
+    confirmClearStatisticsMsg: "すべての統計を削除してもよろしいですか？",
-    "Clear Data": "Clear Data",
+    "Clear Data": "データを削除",
-    Events: "Events",
+    Events: "統計",
-    Heartbeats: "Heartbeats",
+    Heartbeats: "異常記録",
-    "Auto Get": "Auto Get",
+    "Auto Get": "自動取得",
-    enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.",
+    enableDefaultNotificationDescription: "監視を作成するごとに、この通知方法はデフォルトで有効になります。監視ごとに通知を無効にすることもできます。",
-    "Default enabled": "Default enabled",
+    "Default enabled": "デフォルトで有効にする",
-    "Also apply to existing monitors": "Also apply to existing monitors",
+    "Also apply to existing monitors": "既存のモニターにも適用する",
-    Export: "Export",
+    Export: "エクスポート",
-    Import: "Import",
+    Import: "インポート",
-    backupDescription: "You can backup all monitors and all notifications into a JSON file.",
+    backupDescription: "すべての監視と通知方法をJSONファイルにできます。",
-    backupDescription2: "PS: History and event data is not included.",
+    backupDescription2: "※ 履歴と統計のデータはバックアップされません。",
-    backupDescription3: "Sensitive data such as notification tokens is included in the export file, please keep it carefully.",
+    backupDescription3: "通知に使用するトークンなどの機密データも含まれています。注意して扱ってください。",
-    alertNoFile: "Please select a file to import.",
+    alertNoFile: "インポートするファイルを選択してください。",
-    alertWrongFileType: "Please select a JSON file.",
+    alertWrongFileType: "JSONファイルを選択してください。",
-    twoFAVerifyLabel: "Please type in your token to verify that 2FA is working",
+    twoFAVerifyLabel: "トークンを入力して、２段階認証を有効にします。",
-    tokenValidSettingsMsg: "Token is valid! You can now save the 2FA settings.",
+    tokenValidSettingsMsg: "トークンの確認が完了しました！ 「保存」をしてください。",
-    confirmEnableTwoFAMsg: "Are you sure you want to enable 2FA?",
+    confirmEnableTwoFAMsg: "２段階認証を「有効」にします。よろしいですか？",
-    confirmDisableTwoFAMsg: "Are you sure you want to disable 2FA?",
+    confirmDisableTwoFAMsg: "２段階認証を「無効」にします。よろしいですか？",
-    "Apply on all existing monitors": "Apply on all existing monitors",
+    "Apply on all existing monitors": "既存のすべてのモニターに適用する",
-    "Verify Token": "Verify Token",
+    "Verify Token": "認証する",
-    "Setup 2FA": "Setup 2FA",
+    "Setup 2FA": "２段階認証の設定",
-    "Enable 2FA": "Enable 2FA",
+    "Enable 2FA": "２段階認証を有効にする",
-    "Disable 2FA": "Disable 2FA",
+    "Disable 2FA": "２段階認証を無効にする",
-    "2FA Settings": "2FA Settings",
+    "2FA Settings": "２段階認証の設定",
-    "Two Factor Authentication": "Two Factor Authentication",
+    "Two Factor Authentication": "２段階認証",
     Active: "Active",
     Inactive: "Inactive",
     Token: "Token",
     "Show URI": "Show URI",
-    "Clear all statistics": "Clear all Statistics",
+    "Clear all statistics": "すべての記録を削除",
     retryCheckEverySecond: "Retry every {0} seconds.",
-    importHandleDescription: "Choose 'Skip existing' if you want to skip every monitor or notification with the same name. 'Overwrite' will delete every existing monitor and notification.",
+    importHandleDescription: "同じ名前のすべての監視または通知方法を上書きしない場合は、「既存のをスキップ」を選択します。 「上書きする」は、既存のすべてのモニターと通知を削除します。",
-    confirmImportMsg: "Are you sure to import the backup? Please make sure you've selected the right import option.",
+    confirmImportMsg: "バックアップをインポートしてもよろしいですか？希望するオプションを選択してください。",
-    "Heartbeat Retry Interval": "Heartbeat Retry Interval",
+    "Heartbeat Retry Interval": "異常検知後の再試行間隔",
-    "Import Backup": "Import Backup",
+    "Import Backup": "バックアップのインポート",
-    "Export Backup": "Export Backup",
+    "Export Backup": "バックアップのエクスポート",
-    "Skip existing": "Skip existing",
+    "Skip existing": "既存のをスキップする",
-    Overwrite: "Overwrite",
+    Overwrite: "上書きする",
-    Options: "Options",
+    Options: "オプション",
-    "Keep both": "Keep both",
+    "Keep both": "どちらも保持する",
-    Tags: "Tags",
+    Tags: "タグ",
-    "Add New below or Select...": "Add New below or Select...",
+    "Add New below or Select...": "新規追加または選択...",
-    "Tag with this name already exist.": "Tag with this name already exist.",
+    "Tag with this name already exist.": "この名前のタグはすでに存在しています。",
-    "Tag with this value already exist.": "Tag with this value already exist.",
+    "Tag with this value already exist.": "この値のタグはすでに存在しています。",
-    color: "color",
+    color: "色",
-    "value (optional)": "value (optional)",
+    "value (optional)": "値 (optional)",
     Gray: "Gray",
     Red: "Red",
     Orange: "Orange",
@@ -166,20 +166,20 @@ export default {
     Indigo: "Indigo",
     Purple: "Purple",
     Pink: "Pink",
-    "Search...": "Search...",
+    "Search...": "検索...",
-    "Avg. Ping": "Avg. Ping",
+    "Avg. Ping": "平均Ping時間",
-    "Avg. Response": "Avg. Response",
+    "Avg. Response": "平均応答時間",
-    "Entry Page": "Entry Page",
+    "Entry Page": "エントリーページ",
-    statusPageNothing: "Nothing here, please add a group or a monitor.",
+    statusPageNothing: "ここには何もありません。グループまたは監視を追加してください。",
     "No Services": "No Services",
-    "All Systems Operational": "All Systems Operational",
+    "All Systems Operational": "すべてのサービスが稼働中",
-    "Partially Degraded Service": "Partially Degraded Service",
+    "Partially Degraded Service": "部分的にサービスが停止中",
-    "Degraded Service": "Degraded Service",
+    "Degraded Service": "サービスが停止中",
-    "Add Group": "Add Group",
+    "Add Group": "グループの追加",
-    "Add a monitor": "Add a monitor",
+    "Add a monitor": "監視の追加",
-    "Edit Status Page": "Edit Status Page",
+    "Edit Status Page": "ステータスページ編集",
-    "Go to Dashboard": "Go to Dashboard",
+    "Go to Dashboard": "ダッシュボード",
-    "Status Page": "Status Page",
+    "Status Page": "ステータスページ",
     telegram: "Telegram",
     webhook: "Webhook",
     smtp: "Email (SMTP)",

src/languages/ko-KR.js

@@ -194,7 +194,7 @@ export default {
     "Post URL": "Post URL",
     "Content Type": "Content Type",
     webhookJsonDesc: "{0}은 express.js와 같은 최신 HTTP 서버에 적합해요.",
-    webhookFormDataDesc: "{multipart}은 PHP에 적합해요. {decodeFunction}를 기준으로 json을 디코딩하면 돼요.",
+    webhookFormDataDesc: "{multipart}은 PHP에 적합해요. {decodeFunction}를 기준으로 json을 디코딩하면 되어요.",
     smtp: "Email (SMTP)",
     secureOptionNone: "없음 / STARTTLS (25, 587)",
     secureOptionTLS: "TLS (465)",
@@ -245,7 +245,7 @@ export default {
     "Message Title": "메시지 제목",
     "Notification Sound": "알림음",
     "More info on:": "자세한 정보: {0}",
-    pushoverDesc1: "긴급 우선 순위 (2)는 재시도 사이에 기본적으로 30초의 타임아웃이 있고, 1시간 후에 만료돼요.",
+    pushoverDesc1: "긴급 우선 순위 (2)는 재시도 사이에 기본적으로 30초의 타임아웃이 있고, 1시간 후에 만료되어요.",
     pushoverDesc2: "다른 장치에 알림을 보내려면 장치칸을 입력해주세요.",
     "SMS Type": "SMS 종류",
     octopushTypePremium: "프리미엄 (빠름) - 알림 기능에 적합해요)",
@@ -270,13 +270,85 @@ export default {
     "Messaging API": "Messaging API 메뉴",
     wayToGetLineChannelToken: "먼저 {0}에 액세스하고, 공급자 및 채널 (Messaging API)을 만든 다음, 각 메뉴 밑에 언급된 메뉴에서 채널 액세스 토큰과 사용자 ID를 얻을 수 있어요.",
     "Icon URL": "아이콘 URL",
-    aboutIconURL: "\"Icon URL\"에 사진 링크를 입력해 프로필 사진을 설정할 수 있어요. 아이콘 이모지가 설정되어 있으면 적용되지 않을 거예요.",
+    aboutIconURL: "\"아이콘 URL\"에 사진 링크를 입력해 프로필 사진을 설정할 수 있어요. 아이콘 이모지가 설정되어 있으면 적용되지 않을 거예요.",
     aboutMattermostChannelName: "채널 이름을 입력하면 Webhook이 게시할 기본 채널을 재설정할 수 있어요. 이 설정은 Mattermost 웹훅 설정에서 활성화해야 해요. 예: #기타-채널",
-    matrix: "매트릭스",
+    matrix: "Matrix",
     promosmsTypeEco: "SMS ECO - 저렴하지만 느리고 가끔 과부하에 걸려요. 폴란드 수신자만 사용할 수 있어요. ",
-    promosmsTypeFlash: "SMS FLASH - 메시지가 받는 사람 장치에 자동으로 표시돼요. 폴란드 수신자만 사용할 수 있어요.",
+    promosmsTypeFlash: "SMS FLASH - 메시지가 받는 사람 장치에 자동으로 표시되어요. 폴란드 수신자만 사용할 수 있어요.",
     promosmsTypeFull: "SMS FULL - SMS 프리미엄 티어, 보내는 사람 이름을 먼저 등록해야 해요. 알림 기능에 적합해요.",
     promosmsTypeSpeed: "SMS SPEED - 시스템에서 가장 높은 우선순위예요. 매우 빠르고 신뢰할 수 있지만 비용이 많이 들어요 (SMS 전체 가격의 약 두 배).",
-    promosmsPhoneNumber: "전화 번호 (폴란드 수신자라면 지역번호를 적지 않아도 돼요.)",
+    promosmsPhoneNumber: "전화 번호 (폴란드 수신자라면 지역번호를 적지 않아도 되어요.)",
     promosmsSMSSender: "SMS 보내는 사람 이름 : 미리 등록된 이름 혹은 기본값 중 하나예요: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
+    "Primary Base URL": "기본 URL",
+    "Push URL": "Push URL",
+    needPushEvery: "You should call this URL every {0} seconds.",
+    pushOptionalParams: "Optional parameters: {0}",
+    emailCustomSubject: "Custom Subject",
+    clicksendsms: "ClickSend SMS",
+    checkPrice: "{0} 가격 확인:",
+    apiCredentials: "API credentials",
+    octopushLegacyHint: "Octopush 레거시 버전 (2011-2020) 을 사용하시나요? 아니면 새 버전을 사용하시나요?",
+    "Feishu WebHookUrl": "Feishu WebHookURL",
+    matrixHomeserverURL: "Homeserver URL (with http(s):// and optionally port)",
+    "Internal Room Id": "내부 방 ID",
+    matrixDesc1: "Matrix 클라이언트 방 설정의 고급 섹션에서 내부 방 ID를 찾을 수 있어요. 내부 방 ID는 이렇게 생겼답니다: !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "사용자의 모든 방에 대한 엑세스가 허용될 수 있어서 새로운 사용자를 만들고 원하는 방에만 초대한 후 엑세스 토큰을 사용하는 것이 좋아요. {0} 이 명령어를 통해 엑세스 토큰을 얻을 수 있어요.",
+    Method: "Method",
+    Body: "Body",
+    Headers: "Headers",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "요청 Headers의 JSON 형식이 올바르지 않아요: ",
+    BodyInvalidFormat: "요청 Body의 JSON 형식이 올바르지 않아요: ",
+    "Monitor History": "모니터링 기록",
+    clearDataOlderThan: "모니터링 기록을 {0}일 동안 저장해요.",
+    PasswordsDoNotMatch: "비밀번호가 일치하지 않아요.",
+    records: "records",
+    "One record": "One record",
+    steamApiKeyDescription: "스팀 게임 서버를 모니터링하려면 Steam Web API 키가 필요해요. API 키는 하단 사이트에서 등록할 수 있어요: ",
+    "Current User": "현재 사용자",
+    recent: "최근",
+    Done: "완료",
+    Info: "정보",
+    Security: "보안",
+    "Steam API Key": "Steam API Key",
+    "Shrink Database": "데이터베이스 축소",
+    "Pick a RR-Type...": "RR-Type을 골라주세요...",
+    "Pick Accepted Status Codes...": "상태 코드를 골라주세요...",
+    Default: "기본",
+    "HTTP Options": "HTTP 옵션",
+    "Create Incident": "인시던트 만들기",
+    Title: "제목",
+    Content: "내용",
+    Style: "스타일",
+    info: "정보",
+    warning: "경고",
+    danger: "위험",
+    primary: "기본",
+    light: "라이트",
+    dark: "다크",
+    Post: "올리기",
+    "Please input title and content": "제목과 내용을 작성해주세요.",
+    Created: "생성 날짜",
+    "Last Updated": "마지막 업데이트",
+    Unpin: "제거",
+    "Switch to Light Theme": "라이트 테마로 전환",
+    "Switch to Dark Theme": "다크 테마로 전환",
+    "Show Tags": "태그 보이기",
+    "Hide Tags": "태그 숨기기",
+    Description: "설명",
+    "No monitors available.": "모니터링이 없어요.",
+    "Add one": "추가하기",
+    "No Monitors": "모니터링 없음",
+    "Untitled Group": "이름없는 그룹",
+    Services: "서비스",
+    Discard: "취소",
+    Cancel: "취소",
+    "Powered by": "Powered by",
+    shrinkDatabaseDescription: "SQLite 데이터베이스 VACUUM을 트리거해요. 만약 데이터베이스가 1.10.0 버전 이후에 생성되었다면 AUTO_VACUUM이 설정되어 있어 이 작업은 필요 없을 거에요.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API Usename (webapi_ 접두사 포함)",
+    serwersmsAPIPassword: "API 비밀번호",
+    serwersmsPhoneNumber: "휴대전화 번호",
+    serwersmsSenderName: "보내는 사람 이름 (registered via customer portal)",
+    stackfield: "Stackfield",
 };

src/languages/nl-NL.js

@@ -116,7 +116,7 @@ export default {
     "Repeat Password": "Herhaal wachtwoord",
     Export: "Exporteren",
     Import: "Importeren",
-    respTime: "resp. tijd (ms)",
+    respTime: "reactietijd (ms)",
     notAvailableShort: "N.v.t.",
     "Default enabled": "Default enabled",
     "Apply on all existing monitors": "Pas toe op alle bestaande monitors",
@@ -138,48 +138,48 @@ export default {
     "Two Factor Authentication": "Two Factor Authenticatie",
     Active: "Actief",
     Inactive: "Inactief",
-    "Also apply to existing monitors": "Also apply to existing monitors",
+    "Also apply to existing monitors": "Voeg ook toe aan bestaande monitors",
     Token: "Token",
     "Show URI": "Toon URI",
     "Clear all statistics": "Wis alle statistieken",
-    retryCheckEverySecond: "Retry every {0} seconds.",
+    retryCheckEverySecond: "Probeer elke {0} seconden.",
-    importHandleDescription: "Choose 'Skip existing' if you want to skip every monitor or notification with the same name. 'Overwrite' will delete every existing monitor and notification.",
+    importHandleDescription: "Kies 'Sla bestaande over' als je elke monitor of melding met dezelfde naam wilt overslaan. Kies 'Overschrijf' als je elke monitor of notificatie wilt verwijderen.",
-    confirmImportMsg: "Are you sure to import the backup? Please make sure you've selected the right import option.",
+    confirmImportMsg: "Weet je zeker dat je dit bestand wilt importeren?",
     "Heartbeat Retry Interval": "Heartbeat Retry Interval",
-    "Import Backup": "Import Backup",
+    "Import Backup": "Importeer Backup",
-    "Export Backup": "Export Backup",
+    "Export Backup": "Exporteer Backup",
-    "Skip existing": "Skip existing",
+    "Skip existing": "Sla bestaande over",
-    Overwrite: "Overwrite",
+    Overwrite: "Overschrijf",
-    Options: "Options",
+    Options: "Opties",
-    "Keep both": "Keep both",
+    "Keep both": "Bewaar beide",
-    Tags: "Tags",
+    Tags: "Labels",
-    "Add New below or Select...": "Add New below or Select...",
+    "Add New below or Select...": "Voeg nieuwe toe of selecteer...",
-    "Tag with this name already exist.": "Tag with this name already exist.",
+    "Tag with this name already exist.": "Label met deze naam bestaat al",
-    "Tag with this value already exist.": "Tag with this value already exist.",
+    "Tag with this value already exist.": "Label met deze waarde bestaat al",
-    color: "color",
+    color: "Kleur",
-    "value (optional)": "value (optional)",
+    "value (optional)": "waarde (optioneel)",
-    Gray: "Gray",
+    Gray: "Grijs",
-    Red: "Red",
+    Red: "Rood",
-    Orange: "Orange",
+    Orange: "Oranje",
-    Green: "Green",
+    Green: "Groen",
-    Blue: "Blue",
+    Blue: "Blauw",
     Indigo: "Indigo",
-    Purple: "Purple",
+    Purple: "Paars",
-    Pink: "Pink",
+    Pink: "Roze",
-    "Search...": "Search...",
+    "Search...": "Zoeken...",
-    "Avg. Ping": "Avg. Ping",
+    "Avg. Ping": "Gemiddelde Ping",
-    "Avg. Response": "Avg. Response",
+    "Avg. Response": "Gemiddelde Response",
     "Entry Page": "Entry Page",
-    statusPageNothing: "Nothing here, please add a group or a monitor.",
+    statusPageNothing: "Niets hier, voeg een groep of monitor toe.",
     "No Services": "No Services",
-    "All Systems Operational": "All Systems Operational",
+    "All Systems Operational": "Alle systemen operationeel",
-    "Partially Degraded Service": "Partially Degraded Service",
+    "Partially Degraded Service": "Gedeeltelijk verminderde prestaties",
-    "Degraded Service": "Degraded Service",
+    "Degraded Service": "Verminderde prestaties",
-    "Add Group": "Add Group",
+    "Add Group": "Voeg groep toe",
-    "Add a monitor": "Add a monitor",
+    "Add a monitor": "Voeg monitor toe",
-    "Edit Status Page": "Edit Status Page",
+    "Edit Status Page": "Wijzig status pagina",
-    "Go to Dashboard": "Go to Dashboard",
+    "Go to Dashboard": "Ga naar Dashboard",
-    "Status Page": "Status Page",
+    "Status Page": "Status Pagina",
     telegram: "Telegram",
     webhook: "Webhook",
     smtp: "Email (SMTP)",

src/languages/pl.js

@@ -307,4 +307,9 @@ export default {
     recent: "Ostatnie",
     clicksendsms: "ClickSend SMS",
     apiCredentials: "Poświadczenia API",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "Nazwa użytkownika API (z prefiksem webapi_)",
+    serwersmsAPIPassword: "Hasło API",
+    serwersmsPhoneNumber: "Numer telefonu",
+    serwersmsSenderName: "Nazwa nadawcy (zatwierdzona w panelu klienta)",
 };

src/languages/ru-RU.js

@@ -167,8 +167,8 @@ export default {
     Purple: "Пурпурный",
     Pink: "Розовый",
     "Search...": "Поиск...",
-    "Avg. Ping": "Средн. пинг",
+    "Avg. Ping": "Среднее значение пинга",
-    "Avg. Response": "Средн. ответ",
+    "Avg. Response": "Среднее время ответа",
     "Entry Page": "Главная страница",
     statusPageNothing: "Здесь пусто. Добавьте группу или монитор.",
     "No Services": "Нет сервисов",
@@ -308,4 +308,13 @@ export default {
     records: "записей",
     "One record": "Одна запись",
     steamApiKeyDescription: "Для мониторинга игрового сервера Steam вам необходим Web-API ключ Steam. Зарегистрировать его можно здесь: ",
+    "Certificate Chain:": "Цепочка сертификатов:",
+    "Valid": "Действительный",
+    "Hide Tags": "Скрыть тэги",
+    "Title:": "Название инцидента:",
+    "Content:": "Содержание инцидента:",
+    "Post": "Опубликовать",
+    "Cancel": "Отмена",
+    "Created:": "Создано:",
+    "Show Tags": "Показать тэги",
 };

src/languages/sl-SI.js

@@ -0,0 +1,355 @@
+export default {
+    languageName: "Slovenščina",
+    checkEverySecond: "Preveri na vsakih {0} sekund",
+    retryCheckEverySecond: "Ponovno poskusi na vsakih {0} sekund",
+    retriesDescription: "Maksimalno število poskusov predenj se storitev označi kot nedosegljiva in se pošlje obvestilo",
+    ignoreTLSError: "Ignoriraj TLS/SSL napake za HTTPS spletne strani",
+    upsideDownModeDescription: "Negiraj status. Če je storitev dosegljiva je NEDOSEGLJIVA.",
+    maxRedirectDescription: "Maksimalno število sledečih preusmeritev. 0 onemogoči preusmeritve.",
+    acceptedStatusCodesDescription: "Izberi kode statusa veljavna kot uspešen odgovor.",
+    passwordNotMatchMsg: "Ponovljeno geslo se ne ujema.",
+    notificationDescription: "Obvestila morajo biti dodeljena monitorju, da delujejo.",
+    keywordDescription: "Iskana ključna beseda v surovem HTML ali JSON odgovoru. Iskanje je občutljivo na začetnico.",
+    pauseDashboardHome: "Pavza",
+    deleteMonitorMsg: "Ste prepričani, da želite izbrisati ta monitor?",
+    deleteNotificationMsg: "Ste prepričani, da želite izbrisati to obvestilo za vse monitorje?",
+    resoverserverDescription: "Cloudflare je privzeti strežnik. DNS strežnik lahko spremenite kadarkoli.",
+    rrtypeDescription: "Izberite RR tip, ki ga želite spremljati",
+    pauseMonitorMsg: "Ste prepričani, da želite pavzirati?",
+    enableDefaultNotificationDescription: "To obvestilo bo kot privzeto omogočeno za vse nove monitorje. Še vedno ga lahko izključite posebej za vsak monitor.",
+    clearEventsMsg: "Ste prepričani da želite izbrisati vse dogodke tega monitorja?",
+    clearHeartbeatsMsg: "Ste prepričani da želite izbrisati vse srčne utripe tega monitorja?",
+    confirmClearStatisticsMsg: "Ste prepričani da želite izbrisati VSO statistiko?",
+    importHandleDescription: "Izberite 'Preskoči obstoječe', če želite preskočiti vsak monitor ali obvestilo z istim imenom. 'Prepiši' bo prepisal vse obstoječe monitorje in obvestila.",
+    confirmImportMsg: "Ste prepričani da želite uvoziti varnostno kopijo? Preverite da ste izbrali pravo opcijo za uvoz.",
+    twoFAVerifyLabel: "Prosimo vnesite žeton za potrditev 2FA:",
+    tokenValidSettingsMsg: "Žeton je veljaven! Sedaj lahko shranite 2FA nastavitev.",
+    confirmEnableTwoFAMsg: "Ste prepričani, da želite omogočiti 2FA?",
+    confirmDisableTwoFAMsg: "Ste prepričani, da želite onemogočiti 2FA?",
+    Settings: "Nastavitve",
+    Dashboard: "Nadzorna plošča",
+    "New Update": "Nova posodobitev",
+    Language: "Jezik",
+    Appearance: "Izgled",
+    Theme: "Teme",
+    General: "Splošno",
+    "Primary Base URL": "Primaren URL",
+    Version: "Različica",
+    "Check Update On GitHub": "Preveri posodobitev na GitHub-u",
+    List: "Seznam",
+    Add: "Dodaj",
+    "Add New Monitor": "Dodaj nov monitor",
+    "Quick Stats": "Hitro stanje",
+    Up: "Dosegljiv",
+    Down: "Nedosegljiv",
+    Pending: "Na čakanju",
+    Unknown: "Neznano",
+    Pause: "Pavza",
+    Name: "Ime",
+    Status: "Status",
+    DateTime: "DateTime",
+    Message: "Sporočilo",
+    "No important events": "Ni pomembnih dogodkov",
+    Resume: "Nadaljuj",
+    Edit: "Uredi",
+    Delete: "Izbriši",
+    Current: "Trenutno",
+    Uptime: "Uptime",
+    "Cert Exp.": "Potek certifikata",
+    days: "dni",
+    day: "dan",
+    "-day": "-dni",
+    hour: "ura",
+    "-hour": "-ur",
+    Response: "Odgovor",
+    Ping: "Ping",
+    "Monitor Type": "Tip monitorja",
+    Keyword: "Ključna beseda",
+    "Friendly Name": "Ime za prikaz",
+    URL: "URL",
+    Hostname: "Hostname",
+    Port: "Vrata",
+    "Heartbeat Interval": "Interval srčnega utripa",
+    Retries: "Ponovni poskusi",
+    "Heartbeat Retry Interval": "Ponovni poskus srčnega utripa",
+    Advanced: "Napredno",
+    "Upside Down Mode": "Negiran način",
+    "Max. Redirects": "Max. preusmeritev",
+    "Accepted Status Codes": "Sprejete kode statusa",
+    "Push URL": "Push URL",
+    needPushEvery: "Pokliči ta URL vsakih {0} sekund.",
+    pushOptionalParams: "Dodatni parametri: {0}",
+    Save: "Shrani",
+    Notifications: "Obvestila",
+    "Not available, please setup.": "Ni na voljo, prosimo nastavite.",
+    "Setup Notification": "Nastavi obvestila",
+    Light: "Svetlo",
+    Dark: "Temno",
+    Auto: "Auto",
+    "Theme - Heartbeat Bar": "Tema - vrstica srčnega utripa",
+    Normal: "Normalna",
+    Bottom: "Spodaj",
+    None: "Brez",
+    Timezone: "Časovni pas",
+    "Search Engine Visibility": "Vidljivost v spletnih iskalnikih",
+    "Allow indexing": "Dovoli indeksiranje",
+    "Discourage search engines from indexing site": "Odvračaj spletne iskalnike od indeksiranja te strani",
+    "Change Password": "Zamenjaj geslo",
+    "Current Password": "Trenutno geslo",
+    "New Password": "Novo geslo",
+    "Repeat New Password": "Ponovi novo geslo",
+    "Update Password": "Posodobi geslo",
+    "Disable Auth": "Onemogoči auth",
+    "Enable Auth": "Omogoči auth",
+    Logout: "Odjava",
+    Leave: "Zapusti",
+    "I understand, please disable": "Razumem, prosim onemogočite",
+    Confirm: "Potrdi",
+    Yes: "Da",
+    No: "Ne",
+    Username: "Uporabniško ime",
+    Password: "Geslo",
+    "Remember me": "Zapomni si me",
+    Login: "Vpis",
+    "No Monitors, please": "Prosim, brez monitorjev",
+    "add one": "Dodaj enega",
+    "Notification Type": "Tip obvestila",
+    Email: "Email",
+    Test: "Test",
+    "Certificate Info": "Informacije certifikata",
+    "Resolver Server": "Strežnik za razreševanje",
+    "Resource Record Type": "Vrsta zapisa o viru",
+    "Last Result": "Zadnji rezultat",
+    "Create your admin account": "Ustvari administratorski račun",
+    "Repeat Password": "Ponovi geslo",
+    "Import Backup": "Uvozi varnostno kopijo",
+    "Export Backup": "Izvozi varnostno kopijo",
+    Export: "Izvozi",
+    Import: "Uvozi",
+    respTime: "Odzivni čas (ms)",
+    notAvailableShort: "N/A",
+    "Default enabled": "Privzeto omogočeno",
+    "Apply on all existing monitors": "Uporabi na vseh obstoječih monitorjih",
+    Create: "Ustvari",
+    "Clear Data": "Izbriši podatke",
+    Events: "Dogodki",
+    Heartbeats: "Srčni utripi",
+    "Auto Get": "Auto Get",
+    backupDescription: "Izvozite lahko vse monitorje in obvestila v JSON datoteko.",
+    backupDescription2: "Pomni: Zgodovina in podatki dogodkov niso vključeni.",
+    backupDescription3: "Občutljivi podatki, kot žetoni za obvestila so vlkjučeni v datoteko za izvoz; prosimo hranite na varnem.",
+    alertNoFile: "Izberite datoteko za Uvoz.",
+    alertWrongFileType: "Prosimo izberite JSON datoteko.",
+    "Clear all statistics": "Pobrišite vso statistiko",
+    "Skip existing": "Preskoči obstoječe",
+    Overwrite: "Prepiši",
+    Options: "Možnosti",
+    "Keep both": "Ohrani oboje",
+    "Verify Token": "Potrdi žeton",
+    "Setup 2FA": "Nastavi 2FA",
+    "Enable 2FA": "Omogoči 2FA",
+    "Disable 2FA": "Onemogoči 2FA",
+    "2FA Settings": "2FA nastavitve",
+    "Two Factor Authentication": "Preverjanje pristnosti z dvema dejavnikoma",
+    Active: "Aktivno",
+    Inactive: "Neaktivno",
+    Token: "Žeton",
+    "Show URI": "Prikaži URI",
+    Tags: "Značke",
+    "Add New below or Select...": "Dodaj novo spodaj ali izberi iz seznama...",
+    "Tag with this name already exist.": "Značka s tem imenom že obstaja.",
+    "Tag with this value already exist.": "Značka s to vrednostjo že obstaja.",
+    color: "barva",
+    "value (optional)": "vrednost (po želji)",
+    Gray: "Siva",
+    Red: "Rdeča",
+    Orange: "Oranžna",
+    Green: "Zelena",
+    Blue: "Modra",
+    Indigo: "Indigo",
+    Purple: "Vijolična",
+    Pink: "Roza",
+    "Search...": "Išči...",
+    "Avg. Ping": "Avg. Ping",
+    "Avg. Response": "Avg. odziv",
+    "Entry Page": "Vstopna stran",
+    statusPageNothing: "Nikjer nič... Dodajte skupino ali monitor.",
+    "No Services": "Ni storitev",
+    "All Systems Operational": "Vsi sistemi delujejo",
+    "Partially Degraded Service": "Delno poslabšana storitev",
+    "Degraded Service": "Poslabšana storitev",
+    "Add Group": "Dodaj skupino",
+    "Add a monitor": "Dodaj monitor",
+    "Edit Status Page": "Uredi statusno stran",
+    "Go to Dashboard": "Pojdi na nadzorno ploščo",
+    "Status Page": "Status",
+    defaultNotificationName: "Moje {notification} Obvestilo ({number})",
+    here: "tukaj",
+    Required: "Obvezno",
+    telegram: "Telegram",
+    "Bot Token": "Robotkov žetonček",
+    wayToGetTelegramToken: "Lahko dobiš žeton od {0}.",
+    "Chat ID": "ID pogovora",
+    supportTelegramChatID: "Direkten pogovor pomoči / Skupina / ID kanala",
+    wayToGetTelegramChatID: "Id lahko dobiš, če pošlješ sporočilo robotku in odpreš ta URL, da bi videl chat_id:",
+    "YOUR BOT TOKEN HERE": "ROBOTKOV ŽETON TUKAJ",
+    chatIDNotFound: "Ne najdem Chat Id-ja; prvo pošlji sporočilo robotku",
+    webhook: "Webhook",
+    "Post URL": "Post URL",
+    "Content Type": "Vrsta vsebine",
+    webhookJsonDesc: "{0} je v redu za vsak moderen HTTP strežnik, kot recimo Express.js",
+    webhookFormDataDesc: "{multipart} je v redu za PHP. JSON bo moral biti razčlenjen s {decodeFunction}",
+    smtp: "Email (SMTP)",
+    secureOptionNone: "Brez / STARTTLS (25, 587)",
+    secureOptionTLS: "TLS (465)",
+    "Ignore TLS Error": "Ignoriraj TLS napako",
+    "From Email": "Od Email",
+    emailCustomSubject: "Poljubna zadeva",
+    "To Email": "Za Email",
+    smtpCC: "CC",
+    smtpBCC: "BCC",
+    discord: "Discord",
+    "Discord Webhook URL": "Discord Webhook URL",
+    wayToGetDiscordURL: "To lahko dibiš v Server Settings -> Integrations -> Create Webhook",
+    "Bot Display Name": "Prikazno ime robotka",
+    "Prefix Custom Message": "Predpona poljubnega sporočila",
+    "Hello @everyone is...": "Pozdravljen {'@'}everyone je...",
+    teams: "Microsoft Teams",
+    "Webhook URL": "Webhook URL",
+    wayToGetTeamsURL: "Izvedi kako narediš webhook URL {0}.",
+    signal: "Signal",
+    Number: "Številka",
+    Recipients: "Prejemniki",
+    needSignalAPI: "Imeti moraš signal klienta z REST API.",
+    wayToCheckSignalURL: "Kako se to naredi, lahko preveriš na tem URL-ju:",
+    signalImportant: "POMEMBNO: Ne moreš mešati skupin in številk v prejemnikih!",
+    gotify: "Gotify",
+    "Application Token": "Žeton za aplikacijo",
+    "Server URL": "URL Strežnika",
+    Priority: "Prioriteta",
+    slack: "Slack",
+    "Icon Emoji": "Emoji ikona",
+    "Channel Name": "Ime kanala",
+    "Uptime Kuma URL": "Uptime Kuma URL",
+    aboutWebhooks: "Več o webhook-ih: {0}",
+    aboutChannelName: "Vnesi ime kanala na {0} Channel Name polje, če želiš preskočiti webhook kanal. npr.: #drug-kanal",
+    aboutKumaURL: "Če pustite polje Uptime Kuma URL prazno, bo nastavljeno privzeto na GitHub stran projekta.",
+    emojiCheatSheet: "Emoji plonk listek: {0}",
+    "rocket.chat": "Rocket.Chat",
+    pushover: "Pushover",
+    pushy: "Pushy",
+    octopush: "Octopush",
+    promosms: "PromoSMS",
+    clicksendsms: "ClickSend SMS",
+    lunasea: "LunaSea",
+    apprise: "Apprise (podpira 50+ storitev za obveščevanje)",
+    pushbullet: "Pushbullet",
+    line: "Line Messenger",
+    mattermost: "Mattermost",
+    "User Key": "User Key",
+    Device: "Naprava",
+    "Message Title": "Naslov sporočila",
+    "Notification Sound": "Zvok obvestila",
+    "More info on:": "Več informacij na: {0}",
+    pushoverDesc1: "Prioriteta nujnosti (2) ima privzeto nastavitev 30 sekund časa med ponovni poskusi in poteče po 1 uri.",
+    pushoverDesc2: "Če želite pošiljati obvestila na različne naprave izpolnite polje 'Naprava'.",
+    "SMS Type": "Vrsta SMS-a",
+    octopushTypePremium: "Premium (hitro - priporočljivo za opozarjanje)",
+    octopushTypeLowCost: "Cenovno ugodno (počasno - včasih jih blokira operater)",
+    checkPrice: "preveri {0} cene:",
+    apiCredentials: "API poverilnice",
+    octopushLegacyHint: "Uporabljate legacy verzijo Octopush-a (2011-2020) ali novo verzijo?",
+    "Check octopush prices": "Preveri octopush cene {0}.",
+    octopushPhoneNumber: "Telefonska številka (npr.: +386031234567) ",
+    octopushSMSSender: "Ime SMS pošiljatelja: 3-11 alfanumeričnih znakov in presledki (a-zA-Z0-9)",
+    "LunaSea Device ID": "LunaSea Device ID",
+    "Apprise URL": "Apprise URL",
+    "Example:": "Primer: {0}",
+    "Read more:": "Preberi več: {0}",
+    "Status:": "Status: {0}",
+    "Read more": "Preberi več",
+    appriseInstalled: "Apprise je nameščen.",
+    appriseNotInstalled: "Apprise ni nameščen. {0}",
+    "Access Token": "Žeton za dostop",
+    "Channel access token": "Žeton za dostop do kanala",
+    "Line Developers Console": "Line Developers Console",
+    lineDevConsoleTo: "Line Developers Console - {0}",
+    "Basic Settings": "Osnovne nastavitve",
+    "User ID": "User ID",
+    "Messaging API": "Messaging API",
+    wayToGetLineChannelToken: "Prvo odpri {0}, ustvarite ponudnika in kanal (Messaging API), potem lahko žeton za dostop do kanala in ID uporabnika dobite iz zgoraj navedenih elementov menija.",
+    "Icon URL": "URL ikone",
+    aboutIconURL: "V razdelku \"URL ikone\" lahko zagotovite povezavo do slike, ki bo nadomestila privzeto sliko profila. Ne bo uporabljena, če je nastavljena ikona Emoji.",
+    aboutMattermostChannelName: "V razdelku \"URL ikone\" lahko zagotovite povezavo do slike, ki bo nadomestila privzeto sliko profila. Ne bo uporabljena, če je nastavljena ikona Emoji",
+    matrix: "Matrix",
+    promosmsTypeEco: "SMS ECO - poceni, vendar počasen in pogosto preobremenjen. Omejeno samo na poljske prejemnike.",
+    promosmsTypeFlash: "SMS FLASH - sporočilo se samodejno prikaže v napravi prejemnika. Omejeno samo na poljske prejemnike.",
+    promosmsTypeFull: "SMS FULL - Premium raven SMS, Uporabite lahko svoje ime pošiljatelja (najprej morate registrirati ime). Zanesljivo za opozorila.",
+    promosmsTypeSpeed: "SMS SPEED - Najvišja prednost v sistemu. Zelo hitro in zanesljivo, vendar drago (približno dvakratnik cene SMS FULL)..",
+    promosmsPhoneNumber: "Telefonska številka (za poljskega prejemnika Lahko preskočite področne oznake",
+    promosmsSMSSender: "Ime pošiljatelja SMS : vnaprej registrirano ime ali eno od privzetih: SMS, SMS Info, MaxSMS, INFO, SMS",
+    "Feishu WebHookUrl": "Feishu WebHookURL",
+    matrixHomeserverURL: "Homeserver URL (z http(s):// in vrata po želji)",
+    "Internal Room Id": "Interni ID sobe",
+    matrixDesc1: "Notranji ID sobe lahko poiščete v naprednem razdelku nastavitev sobe v odjemalcu Matrix. Izgledati mora kot !QMdRCpUIfLwsfjxye6:home.server",
+    matrixDesc2: "Zelo priporočljivo je, da ustvarite novega uporabnika in ne uporabljate svojega žetona za dostop uporabnika Matrix, saj bo omogočil popoln dostop do vašega računa in vseh sob, ki ste se jim pridružili. Namesto tega ustvarite novega uporabnika in ga povabite le v sobo, v kateri želite prejemati obvestila. Token dostopa lahko dobite tako, da zaženete {0}",
+    Method: "Metoda",
+    Body: "Telo",
+    Headers: "Glave",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "Glave zahtevka niso veljavni JSON: ",
+    BodyInvalidFormat: "Telo zahteve ni veljaven JSON: ",
+    "Monitor History": "Zgodovina",
+    clearDataOlderThan: "Ohrani zgodovino {0} dni.",
+    PasswordsDoNotMatch: "Gesli se ne ujemata.",
+    records: "vnosi",
+    "One record": "En vnos",
+    steamApiKeyDescription: "Za spremljanje igralnega strežnika Steam potrebujete ključ spletnega vmesnika Steam. Ključ API lahko registrirate tukaj: ",
+    "Current User": "Trenuten uporabnik",
+    recent: "Nedavno",
+    Done: "Zaključi",
+    Info: "Info",
+    Security: "Varnost",
+    "Steam API Key": "Steam API Key",
+    "Shrink Database": "Stisni bazo",
+    "Pick a RR-Type...": "Izberi RR tip...",
+    "Pick Accepted Status Codes...": "Izbiranje sprejetih kod stanja...",
+    Default: "Privzeto",
+    "HTTP Options": "HTTP možnosti",
+    "Create Incident": "Ustvari incident",
+    Title: "Naslov",
+    Content: "Vsebina",
+    Style: "Stil",
+    info: "info",
+    warning: "opozorilo",
+    danger: "nevarnost",
+    primary: "primarno",
+    light: "svetlo",
+    dark: "temno",
+    Post: "Objavi",
+    "Please input title and content": "Vnesi naslov in vsebino",
+    Created: "Ustvarjeno",
+    "Last Updated": "Nazadnje posodobljeno",
+    Unpin: "Odpni",
+    "Switch to Light Theme": "Preklopi na svetlo temo",
+    "Switch to Dark Theme": "Preklopi na temno temo",
+    "Show Tags": "Prikaži značke",
+    "Hide Tags": "Skrij značke",
+    Description: "Opis",
+    "No monitors available.": "Nobenega monitorja ni na voljo.",
+    "Add one": "Dodaj enega",
+    "No Monitors": "Ni monitorjev",
+    "Add one": "Dodaj enega",
+    "Untitled Group": "Skupina brez imena",
+    Services: "Storitve",
+    Discard: "zavrzi",
+    Cancel: "Prekliči",
+    "Powered by": "Powered by",
+    shrinkDatabaseDescription: "Sprožitev podatkovne zbirke VACUUM za SQLite. Če je vaša zbirka podatkov ustvarjena po različici 1.10.0, je funkcija AUTO_VACUUM že omogočena in ta ukrep ni potreben.",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API uporabniško ime (vključno z webapi_ prefix)",
+    serwersmsAPIPassword: "API geslo",
+    serwersmsPhoneNumber: "Telefonska številka",
+    serwersmsSenderName: "Ime SMS pošiljatelja (registrirani prek portala za stranke)",
+    "stackfield": "Stackfield",
+};

src/languages/vi.js

@@ -33,21 +33,22 @@ export default {
     Appearance: "Giao diện",
     Theme: "Theme",
     General: "Chung",
+    "Primary Base URL": "URL chính",
     Version: "Phiên bản",
     "Check Update On GitHub": "Kiểm tra bản cập nhật mới trên GitHub",
     List: "List",
     Add: "Thêm",
     "Add New Monitor": "Thêm mới Monitor",
     "Quick Stats": "Thống kê nhanh",
-    Up: "Lên",
+    Up: "Up",
-    Down: "Xuống",
+    Down: "Down",
     Pending: "Chờ xử lý",
     Unknown: "Không xác định",
     Pause: "Tạm dừng",
     Name: "Tên",
     Status: "Trạng thái",
     DateTime: "Ngày tháng",
-    Message: "Tin nhắn",
+    Message: "Trạng thái request",
     "No important events": "Không có sự kiện quan trọng nào",
     Resume: "Khôi phục",
     Edit: "Sửa",
@@ -64,17 +65,20 @@ export default {
     Ping: "Ping",
     "Monitor Type": "Kiểu monitor",
     Keyword: "Từ khoá",
-    "Friendly Name": "Tên dễ hiểu",
+    "Friendly Name": "Tên monitor",
     URL: "URL",
     Hostname: "Hostname",
     Port: "Port",
-    "Heartbeat Interval": "Tần suất heartbeat",
+    "Heartbeat Interval": "Tần suất kiểm tra",
     Retries: "Thử lại",
-    "Heartbeat Retry Interval": "Tần suất thử lại của Heartbeat",
+    "Heartbeat Retry Interval": "Tần suất kiểm tra lại",
     Advanced: "Nâng cao",
-    "Upside Down Mode": "Trạng thái đảo ngược",
+    "Upside Down Mode": "Chế độ đảo ngược",
-    "Max. Redirects": "Chuyển hướng tối đa",
+    "Max. Redirects": "Số chuyển hướng tối đa",
     "Accepted Status Codes": "Codes trạng thái chấp nhận",
+    "Push URL": "Push URL",
+    needPushEvery: "Bạn nên gọi URL mỗi {0} giây.",
+    pushOptionalParams: "Tuỳ chỉnh parameters: {0}",
     Save: "Lưu",
     Notifications: "Thông báo",
     "Not available, please setup.": "Chưa sẵn sàng, hãy cài đặt.",
@@ -131,7 +135,7 @@ export default {
     Events: "Sự kiện",
     Heartbeats: "Heartbeats",
     "Auto Get": "Tự động lấy",
-    backupDescription: "Bạn có thể sao lưu tất cả các màn hình và tất cả các thông báo vào một file JSON.",
+    backupDescription: "Bạn có thể sao lưu tất cả các monitor và tất cả các thông báo vào một file JSON.",
     backupDescription2: "PS: Không bao gồm dữ liệu lịch sử các sự kiện.",
     backupDescription3: "Hãy lưu giữ file này cẩn thận vì trong file đó chứa cả các mã token thông báo.",
     alertNoFile: "Hãy chọn file để khôi phục.",
@@ -171,7 +175,7 @@ export default {
     "Entry Page": "Entry Page",
     statusPageNothing: "Không có gì, hãy thêm nhóm monitor hoặc monitor.",
     "No Services": "Không có dịch vụ",
-    "All Systems Operational": "Tất cả các hệ thống hoạt động",
+    "All Systems Operational": "Tất cả các hệ thống hoạt động bình thường",
     "Partially Degraded Service": "Dịch vụ xuống cấp một phần",
     "Degraded Service": "Degraded Service",
     "Add Group": "Thêm nhóm",
@@ -184,7 +188,7 @@ export default {
     Required: "Bắt buộc",
     telegram: "Telegram",
     "Bot Token": "Bot Token",
-    "You can get a token from": "Bạn có thể lấy mã token từ",
+    wayToGetTelegramToken: "Bạn có thể lấy mã token từ",
     "Chat ID": "Chat ID",
     supportTelegramChatID: "Hỗ trợ chat trực tiếp / Nhóm / Kênh Chat ID",
     wayToGetTelegramChatID: "Bạn có thể lấy chat id của mình bằng cách gửi tin nhắn tới bot và truy cập url này để xem chat_id:",
@@ -200,6 +204,7 @@ export default {
     secureOptionTLS: "TLS (465)",
     "Ignore TLS Error": "Bỏ qua lỗi TLS",
     "From Email": "Từ Email",
+    emailCustomSubject: "Tuỳ chỉnh tiêu đề",
     "To Email": "Tới Email",
     smtpCC: "CC",
     smtpBCC: "BCC",
@@ -212,7 +217,7 @@ export default {
     teams: "Microsoft Teams",
     "Webhook URL": "Webhook URL",
     wayToGetTeamsURL: "Bạn có thể học cách tạo webhook url {0}.",
-    signal: "Signal",
+    signal: "Tín hiệu",
     Number: "Số",
     Recipients: "Người nhận",
     needSignalAPI: "Bạn cần một tín hiệu client với REST API.",
@@ -235,8 +240,9 @@ export default {
     pushy: "Pushy",
     octopush: "Octopush",
     promosms: "PromoSMS",
+    clicksendsms: "ClickSend SMS",
     lunasea: "LunaSea",
-    apprise: "Thông báo (Hỗ trợ 50+ dịch vụ thông báo)",
+    apprise: "Apprise (Hỗ trợ 50+ dịch vụ thông báo)",
     pushbullet: "Pushbullet",
     line: "Line Messenger",
     mattermost: "Mattermost",
@@ -250,8 +256,11 @@ export default {
     "SMS Type": "SMS Type",
     octopushTypePremium: "Premium (Nhanh - Khuyến nghị nên dùng cho cảnh báo)",
     octopushTypeLowCost: "Giá rẻ (Chậm, thỉnh thoảng bị chặn)",
+    checkPrice: "Kiểm tra giá {0}:",
+    apiCredentials: "API credentials",
+    octopushLegacyHint: "Bạn muốn sử dụng phiên bản cũ của Octopush (2011-2020) hay phiên bản mới?",
     "Check octopush prices": "Kiểm tra giá octopush {0}.",
-    octopushPhoneNumber: "Số điện thoại (Định dạng intl, vd : +33612345678) ",
+    octopushPhoneNumber: "Số điện thoại (Định dạng intl, vd : +84123456789) ",
     octopushSMSSender: "SMS người gửi : 3-11 ký tự chữ, số và dấu cách (a-zA-Z0-9)",
     "LunaSea Device ID": "LunaSea ID thiết bị",
     "Apprise URL": "Apprise URL",
@@ -280,4 +289,22 @@ export default {
     promosmsPhoneNumber: "Số điện thoại (Bỏ qua mã vùng với người Ba Lan)",
     promosmsSMSSender: "SMS Tên người gửi: Tên đã đăng ký trước hoặc tên mặc định: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
     "Feishu WebHookUrl": "Feishu WebHookUrl",
+    matrixHomeserverURL: "Homeserver URL (với http(s):// và port tuỳ chỉnh)",
+    "Internal Room Id": "Room ID Nội bộ",
+    matrixDesc1: "Bạn có thể tìm thấy room ID nội bộ bằng cách tìm trong mục advanced của phần room settings trong Matrix client của bạn. Nó có dạng giống như !QMdRCpUIfLwsfjxye6:home.server.",
+    matrixDesc2: "Bạn nên tạo người dùng mới và đừng sử dụng mã token truy cập của Matrix user vì nó sẽ cho phép truy cập toàn quyền vào tài khoản của bạn và tất cả các phòng bạn đã tham gia. Thay vào đó, hãy tạo một người dùng mới và chỉ mời người đó vào phòng mà bạn muốn nhận thông báo. Bạn có thể lấy được mã token truy cập bằng cách chạy {0}",
+    Method: "Method",
+    Body: "Body",
+    Headers: "Headers",
+    PushUrl: "Push URL",
+    HeadersInvalidFormat: "Header request không hợp lệ JSON: ",
+    BodyInvalidFormat: "Tequest body không hợp lệ JSON: ",
+    "Monitor History": "Lịch sử Monitor",
+    clearDataOlderThan: "Giữ dữ liệu lịch sử monitor {0} ngày.",
+    PasswordsDoNotMatch: "Passwords không khớp.",
+    records: "records",
+    "One record": "One record",
+    steamApiKeyDescription: "Để monitor các Steam Game Server bạn cần một Steam Web-API key. Bạn có thể đăng ký API key tại đây: ",
+    "Current User": "User hiện tại",
+    recent: "Gần đây",
 };

src/languages/zh-TW.js

@@ -14,7 +14,7 @@ export default {
     deleteMonitorMsg: "您確定要刪除此監測器嗎？",
     deleteNotificationMsg: "您確定要為所有監測器刪除此通知嗎？",
     resoverserverDescription: "Cloudflare 為預設伺服器。您可以隨時更換解析伺服器。",
-    rrtypeDescription: "選擇您想要監測的資源記錄",
+    rrtypeDescription: "選擇您想要監測的資源記錄類型",
     pauseMonitorMsg: "您確定要暫停嗎？",
     enableDefaultNotificationDescription: "預設情況下，新監測器將啟用此通知。您仍可分別停用各監測器的通知。",
     clearEventsMsg: "您確定要刪除此監測器的所有事件嗎？",
@@ -307,4 +307,50 @@ export default {
     "Showing {from} to {to} of {count} records": "正在顯示 {count} 項記錄中的 {from} 至 {to} 項",
     steamApiKeyDescription: "若要監測 Steam 遊戲伺服器，您將需要 Steam Web-API 金鑰。您可以在此註冊您的 API 金鑰：",
     "Current User": "目前使用者",
+    recent: "最近",
+    Done: "完成",
+    Info: "資訊",
+    Security: "安全性",
+    "Steam API Key": "Steam API 金鑰",
+    "Shrink Database": "壓縮資料庫",
+    "Pick a RR-Type...": "選擇資源記錄類型...",
+    "Pick Accepted Status Codes...": "選擇可接受的狀態碼...",
+    Default: "預設",
+    "HTTP Options": "HTTP 選項",
+    "Create Incident": "建立事件",
+    Title: "標題",
+    Content: "內容",
+    Style: "樣式",
+    info: "資訊",
+    warning: "警告",
+    danger: "危險",
+    primary: "主要",
+    light: "淺色",
+    dark: "暗色",
+    Post: "發佈",
+    "Please input title and content": "請輸入標題及內容",
+    Created: "建立",
+    "Last Updated": "最後更新",
+    Unpin: "取消釘選",
+    "Switch to Light Theme": "切換至淺色佈景主題",
+    "Switch to Dark Theme": "切換至深色佈景主題",
+    "Show Tags": "顯示標籤",
+    "Hide Tags": "隱藏標籤",
+    Description: "說明",
+    "No monitors available.": "沒有可用的監測器。",
+    "Add one": "新增一個",
+    "No Monitors": "無監測器",
+    "Add one": "新增一個",
+    "Untitled Group": "未命名群組",
+    Services: "服務",
+    Discard: "捨棄",
+    Cancel: "取消",
+    "Powered by": "技術支援",
+    shrinkDatabaseDescription: "觸發 SQLite 的資料庫清理 (VACUUM)。如果您的資料庫是在 1.10.0 版本後建立，AUTO_VACUUM 已自動啟用，則無需此操作。",
+    serwersms: "SerwerSMS.pl",
+    serwersmsAPIUser: "API 使用者名稱 (包括 webapi_ 前綴)",
+    serwersmsAPIPassword: "API 密碼",
+    serwersmsPhoneNumber: "電話號碼",
+    serwersmsSenderName: "SMS 寄件人名稱 (由客戶入口網站註冊)",
+    "stackfield": "Stackfield",
 };

src/layouts/Layout.vue

@@ -29,7 +29,7 @@
                     </router-link>
                 </li>
                 <li v-if="$root.loggedIn" class="nav-item">
-                    <router-link to="/settings" class="nav-link">
+                    <router-link to="/settings" class="nav-link" :class="{ active: $route.path.includes('settings') }">
                         <font-awesome-icon icon="cog" /> {{ $t("Settings") }}
                     </router-link>
                 </li>
@@ -188,8 +188,8 @@ main {
 
 .dark {
     header {
-        background-color: #161b22;
+        background-color: $dark-header-bg;
-        border-bottom-color: #161b22 !important;
+        border-bottom-color: $dark-header-bg !important;
 
         span {
             color: #f0f6fc;

src/main.js

@@ -12,6 +12,7 @@ import mobile from "./mixins/mobile";
 import publicMixin from "./mixins/public";
 import socket from "./mixins/socket";
 import theme from "./mixins/theme";
+import lang from "./mixins/lang";
 import { router } from "./router";
 import { appName } from "./util.ts";
 
@@ -22,6 +23,7 @@ const app = createApp({
         mobile,
         datetime,
         publicMixin,
+        lang,
     ],
     data() {
         return {

src/mixins/lang.js

@@ -0,0 +1,33 @@
+import { currentLocale } from "../i18n";
+import { setPageLocale } from "../util-frontend";
+const langModules = import.meta.glob("../languages/*.js");
+
+export default {
+    data() {
+        return {
+            language: currentLocale(),
+        };
+    },
+
+    async created() {
+        if (this.language !== "en") {
+            await this.changeLang(this.language);
+        }
+    },
+
+    watch: {
+        async language(lang) {
+            await this.changeLang(lang);
+        },
+    },
+
+    methods: {
+        async changeLang(lang) {
+            let message = (await langModules["../languages/" + lang + ".js"]()).default;
+            this.$i18n.setLocaleMessage(lang, message);
+            this.$i18n.locale = lang;
+            localStorage.locale = lang;
+            setPageLocale();
+        }
+    }
+};

src/mixins/socket.js

@@ -1,5 +1,6 @@
 import { io } from "socket.io-client";
 import { useToast } from "vue-toastification";
+import jwt_decode from "jwt-decode";
 const toast = useToast();
 
 let socket;
@@ -217,6 +218,15 @@ export default {
             return (this.remember) ? localStorage : sessionStorage;
         },
 
+        getJWTPayload() {
+            const jwtToken = this.$root.storage().token;
+
+            if (jwtToken && jwtToken !== "autoLogin") {
+                return jwt_decode(jwtToken);
+            }
+            return undefined;
+        },
+
         getSocket() {
             return socket;
         },

src/pages/EditMonitor.vue

@@ -106,7 +106,7 @@
                                         :close-on-select="true"
                                         :clear-on-select="false"
                                         :preserve-search="false"
-                                        placeholder="Pick a RR-Type..."
+                                        :placeholder="$t('Pick a RR-Type...')"
                                         :preselect-first="false"
                                         :max-height="500"
                                         :taggable="false"
@@ -220,7 +220,7 @@
                                         :close-on-select="false"
                                         :clear-on-select="false"
                                         :preserve-search="true"
-                                        placeholder="Pick Accepted Status Codes..."
+                                        :placeholder="$t('Pick Accepted Status Codes...')"
                                         :preselect-first="false"
                                         :max-height="600"
                                         :taggable="true"
@@ -237,7 +237,7 @@
                             </div>
 
                             <div class="mt-5 mb-1">
-                                <button class="btn btn-primary" type="submit" :disabled="processing">{{ $t("Save") }}</button>
+                                <button id="monitor-submit-btn" class="btn btn-primary" type="submit" :disabled="processing">{{ $t("Save") }}</button>
                             </div>
                         </div>
 
@@ -258,7 +258,7 @@
                                     <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
                                 </label>
 
-                                <span v-if="notification.isDefault == true" class="badge bg-primary ms-2">Default</span>
+                                <span v-if="notification.isDefault == true" class="badge bg-primary ms-2">{{ $t("Default") }}</span>
                             </div>
 
                             <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
@@ -308,6 +308,19 @@
                                     <label for="headers" class="form-label">{{ $t("Headers") }}</label>
                                     <textarea id="headers" v-model="monitor.headers" class="form-control" :placeholder="headersPlaceholder"></textarea>
                                 </div>
+
+                                <!-- HTTP Basic Auth -->
+                                <h4 class="mt-5 mb-2">{{ $t("HTTP Basic Auth") }}</h4>
+
+                                <div class="my-3">
+                                    <label for="basicauth" class="form-label">{{ $t("Username") }}</label>
+                                    <input id="basicauth-user" v-model="monitor.basic_auth_user" type="text" class="form-control" :placeholder="$t('Username')">
+                                </div>
+
+                                <div class="my-3">
+                                    <label for="basicauth" class="form-label">{{ $t("Password") }}</label>
+                                    <input id="basicauth-pass" v-model="monitor.basic_auth_pass" type="password" autocomplete="new-password" class="form-control" :placeholder="$t('Password')">
+                                </div>
                             </template>
                         </div>
                     </div>
@@ -383,17 +396,17 @@ export default {
         },
 
         bodyPlaceholder() {
-            return `Example:
+            return this.$t("Example:", [`
 {
     "key": "value"
-}`;
+}`]);
         },
 
         headersPlaceholder() {
-            return `Example:
+            return this.$t("Example:", [`
 {
     "HeaderName": "HeaderValue"
-}`;
+}`]);
         }
 
     },

src/pages/Settings.vue

@@ -1,525 +1,94 @@
 <template>
-    <transition name="slide-fade" appear>
+    <div>
-        <div>
+        <h1 v-show="show" class="mb-3">
-            <h1 v-show="show" class="mb-3">
+            {{ $t("Settings") }}
-                {{ $t("Settings") }}
+        </h1>
-            </h1>
 
-            <div class="shadow-box">
+        <div class="shadow-box">
-                <div class="row">
+            <div class="row">
-                    <div class="col-md-6">
+                <div class="settings-menu">
-                        <h2 class="mb-2">{{ $t("Appearance") }}</h2>
+                    <router-link
-
+                        v-for="(item, key) in subMenus"
-                        <div class="mb-3">
+                        :key="key"
-                            <label for="language" class="form-label">{{ $t("Language") }}</label>
+                        :to="`/settings/${key}`"
-                            <select id="language" v-model="$i18n.locale" class="form-select">
+                    >
-                                <option v-for="(lang, i) in $i18n.availableLocales" :key="`Lang${i}`" :value="lang">
+                        <div class="menu-item">
-                                    {{ $i18n.messages[lang].languageName }}
+                            {{ item.title }}
-                                </option>
-                            </select>
                         </div>
-
+                    </router-link>
-                        <div class="mb-3">
+                </div>
-                            <label for="timezone" class="form-label">{{ $t("Theme") }}</label>
+                <div class="settings-content">
-
+                    <div class="settings-content-header">
-                            <div>
+                        {{ subMenus[currentPage].title }}
-                                <div class="btn-group" role="group" aria-label="Basic checkbox toggle button group">
-                                    <input id="btncheck1" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="light">
-                                    <label class="btn btn-outline-primary" for="btncheck1">{{ $t("Light") }}</label>
-
-                                    <input id="btncheck2" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="dark">
-                                    <label class="btn btn-outline-primary" for="btncheck2">{{ $t("Dark") }}</label>
-
-                                    <input id="btncheck3" v-model="$root.userTheme" type="radio" class="btn-check" name="theme" autocomplete="off" value="auto">
-                                    <label class="btn btn-outline-primary" for="btncheck3">{{ $t("Auto") }}</label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="mb-3">
-                            <label class="form-label">{{ $t("Theme - Heartbeat Bar") }}</label>
-                            <div>
-                                <div class="btn-group" role="group" aria-label="Basic checkbox toggle button group">
-                                    <input id="btncheck4" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="normal">
-                                    <label class="btn btn-outline-primary" for="btncheck4">{{ $t("Normal") }}</label>
-
-                                    <input id="btncheck5" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="bottom">
-                                    <label class="btn btn-outline-primary" for="btncheck5">{{ $t("Bottom") }}</label>
-
-                                    <input id="btncheck6" v-model="$root.userHeartbeatBar" type="radio" class="btn-check" name="heartbeatBarTheme" autocomplete="off" value="none">
-                                    <label class="btn btn-outline-primary" for="btncheck6">{{ $t("None") }}</label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <!-- General Settings -->
-                        <h2 class="mt-5 mb-2">{{ $t("General") }}</h2>
-
-                        <form class="mb-3" @submit.prevent="saveGeneral">
-                            <!-- Timezone -->
-                            <div class="mb-4">
-                                <label for="timezone" class="form-label">{{ $t("Timezone") }}</label>
-                                <select id="timezone" v-model="$root.userTimezone" class="form-select">
-                                    <option value="auto">
-                                        {{ $t("Auto") }}: {{ guessTimezone }}
-                                    </option>
-                                    <option v-for="(timezone, index) in timezoneList" :key="index" :value="timezone.value">
-                                        {{ timezone.name }}
-                                    </option>
-                                </select>
-                            </div>
-
-                            <!-- Search Engine -->
-                            <div class="mb-4">
-                                <label class="form-label">{{ $t("Search Engine Visibility") }}</label>
-
-                                <div class="form-check">
-                                    <input id="searchEngineIndexYes" v-model="settings.searchEngineIndex" class="form-check-input" type="radio" name="flexRadioDefault" :value="true" required>
-                                    <label class="form-check-label" for="searchEngineIndexYes">
-                                        {{ $t("Allow indexing") }}
-                                    </label>
-                                </div>
-                                <div class="form-check">
-                                    <input id="searchEngineIndexNo" v-model="settings.searchEngineIndex" class="form-check-input" type="radio" name="flexRadioDefault" :value="false" required>
-                                    <label class="form-check-label" for="searchEngineIndexNo">
-                                        {{ $t("Discourage search engines from indexing site") }}
-                                    </label>
-                                </div>
-                            </div>
-
-                            <!-- Entry Page -->
-                            <div class="mb-4">
-                                <label class="form-label">{{ $t("Entry Page") }}</label>
-
-                                <div class="form-check">
-                                    <input id="entryPageYes" v-model="settings.entryPage" class="form-check-input" type="radio" name="statusPage" value="dashboard" required>
-                                    <label class="form-check-label" for="entryPageYes">
-                                        {{ $t("Dashboard") }}
-                                    </label>
-                                </div>
-
-                                <div class="form-check">
-                                    <input id="entryPageNo" v-model="settings.entryPage" class="form-check-input" type="radio" name="statusPage" value="statusPage" required>
-                                    <label class="form-check-label" for="entryPageNo">
-                                        {{ $t("Status Page") }}
-                                    </label>
-                                </div>
-                            </div>
-
-                            <!-- Primary Base URL -->
-                            <div class="mb-4">
-                                <label class="form-label" for="primaryBaseURL">{{ $t("Primary Base URL") }}</label>
-
-                                <div class="input-group mb-3">
-                                    <input id="primaryBaseURL" v-model="settings.primaryBaseURL" class="form-control" name="primaryBaseURL" placeholder="https://" pattern="https?://.+">
-                                    <button class="btn btn-outline-primary" type="button" @click="autoGetPrimaryBaseURL">{{ $t("Auto Get") }}</button>
-                                </div>
-
-                                <div class="form-text">
-                                </div>
-                            </div>
-
-                            <!-- Steam API Key -->
-                            <div class="mb-4">
-                                <label class="form-label" for="steamAPIKey">{{ $t("Steam API Key") }}</label>
-                                <HiddenInput id="steamAPIKey" v-model="settings.steamAPIKey" />
-                                <div class="form-text">
-                                    {{ $t("steamApiKeyDescription") }}<a href="https://steamcommunity.com/dev" target="_blank">https://steamcommunity.com/dev</a>
-                                </div>
-                            </div>
-
-                            <!-- Monitor History -->
-                            <div class="mb-4">
-                                <h4 class="mt-4">{{ $t("Monitor History") }}</h4>
-                                <div class="mt-2">
-                                    <label for="keepDataPeriodDays" class="form-label">{{ $t("clearDataOlderThan", [ settings.keepDataPeriodDays ]) }}</label>
-                                    <input id="keepDataPeriodDays" v-model="settings.keepDataPeriodDays" type="number" class="form-control" required min="1" step="1">
-                                </div>
-                            </div>
-
-                            <!-- Save Button -->
-                            <div>
-                                <button class="btn btn-primary" type="submit">
-                                    {{ $t("Save") }}
-                                </button>
-                            </div>
-                        </form>
-
-                        <template v-if="loaded">
-                            <!-- Change Password -->
-                            <template v-if="! settings.disableAuth">
-                                <h2 class="mt-5 mb-2">{{ $t("Change Password") }}</h2>
-                                <p>{{ $t("Current User") }}: <strong>{{ username }}</strong></p>
-                                <form class="mb-3" @submit.prevent="savePassword">
-                                    <div class="mb-3">
-                                        <label for="current-password" class="form-label">{{ $t("Current Password") }}</label>
-                                        <input id="current-password" v-model="password.currentPassword" type="password" class="form-control" required>
-                                    </div>
-
-                                    <div class="mb-3">
-                                        <label for="new-password" class="form-label">{{ $t("New Password") }}</label>
-                                        <input id="new-password" v-model="password.newPassword" type="password" class="form-control" required>
-                                    </div>
-
-                                    <div class="mb-3">
-                                        <label for="repeat-new-password" class="form-label">{{ $t("Repeat New Password") }}</label>
-                                        <input id="repeat-new-password" v-model="password.repeatNewPassword" type="password" class="form-control" :class="{ 'is-invalid' : invalidPassword }" required>
-                                        <div class="invalid-feedback">
-                                            {{ $t("passwordNotMatchMsg") }}
-                                        </div>
-                                    </div>
-
-                                    <div>
-                                        <button class="btn btn-primary" type="submit">
-                                            {{ $t("Update Password") }}
-                                        </button>
-                                    </div>
-                                </form>
-                            </template>
-
-                            <div v-if="! settings.disableAuth" class="mt-5 mb-3">
-                                <h2 class="mb-2">
-                                    {{ $t("Two Factor Authentication") }}
-                                </h2>
-                                <button class="btn btn-primary me-2" type="button" @click="$refs.TwoFADialog.show()">{{ $t("2FA Settings") }}</button>
-                            </div>
-
-                            <h2 class="mt-5 mb-2">{{ $t("Export Backup") }}</h2>
-
-                            <p>
-                                {{ $t("backupDescription") }} <br />
-                                ({{ $t("backupDescription2") }}) <br />
-                            </p>
-
-                            <div class="mb-2">
-                                <button class="btn btn-primary" @click="downloadBackup">{{ $t("Export") }}</button>
-                            </div>
-
-                            <p><strong>{{ $t("backupDescription3") }}</strong></p>
-
-                            <h2 class="mt-5 mb-2">{{ $t("Import Backup") }}</h2>
-
-                            <label class="form-label">{{ $t("Options") }}:</label>
-                            <br>
-                            <div class="form-check form-check-inline">
-                                <input id="radioKeep" v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" value="keep">
-                                <label class="form-check-label" for="radioKeep">{{ $t("Keep both") }}</label>
-                            </div>
-                            <div class="form-check form-check-inline">
-                                <input id="radioSkip" v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" value="skip">
-                                <label class="form-check-label" for="radioSkip">{{ $t("Skip existing") }}</label>
-                            </div>
-                            <div class="form-check form-check-inline">
-                                <input id="radioOverwrite" v-model="importHandle" class="form-check-input" type="radio" name="radioImportHandle" value="overwrite">
-                                <label class="form-check-label" for="radioOverwrite">{{ $t("Overwrite") }}</label>
-                            </div>
-                            <div class="form-text mb-2">
-                                {{ $t("importHandleDescription") }}
-                            </div>
-
-                            <div class="mb-2">
-                                <input id="importBackup" type="file" class="form-control" accept="application/json">
-                            </div>
-
-                            <div class="input-group mb-2 justify-content-end">
-                                <button type="button" class="btn btn-outline-primary" :disabled="processing" @click="confirmImport">
-                                    <div v-if="processing" class="spinner-border spinner-border-sm me-1"></div>
-                                    {{ $t("Import") }}
-                                </button>
-                            </div>
-
-                            <div v-if="importAlert" class="alert alert-danger mt-3" style="padding: 6px 16px;">
-                                {{ importAlert }}
-                            </div>
-
-                            <!-- Advanced -->
-                            <h2 class="mt-5 mb-2">{{ $t("Advanced") }}</h2>
-
-                            <div class="mb-3">
-                                <button v-if="settings.disableAuth" class="btn btn-outline-primary me-2 mb-2" @click="enableAuth">{{ $t("Enable Auth") }}</button>
-                                <button v-if="! settings.disableAuth" class="btn btn-primary me-2 mb-2" @click="confirmDisableAuth">{{ $t("Disable Auth") }}</button>
-                                <button v-if="! settings.disableAuth" class="btn btn-danger me-2 mb-2" @click="$root.logout">{{ $t("Logout") }}</button>
-                                <button class="btn btn-outline-danger me-2 mb-2" @click="confirmClearStatistics">{{ $t("Clear all statistics") }}</button>
-                                <button class="btn btn-info me-2 mb-2" @click="shrinkDatabase">{{ $t("Shrink Database") }} ({{ databaseSizeDisplay }})</button>
-                            </div>
-                        </template>
                     </div>
-
+                    <div class="mx-3">
-                    <div class="col-md-6">
+                        <router-view v-slot="{ Component }">
-                        <div v-if="$root.isMobile" class="mt-3" />
+                            <transition name="slide-fade" appear>
-
+                                <component :is="Component" />
-                        <!-- Notifications -->
+                            </transition>
-                        <div class="notification-list ">
+                        </router-view>
-                            <h2>{{ $t("Notifications") }}</h2>
-                            <p v-if="$root.notificationList.length === 0">
-                                {{ $t("Not available, please setup.") }}
-                            </p>
-                            <p v-else>
-                                {{ $t("notificationDescription") }}
-                            </p>
-
-                            <ul class="list-group mb-3" style="border-radius: 1rem;">
-                                <li v-for="(notification, index) in $root.notificationList" :key="index" class="list-group-item">
-                                    {{ notification.name }}<br>
-                                    <a href="#" @click="$refs.notificationDialog.show(notification.id)">{{ $t("Edit") }}</a>
-                                </li>
-                            </ul>
-
-                            <button class="btn btn-primary me-2" type="button" @click="$refs.notificationDialog.show()">
-                                {{ $t("Setup Notification") }}
-                            </button>
-                        </div>
-
-                        <!-- Info -->
-                        <h2 class="mt-5">{{ $t("Info") }}</h2>
-
-                        {{ $t("Version") }}: {{ $root.info.version }} <br />
-                        <a href="https://github.com/louislam/uptime-kuma/releases" target="_blank" rel="noopener">{{ $t("Check Update On GitHub") }}</a>
                     </div>
                 </div>
             </div>
-
-            <NotificationDialog ref="notificationDialog" />
-            <TwoFADialog ref="TwoFADialog" />
-
-            <Confirm ref="confirmDisableAuth" btn-style="btn-danger" :yes-text="$t('I understand, please disable')" :no-text="$t('Leave')" @yes="disableAuth">
-                <template v-if="$i18n.locale === 'es-ES' ">
-                    <p>Seguro que deseas <strong>deshabilitar la autenticación</strong>?</p>
-                    <p>Es para <strong>quien implementa autenticación de terceros</strong> ante Uptime Kuma como por ejemplo Cloudflare Access.</p>
-                    <p>Por favor usar con cuidado.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'pt-BR' ">
-                    <p>Você tem certeza que deseja <strong>desativar a autenticação</strong>?</p>
-                    <p>Isso é para <strong>alguém que tem autenticação de terceiros</strong> na frente do 'UpTime Kuma' como o Cloudflare Access.</p>
-                    <p>Por favor, utilize isso com cautela.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'zh-HK' ">
-                    <p>你是否確認<strong>取消登入認証</strong>？</p>
-                    <p>這個功能是設計給已有<strong>第三方認証</strong>的用家，例如 Cloudflare Access。</p>
-                    <p>請小心使用。</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'zh-CN' ">
-                    <p>是否确定 <strong>取消登录验证</strong>？</p>
-                    <p>这是为 <strong>有第三方认证</strong> 的用户提供的功能，如 Cloudflare Access</p>
-                    <p>请谨慎使用！</p>
-                </template>
-                
-                <template v-else-if="$i18n.locale === 'zh-TW' ">
-                    <p>你是否要<strong>取消登入驗證</strong>？</p>
-                    <p>此功能是設計給已有<strong>第三方認證</strong>的使用者，例如 Cloudflare Access。</p>
-                    <p>請謹慎使用。</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'de-DE' ">
-                    <p>Bist du sicher das du die <strong>Authentifizierung deaktivieren</strong> möchtest?</p>
-                    <p>Es ist für <strong>jemanden der eine externe Authentifizierung</strong> vor Uptime Kuma geschaltet hat, wie z.B. Cloudflare Access.</p>
-                    <p>Bitte mit Vorsicht nutzen.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'sr' ">
-                    <p>Да ли сте сигурни да желите да <strong>искључите аутентификацију</strong>?</p>
-                    <p>То је за <strong>оне који имају додату аутентификацију</strong> испред Uptime Kuma као на пример Cloudflare Access.</p>
-                    <p>Молим Вас користите ово са пажњом.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'sr-latn' ">
-                    <p>Da li ste sigurni da želite da <strong>isključite autentifikaciju</strong>?</p>
-                    <p>To je za <strong>one koji imaju dodatu autentifikaciju</strong> ispred Uptime Kuma kao na primer Cloudflare Access.</p>
-                    <p>Molim Vas koristite ovo sa pažnjom.</p>
-                </template>
-
-                <template v-if="$i18n.locale === 'hr-HR' ">
-                    <p>Jeste li sigurni da želite <strong>isključiti autentikaciju</strong>?</p>
-                    <p>To je za <strong>korisnike koji imaju vanjsku autentikaciju stranice</strong> ispred Uptime Kume, poput usluge Cloudflare Access.</p>
-                    <p>Pažljivo koristite ovu opciju.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'tr-TR' ">
-                    <p><strong>Şifreli girişi devre dışı bırakmak istediğinizden</strong>emin misiniz?</p>
-                    <p>Bu, Uptime Kuma'nın önünde Cloudflare Access gibi <strong>üçüncü taraf yetkilendirmesi olan</strong> kişiler içindir.</p>
-                    <p>Lütfen dikkatli kullanın.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'ko-KR' ">
-                    <p>정말로 <strong>인증 기능을 끌까요</strong>?</p>
-                    <p>이 기능은 <strong>Cloudflare Access와 같은 서드파티 인증</strong>을 Uptime Kuma 앞에 둔 사용자를 위한 기능이에요.</p>
-                    <p>신중하게 사용하세요.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'pl' ">
-                    <p>Czy na pewno chcesz <strong>wyłączyć autoryzację</strong>?</p>
-                    <p>Jest przeznaczony dla <strong>kogoś, kto ma autoryzację zewnętrzną</strong> przed Uptime Kuma, taką jak Cloudflare Access.</p>
-                    <p>Proszę używać ostrożnie.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'et-EE' ">
-                    <p>Kas soovid <strong>lülitada autentimise välja</strong>?</p>
-                    <p>Kastuamiseks <strong>välise autentimispakkujaga</strong>, näiteks Cloudflare Access.</p>
-                    <p>Palun kasuta vastutustundlikult.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'it-IT' ">
-                    <p>Si è certi di voler <strong>disabilitare l'autenticazione</strong>?</p>
-                    <p>È per <strong>chi ha l'autenticazione gestita da terze parti</strong> messa davanti ad Uptime Kuma, ad esempio Cloudflare Access.</p>
-                    <p>Utilizzare con attenzione.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'id-ID' ">
-                    <p>Apakah Anda yakin ingin <strong>menonaktifkan autentikasi</strong>?</p>
-                    <p>Ini untuk <strong>mereka yang memiliki autentikasi pihak ketiga</strong> diletakkan di depan Uptime Kuma, misalnya akses Cloudflare.</p>
-                    <p>Gunakan dengan hati-hati.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'ru-RU' ">
-                    <p>Вы уверены, что хотите <strong>отключить авторизацию</strong>?</p>
-                    <p>Это подходит для <strong>тех, у кого стоит другая авторизация</strong> перед открытием Uptime Kuma, например Cloudflare Access.</p>
-                    <p>Пожалуйста, используйте с осторожностью.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'fa' ">
-                    <p>آیا مطمئن هستید که میخواهید <strong>احراز هویت را غیر فعال کنید</strong>?</p>
-                    <p>این ویژگی برای کسانی است که <strong> لایه امنیتی شخص ثالث دیگر بر روی این آدرس فعال کرده‌اند</strong>، مانند Cloudflare Access.</p>
-                    <p>لطفا از این امکان با دقت استفاده کنید.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'bg-BG' ">
-                    <p>Сигурни ли сте, че желаете да <strong>изключите удостоверяването</strong>?</p>
-                    <p>Използва се в случаите, когато <strong>има настроен алтернативен метод за удостоверяване</strong> преди Uptime Kuma, например Cloudflare Access.</p>
-                    <p>Моля, използвайте с повишено внимание.</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'hu' ">
-                    <p>Biztos benne, hogy <strong>kikapcsolja a hitelesítést</strong>?</p>
-                    <p>Akkor érdemes, ha <strong>van 3rd-party hitelesítés</strong> az Uptime Kuma-t megelőzően mint a Cloudflare Access.</p>
-                    <p>Használja megfontoltan!</p>
-                </template>
-
-                <template v-else-if="$i18n.locale === 'nb-NO' ">
-                    <p>Er du sikker på at du vil <strong>deaktiver autentisering</strong>?</p>
-                    <p>Dette er for <strong>de som har tredjepartsautorisering</strong> foran Uptime Kuma, for eksempel Cloudflare Access.</p>
-                    <p>Vennligst vær forsiktig.</p>
-                </template>
-
-                <!-- English (en) -->
-                <template v-else>
-                    <p>Are you sure want to <strong>disable auth</strong>?</p>
-                    <p>It is for <strong>someone who have 3rd-party auth</strong> in front of Uptime Kuma such as Cloudflare Access.</p>
-                    <p>Please use it carefully.</p>
-                </template>
-            </Confirm>
-
-            <Confirm ref="confirmClearStatistics" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="clearStatistics">
-                {{ $t("confirmClearStatisticsMsg") }}
-            </Confirm>
-            <Confirm ref="confirmImport" btn-style="btn-danger" :yes-text="$t('Yes')" :no-text="$t('No')" @yes="importBackup">
-                {{ $t("confirmImportMsg") }}
-            </Confirm>
         </div>
-    </transition>
+    </div>
 </template>
 
 <script>
-import HiddenInput from "../components/HiddenInput.vue";
+import { useRoute } from "vue-router";
-import Confirm from "../components/Confirm.vue";
-import dayjs from "dayjs";
-import utc from "dayjs/plugin/utc";
-import timezone from "dayjs/plugin/timezone";
-import NotificationDialog from "../components/NotificationDialog.vue";
-import TwoFADialog from "../components/TwoFADialog.vue";
-import jwt_decode from "jwt-decode";
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
-import { timezoneList, setPageLocale } from "../util-frontend";
-import { useToast } from "vue-toastification";
-import { debug } from "../util.ts";
-
-const toast = useToast();
 
 export default {
-    components: {
-        NotificationDialog,
-        TwoFADialog,
-        Confirm,
-        HiddenInput,
-    },
-
     data() {
         return {
-            timezoneList: timezoneList(),
-            guessTimezone: dayjs.tz.guess(),
             show: true,
-            invalidPassword: false,
-            password: {
-                currentPassword: "",
-                newPassword: "",
-                repeatNewPassword: "",
-            },
-            settings: {
 
-            },
+            settings: {},
-            loaded: false,
+            settingsLoaded: false,
-            importAlert: null,
-            importHandle: "skip",
-            processing: false,
-            databaseSize: 0,
         };
     },
 
     computed: {
-        databaseSizeDisplay() {
+        currentPage() {
-            return Math.round(this.databaseSize / 1024 / 1024 * 10) / 10 + " MB";
+            let pathSplit = useRoute().path.split("/");
-        }
+            let pathEnd = pathSplit[pathSplit.length - 1];
-    },
+            if (!pathEnd || pathEnd === "settings") {
-
+                return "general";
-    watch: {
+            }
-        "password.repeatNewPassword"() {
+            return pathEnd;
-            this.invalidPassword = false;
         },
 
-        "$i18n.locale"() {
+        subMenus() {
-            localStorage.locale = this.$i18n.locale;
+            return {
-            setPageLocale();
+                general: {
+                    title: this.$t("General"),
+                },
+                appearance: {
+                    title: this.$t("Appearance"),
+                },
+                notifications: {
+                    title: this.$t("Notifications"),
+                },
+                "monitor-history": {
+                    title: this.$t("Monitor History"),
+                },
+                security: {
+                    title: this.$t("Security"),
+                },
+                backup: {
+                    title: this.$t("Backup"),
+                },
+                about: {
+                    title: this.$t("About"),
+                },
+            };
         },
     },
 
     mounted() {
-        this.loadUsername();
         this.loadSettings();
-        this.loadDatabaseSize();
     },
 
     methods: {
-
-        saveGeneral() {
-            localStorage.timezone = this.$root.userTimezone;
-            this.saveSettings();
-        },
-
-        savePassword() {
-            if (this.password.newPassword !== this.password.repeatNewPassword) {
-                this.invalidPassword = true;
-            } else {
-                this.$root.getSocket().emit("changePassword", this.password, (res) => {
-                    this.$root.toastRes(res);
-                    if (res.ok) {
-                        this.password.currentPassword = "";
-                        this.password.newPassword = "";
-                        this.password.repeatNewPassword = "";
-                    }
-                });
-            }
-        },
-
-        loadUsername() {
-            const jwtToken = this.$root.storage().token;
-            const jwtPayload = jwt_decode(jwtToken);
-            this.username = jwtPayload.username;
-        },
-
         loadSettings() {
             this.$root.getSocket().emit("getSettings", (res) => {
                 this.settings = res.data;
@@ -536,7 +105,7 @@ export default {
                     this.settings.keepDataPeriodDays = 180;
                 }
 
-                this.loaded = true;
+                this.settingsLoaded = true;
             });
         },
 
@@ -546,115 +115,6 @@ export default {
                 this.loadSettings();
             });
         },
-
-        confirmDisableAuth() {
-            this.$refs.confirmDisableAuth.show();
-        },
-
-        confirmClearStatistics() {
-            this.$refs.confirmClearStatistics.show();
-        },
-
-        confirmImport() {
-            this.$refs.confirmImport.show();
-        },
-
-        disableAuth() {
-            this.settings.disableAuth = true;
-            this.saveSettings();
-        },
-
-        enableAuth() {
-            this.settings.disableAuth = false;
-            this.saveSettings();
-            this.$root.storage().removeItem("token");
-        },
-
-        downloadBackup() {
-            let time = dayjs().format("YYYY_MM_DD-hh_mm_ss");
-            let fileName = `Uptime_Kuma_Backup_${time}.json`;
-            let monitorList = Object.values(this.$root.monitorList);
-            let exportData = {
-                version: this.$root.info.version,
-                notificationList: this.$root.notificationList,
-                monitorList: monitorList,
-            };
-            exportData = JSON.stringify(exportData, null, 4);
-            let downloadItem = document.createElement("a");
-            downloadItem.setAttribute("href", "data:application/json;charset=utf-8," + encodeURIComponent(exportData));
-            downloadItem.setAttribute("download", fileName);
-            downloadItem.click();
-        },
-
-        importBackup() {
-            this.processing = true;
-            let uploadItem = document.getElementById("importBackup").files;
-
-            if (uploadItem.length <= 0) {
-                this.processing = false;
-                return this.importAlert = this.$t("alertNoFile");
-            }
-
-            if (uploadItem.item(0).type !== "application/json") {
-                this.processing = false;
-                return this.importAlert = this.$t("alertWrongFileType");
-            }
-
-            let fileReader = new FileReader();
-            fileReader.readAsText(uploadItem.item(0));
-
-            fileReader.onload = item => {
-                this.$root.uploadBackup(item.target.result, this.importHandle, (res) => {
-                    this.processing = false;
-
-                    if (res.ok) {
-                        toast.success(res.msg);
-                    } else {
-                        toast.error(res.msg);
-                    }
-                });
-            };
-        },
-
-        clearStatistics() {
-            this.$root.clearStatistics((res) => {
-                if (res.ok) {
-                    this.$router.go();
-                } else {
-                    toast.error(res.msg);
-                }
-            });
-        },
-
-        autoGetPrimaryBaseURL() {
-            this.settings.primaryBaseURL = location.protocol + "//" + location.host;
-        },
-
-        shrinkDatabase() {
-            this.$root.getSocket().emit("shrinkDatabase", (res) => {
-                if (res.ok) {
-                    this.loadDatabaseSize();
-                    toast.success("Done");
-                } else {
-                    debug(res);
-                }
-            });
-        },
-
-        loadDatabaseSize() {
-            debug("load database size");
-            this.$root.getSocket().emit("getDatabaseSize", (res) => {
-
-                if (res.ok) {
-                    this.databaseSize = res.size;
-                    debug("database size: " + res.size);
-                } else {
-                    debug(res);
-                }
-
-            });
-        }
-
     },
 };
 </script>
@@ -664,37 +124,7 @@ export default {
 
 .shadow-box {
     padding: 20px;
-}
+    min-height: calc(100vh - 155px);
-
-.btn-check:active + .btn-outline-primary,
-.btn-check:checked + .btn-outline-primary,
-.btn-check:hover + .btn-outline-primary {
-    color: #fff;
-}
-
-.dark {
-    .list-group-item {
-        background-color: $dark-bg2;
-        color: $dark-font-color;
-    }
-
-    .btn-check:active + .btn-outline-primary,
-    .btn-check:checked + .btn-outline-primary,
-    .btn-check:hover + .btn-outline-primary {
-        color: #000;
-    }
-
-    #importBackup {
-        &::file-selector-button {
-            color: $primary;
-            background-color: $dark-bg;
-        }
-
-        &:hover:not(:disabled):not([readonly])::file-selector-button {
-            color: $dark-font-color2;
-            background-color: $primary;
-        }
-    }
 }
 
 footer {
@@ -704,4 +134,59 @@ footer {
     padding-bottom: 30px;
     text-align: center;
 }
+
+.settings-menu {
+    flex: 0 0 auto;
+    width: 300px;
+
+    a {
+        text-decoration: none !important;
+    }
+
+    .menu-item {
+        border-radius: 10px;
+        margin: 0.5em;
+        padding: 0.7em 1em;
+        cursor: pointer;
+    }
+
+    .menu-item:hover {
+        background: $highlight-white;
+
+        .dark & {
+            background: $dark-header-bg;
+        }
+    }
+
+    .active .menu-item {
+        background: $highlight-white;
+        border-left: 4px solid $primary;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+
+        .dark & {
+            background: $dark-header-bg;
+        }
+    }
+}
+
+.settings-content {
+    flex: 0 0 auto;
+    width: calc(100% - 300px);
+
+    .settings-content-header {
+        width: calc(100% + 20px);
+        border-bottom: 1px solid #dee2e6;
+        border-radius: 0 10px 0 0;
+        margin-top: -20px;
+        margin-right: -20px;
+        padding: 12.5px 1em;
+        font-size: 26px;
+
+        .dark & {
+            background: $dark-header-bg;
+            border-bottom: 0;
+        }
+    }
+}
 </style>

src/pages/StatusPage.vue

@@ -77,6 +77,17 @@
                     <font-awesome-icon icon="save" />
                     {{ $t("Switch to Dark Theme") }}
                 </button>
+
+                <button class="btn btn-secondary me-2" @click="changeTagsVisibilty(!tagsVisible)">
+                    <template v-if="tagsVisible">
+                        <font-awesome-icon icon="eye-slash" />
+                        {{ $t("Hide Tags") }}
+                    </template>
+                    <template v-else>
+                        <font-awesome-icon icon="eye" />
+                        {{ $t("Show Tags") }}
+                    </template>
+                </button>
             </div>
         </div>
 
@@ -90,9 +101,9 @@
 
             <!-- Incident Date -->
             <div class="date mt-3">
-                Created: {{ $root.datetime(incident.createdDate) }} ({{ dateFromNow(incident.createdDate) }})<br />
+                {{ $t("Created") }}: {{ $root.datetime(incident.createdDate) }} ({{ dateFromNow(incident.createdDate) }})<br />
                 <span v-if="incident.lastUpdatedDate">
-                    Last Updated: {{ $root.datetime(incident.lastUpdatedDate) }} ({{ dateFromNow(incident.lastUpdatedDate) }})
+                    {{ $t("Last Updated") }}: {{ $root.datetime(incident.lastUpdatedDate) }} ({{ dateFromNow(incident.lastUpdatedDate) }})
                 </span>
             </div>
 
@@ -114,15 +125,15 @@
 
                 <div v-if="editIncidentMode" class="dropdown d-inline-block me-2">
                     <button id="dropdownMenuButton1" class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                        Style: {{ incident.style }}
+                        {{ $t("Style") }}: {{ $t(incident.style) }}
                     </button>
                     <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-                        <li><a class="dropdown-item" href="#" @click="incident.style = 'info'">info</a></li>
+                        <li><a class="dropdown-item" href="#" @click="incident.style = 'info'">{{ $t("info") }}</a></li>
-                        <li><a class="dropdown-item" href="#" @click="incident.style = 'warning'">warning</a></li>
+                        <li><a class="dropdown-item" href="#" @click="incident.style = 'warning'">{{ $t("warning") }}</a></li>
-                        <li><a class="dropdown-item" href="#" @click="incident.style = 'danger'">danger</a></li>
+                        <li><a class="dropdown-item" href="#" @click="incident.style = 'danger'">{{ $t("danger") }}</a></li>
-                        <li><a class="dropdown-item" href="#" @click="incident.style = 'primary'">primary</a></li>
+                        <li><a class="dropdown-item" href="#" @click="incident.style = 'primary'">{{ $t("primary") }}</a></li>
-                        <li><a class="dropdown-item" href="#" @click="incident.style = 'light'">light</a></li>
+                        <li><a class="dropdown-item" href="#" @click="incident.style = 'light'">{{ $t("light") }}</a></li>
-                        <li><a class="dropdown-item" href="#" @click="incident.style = 'dark'">dark</a></li>
+                        <li><a class="dropdown-item" href="#" @click="incident.style = 'dark'">{{ $t("dark") }}</a></li>
                     </ul>
                 </div>
 
@@ -292,6 +303,10 @@ export default {
             return this.config.statusPageTheme;
         },
 
+        tagsVisible() {
+            return this.config.statusPageTags
+        },
+
         logoClass() {
             if (this.editMode) {
                 return {
@@ -453,13 +468,13 @@ export default {
         },
 
         addGroup() {
-            let groupName = "Untitled Group";
+            let groupName = this.$t("Untitled Group");
 
             if (this.$root.publicGroupList.length === 0) {
-                groupName = "Services";
+                groupName = this.$t("Services");
             }
 
-            this.$root.publicGroupList.push({
+            this.$root.publicGroupList.unshift({
                 name: groupName,
                 monitorList: [],
             });
@@ -472,6 +487,25 @@ export default {
         changeTheme(name) {
             this.config.statusPageTheme = name;
         },
+        changeTagsVisibilty(newState) {
+            this.config.statusPageTags = newState;
+
+            // On load, the status page will not include tags if it's not enabled for security reasons
+            // Which means if we enable tags, it won't show in the UI until saved
+            // So we have this to enhance UX and load in the tags from the authenticated source instantly
+            this.$root.publicGroupList = this.$root.publicGroupList.map((group) => {
+                return {
+                    ...group,
+                    monitorList: group.monitorList.map((monitor) => {
+                        // We only include the tags if visible so we can reuse the logic to hide the tags on disable
+                        return {
+                            ...monitor,
+                            tags: newState ? this.$root.monitorList[monitor.id].tags : []
+                        }
+                    })
+                }
+            });
+        },
 
         /**
          * Crop Success
@@ -502,7 +536,7 @@ export default {
 
         postIncident() {
             if (this.incident.title == "" || this.incident.content == "") {
-                toast.error("Please input title and content.");
+                toast.error(this.$t("Please input title and content"));
                 return;
             }
 

src/router.js

@@ -11,6 +11,14 @@ import Setup from "./pages/Setup.vue";
 const StatusPage = () => import("./pages/StatusPage.vue");
 import Entry from "./pages/Entry.vue";
 
+import Appearance from "./components/settings/Appearance.vue";
+import General from "./components/settings/General.vue";
+import Notifications from "./components/settings/Notifications.vue";
+import MonitorHistory from "./components/settings/MonitorHistory.vue";
+import Security from "./components/settings/Security.vue";
+import Backup from "./components/settings/Backup.vue";
+import About from "./components/settings/About.vue";
+
 const routes = [
     {
         path: "/",
@@ -59,6 +67,37 @@ const routes = [
                     {
                         path: "/settings",
                         component: Settings,
+                        children: [
+                            {
+                                path: "general",
+                                alias: "",
+                                component: General,
+                            },
+                            {
+                                path: "appearance",
+                                component: Appearance,
+                            },
+                            {
+                                path: "notifications",
+                                component: Notifications,
+                            },
+                            {
+                                path: "monitor-history",
+                                component: MonitorHistory,
+                            },
+                            {
+                                path: "security",
+                                component: Security,
+                            },
+                            {
+                                path: "backup",
+                                component: Backup,
+                            },
+                            {
+                                path: "about",
+                                component: About,
+                            },
+                        ]
                     },
                 ],
             },

test/backend.spec.js

@@ -1,4 +1,125 @@
 const { genSecret, sleep } = require("../src/util");
+const utilServerRewire = require("../server/util-server");
+
+describe("Test parseCertificateInfo", () => {
+    it("should handle undefined", async () => {
+        const parseCertificateInfo = utilServerRewire.__get__("parseCertificateInfo");
+        const info = parseCertificateInfo(undefined);
+        expect(info).toEqual(undefined);
+    }, 5000);
+
+    it("should handle normal cert chain", async () => {
+        const parseCertificateInfo = utilServerRewire.__get__("parseCertificateInfo");
+
+        const chain1 = {
+            fingerprint: "CF:2C:F3:6A:FE:6B:10:EC:44:77:C8:95:BB:96:2E:06:1F:0E:15:DA",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain2 = {
+            fingerprint: "A0:31:C4:67:82:E6:E6:C6:62:C2:C8:7C:76:DA:9A:A6:2C:CA:BD:8E",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain3 = {
+            fingerprint: "5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        chain1.issuerCertificate = chain2;
+        chain2.issuerCertificate = chain3;
+        chain3.issuerCertificate = chain3;
+
+        const info = parseCertificateInfo(chain1);
+        expect(chain1).toEqual(info);
+    }, 5000);
+
+    it("should handle cert chain with strange circle", async () => {
+        const parseCertificateInfo = utilServerRewire.__get__("parseCertificateInfo");
+
+        const chain1 = {
+            fingerprint: "CF:2C:F3:6A:FE:6B:10:EC:44:77:C8:95:BB:96:2E:06:1F:0E:15:DA",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain2 = {
+            fingerprint: "A0:31:C4:67:82:E6:E6:C6:62:C2:C8:7C:76:DA:9A:A6:2C:CA:BD:8E",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain3 = {
+            fingerprint: "5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain4 = {
+            fingerprint: "haha",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        chain1.issuerCertificate = chain2;
+        chain2.issuerCertificate = chain3;
+        chain3.issuerCertificate = chain4;
+        chain4.issuerCertificate = chain2;
+
+        const info = parseCertificateInfo(chain1);
+        expect(chain1).toEqual(info);
+    }, 5000);
+
+    it("should handle cert chain with last undefined (should be happen in real, but just in case)", async () => {
+        const parseCertificateInfo = utilServerRewire.__get__("parseCertificateInfo");
+
+        const chain1 = {
+            fingerprint: "CF:2C:F3:6A:FE:6B:10:EC:44:77:C8:95:BB:96:2E:06:1F:0E:15:DA",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain2 = {
+            fingerprint: "A0:31:C4:67:82:E6:E6:C6:62:C2:C8:7C:76:DA:9A:A6:2C:CA:BD:8E",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain3 = {
+            fingerprint: "5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        const chain4 = {
+            fingerprint: "haha",
+            valid_from: "Oct 22 12:00:00 2013 GMT",
+            valid_to: "Oct 22 12:00:00 2028 GMT",
+            subjectaltname: "DNS:www.example.org, DNS:example.com, DNS:example.edu, DNS:example.net, DNS:example.org, DNS:www.example.com, DNS:www.example.edu, DNS:www.example.net",
+        };
+
+        chain1.issuerCertificate = chain2;
+        chain2.issuerCertificate = chain3;
+        chain3.issuerCertificate = chain4;
+        chain4.issuerCertificate = undefined;
+
+        const info = parseCertificateInfo(chain1);
+        expect(chain1).toEqual(info);
+    }, 5000);
+});
 
 describe("Test genSecret", () => {
 
@@ -42,3 +163,4 @@ describe("Test reset-password", () => {
         await require("../extra/reset-password").main();
     }, 120000);
 });
+

test/e2e.spec.js

@@ -59,18 +59,38 @@ describe("Init", () => {
 
         // Go to /
         await page.goto(baseURL);
-        await sleep(3000);
+        await page.waitForSelector("h1.mb-3");
         pathname = await page.evaluate(() => location.pathname);
         expect(pathname).toEqual("/dashboard");
     });
 
+    it("should create monitor", async () => {
+        // Create monitor
+        await page.goto(baseURL + "/add");
+        await page.waitForSelector("#name");
+
+        await page.type("#name", "Myself");
+        await page.waitForSelector("#url");
+        await page.click("#url", { clickCount: 3 });
+        await page.keyboard.type(baseURL);
+        await page.keyboard.press("Enter");
+
+        await page.waitForFunction(() => {
+            const badge = document.querySelector("span.badge");
+            return badge && badge.innerText == "100%";
+        }, { timeout: 5000 });
+
+    });
+
     // Settings Page
+    /*
     describe("Settings", () => {
-        beforeAll(async () => {
+        beforeEach(async () => {
             await page.goto(baseURL + "/settings");
         });
 
         it("Change Language", async () => {
+            await page.goto(baseURL + "/settings/appearance");
             await page.waitForSelector("#language");
 
             await page.select("#language", "zh-HK");
@@ -83,20 +103,33 @@ describe("Init", () => {
         });
 
         it("Change Theme", async () => {
-            await sleep(1000);
+            await page.goto(baseURL + "/settings/appearance");
 
             // Dark
             await click(page, ".btn[for=btncheck2]");
             await page.waitForSelector("div.dark");
 
-            await sleep(1000);
+            await page.waitForSelector(".btn[for=btncheck1]");
 
             // Light
             await click(page, ".btn[for=btncheck1]");
             await page.waitForSelector("div.light");
         });
 
-        // TODO: Heartbeat Bar Style
+        it("Change Heartbeat Bar Style", async () => {
+            await page.goto(baseURL + "/settings/appearance");
+
+            // Bottom
+            await click(page, ".btn[for=btncheck5]");
+            await page.waitForSelector("div.hp-bar-big");
+
+            // None
+            await click(page, ".btn[for=btncheck6]");
+            await page.waitForSelector("div.hp-bar-big", {
+                hidden: true,
+                timeout: 1000
+            });
+        });
 
         // TODO: Timezone
 
@@ -108,14 +141,14 @@ describe("Init", () => {
             // Yes
             await click(page, "#searchEngineIndexYes");
             await click(page, "form > div > .btn[type=submit]");
-            await sleep(2000);
+            await sleep(1000);
             res = await axios.get(baseURL + "/robots.txt");
             expect(res.data).not.toContain("Disallow: /");
 
             // No
             await click(page, "#searchEngineIndexNo");
             await click(page, "form > div > .btn[type=submit]");
-            await sleep(2000);
+            await sleep(1000);
             res = await axios.get(baseURL + "/robots.txt");
             expect(res.data).toContain("Disallow: /");
         });
@@ -125,25 +158,25 @@ describe("Init", () => {
 
             // Default
             await newPage.goto(baseURL);
-            await sleep(3000);
+            await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
             let pathname = await newPage.evaluate(() => location.pathname);
             expect(pathname).toEqual("/dashboard");
 
             // Status Page
             await click(page, "#entryPageNo");
             await click(page, "form > div > .btn[type=submit]");
-            await sleep(4000);
+            await sleep(1000);
             await newPage.goto(baseURL);
-            await sleep(4000);
+            await newPage.waitForSelector("img.logo", { timeout: 3000 });
             pathname = await newPage.evaluate(() => location.pathname);
             expect(pathname).toEqual("/status");
 
             // Back to Dashboard
             await click(page, "#entryPageYes");
             await click(page, "form > div > .btn[type=submit]");
-            await sleep(4000);
+            await sleep(1000);
             await newPage.goto(baseURL);
-            await sleep(4000);
+            await newPage.waitForSelector("h1.mb-3", { timeout: 3000 });
             pathname = await newPage.evaluate(() => location.pathname);
             expect(pathname).toEqual("/dashboard");
 
@@ -151,7 +184,7 @@ describe("Init", () => {
         });
 
         it("Change Password (wrong current password)", async () => {
-            await page.goto(baseURL + "/settings");
+            await page.goto(baseURL + "/settings/security");
             await page.waitForSelector("#current-password");
 
             await page.type("#current-password", "wrong_passw$$d");
@@ -159,10 +192,10 @@ describe("Init", () => {
             await page.type("#repeat-new-password", "new_password123");
 
             // Save
-            await click(page, "form > div > .btn[type=submit]", 1);
+            await click(page, "form > div > .btn[type=submit]", 0);
-            await sleep(4000);
+            await sleep(1000);
 
-            await click(page, ".btn-danger.btn.me-2");
+            await click(page, "#logout-btn");
             await login("admin", "new_password123");
             let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
             expect(elementCount).toEqual(1);
@@ -171,24 +204,26 @@ describe("Init", () => {
         });
 
         it("Change Password (wrong repeat)", async () => {
-            await page.goto(baseURL + "/settings");
+            await page.goto(baseURL + "/settings/security");
             await page.waitForSelector("#current-password");
 
             await page.type("#current-password", "admin123");
             await page.type("#new-password", "new_password123");
             await page.type("#repeat-new-password", "new_password1234567898797898");
 
-            await click(page, "form > div > .btn[type=submit]", 1);
+            await click(page, "form > div > .btn[type=submit]", 0);
-            await sleep(4000);
+            await sleep(1000);
 
-            await click(page, ".btn-danger.btn.me-2");
+            await click(page, "#logout-btn");
             await login("admin", "new_password123");
 
             let elementCount = await page.evaluate(() => document.querySelectorAll("#floatingPassword").length);
             expect(elementCount).toEqual(1);
 
             await login("admin", "admin123");
-            await sleep(3000);
+            await page.waitForSelector("#current-password");
+            let pathname = await page.evaluate(() => location.pathname);
+            expect(pathname).toEqual("/settings/security");
         });
 
         // TODO: 2FA
@@ -197,10 +232,37 @@ describe("Init", () => {
 
         // TODO: Import Backup
 
-        // TODO: Disable Auth
+        it("Should disable & enable auth", async () => {
+            await page.goto(baseURL + "/settings/security");
+            await click(page, "#disableAuth-btn");
+            await click(page, ".btn.btn-danger[data-bs-dismiss='modal']", 2); // Not a good way to do it
+            await page.waitForSelector("#enableAuth-btn", { timeout: 3000 });
+            await page.waitForSelector("#logout-btn", {
+                hidden: true,
+                timeout: 3000
+            });
 
-        // TODO: Clear Stats
+            const newPage = await browser.newPage();
+            await newPage.goto(baseURL);
+            await newPage.waitForSelector("span.badge", { timeout: 3000 });
+            newPage.close();
+
+            await click(page, "#enableAuth-btn");
+            await login("admin", "admin123");
+            await page.waitForSelector("#disableAuth-btn", { timeout: 3000 });
+        });
+
+        // it("Should clear all statistics", async () => {
+        //     await page.goto(baseURL + "/settings/monitor-history");
+        //     await click(page, "#clearAllStats-btn");
+        //     await click(page, ".btn.btn-danger");
+        //     await page.waitForFunction(() => {
+        //         const badge = document.querySelector("span.badge");
+        //         return badge && badge.innerText == "0%";
+        //     }, { timeout: 3000 });
+        // });
     });
+     */
 
     /*
      * TODO