From d14b745cfb57abc30353b999d4e321388cfd868b Mon Sep 17 00:00:00 2001 From: Troplo Date: Sat, 28 Nov 2020 23:37:33 +1100 Subject: [PATCH] 3/5 --- frontend/src/App.vue | 21 ++- frontend/src/components/AvatarIcon.vue | 2 +- frontend/src/components/TeamDisplay.vue | 5 + .../components/routes/AdminMarketplace.vue | 34 ++--- frontend/src/components/routes/Character.vue | 11 ++ frontend/src/components/routes/Index.vue | 6 +- .../src/components/routes/Marketplace.vue | 9 +- .../components/routes/MarketplaceCreate.vue | 31 +++- .../src/components/routes/MarketplaceItem.vue | 41 +++++- .../src/components/routes/TeamInvites.vue | 2 +- .../src/components/routes/TeamMembers.vue | 39 ++++- frontend/src/components/routes/TeamRoles.vue | 37 +++-- frontend/src/components/routes/TeamUsers.vue | 41 +++++- frontend/src/components/routes/User.vue | 14 +- .../src/components/routes/UserFriends.vue | 4 +- .../src/components/routes/UserInventory.vue | 1 + frontend/src/store/index.js | 4 + lib/errors.js | 4 + migrations/20201128071217-modeler.js | 15 ++ models/item.js | 8 +- models/user.js | 5 + rendering/avatar.blend | Bin 747304 -> 747368 bytes rendering/{avatar.blend1 => avatarhs.blend} | Bin 747320 -> 747304 bytes rendering/marketplacecontent/41.py | 57 +++++++ rendering/marketplacecontent/42.py | 57 +++++++ rendering/usercontent/1.py | 18 +-- rendering/usercontent/2.py | 46 ++++++ rendering/usercontent/36.py | 46 ++++++ rendering/usercontent/37.py | 46 ++++++ rendering/usercontent/38.py | 46 ++++++ rendering/usercontent/39.py | 46 ++++++ rendering/usercontent/40.py | 46 ++++++ rendering/usercontent/hs/1.py | 42 ++++++ rendering/usercontent/hs/2.py | 42 ++++++ routes/admin.js | 139 +++++++++++++++++- routes/avatar.js | 19 ++- routes/marketplace.js | 132 +++++++++++++++-- routes/relationship.js | 9 +- routes/team.js | 2 +- routes/team_admin.js | 2 + 40 files changed, 1020 insertions(+), 109 deletions(-) create mode 100644 migrations/20201128071217-modeler.js rename rendering/{avatar.blend1 => avatarhs.blend} (79%) create mode 100644 rendering/marketplacecontent/41.py create mode 100644 rendering/marketplacecontent/42.py create mode 100644 rendering/usercontent/2.py create mode 100644 rendering/usercontent/36.py create mode 100644 rendering/usercontent/37.py create mode 100644 rendering/usercontent/38.py create mode 100644 rendering/usercontent/39.py create mode 100644 rendering/usercontent/40.py create mode 100644 rendering/usercontent/hs/1.py create mode 100644 rendering/usercontent/hs/2.py diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 3f1d2cc..404e8af 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -773,7 +773,7 @@ blockquote { {{$store.state.availableUsers.user3.username}} {{$store.state.availableUsers.user3.username}} Add another user - Logout all users + Logout of all users Not seeing any users? @@ -1095,6 +1095,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) if(res.data.theme === "dark") { this.darkTheme() } @@ -1151,6 +1152,7 @@ export default { this.$store.commit('setAdmin', res.data.admin) this.$store.commit('setDevMode', res.data.developerMode) this.$store.commit('setTheme', res.data.theme) + this.$store.commit('setModeler', res.data.modeler) }) }) .catch(e => { @@ -1191,6 +1193,7 @@ export default { this.$store.commit('setEmailVerified', res.data.emailVerified) this.$store.commit('setAdmin', res.data.admin) this.$store.commit('setDevMode', res.data.developerMode) + this.$store.commit('setModeler', res.data.modeler) }) }) .catch(e => { @@ -1219,6 +1222,7 @@ export default { this.$store.commit('setAdmin', res.data.admin) this.$store.commit('setDevMode', res.data.developerMode) this.$store.commit('setTheme', res.data.theme) + this.$store.commit('setModeler', res.data.modeler) }) }) .catch(e => { @@ -1305,12 +1309,11 @@ export default { this.$store.commit('setEmail', res.data.email) this.$store.commit('setEmailVerified', res.data.emailVerified) this.$store.commit('setAdmin', res.data.admin) + this.$store.commit('setModeler', res.data.modeler) }) }) .catch(e => { this.settings.account.email.loadingChange = false - - console.log(e) AjaxErrorHandler(this.$store)(e) }) .catch(e => { @@ -1379,6 +1382,7 @@ export default { this.$store.commit('setTheme', res.data.theme) this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) + this.$store.commit('setModeler', res.data.modeler) this.axios.get(process.env.VUE_APP_APIENDPOINT + process.env.VUE_APP_APIVERSION + '/' + 'kaverti/state') .then(res => { this.$store.commit('setSettings', res.data) @@ -1416,7 +1420,6 @@ export default { }) .catch(e => { this.settings.account.deleteAccountLoading = false - console.log(e) AjaxErrorHandler(this.$store)(e) }) }, @@ -1562,6 +1565,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) this.axios.get(process.env.VUE_APP_APIENDPOINT + process.env.VUE_APP_APIVERSION + '/' + 'kaverti/state') .then(res => { this.$store.commit('setSettings', res.data) @@ -1599,6 +1603,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) this.axios.get(process.env.VUE_APP_APIENDPOINT + process.env.VUE_APP_APIVERSION + '/' + 'kaverti/state') .then(res => { this.$store.commit('setSettings', res.data) @@ -1675,6 +1680,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) this.axios.get(process.env.VUE_APP_APIENDPOINT + process.env.VUE_APP_APIVERSION + '/' + 'kaverti/state') .then(res => { this.$store.commit('setSettings', res.data) @@ -1709,6 +1715,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) this.closeConn() }).catch(err => { this.showConn() @@ -1873,6 +1880,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) this.closeConn() @@ -1987,6 +1995,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) this.closeConn() }).catch(err => { this.showConn() @@ -2006,7 +2015,6 @@ export default { } }, mounted () { - console.log(JSON.parse(localStorage.getItem('currentUser'))) this.$store.commit('setMultiUser1Sess', JSON.parse(localStorage.getItem('accessToken'))) this.$store.commit('setMultiUser2Sess', JSON.parse(localStorage.getItem('accessToken2'))) this.$store.commit('setMultiUser3Sess', JSON.parse(localStorage.getItem('accessToken3'))) @@ -2115,6 +2123,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) if(res.data.theme === "dark") { this.darkTheme() } @@ -2147,7 +2156,6 @@ export default { this.pollConn() } }) - console.log(this.$store.state.sessToken + 'IDENTIFY') this.axios.get(process.env.VUE_APP_APIENDPOINT + process.env.VUE_APP_APIVERSION + '/' + 'userinfo', { headers: { 'Authorization': this.$store.state.sessToken @@ -2164,6 +2172,7 @@ export default { this.$store.commit('setExecutive', res.data.executive) this.$store.commit('setUserId', res.data.id) this.$store.commit('setBot', res.data.bot) + this.$store.commit('setModeler', res.data.modeler) this.closeConn() }).catch(err => { this.showConn() diff --git a/frontend/src/components/AvatarIcon.vue b/frontend/src/components/AvatarIcon.vue index 39ba983..55a1d1e 100644 --- a/frontend/src/components/AvatarIcon.vue +++ b/frontend/src/components/AvatarIcon.vue @@ -5,7 +5,7 @@