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
3c637183
You need to sign in or sign up before continuing.
Commit
3c637183
authored
Apr 08, 2017
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactored install + handle long code lines + fuse skip ace
parent
f6e8e91f
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
173 additions
and
117 deletions
+173
-117
markdown-content.scss
client/scss/components/markdown-content.scss
+14
-0
auth.js
controllers/auth.js
+1
-1
fuse.js
fuse.js
+17
-8
install.js
npm/install.js
+140
-107
view.pug
views/pages/view.pug
+1
-1
No files found.
client/scss/components/markdown-content.scss
View file @
3c637183
.has-mkcontent
{
width
:
100%
;
overflow
:hidden
;
.columns
,
.column
{
width
:
100%
;
overflow
:
hidden
;
}
}
.mkcontent
{
.mkcontent
{
font-size
:
14px
;
font-size
:
14px
;
color
:
mc
(
'grey'
,
'700'
);
color
:
mc
(
'grey'
,
'700'
);
padding
:
0
0
20px
0
;
padding
:
0
0
20px
0
;
width
:
100%
;
overflow
:
hidden
;
h1
,
h2
,
h3
{
h1
,
h2
,
h3
{
font-weight
:
400
;
font-weight
:
400
;
...
@@ -243,6 +256,7 @@
...
@@ -243,6 +256,7 @@
padding
:
20px
20px
20px
13px
;
padding
:
20px
20px
20px
13px
;
font-family
:
$core-font-monospace
;
font-family
:
$core-font-monospace
;
white-space
:
pre
;
white-space
:
pre
;
overflow-x
:
scroll
;
>
code
{
>
code
{
border-radius
:
5px
;
border-radius
:
5px
;
...
...
controllers/auth.js
View file @
3c637183
...
@@ -66,7 +66,7 @@ router.post('/login', bruteforce.prevent, function (req, res, next) {
...
@@ -66,7 +66,7 @@ router.post('/login', bruteforce.prevent, function (req, res, next) {
req
.
brute
.
reset
(
function
()
{
req
.
brute
.
reset
(
function
()
{
return
res
.
redirect
(
'/'
)
return
res
.
redirect
(
'/'
)
})
})
})
})
||
true
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
// LOGIN FAIL
// LOGIN FAIL
if
(
err
.
message
===
'INVALID_LOGIN'
)
{
if
(
err
.
message
===
'INVALID_LOGIN'
)
{
...
...
fuse.js
View file @
3c637183
...
@@ -70,15 +70,24 @@ console.info(colors.white('└── ') + colors.green('Running global tasks...'
...
@@ -70,15 +70,24 @@ console.info(colors.white('└── ') + colors.green('Running global tasks...'
let
globalTasks
=
Promise
.
mapSeries
([
let
globalTasks
=
Promise
.
mapSeries
([
()
=>
{
()
=>
{
console
.
info
(
colors
.
white
(
' └── '
)
+
colors
.
green
(
'Copy + Minify ACE modes to assets...'
))
fs
.
accessAsync
(
'./assets/js/ace'
).
then
(()
=>
{
return
fs
.
ensureDirAsync
(
'./assets/js/ace'
).
then
(()
=>
{
console
.
info
(
colors
.
white
(
' └── '
)
+
colors
.
magenta
(
'ACE modes directory already exists. Task aborted.'
))
return
fs
.
readdirAsync
(
'./node_modules/brace/mode'
).
then
(
modeList
=>
{
return
true
return
Promise
.
map
(
modeList
,
mdFile
=>
{
}).
catch
(
err
=>
{
console
.
info
(
colors
.
white
(
' mode-'
+
mdFile
))
if
(
err
.
code
===
'ENOENT'
)
{
let
result
=
uglify
.
minify
(
path
.
join
(
'./node_modules/brace/mode'
,
mdFile
),
{
output
:
{
'max_line_len'
:
1000000
}
})
console
.
info
(
colors
.
white
(
' └── '
)
+
colors
.
green
(
'Copy + Minify ACE modes to assets...'
))
return
fs
.
writeFileAsync
(
path
.
join
(
'./assets/js/ace'
,
'mode-'
+
mdFile
),
result
.
code
)
return
fs
.
ensureDirAsync
(
'./assets/js/ace'
).
then
(()
=>
{
return
fs
.
readdirAsync
(
'./node_modules/brace/mode'
).
then
(
modeList
=>
{
return
Promise
.
map
(
modeList
,
mdFile
=>
{
console
.
info
(
colors
.
white
(
' mode-'
+
mdFile
))
let
result
=
uglify
.
minify
(
path
.
join
(
'./node_modules/brace/mode'
,
mdFile
),
{
output
:
{
'max_line_len'
:
1000000
}
})
return
fs
.
writeFileAsync
(
path
.
join
(
'./assets/js/ace'
,
'mode-'
+
mdFile
),
result
.
code
)
})
})
})
})
})
}
else
{
throw
err
}
})
})
}
}
],
f
=>
{
return
f
()
})
],
f
=>
{
return
f
()
})
...
...
npm/install.js
View file @
3c637183
This diff is collapsed.
Click to expand it.
views/pages/view.pug
View file @
3c637183
...
@@ -29,7 +29,7 @@ block rootNavRight
...
@@ -29,7 +29,7 @@ block rootNavRight
block content
block content
#page-type-view(data-entrypath=pageData.meta.path)
#page-type-view(data-entrypath=pageData.meta.path)
.container.is-fluid
.container.is-fluid
.has-mkcontent
.columns.is-gapless
.columns.is-gapless
.column.is-narrow.is-hidden-touch.sidebar
.column.is-narrow.is-hidden-touch.sidebar
...
...
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