Start integration of Solve Count

Author: forthright48

client/src/api/user.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function getUser(username) {
+  return request({
+    url: `/api/v1/user/${username}`,
+    method: 'get'
+  })
+}

client/src/views/users/components/index.js

@@ -0,0 +1,2 @@
+export { default as UserProfile } from './userProfile.vue'
+export { default as SolveCount } from './solveCount.vue'

client/src/views/users/components/solveCount.vue

@@ -0,0 +1,39 @@
+<template lang="pug">
+  div
+    h1.text-center Solve Count
+    el-table(:data="getSolveCount")
+      el-table-column(prop="index" label="#")
+      el-table-column(prop="oj" label="OJ")
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { GetOjInfo } from '@/store/actions'
+
+export default {
+  props: ['username'],
+  computed: {
+    ...mapGetters([
+      'ojInfo'
+    ]),
+    getSolveCount() {
+      return Object.keys(this.ojInfo).map((oj, ind) => {
+        return {
+          index: ind,
+          oj
+        }
+      })
+    }
+  },
+  async created() {
+    if (Object.keys(this.ojInfo).length === 0) {
+      await this.$store.dispatch(GetOjInfo)
+    }
+    console.log(this.ojInfo)
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>

client/src/views/users/components/userProfile.vue

@@ -0,0 +1,50 @@
+<template lang="pug">
+  div
+    h1.text-center User Profile
+    el-table(:data="getUserFields" align="center")
+      el-table-column
+        template(slot-scope="scope")
+          fa-icon.vertical-middle(:name="scope.row.icon")
+          span.ml-2 {{scope.row.feature}}
+      el-table-column(align="center")
+        template(slot-scope="scope")
+          template(v-if="scope.row.feature=='Password'")
+            el-button(size="mini" type="primary" round) Update Password
+          template(v-else)
+            span {{scope.row.value}}
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+
+export default {
+  props: ['username'],
+  computed: {
+    ...mapGetters([
+      'user'
+    ]),
+    getUserFields() {
+      return [{
+        feature: 'Email',
+        icon: 'envelope',
+        value: this.user.email
+      }, {
+        feature: 'Username',
+        icon: 'user',
+        value: this.user.username
+      }, {
+        feature: 'Roles',
+        icon: 'users',
+        value: this.user.roles.join(', ')
+      }, {
+        feature: 'Password',
+        icon: 'key'
+      }]
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+
+</style>

client/src/views/users/index.vue

@@ -2,50 +2,19 @@
   .app-container
     el-row(type="flex" justify="center")
       el-col
-        h1.text-center User Profile
-        el-table(:data="getUserFields" align="center")
-          el-table-column
-            template(slot-scope="scope")
-              fa-icon.vertical-middle(:name="scope.row.icon")
-              span.ml-2 {{scope.row.feature}}
-          el-table-column(align="center")
-            template(slot-scope="scope")
-              template(v-if="scope.row.feature=='Password'")
-                el-button(size="mini" type="primary" round) Update Password
-              template(v-else)
-                span {{scope.row.value}}
+        UserProfile
+      el-col
+        h1.text-center Classroom
+    el-row
+      el-col
+        SolveCount
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { UserProfile, SolveCount } from './components'
 
 export default {
-  name: 'profile',
-  props: ['username'],
-  computed: {
-    ...mapGetters([
-      'token',
-      'user'
-    ]),
-    getUserFields() {
-      return [{
-        feature: 'Email',
-        icon: 'envelope',
-        value: this.user.email
-      }, {
-        feature: 'Username',
-        icon: 'user',
-        value: this.user.username
-      }, {
-        feature: 'Roles',
-        icon: 'users',
-        value: this.user.roles.join(', ')
-      }, {
-        feature: 'Password',
-        icon: 'key'
-      }]
-    }
-  }
+  components: { UserProfile, SolveCount }
 }
 </script>
 

server/api/v1/users.js

@@ -5,15 +5,15 @@ const User = require('mongoose').model('User');
 // const Gate = require('mongoose').model('Gate');
 // const ojnames = require(path.join(rootPath, 'models/ojnames'));
 // const ojnamesOnly = ojnames.data.map((x)=>x.name);
-const logger = require('logger');
+// const logger = require('logger');
 // const queue = require('queue');
 
 // router.get('/users/username-userId/:username', getUserIdFromUsername );
 // router.get('/users/stats/whoSolvedIt', whoSolvedIt );
 
 router.get('/users/info', getInfo);
 router.post('/users/logout', logout);
-// router.get('/users/:username', getUser );
+router.get('/user/:username', getUser );
 // router.get('/users/:username/root-stats', rootStats);
 // router.put('/users/:username/sync-solve-count', syncSolveCount);
 //
@@ -74,32 +74,33 @@ function logout(req, res, next) {
 //   }
 // }
 //
-// async function getUser(req, res, next) {
-//   try {
-//     const {username} = req.params;
-//     const {select} = req.query;
-//
-//     const user = await User.findOne({username}).select(select).exec();
-//
-//     if (!user) {
-//       const err = new Error('No such user');
-//       err.status = 400;
-//       throw err;
-//     }
-//
-//     // Remove sensitive information
-//     user.email = undefined;
-//     user.password = undefined;
-//
-//     return res.status(200).json({
-//       status: 200,
-//       data: user,
-//     });
-//   } catch (err) {
-//     return next(err);
-//   }
-// }
-//
+async function getUser(req, res, next) {
+  try {
+    const {username} = req.params;
+    const {select} = req.query;
+
+    const user = await User.findOne({_id: username}).select(select).exec();
+
+    if (!user) {
+      return next({
+        status: 400,
+        message: `BADPARAM: No such user with username: ${username}.`,
+      });
+    }
+
+    // Remove sensitive information
+    user.email = undefined;
+    user.password = undefined;
+
+    return res.status(200).json({
+      status: 200,
+      data: user,
+    });
+  } catch (err) {
+    return next(err);
+  }
+}
+
 // async function whoSolvedIt(req, res, next) {
 //   try {
 //     const {problemList, classId} = req.query;