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
0fd681c1
Commit
0fd681c1
authored
Mar 19, 2019
by
Nick
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: code lint
parent
343d4db0
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
31 additions
and
168 deletions
+31
-168
.gitignore
.gitignore
+2
-0
search-results.vue
client/components/common/search-results.vue
+9
-9
register.vue
client/components/register.vue
+2
-4
reset.scss
client/scss/base/reset.scss
+0
-138
v-dialog.scss
client/scss/components/v-dialog.scss
+8
-8
auth.js
server/core/auth.js
+4
-4
userKeys.js
server/models/userKeys.js
+0
-4
setup.js
server/setup.js
+1
-1
sonar-project.properties
sonar-project.properties
+5
-0
No files found.
.gitignore
View file @
0fd681c1
...
...
@@ -14,6 +14,7 @@ npm/node_modules
.npm
.node_repl_history
npm-debug.log*
.yarn
# Generated assets
/assets
...
...
@@ -41,6 +42,7 @@ server/views/setup.pug
# Test results
test-results/
.scannerwork
# Localization Resources
/server/locales/**/*.yml
client/components/common/search-results.vue
View file @
0fd681c1
...
...
@@ -55,7 +55,7 @@
<
script
>
import
_
from
'lodash'
import
{
get
,
sync
}
from
'vuex-pathify'
import
{
sync
}
from
'vuex-pathify'
import
{
OrbitSpinner
}
from
'epic-spinners'
import
searchPagesQuery
from
'gql/common/common-pages-query-search.gql'
...
...
@@ -105,14 +105,6 @@ export default {
}
}
},
methods
:
{
setSearchTerm
(
term
)
{
this
.
search
=
term
},
goToPage
(
item
)
{
window
.
location
.
assign
(
`/
${
item
.
locale
}
/
${
item
.
path
}
`
)
}
},
mounted
()
{
this
.
$root
.
$on
(
'searchMove'
,
(
dir
)
=>
{
this
.
cursor
+=
(
dir
===
'up'
?
-
1
:
1
)
...
...
@@ -130,6 +122,14 @@ export default {
}
})
},
methods
:
{
setSearchTerm
(
term
)
{
this
.
search
=
term
},
goToPage
(
item
)
{
window
.
location
.
assign
(
`/
${
item
.
locale
}
/
${
item
.
path
}
`
)
}
},
apollo
:
{
response
:
{
query
:
searchPagesQuery
,
...
...
client/components/register.vue
View file @
0fd681c1
...
...
@@ -98,7 +98,6 @@
/* global siteConfig */
import
_
from
'lodash'
import
Cookies
from
'js-cookie'
import
validate
from
'validate.js'
import
PasswordStrength
from
'./common/password-strength.vue'
...
...
@@ -134,7 +133,6 @@ export default {
this
.
isShown
=
true
this
.
$nextTick
(()
=>
{
this
.
$refs
.
iptEmail
.
focus
()
})
},
methods
:
{
...
...
@@ -184,11 +182,11 @@ export default {
tooShort
:
this
.
$t
(
'auth:nameTooShort'
),
tooLong
:
this
.
$t
(
'auth:nameTooLong'
)
}
}
,
}
},
{
fullMessages
:
false
})
if
(
validation
)
{
if
(
validation
.
email
)
{
if
(
validation
.
email
)
{
this
.
$store
.
commit
(
'showNotification'
,
{
style
:
'red'
,
message
:
validation
.
email
[
0
],
...
...
client/scss/base/reset.scss
deleted
100644 → 0
View file @
343d4db0
/*
HTML5 Reset :: style.css
----------------------------------------------------------
We have learned much from/been inspired by/taken code where offered from:
Eric Meyer :: http://meyerweb.com
HTML5 Doctor :: http://html5doctor.com
and the HTML5 Boilerplate :: http://html5boilerplate.com
-------------------------------------------------------------------------------*/
/* Let's default this puppy out
-------------------------------------------------------------------------------*/
html
,
body
,
body
div
,
span
,
object
,
iframe
,
h1
,
h2
,
h3
,
h4
,
h5
,
h6
,
p
,
blockquote
,
pre
,
abbr
,
address
,
cite
,
code
,
del
,
dfn
,
em
,
img
,
ins
,
kbd
,
q
,
samp
,
small
,
strong
,
sub
,
sup
,
var
,
b
,
i
,
dl
,
dt
,
dd
,
ol
,
ul
,
li
,
fieldset
,
form
,
label
,
legend
,
table
,
caption
,
tbody
,
tfoot
,
thead
,
tr
,
th
,
td
,
article
,
aside
,
figure
,
footer
,
header
,
menu
,
nav
,
section
,
time
,
mark
,
audio
,
video
,
details
,
summary
{
margin
:
0
;
padding
:
0
;
border
:
0
;
font-size
:
100%
;
font-weight
:
normal
;
vertical-align
:
baseline
;
background
:
transparent
;
}
main
,
article
,
aside
,
figure
,
footer
,
header
,
nav
,
section
,
details
,
summary
{
display
:
block
;}
/* Handle box-sizing while better addressing child elements:
http://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ */
html
{
box-sizing
:
border-box
;
}
*,
*
:before
,
*
:after
{
box-sizing
:
inherit
;
}
/* consider resetting the default cursor: https://gist.github.com/murtaugh/5247154 */
/* Responsive images and other embedded objects */
/* if you don't have full control over `img` tags (if you have to overcome attributes), consider adding height: auto */
img
,
object
,
embed
{
max-width
:
100%
;}
/*
Note: keeping IMG here will cause problems if you're using foreground images as sprites.
In fact, it *will* cause problems with Google Maps' controls at small size.
If this is the case for you, try uncommenting the following:
#map img {
max-width: none;
}
*/
/* force a vertical scrollbar to prevent a jumpy page */
html
{
overflow-y
:
scroll
;}
/* we use a lot of ULs that aren't bulleted.
you'll have to restore the bullets within content,
which is fine because they're probably customized anyway */
ul
{
list-style
:
none
;}
blockquote
,
q
{
quotes
:
none
;}
blockquote
:before
,
blockquote
:after
,
q
:before
,
q
:after
{
content
:
''
;
content
:
none
;}
a
{
margin
:
0
;
padding
:
0
;
font-size
:
100%
;
vertical-align
:
baseline
;
background
:
transparent
;}
del
{
text-decoration
:
line-through
;}
abbr
[
title
],
dfn
[
title
]
{
border-bottom
:
1px
dotted
#000
;
cursor
:
help
;}
/* tables still need cellspacing="0" in the markup */
table
{
border-collapse
:
separate
;
border-spacing
:
0
;}
th
{
font-weight
:
bold
;
vertical-align
:
bottom
;}
td
{
font-weight
:
normal
;
vertical-align
:
top
;}
hr
{
display
:
block
;
height
:
1px
;
border
:
0
;
border-top
:
1px
solid
#ccc
;
margin
:
1em
0
;
padding
:
0
;}
input
,
select
{
vertical-align
:
middle
;}
pre
{
white-space
:
pre
;
/* CSS2 */
white-space
:
pre-wrap
;
/* CSS 2.1 */
white-space
:
pre-line
;
/* CSS 3 (and 2.1 as well, actually) */
word-wrap
:
break-word
;
/* IE */
}
input
[
type
=
"radio"
]
{
vertical-align
:
text-bottom
;}
input
[
type
=
"checkbox"
]
{
vertical-align
:
bottom
;}
.ie7
input
[
type
=
"checkbox"
]
{
vertical-align
:
baseline
;}
.ie6
input
{
vertical-align
:
text-bottom
;}
select
,
input
,
textarea
{
font
:
99%
sans-serif
;}
table
{
font-size
:
inherit
;
font
:
100%
;}
small
{
font-size
:
85%
;}
strong
{
font-weight
:
bold
;}
td
,
td
img
{
vertical-align
:
top
;}
/* Make sure sup and sub don't mess with your line-heights http://gist.github.com/413930 */
sub
,
sup
{
font-size
:
75%
;
line-height
:
0
;
position
:
relative
;}
sup
{
top
:
-0
.5em
;}
sub
{
bottom
:
-0
.25em
;}
/* standardize any monospaced elements */
pre
,
code
,
kbd
,
samp
{
font-family
:
monospace
,
sans-serif
;}
/* hand cursor on clickable elements */
.clickable
,
label
,
input
[
type
=
button
],
input
[
type
=
submit
],
input
[
type
=
file
],
button
{
cursor
:
pointer
;}
/* Webkit browsers add a 2px margin outside the chrome of form elements */
button
,
input
,
select
,
textarea
{
margin
:
0
;}
/* make buttons play nice in IE */
button
,
input
[
type
=
button
]
{
width
:
auto
;
overflow
:
visible
;}
/* scale images in IE7 more attractively */
.ie7
img
{
-ms-interpolation-mode
:
bicubic
;}
/* prevent BG image flicker upon hover
(commented out as usage is rare, and the filter syntax messes with some pre-processors)
.ie6 html {filter: expression(document.execCommand("BackgroundImageCache", false, true));}
*/
/* let's clear some floats */
.clearfix
:after
{
content
:
" "
;
display
:
block
;
clear
:
both
;
}
client/scss/components/v-dialog.scss
View file @
0fd681c1
.dialog-header
{
background-color
:
mc
(
'blue'
,
'700'
);
background
:
radial-gradient
(
ellipse
at
top
,
mc
(
'blue'
,
'500'
)
,
mc
(
'blue'
,
'700'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'blue'
,
'800'
)
,
mc
(
'blue'
,
'700'
));
background
-image
:
radial-gradient
(
ellipse
at
top
,
mc
(
'blue'
,
'500'
)
,
mc
(
'blue'
,
'700'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'blue'
,
'800'
)
,
mc
(
'blue'
,
'700'
));
height
:
60px
;
color
:
#FFF
;
display
:
flex
;
...
...
@@ -11,19 +11,19 @@
&
.is-red
{
background-color
:
mc
(
'red'
,
'700'
);
background
:
radial-gradient
(
ellipse
at
top
,
mc
(
'red'
,
'500'
)
,
mc
(
'red'
,
'700'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'red'
,
'800'
)
,
mc
(
'red'
,
'700'
));
background
-image
:
radial-gradient
(
ellipse
at
top
,
mc
(
'red'
,
'500'
)
,
mc
(
'red'
,
'700'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'red'
,
'800'
)
,
mc
(
'red'
,
'700'
));
}
&
.is-indigo
{
background-color
:
mc
(
'indigo'
,
'700'
);
background
:
radial-gradient
(
ellipse
at
top
,
mc
(
'indigo'
,
'500'
)
,
mc
(
'indigo'
,
'700'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'indigo'
,
'800'
)
,
mc
(
'indigo'
,
'700'
));
background
-image
:
radial-gradient
(
ellipse
at
top
,
mc
(
'indigo'
,
'500'
)
,
mc
(
'indigo'
,
'700'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'indigo'
,
'800'
)
,
mc
(
'indigo'
,
'700'
));
}
&
.is-dark
{
background-color
:
mc
(
'grey'
,
'900'
);
background
:
radial-gradient
(
ellipse
at
top
,
mc
(
'grey'
,
'800'
)
,
mc
(
'grey'
,
'900'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'grey'
,
'800'
)
,
mc
(
'grey'
,
'900'
));
background
-image
:
radial-gradient
(
ellipse
at
top
,
mc
(
'grey'
,
'800'
)
,
mc
(
'grey'
,
'900'
))
,
radial-gradient
(
ellipse
at
bottom
,
mc
(
'grey'
,
'800'
)
,
mc
(
'grey'
,
'900'
));
}
}
server/core/auth.js
View file @
0fd681c1
...
...
@@ -79,15 +79,15 @@ module.exports = {
stg
.
config
.
callbackURL
=
`
${
WIKI
.
config
.
host
}
/login/
${
stg
.
key
}
/callback`
strategy
.
init
(
passport
,
stg
.
config
)
fs
.
readFile
(
path
.
join
(
WIKI
.
ROOTPATH
,
`assets/svg/auth-icon-
${
strategy
.
key
}
.svg`
),
'utf8'
).
then
(
iconData
=>
{
strategy
.
icon
=
iconData
}
).
catch
(
err
=>
{
try
{
strategy
.
icon
=
await
fs
.
readFile
(
path
.
join
(
WIKI
.
ROOTPATH
,
`assets/svg/auth-icon-
${
strategy
.
key
}
.svg`
),
'utf8'
)
}
catch
(
err
)
{
if
(
err
.
code
===
'ENOENT'
)
{
strategy
.
icon
=
'[missing icon]'
}
else
{
WIKI
.
logger
.
warn
(
err
)
}
}
)
}
WIKI
.
auth
.
strategies
[
stg
.
key
]
=
strategy
WIKI
.
logger
.
info
(
`Authentication Strategy
${
stg
.
key
}
: [ OK ]`
)
}
...
...
server/models/userKeys.js
View file @
0fd681c1
/* global WIKI */
const
_
=
require
(
'lodash'
)
const
securityHelper
=
require
(
'../helpers/security'
)
const
Model
=
require
(
'objection'
).
Model
const
moment
=
require
(
'moment'
)
const
nanoid
=
require
(
'nanoid'
)
...
...
@@ -68,7 +66,5 @@ module.exports = class UserKey extends Model {
}
else
{
throw
new
WIKI
.
Error
.
AuthValidationTokenInvalid
()
}
return
token
}
}
server/setup.js
View file @
0fd681c1
...
...
@@ -387,7 +387,7 @@ module.exports = () => {
let
key
=
conn
.
remoteAddress
+
':'
+
conn
.
remotePort
openConnections
[
key
]
=
conn
conn
.
on
(
'close'
,
()
=>
{
delete
openConnections
[
key
]
openConnections
.
splice
(
key
,
1
)
})
})
...
...
sonar-project.properties
0 → 100644
View file @
0fd681c1
sonar.projectKey
=
Requarks_wiki
sonar.organization
=
requarks
sonar.host.url
=
https://sonarcloud.io
sonar.sources
=
./server,./client
sonar.exclusions
=
./server/templates
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