msb-public
/
wiki
mirror of https://github.com/requarks/wiki
1
0
Code Issues Projects Releases Wiki Activity

feat: Added custom mdi icons for pages

Browse Source
pull/7619/head
Ruslan Semak 8 months ago
parent 4fa71b2461
commit fe6b2cafd3
9 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File

5
client/components/admin/admin-pages.vue
Unescape View File

@ -94,6 +94,9 @@
:class="{'drag-over': dragOverIndex === props.index}"
)
td.text-xs-right {{ props.item.id }}
td.text-xs-right {{ props.item.icon }}
td
v-icon(v-if='props.item.icon') mdi-{{ props.item.icon }}
td.text-xs-right {{ props.item.orderPriority }}
td
.body-2: strong {{ props.item.title }}
@ -123,6 +126,8 @@ export default {
pageTotal: 0,
headers: [
{ text: 'ID', value: 'id', width: 80, sortable: true },
{ text: 'Icon name', value: 'icon' },
{ text: 'Icon', value: 'icon' },
{ text: 'Order', value: 'orderPriority', width: 100 },
{ text: 'Title', value: 'title' },
{ text: 'Path', value: 'path' },

1
client/graph/admin/pages/pages-query-list.gql
Unescape View File

@ -10,6 +10,7 @@ query {
isPublished
isPrivate
orderPriority
icon
privateNS
createdAt
updatedAt

1
client/graph/common/common-pages-query-list.gql
Unescape View File

@ -5,6 +5,7 @@ query ($limit: Int, $orderBy: PageOrderBy, $orderByDirection: PageOrderByDirecti
locale
path
title
icon
description
createdAt
updatedAt

2
client/graph/common/common-pages-query-tree.gql
Unescape View File

@ -4,6 +4,8 @@ query ($parent: Int!, $mode: PageTreeMode!, $locale: String!) {
id
path
title
icon
orderPriority
isFolder
pageId
parent

9
client/themes/default/components/nav-sidebar.vue
Unescape View File

@ -67,7 +67,8 @@
@update:active='activeTreeItem'
)
template(v-slot:prepend="{ item, open }")
v-icon(v-if="!item.children") mdi-text-box
v-icon(v-if="!item.children && item.icon") mdi-{{ item.icon }}
v-icon(v-else-if="!item.children && !item.icon") mdi-text-box
v-icon(v-else-if="open") mdi-folder-open
v-icon(v-else) mdi-folder
template(v-slot:label="{ item }")
@ -272,9 +273,9 @@ export default {
},
pageItem2TreeItem(item, level) {
if (item.isFolder) {
return { id: item.id, level: level, pageId: item.pageId, path: item.path, locale: item.locale, name: item.title, children: [] }
return { id: item.id, icon: item.icon, level: level, pageId: item.pageId, path: item.path, locale: item.locale, name: item.title, children: [] }
} else {
return { id: item.id, level: level, path: item.path, locale: item.locale, name: item.title }
return { id: item.id, icon: item.icon, level: level, path: item.path, locale: item.locale, name: item.title }
}
},
activeTreeItem([id]) {
@ -342,6 +343,7 @@ export default {
id
path
title
icon
isFolder
pageId
parent
@ -356,6 +358,7 @@ export default {
locale: this.locale
}
})
return _.get(resp, 'data.pages.tree', [])
}
},

13
server/db/migrations/2.5.132.js
Unescape View File

@ -0,0 +1,13 @@
exports.up = async knex => {
await knex.schema
.alterTable('pages', table => {
table.text('icon').notNullable().defaultTo('text-box')
})
await knex.schema
.alterTable('pageTree', table => {
table.text('icon').notNullable().defaultTo('text-box')
})
}
exports.down = knex => { }

30
server/graph/resolvers/page.js
Unescape View File

@ -82,6 +82,7 @@ module.exports = {
'description',
'isPublished',
'orderPriority',
'icon',
'isPrivate',
'privateNS',
'contentType',
@ -284,35 +285,6 @@ module.exports = {
}
}).orderBy([{ column: 'isFolder', order: 'desc' }, 'orderPriority'])
// // Ruslan: Custom sorting for "Tree Navigation" for folder "Users"
// const emojiRegex = /^[\u{1F300}-\u{1F6FF}\u{1F900}-\u{1F9FF}\u{2600}-\u{26FF}\u{2700}-\u{27BF}]/u
// const russianRegex = /[\u0400-\u04FF]/
//
// const userPrefix = 'Users/'
// results.sort((a, b) => {
// if (a.isFolder !== b.isFolder) {
// return b.isFolder - a.isFolder
// }
//
// if (a.path.startsWith(userPrefix) || a.path.startsWith(userPrefix)) {
// // Emoji first
// const aIsEmoji = emojiRegex.test(a.title)
// const bIsEmoji = emojiRegex.test(b.title)
//
// if (aIsEmoji && !bIsEmoji) return -1
// if (!aIsEmoji && bIsEmoji) return 1
//
// // Russian second, only by first letter due to title must contain russian + english
// const aIsRussian = russianRegex.test(a.title[0])
// const bIsRussian = russianRegex.test(b.title[1])
//
// if (aIsRussian && !bIsRussian) return -1
// if (!aIsRussian && bIsRussian) return 1
// }
//
// return a.title.localeCompare(b.title)
// })
return results.filter(r => {
return WIKI.auth.checkAccess(context.req.user, ['read:pages'], {
path: r.path,

5
server/graph/schemas/page.graphql
Unescape View File

@ -285,7 +285,8 @@ type PageListItem {
title: String
description: String
contentType: String!
orderPriority: Int
orderPriority: Int!
icon: String!
isPublished: Boolean!
isPrivate: Boolean!
privateNS: String
@ -298,6 +299,8 @@ type PageTreeItem {
id: Int!
path: String!
depth: Int!
orderPriority: Int!
icon: String!
title: String!
isPrivate: Boolean!
isFolder: Boolean!

3
server/jobs/rebuild-tree.js
Unescape View File

@ -10,7 +10,7 @@ module.exports = async (pageId) => {
await WIKI.configSvc.loadFromDb()
await WIKI.configSvc.applyFlags()
const pages = await WIKI.models.pages.query().select('id', 'path', 'localeCode', 'orderPriority', 'title', 'isPrivate', 'privateNS').orderBy(['localeCode', 'path'])
const pages = await WIKI.models.pages.query().select('id', 'path', 'localeCode', 'orderPriority', 'icon', 'title', 'isPrivate', 'privateNS').orderBy(['localeCode', 'path'])
let tree = []
let pik = 0
@ -33,6 +33,7 @@ module.exports = async (pageId) => {
tree.push({
id: pik,
orderPriority: page.orderPriority,
icon: page.icon,
localeCode: page.localeCode,
path: currentPath,
depth: depth,

Write Preview
Loading…
Cancel
Save