From cd0fae345ccb668a3ae791b7eae69c72567af8da Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sat, 18 Jul 2020 00:07:36 +0800
Subject: [PATCH 01/19] [Add] Sighin WebsiteName auto Get

---
 src/pages/oj/views/general/Announcements.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/oj/views/general/Announcements.vue b/src/pages/oj/views/general/Announcements.vue
index 2385759..532b30b 100644
--- a/src/pages/oj/views/general/Announcements.vue
+++ b/src/pages/oj/views/general/Announcements.vue
@@ -15,7 +15,7 @@
           <div style="margin:50% 15%; font-size:18px; text-align:center; width:26px; line-height:28px; background: transparent; color:#636e72;">{{nowWeek}}</div>
         </Sider>
       </Layout>
-      <div v-if="days" style="margin:0 auto; margin-top:-30px; margin-bottom:15px; font-size:12px; text-align:center; width:140px; line-height:16px; background: transparent; color:#636e72;">您已在稳健 Online Judge 连续签到了 <strong>{{days}}</strong> 天</div>
+      <div v-if="days" style="margin:0 auto; margin-top:-30px; margin-bottom:15px; font-size:12px; text-align:center; width:160px; line-height:16px; background: transparent; color:#636e72;">您已在「{{website.website_name}}」<br>连续签到了 <strong>{{days}}</strong> 天</div>
       <div style="margin-top:-10px; margin:0 auto; font-size:14px; text-align:center; width:80%; line-height:16px; background: transparent; color:#636e72;">{{word}}</div>
       <Button v-if="!SighinStatus" type="primary" icon="ios-alarm" @click="Sighin" long style="margin-top:20px; margin-bottom:20px; margin-left:10%; width:80%;">签到</Button>
       <Button v-else type="primary" icon="ios-alarm" long disabled style="margin-top:20px; margin-bottom:20px; margin-left:10%; width:80%;">
@@ -67,6 +67,7 @@
   import api from '@oj/api'
   import Pagination from '@oj/components/Pagination'
   import axios from 'axios'
+  import { mapState } from 'vuex'
 
   export default {
     name: 'Announcement',
@@ -180,6 +181,7 @@
       }
     },
     computed: {
+      ...mapState(['website']),
       title () {
         if (this.listVisible) {
           return this.isContest ? this.$i18n.t('m.Contest_Announcements') : this.$i18n.t('m.Announcements')

From da1404ae85721f79210f0dd9c0863f44203c2458 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sat, 18 Jul 2020 00:11:05 +0800
Subject: [PATCH 02/19] [Add] Golang Code Highlight

---
 src/pages/oj/components/CodeMirror.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/oj/components/CodeMirror.vue b/src/pages/oj/components/CodeMirror.vue
index 286c391..d01971d 100644
--- a/src/pages/oj/components/CodeMirror.vue
+++ b/src/pages/oj/components/CodeMirror.vue
@@ -47,6 +47,7 @@
   // mode
   import 'codemirror/mode/clike/clike.js'
   import 'codemirror/mode/python/python.js'
+  import 'codemirror/mode/go/go.js'
 
   // active-line.js
   import 'codemirror/addon/selection/active-line.js'

From 558721dedcf958a402d91348169b1e2a51bd759c Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sun, 19 Jul 2020 13:24:50 +0800
Subject: [PATCH 03/19] [Fix] Cancel shadow

---
 src/pages/oj/views/general/Announcements.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/oj/views/general/Announcements.vue b/src/pages/oj/views/general/Announcements.vue
index 532b30b..7467c3a 100644
--- a/src/pages/oj/views/general/Announcements.vue
+++ b/src/pages/oj/views/general/Announcements.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Panel v-if="!isContest" style="float:right; margin-right:0%; width:23%; hight:200px">
+    <Panel v-if="!isContest" shadow style="float:right; margin-right:0%; width:23%; hight:200px">
       <div style="margin:0 10%; font-size:14px; text-align:left; width:100%; line-height:16px; background: transparent; color:#636e72;">今天是：</div>
       <Layout>
         <Sider style="width:25%; min-width:25%; max-width:25%; flex: 0 0 25%; background: transparent;">

From f6d98c5403d4efa4d4cd1a4ea3df098ba4c89fd3 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sun, 19 Jul 2020 17:04:28 +0800
Subject: [PATCH 04/19] [Add] Forum

---
 src/i18n/oj/en-US.js                   |  13 +
 src/i18n/oj/zh-CN.js                   |  13 +
 src/i18n/oj/zh-TW.js                   |  13 +
 src/pages/oj/api.js                    |  48 ++++
 src/pages/oj/components/NavBar.vue     |   3 +
 src/pages/oj/components/Simditor.vue   |  66 ++++++
 src/pages/oj/router/routes.js          |  23 +-
 src/pages/oj/views/forum/Forum.vue     | 313 +++++++++++++++++++++++++
 src/pages/oj/views/forum/ForumList.vue | 265 +++++++++++++++++++++
 src/pages/oj/views/forum/ForumPost.vue | 216 +++++++++++++++++
 src/pages/oj/views/index.js            |   7 +-
 11 files changed, 978 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/oj/components/Simditor.vue
 create mode 100644 src/pages/oj/views/forum/Forum.vue
 create mode 100644 src/pages/oj/views/forum/ForumList.vue
 create mode 100644 src/pages/oj/views/forum/ForumPost.vue

diff --git a/src/i18n/oj/en-US.js b/src/i18n/oj/en-US.js
index ad5b8ec..190db41 100644
--- a/src/i18n/oj/en-US.js
+++ b/src/i18n/oj/en-US.js
@@ -156,6 +156,19 @@ export const m = {
   AboutUs: 'About Us',
   App: 'APP',
   IDE: 'Online IDE',
+  Forum: 'Forum',
+  Forum_List: 'Post List',
+  Forum_Title: 'Title',
+  Forum_Content: 'content',
+  Forum_Post_Time: 'Post Time',
+  Forum_Last_Update_Time: 'Last Update Time',
+  Forum_Post_Information: 'Post Information',
+  Forum_Post: 'Post',
+  Forum_Edit: 'Edit',
+  Forum_Reply: 'Reply',
+  Forum_Reply_List: 'Reply List',
+  Forum_No_Reply: 'No Reply',
+  Sort: 'Plate',
   Judger: 'Judger',
   FAQ: 'FAQ',
   Login: 'Login',
diff --git a/src/i18n/oj/zh-CN.js b/src/i18n/oj/zh-CN.js
index 71ac8f5..20070ed 100644
--- a/src/i18n/oj/zh-CN.js
+++ b/src/i18n/oj/zh-CN.js
@@ -156,6 +156,19 @@ export const m = {
   AboutUs: '关于我们',
   App: '应用',
   IDE: '在线 IDE',
+  Forum: '讨论版',
+  Forum_List: '帖子列表',
+  Forum_Title: '标题',
+  Forum_Content: '内容',
+  Forum_Post_Time: '发布时间',
+  Forum_Last_Update_Time: '最后更新时间',
+  Forum_Post_Information: '帖子信息',
+  Forum_Post: '发帖',
+  Forum_Edit: '编辑',
+  Forum_Reply: '回复',
+  Forum_Reply_List: '回复列表',
+  Forum_No_Reply: '暂无回复',
+  Sort: '板块',
   Judger: '评测机信息',
   FAQ: '常见问题',
   Login: '登录',
diff --git a/src/i18n/oj/zh-TW.js b/src/i18n/oj/zh-TW.js
index d270283..96bf7cf 100644
--- a/src/i18n/oj/zh-TW.js
+++ b/src/i18n/oj/zh-TW.js
@@ -50,6 +50,19 @@ export const m = {
   About: '關於',
   App: '應用',
   IDE: '線上IDE',
+  Forum: '討論版',
+  Forum_List: '帖子列表',
+  Forum_Title: '標題',
+  Forum_Content: '內容',
+  Forum_Post_Time: '發佈時間',
+  Forum_Last_Update_Time: '最後更新時間',
+  Forum_Post_Information: '帖子資訊',
+  Forum_Post: '發帖',
+  Forum_Edit: '編輯',
+  Forum_Reply: '回復',
+  Forum_Reply_List: '回復清單',
+  Forum_No_Reply: '暫無回復',
+  Sort: '板塊',
   AboutUs: '關於我們',
   Judger: 'Judge 說明',
   FAQ: '常見問題',
diff --git a/src/pages/oj/api.js b/src/pages/oj/api.js
index ddbbb5d..5ebe771 100644
--- a/src/pages/oj/api.js
+++ b/src/pages/oj/api.js
@@ -282,6 +282,54 @@ export default {
   },
   UserSighin () {
     return ajax('sighin', 'post')
+  },
+  getForumList (offset, limit, searchParams) {
+    let params = {
+      paging: true,
+      offset,
+      limit
+    }
+    Object.keys(searchParams).forEach((element) => {
+      if (searchParams[element]) {
+        params[element] = searchParams[element]
+      }
+    })
+    return ajax('forumpost', 'get', {
+      params: params
+    })
+  },
+  getForum (forumpostID) {
+    return ajax('forumpost', 'get', {
+      params: {
+        forumpost_id: forumpostID
+      }
+    })
+  },
+  submitFourmPost (data) {
+    return ajax('forumpost', 'post', {
+      data
+    })
+  },
+  getForumReplyList (offset, limit, forumpostID, searchParams) {
+    let params = {
+      paging: true,
+      offset,
+      limit,
+      fa_id: forumpostID
+    }
+    Object.keys(searchParams).forEach((element) => {
+      if (searchParams[element]) {
+        params[element] = searchParams[element]
+      }
+    })
+    return ajax('forumreply', 'get', {
+      params: params
+    })
+  },
+  submitFourmReply (data) {
+    return ajax('forumreply', 'post', {
+      data
+    })
   }
 }
 
diff --git a/src/pages/oj/components/NavBar.vue b/src/pages/oj/components/NavBar.vue
index dc250bb..20531de 100644
--- a/src/pages/oj/components/NavBar.vue
+++ b/src/pages/oj/components/NavBar.vue
@@ -38,6 +38,9 @@
         <Menu-item name="/IDE">
           {{$t('m.IDE')}}
         </Menu-item>
+        <Menu-item name="/Forum">
+          {{$t('m.Forum')}}
+        </Menu-item>
       </Submenu>
       <Submenu name="about">
         <template slot="title">
diff --git a/src/pages/oj/components/Simditor.vue b/src/pages/oj/components/Simditor.vue
new file mode 100644
index 0000000..5253d2a
--- /dev/null
+++ b/src/pages/oj/components/Simditor.vue
@@ -0,0 +1,66 @@
+<template>
+  <textarea ref="editor"></textarea>
+</template>
+
+<script>
+  import Simditor from 'tar-simditor'
+  import 'tar-simditor/styles/simditor.css'
+  import 'tar-simditor-markdown'
+  import 'tar-simditor-markdown/styles/simditor-markdown.css'
+
+  export default {
+    name: 'Simditor',
+    props: {
+      toolbar: {
+        type: Array,
+        default: () => ['title', 'bold', 'italic', 'underline', 'fontScale', 'color', 'ol', 'ul', 'blockquote', 'code', 'link', 'table', 'image', 'hr', 'indent', 'outdent', 'alignment', 'markdown']
+      },
+      value: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+        editor: null,
+        currentValue: this.value
+      }
+    },
+    mounted () {
+      this.editor = new Simditor({
+        textarea: this.$refs.editor,
+        toolbar: this.toolbar,
+        pasteImage: true,
+        markdown: false,
+        allowedStyles: {
+          span: ['color']
+        }
+      })
+      this.editor.on('valuechanged', (e, src) => {
+        this.currentValue = this.editor.getValue()
+      })
+      this.editor.on('decorate', (e, src) => {
+        this.currentValue = this.editor.getValue()
+      })
+
+      this.editor.setValue(this.value)
+    },
+    watch: {
+      'value' (val) {
+        if (this.currentValue !== val) {
+          this.currentValue = val
+          this.editor.setValue(val)
+        }
+      },
+      'currentValue' (newVal, oldVal) {
+        if (newVal !== oldVal) {
+          this.$emit('change', newVal)
+          this.$emit('input', newVal)
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+</style>
diff --git a/src/pages/oj/router/routes.js b/src/pages/oj/router/routes.js
index d2ba0c0..185ba85 100644
--- a/src/pages/oj/router/routes.js
+++ b/src/pages/oj/router/routes.js
@@ -16,7 +16,10 @@ import {
   SubmissionDetails,
   SubmissionList,
   UserHome,
-  IDE
+  IDE,
+  Forum,
+  ForumList,
+  ForumPost
 } from '../views'
 
 import * as Contest from '@oj/views/contest'
@@ -187,6 +190,24 @@ export default [
     meta: {title: 'IDE'},
     component: IDE
   },
+  {
+    name: 'Forum-list',
+    path: '/Forum',
+    meta: {title: 'Forum Post List'},
+    component: ForumList
+  },
+  {
+    name: 'Forum-post',
+    path: '/Post',
+    meta: {title: 'Forum Post'},
+    component: ForumPost
+  },
+  {
+    name: 'Forum-details',
+    path: '/Forum/:forumpostID',
+    meta: {title: 'Forum Post Details'},
+    component: Forum
+  },
   {
     path: '*',
     meta: {title: '404'},
diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
new file mode 100644
index 0000000..7039461
--- /dev/null
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -0,0 +1,313 @@
+<template>
+  <div class="flex-container">
+    <div id="forumpost-main">
+      <!--ForumPost main-->
+      <Panel :padding="40" shadow>
+        <div slot="title">{{forumpost.title}}</div>
+        <div id="forumpost-content" class="markdown-body" v-katex>
+          <p class="title">{{$t('m.Forum_Content')}}</p>
+          <p class="content" v-html="forumpost.content"></p>
+        </div>
+      </Panel>
+      <!--ForumPost main end-->
+
+      <!--Reply List main-->
+      <Panel :padding="40" shadow style="margin-top: 20px;">
+        <div slot="title">{{$t('m.Forum_Reply_List')}}</div>
+        <div class="no-replys" v-if="!forumreplys.length" key="no-replys">
+          <p>{{$t('m.Forum_No_Reply')}}</p>
+        </div>
+        <div style="margin-top: -30px; margin-bottom: 30px">
+          <Card :padding="20" dis-hover v-for="reply in forumreplys"
+                :key="reply.id"
+                style="margin-top: 5px;">
+            <p slot="title">
+              <a @click="GoUserHome(reply.author.username)">
+                {{reply.author.username}}
+              </a>
+            </p>
+            <p slot="extra">{{reply.create_time | localtime }} &emsp;&emsp;# {{reply.floor}}</p>
+            <div id="forumreply-content" class="markdown-body" v-katex>
+              <p class="content" v-html="reply.content"></p>
+            </div>
+          </Card>
+          <Pagination :total="total" :page-size.sync="limit" :current.sync="page"
+                    @on-change="getForumReplyList" show-sizer
+                    @on-page-size-change="getForumReplyList(1)">
+          </Pagination>
+        </div>
+        
+      </Panel>
+      <!--Reply List main end-->
+
+      <!--Reply main-->
+      <Card :padding="20" id="submit-reply" dis-hover>
+        <div class="title">{{$t('m.Forum_Reply')}}</div>
+        <div style="margin-left: 20px; margin-right: 20px;">
+          <Simditor v-model="forumreply.content"></Simditor>
+        </div>
+        <Row type="flex" justify="space-between">
+          <Col :span="12" style="margin-top: 20px;">
+            <Button type="warning" icon="edit" :loading="submitting" @click="submitForumReply"
+                          :disabled="forumpostSubmitDisabled || submitted"
+                          class="fl-right">
+            <span v-if="submitting">{{$t('m.Submitting')}}</span>
+            <span v-else>{{$t('m.Submit')}}</span>
+            </Button>
+          </Col>
+        </Row>
+      </Card>
+      <!--Reply main end-->
+    </div>
+
+    <div id="right-column">
+      <Card id="info">
+        <div slot="title" class="header">
+          <Icon type="information-circled"></Icon>
+          <span class="card-title">{{$t('m.Forum_Post_Information')}}</span>
+        </div>
+        <ul>
+          <li>
+            <p>ID</p>
+            <p>{{forumpost.id}}</p>
+          </li>
+          <li>
+            <p>{{$t('m.By')}}</p>
+            <p>{{forumpost.author.username}}</p>
+          </li>
+          <li>
+            <p>{{$t('m.Forum_Post_Time')}}</p>
+            <p>{{forumpost.create_time | localtime }}</p>
+          </li>
+          <li>
+            <p>{{$t('m.Forum_Last_Update_Time')}}</p>
+            <p>{{forumpost.last_update_time | localtime }}</p>
+          </li>
+        </ul>
+      </Card>
+      <VerticalMenu v-if="is_author" @on-click="handleRoute" style="margin-top: 10px;">
+        <VerticalMenu-item :disabled="contestMenuDisabled"
+                           :route="{name: 'Forum-post', query: {id: forumpostID}}">
+          <Icon type="edit"></Icon>
+          {{$t('m.Forum_Edit')}}
+        </VerticalMenu-item>
+      </VerticalMenu>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { mapGetters, mapActions } from 'vuex'
+  import {types} from '../../../../store'
+  import {FormMixin} from '@oj/components/mixins'
+  import api from '@oj/api'
+  import Simditor from '@oj/components/Simditor.vue'
+  import Pagination from '@oj/components/Pagination'
+
+  export default {
+    name: 'forumpost',
+    components: {
+      Simditor,
+      Pagination
+    },
+    mixins: [FormMixin],
+    data () {
+      return {
+        forumpostID: '',
+        submitting: false,
+        forumpost: {
+          title: '',
+          content: '',
+          author: {
+            username: ''
+          }
+        },
+        is_author: false,
+        forumreply: {
+          fa_id: '',
+          content: ''
+        },
+        forumreplys: [],
+        limit: 10,
+        page: 1,
+        total: 0,
+        routeName: '',
+        query: {
+          page: 1
+        }
+      }
+    },
+    mounted () {
+      this.$store.commit(types.CHANGE_CONTEST_ITEM_VISIBLE, {menu: false})
+      this.init()
+    },
+    methods: {
+      ...mapActions(['changeDomTitle']),
+      init () {
+        this.$Loading.start()
+        this.forumpostID = this.$route.params.forumpostID
+        api.getForum(this.forumpostID).then(res => {
+          this.$Loading.finish()
+          let forumpost = res.data.data
+          this.changeDomTitle({title: forumpost.title})
+          this.forumpost = forumpost
+          if (this.user.username === this.forumpost.author.username) {
+            this.is_author = true
+          }
+        }, () => {
+          this.$Loading.error()
+        })
+        this.routeName = this.$route.name
+        let query = this.$route.query
+        this.query.page = parseInt(query.page) || 1
+        if (this.query.page < 1) {
+          this.query.page = 1
+        }
+        this.getForumReplyList(1)
+      },
+      handleRoute (route) {
+        this.$router.push(route)
+      },
+      getForumReplyList (page) {
+        let offset = (this.page - 1) * this.limit
+        this.query.page = page
+        api.getForumReplyList(offset, this.limit, this.forumpostID, this.query).then(res => {
+          this.total = res.data.data.total
+          this.forumreplys = res.data.data.results
+        })
+      },
+      submitForumReply () {
+        if (this.forumreply.content.trim() === '') {
+          this.$error('Reply can not be empty!')
+          return
+        }
+        this.submitting = true
+        let data = {
+          fa_id: this.forumpostID,
+          content: this.forumreply.content,
+          is_top: false
+        }
+        api.submitFourmReply(data).then(res => {
+          this.submitting = false
+          this.$success('Success')
+        })
+      },
+      GoUserHome (username) {
+        this.$router.push(
+          {
+            name: 'user-home',
+            query: {username: username}
+          })
+      }
+    },
+    computed: {
+      ...mapGetters(['user', 'isAdminRole'])
+    },
+    watch: {
+      '$route' () {
+        this.init()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .card-title {
+    margin-left: 8px;
+  }
+
+  .flex-container {
+    #forumpost-main {
+      flex: auto;
+      margin-right: 18px;
+    }
+    #forumreply-main {
+      flex: auto;
+      margin-top: 5px;
+    }
+    #right-column {
+      flex: none;
+      width: 250px;
+    }
+  }
+
+  #forumpost-content {
+    margin-top: -50px;
+    .title {
+      font-size: 20px;
+      font-weight: 400;
+      margin: 25px 0 12px 0;
+      color: #3091f2;
+      .copy {
+        padding-left: 8px;
+      }
+    }
+    p.content {
+      margin-left: 25px;
+      margin-right: 20px;
+      font-size: 15px
+    }
+  }
+
+  #forumreply-content {
+    .title {
+      font-size: 20px;
+      font-weight: 400;
+      margin: 25px 0 12px 0;
+      color: #3091f2;
+      .copy {
+        padding-left: 8px;
+      }
+    }
+    p.content {
+      margin-left: 25px;
+      margin-right: 20px;
+      font-size: 15px
+    }
+  }
+
+  #submit-reply {
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+
+  #info {
+    margin-bottom: 20px;
+    ul {
+      list-style-type: none;
+      li {
+        border-bottom: 1px dotted #e9eaec;
+        margin-bottom: 10px;
+        p {
+          display: inline-block;
+        }
+        p:first-child {
+          width: 90px;
+        }
+        p:last-child {
+          float: right;
+        }
+      }
+    }
+  }
+
+  .fl-right {
+    float: right;
+  }
+
+  .no-replys {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .title {
+    font-size: 21px;
+    font-weight: 500;
+    padding-top: 10px;
+    padding-bottom: 20px;
+    line-height: 30px;
+    padding: 5px 15px;
+    margin-bottom: 15px;
+  }
+</style>
+
diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
new file mode 100644
index 0000000..ccb6d95
--- /dev/null
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -0,0 +1,265 @@
+<template>
+  <Row type="flex" :gutter="18">
+    <Col :span=19>
+    <Panel shadow>
+      <div slot="title">{{$t('m.Forum_List')}}</div>
+      <div slot="extra">
+        <ul class="filter">
+          <li>
+            <Input v-model="query.keyword"
+                   @on-enter="filterByKeyword"
+                   @on-click="filterByKeyword"
+                   placeholder="keyword"
+                   icon="ios-search-strong"/>
+          </li>
+          <li>
+            <Button type="info" @click="onReset">
+              <Icon type="refresh"></Icon>
+              {{$t('m.Reset')}}
+            </Button>
+          </li>
+        </ul>
+      </div>
+      <Table style="width: 100%; font-size: 16px;"
+             :columns="problemTableColumns"
+             :data="ForumList"
+             :loading="loadings.table"
+             disabled-hover></Table>
+    </Panel>
+    <Pagination :total="total" :page-size="limit" @on-change="pushRouter" :current.sync="query.page"></Pagination>
+
+    </Col>
+
+    <Col :span="5">
+      <Panel :padding="10">
+        <div slot="title" class="taglist-title">{{$t('m.Sort')}}</div>
+        <br>
+        <Button v-for="tag in tagList"
+                :key="tag.name"
+                @click="filterByTag(tag.name)"
+                type="ghost"
+                :disabled="query.tag === tag.name"
+                shape="circle"
+                class="tag-btn">{{tag.name}}>
+        </Button>
+      </Panel>
+      <Spin v-if="loadings.tag" fix size="large"></Spin>
+      <VerticalMenu @on-click="handleRoute" style="margin-top: 10px;">
+        <VerticalMenu-item :disabled="contestMenuDisabled"
+                           :route="{name: 'Forum-post'}">
+          <Icon type="edit"></Icon>
+          {{$t('m.Forum_Post')}}
+        </VerticalMenu-item>
+      </VerticalMenu>
+    </Col>
+  </Row>
+</template>
+
+<script>
+  import { mapGetters } from 'vuex'
+  import api from '@oj/api'
+  import utils from '@/utils/utils'
+  import time from '@/utils/time'
+  import { ProblemMixin } from '@oj/components/mixins'
+  import Pagination from '@oj/components/Pagination'
+
+  export default {
+    name: 'ForumList',
+    mixins: [ProblemMixin],
+    components: {
+      Pagination
+    },
+    data () {
+      return {
+        tagList: [],
+        problemTableColumns: [
+          {
+            title: this.$i18n.t('m.Forum_Title'),
+            width: 800,
+            render: (h, params) => {
+              return h('Button', {
+                props: {
+                  type: 'text',
+                  size: 'large'
+                },
+                on: {
+                  click: () => {
+                    this.$router.push({name: 'Forum-details', params: {forumpostID: params.row.id}})
+                  }
+                },
+                style: {
+                  padding: '2px 0',
+                  overflowX: 'auto',
+                  textAlign: 'left',
+                  width: '100%'
+                }
+              }, params.row.title)
+            }
+          },
+          {
+            title: this.$i18n.t('m.Sort'),
+            render: (h, params) => {
+              return h('Button', {
+                props: {
+                  type: 'text',
+                  size: 'large'
+                },
+                on: {
+                  click: () => {
+                    this.$router.push({name: 'Forum-details', params: {forumpostID: params.row.id}})
+                  }
+                }
+              }, params.row.sort)
+            }
+          },
+          {
+            title: this.$i18n.t('m.Forum_Post_Time'),
+            render: (h, params) => {
+              return h('span', time.utcToLocal(params.row.create_time))
+            }
+          },
+          {
+            title: this.$i18n.t('m.By'),
+            render: (h, params) => {
+              return h('Button', {
+                props: {
+                  type: 'text',
+                  size: 'large'
+                },
+                on: {
+                  click: () => {
+                    this.$router.push(
+                      {
+                        name: 'user-home',
+                        query: {username: params.row.author.username}
+                      })
+                  }
+                }
+              }, params.row.author.username)
+            }
+          }
+        ],
+        ForumList: [],
+        limit: 20,
+        total: 0,
+        loadings: {
+          table: true,
+          tag: false
+        },
+        routeName: '',
+        query: {
+          keyword: '',
+          page: 1
+        }
+      }
+    },
+    mounted () {
+      this.init()
+    },
+    methods: {
+      init (simulate = false) {
+        this.routeName = this.$route.name
+        let query = this.$route.query
+        this.query.keyword = query.keyword || ''
+        this.query.page = parseInt(query.page) || 1
+        if (this.query.page < 1) {
+          this.query.page = 1
+        }
+        this.getForumList()
+      },
+      pushRouter () {
+        this.$router.push({
+          name: 'Forum-list',
+          query: utils.filterEmptyValue(this.query)
+        })
+      },
+      getForumList () {
+        let offset = (this.query.page - 1) * this.limit
+        this.loadings.table = true
+        api.getForumList(offset, this.limit, this.query).then(res => {
+          this.loadings.table = false
+          this.total = res.data.data.total
+          this.ForumList = res.data.data.results
+          if (this.isAuthenticated) {
+            this.addStatusColumn(this.problemTableColumns, res.data.data.results)
+          }
+        }, res => {
+          this.loadings.table = false
+        })
+      },
+      getTagList () {
+        api.getProblemTagList().then(res => {
+          this.tagList = res.data.data.sort((a, b) => {
+            return a.name.localeCompare(b.name)
+          })
+          this.loadings.tag = false
+        }, res => {
+          this.loadings.tag = false
+        })
+      },
+      filterByKeyword () {
+        this.query.page = 1
+        this.pushRouter()
+      },
+      handleTagsVisible (value) {
+        if (value) {
+          this.problemTableColumns.push(
+            {
+              title: this.$i18n.t('m.Tags'),
+              align: 'center',
+              render: (h, params) => {
+                let tags = []
+                params.row.tags.forEach(tag => {
+                  tags.push(h('Tag', {}, tag))
+                })
+                return h('div', {
+                  style: {
+                    margin: '8px 0'
+                  }
+                }, tags)
+              }
+            })
+        } else {
+          this.problemTableColumns.splice(this.problemTableColumns.length - 1, 1)
+        }
+      },
+      onReset () {
+        this.$router.push({name: 'Forum-list'})
+      },
+      handleRoute (route) {
+        this.$router.push(route)
+      }
+    },
+    computed: {
+      ...mapGetters(['isAuthenticated'])
+    },
+    watch: {
+      '$route' (newVal, oldVal) {
+        if (newVal !== oldVal) {
+          this.init(true)
+        }
+      },
+      'isAuthenticated' (newVal) {
+        if (newVal === true) {
+          this.init()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .taglist-title {
+    margin-left: -10px;
+    margin-bottom: -10px;
+  }
+
+  .tag-btn {
+    margin-right: 5px;
+    margin-bottom: 10px;
+  }
+
+  #pick-one {
+    margin-bottom: 10px;
+  }
+</style>
diff --git a/src/pages/oj/views/forum/ForumPost.vue b/src/pages/oj/views/forum/ForumPost.vue
new file mode 100644
index 0000000..56a543f
--- /dev/null
+++ b/src/pages/oj/views/forum/ForumPost.vue
@@ -0,0 +1,216 @@
+<template>
+  <div class="flex-container">
+    <div id="forumpost-main">
+      <!--Post main-->
+      <Card :padding="20" id="submit-reply" dis-hover>
+        <div class="title">{{$t('m.Forum_Post')}}</div>
+        <div style="font-size: 16px; margin-left: 20px; margin-right: 20px;">
+          {{$t('m.Forum_Title')}}:&emsp; 
+          <Input v-model="forumpost.title" placeholder="Title" size="large" style="width: 600px"></Input>
+        </div>
+        <div style="margin-top: 20px; margin-left: 20px; margin-right: 20px;">
+          <Simditor v-model="forumpost.content"></Simditor>
+        </div>
+        <Row type="flex" justify="space-between">
+          <Col :span="12" style="margin-top: 20px; margin-left: 45px;">
+            <Button type="warning" icon="edit" :loading="submitting" @click="submitforumpost"
+                          :disabled="forumpostSubmitDisabled || submitted"
+                          class="fl-right">
+            <span v-if="submitting">{{$t('m.Submitting')}}</span>
+            <span v-else>{{$t('m.Submit')}}</span>
+            </Button>
+          </Col>
+        </Row>
+      </Card>
+      <!--Post main end-->
+    </div>
+  </div>
+</template>
+
+<script>
+  import {mapActions} from 'vuex'
+  import {types} from '../../../../store'
+  import {FormMixin} from '@oj/components/mixins'
+  import api from '@oj/api'
+  import utils from '@/utils/utils'
+  import Simditor from '@oj/components/Simditor.vue'
+
+  export default {
+    name: 'forumpost',
+    components: {
+      Simditor
+    },
+    mixins: [FormMixin],
+    data () {
+      return {
+        submitting: false,
+        forumpost: {
+          id: '',
+          title: '',
+          content: '',
+          sort: 0,
+          son_sort: 0
+        },
+        limit: 20,
+        total: 0,
+        routeName: '',
+        query: {
+          page: 1
+        }
+      }
+    },
+    mounted () {
+      this.$store.commit(types.CHANGE_CONTEST_ITEM_VISIBLE, {menu: false})
+      this.init()
+    },
+    methods: {
+      ...mapActions(['changeDomTitle']),
+      init () {
+        this.$Loading.start()
+        if (this.$route.query.id) {
+          this.forumpost.id = this.$route.query.id
+          api.getForum(this.forumpost.id).then(res => {
+            this.$Loading.finish()
+            let forumpost = res.data.data
+            this.forumpost = forumpost
+          }, () => {
+            this.$Loading.error()
+          })
+        } else {
+          this.forumpost.id = -1
+        }
+        this.$Loading.finish()
+      },
+      pushRouter () {
+        this.$router.push({
+          name: 'Forum-list',
+          query: utils.filterEmptyValue(this.query)
+        })
+      },
+      submitforumpost () {
+        if (this.forumpost.content.trim() === '') {
+          this.$error('Reply can not be empty!')
+          return
+        }
+        this.submitting = true
+        let data = {
+          id: this.forumpost.id,
+          title: this.forumpost.title,
+          content: this.forumpost.content,
+          sort: 0,
+          son_sort: 0
+        }
+        api.submitFourmPost(data).then(res => {
+          this.submitting = false
+          this.$success('Success')
+        })
+      }
+    },
+    watch: {
+      '$route' () {
+        this.init()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .card-title {
+    margin-left: 8px;
+  }
+
+  .flex-container {
+    #forumpost-main {
+      flex: auto;
+      margin-right: 18px;
+    }
+    #forumpost-main {
+      flex: auto;
+      margin-top: 5px;
+    }
+    #right-column {
+      flex: none;
+      width: 250px;
+    }
+  }
+
+  #forumpost-content {
+    margin-top: -50px;
+    .title {
+      font-size: 20px;
+      font-weight: 400;
+      margin: 25px 0 12px 0;
+      color: #3091f2;
+      .copy {
+        padding-left: 8px;
+      }
+    }
+    p.content {
+      margin-left: 25px;
+      margin-right: 20px;
+      font-size: 15px
+    }
+  }
+
+  #forumpost-content {
+    .title {
+      font-size: 20px;
+      font-weight: 400;
+      margin: 25px 0 12px 0;
+      color: #3091f2;
+      .copy {
+        padding-left: 8px;
+      }
+    }
+    p.content {
+      margin-left: 25px;
+      margin-right: 20px;
+      font-size: 15px
+    }
+  }
+
+  #submit-reply {
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
+
+  #info {
+    margin-bottom: 20px;
+    ul {
+      list-style-type: none;
+      li {
+        border-bottom: 1px dotted #e9eaec;
+        margin-bottom: 10px;
+        p {
+          display: inline-block;
+        }
+        p:first-child {
+          width: 90px;
+        }
+        p:last-child {
+          float: right;
+        }
+      }
+    }
+  }
+
+  .fl-right {
+    float: right;
+  }
+
+  .no-replys {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .title {
+    font-size: 21px;
+    font-weight: 500;
+    padding-top: 10px;
+    padding-bottom: 20px;
+    line-height: 30px;
+    padding: 5px 15px;
+    margin-bottom: 15px;
+  }
+</style>
+
diff --git a/src/pages/oj/views/index.js b/src/pages/oj/views/index.js
index 980eeb7..7fa4c81 100644
--- a/src/pages/oj/views/index.js
+++ b/src/pages/oj/views/index.js
@@ -8,6 +8,8 @@ import NotFound from './general/404.vue'
 import Home from './general/Home.vue'
 import Announcements from './general/Announcements.vue'
 import IDE from './ide/ide.vue'
+import ForumList from './forum/ForumList.vue'
+import ForumPost from './forum/ForumPost.vue'
 
 // Grouping Components in the Same Chunk
 const SubmissionList = () => import(/* webpackChunkName: "submission" */ '@oj/views/submission/SubmissionList.vue')
@@ -21,13 +23,16 @@ const ResetPassword = () => import(/* webpackChunkName: "password" */ '@oj/views
 
 const Problem = () => import(/* webpackChunkName: "Problem" */ '@oj/views/problem/Problem.vue')
 
+const Forum = () => import(/* webpackChunkName: "Forum" */ '@oj/views/forum/Forum.vue')
+
 export {
   Home, NotFound, Announcements,
   Logout, UserHome, About, FAQ, AboutUs,
   ProblemList, Problem,
   ACMRank, OIRank,
   SubmissionList, SubmissionDetails,
-  ApplyResetPassword, ResetPassword, IDE
+  ApplyResetPassword, ResetPassword,
+  IDE, Forum, ForumList, ForumPost
 }
 /* 组件导出分为两类, 一类常用的直接导出，另一类诸如Login, Logout等用懒加载,懒加载不在此处导出
  *   在对应的route内加载

From 5ba5511721f5eacb3e469e90ec1bfea1f0530d2b Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sun, 19 Jul 2020 17:37:20 +0800
Subject: [PATCH 05/19] [Fix] Forum_Post_Time Show Problem

---
 src/pages/oj/views/forum/ForumList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
index ccb6d95..990edd8 100644
--- a/src/pages/oj/views/forum/ForumList.vue
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -114,6 +114,7 @@
           },
           {
             title: this.$i18n.t('m.Forum_Post_Time'),
+            width: 150,
             render: (h, params) => {
               return h('span', time.utcToLocal(params.row.create_time))
             }

From a13598924a9379c9c0f234ed2fca92e631b6dcbb Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sun, 19 Jul 2020 23:29:11 +0800
Subject: [PATCH 06/19] [Add] PushRoute after Posting

---
 src/pages/oj/views/forum/ForumPost.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/oj/views/forum/ForumPost.vue b/src/pages/oj/views/forum/ForumPost.vue
index 56a543f..e04f26e 100644
--- a/src/pages/oj/views/forum/ForumPost.vue
+++ b/src/pages/oj/views/forum/ForumPost.vue
@@ -103,6 +103,7 @@
         api.submitFourmPost(data).then(res => {
           this.submitting = false
           this.$success('Success')
+          this.$router.push({name: 'Forum-details', params: {forumpostID: res.data.data.id}})
         })
       }
     },

From 97e0b8e122ec63c6bc89768cde0f9141fe664e60 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sun, 19 Jul 2020 23:34:08 +0800
Subject: [PATCH 07/19] [Add] Only Admin ot Author can Edit

---
 src/pages/oj/views/forum/Forum.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index 7039461..d830941 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -151,6 +151,9 @@
           let forumpost = res.data.data
           this.changeDomTitle({title: forumpost.title})
           this.forumpost = forumpost
+          if (this.isAdminRole) {
+            this.is_author = true
+          }
           if (this.user.username === this.forumpost.author.username) {
             this.is_author = true
           }

From 85d96f19376703c23d7a30f207895d43d42f0c1a Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Mon, 20 Jul 2020 10:47:09 +0800
Subject: [PATCH 08/19] [Add] Auto add Reply to ReplyList

---
 src/pages/oj/views/forum/Forum.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index d830941..0585938 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -193,6 +193,7 @@
         api.submitFourmReply(data).then(res => {
           this.submitting = false
           this.$success('Success')
+          this.forumreplys.unshift(res.data.data)
         })
       },
       GoUserHome (username) {

From d7c0c8628999346ed4b24db0c8f8763e7630220c Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 00:27:09 +0800
Subject: [PATCH 09/19] [Add] Forum Delete

---
 src/i18n/oj/en-US.js               |  2 +
 src/i18n/oj/zh-CN.js               |  2 +
 src/i18n/oj/zh-TW.js               |  2 +
 src/pages/oj/api.js                |  8 +++
 src/pages/oj/views/forum/Forum.vue | 81 ++++++++++++++++++++++++------
 5 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/src/i18n/oj/en-US.js b/src/i18n/oj/en-US.js
index 190db41..0add3ec 100644
--- a/src/i18n/oj/en-US.js
+++ b/src/i18n/oj/en-US.js
@@ -165,6 +165,8 @@ export const m = {
   Forum_Post_Information: 'Post Information',
   Forum_Post: 'Post',
   Forum_Edit: 'Edit',
+  Forum_Delete: 'Delete',
+  Forum_ConfirmDelete: 'Do you Confirm Delete?',
   Forum_Reply: 'Reply',
   Forum_Reply_List: 'Reply List',
   Forum_No_Reply: 'No Reply',
diff --git a/src/i18n/oj/zh-CN.js b/src/i18n/oj/zh-CN.js
index 20070ed..d8bc336 100644
--- a/src/i18n/oj/zh-CN.js
+++ b/src/i18n/oj/zh-CN.js
@@ -165,6 +165,8 @@ export const m = {
   Forum_Post_Information: '帖子信息',
   Forum_Post: '发帖',
   Forum_Edit: '编辑',
+  Forum_Delete: '删除',
+  Forum_ConfirmDelete: '确认删除?',
   Forum_Reply: '回复',
   Forum_Reply_List: '回复列表',
   Forum_No_Reply: '暂无回复',
diff --git a/src/i18n/oj/zh-TW.js b/src/i18n/oj/zh-TW.js
index 96bf7cf..faa448a 100644
--- a/src/i18n/oj/zh-TW.js
+++ b/src/i18n/oj/zh-TW.js
@@ -59,6 +59,8 @@ export const m = {
   Forum_Post_Information: '帖子資訊',
   Forum_Post: '發帖',
   Forum_Edit: '編輯',
+  Forum_Delete: '删除',
+  Forum_ConfirmDelete: '確認删除?',
   Forum_Reply: '回復',
   Forum_Reply_List: '回復清單',
   Forum_No_Reply: '暫無回復',
diff --git a/src/pages/oj/api.js b/src/pages/oj/api.js
index 5ebe771..86fe6fc 100644
--- a/src/pages/oj/api.js
+++ b/src/pages/oj/api.js
@@ -310,6 +310,14 @@ export default {
       data
     })
   },
+  deleteFourmPost (id) {
+    let params = {
+      id: id
+    }
+    return ajax('forumpost', 'delete', {
+      params: params
+    })
+  },
   getForumReplyList (offset, limit, forumpostID, searchParams) {
     let params = {
       paging: true,
diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index 0585938..7fd010f 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -49,7 +49,6 @@
         <Row type="flex" justify="space-between">
           <Col :span="12" style="margin-top: 20px;">
             <Button type="warning" icon="edit" :loading="submitting" @click="submitForumReply"
-                          :disabled="forumpostSubmitDisabled || submitted"
                           class="fl-right">
             <span v-if="submitting">{{$t('m.Submitting')}}</span>
             <span v-else>{{$t('m.Submit')}}</span>
@@ -85,14 +84,30 @@
           </li>
         </ul>
       </Card>
-      <VerticalMenu v-if="is_author" @on-click="handleRoute" style="margin-top: 10px;">
-        <VerticalMenu-item :disabled="contestMenuDisabled"
-                           :route="{name: 'Forum-post', query: {id: forumpostID}}">
-          <Icon type="edit"></Icon>
-          {{$t('m.Forum_Edit')}}
-        </VerticalMenu-item>
-      </VerticalMenu>
+      <!--Edit / Top / Light / Nice / Delete-->
+      <div id="VerticalMenu">
+        <Card v-if="visible" :padding="0" dis-hover style="margin-top: 10px;">
+          <ul>
+            <li @click.stop="handleRoute(1)">
+              <Icon type="edit"></Icon>
+              {{$t('m.Forum_Edit')}}
+            </li>
+            <li @click.stop="handleRoute(0)">
+                <Icon type="trash-b"></Icon>
+                &nbsp;{{$t('m.Forum_Delete')}}
+            </li>
+          </ul>
+        </Card>
+      </div>
     </div>
+
+    <Modal
+        v-model="ConfirmDelete"
+        :title="$t('m.Forum_Delete')"
+        @on-ok="ok">
+        <p>{{$t('m.Forum_ConfirmDelete')}}</p>
+    </Modal>
+
   </div>
 </template>
 
@@ -122,7 +137,8 @@
             username: ''
           }
         },
-        is_author: false,
+        visible: false,
+        ConfirmDelete: false,
         forumreply: {
           fa_id: '',
           content: ''
@@ -151,11 +167,11 @@
           let forumpost = res.data.data
           this.changeDomTitle({title: forumpost.title})
           this.forumpost = forumpost
-          if (this.isAdminRole) {
-            this.is_author = true
+          if (this.isSuperAdmin) {
+            this.visible = true
           }
           if (this.user.username === this.forumpost.author.username) {
-            this.is_author = true
+            this.visible = true
           }
         }, () => {
           this.$Loading.error()
@@ -168,8 +184,15 @@
         }
         this.getForumReplyList(1)
       },
-      handleRoute (route) {
-        this.$router.push(route)
+      handleRoute (method) {
+        if (method === 1) {
+          // Edit
+          this.$router.push({name: 'Forum-post', query: {id: this.forumpostID}})
+        }
+        if (method === 0) {
+          // Delete
+          this.ConfirmDelete = true
+        }
       },
       getForumReplyList (page) {
         let offset = (this.page - 1) * this.limit
@@ -196,6 +219,12 @@
           this.forumreplys.unshift(res.data.data)
         })
       },
+      ok () {
+        api.deleteFourmPost(this.forumpostID).then(res => {
+          this.$success('Success')
+          this.$router.push({name: 'Forum-list'})
+        })
+      },
       GoUserHome (username) {
         this.$router.push(
           {
@@ -205,7 +234,7 @@
       }
     },
     computed: {
-      ...mapGetters(['user', 'isAdminRole'])
+      ...mapGetters(['user', 'isSuperAdmin'])
     },
     watch: {
       '$route' () {
@@ -233,6 +262,28 @@
       flex: none;
       width: 250px;
     }
+
+    #VerticalMenu {
+      li {
+        border-bottom: 1px dashed #e9eaec;
+        color: #495060;
+        display: block;
+        text-align: left;
+        padding: 15px 20px;
+        &:hover {
+          background: #f8f8f9;
+          border-left: 2px solid #5cadff;
+          color: #2d8cf0;
+        }
+        & > .ivu-icon {
+          font-size: 16px;
+          margin-right: 8px;
+        }
+        &:last-child {
+          border-bottom: none;
+        }
+      }
+    }
   }
 
   #forumpost-content {

From d037331620feda1a668f2314746d46226f77c4fe Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 13:35:02 +0800
Subject: [PATCH 10/19] [Add] ForumPost Top/Light/Nice

---
 src/i18n/oj/en-US.js                   |  4 ++
 src/i18n/oj/zh-CN.js                   |  4 ++
 src/i18n/oj/zh-TW.js                   |  4 ++
 src/pages/oj/api.js                    |  4 +-
 src/pages/oj/views/forum/Forum.vue     | 96 ++++++++++++++++++--------
 src/pages/oj/views/forum/ForumList.vue |  2 +-
 src/pages/oj/views/forum/ForumPost.vue |  3 +
 7 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/src/i18n/oj/en-US.js b/src/i18n/oj/en-US.js
index 0add3ec..0c122b8 100644
--- a/src/i18n/oj/en-US.js
+++ b/src/i18n/oj/en-US.js
@@ -166,6 +166,10 @@ export const m = {
   Forum_Post: 'Post',
   Forum_Edit: 'Edit',
   Forum_Delete: 'Delete',
+  Forum_Top: 'Top',
+  Forum_Light: 'Light',
+  Forum_Nice: 'Nice',
+  Forum_ToolBox: 'Tool Box',
   Forum_ConfirmDelete: 'Do you Confirm Delete?',
   Forum_Reply: 'Reply',
   Forum_Reply_List: 'Reply List',
diff --git a/src/i18n/oj/zh-CN.js b/src/i18n/oj/zh-CN.js
index d8bc336..84d5233 100644
--- a/src/i18n/oj/zh-CN.js
+++ b/src/i18n/oj/zh-CN.js
@@ -166,6 +166,10 @@ export const m = {
   Forum_Post: '发帖',
   Forum_Edit: '编辑',
   Forum_Delete: '删除',
+  Forum_Top: '置顶',
+  Forum_Light: '高亮',
+  Forum_Nice: '精品',
+  Forum_ToolBox: '工具箱',
   Forum_ConfirmDelete: '确认删除?',
   Forum_Reply: '回复',
   Forum_Reply_List: '回复列表',
diff --git a/src/i18n/oj/zh-TW.js b/src/i18n/oj/zh-TW.js
index faa448a..152d9a1 100644
--- a/src/i18n/oj/zh-TW.js
+++ b/src/i18n/oj/zh-TW.js
@@ -60,6 +60,10 @@ export const m = {
   Forum_Post: '發帖',
   Forum_Edit: '編輯',
   Forum_Delete: '删除',
+  Forum_Top: '置頂',
+  Forum_Light: '高亮',
+  Forum_Nice: '精品',
+  Forum_ToolBox: '工具箱',
   Forum_ConfirmDelete: '確認删除?',
   Forum_Reply: '回復',
   Forum_Reply_List: '回復清單',
diff --git a/src/pages/oj/api.js b/src/pages/oj/api.js
index 86fe6fc..24aced6 100644
--- a/src/pages/oj/api.js
+++ b/src/pages/oj/api.js
@@ -310,9 +310,9 @@ export default {
       data
     })
   },
-  deleteFourmPost (id) {
+  deleteFourmPost (forumpostID) {
     let params = {
-      id: id
+      forumpost_id: forumpostID
     }
     return ajax('forumpost', 'delete', {
       params: params
diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index 7fd010f..8474e4c 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -85,16 +85,31 @@
         </ul>
       </Card>
       <!--Edit / Top / Light / Nice / Delete-->
-      <div id="VerticalMenu">
+      <div class="VerticalMenu">
         <Card v-if="visible" :padding="0" dis-hover style="margin-top: 10px;">
           <ul>
-            <li @click.stop="handleRoute(1)">
+            <li @click.stop="ForumPostControl(1)">
               <Icon type="edit"></Icon>
               {{$t('m.Forum_Edit')}}
             </li>
-            <li @click.stop="handleRoute(0)">
-                <Icon type="trash-b"></Icon>
-                &nbsp;{{$t('m.Forum_Delete')}}
+            <li v-if="isSuperAdmin">
+              <Icon type="pin" style="margin-left: 2px;"></Icon>
+              &nbsp;{{$t('m.Forum_Top')}}
+              <i-switch v-model="forumpost.is_top" @on-change="ForumPostControl(2)" style="margin-left: 10px;"></i-switch>
+            </li>
+            <li v-if="isSuperAdmin">
+              <Icon type="lightbulb" style="margin-left: 2px;"></Icon>
+              &nbsp;{{$t('m.Forum_Light')}}
+              <i-switch v-model="forumpost.is_light" @on-change="ForumPostControl(2)" style="margin-left: 10px;"></i-switch>
+            </li>
+            <li v-if="isSuperAdmin">
+              <Icon type="happy" style="margin-left: -1px;"></Icon>
+              {{$t('m.Forum_Nice')}}
+              <i-switch v-model="forumpost.is_nice" @on-change="ForumPostControl(2)" style="margin-left: 10px;"></i-switch>
+            </li>
+            <li class="delete" @click.stop="ForumPostControl(0)">
+                <Icon type="trash-b" style="margin-left: 1px;"></Icon>
+                {{$t('m.Forum_Delete')}}
             </li>
           </ul>
         </Card>
@@ -184,16 +199,35 @@
         }
         this.getForumReplyList(1)
       },
-      handleRoute (method) {
+      ForumPostControl (method) {
         if (method === 1) {
           // Edit
           this.$router.push({name: 'Forum-post', query: {id: this.forumpostID}})
         }
+        if (method === 2) {
+          // Top / Light / Nice
+          this.submitforumpost()
+        }
         if (method === 0) {
           // Delete
           this.ConfirmDelete = true
         }
       },
+      submitforumpost () {
+        let data = {
+          id: this.forumpost.id,
+          title: this.forumpost.title,
+          content: this.forumpost.content,
+          is_top: this.forumpost.is_top,
+          is_light: this.forumpost.is_light,
+          is_nice: this.forumpost.is_nice,
+          sort: 0,
+          son_sort: 0
+        }
+        api.submitFourmPost(data).then(res => {
+          this.$success('Success')
+        })
+      },
       getForumReplyList (page) {
         let offset = (this.page - 1) * this.limit
         this.query.page = page
@@ -262,28 +296,6 @@
       flex: none;
       width: 250px;
     }
-
-    #VerticalMenu {
-      li {
-        border-bottom: 1px dashed #e9eaec;
-        color: #495060;
-        display: block;
-        text-align: left;
-        padding: 15px 20px;
-        &:hover {
-          background: #f8f8f9;
-          border-left: 2px solid #5cadff;
-          color: #2d8cf0;
-        }
-        & > .ivu-icon {
-          font-size: 16px;
-          margin-right: 8px;
-        }
-        &:last-child {
-          border-bottom: none;
-        }
-      }
-    }
   }
 
   #forumpost-content {
@@ -364,5 +376,33 @@
     padding: 5px 15px;
     margin-bottom: 15px;
   }
+
+  .VerticalMenu {
+    li {
+      border-bottom: 1px dotted #e9eaec;
+      color: #495060;
+      display: block;
+      text-align: left;
+      padding: 15px 20px;
+      &:hover {
+        background: #f8f8f9;
+        border-left: 2px solid #5cadff;
+        color: #2d8cf0;
+      }
+      & > .ivu-icon {
+        font-size: 16px;
+        margin-right: 8px;
+      }
+      &:last-child {
+        border-bottom: none;
+      }
+    }
+  }
+
+  .delete:hover  {
+    background: #f8f8f9 !important;
+    border-left: 2px solid #ed3f14 !important;
+    color: #ed3f14 !important;
+  }
 </style>
 
diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
index 990edd8..0fcd74a 100644
--- a/src/pages/oj/views/forum/ForumList.vue
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -225,7 +225,7 @@
         }
       },
       onReset () {
-        this.$router.push({name: 'Forum-list'})
+        this.getForumList()
       },
       handleRoute (route) {
         this.$router.push(route)
diff --git a/src/pages/oj/views/forum/ForumPost.vue b/src/pages/oj/views/forum/ForumPost.vue
index e04f26e..2cbafd3 100644
--- a/src/pages/oj/views/forum/ForumPost.vue
+++ b/src/pages/oj/views/forum/ForumPost.vue
@@ -97,6 +97,9 @@
           id: this.forumpost.id,
           title: this.forumpost.title,
           content: this.forumpost.content,
+          is_top: false,
+          is_light: false,
+          is_nice: false,
           sort: 0,
           son_sort: 0
         }

From f9a05ca0e2194df0c1c22c10c185d35d5fc93d6e Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 16:45:40 +0800
Subject: [PATCH 11/19] [Add] ForumList Top/Light/Nice Display style

---
 src/pages/oj/views/forum/Forum.vue     |  5 +-
 src/pages/oj/views/forum/ForumList.vue | 67 ++++++++++++++++++++------
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index 8474e4c..fe6fc42 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -103,7 +103,7 @@
               <i-switch v-model="forumpost.is_light" @on-change="ForumPostControl(2)" style="margin-left: 10px;"></i-switch>
             </li>
             <li v-if="isSuperAdmin">
-              <Icon type="happy" style="margin-left: -1px;"></Icon>
+              <Icon type="star" style="margin-left: -1px;"></Icon>
               {{$t('m.Forum_Nice')}}
               <i-switch v-model="forumpost.is_nice" @on-change="ForumPostControl(2)" style="margin-left: 10px;"></i-switch>
             </li>
@@ -244,8 +244,7 @@
         this.submitting = true
         let data = {
           fa_id: this.forumpostID,
-          content: this.forumreply.content,
-          is_top: false
+          content: this.forumreply.content
         }
         api.submitFourmReply(data).then(res => {
           this.submitting = false
diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
index 0fcd74a..4fb2d5c 100644
--- a/src/pages/oj/views/forum/ForumList.vue
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -77,23 +77,58 @@
             title: this.$i18n.t('m.Forum_Title'),
             width: 800,
             render: (h, params) => {
-              return h('Button', {
-                props: {
-                  type: 'text',
-                  size: 'large'
-                },
-                on: {
-                  click: () => {
-                    this.$router.push({name: 'Forum-details', params: {forumpostID: params.row.id}})
+              let top = ''
+              let topmargin = ''
+              let nice = ''
+              let nicemargin = ''
+              let light = '#495060'
+              if (params.row.is_top) {
+                top = 'pin'
+                topmargin = '0 0 0 8px'
+              }
+              if (params.row.is_nice) {
+                nice = 'star'
+                nicemargin = '0 0 0 8px'
+              }
+              if (params.row.is_light) light = '#e74c3c'
+              return h('div', [
+                h('Button', {
+                  props: {
+                    type: 'text',
+                    size: 'large'
+                  },
+                  on: {
+                    click: () => {
+                      this.$router.push({name: 'Forum-details', params: {forumpostID: params.row.id}})
+                    }
+                  },
+                  style: {
+                    padding: '2px 0',
+                    overflowX: 'auto',
+                    textAlign: 'left',
+                    color: light
                   }
-                },
-                style: {
-                  padding: '2px 0',
-                  overflowX: 'auto',
-                  textAlign: 'left',
-                  width: '100%'
-                }
-              }, params.row.title)
+                }, params.row.title),
+                h('Icon', {
+                  props: {
+                    type: top,
+                    size: '14'
+                  },
+                  style: {
+                    margin: topmargin
+                  }
+                }),
+                h('Icon', {
+                  props: {
+                    type: nice,
+                    size: '14',
+                    color: '#f1c40f'
+                  },
+                  style: {
+                    margin: nicemargin
+                  }
+                })
+              ])
             }
           },
           {

From b47ffece4426d07e348ac2e6c43d4d13d97c0a21 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 17:05:09 +0800
Subject: [PATCH 12/19] [Fix] ForumList Top/Nice Display style

---
 src/pages/oj/views/forum/ForumList.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
index 4fb2d5c..5767de9 100644
--- a/src/pages/oj/views/forum/ForumList.vue
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -88,7 +88,7 @@
               }
               if (params.row.is_nice) {
                 nice = 'star'
-                nicemargin = '0 0 0 8px'
+                nicemargin = '0 2px 0 8px'
               }
               if (params.row.is_light) light = '#e74c3c'
               return h('div', [
@@ -111,21 +111,21 @@
                 }, params.row.title),
                 h('Icon', {
                   props: {
-                    type: top,
-                    size: '14'
+                    type: nice,
+                    size: '14',
+                    color: '#f1c40f'
                   },
                   style: {
-                    margin: topmargin
+                    margin: nicemargin
                   }
                 }),
                 h('Icon', {
                   props: {
-                    type: nice,
-                    size: '14',
-                    color: '#f1c40f'
+                    type: top,
+                    size: '14'
                   },
                   style: {
-                    margin: nicemargin
+                    margin: topmargin
                   }
                 })
               ])

From 041266eea01fd1bd815c24d865d4853a1f14ac25 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 17:06:55 +0800
Subject: [PATCH 13/19] [Add] ForumPost Sort Information

---
 src/pages/oj/views/forum/Forum.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index fe6fc42..56111b0 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -74,6 +74,10 @@
             <p>{{$t('m.By')}}</p>
             <p>{{forumpost.author.username}}</p>
           </li>
+          <li>
+            <p>{{$t('m.Sort')}}</p>
+            <p>{{forumpost.sort}}</p>
+          </li>
           <li>
             <p>{{$t('m.Forum_Post_Time')}}</p>
             <p>{{forumpost.create_time | localtime }}</p>

From 8f17a853a3cfd81f8b79b4b71043d98252dae3ee Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 18:32:06 +0800
Subject: [PATCH 14/19] [Fix] ForumList Light style

---
 src/pages/oj/views/forum/ForumList.vue | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
index 5767de9..2335523 100644
--- a/src/pages/oj/views/forum/ForumList.vue
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -81,7 +81,11 @@
               let topmargin = ''
               let nice = ''
               let nicemargin = ''
-              let light = '#495060'
+              let light = {
+                padding: '2px 0',
+                overflowX: 'auto',
+                textAlign: 'left'
+              }
               if (params.row.is_top) {
                 top = 'pin'
                 topmargin = '0 0 0 8px'
@@ -90,7 +94,14 @@
                 nice = 'star'
                 nicemargin = '0 2px 0 8px'
               }
-              if (params.row.is_light) light = '#e74c3c'
+              if (params.row.is_light) {
+                light = {
+                  padding: '2px 0',
+                  overflowX: 'auto',
+                  textAlign: 'left',
+                  color: '#e74c3c'
+                }
+              }
               return h('div', [
                 h('Button', {
                   props: {
@@ -102,12 +113,7 @@
                       this.$router.push({name: 'Forum-details', params: {forumpostID: params.row.id}})
                     }
                   },
-                  style: {
-                    padding: '2px 0',
-                    overflowX: 'auto',
-                    textAlign: 'left',
-                    color: light
-                  }
+                  style: light
                 }, params.row.title),
                 h('Icon', {
                   props: {

From 2bae6fdb906f8490716fbd46cb98e9a524167547 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 19:24:40 +0800
Subject: [PATCH 15/19] [Add] Forum Reply Delete

---
 src/pages/oj/api.js                |  8 ++++++
 src/pages/oj/views/forum/Forum.vue | 41 ++++++++++++++++++++++++------
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/pages/oj/api.js b/src/pages/oj/api.js
index 24aced6..86514dc 100644
--- a/src/pages/oj/api.js
+++ b/src/pages/oj/api.js
@@ -338,6 +338,14 @@ export default {
     return ajax('forumreply', 'post', {
       data
     })
+  },
+  deleteFourmReply (id) {
+    let params = {
+      id: id
+    }
+    return ajax('forumreply', 'delete', {
+      params: params
+    })
   }
 }
 
diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index 56111b0..00435de 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -26,7 +26,14 @@
                 {{reply.author.username}}
               </a>
             </p>
-            <p slot="extra">{{reply.create_time | localtime }} &emsp;&emsp;# {{reply.floor}}</p>
+            <p slot="extra">
+              <Button v-if="visible || reply.author.username === user.username"
+                      class="delete-Button" 
+                      type="text"
+                      @click="ConfirmDeleteForumReply = true, forumreplyID = reply.id">
+                      {{$t('m.Forum_Delete')}}</Button>
+              {{reply.create_time | localtime }} &emsp;&emsp;# {{reply.floor}}
+            </p>
             <div id="forumreply-content" class="markdown-body" v-katex>
               <p class="content" v-html="reply.content"></p>
             </div>
@@ -121,9 +128,16 @@
     </div>
 
     <Modal
-        v-model="ConfirmDelete"
+        v-model="ConfirmDeleteForumPost"
+        :title="$t('m.Forum_Delete')"
+        @on-ok="confirmDeletePost">
+        <p>{{$t('m.Forum_ConfirmDelete')}}</p>
+    </Modal>
+
+    <Modal
+        v-model="ConfirmDeleteForumReply"
         :title="$t('m.Forum_Delete')"
-        @on-ok="ok">
+        @on-ok="confirmDeleteReply">
         <p>{{$t('m.Forum_ConfirmDelete')}}</p>
     </Modal>
 
@@ -157,7 +171,8 @@
           }
         },
         visible: false,
-        ConfirmDelete: false,
+        ConfirmDeleteForumPost: false,
+        ConfirmDeleteForumReply: false,
         forumreply: {
           fa_id: '',
           content: ''
@@ -214,9 +229,15 @@
         }
         if (method === 0) {
           // Delete
-          this.ConfirmDelete = true
+          this.ConfirmDeleteForumPost = true
         }
       },
+      confirmDeletePost () {
+        api.deleteFourmPost(this.forumpostID).then(res => {
+          this.$success('Success')
+          this.$router.push({name: 'Forum-list'})
+        })
+      },
       submitforumpost () {
         let data = {
           id: this.forumpost.id,
@@ -256,10 +277,10 @@
           this.forumreplys.unshift(res.data.data)
         })
       },
-      ok () {
-        api.deleteFourmPost(this.forumpostID).then(res => {
+      confirmDeleteReply () {
+        api.deleteFourmReply(this.forumreplyID).then(res => {
           this.$success('Success')
-          this.$router.push({name: 'Forum-list'})
+          this.getForumReplyList(this.page)
         })
       },
       GoUserHome (username) {
@@ -407,5 +428,9 @@
     border-left: 2px solid #ed3f14 !important;
     color: #ed3f14 !important;
   }
+
+  .delete-Button:hover  {
+    color: #ed3f14 !important;
+  }
 </style>
 

From 3b930801e786e0c979ae4eaddf48c7ecb7122dd5 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 20:33:40 +0800
Subject: [PATCH 16/19] [Fix] Change Theme Problem

---
 src/pages/oj/App.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/pages/oj/App.vue b/src/pages/oj/App.vue
index 30823c4..aced7f1 100644
--- a/src/pages/oj/App.vue
+++ b/src/pages/oj/App.vue
@@ -143,6 +143,9 @@
     }
 	  .ivu-card {
       background: @color2;
+    }
+    .ivu-layout {
+      background: transparent;
     }
 	  .ivu-menu-light.ivu-menu-horizontal .ivu-menu-submenu:hover{
 	    color: @color;

From ac1eee81e692857fde00fc66486782def05434ac Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Fri, 31 Jul 2020 23:01:04 +0800
Subject: [PATCH 17/19] [Fix] Forum Post/Reply error reset ubmitting

---
 src/pages/oj/views/forum/Forum.vue     | 2 ++
 src/pages/oj/views/forum/ForumPost.vue | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index 00435de..6d99be1 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -275,6 +275,8 @@
           this.submitting = false
           this.$success('Success')
           this.forumreplys.unshift(res.data.data)
+        }, () => {
+          this.submitting = false
         })
       },
       confirmDeleteReply () {
diff --git a/src/pages/oj/views/forum/ForumPost.vue b/src/pages/oj/views/forum/ForumPost.vue
index 2cbafd3..3408b95 100644
--- a/src/pages/oj/views/forum/ForumPost.vue
+++ b/src/pages/oj/views/forum/ForumPost.vue
@@ -107,6 +107,8 @@
           this.submitting = false
           this.$success('Success')
           this.$router.push({name: 'Forum-details', params: {forumpostID: res.data.data.id}})
+        }, () => {
+          this.submitting = false
         })
       }
     },

From ba999118fa095ea0043f4198e67623c259ad7c80 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sat, 1 Aug 2020 15:07:09 +0800
Subject: [PATCH 18/19] [Add] Forum Sort

---
 src/pages/oj/api.js                    |  7 +---
 src/pages/oj/views/forum/Forum.vue     |  7 ++--
 src/pages/oj/views/forum/ForumList.vue | 51 ++++++++++++++-----------
 src/pages/oj/views/forum/ForumPost.vue | 53 +++++++++++++++++++-------
 4 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/src/pages/oj/api.js b/src/pages/oj/api.js
index 86514dc..c38865a 100644
--- a/src/pages/oj/api.js
+++ b/src/pages/oj/api.js
@@ -318,18 +318,13 @@ export default {
       params: params
     })
   },
-  getForumReplyList (offset, limit, forumpostID, searchParams) {
+  getForumReplyList (offset, limit, forumpostID) {
     let params = {
       paging: true,
       offset,
       limit,
       fa_id: forumpostID
     }
-    Object.keys(searchParams).forEach((element) => {
-      if (searchParams[element]) {
-        params[element] = searchParams[element]
-      }
-    })
     return ajax('forumreply', 'get', {
       params: params
     })
diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index 6d99be1..ceb6364 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -83,7 +83,7 @@
           </li>
           <li>
             <p>{{$t('m.Sort')}}</p>
-            <p>{{forumpost.sort}}</p>
+            <p>{{website.forum_sort[forumpost.sort - 1].name}}</p>
           </li>
           <li>
             <p>{{$t('m.Forum_Post_Time')}}</p>
@@ -246,8 +246,7 @@
           is_top: this.forumpost.is_top,
           is_light: this.forumpost.is_light,
           is_nice: this.forumpost.is_nice,
-          sort: 0,
-          son_sort: 0
+          sort: this.forumpost.sort
         }
         api.submitFourmPost(data).then(res => {
           this.$success('Success')
@@ -294,7 +293,7 @@
       }
     },
     computed: {
-      ...mapGetters(['user', 'isSuperAdmin'])
+      ...mapGetters(['website', 'user', 'isSuperAdmin'])
     },
     watch: {
       '$route' () {
diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
index 2335523..4ac3383 100644
--- a/src/pages/oj/views/forum/ForumList.vue
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -1,6 +1,6 @@
 <template>
   <Row type="flex" :gutter="18">
-    <Col :span=19>
+    <Col :span="19">
     <Panel shadow>
       <div slot="title">{{$t('m.Forum_List')}}</div>
       <div slot="extra">
@@ -34,13 +34,13 @@
       <Panel :padding="10">
         <div slot="title" class="taglist-title">{{$t('m.Sort')}}</div>
         <br>
-        <Button v-for="tag in tagList"
-                :key="tag.name"
-                @click="filterByTag(tag.name)"
+        <Button v-for="sort in website.forum_sort"
+                :key="sort.name"
+                @click="filterBySort(sort.id)"
                 type="ghost"
-                :disabled="query.tag === tag.name"
+                :disabled="query.sort === sort.id"
                 shape="circle"
-                class="tag-btn">{{tag.name}}>
+                class="tag-btn">{{sort.name}}
         </Button>
       </Panel>
       <Spin v-if="loadings.tag" fix size="large"></Spin>
@@ -75,7 +75,7 @@
         problemTableColumns: [
           {
             title: this.$i18n.t('m.Forum_Title'),
-            width: 800,
+            width: 750,
             render: (h, params) => {
               let top = ''
               let topmargin = ''
@@ -147,17 +147,24 @@
                 },
                 on: {
                   click: () => {
-                    this.$router.push({name: 'Forum-details', params: {forumpostID: params.row.id}})
+                    this.filterBySort(params.row.sort)
                   }
+                },
+                style: {
+                  margin: '0 0 0 -22px'
                 }
-              }, params.row.sort)
+              }, this.website.forum_sort[params.row.sort - 1].name)
             }
           },
           {
             title: this.$i18n.t('m.Forum_Post_Time'),
             width: 150,
             render: (h, params) => {
-              return h('span', time.utcToLocal(params.row.create_time))
+              return h('span', {
+                style: {
+                  margin: '0 0 0 -5px'
+                }
+              }, time.utcToLocal(params.row.create_time))
             }
           },
           {
@@ -176,6 +183,9 @@
                         query: {username: params.row.author.username}
                       })
                   }
+                },
+                style: {
+                  margin: '0 0 0 -10px'
                 }
               }, params.row.author.username)
             }
@@ -191,6 +201,7 @@
         routeName: '',
         query: {
           keyword: '',
+          sort: '',
           page: 1
         }
       }
@@ -203,6 +214,7 @@
         this.routeName = this.$route.name
         let query = this.$route.query
         this.query.keyword = query.keyword || ''
+        this.query.sort = query.sort || ''
         this.query.page = parseInt(query.page) || 1
         if (this.query.page < 1) {
           this.query.page = 1
@@ -229,20 +241,15 @@
           this.loadings.table = false
         })
       },
-      getTagList () {
-        api.getProblemTagList().then(res => {
-          this.tagList = res.data.data.sort((a, b) => {
-            return a.name.localeCompare(b.name)
-          })
-          this.loadings.tag = false
-        }, res => {
-          this.loadings.tag = false
-        })
-      },
       filterByKeyword () {
         this.query.page = 1
         this.pushRouter()
       },
+      filterBySort (sortID) {
+        this.query.sort = sortID
+        this.query.page = 1
+        this.pushRouter()
+      },
       handleTagsVisible (value) {
         if (value) {
           this.problemTableColumns.push(
@@ -266,14 +273,14 @@
         }
       },
       onReset () {
-        this.getForumList()
+        this.$router.push({name: 'Forum-list'})
       },
       handleRoute (route) {
         this.$router.push(route)
       }
     },
     computed: {
-      ...mapGetters(['isAuthenticated'])
+      ...mapGetters(['website', 'isAuthenticated'])
     },
     watch: {
       '$route' (newVal, oldVal) {
diff --git a/src/pages/oj/views/forum/ForumPost.vue b/src/pages/oj/views/forum/ForumPost.vue
index 3408b95..de06609 100644
--- a/src/pages/oj/views/forum/ForumPost.vue
+++ b/src/pages/oj/views/forum/ForumPost.vue
@@ -4,17 +4,27 @@
       <!--Post main-->
       <Card :padding="20" id="submit-reply" dis-hover>
         <div class="title">{{$t('m.Forum_Post')}}</div>
-        <div style="font-size: 16px; margin-left: 20px; margin-right: 20px;">
-          {{$t('m.Forum_Title')}}:&emsp; 
-          <Input v-model="forumpost.title" placeholder="Title" size="large" style="width: 600px"></Input>
-        </div>
-        <div style="margin-top: 20px; margin-left: 20px; margin-right: 20px;">
-          <Simditor v-model="forumpost.content"></Simditor>
-        </div>
+        <Form ref="forumpost" :model="forumpost" :rules="ruleValidate" inline style="margin-left: 20px; margin-right: 20px; width: 100%;">
+          <FormItem :label="$t('m.Sort')" prop="sort">
+            <Select v-model="forumpost.sort" size="large" style="width:200px; margin-right: 20px;" @change="console.log(forumpost.sort)">
+              <Option v-for="sort in website.forum_sort" :value="sort.id" :key="sort.name">{{ sort.name }}</Option>
+            </Select>
+          </FormItem>
+          <FormItem :label="$t('m.Forum_Title')" prop="title">
+            <Input v-model="forumpost.title" placeholder="Title" size="large" style="width: 600px"></Input>
+          </FormItem>
+        </Form>
+        <Form ref="forumpost" :model="forumpost" :rules="ruleValidate" style="margin-left: 20px; margin-right: 20px; width: 100%;">
+          <FormItem :label="$t('m.Forum_Content')" prop="content">
+            <div style="margin-top: 35px; margin-right: 40px;">
+              <Simditor v-model="forumpost.content"></Simditor>
+            </div>
+          </FormItem>
+        </Form>
         <Row type="flex" justify="space-between">
           <Col :span="12" style="margin-top: 20px; margin-left: 45px;">
             <Button type="warning" icon="edit" :loading="submitting" @click="submitforumpost"
-                          :disabled="forumpostSubmitDisabled || submitted"
+                          :disabled="forumpostSubmitDisabled"
                           class="fl-right">
             <span v-if="submitting">{{$t('m.Submitting')}}</span>
             <span v-else>{{$t('m.Submit')}}</span>
@@ -28,7 +38,7 @@
 </template>
 
 <script>
-  import {mapActions} from 'vuex'
+  import {mapGetters} from 'vuex'
   import {types} from '../../../../store'
   import {FormMixin} from '@oj/components/mixins'
   import api from '@oj/api'
@@ -48,8 +58,18 @@
           id: '',
           title: '',
           content: '',
-          sort: 0,
-          son_sort: 0
+          sort: 0
+        },
+        ruleValidate: {
+          sort: [
+            { required: true, message: 'The Sort cannot be empty', trigger: 'blur' }
+          ],
+          title: [
+            { required: true, message: 'The Title cannot be empty', trigger: 'blur' }
+          ],
+          content: [
+            { required: true, message: 'The Content cannot be empty', trigger: 'blur' }
+          ]
         },
         limit: 20,
         total: 0,
@@ -64,7 +84,6 @@
       this.init()
     },
     methods: {
-      ...mapActions(['changeDomTitle']),
       init () {
         this.$Loading.start()
         if (this.$route.query.id) {
@@ -88,6 +107,10 @@
         })
       },
       submitforumpost () {
+        if (this.forumpost.title.trim() === '') {
+          this.$error('Title can not be empty!')
+          return
+        }
         if (this.forumpost.content.trim() === '') {
           this.$error('Reply can not be empty!')
           return
@@ -100,8 +123,7 @@
           is_top: false,
           is_light: false,
           is_nice: false,
-          sort: 0,
-          son_sort: 0
+          sort: this.forumpost.sort
         }
         api.submitFourmPost(data).then(res => {
           this.submitting = false
@@ -112,6 +134,9 @@
         })
       }
     },
+    computed: {
+      ...mapGetters(['website'])
+    },
     watch: {
       '$route' () {
         this.init()

From 8ca8758f95c6c3f8fd332a5b21b63670a3899838 Mon Sep 17 00:00:00 2001
From: Harry-zklcdc <1269158832@qq.com>
Date: Sat, 1 Aug 2020 23:51:10 +0800
Subject: [PATCH 19/19] [Add] Forum Post/Reply Permission

---
 src/i18n/admin/en-US.js                |  6 ++
 src/i18n/admin/zh-CN.js                |  6 ++
 src/i18n/admin/zh-TW.js                |  6 ++
 src/pages/admin/views/general/Conf.vue | 90 ++++++++++++++++++++++++--
 src/pages/oj/views/forum/Forum.vue     | 37 +++++++++--
 src/pages/oj/views/forum/ForumList.vue |  6 +-
 src/pages/oj/views/forum/ForumPost.vue | 14 +++-
 7 files changed, 148 insertions(+), 17 deletions(-)

diff --git a/src/i18n/admin/en-US.js b/src/i18n/admin/en-US.js
index e984c12..97ea2c5 100644
--- a/src/i18n/admin/en-US.js
+++ b/src/i18n/admin/en-US.js
@@ -50,6 +50,12 @@ export const m = {
   Footer: 'Footer',
   Allow_Register: 'Allow Register',
   Submission_List_Show_All: 'Submission List Show All',
+  Sort: 'Sort',
+  Sort_Name: 'Sort Name',
+  Sort_Permission: 'Sort Permission',
+  Add_Sort: 'Add Sort',
+  Allow_Post: 'Allow Post',
+  Allow_Reply: 'Allow Reply',
   // JudgeServer.vue
   Judge_Server_Token: 'Judge Server Token',
   Judge_Server_Info: 'Judge Server',
diff --git a/src/i18n/admin/zh-CN.js b/src/i18n/admin/zh-CN.js
index a793b89..9278292 100644
--- a/src/i18n/admin/zh-CN.js
+++ b/src/i18n/admin/zh-CN.js
@@ -50,6 +50,12 @@ export const m = {
   Footer: '页脚',
   Allow_Register: '是否允许注册',
   Submission_List_Show_All: '显示全部题目的提交',
+  Sort: '板块',
+  Sort_Name: '板块名称',
+  Sort_Permission: '板块权限',
+  Add_Sort: '添加板块',
+  Allow_Post: '是否允许发帖',
+  Allow_Reply: '是否允许回复',
   // JudgeServer.vue
   Judge_Server_Token: '判题服务器接口',
   Judge_Server_Info: '判题服务器',
diff --git a/src/i18n/admin/zh-TW.js b/src/i18n/admin/zh-TW.js
index e1645e6..fb73df2 100644
--- a/src/i18n/admin/zh-TW.js
+++ b/src/i18n/admin/zh-TW.js
@@ -50,6 +50,12 @@ export const m = {
   Footer: '頁尾',
   Allow_Register: '是否允許註冊',
   Submission_List_Show_All: '顯示全部題目的提交',
+  Sort: '板塊',
+  Sort_Name: '板塊名稱',
+  Sort_Permission: '板塊許可權',
+  Add_Sort: '添加板塊',
+  Allow_Post: '是否允許發帖',
+  Allow_Reply: '是否允許回復',
   // JudgeServer.vue
   Judge_Server_Token: 'Judge 伺服器 Token',
   Judge_Server_Info: 'Judge 伺服器',
diff --git a/src/pages/admin/views/general/Conf.vue b/src/pages/admin/views/general/Conf.vue
index 67a0487..19b217a 100644
--- a/src/pages/admin/views/general/Conf.vue
+++ b/src/pages/admin/views/general/Conf.vue
@@ -62,8 +62,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-col :span="12">
-              <el-form-item :label="$t('m.Allow_Register')" label-width="200px">
+            <el-col :span="6">
+              <el-form-item :label="$t('m.Allow_Register')" label-width="150px">
                 <el-switch
                   v-model="websiteConfig.allow_register"
                   active-color="#13ce66"
@@ -71,8 +71,8 @@
                 </el-switch>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item :label="$t('m.Submission_List_Show_All')" label-width="200px">
+            <el-col :span="6">
+              <el-form-item :label="$t('m.Submission_List_Show_All')" label-width="150px">
                 <el-switch
                   v-model="websiteConfig.submission_list_show_all"
                   active-color="#13ce66"
@@ -80,10 +80,61 @@
                 </el-switch>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('m.Allow_Post')" label-width="150px">
+                <el-switch
+                  v-model="websiteConfig.allow_forum_post"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('m.Allow_Reply')" label-width="150px">
+                <el-switch
+                  v-model="websiteConfig.allow_forum_reply"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949">
+                </el-switch>
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="24">
+            <div>
+              <el-form-item v-for="(forum_sort, index) in websiteConfig.forum_sort" :key="$t('m.Sort') + index">
+                <Accordion :title="$t('m.Sort') + (index + 1)" style="margin-left: -100px;">
+                  <el-button type="warning" size="small" icon="el-icon-delete" slot="header" @click="deleteSort(index)">
+                    Delete
+                  </el-button>
+                  <el-row :gutter="20">
+                    <el-col :span="12">
+                      <el-form-item :label="$t('m.Sort_Name')" required>
+                        <el-input
+                          :placeholder="$t('m.Sort_Name')"
+                          v-model="forum_sort.name">
+                        </el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item :label="$t('m.Sort_Permission')" required>
+                        <el-select v-model="forum_sort.permission" placeholder="All">
+                          <el-option label="All" value="All"></el-option>
+                          <el-option label="Super Admin" value="Super Admin"></el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </Accordion>
+              </el-form-item>
+            </div>
+            <div class="add-sample-btn">
+              <button type="button" class="add-sorts" @click="addSort()"><i class="el-icon-plus"></i>{{$t('m.Add_Sort')}}
+              </button>
+            </div>
           </el-col>
         </el-row>
       </el-form>
-      <save @click.native="saveWebsiteConfig"></save>
+      <save @click.native="saveWebsiteConfig" style="margin-top: 20px;"></save>
     </Panel>
 
     <Panel :title="$t('About Us Config')">
@@ -102,13 +153,15 @@
 </template>
 
 <script>
+  import Accordion from '../../components/Accordion'
   import Simditor from '../../components/Simditor.vue'
   import api from '../../api.js'
 
   export default {
     name: 'Conf',
     components: {
-      Simditor
+      Simditor,
+      Accordion
     },
     data () {
       return {
@@ -187,6 +240,12 @@
         }).catch(() => {
         })
       },
+      addSort () {
+        this.websiteConfig.forum_sort.push({name: '', permission: ''})
+      },
+      deleteSort (index) {
+        this.websiteConfig.forum_sort.splice(index, 1)
+      },
       saveAboutUs (data) {
         if (this.onit === false) {
           api.updateAboutUs(this.aboutus).then(() => {
@@ -214,3 +273,22 @@
     }
   }
 </script>
+
+<style lang="less" scoped>
+  .add-sorts {
+      width: 100%;
+      background-color: #fff;
+      border: 1px dashed #aaa;
+      outline: none;
+      cursor: pointer;
+      color: #666;
+      height: 35px;
+      font-size: 14px;
+      &:hover {
+        background-color: #f9fafc;
+      }
+      i {
+        margin-right: 10px;
+      }
+    }
+</style>
diff --git a/src/pages/oj/views/forum/Forum.vue b/src/pages/oj/views/forum/Forum.vue
index ceb6364..ddf8620 100644
--- a/src/pages/oj/views/forum/Forum.vue
+++ b/src/pages/oj/views/forum/Forum.vue
@@ -111,12 +111,12 @@
             <li v-if="isSuperAdmin">
               <Icon type="lightbulb" style="margin-left: 2px;"></Icon>
               &nbsp;{{$t('m.Forum_Light')}}
-              <i-switch v-model="forumpost.is_light" @on-change="ForumPostControl(2)" style="margin-left: 10px;"></i-switch>
+              <i-switch v-model="forumpost.is_light" @on-change="ForumPostControl(3)" style="margin-left: 10px;"></i-switch>
             </li>
             <li v-if="isSuperAdmin">
               <Icon type="star" style="margin-left: -1px;"></Icon>
               {{$t('m.Forum_Nice')}}
-              <i-switch v-model="forumpost.is_nice" @on-change="ForumPostControl(2)" style="margin-left: 10px;"></i-switch>
+              <i-switch v-model="forumpost.is_nice" @on-change="ForumPostControl(4)" style="margin-left: 10px;"></i-switch>
             </li>
             <li class="delete" @click.stop="ForumPostControl(0)">
                 <Icon type="trash-b" style="margin-left: 1px;"></Icon>
@@ -224,8 +224,16 @@
           this.$router.push({name: 'Forum-post', query: {id: this.forumpostID}})
         }
         if (method === 2) {
-          // Top / Light / Nice
-          this.submitforumpost()
+          // Top
+          this.submitforumpost(2)
+        }
+        if (method === 3) {
+          // Light
+          this.submitforumpost(3)
+        }
+        if (method === 4) {
+          // Nice
+          this.submitforumpost(4)
         }
         if (method === 0) {
           // Delete
@@ -238,7 +246,18 @@
           this.$router.push({name: 'Forum-list'})
         })
       },
-      submitforumpost () {
+      submitforumpost (model) {
+        if (this.isSuperAdmin === false) {
+          this.$error('User does\'t have permission')
+          return
+        }
+        if (this.website.allow_forum_post === false) {
+          if (model === 2) { this.forumpost.is_top = !this.forumpost.is_top }
+          if (model === 3) { this.forumpost.is_light = !this.forumpost.is_light }
+          if (model === 4) { this.forumpost.is_nice = !this.forumpost.is_nice }
+          this.$error(this.website.website_name + ' does\'t allow to post')
+          return
+        }
         let data = {
           id: this.forumpost.id,
           title: this.forumpost.title,
@@ -250,6 +269,10 @@
         }
         api.submitFourmPost(data).then(res => {
           this.$success('Success')
+        }, () => {
+          if (model === 2) this.forumpost.is_top = !this.forumpost.is_top
+          if (model === 3) this.forumpost.is_light = !this.forumpost.is_light
+          if (model === 4) this.forumpost.is_nice = !this.forumpost.is_nice
         })
       },
       getForumReplyList (page) {
@@ -265,6 +288,10 @@
           this.$error('Reply can not be empty!')
           return
         }
+        if (this.website.allow_forum_reply === false) {
+          this.$error(this.website.website_name + ' does\'t allow to reply')
+          return
+        }
         this.submitting = true
         let data = {
           fa_id: this.forumpostID,
diff --git a/src/pages/oj/views/forum/ForumList.vue b/src/pages/oj/views/forum/ForumList.vue
index 4ac3383..4915eab 100644
--- a/src/pages/oj/views/forum/ForumList.vue
+++ b/src/pages/oj/views/forum/ForumList.vue
@@ -34,11 +34,11 @@
       <Panel :padding="10">
         <div slot="title" class="taglist-title">{{$t('m.Sort')}}</div>
         <br>
-        <Button v-for="sort in website.forum_sort"
+        <Button v-for="(sort, index) in website.forum_sort"
                 :key="sort.name"
-                @click="filterBySort(sort.id)"
+                @click="filterBySort(index + 1)"
                 type="ghost"
-                :disabled="query.sort === sort.id"
+                :disabled="query.sort === index + 1"
                 shape="circle"
                 class="tag-btn">{{sort.name}}
         </Button>
diff --git a/src/pages/oj/views/forum/ForumPost.vue b/src/pages/oj/views/forum/ForumPost.vue
index de06609..7582b9e 100644
--- a/src/pages/oj/views/forum/ForumPost.vue
+++ b/src/pages/oj/views/forum/ForumPost.vue
@@ -6,8 +6,8 @@
         <div class="title">{{$t('m.Forum_Post')}}</div>
         <Form ref="forumpost" :model="forumpost" :rules="ruleValidate" inline style="margin-left: 20px; margin-right: 20px; width: 100%;">
           <FormItem :label="$t('m.Sort')" prop="sort">
-            <Select v-model="forumpost.sort" size="large" style="width:200px; margin-right: 20px;" @change="console.log(forumpost.sort)">
-              <Option v-for="sort in website.forum_sort" :value="sort.id" :key="sort.name">{{ sort.name }}</Option>
+            <Select v-model="forumpost.sort" size="large" style="width:200px; margin-right: 20px;">
+              <Option v-for="(sort, index) in website.forum_sort" :value="index + 1" :key="sort.name">{{ sort.name }}</Option>
             </Select>
           </FormItem>
           <FormItem :label="$t('m.Forum_Title')" prop="title">
@@ -107,6 +107,14 @@
         })
       },
       submitforumpost () {
+        if (this.website.allow_forum_post === false) {
+          this.$error(this.website.website_name + ' does\'t allow to post')
+          return
+        }
+        if (this.website.forum_sort[this.forumpost.sort - 1].permission === 'Super Admin' && this.isSuperAdmin === false) {
+          this.$error(this.website.forum_sort[this.forumpost.sort - 1].name + ' does\'t allow you to post')
+          return
+        }
         if (this.forumpost.title.trim() === '') {
           this.$error('Title can not be empty!')
           return
@@ -135,7 +143,7 @@
       }
     },
     computed: {
-      ...mapGetters(['website'])
+      ...mapGetters(['website', 'isSuperAdmin'])
     },
     watch: {
       '$route' () {