ui: 允许自定义首页布局

packages/hydrooj/locales/zh.yaml

@@ -156,7 +156,6 @@ contest_edit: 编辑比赛
 contest_main: 比赛
 contest_scoreboard: 比赛成绩表
 Contest: 比赛
-Contests on main: 主页展示的比赛数量
 Contests per page: 每页展示的比赛数量
 Continue: 继续
 Contributed Problems: 贡献的题目
@@ -243,7 +242,6 @@ discussion_edit: 编辑讨论
 discussion_main: 讨论
 discussion_node: 讨论
 Discussion: 讨论
-Discussions on main: 主页展示的讨论数量
 Discussions per page: 每页展示的讨论数量
 Discussions: 讨论
 Display name {1} you want to set is used by others.: 您想要设置的显示名 {1} 已经被其他人使用了。
@@ -367,7 +365,6 @@ homework_main: 作业
 homework_scoreboard: 作业成绩表
 homework_status: 作业成绩表
 Homework: 作业
-Homeworks on main: 主页展示的作业数量
 Homeworks per page: 每页展示的作业数量
 Host: 主办人
 hour(s): 小时
@@ -779,7 +776,6 @@ training_detail: 训练详情
 training_edit: 编辑训练
 training_main: 训练
 Training: 训练
-Trainings on main: 主页展示的训练数量
 Trainings per page: 每页展示的训练数量
 Type: 类型
 UI Language: 用户界面语言

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.27.0",
+    "version": "2.27.1",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/setting.yaml

@@ -1,3 +1,11 @@
+homepage:
+  type: yaml
+  desc: Homepage Config
+  default:
+    contest: 5
+    homework: 10
+    training: 10
+    discussion: 20
 langs:
   type: yaml
   desc: Code language settings

packages/hydrooj/src/handler/home.ts

@@ -30,85 +30,90 @@ import BlackListModel from '../model/blacklist';
 const { geoip, useragent } = global.Hydro.lib;
 
 class HomeHandler extends Handler {
-    async homework(domainId: string) {
+    uids = new Set<number>();
+
+    collectUser(uids: number[]) {
+        uids.forEach((uid) => this.uids.add(uid));
+    }
+
+    async getHomework(domainId: string, limit: number = 5) {
         if (this.user.hasPerm(PERM.PERM_VIEW_HOMEWORK)) {
             const tdocs = await contest.getMulti(domainId, {}, document.TYPE_HOMEWORK)
-                .sort('beginAt', -1)
-                .limit(system.get('pagination.homework_main'))
-                .toArray();
+                .sort('beginAt', -1).limit(limit).toArray();
             const tsdict = await contest.getListStatus(
                 domainId, this.user._id,
                 tdocs.map((tdoc) => tdoc.docId), document.TYPE_HOMEWORK,
             );
-            return [tdocs, tsdict];
+            return ['homework', tdocs, tsdict];
         }
-        return [[], {}];
+        return ['homework', [], {}];
     }
 
-    async contest(domainId: string) {
+    async getContest(domainId: string, limit: number = 10) {
         if (this.user.hasPerm(PERM.PERM_VIEW_CONTEST)) {
             const tdocs = await contest.getMulti(domainId)
-                .sort('beginAt', -1)
-                .limit(system.get('pagination.contest_main'))
-                .toArray();
+                .sort('beginAt', -1).limit(limit).toArray();
             const tsdict = await contest.getListStatus(
                 domainId, this.user._id, tdocs.map((tdoc) => tdoc.docId),
             );
-            return [tdocs, tsdict];
+            return ['contest', tdocs, tsdict];
         }
-        return [[], {}];
+        return ['contest', [], {}];
     }
 
-    async training(domainId: string) {
+    async getTraining(domainId: string, limit: number = 10) {
         if (this.user.hasPerm(PERM.PERM_VIEW_TRAINING)) {
             const tdocs = await training.getMulti(domainId)
-                .sort('_id', 1)
-                .limit(system.get('pagination.training_main'))
-                .toArray();
+                .sort('_id', 1).limit(limit).toArray();
             const tsdict = await training.getListStatus(
                 domainId, this.user._id, tdocs.map((tdoc) => tdoc.docId),
             );
-            return [tdocs, tsdict];
+            return ['training', tdocs, tsdict];
         }
-        return [[], {}];
+        return ['training', [], {}];
     }
 
-    async discussion(domainId: string): Promise<[any[], any]> {
+    async getDiscussion(domainId: string, limit: number = 20) {
         if (this.user.hasPerm(PERM.PERM_VIEW_DISCUSSION)) {
-            const ddocs = await discussion.getMulti(domainId)
-                .limit(system.get('pagination.discussion_main'))
-                .toArray();
+            const ddocs = await discussion.getMulti(domainId).limit(limit).toArray();
             const vndict = await discussion.getListVnodes(
                 domainId, ddocs, this.user.hasPerm(PERM.PERM_VIEW_PROBLEM_HIDDEN),
             );
-            return [ddocs, vndict];
+            this.collectUser(ddocs.map((ddoc) => ddoc.owner));
+            return ['discussion', ddocs, vndict];
         }
-        return [[], {}];
+        return ['discussion', [], {}];
+    }
+
+    async getRanking(domainId: string, limit: number = 50) {
+        if (this.user.hasPerm(PERM.PERM_VIEW_RANKING)) {
+            const dudocs = await domain.getMultiUserInDomain(domainId)
+                .sort({ rp: -1 }).project({ uid: 1 }).limit(limit).toArray();
+            const uids = dudocs.map((dudoc) => dudoc.uid);
+            this.collectUser(uids);
+            return ['ranking', uids];
+        }
+        return ['ranking', []];
     }
 
     async get({ domainId }) {
-        const [
-            [htdocs, htsdict], [tdocs, tsdict],
-            [trdocs, trsdict], [ddocs, vndict],
-        ] = await Promise.all([
-            this.homework(domainId), this.contest(domainId),
-            this.training(domainId), this.discussion(domainId),
-        ]);
+        const homepageConfig = system.get('hydrooj.homepage');
+        const tasks = [];
+        const info = yaml.load(homepageConfig) as any;
+        for (const key in info) {
+            const func = `get${key.replace(/^[a-z]/, (i) => i.toUpperCase())}`;
+            if (!this[func]) continue;
+            tasks.push(this[func](domainId, +info[key]));
+        }
+        const contents = await Promise.all(tasks);
         const [udict, dodoc, vnodes] = await Promise.all([
-            user.getList(domainId, ddocs.map((ddoc) => ddoc.owner)),
+            user.getList(domainId, Array.from(this.uids)),
             domain.get(domainId),
             discussion.getNodes(domainId),
         ]);
         this.response.template = 'main.html';
         this.response.body = {
-            htdocs,
-            htsdict,
-            tdocs,
-            tsdict,
-            trdocs,
-            trsdict,
-            ddocs,
-            vndict,
+            contents,
             udict,
             domain: dodoc,
             vnodes,

packages/hydrooj/src/model/setting.ts

@@ -191,10 +191,6 @@ SystemSetting(
     Setting('setting_basic', 'pagination.solution', 20, 'number', 'pagination.solution', 'Solutions per page'),
     Setting('setting_basic', 'pagination.training', 10, 'number', 'pagination.training', 'Trainings per page'),
     Setting('setting_basic', 'pagination.reply', 50, 'number', 'pagination.reply', 'Replies per page'),
-    Setting('setting_basic', 'pagination.homework_main', 5, 'number', 'pagination.homework_main', 'Homeworks on main'),
-    Setting('setting_basic', 'pagination.contest_main', 10, 'number', 'pagination.contest_main', 'Contests on main'),
-    Setting('setting_basic', 'pagination.training_main', 10, 'number', 'pagination.training_main', 'Trainings on main'),
-    Setting('setting_basic', 'pagination.discussion_main', 20, 'number', 'pagination.discussion_main', 'Discussions on main'),
     Setting('setting_session', 'session.keys', [String.random(32)], 'text', 'session.keys', 'session.keys', FLAG_HIDDEN),
     Setting('setting_session', 'session.secure', false, 'boolean', 'session.secure', 'session.secure'),
     Setting('setting_session', 'session.saved_expire_seconds', 3600 * 24 * 30,