refactor: vue fixes + modal-upgrade-system.vue

server/controllers/admin.js

@@ -105,6 +105,8 @@ router.get('/users/:id', (req, res) => {
       }
 
       res.render('pages/admin/users-edit', { adminTab: 'users', usr, usrOpts })
+    }).catch(err => { // eslint-disable-line handle-callback-err
+      return res.status(404).end() || true
     })
 })
 
@@ -218,9 +220,9 @@ router.delete('/users/:id', (req, res) => {
   }
 
   return db.User.findByIdAndRemove(req.params.id).then(() => {
-    return res.json({ msg: 'OK' })
+    return res.json({ ok: true })
   }).catch((err) => {
-    res.status(500).json({ msg: err.message })
+    res.status(500).json({ ok: false, msg: err.message })
   })
 })
 

server/libs/markdown.js

@@ -206,13 +206,6 @@ const parseContent = (content) => {
     cr(elm).replaceWith(txtLink)
   })
 
-  // -> Add anchor handler
-
-  cr('a.toc-anchor').each((i, elm) => {
-    let hashText = cr(elm).attr('href').slice(1)
-    cr(elm).attr('v-on:click.stop.prevent', "$store.dispatch('anchorOpen', '" + hashText + "')")
-  })
-
   // -> Re-attach blockquote styling classes to their parents
 
   cr.root().children('blockquote').each((i, elm) => {

server/locales/en/admin.json

@@ -1,8 +1,14 @@
 {
   "profile": {
+    "displayname": "Display Name",
+    "displaynameexample": "John Smith",
+    "email": "Email",
     "lastprofileupdate": "Last Profile Update",
     "membersince": "Member since",
+    "password": "Password",
+    "passwordverify": "Verify Password",
     "provider": "Provider",
+    "savechanges": "Save Changes",
     "subtitle": "Profile and authentication info"
   },
   "stats": {
@@ -42,4 +48,4 @@
     "edituser": "Edit User",
     "uniqueid": "Unique ID"
   }
-}
+}

server/locales/en/browser.json

@@ -97,14 +97,6 @@
   "nav": {
     "home": "Home"
   },
-  "profile": {
-    "displayname": "Display Name",
-    "displaynameexample": "John Smith",
-    "email": "Email",
-    "password": "Password",
-    "passwordverify": "Verify Password",
-    "savechanges": "Save Changes"
-  },
   "search": {
     "didyoumean": "Did you mean...?",
     "nomatch": "No results matching your query",

server/views/pages/admin/settings.pug

@@ -15,10 +15,10 @@ block adminContent
             p #{t('admin:settings.latestversion')}: #[strong= sysversion.latest] #[em (Published #{moment(sysversion.latestPublishedAt).fromNow()})]
             p
               if sysversion.current !== sysversion.latest
-                button.button.is-deep-orange(v-on:click='upgrade')= t('admin:settings.upgrade')
+                button.button.is-deep-orange(@click='$store.dispatch("modalUpgradeSystem/open", { mode: "upgrade"})')= t('admin:settings.upgrade')
               else
                 button.button.is-disabled= t('admin:settings.upgrade')
-              button.button.is-deep-orange.is-outlined(v-on:click='reinstall')= t('admin:settings.reinstall')
+              button.button.is-deep-orange.is-outlined(@click='$store.dispatch("modalUpgradeSystem/open", { mode: "reinstall"})')= t('admin:settings.reinstall')
           else
             p: em= t('admin:settings.versioncheckfailed')
       section
@@ -34,4 +34,4 @@ block adminContent
           p.is-small= t('admin:settings.flushsessionstext')
           p: button.button.is-teal.is-outlined(v-on:click='flushsessions')= t('admin:settings.flushsessionsbtn')
 
-      include ../../modals/admin-upgrade.pug
+  modal-upgrade-system