From 44e22c990f09214d84afe7030d061a437b78b85b Mon Sep 17 00:00:00 2001
From: daiwenyuan <daiwenyuan@cdinfotech.cn>
Date: Tue, 3 Jan 2023 19:10:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8docker-compose=20?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=20DEV=E6=A8=A1=E5=BC=8F=E8=BF=90=E8=A1=8C=20?=
 =?UTF-8?q?=E6=B3=A8=E6=84=8F=EF=BC=9A=E5=BD=93=E4=BD=BF=E7=94=A8PRODUCTIO?=
 =?UTF-8?q?N=E6=A8=A1=E5=BC=8F=E8=BF=90=E8=A1=8C=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=85=8D=E7=BD=AE=20ALLOWED=5FHOST=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=A3=E5=BC=8F=E7=9A=84=E5=9F=9F=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env               | 2 +-
 .gitignore         | 2 ++
 docker-compose.yml | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 2fa3e08..2796876 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,7 @@ mysql_password=ANOTHER_SECRET_MYSQL_DJANGO_PASSWORD
 mysql_root_password=ANOTHER_SECRET_MYSQL_ROOT_PASSWORD
 public_host=vlab.ustc.edu.cn
 rabbitmq_password=ANOTHER_SECRET_RABBITMQ_PASSWORD
-docker_judger_host_path=/home/libreliu/Projects/Soft_Eng/DockerJudger
+docker_judger_host_path=/Users/mac/Documents/workspaces/ustc_projects/VLAB/Verilog-OJ/DockerJudger
 docker_host_dir=/host_dir
 rabbitmq_default_user=user
 rabbitmq_default_pass=ANOTHER_SECRET_RABBITMQ_PASSWORD
diff --git a/.gitignore b/.gitignore
index 12e2219..017d72e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 **/__pycache__
+lib/
 venv/
+venv_new/
 
 # Editor directories and files
 .idea
diff --git a/docker-compose.yml b/docker-compose.yml
index ea3741a..035589a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,8 +23,9 @@ services:
         USE_APK_MIRROR: "yes"
         USE_MYSQL: "yes"
     environment:
+      VERILOG_OJ_DEV: "TRUE"
       VERILOG_OJ_HOST_STATIC: "yes"
-      #VERILOG_OJ_PROD_DEBUG: "yes"
+      # VERILOG_OJ_PROD_DEBUG: "yes"
       VERILOG_OJ_JUDGER_SECRET: ${judger_secret}
       VERILOG_OJ_SECRET_KEY: ${secret_key}
       VERILOG_OJ_USE_MYSQL: "yes"

From edfd8cf3628385a445c17e0a1147f3a96c06e400 Mon Sep 17 00:00:00 2001
From: liuly <me@liuly.moe>
Date: Tue, 7 Feb 2023 19:02:23 +0800
Subject: [PATCH 2/2] fix: wrong profile update url

---
 frontend/src/App.vue                         |  1 -
 frontend/src/components/mainpage/setting.vue | 87 ++++++++++----------
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index f94a3f4..801a526 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -134,7 +134,6 @@ export default {
       if (command == "setting") {
         this.$router.push({
           name: "setting",
-          params: { username: this.username },
         });
       }
       // if (command == "submittion") {
diff --git a/frontend/src/components/mainpage/setting.vue b/frontend/src/components/mainpage/setting.vue
index 228d485..182437f 100644
--- a/frontend/src/components/mainpage/setting.vue
+++ b/frontend/src/components/mainpage/setting.vue
@@ -6,7 +6,7 @@
           <div style="text-align: center; margin: 5px">昵称</div>
         </el-col>
         <el-col :span="12">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+          <el-input v-model="form.username" autocomplete="off"></el-input>
         </el-col>
       </el-row>
       <el-row :gutter="10">
@@ -106,17 +106,16 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
+
 export default {
   name: "setting",
   data() {
     return {
-      username: "",
-      name: "",
       form: {
-        username: "",
         password: "",
         confirm: "",
-        name: "",
+        username: "",
         des: "",
         school: "",
         course: "",
@@ -126,17 +125,16 @@ export default {
         qq: "",
         email: "",
       },
-      userid: -1,
     };
   },
   methods: {
     updateClick() {
-      if (!this.username) {
+      if (!this.userID) {
         this.$message.error("非法访问！");
         return;
       }
       if (
-        !this.form.name ||
+        !this.form.username ||
         !this.form.school ||
         !this.form.course ||
         !this.form.classes ||
@@ -153,7 +151,7 @@ export default {
         return;
       }
 
-      if (this.form.name.length < 2) {
+      if (this.form.username.length < 2) {
         this.$message.error("昵称太短！");
         return;
       }
@@ -183,44 +181,45 @@ export default {
       ).then(() => {
         // TODO: fix this
         //this.form.password = this.form.password;
-        this.$axios
-          .put("/changeone/", this.form)
-
-          .then(
-            (response) => {
-              this.$message({
-                message: "更新成功！",
-                type: "success",
-              });
-              sessionStorage.setItem("name", this.form.name);
-              this.$router.push({
-                name: "user",
-                query: { username: this.form.username },
-              });
-            },
-            (response) => {
-              this.$message.error("更新失败（" + response + "）");
-            }
-          );
+        this.$axios.put(`/users/${this.userID}/`, this.form).then(
+          (response) => {
+            this.$message({
+              message: "更新成功！",
+              type: "success",
+            });
+            this.$parent.showHome();
+          },
+          (response) => {
+            this.$message.error("更新失败（" + response + "）");
+          }
+        );
       });
     },
+    async updateUserInfo() {
+      if (this.userID) {
+        const resp_data = (await this.$axios.get(`/users/${this.userID}`)).data;
+        this.form.username = resp_data.username;
+        this.form.des = resp_data.des || "这个人很懒，什么都没有没有留下。";
+        this.form.school = resp_data.school;
+        this.form.course = resp_data.course;
+        this.form.classes = resp_data.classes;
+        this.form.number = resp_data.number;
+        this.form.realname = resp_data.realname;
+        this.form.qq = resp_data.qq;
+        this.form.email = resp_data.email;
+      }
+    },
   },
-  created() {
-    this.username = this.$route.params.username;
-    this.form.username = this.username;
-    if (this.username) {
-      this.$axios.get("/user/?username=" + this.username).then((response) => {
-        this.form.name = response.data[0].name;
-        this.form.school = response.data[0].school;
-        this.form.course = response.data[0].course;
-        this.form.classes = response.data[0].classes;
-        this.form.number = response.data[0].number;
-        this.form.realname = response.data[0].realname;
-        this.form.qq = response.data[0].qq;
-        this.form.email = response.data[0].email;
-        this.userid = this.username;
-      });
-    }
+  computed: {
+    ...mapState(["loggedIn", "userID", "username", "isSuperUser"]),
+  },
+  watch: {
+    userID: function () {
+      this.updateUserInfo();
+    },
+  },
+  created: async function () {
+    await this.updateUserInfo();
   },
 };
 </script>