Update packages, change oauth2 client display style a bit
This commit is contained in:
parent
558e92f2af
commit
e2cb5903d3
660
package-lock.json
generated
660
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
42
package.json
42
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "icynet.eu",
|
"name": "icynet.eu",
|
||||||
"version": "0.9.3",
|
"version": "0.9.4",
|
||||||
"description": "Icy Network web server",
|
"description": "Icy Network web server",
|
||||||
"main": "icynet.eu.js",
|
"main": "icynet.eu.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@ -33,21 +33,21 @@
|
|||||||
"babel-core": "^6.26.3",
|
"babel-core": "^6.26.3",
|
||||||
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
|
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
|
||||||
"bcryptjs": "^2.4.3",
|
"bcryptjs": "^2.4.3",
|
||||||
"bluebird": "^3.5.1",
|
"bluebird": "^3.5.4",
|
||||||
"body-parser": "^1.18.3",
|
"body-parser": "^1.18.3",
|
||||||
"connect-redis": "^3.3.3",
|
"connect-redis": "^3.4.1",
|
||||||
"connect-session-knex": "^1.4.0",
|
"connect-session-knex": "^1.4.0",
|
||||||
"email-templates": "^2.7.1",
|
"email-templates": "^2.7.1",
|
||||||
"express": "^4.16.3",
|
"express": "^4.16.4",
|
||||||
"express-rate-limit": "^2.11.0",
|
"express-rate-limit": "^2.14.2",
|
||||||
"express-session": "^1.15.6",
|
"express-session": "^1.16.1",
|
||||||
"feed": "^1.1.1",
|
"feed": "^1.1.1",
|
||||||
"fs-extra": "^4.0.3",
|
"fs-extra": "^4.0.3",
|
||||||
"gm": "^1.23.1",
|
"gm": "^1.23.1",
|
||||||
"knex": "^0.14.6",
|
"knex": "^0.14.6",
|
||||||
"multiparty": "^4.1.4",
|
"multiparty": "^4.2.1",
|
||||||
"mysql": "^2.16.0",
|
"mysql": "^2.16.0",
|
||||||
"nodemailer": "^4.6.7",
|
"nodemailer": "^4.7.0",
|
||||||
"notp": "^2.0.3",
|
"notp": "^2.0.3",
|
||||||
"oauth-libre": "^0.9.17",
|
"oauth-libre": "^0.9.17",
|
||||||
"objection": "^0.8.9",
|
"objection": "^0.8.9",
|
||||||
@ -55,30 +55,30 @@
|
|||||||
"serve-favicon": "^2.5.0",
|
"serve-favicon": "^2.5.0",
|
||||||
"stylus": "^0.54.5",
|
"stylus": "^0.54.5",
|
||||||
"thirty-two": "^1.0.2",
|
"thirty-two": "^1.0.2",
|
||||||
"toml": "^2.3.3",
|
"toml": "^2.3.6",
|
||||||
"uuid": "^3.3.2",
|
"uuid": "^3.3.2",
|
||||||
"vue": "^2.5.16"
|
"vue": "^2.6.10"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"babel-loader": "^7.1.5",
|
"babel-loader": "^7.1.5",
|
||||||
"babel-preset-env": "^1.7.0",
|
"babel-preset-env": "^1.7.0",
|
||||||
"bootstrap": "^4.1.2",
|
"bootstrap": "^4.3.1",
|
||||||
"concurrently": "^3.6.0",
|
"concurrently": "^3.6.1",
|
||||||
"eslint-plugin-import": "^2.13.0",
|
"eslint-plugin-import": "^2.17.1",
|
||||||
"jquery": "^3.3.1",
|
"jquery": "^3.4.0",
|
||||||
"morgan": "^1.9.1",
|
"morgan": "^1.9.1",
|
||||||
"mustache": "^2.3.0",
|
"mustache": "^2.3.2",
|
||||||
"popper.js": "^1.14.3",
|
"popper.js": "^1.15.0",
|
||||||
"standard": "^10.0.3",
|
"standard": "^10.0.3",
|
||||||
"uglifyjs-webpack-plugin": "^1.2.7",
|
"uglifyjs-webpack-plugin": "^1.3.0",
|
||||||
"vue-clickaway": "^2.2.2",
|
"vue-clickaway": "^2.2.2",
|
||||||
"vue-loader": "^13.7.2",
|
"vue-loader": "^13.7.3",
|
||||||
"vue-resource": "^1.5.1",
|
"vue-resource": "^1.5.1",
|
||||||
"vue-router": "^3.0.1",
|
"vue-router": "^3.0.5",
|
||||||
"vue-template-compiler": "^2.5.16",
|
"vue-template-compiler": "^2.6.10",
|
||||||
"watch": "^1.0.2",
|
"watch": "^1.0.2",
|
||||||
"webpack": "^3.12.0",
|
"webpack": "^3.12.0",
|
||||||
"webpack-merge": "^4.1.3"
|
"webpack-merge": "^4.2.1"
|
||||||
},
|
},
|
||||||
"standard": {
|
"standard": {
|
||||||
"env": {
|
"env": {
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<template lang="pug">
|
<template lang="pug">
|
||||||
.application.list-item.row
|
.application.list-item.row
|
||||||
.col-2
|
div
|
||||||
.picture
|
.picture
|
||||||
img(v-if="icon" :src="'/usercontent/images/' + icon")
|
img(v-if="icon" :src="'/usercontent/images/' + icon")
|
||||||
.noicon(v-else)
|
.noicon(v-else)
|
||||||
i.fa.fa-fw.fa-gears
|
i.fa.fa-fw.fa-gears
|
||||||
.info.col-sm
|
.info
|
||||||
.stamps
|
.stamps
|
||||||
.verified.stamp(v-if="verified")
|
.verified.stamp(v-if="verified")
|
||||||
i.fa.fa-fw.fa-check
|
i.fa.fa-fw.fa-check
|
||||||
|
@ -65,7 +65,6 @@ $(document).ready(function () {
|
|||||||
var html = ''
|
var html = ''
|
||||||
var client = data[i]
|
var client = data[i]
|
||||||
html += '<div class="authclient application" data-client-id="' + client.id + '" id="client-' + client.id + '">'
|
html += '<div class="authclient application" data-client-id="' + client.id + '" id="client-' + client.id + '">'
|
||||||
html += '<div class="remove" id="deleteclient"><i class="fa fa-fw fa-ban"></i></div>'
|
|
||||||
html += '<div class="picture">'
|
html += '<div class="picture">'
|
||||||
|
|
||||||
if (client.icon) {
|
if (client.icon) {
|
||||||
@ -80,7 +79,10 @@ $(document).ready(function () {
|
|||||||
html += '<div class="description">' + client.description + '</div>'
|
html += '<div class="description">' + client.description + '</div>'
|
||||||
html += '<a class="url" href="' + client.url + '">' + client.url + '</a>'
|
html += '<a class="url" href="' + client.url + '">' + client.url + '</a>'
|
||||||
html += '<div class="timestamp">Authorized ' + new Date(client.created_at) + '</div>'
|
html += '<div class="timestamp">Authorized ' + new Date(client.created_at) + '</div>'
|
||||||
html += '</div></div>'
|
html += '</div>'
|
||||||
|
|
||||||
|
html += '<div class="remove" id="deleteclient"><i class="fa fa-fw fa-ban"></i></div>'
|
||||||
|
html += '</div>'
|
||||||
|
|
||||||
$('#clientlist').append(html)
|
$('#clientlist').append(html)
|
||||||
|
|
||||||
|
@ -55,12 +55,6 @@ body
|
|||||||
color: green
|
color: green
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
display: inline-block
|
display: inline-block
|
||||||
|
|
||||||
.picture
|
|
||||||
float: none
|
|
||||||
|
|
||||||
.info
|
|
||||||
margin: 0
|
|
||||||
|
|
||||||
.dropdown-wrapper
|
.dropdown-wrapper
|
||||||
border-radius: 5px
|
border-radius: 5px
|
||||||
|
@ -197,9 +197,10 @@ span.divider
|
|||||||
border: 1px solid maroon
|
border: 1px solid maroon
|
||||||
|
|
||||||
.application
|
.application
|
||||||
height: 140px
|
display: flex
|
||||||
|
flex-direction: row
|
||||||
|
margin-bottom: 15px
|
||||||
#deleteclient
|
#deleteclient
|
||||||
float: right
|
|
||||||
color: red
|
color: red
|
||||||
font-size: 120%
|
font-size: 120%
|
||||||
cursor: pointer
|
cursor: pointer
|
||||||
@ -208,7 +209,6 @@ span.divider
|
|||||||
height: 120px
|
height: 120px
|
||||||
position: relative
|
position: relative
|
||||||
display: inline-block
|
display: inline-block
|
||||||
float: left
|
|
||||||
.noicon
|
.noicon
|
||||||
width: 100%
|
width: 100%
|
||||||
height: 100%
|
height: 100%
|
||||||
@ -219,7 +219,8 @@ span.divider
|
|||||||
font-size: 500%
|
font-size: 500%
|
||||||
margin-top: 20px
|
margin-top: 20px
|
||||||
.info
|
.info
|
||||||
margin-left: 130px
|
flex-grow: 1
|
||||||
|
margin-left: 15px
|
||||||
.name
|
.name
|
||||||
font-size: 120%
|
font-size: 120%
|
||||||
font-weight: bold
|
font-weight: bold
|
||||||
|
Reference in New Issue
Block a user