roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-04-25 04:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sync

Browse source
This commit is contained in:
41666 2017-12-10 03:56:41 -06:00
parent 13cd3bd4a0
commit 52cb96baa3
43 changed files with 3257 additions and 1072 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Server/.env.example
View file

@ -5,3 +5,4 @@ DISCORD_CLIENT_ID=36391647431320739
DISCORD_CLIENT_SECRET=PZd3u4RkokhnB8MVdALPz5
DISCORD_BOT_TOKEN=qgTk4wm9Q7ECmMCovpmJVNCBltzJhL
APP_URL=http://localhost:6769
APP_KEY=PJoayPGqi8vfYVFYBDgSeJSDYUpzBX

3
Server/.eslintrc.js Normal file
View file

@ -0,0 +1,3 @@
module.exports = {
"extends": "standard"
};

1
Server/Roleypoly.js
View file

@ -42,6 +42,7 @@ class Roleypoly {
// })
this.ctx.discord = new (require('./services/discord'))(this.ctx)
this.ctx.sessions = new (require('./services/sessions'))(this.ctx)
}
async mountRoutes () {

50
Server/api/auth.js
View file

@ -1,3 +1,51 @@
module.exports = R => {
module.exports = (R, $) => {
R.post('/api/auth/token', async (ctx) => {
const { token } = ctx.request.body
if (token == null || token === '') {
ctx.body = { err: 'token_missing' }
ctx.status = 400
return
}
console.log(ctx.session.expiresAt >= new Date(), ctx.session.expiresAt, new Date())
if (ctx.session.accessToken === undefined || ctx.session.expiresAt >= new Date()) {
console.log('getting auth token')
const data = await $.discord.getAuthToken(token)
console.log(data)
ctx.session.accessToken = data.access_token
ctx.session.refreshToken = data.refresh_token
ctx.session.expiresAt = new Date() + ctx.expires_in
console.log(ctx.session)
}
const user = await $.discord.getUser(ctx.session.accessToken)
ctx.session.userId = user.id
ctx.session.avatarHash = user.avatar
ctx.body = {
id: user.id,
avatar: user.avatar,
username: user.username,
discriminator: user.discriminator
}
})
R.get('/api/auth/user', async ctx => {
const user = await $.discord.getUser(ctx.session.accessToken)
ctx.session.userId = user.id
ctx.session.avatarHash = user.avatar
ctx.body = {
id: user.id,
avatar: user.avatar,
username: user.username,
discriminator: user.discriminator
}
})
R.get('/api/auth/redirect', ctx => {
ctx.redirect($.discord.getAuthUrl())
})
}

25
Server/api/servers.js
View file

@ -1,6 +1,25 @@
module.exports = (R, $) => {
R.get('/api/servers', (ctx) => {
ctx.body = 'hi'
console.log($)
R.get('/api/servers', async (ctx) => {
const { userId } = ctx.session
const srv = $.discord.getRelevantServers(userId)
ctx.body = $.discord.presentableServers(srv, userId)
})
R.get('/api/server/:id', async (ctx) => {
const { userId } = ctx.session
const { id } = ctx.params
const srv = $.discord.client.guilds.get(id)
if (srv == null) {
ctx.body = { err: 'not found' }
ctx.status = 404
return
}
const gm = srv.members.get(userId)
const roles = $.discord.presentableRoles(id, gm)
ctx.body = roles
})
}

18
Server/api/servers_test.js
View file

@ -6,9 +6,21 @@ module.exports = (R, $) => {
return
})
R.get('/api/~/roles/:server', (ctx, next) => {
R.get('/api/~/roles/:id/:userId', (ctx, next) => {
// ctx.body = 'ok'
ctx.body = $.discord.getRoles(ctx.params.server)
return
const { id, userId } = ctx.params
const srv = $.discord.client.guilds.get(id)
if (srv === undefined) {
ctx.body = { err: 'not found' }
ctx.status = 404
return
}
const gm = srv.members.get(userId)
const roles = $.discord.presentableRoles(id, gm)
ctx.boy = roles
})
}

26
Server/index.js
View file

@ -14,16 +14,38 @@ const io = _io(server, { transports: ['websocket'], path: '/api/socket.io', wsEn
const M = new Roleypoly(router, io, app) // eslint-disable-line no-unused-vars
app.keys = [ process.env.APP_KEY ]
const DEVEL = process.env.NODE_ENV === 'development'
async function start () {
// body parser
const bodyParser = require('koa-bodyparser')
app.use(bodyParser({ types: ['json'] }))
const session = require('koa-session')
app.use(session({
key: 'roleypoly:sess',
maxAge: 'session',
store: M.sessions
}, app))
// Request logger
app.use(async (ctx, next) => {
let timeStart = new Date()
await next()
try {
await next()
} catch (e) {
log.error(e)
ctx.status = 500
if (DEVEL) {
ctx.body = e.stack
} else {
ctx.body = {
err: 'something terrible happened.'
}
}
}
let timeElapsed = new Date() - timeStart
log.request(`${ctx.status} ${ctx.method} ${ctx.url} - ${ctx.ip} - took ${timeElapsed}ms`)
@ -40,5 +62,5 @@ async function start () {
}
start().catch(e => {
console.trace(e)
console.error(e)
})

634
Server/package-lock.json generated
View file

@ -4,16 +4,6 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@types/geojson": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz",
"integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w=="
},
"@types/node": {
"version": "8.0.53",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.53.tgz",
"integrity": "sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ=="
},
"accepts": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
@ -64,18 +54,20 @@
"integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
},
"ajv": {
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
"version": "5.5.1",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.1.tgz",
"integrity": "sha1-s4u4h22ehr7plJVqBOch6IskjrI=",
"requires": {
"co": "4.6.0",
"json-stable-stringify": "1.0.1"
"fast-deep-equal": "1.0.0",
"fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "0.3.1"
}
},
"ajv-keywords": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
"integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw="
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
"integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
},
"amp": {
"version": "0.3.1",
@ -301,11 +293,6 @@
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
"integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE="
},
"bluebird": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
},
"brace-expansion": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@ -479,15 +466,6 @@
}
}
},
"cls-bluebird": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-2.0.1.tgz",
"integrity": "sha1-wlmkgK4CwOUGE0MHuxPbMERu4uc=",
"requires": {
"is-bluebird": "1.0.2",
"shimmer": "1.1.0"
}
},
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@ -758,11 +736,6 @@
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz",
"integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0="
},
"dottie": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.0.tgz",
"integrity": "sha1-2hkZgci41xPKARXViYzzl8Lw3dA="
},
"ee-first": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@ -988,155 +961,90 @@
}
},
"eslint": {
"version": "3.19.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
"integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
"version": "4.12.1",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.12.1.tgz",
"integrity": "sha512-28hOYej+NZ/R5H1yMvyKa1+bPlu+fnsIAQffK6hxXgvmXnImos2bA5XfCn5dYv2k2mrKj+/U/Z4L5ICWxC7TQw==",
"requires": {
"ajv": "5.5.1",
"babel-code-frame": "6.26.0",
"chalk": "1.1.3",
"chalk": "2.3.0",
"concat-stream": "1.6.0",
"debug": "2.6.8",
"cross-spawn": "5.1.0",
"debug": "3.1.0",
"doctrine": "2.0.2",
"escope": "3.6.0",
"eslint-scope": "3.7.1",
"espree": "3.5.2",
"esquery": "1.0.0",
"estraverse": "4.2.0",
"esutils": "2.0.2",
"file-entry-cache": "2.0.0",
"functional-red-black-tree": "1.0.1",
"glob": "7.1.2",
"globals": "9.18.0",
"globals": "11.0.1",
"ignore": "3.3.7",
"imurmurhash": "0.1.4",
"inquirer": "0.12.0",
"is-my-json-valid": "2.16.1",
"inquirer": "3.3.0",
"is-resolvable": "1.0.0",
"js-yaml": "3.10.0",
"json-stable-stringify": "1.0.1",
"json-stable-stringify-without-jsonify": "1.0.1",
"levn": "0.3.0",
"lodash": "4.17.4",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
"natural-compare": "1.4.0",
"optionator": "0.8.2",
"path-is-inside": "1.0.2",
"pluralize": "1.2.1",
"progress": "1.1.8",
"pluralize": "7.0.0",
"progress": "2.0.0",
"require-uncached": "1.0.3",
"shelljs": "0.7.8",
"strip-bom": "3.0.0",
"semver": "5.3.0",
"strip-ansi": "4.0.0",
"strip-json-comments": "2.0.1",
"table": "3.8.3",
"text-table": "0.2.0",
"user-home": "2.0.0"
"table": "4.0.2",
"text-table": "0.2.0"
},
"dependencies": {
"ansi-escapes": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
},
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
}
},
"cli-cursor": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"requires": {
"restore-cursor": "1.0.1"
}
},
"figures": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"requires": {
"escape-string-regexp": "1.0.5",
"object-assign": "4.1.1"
"ms": "2.0.0"
}
},
"inquirer": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
"integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
"integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
"requires": {
"ansi-escapes": "1.4.0",
"ansi-regex": "2.1.1",
"chalk": "1.1.3",
"cli-cursor": "1.0.2",
"ansi-escapes": "3.0.0",
"chalk": "2.3.0",
"cli-cursor": "2.1.0",
"cli-width": "2.2.0",
"figures": "1.7.0",
"external-editor": "2.1.0",
"figures": "2.0.0",
"lodash": "4.17.4",
"readline2": "1.0.1",
"run-async": "0.1.0",
"rx-lite": "3.1.2",
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
"mute-stream": "0.0.7",
"run-async": "2.3.0",
"rx-lite": "4.0.8",
"rx-lite-aggregates": "4.0.8",
"string-width": "2.1.1",
"strip-ansi": "4.0.0",
"through": "2.3.8"
}
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"requires": {
"number-is-nan": "1.0.1"
"ansi-regex": "3.0.0"
}
},
"onetime": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
},
"restore-cursor": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"requires": {
"exit-hook": "1.1.1",
"onetime": "1.1.0"
}
},
"run-async": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
"integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
"requires": {
"once": "1.4.0"
}
},
"rx-lite": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
"integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI="
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}
}
},
@ -1242,6 +1150,15 @@
"resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz",
"integrity": "sha1-NNDJFbRe3G8BA5PH7vOCOwhWXPI="
},
"eslint-scope": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz",
"integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
"requires": {
"esrecurse": "4.2.0",
"estraverse": "4.2.0"
}
},
"espree": {
"version": "3.5.2",
"resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz",
@ -1368,6 +1285,16 @@
"is-extglob": "1.0.0"
}
},
"fast-deep-equal": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
"integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
},
"fast-json-stable-stringify": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
"integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
},
"fast-levenshtein": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@ -2274,6 +2201,11 @@
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"functional-red-black-tree": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
"integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
},
"generate-function": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
@ -2287,11 +2219,6 @@
"is-property": "1.0.2"
}
},
"generic-pool": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.2.0.tgz",
"integrity": "sha512-JjcXDHT84icN/kFaF5+rNd1trZsgJFVqTSgM9dv6eayxSIQKMq0ilBJ+5pvf0SgimacMlZEsav4oL+4dUE4E2g=="
},
"get-caller-file": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
@ -2343,9 +2270,9 @@
}
},
"globals": {
"version": "9.18.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
"version": "11.0.1",
"resolved": "https://registry.npmjs.org/globals/-/globals-11.0.1.tgz",
"integrity": "sha1-Eqh7sBDlFUOWrMU14eQ/x1Ow5eg="
},
"globby": {
"version": "5.0.0",
@ -2456,11 +2383,6 @@
"resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz",
"integrity": "sha1-i0F+R8KPklpFEz2RTKH9OJEH8w8="
},
"inflection": {
"version": "1.12.0",
"resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
"integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY="
},
"inflight": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@ -2539,11 +2461,6 @@
"binary-extensions": "1.11.0"
}
},
"is-bluebird": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-bluebird/-/is-bluebird-1.0.2.tgz",
"integrity": "sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI="
},
"is-buffer": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
@ -2756,6 +2673,11 @@
"esprima": "4.0.0"
}
},
"json-schema-traverse": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
},
"json-stable-stringify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
@ -2764,6 +2686,11 @@
"jsonify": "0.0.0"
}
},
"json-stable-stringify-without-jsonify": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
"integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
},
"json-stringify-safe": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@ -3575,9 +3502,9 @@
}
},
"pluralize": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
"integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU="
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow=="
},
"pm2": {
"version": "2.8.0",
@ -3741,9 +3668,9 @@
"integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
},
"progress": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74="
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8="
},
"promptly": {
"version": "2.2.0",
@ -3928,25 +3855,6 @@
"signal-exit": "3.0.2"
}
},
"retry-as-promised": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.3.2.tgz",
"integrity": "sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c=",
"requires": {
"bluebird": "3.5.1",
"debug": "2.6.9"
},
"dependencies": {
"debug": {
"version": "2.6.9",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
"requires": {
"ms": "2.0.0"
}
}
}
},
"rimraf": {
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
@ -3991,40 +3899,6 @@
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
},
"sequelize": {
"version": "4.25.1",
"resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.25.1.tgz",
"integrity": "sha512-LA4fo8aSumlKzLTTTU+cNiYD32I7O15as4MK7x7raluV2URKmT1rbgt9sBEl3De77lNAIIX2gvb3D0nzPAbUtg==",
"requires": {
"bluebird": "3.5.1",
"cls-bluebird": "2.0.1",
"debug": "3.1.0",
"depd": "1.1.1",
"dottie": "2.0.0",
"generic-pool": "3.2.0",
"inflection": "1.12.0",
"lodash": "4.17.4",
"moment": "2.18.1",
"moment-timezone": "0.5.13",
"retry-as-promised": "2.3.2",
"semver": "5.3.0",
"terraformer-wkt-parser": "1.1.2",
"toposort-class": "1.0.1",
"uuid": "3.1.0",
"validator": "9.1.2",
"wkx": "0.4.2"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.0.0"
}
}
}
},
"set-blocking": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@ -4082,9 +3956,12 @@
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
"slice-ansi": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
"integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU="
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
"requires": {
"is-fullwidth-code-point": "2.0.0"
}
},
"snekfetch": {
"version": "3.6.0",
@ -4186,6 +4063,235 @@
"eslint-plugin-react": "6.10.3",
"eslint-plugin-standard": "3.0.1",
"standard-engine": "7.0.0"
},
"dependencies": {
"ajv": {
"version": "4.11.8",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
"integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
"requires": {
"co": "4.6.0",
"json-stable-stringify": "1.0.1"
}
},
"ajv-keywords": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
"integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw="
},
"ansi-escapes": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
},
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
}
},
"cli-cursor": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"requires": {
"restore-cursor": "1.0.1"
}
},
"eslint": {
"version": "3.19.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
"integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
"requires": {
"babel-code-frame": "6.26.0",
"chalk": "1.1.3",
"concat-stream": "1.6.0",
"debug": "2.6.8",
"doctrine": "2.0.2",
"escope": "3.6.0",
"espree": "3.5.2",
"esquery": "1.0.0",
"estraverse": "4.2.0",
"esutils": "2.0.2",
"file-entry-cache": "2.0.0",
"glob": "7.1.2",
"globals": "9.18.0",
"ignore": "3.3.7",
"imurmurhash": "0.1.4",
"inquirer": "0.12.0",
"is-my-json-valid": "2.16.1",
"is-resolvable": "1.0.0",
"js-yaml": "3.10.0",
"json-stable-stringify": "1.0.1",
"levn": "0.3.0",
"lodash": "4.17.4",
"mkdirp": "0.5.1",
"natural-compare": "1.4.0",
"optionator": "0.8.2",
"path-is-inside": "1.0.2",
"pluralize": "1.2.1",
"progress": "1.1.8",
"require-uncached": "1.0.3",
"shelljs": "0.7.8",
"strip-bom": "3.0.0",
"strip-json-comments": "2.0.1",
"table": "3.8.3",
"text-table": "0.2.0",
"user-home": "2.0.0"
}
},
"figures": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"requires": {
"escape-string-regexp": "1.0.5",
"object-assign": "4.1.1"
}
},
"globals": {
"version": "9.18.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
},
"inquirer": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
"integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
"requires": {
"ansi-escapes": "1.4.0",
"ansi-regex": "2.1.1",
"chalk": "1.1.3",
"cli-cursor": "1.0.2",
"cli-width": "2.2.0",
"figures": "1.7.0",
"lodash": "4.17.4",
"readline2": "1.0.1",
"run-async": "0.1.0",
"rx-lite": "3.1.2",
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
"through": "2.3.8"
}
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
"number-is-nan": "1.0.1"
}
},
"onetime": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
},
"pluralize": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
"integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU="
},
"progress": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
"integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74="
},
"restore-cursor": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"requires": {
"exit-hook": "1.1.1",
"onetime": "1.1.0"
}
},
"run-async": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
"integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
"requires": {
"once": "1.4.0"
}
},
"rx-lite": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
"integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI="
},
"slice-ansi": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
"integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU="
},
"string-width": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
},
"table": {
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
"integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
"requires": {
"ajv": "4.11.8",
"ajv-keywords": "1.5.1",
"chalk": "1.1.3",
"lodash": "4.17.4",
"slice-ansi": "0.0.4",
"string-width": "2.1.1"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
},
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
},
"string-width": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"requires": {
"is-fullwidth-code-point": "2.0.0",
"strip-ansi": "4.0.0"
}
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"requires": {
"ansi-regex": "3.0.0"
}
}
}
}
}
},
"standard-engine": {
@ -4287,56 +4393,16 @@
}
},
"table": {
"version": "3.8.3",
"resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
"integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
"integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
"requires": {
"ajv": "4.11.8",
"ajv-keywords": "1.5.1",
"chalk": "1.1.3",
"ajv": "5.5.1",
"ajv-keywords": "2.1.1",
"chalk": "2.3.0",
"lodash": "4.17.4",
"slice-ansi": "0.0.4",
"slice-ansi": "1.0.0",
"string-width": "2.1.1"
},
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
"ansi-styles": "2.2.1",
"escape-string-regexp": "1.0.5",
"has-ansi": "2.0.0",
"strip-ansi": "3.0.1",
"supports-color": "2.0.0"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
}
}
},
"terraformer": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.8.tgz",
"integrity": "sha1-UeCtiXRvzyFh3G9lqnDkI3fItZM=",
"requires": {
"@types/geojson": "1.0.6"
}
},
"terraformer-wkt-parser": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.1.2.tgz",
"integrity": "sha1-M2oMj8gglKWv+DKI9prt7NNpvww=",
"requires": {
"terraformer": "1.0.8"
}
},
"text-table": {
@ -4370,11 +4436,6 @@
"kind-of": "3.2.2"
}
},
"toposort-class": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz",
"integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg="
},
"tryit": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
@ -4473,11 +4534,6 @@
"resolved": "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz",
"integrity": "sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg=="
},
"validator": {
"version": "9.1.2",
"resolved": "https://registry.npmjs.org/validator/-/validator-9.1.2.tgz",
"integrity": "sha512-1Tml6crNdsSC61jHssWksQxq6C7MmSFCCmf99Eb+l/V/cwVlw4/Pg3YXBP1WKcHLsyqe3E+iJXUZgoTTQFcqQg=="
},
"vary": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@ -4529,14 +4585,6 @@
"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
},
"wkx": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.2.tgz",
"integrity": "sha1-d201pjSlwi5lbkdEvetU+D/Szo0=",
"requires": {
"@types/node": "8.0.53"
}
},
"wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",

2
Server/package.json
View file

@ -14,6 +14,8 @@
"discord.js": "^11.2.1",
"dotenv": "^4.0.0",
"erlpack": "github:discordapp/erlpack",
"eslint": "^4.12.1",
"eslint-config-standard": "^10.2.1",
"eventemitter3": "^3.0.0",
"glob": "^7.1.2",
"immutable": "^3.8.2",

26
Server/services/discord.js
View file

@ -46,13 +46,15 @@ class DiscordService extends Service {
})
}
presentableRoles (serverId) {
return this.client.guilds.get(serverId).roles.map((role) => {
presentableRoles (serverId, gm) {
return this.client.guilds.get(serverId).roles.filter(r => r.id !== serverId).map((role) => {
return {
color: role.hexColor,
position: role.calculatedPosition,
position: role.position,
calculatedPosition: role.calculatedPosition,
id: role.id,
name: role.name,
selected: gm.roles.has(role.id)
}
})
}
@ -71,6 +73,7 @@ class DiscordService extends Service {
const rsp =
await superagent
.post(url)
.set('Content-Type', 'application/x-www-form-urlencoded')
.send({
client_id: this.clientId,
client_secret: this.clientSecret,
@ -86,6 +89,20 @@ class DiscordService extends Service {
}
}
async getUser (authToken) {
const url = 'https://discordapp.com/api/v6/users/@me'
try {
const rsp =
await superagent
.get(url)
.set('Authorization', `Bearer ${authToken}`)
return rsp.body
} catch (e) {
this.log.error('getUser error', e)
throw e
}
}
// on sign out, we revoke the token we had.
// async revokeAuthToken (code, state) {
// const url = 'https://discordapp.com/api/oauth2/revoke'
@ -119,7 +136,6 @@ class DiscordService extends Service {
getBotJoinUrl () {
return `https://discordapp.com/oauth2/authorize?client_id=${this.clientId}&scope=bot&permissions=268435456&redirect_uri=${this.botCallback}`
}
}
module.exports = DiscordService

37
Server/services/sessions.js Normal file
View file

@ -0,0 +1,37 @@
const Service = require('./Service')
class SessionsService extends Service {
constructor (ctx) {
super(ctx)
this.Session = ctx.M.Session
}
async get (id) {
const user = await this.Session.findOne({ where: { id } })
if (user === null) {
return null
}
return user.data
}
async set (id, data, maxAge) {
let session = await this.Session.findOne({ where: { id } })
if (session === null) {
session = this.Session.build({ id })
}
session.data = data
session.maxAge = maxAge
return session.save()
}
async destroy (id) {
return (await this.Session.findOne({ where: { id } })).destroy()
}
}
module.exports = SessionsService

942
Server/yarn.lock
View file

File diff suppressed because it is too large Load diff

4
UI/.env Normal file
View file

@ -0,0 +1,4 @@
REACT_APP_DECORATORS=true
REACT_APP_BABEL_STAGE_0=true
REACT_APP_SASS=true
REACT_APP_SASS_MODULES=true

15
UI/package.json
View file

@ -4,15 +4,24 @@
"private": true,
"dependencies": {
"color": "^2.0.1",
"eslint": "^4.12.1",
"custom-react-scripts": "0.2.1",
"eslint": "^4.13.0",
"immutable": "^3.8.2",
"prop-types": "^15.6.0",
"radium": "^0.19.6",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-redux": "^5.0.6",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
"react-scripts": "1.0.17",
"superagent": "^3.8.1"
"redux": "^3.7.2",
"redux-devtools": "^3.4.1",
"redux-devtools-dock-monitor": "^1.1.2",
"redux-devtools-log-monitor": "^1.4.0",
"redux-logger": "^3.0.6",
"redux-saga": "^0.16.0",
"redux-thunk": "^2.2.0",
"superagent": "^3.8.2"
},
"scripts": {
"start": "react-scripts start",

18
UI/src/App.js
View file

@ -1,18 +1,26 @@
import React, { Component } from 'react'
import { BrowserRouter } from 'react-router-dom'
import { Provider } from 'react-redux'
import './App.css'
import configureStore from './store/configureStore'
import Wrapper from './components/wrapper'
import AppRouter from './router'
const store = configureStore()
window.__APP_STORE__ = store
class App extends Component {
render () {
return (
<BrowserRouter>
<Wrapper>
<AppRouter />
</Wrapper>
</BrowserRouter>
<Provider store={store}>
<BrowserRouter>
<Wrapper>
<AppRouter />
</Wrapper>
</BrowserRouter>
</Provider>
)
}
}

0
UI/src/actions/index.js Normal file
View file

11
UI/src/components/dev-tools/index.js Normal file
View file

@ -0,0 +1,11 @@
import React from 'react'
import { createDevTools } from 'redux-devtools'
import LogMonitor from 'redux-devtools-log-monitor'
import DockMonitor from 'redux-devtools-dock-monitor'
export default createDevTools(
<DockMonitor toggleVisibilityKey="`"
changePositionKey="ctrl-w">
<LogMonitor />
</DockMonitor>
)

4
UI/src/components/logotype/index.js
View file

@ -2,8 +2,8 @@ import React from 'react'
const Logotype = ({fill = 'var(--c-7)', width, height, circleFill, typeFill, style, className}) => (
<svg style={style} className={className} viewBox='0 0 1566 298' version='1.1' xmlns='http://www.w3.org/2000/svg'>
<g id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'>
<text id='Roleypoly' font-family='HelveticaNeue-Medium, Helvetica Neue' font-size='288' font-weight='400' fill={typeFill || fill}>
<g id='Page-1' stroke='none' strokeWidth='1' fill='none' fillRule='evenodd'>
<text id='Roleypoly' fontFamily='HelveticaNeue-Medium, Helvetica Neue' fontSize='288' fontWeight='400' fill={typeFill || fill}>
<tspan x='249' y='238'>Roleypoly</tspan>
</text>
<defs>

8
UI/src/components/oauth-callback/index.js
View file

@ -1,4 +1,4 @@
import React, { Component, Fragment } from 'react'
import React, { Component } from 'react'
import { Redirect } from 'react-router-dom'
import superagent from 'superagent'
@ -23,14 +23,16 @@ class OauthCallback extends Component {
// pass token to backend, await it to finish it's business.
try {
await superagent.post('/api/auth/token').send({ token })
const rsp = await superagent.post('/api/auth/token').send({ token })
this.setState({ notReady: false })
this.props.onLogin(rsp.body)
} catch (e) {
console.error('token pass error', e)
this.setState({ message: 'g-gomen nasai... i broke it...' })
return
}
this.setState({ notReady: false })
// update user stuff here
}

6
UI/src/components/role-picker/RolePicker.sass Normal file
View file

@ -0,0 +1,6 @@
.role-picker
transition: opacity 0.3s ease-in-out
opacity: 1
.hidden
opacity: 0

65
UI/src/components/role-picker/index.js Normal file
View file

@ -0,0 +1,65 @@
import React, { Component } from 'react'
import superagent from 'superagent'
import './RolePicker.sass'
import Role from '../role'
class RolePicker extends Component {
state = {
roles: [],
categories: {},
hidden: true,
serverMessage: `Hey there. This is a cool UI you can pick your roles from. If you have any questions, ask the mods on Discord!`
}
async componentDidUpdate (prevProps) {
if (prevProps.match.params.server !== this.props.match.params.server) {
this.setState({ hidden: true })
setTimeout(async () => {
this.setState({ roles: [] })
this.setState({ roles: await this.getRoles(this.props.match.params.server), hidden: false })
}, 350)
}
}
async componentWillMount () {
this.setState({ roles: await this.getRoles(this.props.match.params.server), hidden: false })
}
async getRoles (id) {
const rsp = await superagent.get(`/api/server/${id}`)
return rsp.body//.map(r => { r.selected = false; return r })
}
onChange = k => (newVal, oldVal) => {
this.setState((prevState) => {
return { roles: prevState.roles.map(r => {
if (r.id === k) {
r.selected = newVal
}
return r
})}
})
}
render () {
return <div className={`role-picker ${(this.state.hidden) ? 'hidden' : ''}`}>
<section>
<h3>Server Message</h3>
<p>{this.state.serverMessage}</p>
</section>
<section>
<h3>Roles</h3>
{
this.state.roles.map((r, k) => {
return <Role key={k} role={r} onToggle={this.onChange(r.id)} />
})
}
</section>
</div>
}
}
export default RolePicker

56
UI/src/components/role/Role.sass Normal file
View file

@ -0,0 +1,56 @@
.role
border: 1px solid var(--role-color-rgba)
border-radius: 32px
box-sizing: border-box
height: 32px
margin: 0 6px 6px 0
padding: 4px
display: inline-flex
font-weight: 600
align-content: center
justify-content: center
font-size: 16px
vertical-align: baseline
transition: border-color 0.2s ease-in-out
&:hover
.role__option
transform: translateY(-1px)
box-shadow: 0 1px 1px var(--c-dark)
border-color: var(--role-color-hover)
background-color: transparent
&:active
box-shadow: none
&__option
border-radius: 50%
height: 22px
margin-right: 6px
width: 22px
box-sizing: border-box
/* display: inline-block */
background-color: transparent
overflow: hidden
border: 1px solid var(--role-color-hex)
transition: background-color 0.1s ease-in-out, border-left-width 0.3s ease-in-out, border-right-width 0.5s ease-in-out, border-color 0.1s ease-in-out, transform 0.1s ease-in-out, box-shadow 0.1s ease-out
&.selected
background-color: var(--role-color-hex)
// This **must** be width-1, otherwise blink adds width to the boundaries.
border-left-width: 21px
&:hover
cursor: pointer
&__name
margin-right: 6px
max-width: 200px
overflow: hidden
text-overflow: ellipsis
white-space: nowrap
user-select: none
.role__option:active, .role:active .role__option:not(:active)
transform: translateY(0) !important

37
UI/src/components/role/index.js Normal file
View file

@ -0,0 +1,37 @@
import React, { Component } from 'react'
import Radium from 'radium'
import Color from 'color'
import './Role.sass'
const whiteColor = Color('#efefef')
class Role extends Component {
render () {
const { role } = this.props
let color = Color(role.color)
if (color.rgbNumber() === 0) {
color = whiteColor
}
const c = color
let hc = color.lighten(0.1)
return <div
onClick={this.props.onToggle.bind(null, !role.selected, role.selected)}
className='role'
style={{
'--role-color-hex': c.string(),
'--role-color-hover': hc.string(),
'--role-color-rgba': `rgba(${c.red()}, ${c.green()}, ${c.blue()}, 0.7)`
}}>
{/* circle svg */}
<div className={`role__option ${(role.selected) ? 'selected' : ''}`}/>
<div className='role__name'>
{role.name}
</div>
</div>
}
}
export default Radium(Role)

15
UI/src/components/servers/Navigation.js
View file

@ -1,13 +1,18 @@
import React, { Component, Fragment } from 'react'
import Radium from 'radium'
import serverStyles, { navigation as styles } from './styles'
import PropTypes from 'prop-types'
import ServerCard from './ServerCard'
import UserCard from './UserCard'
class ServersNavigation extends Component {
static propTypes = {
user: PropTypes.object.isRequired,
servers: PropTypes.arrayOf(PropTypes.object).isRequired,
className: PropTypes.string
}
render () {
console.log(this.props.servers)
// console.log(this.props.servers)
return <Fragment>
<UserCard user={this.props.user} />
<div className={this.props.className}>
@ -17,4 +22,4 @@ class ServersNavigation extends Component {
}
}
export default Radium(ServersNavigation)
export default ServersNavigation

47
UI/src/components/servers/ServerCard.css
View file

@ -1,47 +0,0 @@
.server-list__item {
display: flex;
/* border-bottom: 1px solid var(--c-3); */
padding: 25px 15px;
padding-right: 0;
align-items: center;
/* justify-content: center; */
}
a.server-list__item {
color: var(--c-white);
text-decoration: none;
}
a.server-list__item.active {
cursor: default
}
.server-list__item.active {
background-color: var(--c-3);
}
.server-list__item:hover:not(.active) {
background-color: rgba(0,0,0,0.25) !important;
cursor: pointer;
transform: translateX(1px);
transition: background 0.05s ease-in-out, transform 0.1s ease-in-out;
}
.server-list__item:last-of-type {
border: 0
}
.server-list__item:nth-of-type(even):not(.active) {
background-color: rgba(0,0,0,0.1);
}
.server-list__item__icon img {
border-radius: 100%;
width: 50px;
height: 50px;
border: 2px solid transparent;
}
.server-list__item__info {
padding: 0 10px
}

8
UI/src/components/servers/ServerCard.js
View file

@ -1,7 +1,7 @@
import React, { Component } from 'react'
import { NavLink } from 'react-router-dom'
import Radium from 'radium'
import './ServerCard.css'
import './ServerCard.sass'
class ServerCard extends Component {
render () {
@ -10,16 +10,16 @@ class ServerCard extends Component {
let icon = ''
if (perms.canManageRoles) {
icon = <span title='Role Manager' uk-tooltip=''>🔰</span>
icon = <span title='Role Manager' uk-tooltip='' role='img' aria-label='Role Manager'>🔰</span>
}
if (perms.isAdmin) {
icon = <span title='Server Admin' uk-tooltip=''>🔰⭐️</span>
icon = <span title='Server Admin' uk-tooltip='' role='img' aria-label='Server Admin'>🔰⭐️</span>
}
return <NavLink className='server-list__item' activeClassName='active' to={`/s/${id}`}>
<div className='server-list__item__icon'>
<img src={`https://cdn.discordapp.com/icons/${id}/${server.icon}.png`} />
<img src={`https://cdn.discordapp.com/icons/${id}/${server.icon}.png`} alt={server.name} />
</div>
<div className='server-list__item__info'>
<b>{server.name}</b><br />

41
UI/src/components/servers/ServerCard.sass Normal file
View file

@ -0,0 +1,41 @@
.server-list
&__item
display: flex
/* border-bottom: 1px solid var(--c-3) */
padding: 25px 15px
padding-right: 0
align-items: center
/* justify-content: center */
.active
background-color: var(--c-3)
&:hover:not(.active)
background-color: rgba(0,0,0,0.25) !important
cursor: pointer
transform: translateX(1px)
transition: background 0.05s ease-in-out, transform 0.1s ease-in-out
&:nth-of-type(even)
background-color: rgba(0,0,0,0.1)
&:last-of-type
border: 0
&__icon img
border-radius: 100%
width: 50px
height: 50px
border: 2px solid transparent
&__info
padding: 0 10px
a.server-list__item
color: var(--c-white)
text-decoration: none
.active
cursor: default

53
UI/src/components/servers/UserCard.css
View file

@ -1,53 +0,0 @@
.user-card {
position: relative;
display: flex;
background-color: rgba(0,0,0,0.3);
/* border-bottom: 1px solid var(--c-3); */
padding: 25px 15px;
grid-area: user;
}
.user-card__icon img {
width: 50px;
height: 50px;
border-radius: 100%;
border: 2px solid #5fc66d;
}
.user-card__info {
padding: 0 10px;
line-height: 50px
}
.user-card__info__discrim {
font-weight: 100;
font-size: 0.7rem;
color: var(--c-7);
}
.user-card__info__name {
/* font-size */
/* font-weight: ; */
}
.user-card__actions {
position: absolute;
right: 5px;
top: 5px;
bottom: 5px;
display: flex;
align-items: center;
justify-content: center;
}
.user-card__actions svg {
transition: transform 0.05s ease-in-out;
}
.user-card__actions svg:hover {
transform: scale(1.15);
}
.user-card__actions polygon {
fill: var(--c-7);
}

25
UI/src/components/servers/UserCard.js
View file

@ -1,18 +1,33 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { NavLink } from 'react-router-dom'
import Radium from 'radium'
import './UserCard.css'
import './UserCard.sass'
class UserCard extends Component {
static propTypes = {
user: PropTypes.object.isRequired
}
get avatar () {
const { user } = this.props
if (user.avatar === '' || user.avatar == null) {
return `https://cdn.discordapp.com/embed/avatars/${Math.ceil(Math.random() * 9999) % 4}.png`
}
return `https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`
}
render () {
const { user } = this.props
// console.log(this.props)
return <div className='user-card'>
<div className='user-card__icon'>
<img src={`https://cdn.discordapp.com/avatars/${user.id}/${user.avatar}.png`} />
<img src={this.avatar} alt={user.username} />
</div>
<div className='user-card__info'>
<span className='user-card__info__name'>{user.username}</span><span className='user-card__info__discrim'>#{user.discriminator}</span>
<span className='user-card__info__name'>{user.username}</span><span className='user-card__info__discrim'>#{user.discriminator}</span>
</div>
<div className='user-card__actions'>
<ul className='uk-iconnav uk-iconnav-vertical'>
@ -28,4 +43,4 @@ class UserCard extends Component {
}
}
export default Radium(UserCard)
export default UserCard

44
UI/src/components/servers/UserCard.sass Normal file
View file

@ -0,0 +1,44 @@
.user-card
position: relative
display: flex
background-color: var(--c-dark)
/* border-bottom: 1px solid var(--c-3) */
padding: 25px 15px
grid-area: user
&__icon img
width: 50px
height: 50px
border-radius: 100%
border: 2px solid #5fc66d
&__info
padding: 0 10px
line-height: 50px
&__discrim
font-weight: 100
font-size: 0.7rem
color: var(--c-7)
&__name
/* font-size */
/* font-weight: */
&__actions
position: absolute
right: 5px
top: 5px
bottom: 5px
display: flex
align-items: center
justify-content: center
svg
transition: transform 0.05s ease-in-out
svg:hover
transform: scale(1.15)
polygon
fill: var(--c-7)

20
UI/src/components/servers/index.css
View file

@ -1,20 +0,0 @@
.servers {
display: grid;
grid-template-rows: 100px calc(100vh - 75px);
grid-template-columns: 300px 1fr;
grid-template-areas: "user content"
"listing content";
}
.servers__nav {
grid-area: listing;
overflow-y: scroll;
height: calc(100vh - 175px);
}
.servers__content {
grid-area: content;
background-color: var(--c-3);
padding: 15px;
overflow-y: scroll;
}

18
UI/src/components/servers/index.js
View file

@ -1,29 +1,27 @@
import React, { Component } from 'react'
import { Route } from 'react-router-dom'
import Radium from 'radium'
import superagent from 'superagent'
import './index.css'
import './index.sass'
import Navigation from './Navigation'
import RolePicker from '../role-picker'
import mockData from './mockData'
// import mockData from './mockData'
class Servers extends Component {
state = {
user: mockData.user,
servers: [],
}
async componentWillMount () {
const rsp = await superagent.get(`/api/~/relevant-servers/62601275618889728`)
const rsp = await superagent.get(`/api/servers`)
this.setState({ servers: rsp.body })
}
render () {
return <div className="servers">
<Navigation className="servers__nav" servers={this.state.servers} user={this.state.user} />
<Navigation className="servers__nav" servers={[]} user={{}} />
<div className="servers__content">
{/* another router probably. */}
<Route path='/s/:server' component={RolePicker} />
<Route path='/s/:server/edit' component={RolePicker} />
</div>
</div>
}

21
UI/src/components/servers/index.sass Normal file
View file

@ -0,0 +1,21 @@
.servers
$fullH: calc(100vh - 75px)
display: grid
grid-template-rows: 100px $fullH
grid-template-columns: 300px 1fr
grid-template-areas: "user content" "listing content"
&__nav
grid-area: listing
overflow-y: scroll
height: $fullH
&__content
grid-area: content
background-color: var(--c-3)
padding: 15px
overflow-y: scroll

4
UI/src/components/wrapper/index.js
View file

@ -14,8 +14,8 @@ class Wrapper extends Component {
<div className='uk-navbar-left'>
<Logotype style={{ height: '2rem' }} className='wrapper__logotype' />
</div>
<div class='uk-navbar-right'>
<ul class='uk-navbar-nav'>
<div className='uk-navbar-right'>
<ul className='uk-navbar-nav'>
<li><Link to='/start'>Get Started</Link></li>
<li><a href='https://discord.gg/PWQUVsd'>Support Discord</a></li>
</ul>

10
UI/src/index.css
View file

@ -10,11 +10,11 @@ body {
:root {
--c-white: #efefef;
--c-9: #EBD6D4;
--c-7: #AB9C9A;
--c-5: #6B6261;
--c-3: #5E5655;
--c-1: #453F3E;
--c-dark: #5E5655;
--c-7: #ab9b9a;
--c-5: #756867;
--c-3: #5d5352;
--c-1: #453e3d;
--c-dark: #332d2d;
}
::selection {

11
UI/src/reducers/index.js Normal file
View file

@ -0,0 +1,11 @@
import { combineReducers } from 'redux'
import servers from './servers'
import user from './user'
const rootReducer = combineReducers({
servers,
user
})
export default rootReducer

36
UI/src/reducers/servers.js Normal file
View file

@ -0,0 +1,36 @@
import { Set, Map } from 'immutable'
const blankServer = Map({
'id': '386659935687147521',
'gm': {
'nickname': null,
'color': '#cca1a1'
},
'server': {
'id': '386659935687147521',
'name': 'Roleypoly',
'ownerID': '62601275618889728',
'icon': '4fa0c1063649a739f3fe1a0589aa2c03'
},
'perms': {
'isAdmin': true,
'canManageRoles': true
}
})
const initialState = Set([])
export default (state = initialState, { type, data }) => {
console.log(__filename, type, data)
switch (type) {
case Symbol.for('update servers'):
return data.reduce((acc, s) => acc.add(Map(s)), Set())
case Symbol.for('add debug server'):
return Set([blankServer])
default:
return state
}
}

15
UI/src/reducers/user.js Normal file
View file

@ -0,0 +1,15 @@
import { Map } from 'immutable'
const initialState = Map({
username: 'あたし',
discriminator: '0001',
id: '',
avatar: null
})
export default (state = initialState, { type, data }) => {
switch (type) {
default:
return state
}
}

50
UI/src/store.js Normal file
View file

@ -0,0 +1,50 @@
import { observable, computed } from 'mobx'
class Store {
@observable servers = [
{
"id": "203493697696956418",
"gm": {
"nickname": "sexkittenhime",
"color": "#ff5c00"
},
"server": {
"id": "203493697696956418",
"name": "Genudine Medkit Manufacturing",
"ownerID": "62601275618889728",
"icon": "ff08d36f5aee1ff48f8377b65d031ab0"
},
"perms": {
"isAdmin": true,
"canManageRoles": true
}
},
{
"id": "386659935687147521",
"gm": {
"nickname": null,
"color": "#cca1a1"
},
"server": {
"id": "386659935687147521",
"name": "Roleypoly",
"ownerID": "62601275618889728",
"icon": "4fa0c1063649a739f3fe1a0589aa2c03"
},
"perms": {
"isAdmin": true,
"canManageRoles": true
}
}
]
@observable user = {
username: 'あたし',
discriminator: '0001',
id: '',
avatar: null
}
}
export default Store

29
UI/src/store/configureStore.dev.js Normal file
View file

@ -0,0 +1,29 @@
import { createStore, applyMiddleware, compose } from 'redux'
import thunk from 'redux-thunk'
import { createLogger } from 'redux-logger'
// import api from '../middleware/api'
import rootReducer from '../reducers'
import DevTools from '../components/dev-tools'
const configureStore = preloadedState => {
const store = createStore(
rootReducer,
preloadedState,
compose(
applyMiddleware(thunk, createLogger()),
DevTools.instrument()
)
)
if (module.hot) {
// Enable Webpack hot module replacement for reducers
module.hot.accept('../reducers', () => {
store.replaceReducer(rootReducer)
})
}
return store
}
export default configureStore

5
UI/src/store/configureStore.js Normal file
View file

@ -0,0 +1,5 @@
if (process.env.NODE_ENV === 'production') {
module.exports = require('./configureStore.prod')
} else {
module.exports = require('./configureStore.dev')
}

12
UI/src/store/configureStore.prod.js Normal file
View file

@ -0,0 +1,12 @@
import { createStore, applyMiddleware } from 'redux'
import thunk from 'redux-thunk'
// import api from '../middleware/api'
import rootReducer from '../reducers'
const configureStore = preloadedState => createStore(
rootReducer,
preloadedState,
applyMiddleware(thunk)
)
export default configureStore

1874
UI/yarn.lock
View file

File diff suppressed because it is too large Load diff