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
c863059a
You need to sign in or sign up before continuing.
Commit
c863059a
authored
Jun 26, 2017
by
NGPixel
Committed by
Nicolas Giard
Jul 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: admin page icons + Color Theme footer field
parent
8a836719
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
58 additions
and
3 deletions
+58
-3
color-picker.scss
client/scss/components/color-picker.scss
+10
-0
hero.scss
client/scss/components/hero.scss
+8
-0
admin.json
server/locales/en/admin.json
+2
-1
setting.js
server/models/setting.js
+22
-0
user.js
server/models/user.js
+1
-1
_layout.pug
server/views/pages/admin/_layout.pug
+1
-1
profile.pug
server/views/pages/admin/profile.pug
+1
-0
settings.pug
server/views/pages/admin/settings.pug
+1
-0
stats.pug
server/views/pages/admin/stats.pug
+1
-0
system.pug
server/views/pages/admin/system.pug
+1
-0
theme.pug
server/views/pages/admin/theme.pug
+8
-0
users-edit.pug
server/views/pages/admin/users-edit.pug
+1
-0
users.pug
server/views/pages/admin/users.pug
+1
-0
No files found.
client/scss/components/color-picker.scss
View file @
c863059a
...
@@ -9,13 +9,23 @@
...
@@ -9,13 +9,23 @@
border
:
1px
solid
#FFF
;
border
:
1px
solid
#FFF
;
transition
:
all
.2s
ease
;
transition
:
all
.2s
ease
;
cursor
:
pointer
;
cursor
:
pointer
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
&
.is-active
,
&
:hover
{
&
.is-active
,
&
:hover
{
border-width
:
5px
;
border-width
:
5px
;
border-radius
:
3px
;
width
:
60px
;
width
:
60px
;
height
:
60px
;
height
:
60px
;
}
}
&.
is-active
:
:
before
{
content
:
'X'
;
font-weight
:
700
;
color
:
rgba
(
255
,
255
,
255
,.
5
);
}
@each
$color
,
$colorvalue
in
$material-colors
{
@each
$color
,
$colorvalue
in
$material-colors
{
&
.is-
#{
$color
}
{
&
.is-
#{
$color
}
{
background-color
:
mc
(
$color
,
'500'
);
background-color
:
mc
(
$color
,
'500'
);
...
...
client/scss/components/hero.scss
View file @
c863059a
...
@@ -16,6 +16,14 @@
...
@@ -16,6 +16,14 @@
font-weight
:
400
;
font-weight
:
400
;
}
}
.pageicon
{
position
:absolute
;
right
:
20px
;
top
:
28px
;
font-size
:
48px
;
color
:
mc
(
'blue-grey'
,
'500'
);
}
.hero-menu
{
.hero-menu
{
position
:
absolute
;
position
:
absolute
;
right
:
20px
;
right
:
20px
;
...
...
server/locales/en/admin.json
View file @
c863059a
...
@@ -46,7 +46,8 @@
...
@@ -46,7 +46,8 @@
"subtitle"
:
"Customize the appearance of your wiki"
,
"subtitle"
:
"Customize the appearance of your wiki"
,
"primarycolor"
:
"Primary Color"
,
"primarycolor"
:
"Primary Color"
,
"altcolor"
:
"Secondary Color"
,
"altcolor"
:
"Secondary Color"
,
"codeblock"
:
"Code Blocks"
"codeblock"
:
"Code Blocks"
,
"footercolor"
:
"Footer Color"
},
},
"users"
:
{
"users"
:
{
"createauthorize"
:
"Create / Authorize User"
,
"createauthorize"
:
"Create / Authorize User"
,
...
...
server/models/setting.js
0 → 100644
View file @
c863059a
'use strict'
const
Mongoose
=
require
(
'mongoose'
)
/**
* Settings schema
*
* @type {<Mongoose.Schema>}
*/
var
settingSchema
=
Mongoose
.
Schema
({
key
:
{
type
:
String
,
required
:
true
,
index
:
true
},
value
:
{
type
:
String
,
required
:
true
}
},
{
timestamps
:
{}
})
module
.
exports
=
Mongoose
.
model
(
'Setting'
,
settingSchema
)
server/models/user.js
View file @
c863059a
...
@@ -8,7 +8,7 @@ const bcrypt = require('bcryptjs-then')
...
@@ -8,7 +8,7 @@ const bcrypt = require('bcryptjs-then')
const
_
=
require
(
'lodash'
)
const
_
=
require
(
'lodash'
)
/**
/**
*
Region
schema
*
Users
schema
*
*
* @type {<Mongoose.Schema>}
* @type {<Mongoose.Schema>}
*/
*/
...
...
server/views/pages/admin/_layout.pug
View file @
c863059a
...
@@ -46,7 +46,7 @@ block content
...
@@ -46,7 +46,7 @@ block content
span= t('nav.users')
span= t('nav.users')
li
li
a(href='/admin/theme')
a(href='/admin/theme')
i.
icon-drop
i.
nc-icon-outline.design_paint-37
span= t('nav.theme')
span= t('nav.theme')
li
li
a(href='/admin/settings')
a(href='/admin/settings')
...
...
server/views/pages/admin/profile.pug
View file @
c863059a
...
@@ -4,6 +4,7 @@ block adminContent
...
@@ -4,6 +4,7 @@ block adminContent
.hero
.hero
h1.title#title= t('nav.myprofile')
h1.title#title= t('nav.myprofile')
h2.subtitle= t('admin:profile.subtitle')
h2.subtitle= t('admin:profile.subtitle')
i.pageicon.nc-icon-outline.business_business-contact-86
.form-sections
.form-sections
.columns.is-gapless
.columns.is-gapless
.column.is-two-thirds
.column.is-two-thirds
...
...
server/views/pages/admin/settings.pug
View file @
c863059a
...
@@ -4,3 +4,4 @@ block adminContent
...
@@ -4,3 +4,4 @@ block adminContent
.hero
.hero
h1.title#title= t('nav.syssettings')
h1.title#title= t('nav.syssettings')
h2.subtitle= t('admin:settings.subtitle')
h2.subtitle= t('admin:settings.subtitle')
i.pageicon.nc-icon-outline.ui-1_settings-gear-63
server/views/pages/admin/stats.pug
View file @
c863059a
...
@@ -4,6 +4,7 @@ block adminContent
...
@@ -4,6 +4,7 @@ block adminContent
.hero
.hero
h1.title#title= t('nav.stats')
h1.title#title= t('nav.stats')
h2.subtitle= t('admin:stats.subtitle')
h2.subtitle= t('admin:stats.subtitle')
i.pageicon.nc-icon-outline.ui-3_chart-bars
.form-sections
.form-sections
section
section
label.label= t('admin:stats.entries')
label.label= t('admin:stats.entries')
...
...
server/views/pages/admin/system.pug
View file @
c863059a
...
@@ -4,6 +4,7 @@ block adminContent
...
@@ -4,6 +4,7 @@ block adminContent
.hero
.hero
h1.title#title= t('nav.sysinfo')
h1.title#title= t('nav.sysinfo')
h2.subtitle= t('admin:system.subtitle')
h2.subtitle= t('admin:system.subtitle')
i.pageicon.nc-icon-outline.objects_planet
admin-settings(inline-template)
admin-settings(inline-template)
.form-sections
.form-sections
section
section
...
...
server/views/pages/admin/theme.pug
View file @
c863059a
...
@@ -4,6 +4,7 @@ block adminContent
...
@@ -4,6 +4,7 @@ block adminContent
.hero
.hero
h1.title#title= t('nav.theme')
h1.title#title= t('nav.theme')
h2.subtitle= t('admin:theme.subtitle')
h2.subtitle= t('admin:theme.subtitle')
i.pageicon.nc-icon-outline.design_paint-37
.form-sections
.form-sections
section
section
label.label= t('admin:theme.primarycolor')
label.label= t('admin:theme.primarycolor')
...
@@ -12,6 +13,13 @@ block adminContent
...
@@ -12,6 +13,13 @@ block adminContent
label.label= t('admin:theme.altcolor')
label.label= t('admin:theme.altcolor')
color-picker(current-color='blue-grey')
color-picker(current-color='blue-grey')
section
section
label.label= t('admin:theme.footercolor')
color-picker(current-color='blue-grey')
section
label.label= t('admin:theme.codeblock')
label.label= t('admin:theme.codeblock')
toggle(current-value='dark', desc='Use Dark Theme')
toggle(current-value='dark', desc='Use Dark Theme')
toggle(current-value='dark', desc='Colorize code syntax')
toggle(current-value='dark', desc='Colorize code syntax')
section
button.button.is-green(@click='saveUser')
i.nc-icon-outline.ui-1_check
span= t('admin:profile.savechanges')
server/views/pages/admin/users-edit.pug
View file @
c863059a
...
@@ -13,6 +13,7 @@ block adminContent
...
@@ -13,6 +13,7 @@ block adminContent
.hero
.hero
h1.title= t('admin:users.edituser')
h1.title= t('admin:users.edituser')
h2.subtitle= usr.email
h2.subtitle= usr.email
i.pageicon.nc-icon-outline.users_single-05
table.table
table.table
thead
thead
tr
tr
...
...
server/views/pages/admin/users.pug
View file @
c863059a
...
@@ -11,6 +11,7 @@ block adminContent
...
@@ -11,6 +11,7 @@ block adminContent
.hero
.hero
h1.title#title= t('nav.users')
h1.title#title= t('nav.users')
h2.subtitle= t('admin:users.subtitle')
h2.subtitle= t('admin:users.subtitle')
i.pageicon.nc-icon-outline.users_multiple-19
table.table
table.table
thead
thead
tr
tr
...
...
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