Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
f27c1e86
You need to sign in or sign up before continuing.
Commit
f27c1e86
authored
Feb 17, 2018
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: editor-modal-document UI
parent
c9b6d0ee
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
66 additions
and
27 deletions
+66
-27
.babelrc
.babelrc
+1
-7
index.js
client/index.js
+1
-1
app.js
client/js/app.js
+2
-12
editor-code.vue
client/js/components/editor-code.vue
+25
-7
editor-modal-document.vue
client/js/components/editor-modal-document.vue
+37
-0
No files found.
.babelrc
View file @
f27c1e86
...
@@ -2,13 +2,7 @@
...
@@ -2,13 +2,7 @@
"comments": true,
"comments": true,
"plugins": [
"plugins": [
"lodash",
"lodash",
"graphql-tag",
"graphql-tag"
["transform-imports", {
"vuetify": {
"transform": "vuetify/es5/components/${member}",
"preventFullImport": true
}
}]
],
],
"presets": [
"presets": [
["env"],
["env"],
...
...
client/index.js
View file @
f27c1e86
'use strict'
'use strict'
require
(
'vuetify/src/stylus/
app
.styl'
)
require
(
'vuetify/src/stylus/
main
.styl'
)
require
(
'./scss/app.scss'
)
require
(
'./scss/app.scss'
)
require
(
'./js/compatibility.js'
)
require
(
'./js/compatibility.js'
)
require
(
'offline-plugin/runtime'
).
install
()
require
(
'offline-plugin/runtime'
).
install
()
...
...
client/js/app.js
View file @
f27c1e86
...
@@ -13,7 +13,7 @@ import { ApolloLink } from 'apollo-link'
...
@@ -13,7 +13,7 @@ import { ApolloLink } from 'apollo-link'
import
{
createApolloFetch
}
from
'apollo-fetch'
import
{
createApolloFetch
}
from
'apollo-fetch'
import
{
BatchHttpLink
}
from
'apollo-link-batch-http'
import
{
BatchHttpLink
}
from
'apollo-link-batch-http'
import
{
InMemoryCache
}
from
'apollo-cache-inmemory'
import
{
InMemoryCache
}
from
'apollo-cache-inmemory'
import
{
Vuetify
,
VApp
,
VBtn
,
VIcon
,
VList
,
VMenu
,
VSpeedDial
,
VTooltip
}
from
'vuetify'
import
Vuetify
from
'vuetify'
import
Hammer
from
'hammerjs'
import
Hammer
from
'hammerjs'
import
store
from
'./store'
import
store
from
'./store'
...
@@ -93,17 +93,7 @@ Vue.use(VeeValidate, {
...
@@ -93,17 +93,7 @@ Vue.use(VeeValidate, {
dirty
:
'is-dirty'
// control has been interacted with
dirty
:
'is-dirty'
// control has been interacted with
}
}
})
})
Vue
.
use
(
Vuetify
,
{
Vue
.
use
(
Vuetify
)
components
:
{
VApp
,
VBtn
,
VIcon
,
VList
,
VMenu
,
VSpeedDial
,
VTooltip
}
})
// ====================================
// ====================================
// Register Vue Components
// Register Vue Components
...
...
client/js/components/editor-code.vue
View file @
f27c1e86
...
@@ -75,13 +75,13 @@
...
@@ -75,13 +75,13 @@
v-btn(color='blue', fab, dark, slot='activator')
v-btn(color='blue', fab, dark, slot='activator')
v-icon more_horiz
v-icon more_horiz
v-icon close
v-icon close
v-btn(color='blue-grey', fab, dark): v-icon sort_by_alpha
v-btn(color='blue-grey', fab, dark
, @click='documentPropsDialog = !documentPropsDialog'
): v-icon sort_by_alpha
v-btn(color='green', fab, dark): v-icon save
v-btn(color='green', fab, dark): v-icon save
v-btn(color='red', fab, dark, small): v-icon not_interested
v-btn(color='red', fab, dark, small): v-icon not_interested
v-btn(color='orange', fab, dark, small): v-icon vpn_lock
v-btn(color='orange', fab, dark, small): v-icon vpn_lock
v-btn(color='indigo', fab, dark, small): v-icon restore
v-btn(color='indigo', fab, dark, small): v-icon restore
v-btn(color='brown', fab, dark, small): v-icon archive
v-btn(color='brown', fab, dark, small): v-icon archive
editorModalDocument(:is-opened='documentPropsDialog')
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -89,15 +89,12 @@ import { codemirror } from 'vue-codemirror'
...
@@ -89,15 +89,12 @@ import { codemirror } from 'vue-codemirror'
import
'codemirror/lib/codemirror.css'
import
'codemirror/lib/codemirror.css'
// Theme
// Theme
import
'codemirror/theme/base16-dark.css'
import
'codemirror/theme/base16-dark.css'
// Language
// Language
import
'codemirror/mode/markdown/markdown.js'
import
'codemirror/mode/markdown/markdown.js'
// Addons
// Addons
import
'codemirror/addon/selection/active-line.js'
import
'codemirror/addon/selection/active-line.js'
import
'codemirror/addon/display/fullscreen.js'
import
'codemirror/addon/display/fullscreen.js'
import
'codemirror/addon/display/fullscreen.css'
import
'codemirror/addon/display/fullscreen.css'
...
@@ -109,7 +106,8 @@ import 'codemirror/addon/search/match-highlighter.js'
...
@@ -109,7 +106,8 @@ import 'codemirror/addon/search/match-highlighter.js'
export
default
{
export
default
{
components
:
{
components
:
{
codemirror
codemirror
,
editorModalDocument
:
()
=>
import
(
/* webpackChunkName: "editor" */
'./editor-modal-document.vue'
)
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -134,7 +132,8 @@ export default {
...
@@ -134,7 +132,8 @@ export default {
if
(
cm
.
getOption
(
'fullScreen'
))
cm
.
setOption
(
'fullScreen'
,
false
)
if
(
cm
.
getOption
(
'fullScreen'
))
cm
.
setOption
(
'fullScreen'
,
false
)
}
}
}
}
}
},
documentPropsDialog
:
false
}
}
},
},
computed
:
{
computed
:
{
...
@@ -281,6 +280,25 @@ export default {
...
@@ -281,6 +280,25 @@ export default {
.CodeMirror
{
.CodeMirror
{
height
:
auto
;
height
:
auto
;
.cm-header-1
{
font-size
:
1
.5rem
;
}
.cm-header-2
{
font-size
:
1
.25rem
;
}
.cm-header-3
{
font-size
:
1
.15rem
;
}
.cm-header-4
{
font-size
:
1
.1rem
;
}
.cm-header-5
{
font-size
:
1
.05rem
;
}
.cm-header-6
{
font-size
:
1
.025rem
;
}
}
}
.CodeMirror-focused
.cm-matchhighlight
{
.CodeMirror-focused
.cm-matchhighlight
{
...
...
client/js/components/editor-modal-document.vue
0 → 100644
View file @
f27c1e86
<
template
lang=
'pug'
>
v-bottom-sheet(v-model='isOpened', inset)
v-toolbar(color='blue-grey', flat)
v-icon(color='white') sort_by_alpha
v-toolbar-title.white--text Document Properties
v-spacer
v-btn(icon, dark)
v-icon close
v-card.pa-3(tile)
v-card-text
v-form
v-text-field(label='Title', autofocus, loading='primary')
v-text-field(label='Short Description')
v-card-actions
v-btn(color='green', dark) Save
v-btn Cancel
</
template
>
<
script
>
export
default
{
props
:
{
isOpened
:
{
type
:
Boolean
,
default
:
false
}
},
data
()
{
return
{
}
}
}
</
script
>
<
style
lang=
'scss'
>
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment