whole new conf/setup method

server/api/controller/event.js

@@ -1,6 +1,6 @@
 const crypto = require('crypto')
 const path = require('path')
-const config = require('config')
+const config = require('../../config')
 const fs = require('fs')
 const { Op } = require('sequelize')
 const intersection = require('lodash/intersection')

server/api/controller/settings.js

@@ -1,6 +1,4 @@
-const Setting = require('../models/setting')
-const config = require('config')
-const consola = require('consola')
+const config = require('../../config')
 const path = require('path')
 const fs = require('fs')
 const pkg = require('../../../package.json')
@@ -11,9 +9,11 @@ const sharp = require('sharp')
 const log = require('../../log')
 
 const defaultSettings = {
+  title: 'Gancio',
+  description: 'A shared agenda for local communities',
   instance_timezone: 'Europe/Rome',
   instance_locale: 'en',
-  instance_name: config.title.toLowerCase().replace(/ /g, ''),
+  instance_name: 'gancio', // config.title.toLowerCase().replace(/ /g, ''),
   instance_place: '',
   allow_registration: true,
   allow_anon_event: true,
@@ -42,6 +42,11 @@ const settingsController = {
   secretSettings: {},
 
   async load () {
+    if (config.firstrun) {
+      settingsController.settings = defaultSettings
+      return
+    }
+    const Setting = require('../models/setting')
     if (!settingsController.settings.initialized) {
       // initialize instance settings from db
       // note that this is done only once when the server starts
@@ -80,7 +85,7 @@ const settingsController = {
       if (config.user_locale && fs.existsSync(path.resolve(config.user_locale))) {
         const user_locale = fs.readdirSync(path.resolve(config.user_locale))
         user_locale.forEach(async f => {
-          consola.info(`Loading user locale ${f}`)
+          log.info(`Loading user locale ${f}`)
           const locale = path.basename(f, '.js')
           settingsController.user_locale[locale] =
             (await require(path.resolve(config.user_locale, f))).default
@@ -90,6 +95,7 @@ const settingsController = {
   },
 
   async set (key, value, is_secret = false) {
+    const Setting = require('../models/setting')
     log.info(`SET ${key} ${is_secret ? '*****' : value}`)
     try {
       const [setting, created] = await Setting.findOrCreate({
@@ -135,14 +141,7 @@ const settingsController = {
 
   getAllRequest (req, res) {
     // get public settings and public configuration
-    const settings = {
-      ...settingsController.settings,
-      baseurl: config.baseurl,
-      title: config.title,
-      description: config.description,
-      version: pkg.version
-    }
-    res.json(settings)
+    res.json({ ...settingsController.settings, version: pkg.version })
   }
 }
 

server/api/controller/user.js

@@ -1,6 +1,6 @@
 const crypto = require('crypto')
 const { Op } = require('sequelize')
-const config = require('config')
+const config = require('../../config')
 const mail = require('../mail')
 const User = require('../models/user')
 const settingsController = require('./settings')

server/api/mail.js

@@ -1,14 +1,14 @@
 const Email = require('email-templates')
 const path = require('path')
 const moment = require('dayjs')
-const config = require('config')
-const settingsController = require('./controller/settings')
+const config = require('../config')
+const settings = require('./controller/settings').settings
 const log = require('../log')
 const { Task, TaskManager } = require('../taskManager')
 const locales = require('../../locales')
 
 const mail = {
-  send (addresses, template, locals, locale = settingsController.settings.instance_locale) {
+  send (addresses, template, locals, locale = settings.instance_locale) {
     log.debug('Enqueue new email ', template, locale)
     const task = new Task({
       name: 'MAIL',
@@ -31,7 +31,7 @@ const mail = {
         }
       },
       message: {
-        from: `📅 ${config.title} <${config.admin_email}>`
+        from: `📅 ${settings.title} <${settings.admin_email}>`
       },
       send: true,
       i18n: {
@@ -39,23 +39,23 @@ const mail = {
         objectNotation: true,
         syncFiles: false,
         updateFiles: false,
-        defaultLocale: settingsController.settings.instance_locale || 'en',
+        defaultLocale: settings.instance_locale || 'en',
         locale,
         locales: Object.keys(locales)
       },
-      transport: config.smtp
+      transport: settings.smtp
     })
 
     const msg = {
       template,
       message: {
         to: addresses,
-        bcc: config.admin_email
+        bcc: settings.admin_email
       },
       locals: {
         ...locals,
         locale,
-        config: { title: config.title, baseurl: config.baseurl, description: config.description, admin_email: config.admin_email },
+        config: { title: settings.title, baseurl: settings.baseurl, description: settings.description, admin_email: settings.admin_email },
         datetime: datetime => moment.unix(datetime).locale(locale).format('ddd, D MMMM HH:mm')
       }
     }

server/api/storage.js

@@ -4,7 +4,7 @@ const crypto = require('crypto')
 const mkdirp = require('mkdirp')
 const sharp = require('sharp')
 const log = require('../log')
-const config = require('config')
+const config = require('../config')
 
 try {
   mkdirp.sync(config.upload_path + '/thumb')