Merge remote-tracking branch 'origin/develop' into negue/ui/setting

# Conflicts:
#	website/client/src/router/user-routes.js

website/client/src/components/memberDetails.vue

@@ -270,6 +270,9 @@ export default {
   methods: {
     percent,
     showMemberModal (member) {
+      if (this.$route.name === 'userProfile' && this.$route.params?.userId === member._id) {
+        return;
+      }
       this.$router.push({ name: 'userProfile', params: { userId: member._id } });
     },
   },

website/client/src/router/user-routes.js

@@ -1,11 +1,5 @@
 import ParentPage from '@/components/parentPage';
-
-
-// User Pages
-// const StatsPage = () => import(/* webpackChunkName: "user" */'./components/userMenu/stats');
-// const AchievementsPage =
-// () => import(/* webpackChunkName: "user" */'./components/userMenu/achievements');
-export const ProfilePage = () => import(/* webpackChunkName: "user" */'@/components/userMenu/profilePage');
+import { ProfilePage } from './shared-route-imports';
 
 // Settings
 const Settings = () => import(/* webpackChunkName: "settings" */'@/pages/settings-overview');