From 5d4c519b78beefb95e3d9a760393afbbf7e16fc0 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Thu, 10 Nov 2022 13:46:50 +0000 Subject: [PATCH 1/6] added `getUserBadges` method --- packages/app/src/models/user/index.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/packages/app/src/models/user/index.js b/packages/app/src/models/user/index.js index 45878c71..4b36fa2c 100755 --- a/packages/app/src/models/user/index.js +++ b/packages/app/src/models/user/index.js @@ -75,6 +75,26 @@ export default class User { return User.hasRole("admin") } + static async getUserBadges(user_id) { + if (!User.bridge) { + return false + } + + if (!user_id) { + user_id = await User.selfUserId() + } + + const { data } = await app.api.customRequest("main", { + method: "GET", + url: "/user/badges", + params: { + user_id: user_id, + } + }) + + return data + } + static async register(payload) { if (!User.bridge) { return false From de36c90f4368db152c5b8bdf9ac1261bb68d3d6a Mon Sep 17 00:00:00 2001 From: srgooglo Date: Thu, 10 Nov 2022 13:47:11 +0000 Subject: [PATCH 2/6] implement `/user/badges` endpoint --- .../src/controllers/BadgesController/index.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/server/src/controllers/BadgesController/index.js b/packages/server/src/controllers/BadgesController/index.js index 575b5579..20f737ac 100755 --- a/packages/server/src/controllers/BadgesController/index.js +++ b/packages/server/src/controllers/BadgesController/index.js @@ -28,6 +28,22 @@ export default class BadgesController extends Controller { return res.json(badges) } }), + "/user/badges": { + middlewares: ["withAuthentication"], + fn: async (req, res) => { + const user = await User.findOne({ _id: req.query.user_id ?? req.user._id }) + + if (!user) { + return res.status(404).json({ error: "User not found" }) + } + + const badges = await Badge.find({ + name: { $in: user.badges }, + }) + + return res.json(badges) + } + } } post = { From d26ad31740e7707553fa1ac345b700870aa23e14 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Thu, 10 Nov 2022 13:47:21 +0000 Subject: [PATCH 3/6] use model to fetch badges --- packages/app/src/pages/account/index.jsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/app/src/pages/account/index.jsx b/packages/app/src/pages/account/index.jsx index c2820199..5cd2a571 100755 --- a/packages/app/src/pages/account/index.jsx +++ b/packages/app/src/pages/account/index.jsx @@ -49,16 +49,17 @@ const TabRender = React.memo((props) => { const UserBadges = React.memo((props) => { return React.createElement(Loadable({ loader: async () => { - let { badges } = props + let { user_id } = props + + const badgesData = await User.getUserBadges(user_id).catch((err) => { + console.error(err) + + app.message.error("Failed to fetch user badges") - if (!badges || Array.isArray(badges) === false || badges.length === 0) { return null - } + }) - // fetch badges datam from api - const badgesData = await app.api.request("main", "get", "badges", { - _id: badges - }).catch(() => false) + console.log(badgesData) if (!badgesData) { return null @@ -286,7 +287,7 @@ export default class Account extends React.Component {
}> - +
From 0579a57911941819135ffe7b6c36579861629dd6 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Thu, 10 Nov 2022 13:47:30 +0000 Subject: [PATCH 4/6] change peacock color --- .vscode/settings.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 54f6c0db..a39611e0 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,23 @@ { - "discord.enabled": false + "discord.enabled": false, + "workbench.colorCustomizations": { + "activityBar.activeBackground": "#65c89b", + "activityBar.background": "#65c89b", + "activityBar.foreground": "#15202b", + "activityBar.inactiveForeground": "#15202b99", + "activityBarBadge.background": "#945bc4", + "activityBarBadge.foreground": "#e7e7e7", + "commandCenter.border": "#15202b99", + "sash.hoverBorder": "#65c89b", + "statusBar.background": "#42b883", + "statusBar.foreground": "#15202b", + "statusBarItem.hoverBackground": "#359268", + "statusBarItem.remoteBackground": "#42b883", + "statusBarItem.remoteForeground": "#15202b", + "titleBar.activeBackground": "#42b883", + "titleBar.activeForeground": "#15202b", + "titleBar.inactiveBackground": "#42b88399", + "titleBar.inactiveForeground": "#15202b99" + }, + "peacock.remoteColor": "#42b883" } \ No newline at end of file From 5d8c0bb2c714f4fe0e46ea787b0367e193ce2e16 Mon Sep 17 00:00:00 2001 From: srgooglo Date: Thu, 10 Nov 2022 13:50:58 +0000 Subject: [PATCH 5/6] fix style --- packages/app/src/components/PostCreator/index.less | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/app/src/components/PostCreator/index.less b/packages/app/src/components/PostCreator/index.less index 81348ebe..3bffe28f 100755 --- a/packages/app/src/components/PostCreator/index.less +++ b/packages/app/src/components/PostCreator/index.less @@ -69,9 +69,15 @@ .ant-upload { span { - width: fit-content !important; + width: 100%; + } + svg { + margin: 0 !important; + } + + .ant-upload-select-picture-card { background-color: transparent !important; } @@ -112,7 +118,7 @@ flex-direction: row; width: 100%; - + overflow-x: auto; overflow-y: hidden; From 45189c96588b363acb247ebc151ee3b16bd26c0c Mon Sep 17 00:00:00 2001 From: srgooglo Date: Thu, 10 Nov 2022 13:51:16 +0000 Subject: [PATCH 6/6] bump version --- .corenode | 2 +- package.json | 2 +- packages/app/package.json | 2 +- packages/server/package.json | 2 +- packages/wrapper/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.corenode b/.corenode index 73a3f6fb..90857574 100755 --- a/.corenode +++ b/.corenode @@ -1,3 +1,3 @@ { - "version": "0.28.3" + "version": "0.28.4" } diff --git a/package.json b/package.json index 067c840b..dfc43105 100755 --- a/package.json +++ b/package.json @@ -22,5 +22,5 @@ "devDependencies": { "concurrently": "^7.5.0" }, - "version": "0.28.3" + "version": "0.28.4" } diff --git a/packages/app/package.json b/packages/app/package.json index 97e73242..8828e0e9 100755 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "comty", - "version": "0.28.3", + "version": "0.28.4", "license": "LGPL-2.1", "main": "electron/main", "author": "RageStudio", diff --git a/packages/server/package.json b/packages/server/package.json index 0c9182be..9ecdf184 100755 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@comty/server", - "version": "0.28.3", + "version": "0.28.4", "main": "dist/index.js", "scripts": { "build": "corenode-cli build", diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json index 84700a02..151a7e39 100755 --- a/packages/wrapper/package.json +++ b/packages/wrapper/package.json @@ -1,6 +1,6 @@ { "name": "wrapper", - "version": "0.28.3", + "version": "0.28.4", "main": "./src/index.js", "license": "MIT", "scripts": {