Skip to content

Commit bc12db7

Browse files
NGPixelNGPixel
committed
feat: admin rendering UI + contribute i18n
1 parent 4643336 commit bc12db7

File tree

14 files changed

+285
-58
lines changed

14 files changed

+285
-58
lines changed

‎client/components/admin/admin-contribute.vue

+21-30
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,43 @@
11
<template lang='pug'>
22
v-card(flat)
33
v-card(flat, tile, :color='$vuetify.dark ? "grey darken-4" : "grey lighten-5"').pa-3.pt-4
4-
.headline.primary--text Contribute
5-
.subheading.grey--text Help support Wiki.js development and operations
4+
.headline.primary--text {{ $t('admin:contribute.title') }}
5+
.subheading.grey--text {{ $t('admin:contribute.subtitle') }}
66
v-card.pa-3
7-
.body-1.pl-3 Wiki.js is a #[strong free and open-source software] brought to you with #[v-icon(color='red') favorite] by #[a(href='https://requarks.io', target='_blank') requarks.io] and #[a(href='https://github.com/Requarks/wiki/graphs/contributors', target='_blank') contributors].
8-
.body-1.pt-3.pl-3 We need your help to keep improving the software and run the various associated services (e.g. hosting and networking).
7+
i18next.body-1.pl-3(path='admin:contribute.openSource', tag='div')
8+
v-icon(color='red') favorite
9+
a(href='https://requarks.io', target='_blank') requarks.io
10+
a(href='https://github.com/Requarks/wiki/graphs/contributors', target='_blank') {{ $t('admin:contribute.openSourceContributors') }}
11+
.body-1.pt-3.pl-3 {{ $t('admin:contribute.needYourHelp') }}
912
v-divider
10-
v-subheader Fund our work
11-
.body-1.pl-3 Wiki.js is part of the Open Collective initiative. You can contribute financially by making a monthly or one-time donation:
13+
v-subheader {{ $t('admin:contribute.fundOurWork') }}
14+
.body-1.pl-3 {{ $t('admin:contribute.openCollective') }}
1215
v-card-actions.mt-3.ml-2
1316
v-btn(depressed, color='primary', href='https://opencollective.com/wikijs')
1417
v-icon(left) local_atm
15-
| Make a donation
18+
span {{ $t('admin:contribute.makeADonation') }}
1619
v-divider
17-
v-subheader Contribute
20+
v-subheader {{ $t('admin:contribute.contribute') }}
1821
.body-1.pl-3
1922
ul
20-
li Submit an idea or vote on a proposed one on the #[a(href='https://requests.requarks.io/wiki', target='_blank') feature requests board].
21-
li Found a bug? Submit an issue on #[a(href='https://github.com/Requarks/wiki/issues', target='_blank') Github].
22-
li Help translate Wiki.js in your language. Let us know on #[a(href='https://gitter.im/Requarks/wiki', target='_blank') Gitter].
23+
i18next(path='admin:contribute.submitAnIdea', tag='li')
24+
a(href='https://requests.requarks.io/wiki', target='_blank') {{ $t('admin:contribute.submitAnIdeaLink') }}
25+
i18next(path='admin:contribute.foundABug', tag='li')
26+
a(href='https://github.com/Requarks/wiki/issues', target='_blank') Github
27+
i18next(path='admin:contribute.helpTranslate', tag='li')
28+
a(href='https://gitter.im/Requarks/wiki', target='_blank') Gitter
2329
v-divider
24-
v-subheader Spread the word
30+
v-subheader {{ $t('admin:contribute.spreadTheWord') }}
2531
.body-1.pl-3
2632
ul
27-
li Talk to your friends and colleagues about how awesome Wiki.js is!
28-
li Follow us on #[a(href='https://twitter.com/requarks', target='_blank') Twitter].
33+
li {{ $t('admin:contribute.talkToFriends') }}
34+
i18next(path='admin:contribute.followUsOnTwitter', tag='li')
35+
a(href='https://twitter.com/requarks', target='_blank') Twitter
2936

3037
</template>
3138

3239
<script>
33-
import IconGithubCircle from 'mdi/github-circle'
34-
3540
export default {
36-
components: {
37-
IconGithubCircle
38-
},
39-
data() {
40-
return {
41-
tab: '0',
42-
telemetry: true
43-
}
44-
},
45-
methods: {
46-
resetClientID() {
47-
48-
}
49-
}
5041
}
5142
</script>
5243

‎client/components/admin/admin-rendering.vue

+199-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,212 @@
11
<template lang='pug'>
2-
v-container(fluid, fill-height)
2+
v-container(fluid, fill-height, grid-list-lg)
33
v-layout(row wrap)
44
v-flex(xs12)
55
.headline.primary--text Rendering
66
.subheading.grey--text Configure how content is rendered
7+
v-layout.mt-3(row wrap)
8+
v-flex(lg3 xs12)
9+
v-card
10+
v-toolbar(
11+
color='primary'
12+
dense
13+
flat
14+
dark
15+
)
16+
v-icon.mr-2 line_weight
17+
.subheading Pipeline
18+
v-toolbar(
19+
color='blue'
20+
dense
21+
dark
22+
)
23+
v-icon.mr-2 arrow_downward
24+
.body-2 Markdown
25+
v-spacer
26+
v-btn(
27+
icon
28+
@click=''
29+
)
30+
v-icon add
31+
v-list(two-line, dense)
32+
v-list-tile(avatar)
33+
v-list-tile-avatar
34+
v-icon(color='grey') crop_free
35+
v-list-tile-content
36+
v-list-tile-title Core
37+
v-list-tile-sub-title Basic Markdown parser
38+
v-list-tile-avatar
39+
v-icon(color='green', small) lens
40+
v-divider.my-0
41+
v-list-tile(avatar)
42+
v-list-tile-avatar
43+
v-icon(color='grey') tag_faces
44+
v-list-tile-content
45+
v-list-tile-title Emoji
46+
v-list-tile-sub-title Convert tags to emojis
47+
v-list-tile-avatar
48+
v-icon(color='green', small) lens
49+
v-divider.my-0
50+
v-list-tile(avatar)
51+
v-list-tile-avatar
52+
v-icon(color='grey') list
53+
v-list-tile-content
54+
v-list-tile-title Task Lists
55+
v-list-tile-sub-title Parse task lists to checkboxes
56+
v-list-tile-avatar
57+
v-icon(color='green', small) lens
58+
v-divider.my-0
59+
v-list-tile(avatar)
60+
v-list-tile-avatar
61+
v-icon(color='grey') multiline_chart
62+
v-list-tile-content
63+
v-list-tile-title PlantUML
64+
v-list-tile-sub-title Generate diagrams from PlantUML syntax
65+
v-list-tile-avatar
66+
v-icon(color='green', small) lens
67+
v-divider.my-0
68+
v-list-tile(avatar)
69+
v-list-tile-avatar
70+
v-icon(color='grey') merge_type
71+
v-list-tile-content
72+
v-list-tile-title Mermaid
73+
v-list-tile-sub-title Generate flowcharts from Mermaid syntax
74+
v-list-tile-avatar
75+
v-icon(color='green', small) lens
76+
v-divider.my-0
77+
v-list-tile(avatar)
78+
v-list-tile-avatar
79+
v-icon(color='grey') functions
80+
v-list-tile-content
81+
v-list-tile-title Mathjax Pre-Processor
82+
v-list-tile-sub-title Parse Mathjax content from Markdown
83+
v-list-tile-avatar
84+
v-icon(color='red', small) trip_origin
85+
86+
v-toolbar(
87+
color='blue'
88+
dense
89+
dark
90+
)
91+
v-icon.mr-2 arrow_downward
92+
.body-2 HTML
93+
v-spacer
94+
v-btn(
95+
icon
96+
@click=''
97+
)
98+
v-icon add
99+
v-list(two-line, dense)
100+
v-list-tile(avatar)
101+
v-list-tile-avatar
102+
v-icon(color='grey') subscriptions
103+
v-list-tile-content
104+
v-list-tile-title Video Players
105+
v-list-tile-sub-title Embed video players such as Youtube, Vimeo, etc.
106+
v-list-tile-avatar
107+
v-icon(color='green', small) lens
108+
v-divider.my-0
109+
v-list-tile(avatar)
110+
v-list-tile-avatar
111+
v-icon(color='grey') subtitles
112+
v-list-tile-content
113+
v-list-tile-title Asciinema
114+
v-list-tile-sub-title Embed asciinema players from compatible links
115+
v-list-tile-avatar
116+
v-icon(color='green', small) lens
117+
v-divider.my-0
118+
v-list-tile(avatar)
119+
v-list-tile-avatar
120+
v-icon(color='grey') volume_up
121+
v-list-tile-content
122+
v-list-tile-title Audio Players
123+
v-list-tile-sub-title Embed audio players for audio content
124+
v-list-tile-avatar
125+
v-icon(color='green', small) lens
126+
v-divider.my-0
127+
v-list-tile(avatar)
128+
v-list-tile-avatar
129+
v-icon(color='grey') insert_comment
130+
v-list-tile-content
131+
v-list-tile-title Blockquotes
132+
v-list-tile-sub-title Process styled blockquotes
133+
v-list-tile-avatar
134+
v-icon(color='green', small) lens
135+
v-divider.my-0
136+
v-list-tile(avatar)
137+
v-list-tile-avatar
138+
v-icon(color='grey') functions
139+
v-list-tile-content
140+
v-list-tile-title Mathjax Processor
141+
v-list-tile-sub-title TeX/MathML Math Equations Parser
142+
v-list-tile-avatar
143+
v-icon(color='red', small) trip_origin
144+
145+
v-flex(lg9 xs12)
146+
v-card
147+
v-toolbar(
148+
color='grey darken-1'
149+
dark
150+
flat
151+
dense
152+
)
153+
v-icon.mr-2 settings_applications
154+
.subheading Markdown
155+
v-icon chevron_right
156+
.subheading Core
157+
v-spacer
158+
v-btn(flat, disabled)
159+
v-icon(left) wrap_text
160+
span Bypass
161+
v-btn(flat, disabled)
162+
v-icon(left) clear
163+
span Remove
164+
v-card-text
165+
v-switch(
166+
v-model='linkify'
167+
label='Automatically convert links'
168+
color='primary'
169+
persistent-hint
170+
hint='Links will automatically be converted to clickable links.'
171+
)
172+
v-divider
173+
v-switch(
174+
v-model='linkify'
175+
label='Automatically convert line breaks'
176+
color='primary'
177+
persistent-hint
178+
hint='Add linebreaks within paragraphs.'
179+
)
180+
v-divider
181+
v-switch(
182+
v-model='linkify'
183+
label='Highlight code blocks'
184+
color='primary'
185+
persistent-hint
186+
hint='Add syntax coloring to code blocks.'
187+
)
188+
v-select.mt-3(
189+
:items='["Light", "Dark"]'
190+
v-model='codeTheme'
191+
label='Code Color Theme'
192+
outline
193+
background-color='grey lighten-2'
194+
)
195+
v-card-chin
196+
v-btn(
197+
color='primary'
198+
)
199+
v-icon(left) check
200+
span Apply Configuration
7201
</template>
8202

9203
<script>
10204
export default {
11205
data() {
12-
return {}
206+
return {
207+
linkify: true,
208+
codeTheme: 'Light'
209+
}
13210
}
14211
}
15212
</script>

‎client/components/login.vue

+9-8
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
.login-frame(v-show='screen === "login"')
1414
h1.text-xs-center.display-1 {{ siteTitle }}
1515
h2.text-xs-center.subheading {{ $t('auth:loginRequired') }}
16-
v-text-field(solo, ref='iptEmail', v-model='username', :placeholder='$t("auth:fields.emailUser")')
16+
v-text-field(solo, hide-details, ref='iptEmail', v-model='username', :placeholder='$t("auth:fields.emailUser")')
1717
v-text-field.mt-2(
18-
solo,
19-
ref='iptPassword',
20-
v-model='password',
21-
:append-icon='hidePassword ? "visibility" : "visibility_off"',
22-
:append-icon-cb='() => (hidePassword = !hidePassword)',
23-
:type='hidePassword ? "password" : "text"',
24-
:placeholder='$t("auth:fields.password")',
18+
solo
19+
hide-details
20+
ref='iptPassword'
21+
v-model='password'
22+
:append-icon='hidePassword ? "visibility" : "visibility_off"'
23+
:append-icon-cb='() => (hidePassword = !hidePassword)'
24+
:type='hidePassword ? "password" : "text"'
25+
:placeholder='$t("auth:fields.password")'
2526
@keyup.enter='login'
2627
)
2728
v-btn.mt-3(block, large, color='primary', @click='login') {{ $t('auth:actions.login') }}

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@
234234
"vue-router": "3.0.1",
235235
"vue-simple-breakpoints": "1.0.3",
236236
"vue-template-compiler": "2.5.16",
237+
"vuedraggable": "2.16.0",
237238
"vuetify": "1.1.1",
238239
"vuex": "3.0.1",
239240
"vuex-persistedstate": "2.5.4",

‎server/modules/storage/azure.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ module.exports = {
66
accountKey: String,
77
container: String
88
},
9-
activate() {
9+
activated(opts) {
1010

1111
},
12-
deactivate() {
12+
deactivated(opts) {
13+
14+
},
15+
init(opts) {
1316

1417
},
1518
created(opts) {

‎server/modules/storage/digitalocean.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ module.exports = {
1010
},
1111
bucket: String
1212
},
13-
activate() {
13+
activated(opts) {
1414

1515
},
16-
deactivate() {
16+
deactivated(opts) {
17+
18+
},
19+
init(opts) {
1720

1821
},
1922
created(opts) {

‎server/modules/storage/disk.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ module.exports = {
44
props: {
55
path: String
66
},
7-
activate() {
7+
activated(opts) {
88

99
},
10-
deactivate() {
10+
deactivated(opts) {
11+
12+
},
13+
init(opts) {
1114

1215
},
1316
created(opts) {

‎server/modules/storage/dropbox.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ module.exports = {
55
appKey: String,
66
appSecret: String
77
},
8-
activate() {
8+
activated(opts) {
99

1010
},
11-
deactivate() {
11+
deactivated(opts) {
12+
13+
},
14+
init(opts) {
1215

1316
},
1417
created(opts) {

0 commit comments

Comments
 (0)