diff --git a/server/modules/logging/airbrake/definition.yml b/server/modules/logging/airbrake/definition.yml deleted file mode 100644 index 75bd0e1833905e6455cf169ea254d7e6707876e2..0000000000000000000000000000000000000000 --- a/server/modules/logging/airbrake/definition.yml +++ /dev/null @@ -1,8 +0,0 @@ -key: airbrake -title: Airbrake -description: Airbrake is the leading exception reporting service, currently providing error monitoring for 50,000 applications with support for 18 programming languages. -author: requarks.io -logo: https://static.requarks.io/logo/airbrake.svg -website: https://airbrake.io/ -defaultLevel: warn -props: {} diff --git a/server/modules/logging/airbrake/logger.js b/server/modules/logging/airbrake/logger.js deleted file mode 100644 index 80f5857862c5877beaf129f9dd0da158e468b0fb..0000000000000000000000000000000000000000 --- a/server/modules/logging/airbrake/logger.js +++ /dev/null @@ -1,9 +0,0 @@ -// ------------------------------------ -// Airbrake -// ------------------------------------ - -module.exports = { - init (logger, conf) { - - } -} diff --git a/server/modules/logging/bugsnag/definition.yml b/server/modules/logging/bugsnag/definition.yml deleted file mode 100644 index b9bd4584722e37516decfe8ef633e07f2ac5abc6..0000000000000000000000000000000000000000 --- a/server/modules/logging/bugsnag/definition.yml +++ /dev/null @@ -1,12 +0,0 @@ -key: bugsnag -title: Bugsnag -description: Bugsnag monitors apps for errors that impact customers & reports all diagnostic data. -author: requarks.io -logo: https://static.requarks.io/logo/bugsnag.svg -website: https://www.bugsnag.com/ -defaultLevel: warn -props: - key: - type: String - title: Key - hint: Bugsnag Project Notifier key diff --git a/server/modules/logging/bugsnag/logger.js b/server/modules/logging/bugsnag/logger.js deleted file mode 100644 index 4ad34ad4098cfed55f4cad28517723d1c57f5afd..0000000000000000000000000000000000000000 --- a/server/modules/logging/bugsnag/logger.js +++ /dev/null @@ -1,29 +0,0 @@ -const util = require('util') -const winston = require('winston') -const _ = require('lodash') - -// ------------------------------------ -// Bugsnag -// ------------------------------------ - -module.exports = { - init (logger, conf) { - let BugsnagLogger = winston.transports.BugsnagLogger = function (options) { - this.name = 'bugsnagLogger' - this.level = options.level || 'warn' - this.bugsnag = require('bugsnag') - this.bugsnag.register(options.key) - } - util.inherits(BugsnagLogger, winston.Transport) - - BugsnagLogger.prototype.log = function (level, msg, meta, callback) { - this.bugsnag.notify(new Error(msg), _.assignIn(meta, { severity: level })) - callback(null, true) - } - - logger.add(new BugsnagLogger({ - level: 'warn', - key: conf.key - })) - } -} diff --git a/server/modules/logging/disk/definition.yml b/server/modules/logging/disk/definition.yml deleted file mode 100644 index d954ba9fbc308ce97d913041640ffc23ef4ffa05..0000000000000000000000000000000000000000 --- a/server/modules/logging/disk/definition.yml +++ /dev/null @@ -1,8 +0,0 @@ -key: disk -title: Log Files -description: Outputs log files on local disk. -author: requarks.io -logo: https://static.requarks.io/logo/local-fs.svg -website: https://wiki.js.org -defaultLevel: info -props: {} diff --git a/server/modules/logging/disk/logger.js b/server/modules/logging/disk/logger.js deleted file mode 100644 index 9797f12ccc51239193e962146ac66a68ac0fe112..0000000000000000000000000000000000000000 --- a/server/modules/logging/disk/logger.js +++ /dev/null @@ -1,9 +0,0 @@ -// ------------------------------------ -// Disk -// ------------------------------------ - -module.exports = { - init (logger, conf) { - - } -} diff --git a/server/modules/logging/eventlog/definition.yml b/server/modules/logging/eventlog/definition.yml deleted file mode 100644 index 4f405973a8efebebd1f649a4b81336c05cfd8f44..0000000000000000000000000000000000000000 --- a/server/modules/logging/eventlog/definition.yml +++ /dev/null @@ -1,8 +0,0 @@ -key: eventlog -title: Windows Event Log -description: Report logs to the Windows Event Log -author: requarks.io -logo: https://static.requarks.io/logo/windows-server.svg -website: https://wiki.js.org -defaultLevel: warn -props: {} diff --git a/server/modules/logging/eventlog/logger.js b/server/modules/logging/eventlog/logger.js deleted file mode 100644 index f2561b3533f0597b28458c0547ad2e64a9cf41e6..0000000000000000000000000000000000000000 --- a/server/modules/logging/eventlog/logger.js +++ /dev/null @@ -1,9 +0,0 @@ -// ------------------------------------ -// Windows Event Log -// ------------------------------------ - -module.exports = { - init (logger, conf) { - - } -} diff --git a/server/modules/logging/loggly/definition.yml b/server/modules/logging/loggly/definition.yml deleted file mode 100644 index 4c55b936f51872f5373a1e9f62954eedafffd834..0000000000000000000000000000000000000000 --- a/server/modules/logging/loggly/definition.yml +++ /dev/null @@ -1,16 +0,0 @@ -key: loggly -title: Loggly -description: Log Analysis / Log Management by Loggly, the world's most popular log analysis & monitoring in the cloud. -author: requarks.io -logo: https://static.requarks.io/logo/loggly.svg -website: https://www.loggly.com/ -defaultLevel: warn -props: - token: - type: String - title: Token - hint: Loggly Token - subdomain: - type: String - title: Subdomain - hint: Loggly Subdomain diff --git a/server/modules/logging/loggly/logger.js b/server/modules/logging/loggly/logger.js deleted file mode 100644 index aa3d1fbbc03073ac2fdbc4ba51bc10071faba876..0000000000000000000000000000000000000000 --- a/server/modules/logging/loggly/logger.js +++ /dev/null @@ -1,18 +0,0 @@ -const winston = require('winston') - -// ------------------------------------ -// Loggly -// ------------------------------------ - -module.exports = { - init (logger, conf) { - require('winston-loggly-bulk') - logger.add(new winston.transports.Loggly({ - token: conf.token, - subdomain: conf.subdomain, - tags: ['wiki-js'], - level: 'warn', - json: true - })) - } -} diff --git a/server/modules/logging/logstash/definition.yml b/server/modules/logging/logstash/definition.yml deleted file mode 100644 index eb660d17287319680237bd09acc408ef24f6a7e7..0000000000000000000000000000000000000000 --- a/server/modules/logging/logstash/definition.yml +++ /dev/null @@ -1,8 +0,0 @@ -key: logstash -title: Logstash -description: Logstash is an open source tool for collecting, parsing, and storing logs for future use. -author: requarks.io -logo: https://static.requarks.io/logo/logstash.svg -website: https://www.elastic.co/products/logstash -defaultLevel: warn -props: {} diff --git a/server/modules/logging/logstash/logger.js b/server/modules/logging/logstash/logger.js deleted file mode 100644 index ae174c4eef0c0cbc1a449a698e4044568a478257..0000000000000000000000000000000000000000 --- a/server/modules/logging/logstash/logger.js +++ /dev/null @@ -1,9 +0,0 @@ -// ------------------------------------ -// Logstash -// ------------------------------------ - -module.exports = { - init (logger, conf) { - - } -} diff --git a/server/modules/logging/newrelic/definition.yml b/server/modules/logging/newrelic/definition.yml deleted file mode 100644 index 501393e9eae4f0e1c95a5b1636e2616287be2117..0000000000000000000000000000000000000000 --- a/server/modules/logging/newrelic/definition.yml +++ /dev/null @@ -1,8 +0,0 @@ -key: newrelic -title: New Relic -description: New Relic's digital intelligence platform lets developers, ops, and tech teams measure and monitor the performance of their applications and infrastructure. -author: requarks.io -logo: https://static.requarks.io/logo/newrelic.svg -website: https://newrelic.com/ -defaultLevel: warn -props: {} diff --git a/server/modules/logging/newrelic/logger.js b/server/modules/logging/newrelic/logger.js deleted file mode 100644 index e8c86855e0d1dfee688a21d0161f2165695e82b5..0000000000000000000000000000000000000000 --- a/server/modules/logging/newrelic/logger.js +++ /dev/null @@ -1,9 +0,0 @@ -// ------------------------------------ -// New Relic -// ------------------------------------ - -module.exports = { - init (logger, conf) { - - } -} diff --git a/server/modules/logging/papertrail/definition.yml b/server/modules/logging/papertrail/definition.yml deleted file mode 100644 index 9a5decbd2442f0b01e96c9a16825d33038611fb6..0000000000000000000000000000000000000000 --- a/server/modules/logging/papertrail/definition.yml +++ /dev/null @@ -1,14 +0,0 @@ -key: papertrail -title: Papertrail -description: Frustration-free log management. -author: requarks.io -logo: https://static.requarks.io/logo/papertrail.svg -website: https://papertrailapp.com/ -defaultLevel: warn -props: - host: - type: String - title: Host - port: - type: Number - title: Port diff --git a/server/modules/logging/papertrail/logger.js b/server/modules/logging/papertrail/logger.js deleted file mode 100644 index 9469f0bf0565297b74e649ae00ae818d9332cc30..0000000000000000000000000000000000000000 --- a/server/modules/logging/papertrail/logger.js +++ /dev/null @@ -1,18 +0,0 @@ -const winston = require('winston') - -// ------------------------------------ -// Papertrail -// ------------------------------------ - -module.exports = { - init (logger, conf) { - // eslint-disable-next-line no-unused-expressions - require('winston-papertrail').Papertrail // NOSONAR - logger.add(new winston.transports.Papertrail({ - host: conf.host, - port: conf.port, - level: 'warn', - program: 'wiki.js' - })) - } -} diff --git a/server/modules/logging/raygun/definition.yml b/server/modules/logging/raygun/definition.yml deleted file mode 100644 index 3b34372c509be0c645bc7fc91a3068c321d8907d..0000000000000000000000000000000000000000 --- a/server/modules/logging/raygun/definition.yml +++ /dev/null @@ -1,8 +0,0 @@ -key: raygun -title: Raygun -description: Error, crash and performance monitoring for software teams. -author: requarks.io -logo: https://static.requarks.io/logo/raygun.svg -website: https://raygun.com/ -defaultLevel: warn -props: {} diff --git a/server/modules/logging/raygun/logger.js b/server/modules/logging/raygun/logger.js deleted file mode 100644 index cb106ec434668f065536c6e8907f7b931d99aee3..0000000000000000000000000000000000000000 --- a/server/modules/logging/raygun/logger.js +++ /dev/null @@ -1,9 +0,0 @@ -// ------------------------------------ -// Raygun -// ------------------------------------ - -module.exports = { - init (logger, conf) { - - } -} diff --git a/server/modules/logging/rollbar/definition.yml b/server/modules/logging/rollbar/definition.yml deleted file mode 100644 index 09e5a7d141d920d478d4da9e76153b9c9a6256f1..0000000000000000000000000000000000000000 --- a/server/modules/logging/rollbar/definition.yml +++ /dev/null @@ -1,11 +0,0 @@ -key: rollbar -title: Rollbar -description: Rollbar provides real-time error alerting & debugging tools for developers. -author: requarks.io -logo: https://static.requarks.io/logo/rollbar.svg -website: https://rollbar.com/ -defaultLevel: warn -props: - key: - type: String - title: Key diff --git a/server/modules/logging/rollbar/logger.js b/server/modules/logging/rollbar/logger.js deleted file mode 100644 index 0d8ea4f6ee5dd2562755a992f14079826cb9a71a..0000000000000000000000000000000000000000 --- a/server/modules/logging/rollbar/logger.js +++ /dev/null @@ -1,29 +0,0 @@ -const util = require('util') -const winston = require('winston') -const _ = require('lodash') - -// ------------------------------------ -// Rollbar -// ------------------------------------ - -module.exports = { - init (logger, conf) { - let RollbarLogger = winston.transports.RollbarLogger = function (options) { - this.name = 'rollbarLogger' - this.level = options.level || 'warn' - this.rollbar = require('rollbar') - this.rollbar.init(options.key) - } - util.inherits(RollbarLogger, winston.Transport) - - RollbarLogger.prototype.log = function (level, msg, meta, callback) { - this.rollbar.handleErrorWithPayloadData(new Error(msg), _.assignIn(meta, { level })) - callback(null, true) - } - - logger.add(new RollbarLogger({ - level: 'warn', - key: conf.key - })) - } -} diff --git a/server/modules/logging/sentry/definition.yml b/server/modules/logging/sentry/definition.yml deleted file mode 100644 index 7afaaa6cbce663e127bf9b301240450de7bcf7e4..0000000000000000000000000000000000000000 --- a/server/modules/logging/sentry/definition.yml +++ /dev/null @@ -1,11 +0,0 @@ -key: sentry -title: Sentry -description: Open-source error tracking that helps developers monitor and fix crashes in real time. -author: requarks.io -logo: https://static.requarks.io/logo/sentry.svg -website: https://sentry.io/ -defaultLevel: warn -props: - key: - type: String - title: Key diff --git a/server/modules/logging/sentry/logger.js b/server/modules/logging/sentry/logger.js deleted file mode 100644 index 2601716dd8f17e4107a3f87fe999ed5bd87030fb..0000000000000000000000000000000000000000 --- a/server/modules/logging/sentry/logger.js +++ /dev/null @@ -1,29 +0,0 @@ -const util = require('util') -const winston = require('winston') - -// ------------------------------------ -// Sentry -// ------------------------------------ - -module.exports = { - init (logger, conf) { - let SentryLogger = winston.transports.SentryLogger = function (options) { - this.name = 'sentryLogger' - this.level = options.level || 'warn' - this.raven = require('raven') - this.raven.config(options.key).install() - } - util.inherits(SentryLogger, winston.Transport) - - SentryLogger.prototype.log = function (level, msg, meta, callback) { - level = (level === 'warn') ? 'warning' : level - this.raven.captureMessage(msg, { level, extra: meta }) - callback(null, true) - } - - logger.add(new SentryLogger({ - level: 'warn', - key: conf.key - })) - } -} diff --git a/server/modules/logging/syslog/definition.yml b/server/modules/logging/syslog/definition.yml deleted file mode 100644 index 91d0ba3d22d18e2900d47f6c9b79d2b8ce41f950..0000000000000000000000000000000000000000 --- a/server/modules/logging/syslog/definition.yml +++ /dev/null @@ -1,8 +0,0 @@ -key: syslog -title: Syslog -description: Syslog is a way for network devices to send event messages to a logging server. -author: requarks.io -logo: https://static.requarks.io/logo/syslog.svg -website: https://wiki.js.org -defaultLevel: warn -props: {} diff --git a/server/modules/logging/syslog/logger.js b/server/modules/logging/syslog/logger.js deleted file mode 100644 index ab30f4d4679b5c0758e7ad9179cb3381656c92b0..0000000000000000000000000000000000000000 --- a/server/modules/logging/syslog/logger.js +++ /dev/null @@ -1,9 +0,0 @@ -// ------------------------------------ -// Syslog -// ------------------------------------ - -module.exports = { - init (logger, conf) { - - } -} diff --git a/ux/src/router/routes.js b/ux/src/router/routes.js index fba12729a48c79a77631e924617f853c853ae798..b41d9aca4346604159192a5f6b6631f1ccc9231d 100644 --- a/ux/src/router/routes.js +++ b/ux/src/router/routes.js @@ -29,7 +29,7 @@ const routes = [ children: [ { path: '', redirect: '/_admin/dashboard' }, { path: 'dashboard', component: () => import('../pages/AdminDashboard.vue') }, - // { path: 'sites', component: () => import('../pages/AdminSites.vue') }, + { path: 'sites', component: () => import('../pages/AdminSites.vue') }, // // -> Site // { path: ':siteid/general', component: () => import('../pages/AdminGeneral.vue') }, { path: ':siteid/editors', component: () => import('../pages/AdminEditors.vue') }, diff --git a/ux/src/stores/admin.js b/ux/src/stores/admin.js index 0cb5458176199b8634028c6d14424607c6558649..606d854b4bd49be3c391a40c42457402176a7024 100644 --- a/ux/src/stores/admin.js +++ b/ux/src/stores/admin.js @@ -38,6 +38,9 @@ export const useAdminStore = defineStore('admin', { fetchPolicy: 'network-only' }) this.sites = cloneDeep(resp?.data?.sites ?? []) + if (!this.currentSiteId) { + this.currentSiteId = this.sites[0].id + } } } })