liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: eslint for vue components

Browse Source
This commit is contained in:
NGPixel
2017-10-29 21:36:05 -04:00
parent 72e3bacc2e
commit 98d311145b
45 changed files with 953 additions and 1253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/helpers/entry.js
View File

@@ -1,4 +1,4 @@
'use strict'
/* global appdata, ROOTPATH */
const crypto = require('crypto')
const path = require('path')

2
server/middlewares/auth.js
View File

@@ -1,6 +1,6 @@
'use strict'
/* global appdata, rights */
/* global rights */
/**
* Authentication middleware

2
server/models/user.js
View File

@@ -1,4 +1,4 @@
/* global wiki */
/* global wiki, appconfig */
const Promise = require('bluebird')
const bcrypt = require('bcryptjs-then')

84
server/modules/documents.js
View File

@@ -1,5 +1,3 @@
'use strict'
/* global wiki */
const Promise = require('bluebird')
@@ -78,7 +76,7 @@ module.exports = {
return fs.readFileAsync(cpath).then((contents) => {
return JSON.parse(contents)
}).catch((err) => { // eslint-disable-line handle-callback-err
winston.error('Corrupted cache file. Deleting it...')
wiki.logger.error('Corrupted cache file. Deleting it...')
fs.unlinkSync(cpath)
return false
})
@@ -115,7 +113,7 @@ module.exports = {
return fs.statAsync(fpath).then((st) => {
if (st.isFile()) {
return fs.readFileAsync(fpath, 'utf8').then((contents) => {
let htmlProcessor = (options.parseMarkdown) ? mark.parseContent(contents) : Promise.resolve('')
let htmlProcessor = (options.parseMarkdown) ? wiki.mark.parseContent(contents) : Promise.resolve('')
// Parse contents
@@ -123,8 +121,8 @@ module.exports = {
let pageData = {
markdown: (options.includeMarkdown) ? contents : '',
html,
meta: (options.parseMeta) ? mark.parseMeta(contents) : {},
tree: (options.parseTree) ? mark.parseTree(contents) : []
meta: (options.parseMeta) ? wiki.mark.parseMeta(contents) : {},
tree: (options.parseTree) ? wiki.mark.parseTree(contents) : []
}
if (!pageData.meta.title) {
@@ -147,8 +145,8 @@ module.exports = {
if (options.cache) {
let cacheData = JSON.stringify(_.pick(pageData, ['html', 'meta', 'tree', 'parent']), false, false, false)
return fs.writeFileAsync(cpath, cacheData).catch((err) => {
winston.error('Unable to write to cache! Performance may be affected.')
winston.error(err)
wiki.logger.error('Unable to write to cache! Performance may be affected.')
wiki.logger.error(err)
return true
})
} else {
@@ -161,7 +159,7 @@ module.exports = {
return false
}
}).catch((err) => { // eslint-disable-line handle-callback-err
throw new Promise.OperationalError(lang.t('errors:notexist', { path: entryPath }))
throw new Promise.OperationalError(wiki.lang.t('errors:notexist', { path: entryPath }))
})
},
@@ -181,7 +179,7 @@ module.exports = {
return fs.statAsync(fpath).then((st) => {
if (st.isFile()) {
return fs.readFileAsync(fpath, 'utf8').then((contents) => {
let pageMeta = mark.parseMeta(contents)
let pageMeta = wiki.mark.parseMeta(contents)
return {
path: parentPath,
@@ -190,11 +188,11 @@ module.exports = {
}
})
} else {
return Promise.reject(new Error(lang.t('errors:parentinvalid')))
return Promise.reject(new Error(wiki.lang.t('errors:parentinvalid')))
}
})
} else {
return Promise.reject(new Error(lang.t('errors:parentisroot')))
return Promise.reject(new Error(wiki.lang.t('errors:parentisroot')))
}
},
@@ -214,15 +212,15 @@ module.exports = {
if (st.isFile()) {
return self.makePersistent(entryPath, contents, author).then(() => {
return self.updateCache(entryPath).then(entry => {
return search.add(entry)
return wiki.search.add(entry)
})
})
} else {
return Promise.reject(new Error(lang.t('errors:notexist', { path: entryPath })))
return Promise.reject(new Error(wiki.lang.t('errors:notexist', { path: entryPath })))
}
}).catch((err) => {
winston.error(err)
return Promise.reject(new Error(lang.t('errors:savefailed')))
wiki.logger.error(err)
return Promise.reject(new Error(wiki.lang.t('errors:savefailed')))
})
},
@@ -243,21 +241,21 @@ module.exports = {
includeParentInfo: true,
cache: true
}).catch(err => {
winston.error(err)
wiki.logger.error(err)
return err
}).then((pageData) => {
return {
entryPath,
meta: pageData.meta,
parent: pageData.parent || {},
text: mark.removeMarkdown(pageData.markdown)
text: wiki.mark.removeMarkdown(pageData.markdown)
}
}).catch(err => {
winston.error(err)
wiki.logger.error(err)
return err
}).then((content) => {
let parentPath = _.chain(content.entryPath).split('/').initial().join('/').value()
return db.Entry.findOneAndUpdate({
return wiki.db.Entry.findOneAndUpdate({
_id: content.entryPath
}, {
_id: content.entryPath,
@@ -280,7 +278,7 @@ module.exports = {
return result
})
}).catch(err => {
winston.error(err)
wiki.logger.error(err)
return err
})
},
@@ -291,12 +289,12 @@ module.exports = {
* @returns {Promise<Boolean>} Promise of the operation
*/
updateTreeInfo() {
return db.Entry.distinct('parentPath', { parentPath: { $ne: '' } }).then(allPaths => {
return wiki.db.Entry.distinct('parentPath', { parentPath: { $ne: '' } }).then(allPaths => {
if (allPaths.length > 0) {
return Promise.map(allPaths, pathItem => {
let parentPath = _.chain(pathItem).split('/').initial().join('/').value()
let guessedTitle = _.chain(pathItem).split('/').last().startCase().value()
return db.Entry.update({ _id: pathItem }, {
return wiki.db.Entry.update({ _id: pathItem }, {
$set: { isDirectory: true },
$setOnInsert: { isEntry: false, title: guessedTitle, parentPath }
}, { upsert: true })
@@ -322,15 +320,15 @@ module.exports = {
if (!docExists) {
return self.makePersistent(entryPath, contents, author).then(() => {
return self.updateCache(entryPath).then(entry => {
return search.add(entry)
return wiki.search.add(entry)
})
})
} else {
return Promise.reject(new Error(lang.t('errors:alreadyexists')))
return Promise.reject(new Error(wiki.lang.t('errors:alreadyexists')))
}
}).catch((err) => {
winston.error(err)
return Promise.reject(new Error(lang.t('errors:generic')))
wiki.logger.error(err)
return Promise.reject(new Error(wiki.lang.t('errors:generic')))
})
},
@@ -346,7 +344,7 @@ module.exports = {
let fpath = entryHelper.getFullPath(entryPath)
return fs.outputFileAsync(fpath, contents).then(() => {
return git.commitDocument(entryPath, author)
return wiki.git.commitDocument(entryPath, author)
})
},
@@ -362,11 +360,11 @@ module.exports = {
let self = this
if (_.isEmpty(entryPath) || entryPath === 'home') {
return Promise.reject(new Error(lang.t('errors:invalidpath')))
return Promise.reject(new Error(wiki.lang.t('errors:invalidpath')))
}
return git.moveDocument(entryPath, newEntryPath).then(() => {
return git.commitDocument(newEntryPath, author).then(() => {
return wiki.git.moveDocument(entryPath, newEntryPath).then(() => {
return wiki.git.commitDocument(newEntryPath, author).then(() => {
// Delete old cache version
let oldEntryCachePath = entryHelper.getCachePath(entryPath)
@@ -374,14 +372,14 @@ module.exports = {
// Delete old index entry
search.delete(entryPath)
wiki.search.delete(entryPath)
// Create cache for new entry
return Promise.join(
db.Entry.deleteOne({ _id: entryPath }),
wiki.db.Entry.deleteOne({ _id: entryPath }),
self.updateCache(newEntryPath).then(entry => {
return search.add(entry)
return wiki.search.add(entry)
})
)
})
@@ -397,20 +395,20 @@ module.exports = {
*/
remove(entryPath, author) {
if (_.isEmpty(entryPath) || entryPath === 'home') {
return Promise.reject(new Error(lang.t('errors:invalidpath')))
return Promise.reject(new Error(wiki.lang.t('errors:invalidpath')))
}
return git.deleteDocument(entryPath, author).then(() => {
return wiki.git.deleteDocument(entryPath, author).then(() => {
// Delete old cache version
let oldEntryCachePath = entryHelper.getCachePath(entryPath)
fs.unlinkAsync(oldEntryCachePath).catch((err) => { return true }) // eslint-disable-line handle-callback-err
// Delete old index entry
search.delete(entryPath)
wiki.search.delete(entryPath)
// Delete entry
return db.Entry.deleteOne({ _id: entryPath })
return wiki.db.Entry.deleteOne({ _id: entryPath })
})
},
@@ -423,7 +421,7 @@ module.exports = {
getStarter(entryPath) {
let formattedTitle = _.startCase(_.last(_.split(entryPath, '/')))
return fs.readFileAsync(path.join(SERVERPATH, 'app/content/create.md'), 'utf8').then((contents) => {
return fs.readFileAsync(path.join(wiki.SERVERPATH, 'app/content/create.md'), 'utf8').then((contents) => {
return _.replace(contents, new RegExp('{TITLE}', 'g'), formattedTitle)
})
},
@@ -436,17 +434,17 @@ module.exports = {
* @return {Promise<Array>} List of entries
*/
getFromTree(basePath, usr) {
return db.Entry.find({ parentPath: basePath }, 'title parentPath isDirectory isEntry').sort({ title: 'asc' }).then(results => {
return wiki.db.Entry.find({ parentPath: basePath }, 'title parentPath isDirectory isEntry').sort({ title: 'asc' }).then(results => {
return _.filter(results, r => {
return rights.checkRole('/' + r._id, usr.rights, 'read')
return wiki.rights.checkRole('/' + r._id, usr.rights, 'read')
})
})
},
getHistory(entryPath) {
return db.Entry.findOne({ _id: entryPath, isEntry: true }).then(entry => {
return wiki.db.Entry.findOne({ _id: entryPath, isEntry: true }).then(entry => {
if (!entry) { return false }
return git.getHistory(entryPath).then(history => {
return wiki.git.getHistory(entryPath).then(history => {
return {
meta: entry,
history

5
server/modules/markdown.js
View File

@@ -1,5 +1,3 @@
'use strict'
/* global wiki */
const Promise = require('bluebird')
@@ -58,8 +56,7 @@ var mkdown = md({
})
.use(mdAttrs)
// if (wiki.config.features.mathjax) {
if (true) {
if (wiki.config.features.mathjax) {
mkdown.use(mdMathjax)
}

4
server/modules/search.js
View File

@@ -5,7 +5,7 @@
const Promise = require('bluebird')
const _ = require('lodash')
// const searchIndex = require('./search-index')
const stopWord = require('stopword')
// const stopWord = require('stopword')
const streamToPromise = require('stream-to-promise')
const searchAllowedChars = new RegExp('[^a-z0-9' + wiki.data.regex.cjk + wiki.data.regex.arabic + ' ]', 'g')
@@ -22,7 +22,7 @@ module.exports = {
init () {
let self = this
self._isReady = new Promise((resolve, reject) => {
/*searchIndex({
/* searchIndex({
deletable: true,
fieldedSearch: true,
indexPath: 'wiki',

2
server/modules/system.js
View File

@@ -1,6 +1,6 @@
'use strict'
/* global winston */
/* global winston, ROOTPATH, appconfig */
const Promise = require('bluebird')
const crypto = require('crypto')

24
server/views/configure/index.pug
View File

@@ -26,7 +26,7 @@ block body
.panel-content.form-sections
section
p
svg.icons.is-18.is-outlined.has-right-pad.is-text: use(xlink:href="#nc-cd-reader")
svg.icons.is-18.is-outlined.has-right-pad.is-text: use(xlink:href='#nc-cd-reader')
span You are about to install Wiki.js #[strong= packageObj.version].
section
p.control.is-fullwidth
@@ -51,14 +51,14 @@ block body
span System Check
i(v-if='loading')
.panel-content.is-text
p(v-if='loading') #[svg.icons.is-24.is-text: use(xlink:href="#nc-ms-dots")] Checking your system for compatibility...
p(v-if='loading') #[svg.icons.is-24.is-text: use(xlink:href='#nc-ms-dots')] Checking your system for compatibility...
p(v-if='!loading && syscheck.ok')
ul
li(v-for='rs in syscheck.results') #[svg.icons.is-18.is-text: use(xlink:href="#nc-check-bold")] {{rs}}
li(v-for='rs in syscheck.results') #[svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold')] {{rs}}
p(v-if='!loading && syscheck.ok')
svg.icons.is-18.is-text: use(xlink:href="#nc-check-bold")
svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold')
strong Looks good! No issues so far.
p(v-if='!loading && !syscheck.ok') #[svg.icons.is-18.is-text: use(xlink:href="#nc-square-remove-12")] Error: {{ syscheck.error }}
p(v-if='!loading && !syscheck.ok') #[svg.icons.is-18.is-text: use(xlink:href='#nc-square-remove-12')] Error: {{ syscheck.error }}
.panel-footer
.progress-bar: div(v-bind:style='{width: currentProgress}')
button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToWelcome', v-bind:disabled='loading') Back
@@ -218,14 +218,14 @@ block body
span Git Repository Check
i(v-if='loading')
.panel-content.is-text
p(v-if='loading') #[svg.icons.is-24.is-text: use(xlink:href="#nc-ms-dots")] Verifying Git repository settings...
p(v-if='loading') #[svg.icons.is-24.is-text: use(xlink:href='#nc-ms-dots')] Verifying Git repository settings...
p(v-if='!loading && gitcheck.ok')
ul
li(v-for='rs in gitcheck.results') #[svg.icons.is-18.is-text: use(xlink:href="#nc-check-bold")] {{rs}}
li(v-for='rs in gitcheck.results') #[svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold')] {{rs}}
p(v-if='!loading && gitcheck.ok')
svg.icons.is-18.is-text: use(xlink:href="#nc-check-bold")
svg.icons.is-18.is-text: use(xlink:href='#nc-check-bold')
strong Git settings are correct!
p(v-if='!loading && !gitcheck.ok') #[svg.icons.is-18.is-text: use(xlink:href="#nc-square-remove-12")] Error: {{ gitcheck.error }}
p(v-if='!loading && !gitcheck.ok') #[svg.icons.is-18.is-text: use(xlink:href='#nc-square-remove-12')] Error: {{ gitcheck.error }}
.panel-footer
.progress-bar: div(v-bind:style='{width: currentProgress}')
button.button.is-small.is-light-blue.is-outlined(v-on:click='proceedToGit', v-bind:disabled='loading') Back
@@ -280,11 +280,11 @@ block body
section
p.control.is-fullwidth
label.label Connection String to Wiki.js 1.x MongoDB database
input(type='text', placeholder='mongodb://', v-model='conf.mongo', data-vv-scope='mongo', name='ipt-mongo', v-validate='{ required: true, min: 2 }')
input(type='text', placeholder='mongodb://', v-model='conf.mongo', data-vv-scope='upgrade', name='ipt-mongo', v-validate='{ required: true, min: 2 }')
span.desc A MongoDB database connection string where a Wiki.js 1.x installation is located. #[strong No alterations will be made to this database. ]
section
p.control.is-fullwidth
input#ipt-public(type='checkbox', v-model='conf.public', data-vv-scope='general', name='ipt-public')
input#ipt-public(type='checkbox', v-model='conf.public', data-vv-scope='upgrade', name='ipt-public')
label.label(for='ipt-public') Create groups based on individual permissions
span.desc User groups will be created based on existing users permissions. If multiple users have the exact same permission rules, they will be put in the same user group.
.panel-footer
@@ -332,4 +332,4 @@ block body
.footer
small Wiki.js Installation Wizard
small(v-if='conf.telemetry') Telemetry Client ID: !{telemetryClientID}
small(v-if='conf.telemetry') Telemetry Client ID: !{telemetryClientID}