kaverti
/
website
5
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

1.0.0-prerelease4

This commit is contained in:
Troplo 2021-02-04 18:24:22 +11:00
parent 2020b4ac48
commit c45e8ea2b2
8 changed files with 103 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacyfrontend/src/components/routes/Character.vue
View File

@ -384,6 +384,6 @@ export default {
},
mounted () {
this.fetchData();
}
},
}
</script>

23
lib/authCheck.js Normal file
View File

@ -0,0 +1,23 @@
let {
User, sequelize
} = require('../models')
const jwt = require("jsonwebtoken");
const Errors = require('../lib/errors')
module.exports = async(req, res, next) => {
try {
const token = req.headers.authorization.replace("Bearer ", "");
const decoded = jwt.verify(token, "iouydhtrfguyrthgftryhgidrhytgidhytiglriltnhgrhtiuygrthiugritghiyutrcginhrtijghurfcuhjgnioergjfuiehtiehtiehyritheithreifbhgehfbdxhbkvfdbhjkvgdkhnjUIYIRUiuiuYIYI3i42yiuyIUYIU4yiu$YUI#YUI$3mvsazr57;" + process.env.SESSION_SECRET);
req.userData = decoded;
let user = await User.findOne({ where: {
id: req.userData.id
}})
if(user && user.jwtOffset == req.userData.offset) {
req.userData = decoded;
return true
} else {
return false
}
} catch {
return false
}
};

35
migrations/20210204053359-TeamAvatars.js Normal file
View File

@ -0,0 +1,35 @@
module.exports = {
up(queryInterface, Sequelize) {
return Promise.all([
queryInterface.addColumn(
'Teams',
'hatId',
{
type: Sequelize.BIGINT,
},
),
queryInterface.addColumn(
'Teams',
'pantsId',
{
type: Sequelize.BIGINT,
},
),
queryInterface.addColumn(
'Teams',
'shirtId',
{
type: Sequelize.BIGINT,
},
),
queryInterface.addColumn(
'Teams',
'faceId',
{
type: Sequelize.BIGINT,
defaultValue: 0
},
),
]);
},
}

13
models/team.js
View File

@ -118,6 +118,19 @@ module.exports = (sequelize, DataTypes) => {
default: false,
defaultValue: false
},
hatId: {
type: DataTypes.BIGINT
},
shirtId: {
type: DataTypes.BIGINT
},
pantsId: {
type: DataTypes.BIGINT
},
faceId: {
type: DataTypes.BIGINT,
defaultValue: 0
},
picture: {
type: DataTypes.TEXT('long'),
validate: {

14
rendering/usercontent/1.py
View File

@ -12,7 +12,7 @@ def hex_to_rgb(value):
fin.append(g)
fin.append(b)
return tuple(fin)
bpy.ops.wm.open_mainfile(filepath='C:/Users/matth/Documents/GitHub/website/rendering/avatar.blend')
bpy.ops.wm.open_mainfile(filepath='/home/kaverti/website/rendering/avatar.blend')
bpy.data.objects['Head'].select = True
bpy.data.materials['Head'].diffuse_color = hex_to_rgb('#F2C511')
bpy.data.materials['Face'].diffuse_color = hex_to_rgb('#F2C511')
@ -26,25 +26,25 @@ bpy.data.objects['Left Leg'].select = True
bpy.data.objects['Left Leg'].active_material.diffuse_color = hex_to_rgb('#3D556E')
bpy.data.objects['Right Leg'].select = True
bpy.data.objects['Right Leg'].active_material.diffuse_color = hex_to_rgb('#C0382B')
hat_import = bpy.ops.import_scene.obj(filepath='C:/Users/matth/Documents/GitHub/website/rendering/global/5873ada4b44681127842826981ff3d97.obj')
hat_import = bpy.ops.import_scene.obj(filepath='/home/kaverti/website/rendering/global/5873ada4b44681127842826981ff3d97')
hat = bpy.context.selected_objects[0]
bpy.context.selected_objects[0].data.name = 'hat'
bpy.context.selected_objects[0].name = 'hat'
hat_material = bpy.data.materials.new('hat')
hat_material.diffuse_shader = 'LAMBERT'
hat.active_material = hat_material
hat_image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/5873ada4b44681127842826981ff3d97.png')
hat_image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/5873ada4b44681127842826981ff3d97.png')
hat_texture = bpy.data.textures.new('ColorTex', type = 'IMAGE')
hat_texture.image = hat_image
hat_add = bpy.data.objects['hat'].active_material.texture_slots.add()
hat_add.texture = hat_texture
face_Image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/fc56a2a4f55254f475ccea568402d2bc.png')
face_Image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/fc56a2a4f55254f475ccea568402d2bc.png')
bpy.data.textures['Face'].image = face_Image
shirt_Image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/0.png')
shirt_Image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/0.png')
bpy.data.textures['Shirt'].image = shirt_Image
bpy.data.textures['ShirtR'].image = shirt_Image
bpy.data.textures['ShirtL'].image = shirt_Image
pants_Image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/0.png')
pants_Image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/0.png')
bpy.data.textures['PantsR'].image = pants_Image
bpy.data.textures['PantsL'].image = pants_Image
for obj in bpy.data.objects:
@ -53,5 +53,5 @@ for obj in bpy.data.objects:
bpy.ops.view3d.camera_to_view_selected()
scene = bpy.context.scene
scene.render.image_settings.file_format = 'PNG'
scene.render.filepath = 'C:/xampp21/htdocs/user/avatars/full/e97a54fe29e2e3a2be14751f24113bd1.png'
scene.render.filepath = '/var/www/html/cdn/user/avatars/full/4daef004be39e0c4c2f5b6498e6fcbaf.png'
bpy.ops.render.render(write_still = 1)

14
rendering/usercontent/hs/1.py
View File

@ -12,7 +12,7 @@ def hex_to_rgb(value):
fin.append(g)
fin.append(b)
return tuple(fin)
bpy.ops.wm.open_mainfile(filepath='C:/Users/matth/Documents/GitHub/website/rendering/avatarhs.blend')
bpy.ops.wm.open_mainfile(filepath='/home/kaverti/website/rendering/avatarhs.blend')
bpy.data.objects['Head'].select = True
bpy.data.materials['Head'].diffuse_color = hex_to_rgb('#F2C511')
bpy.data.materials['Face'].diffuse_color = hex_to_rgb('#F2C511')
@ -26,28 +26,28 @@ bpy.data.objects['Left Leg'].select = True
bpy.data.objects['Left Leg'].active_material.diffuse_color = hex_to_rgb('#3D556E')
bpy.data.objects['Right Leg'].select = True
bpy.data.objects['Right Leg'].active_material.diffuse_color = hex_to_rgb('#C0382B')
hat_import = bpy.ops.import_scene.obj(filepath='C:/Users/matth/Documents/GitHub/website/rendering/global/5873ada4b44681127842826981ff3d97.obj')
hat_import = bpy.ops.import_scene.obj(filepath='/home/kaverti/website/rendering/global/5873ada4b44681127842826981ff3d97')
hat = bpy.context.selected_objects[0]
bpy.context.selected_objects[0].data.name = 'hat'
bpy.context.selected_objects[0].name = 'hat'
hat_material = bpy.data.materials.new('hat')
hat_material.diffuse_shader = 'LAMBERT'
hat.active_material = hat_material
hat_image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/5873ada4b44681127842826981ff3d97.png')
hat_image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/5873ada4b44681127842826981ff3d97.png')
hat_texture = bpy.data.textures.new('ColorTex', type = 'IMAGE')
hat_texture.image = hat_image
hat_add = bpy.data.objects['hat'].active_material.texture_slots.add()
hat_add.texture = hat_texture
face_Image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/fc56a2a4f55254f475ccea568402d2bc.png')
face_Image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/fc56a2a4f55254f475ccea568402d2bc.png')
bpy.data.textures['Face'].image = face_Image
shirt_Image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/0.png')
shirt_Image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/0.png')
bpy.data.textures['Shirt'].image = shirt_Image
bpy.data.textures['ShirtR'].image = shirt_Image
bpy.data.textures['ShirtL'].image = shirt_Image
pants_Image = bpy.data.images.load(filepath = 'C:/Users/matth/Documents/GitHub/website/rendering/global/0.png')
pants_Image = bpy.data.images.load(filepath = '/home/kaverti/website/rendering/global/0.png')
bpy.data.textures['PantsR'].image = pants_Image
bpy.data.textures['PantsL'].image = pants_Image
scene = bpy.context.scene
scene.render.image_settings.file_format = 'PNG'
scene.render.filepath = 'C:/xampp21/htdocs/user/avatars/headshot/e97a54fe29e2e3a2be14751f24113bd1.png'
scene.render.filepath = '/var/www/html/cdn/user/avatars/headshot/4daef004be39e0c4c2f5b6498e6fcbaf.png'
bpy.ops.render.render(write_still = 1)

15
routes/inventory.js
View File

@ -21,6 +21,21 @@ router.get('/', auth, async(req, res, next) => {
} catch (e) { next(e) }
})
router.get('/:category', auth, async(req, res, next) => {
try {
let queryObj = {
where: {UserId: req.userData.id},
include: { model: Item, where: {ItemCategoryId: req.params.category}, include: { model: User, attributes: ['username', 'createdAt', 'id', 'color', 'picture', 'locked', 'admin', 'booster', 'executive', 'bot'] } }
}
let transaction = await Inventory.findAndCountAll(queryObj)
if(!transaction) {
res.status(200)
res.json({success: false})
}
res.json(transaction)
} catch (e) { next(e) }
})
router.post('/', auth, async(req, res, next) => {
try {
if (

18
routes/state.js
View File

@ -1,9 +1,8 @@
let express = require('express')
let router = express.Router()
const auth = require('../lib/auth')
const Errors = require('../lib/errors')
let { Settings, Ban, Sequelize } = require('../models')
let { Settings } = require('../models')
router.get('/', async(req, res, next) => {
try {
@ -14,22 +13,9 @@ router.get('/', async(req, res, next) => {
attributes: { exclude: ['id', 'createdAt', 'updatedAt'] }
})
if(!settings) throw Errors.noSettings
res.json({state: settings.toJSON(), apiVersion: '1.0.0-prerelease3'})
res.json({state: settings.toJSON(), apiVersion: '1.0.0-prerelease4'})
} catch (e) { next(e) }
})
router.all('*', auth, (req, res, next) => {
if(req.userData.admin) {
next()
} else {
res.status(401)
res.json({
errors: [Errors.requestNotAuthorized]
})
}
})
module.exports = router