Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor

# Conflicts:
#	src/languages/en.js
#	src/pages/EditMonitor.vue
This commit is contained in:
Louis Lam
2023-02-25 14:56:51 +08:00
215 changed files with 31067 additions and 18429 deletions

View File

@@ -18,12 +18,14 @@ import NotFound from "./pages/NotFound.vue";
import DockerHosts from "./components/settings/Docker.vue";
import MaintenanceDetails from "./pages/MaintenanceDetails.vue";
import ManageMaintenance from "./pages/ManageMaintenance.vue";
import Plugins from "./components/settings/Plugins.vue";
// Settings - Sub Pages
import Appearance from "./components/settings/Appearance.vue";
import General from "./components/settings/General.vue";
const Notifications = () => import("./components/settings/Notifications.vue");
import ReverseProxy from "./components/settings/ReverseProxy.vue";
import Tags from "./components/settings/Tags.vue";
import MonitorHistory from "./components/settings/MonitorHistory.vue";
const Security = () => import("./components/settings/Security.vue");
import Proxies from "./components/settings/Proxies.vue";
@@ -99,6 +101,10 @@ const routes = [
path: "reverse-proxy",
component: ReverseProxy,
},
{
path: "tags",
component: Tags,
},
{
path: "monitor-history",
component: MonitorHistory,
@@ -119,6 +125,10 @@ const routes = [
path: "backup",
component: Backup,
},
{
path: "plugins",
component: Plugins,
},
{
path: "about",
component: About,