conflicts resolved

This commit is contained in:
Bnyro
2022-10-07 20:10:39 +02:00
32 changed files with 757 additions and 313 deletions

View File

@@ -17,6 +17,9 @@ import {
faXmark,
faClone,
faShare,
faBook,
faServer,
faDonate,
} from "@fortawesome/free-solid-svg-icons";
import { faGithub, faBitcoin } from "@fortawesome/free-brands-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
@@ -39,6 +42,9 @@ library.add(
faXmark,
faClone,
faShare,
faBook,
faServer,
faDonate,
);
import router from "@/router/router.js";
@@ -183,7 +189,7 @@ const mixin = {
const emailRegex = /([\w-\\.]+@(?:[\w-]+\.)+[\w-]{2,4})/g;
return string
.replace(urlRegex, url => {
if (url.endsWith("</a>")) return url;
if (url.endsWith("</a>") || url.endsWith("<a")) return url;
return `<a href="${url}" target="_blank">${url}</a>`;
})
.replace(emailRegex, email => {