Add some functions、Fix some bugs

Dockerfile

@@ -11,7 +11,7 @@ RUN apk add --update --no-cache build-base nginx openssl curl unzip supervisor j
     pip install --no-cache-dir -r /app/deploy/requirements.txt && \
     apk del build-base --purge
 
-RUN curl -L  $(curl -s  https://api.github.com/repos/QingdaoU/OnlineJudgeFE/releases/latest | grep /dist.zip | cut -d '"' -f 4) -o dist.zip && \
+RUN curl -L  $(curl -s  https://api.github.com/repos/Harry-zklcdc/OJ/releases/latest | grep /dist.zip | cut -d '"' -f 4) -o dist.zip && \
     unzip dist.zip && \
     rm dist.zip
 

README-CN.md

@@ -3,34 +3,38 @@
 [![Python](https://img.shields.io/badge/python-3.6.2-blue.svg?style=flat-square)](https://www.python.org/downloads/release/python-362/)
 [![Django](https://img.shields.io/badge/django-1.11.4-blue.svg?style=flat-square)](https://www.djangoproject.com/)
 [![Django Rest Framework](https://img.shields.io/badge/django_rest_framework-3.4.0-blue.svg?style=flat-square)](http://www.django-rest-framework.org/)
-[![Build Status](https://travis-ci.org/QingdaoU/OnlineJudge.svg?branch=master)](https://travis-ci.org/QingdaoU/OnlineJudge)
+[![Build Status](https://travis-ci.org/Harry-zklcdc/OnlineJudge.svg?branch=master)](https://travis-ci.org/Harry-zklcdc/OnlineJudge)
 
-> #### 基于 Python 和 Vue 的在线评测系统。 [Demo](https://qduoj.com)
+> #### 基于 Python 和 Vue 的在线评测系统。 [Demo](http://www.yangzheng.com.cn:84)
 
 [English Document](README.md)
 
 ## 概览
 
-+ 基于 Docker，真正一键部署
-+ 前后端分离，模块化编程，微服务
-+ ACM/OI 两种比赛模式、实时/非实时评判 任意选择
-+ 丰富的可视化图表，一图胜千言
-+ 支持 Template Problem，可以添加函数题甚至填空题
-+ 更细致的权限划分，超级管理员和普通管理员各司其职
-+ 多语言支持：`C`, `C++`, `Java`, `Python2`, `Python3`，题目可以选择使用的语言
-+ Markdown & MathJax 支持
-+ 比赛用户IP限制 (CIDR ranges)
+- 基于 Docker，真正一键部署
+- 前后端分离，模块化编程，微服务
+- ACM/OI 两种比赛模式、实时/非实时评判 任意选择
+- 丰富的可视化图表，一图胜千言
+- 支持 Template Problem，可以添加函数题甚至填空题
+- 更细致的权限划分，超级管理员和普通管理员各司其职
+- 多语言支持：`C`, `C++`, `Java`, `Python2`, `Python3`，题目可以选择使用的语言
+- Markdown & MathJax 支持
+- 比赛用户IP限制 (CIDR ranges)
+- 在线 IDE
+- 自定义关于我们介绍页面
+- 换肤功能
+- 标准输入输出 / 文件输入输出
 
 主要模块均已开源:
 
-+ 后端(Django): [https://github.com/QingdaoU/OnlineJudge](https://github.com/QingdaoU/OnlineJudge)
-+ 前端(Vue): [https://github.com/QingdaoU/OnlineJudgeFE](https://github.com/QingdaoU/OnlineJudgeFE)
-+ 判题沙箱(Seccomp): [https://github.com/QingdaoU/Judger](https://github.com/QingdaoU/Judger)
-+ 判题服务器(对Judger的封装): [https://github.com/QingdaoU/JudgeServer](https://github.com/QingdaoU/JudgeServer)
+- 后端(Django): [https://github.com/Harry-zklcdc/OnlineJudge](https://github.com/Harry-zklcdc/OnlineJudge)
+- 前端(Vue): [https://github.com/Harry-zklcdc/OJ](https://github.com/Harry-zklcdc/OJ)
+- 判题沙箱(Seccomp): [https://github.com/Harry-zklcdc/Judger](https://github.com/Harry-zklcdc/Judger)
+- 判题服务器(对Judger的封装): [https://github.com/Harry-zklcdc/JudgeServer](https://github.com/Harry-zklcdc/JudgeServe)
 
 ## 安装
 
-请根据此进行安装:  [https://github.com/QingdaoU/OnlineJudgeDeploy/tree/2.0](https://github.com/QingdaoU/OnlineJudgeDeploy/tree/2.0)
+请根据此进行安装:  [https://github.com/Harry-zklcdc/OnlineJudgeDeploy/tree/2.0](https://github.com/Harry-zklcdc/OnlineJudgeDeploy/tree/2.0)
 
 ## 文档
 
@@ -68,15 +72,14 @@ Rankings 中可以控制图表和菜单的显隐。
 
 ![create-contest](https://user-images.githubusercontent.com/20637881/33372514-428ab922-d539-11e7-8f68-da55dedf3ad3.png)
 
-
 ## 浏览器支持
 
 Modern browsers(chrome, firefox) 和 Internet Explorer 10+.
 
 ## 特别感谢
 
-+ 所有为本项目做出贡献的人
-+ [heb1c](https://github.com/hebicheng) 同学为我们提供了很多意见和建议
+- 所有为本项目做出贡献的人
+- [heb1c](https://github.com/hebicheng) 同学为我们提供了很多意见和建议
 
 如果您觉得这个项目还不错，就star一下吧 ：)
 

README.md

@@ -3,34 +3,40 @@
 [![Python](https://img.shields.io/badge/python-3.6.2-blue.svg?style=flat-square)](https://www.python.org/downloads/release/python-362/)
 [![Django](https://img.shields.io/badge/django-1.11.4-blue.svg?style=flat-square)](https://www.djangoproject.com/)
 [![Django Rest Framework](https://img.shields.io/badge/django_rest_framework-3.4.0-blue.svg?style=flat-square)](http://www.django-rest-framework.org/)
-[![Build Status](https://travis-ci.org/QingdaoU/OnlineJudge.svg?branch=master)](https://travis-ci.org/QingdaoU/OnlineJudge)
+[![Build Status](https://travis-ci.org/Harry-zklcdc/OnlineJudge.svg?branch=master)](https://travis-ci.org/Harry-zklcdc/OnlineJudge)
 
-> #### An onlinejudge system based on Python and Vue. [Demo](https://qduoj.com)
+> 
+>
+> #### An onlinejudge system based on Python and Vue. [Demo](http://www.yangzheng.com.cn:84)
 
 [中文文档](README-CN.md)
 
 ## Overview
 
-+ Based on Docker; One-click deployment
-+ Separated backend and frontend; Modular programming; Micro service
-+ ACM/OI rule support; realtime/non-realtime rank support
-+ Amazing charting and visualization
-+ Template-problem support
-+ More reasonable permission control
-+ Multi-language support: `C`, `C++`, `Java`, `Python2`, `Python3`
-+ Markdown & MathJax support
-+ Contest participants IP limit(CIDR)
+- Based on Docker; One-click deployment
+- Separated backend and frontend; Modular programming; Micro service
+- ACM/OI rule support; realtime/non-realtime rank support
+- Amazing charting and visualization
+- Template-problem support
+- More reasonable permission control
+- Multi-language support: `C`, `C++`, `Java`, `Python2`, `Python3`
+- Markdown & MathJax support
+- Contest participants IP limit(CIDR)
+- Online IDE
+- DIY About Us Page
+- Optional Theme
+- Standard IO/File IO
 
 Main modules are available below:
 
-+ Backend(Django): [https://github.com/QingdaoU/OnlineJudge](https://github.com/QingdaoU/OnlineJudge)
-+ Frontend(Vue): [https://github.com/QingdaoU/OnlineJudgeFE](https://github.com/QingdaoU/OnlineJudgeFE)
-+ Judger Sandbox(Seccomp): [https://github.com/QingdaoU/Judger](https://github.com/QingdaoU/Judger)
-+ JudgeServer(A wrapper for Judger): [https://github.com/QingdaoU/JudgeServer](https://github.com/QingdaoU/JudgeServer)
+- Backend(Django): [https://github.com/Harry-zklcdc/OnlineJudge](https://github.com/Harry-zklcdc/OnlineJudge)
+- Frontend(Vue): [https://github.com/Harry-zklcdc/OJ](https://github.com/Harry-zklcdc/OJ)
+- Judger Sandbox(Seccomp): [https://github.com/Harry-zklcdc/Judger](https://github.com/Harry-zklcdc/Judger)
+- JudgeServer(A wrapper for Judger): [https://github.com/Harry-zklcdc/JudgeServer](https://github.com/Harry-zklcdc/JudgeServer)
 
 ## Installation
 
-Follow me:  [https://github.com/QingdaoU/OnlineJudgeDeploy/tree/2.0](https://github.com/QingdaoU/OnlineJudgeDeploy/tree/2.0)
+Follow me:  [https://github.com/Harry-zklcdc/OnlineJudgeDeploy/tree/2.0](https://github.com/Harry-zklcdc/OnlineJudgeDeploy/tree/2.0)
 
 ## Documents
 
@@ -76,10 +82,10 @@ Modern browsers(chrome, firefox) and Internet Explorer 10+.
 
 ## Thanks
 
-+ I'd appreciate a star if you find this helpful.
-+ Thanks to everyone that contributes to this project.
-+ Special thanks to [heb1c](https://github.com/hebicheng), who has given us a lot of suggestions.
+- I'd appreciate a star if you find this helpful.
+- Thanks to everyone that contributes to this project.
+- Special thanks to [heb1c](https://github.com/hebicheng), who has given us a lot of suggestions.
 
 ## License
 
-[MIT](http://opensource.org/licenses/MIT)
+[MIT](http://opensource.org/licenses/MIT)**

account/views/admin.py

@@ -119,6 +119,11 @@ def get(self, request):
             user = user.filter(Q(username__icontains=keyword) |
                                Q(userprofile__real_name__icontains=keyword) |
                                Q(email__icontains=keyword))
+
+        only_admin = request.GET.get("onlyadmin", None)
+        if only_admin:
+            user = user.filter(Q(admin_type__icontains="Admin"))
+
         return self.success(self.paginate_data(request, user, UserAdminSerializer))
 
     @super_admin_required

announcement/migrations/0001_initial.py

@@ -34,3 +34,4 @@ class Migration(migrations.Migration):
             },
         ),
     ]
+

announcement/migrations/0004_auto_20190430_2118.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2019-04-30 21:18
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+import utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcement', '0003_auto_20180501_0436'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AboutUs',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('content', utils.models.RichTextField()),
+                ('last_update_time', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'db_table': 'aboutus',
+            },
+        ),
+    ]

announcement/models.py

@@ -16,3 +16,12 @@ class Announcement(models.Model):
     class Meta:
         db_table = "announcement"
         ordering = ("-create_time",)
+
+
+class AboutUs(models.Model):
+    # HTML
+    content = RichTextField()
+    last_update_time = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        db_table = "aboutus"

announcement/serializers.py

@@ -1,7 +1,7 @@
 from utils.api import serializers
 from utils.api._serializers import UsernameSerializer
 
-from .models import Announcement
+from .models import Announcement, AboutUs
 
 
 class CreateAnnouncementSerializer(serializers.Serializer):
@@ -23,3 +23,19 @@ class EditAnnouncementSerializer(serializers.Serializer):
     title = serializers.CharField(max_length=64)
     content = serializers.CharField(max_length=1024 * 1024 * 8)
     visible = serializers.BooleanField()
+
+
+class CreateAboutUsSerializer(serializers.Serializer):
+    content = serializers.CharField(max_length=1024 * 1024 * 8)
+
+
+class AboutUsSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = AboutUs
+        fields = "__all__"
+
+
+class EditAboutUsSerializer(serializers.Serializer):
+    id = 0
+    content = serializers.CharField(max_length=1024 * 1024 * 8)

announcement/urls/admin.py

@@ -1,7 +1,8 @@
 from django.conf.urls import url
 
-from ..views.admin import AnnouncementAdminAPI
+from ..views.admin import AnnouncementAdminAPI, AboutUsAdminAPI
 
 urlpatterns = [
     url(r"^announcement/?$", AnnouncementAdminAPI.as_view(), name="announcement_admin_api"),
+    url(r"^aboutus/?$", AboutUsAdminAPI.as_view(), name="aboutus_admin_api"),
 ]

announcement/urls/oj.py

@@ -1,7 +1,8 @@
 from django.conf.urls import url
 
-from ..views.oj import AnnouncementAPI
+from ..views.oj import AnnouncementAPI, AboutUsAPI
 
 urlpatterns = [
     url(r"^announcement/?$", AnnouncementAPI.as_view(), name="announcement_api"),
+    url(r"^aboutus/?$", AboutUsAPI.as_view(), name="aboutus_api"),
 ]

announcement/views/admin.py

@@ -1,9 +1,9 @@
 from account.decorators import super_admin_required
 from utils.api import APIView, validate_serializer
 
-from announcement.models import Announcement
-from announcement.serializers import (AnnouncementSerializer, CreateAnnouncementSerializer,
-                                      EditAnnouncementSerializer)
+from announcement.models import Announcement, AboutUs
+from announcement.serializers import (AnnouncementSerializer, CreateAnnouncementSerializer, EditAnnouncementSerializer,
+                                      AboutUsSerializer, CreateAboutUsSerializer, EditAboutUsSerializer)
 
 
 class AnnouncementAdminAPI(APIView):
@@ -60,3 +60,45 @@ def delete(self, request):
         if request.GET.get("id"):
             Announcement.objects.filter(id=request.GET["id"]).delete()
         return self.success()
+
+
+class AboutUsAdminAPI(APIView):
+    @validate_serializer(CreateAboutUsSerializer)
+    @super_admin_required
+    def post(self, request):
+        """
+        publish aboutus
+        """
+        data = request.data
+        aboutus = AboutUs.objects.create(content=data["content"])
+        return self.success(AboutUsSerializer(aboutus).data)
+
+    @validate_serializer(EditAboutUsSerializer)
+    @super_admin_required
+    def put(self, request):
+        """
+        edit aboutus
+        """
+        data = request.data
+        try:
+            aboutus = AboutUs.objects.get(id=1)
+        except AboutUs.DoesNotExist:
+            return self.error("About Us does not exist")
+
+        for k, v in data.items():
+            setattr(aboutus, k, v)
+        aboutus.save()
+
+        return self.success(AboutUsSerializer(aboutus).data)
+
+    @super_admin_required
+    def get(self, request):
+        """
+        get about_us list / get about_us
+        """
+        aboutus_id = 1
+        try:
+            aboutus = AboutUs.objects.get(id=aboutus_id)
+            return self.success(AboutUsSerializer(aboutus).data)
+        except AboutUs.DoesNotExist:
+            return self.success(None)

announcement/views/oj.py

@@ -1,10 +1,19 @@
 from utils.api import APIView
 
-from announcement.models import Announcement
-from announcement.serializers import AnnouncementSerializer
+from announcement.models import Announcement, AboutUs
+from announcement.serializers import AnnouncementSerializer, AboutUsSerializer
 
 
 class AnnouncementAPI(APIView):
     def get(self, request):
         announcements = Announcement.objects.filter(visible=True)
         return self.success(self.paginate_data(request, announcements, AnnouncementSerializer))
+
+
+class AboutUsAPI(APIView):
+    def get(self, request):
+        try:
+            aboutus = AboutUs.objects.get(id=1)
+            return self.success(AboutUsSerializer(aboutus).data)
+        except AboutUs.DoesNotExist:
+            return self.error("About Us does not exist")

conf/urls/admin.py

@@ -10,5 +10,5 @@
     url(r"^judge_server/?$", JudgeServerAPI.as_view(), name="judge_server_api"),
     url(r"^prune_test_case/?$", TestCasePruneAPI.as_view(), name="prune_test_case_api"),
     url(r"^versions/?$", ReleaseNotesAPI.as_view(), name="get_release_notes_api"),
-    url(r"^dashboard_info", DashboardInfoAPI.as_view(), name="dashboard_info_api"),
+    url(r"^dashboard_info", DashboardInfoAPI.as_view(), name="dashboard_info_api")
 ]