Skip to content

W
wiki-js
Commit e2848228 authored by Nicolas Giard's avatar Nicolas Giard
Browse files
Options

misc: updated dependencies + UI fixes

parent 5e109802
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 61 deletions
.babelrc
View file @ e2848228
......@@ -2,10 +2,25 @@
"comments": true,
"plugins": [
"lodash",
"graphql-tag"
"graphql-tag",
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-syntax-import-meta",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-json-strings",
[
"@babel/plugin-proposal-decorators",
{
"legacy": true
}
],
"@babel/plugin-proposal-function-sent",
"@babel/plugin-proposal-export-namespace-from",
"@babel/plugin-proposal-numeric-separator",
"@babel/plugin-proposal-throw-expressions"
],
"presets": [
["env"],
"stage-2"
[
"@babel/preset-env"
]
]
}
client/components/admin/admin-auth.vue
View file @ e2848228
......@@ -12,7 +12,7 @@
.body-2.grey--text.text--darken-1 Select which authentication strategies to enable:
.caption.grey--text.pb-2 Some strategies require additional configuration in their dedicated tab (when selected).
v-form
v-checkbox.my-1(
v-checkbox.my-0(
v-for='strategy in strategies'
v-model='strategy.isEnabled'
:key='strategy.key'
......
client/components/admin/admin-general.vue
View file @ e2848228
......@@ -44,7 +44,7 @@
)
v-card-chin
v-spacer
v-btn(color='primary')
v-btn(color='primary', @click='save')
v-icon(left) chevron_right
span Save
v-flex(lg6 xs12)
......@@ -82,7 +82,33 @@
)
v-card-chin
v-spacer
v-btn(color='primary')
v-btn(color='primary', @click='save')
v-icon(left) chevron_right
span Save
v-card.mt-3
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading Features
v-card-text
v-switch(
v-model='featurePageRatings'
label='Page Ratings'
color='primary'
persistent-hint
hint='Allow users to rate pages.'
)
v-divider.mt-3
v-switch(
v-model='featurePersonalWiki'
label='Personal Wikis'
color='primary'
persistent-hint
hint='Allow users to have their own personal wiki.'
)
v-card-chin
v-spacer
v-btn(color='primary', @click='save')
v-icon(left) chevron_right
span Save
......@@ -98,12 +124,23 @@ export default {
metaRobotsSelection: ['Index', 'Follow'],
metaRobots: ['Index', 'Follow', 'No Index', 'No Follow'],
useSquareLogo: false,
displayMascot: true
displayMascot: true,
featurePageRatings: false,
featurePersonalWiki: true
}
},
computed: {
siteTitle: sync('site/title'),
company: sync('site/company')
},
methods: {
async save () {
this.$store.commit('showNotification', {
message: 'Configuration saved successfully.',
style: 'success',
icon: 'check'
})
}
}
}
</script>
......
client/components/admin/admin-logging.vue
View file @ e2848228
......@@ -12,7 +12,7 @@
.body-2.grey--text.text--darken-1 Select which logging service to enable:
.caption.grey--text.pb-2 Some loggers require additional configuration in their dedicated tab (when selected).
v-form
v-checkbox.my-1(
v-checkbox.my-0(
v-for='(logger, n) in loggers'
v-model='logger.isEnabled'
:key='logger.key'
......
client/components/admin/admin-storage.vue
View file @ e2848228
......@@ -12,7 +12,7 @@
.body-2.grey--text.text--darken-1 Select which storage targets to enable:
.caption.grey--text.pb-2 Some storage targets require additional configuration in their dedicated tab (when selected).
v-form
v-checkbox.my-1(
v-checkbox.my-0(
v-for='tgt in targets'
v-model='tgt.isEnabled'
:key='tgt.key'
......
client/components/admin/admin-utilities.vue
View file @ e2848228
......@@ -139,8 +139,8 @@
</template>
<script>
import IconGithubCircle from 'mdi/github-circle'
import IconHomeAlert from 'mdi/home-alert'
import IconGithubCircle from 'mdi/GithubCircle'
import IconHomeAlert from 'mdi/HomeAlert'
export default {
components: {
......
client/helpers/compatibility.js
View file @ e2848228
require('babel-polyfill')
require('@babel/polyfill')
// =======================================
// Fetch polyfill
......
client/modules/localization.js
View file @ e2848228
......@@ -8,7 +8,7 @@ import _ from 'lodash'
import localeQuery from 'gql/common/common-locale-query.gql'
module.exports = {
export default {
VueI18Next,
init() {
i18next
......
client/themes/default/components/app.vue
View file @ e2848228
......@@ -51,6 +51,7 @@
v-divider
.contents
slot(name='contents')
v-flex(lg3, xl2, fill-height, v-if='$vuetify.breakpoint.lgAndUp')
v-toolbar(color='grey lighten-4', flat, :height='90')
div
......@@ -68,6 +69,18 @@
vue-tree-navigation.treenav(:items='toc', :defaultOpenLevel='1')
v-divider
v-list.grey.lighten-4(dense)
v-subheader.pl-4.yellow--text.text--darken-4 Rating
.text-xs-center
v-rating(
v-model='rating'
color='yellow darken-3'
background-color='grey lighten-1'
half-increments
hover
)
.pb-2.caption.grey--text 5 votes
v-divider
v-list.grey.lighten-3(dense)
v-subheader.pl-4.teal--text Tags
v-list-tile
v-list-tile-avatar: v-icon(color='teal') label
......@@ -81,7 +94,7 @@
v-list-tile-avatar: v-icon(color='teal') label
v-list-tile-title Planets
v-divider
v-toolbar(color='grey lighten-3', flat, dense)
v-toolbar(color='grey lighten-4', flat, dense)
v-spacer
v-tooltip(bottom)
v-btn(icon, slot='activator'): v-icon(color='grey') bookmark
......@@ -183,6 +196,14 @@ export default {
navShown: {
get() { return this.navOpen || this.$vuetify.breakpoint.smAndUp },
set(val) { this.navOpen = val }
},
rating: {
get () {
return 3.5
},
set (val) {
}
}
},
methods: {
......
package.json
View file @ e2848228
......@@ -42,15 +42,15 @@
"node": ">=8.11"
},
"dependencies": {
"apollo-server": "2.0.2",
"apollo-server-express": "2.0.2",
"auto-load": "3.0.0",
"apollo-server": "2.0.6",
"apollo-server-express": "2.0.5",
"auto-load": "3.0.1",
"axios": "0.18.0",
"bcryptjs-then": "1.0.1",
"bluebird": "3.5.1",
"bluebird": "3.5.2",
"body-parser": "1.18.3",
"bugsnag": "2.4.3",
"bull": "3.4.7",
"bull": "3.4.8",
"chalk": "2.4.1",
"cheerio": "1.0.0-rc.2",
"child-process-promise": "2.2.1",
......@@ -59,26 +59,26 @@
"connect-redis": "3.3.3",
"cookie-parser": "1.4.3",
"cors": "2.8.4",
"dependency-graph": "0.7.1",
"dependency-graph": "0.7.2",
"diff2html": "2.4.0",
"dotize": "^0.2.0",
"execa": "0.10.0",
"execa": "1.0.0",
"express": "4.16.3",
"express-brute": "1.0.1",
"express-brute-redis": "0.0.1",
"express-session": "1.15.6",
"file-type": "9.0.0",
"filesize.js": "1.0.2",
"follow-redirects": "1.5.5",
"follow-redirects": "1.5.7",
"fs-extra": "7.0.0",
"getos": "3.1.0",
"graphql": "0.13.2",
"graphql": "14.0.0",
"graphql-list-fields": "2.0.2",
"graphql-tools": "3.1.1",
"i18next": "11.6.0",
"i18next-express-middleware": "1.2.1",
"i18next-express-middleware": "1.3.2",
"i18next-localstorage-cache": "1.1.1",
"i18next-node-fs-backend": "1.2.1",
"i18next-node-fs-backend": "2.0.0",
"image-size": "0.6.3",
"ioredis": "4.0.0",
"js-yaml": "3.12.0",
......@@ -101,17 +101,17 @@
"markdown-it-sup": "1.0.0",
"markdown-it-task-lists": "2.1.1",
"mathjax-node": "2.1.1",
"mime-types": "2.1.19",
"mime-types": "2.1.20",
"moment": "2.22.2",
"moment-timezone": "0.5.21",
"mongodb": "3.1.3",
"mongodb": "3.1.4",
"mssql": "4.1.0",
"multer": "1.3.1",
"mysql2": "1.6.1",
"node-2fa": "1.1.2",
"node-cache": "4.2.0",
"oauth2orize": "1.11.0",
"objection": "1.2.2",
"objection": "1.2.6",
"ora": "3.0.0",
"passport": "0.4.0",
"passport-auth0": "1.0.0",
......@@ -133,66 +133,74 @@
"passport-windowslive": "1.0.2",
"pg": "7.4.3",
"pg-hstore": "2.3.2",
"pm2": "3.0.3",
"pm2": "3.0.4",
"pug": "2.0.3",
"qr-image": "3.2.0",
"raven": "2.6.3",
"read-chunk": "2.1.0",
"read-chunk": "3.0.0",
"remove-markdown": "0.3.0",
"request": "2.88.0",
"request-promise": "4.2.2",
"scim-query-filter-parser": "1.1.0",
"semver": "5.5.0",
"semver": "5.5.1",
"serve-favicon": "2.5.0",
"sqlite3": "4.0.2",
"uuid": "3.3.2",
"validator": "10.5.0",
"validator": "10.7.1",
"validator-as-promised": "1.0.2",
"winston": "3.0.0",
"yargs": "12.0.1"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-decorators": "^7.0.0",
"@babel/plugin-proposal-export-namespace-from": "^7.0.0",
"@babel/plugin-proposal-function-sent": "^7.0.0",
"@babel/plugin-proposal-json-strings": "^7.0.0",
"@babel/plugin-proposal-numeric-separator": "^7.0.0",
"@babel/plugin-proposal-throw-expressions": "^7.0.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-syntax-import-meta": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@panter/vue-i18next": "0.12.0",
"@vue/cli": "3.0.0",
"@vue/cli": "3.0.1",
"animated-number-vue": "0.1.3",
"apollo-cache-inmemory": "1.2.7",
"apollo-client": "2.3.8",
"apollo-cache-inmemory": "1.2.9",
"apollo-client": "2.4.1",
"apollo-fetch": "0.7.0",
"apollo-link": "1.2.2",
"apollo-link-batch-http": "1.2.2",
"apollo-link-error": "1.1.0",
"apollo-link-http": "1.5.4",
"apollo-link-persisted-queries": "0.2.1",
"autoprefixer": "9.1.1",
"babel-cli": "6.26.0",
"babel-core": "6.26.3",
"babel-eslint": "8.2.6",
"autoprefixer": "9.1.3",
"babel-eslint": "9.0.0",
"babel-jest": "23.4.2",
"babel-loader": "7.1.5",
"babel-loader": "^8.0.0",
"babel-plugin-graphql-tag": "1.6.0",
"babel-plugin-lodash": "3.3.4",
"babel-plugin-transform-imports": "1.5.0",
"babel-polyfill": "6.26.0",
"babel-preset-env": "1.7.0",
"babel-preset-stage-2": "6.24.1",
"brace": "0.11.1",
"cache-loader": "1.2.2",
"chart.js": "2.7.2",
"clean-webpack-plugin": "0.1.19",
"copy-webpack-plugin": "4.5.2",
"css-loader": "1.0.0",
"cssnano": "4.0.5",
"cssnano": "4.1.0",
"duplicate-package-checker-webpack-plugin": "3.0.0",
"epic-spinners": "1.0.3",
"eslint": "5.3.0",
"eslint": "5.5.0",
"eslint-config-requarks": "1.0.7",
"eslint-config-standard": "11.0.0",
"eslint-config-standard": "12.0.0",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-node": "7.0.1",
"eslint-plugin-promise": "3.8.0",
"eslint-plugin-standard": "3.1.0",
"eslint-plugin-promise": "4.0.0",
"eslint-plugin-standard": "4.0.0",
"eslint-plugin-vue": "4.7.1",
"file-loader": "1.1.11",
"file-loader": "2.0.0",
"graphiql": "0.11.11",
"graphql-persisted-document-loader": "1.0.1",
"graphql-tag": "^2.9.2",
......@@ -203,10 +211,10 @@
"i18next-xhr-backend": "1.5.1",
"ignore-loader": "0.1.2",
"js-cookie": "2.2.0",
"mini-css-extract-plugin": "0.4.1",
"mini-css-extract-plugin": "0.4.2",
"node-sass": "4.9.3",
"offline-plugin": "5.0.5",
"optimize-css-assets-webpack-plugin": "5.0.0",
"optimize-css-assets-webpack-plugin": "5.0.1",
"postcss-cssnext": "3.1.0",
"postcss-flexbugs-fixes": "4.1.0",
"postcss-flexibility": "2.0.0",
......@@ -224,21 +232,21 @@
"sass-resources-loader": "1.3.3",
"script-ext-html-webpack-plugin": "2.0.1",
"simple-progress-webpack-plugin": "1.1.2",
"style-loader": "0.22.1",
"style-loader": "0.23.0",
"stylus": "0.54.5",
"stylus-loader": "3.0.2",
"twemoji-awesome": "1.0.6",
"url-loader": "1.1.0",
"vee-validate": "2.1.0-beta.7",
"url-loader": "1.1.1",
"vee-validate": "2.1.0-beta.8",
"velocity-animate": "1.5.2",
"vue": "2.5.17",
"vue-apollo": "3.0.0-beta.19",
"vue-apollo": "3.0.0-beta.21",
"vue-chartjs": "3.4.0",
"vue-clipboards": "1.2.4",
"vue-codemirror": "4.0.5",
"vue-hot-reload-api": "2.3.0",
"vue-loader": "15.3.0",
"vue-material-design-icons": "1.6.0",
"vue-loader": "15.4.1",
"vue-material-design-icons": "2.1.1",
"vue-moment": "4.0.0",
"vue-router": "3.0.1",
"vue-simple-breakpoints": "1.0.3",
......@@ -247,15 +255,15 @@
"vue-tour": "1.0.1",
"vue-tree-navigation": "3.0.1",
"vuedraggable": "2.16.0",
"vuetify": "1.1.12",
"vuetify": "1.2.1",
"vuex": "3.0.1",
"vuex-pathify": "1.1.3",
"vuex-persistedstate": "2.5.4",
"webpack": "4.16.5",
"webpack": "4.17.2",
"webpack-bundle-analyzer": "2.13.1",
"webpack-cli": "3.1.0",
"webpack-dev-middleware": "3.1.3",
"webpack-hot-middleware": "2.22.3",
"webpack-dev-middleware": "3.2.0",
"webpack-hot-middleware": "2.23.1",
"webpack-merge": "4.1.4",
"whatwg-fetch": "2.0.4",
"write-file-webpack-plugin": "4.3.2",
......
yarn.lock
View file @ e2848228
This diff was suppressed by a .gitattributes entry.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment