Merge pull request #87 from segment-oj/change-api-url-ztl

change in api

Author: szdytom

src/components/problem/list.vue

@@ -111,9 +111,44 @@ export default {
       this.$store.commit('setDisplayTag', {
         val: val
       });
+    },
+    limit(val) {
+      this.set_column(val);
     }
   },
   methods: {
+    get_list_lenth() {
+      this.$axios
+        .get(apiurl('/problem/list/count'))
+        .then(response => {
+          let data = response.data;
+          this.data_count = data.res;
+        })
+        .catch(err => {
+          this.$SegmentMessage.error(this, '[Problem List] Get List Length Failed');
+          console.log(err);
+        });
+    },
+    get_column() {
+      if (this.$store.state.user.userid === null) {
+        return;
+      }
+      this.$axios
+        .get(apiurl('/account/' + this.$store.state.user.userid))
+        .then(res => {
+          let data = res.data.res;
+          this.limit = data.list_column;
+        });
+    },
+    set_column(x) {
+      if (this.$store.state.user.userid === null) {
+        return;
+      }
+      this.$axios
+        .patch(apiurl('/account/' + this.$store.state.user.userid), {
+          list_column: x
+        });
+    },
     process(x) {
       let color = '';
       if (x.score === 100) {
@@ -149,16 +184,8 @@ export default {
     JumpToProblem
   },
   mounted() {
-    this.$axios
-      .get(apiurl('/problem/list/count'))
-      .then(response => {
-        let data = response.data;
-        this.data_count = data.res;
-      })
-      .catch(err => {
-        this.$SegmentMessage.error(this, '[Problem List] Get List Length Failed');
-        console.log(err);
-      });
+    this.get_list_lenth();
+    this.get_column();
   }
 };
 </script>

src/components/user/content.vue

@@ -172,7 +172,6 @@ export default {
           this.username = data.username;
           this.userid = data.id;
           this.email = data.email;
-          this.introduction = data.introduction;
           this.solved = data.solved;
           this.submit = data.submit_time;
           this.timeJoin = timeFormat(data.date_joined);
@@ -194,6 +193,18 @@ export default {
           if (this.$store.state.user.isStaff || this.userid == String(this.$store.state.user.userid)) {
             this.ismine = true;
           }
+          this.$axios
+            .get(apiurl('/account/' + this.$route.params.id + '/introduction'))
+            .then(detail => {
+              this.introduction = detail.data.res.introduction;
+            })
+            .catch(err => {
+              if(err.request.status === 404) {
+                this.$SegmentMessage.error(this, 'User does not exist');
+              } else {
+                this.$SegmentMessage.error(this, 'Unkown error');
+              }
+            });
           this.userLoading = false;
         })
         .catch(err => {

src/components/user/edit.vue

@@ -123,7 +123,6 @@ export default {
           if (this.isMine || this.isRootMe || this.isStaffMe) {
             this.username = data.username;
             this.email = data.email;
-            this.introduction = data.introduction;
             this.isStaff = data.is_staff;
             this.isRoot = data.is_superuser;
             this.isActive = data.is_active;
@@ -139,13 +138,26 @@ export default {
             this.$SegmentMessage.error(this, 'Unkown error');
           }
         });
+      this.$axios
+        .get(apiurl('/account/' + this.$route.params.id + '/introduction'))
+        .then(res => {
+          let data = res.data.res;
+          this.introduction = data.introduction;
+        })
+        .catch(err => {
+          if(err.request.status === 404) {
+            this.$SegmentMessage.error(this, 'User does not exist');
+          } else {
+            this.$SegmentMessage.error(this, 'Unkown error');
+          }
+          this.userLoading = false;
+        });
     },
     submit() {
       this.buttonLoading = true;
       this.$axios
         .patch(apiurl('/account/' + this.$route.params.id), {
           username: this.username,
-          introduction: this.introduction,
           is_staff: this.isStaff,
           is_superuser: this.isRoot,
           is_active: this.isActive,
@@ -163,6 +175,21 @@ export default {
               lang: this.lang
             });
           }
+          this.$axios
+            .patch(apiurl('/account/' + this.$route.params.id + '/introduction'), {
+              introduction: this.introduction,
+            })
+            .then(() => {
+              this.buttonLoading = false;
+            })
+            .catch(err => {
+              if(err.request.status === 404) {
+                this.$SegmentMessage.error(this, 'User does not exist');
+              } else {
+                this.$SegmentMessage.error(this, 'Unkown error');
+              }
+              this.userLoading = false;
+            });
         })
         .catch(err => {
           this.buttonLoading = false;