diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c30aefaaa..658739e33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/upload-artifact@v1 with: name: hydro - path: dist + path: .build - run: | cd ui yarn diff --git a/hydro/development.js b/hydro/development.js index 0228587e0..f7e1573d9 100644 --- a/hydro/development.js +++ b/hydro/development.js @@ -34,6 +34,8 @@ async function run() { require('./handler/user'); require('./handler/contest'); require('./handler/training'); + require('./handler/discussion'); + require('./handler/manage'); require('./handler/import'); server.start(); } diff --git a/hydro/handler/discussion.js b/hydro/handler/discussion.js index b454b9dde..d21f70b9f 100644 --- a/hydro/handler/discussion.js +++ b/hydro/handler/discussion.js @@ -46,12 +46,14 @@ class DiscussionHandler extends Handler { const pdoc = await problem.getById(docId); if (!pdoc) throw new DiscussionNodeNotFoundError(type, docId); if (pdoc.hidden) this.checkPerm(PERM_VIEW_PROBLEM_HIDDEN); - this.title = pdoc.title; + this.vnode = pdoc; } else if (type === 'contest') { const tdoc = await contest.get(docId); if (!tdoc) throw new DiscussionNodeNotFoundError(type, docId); - this.title = tdoc.title; + this.vnode = tdoc; } else throw new DiscussionNodeNotFoundError(type, docId); + this.vnode.parentType = type; + this.vnode.parentId = docId; } } } @@ -62,7 +64,7 @@ class DiscussionMainHandler extends DiscussionHandler { const udict = await user.getList(ddocs.map((ddoc) => ddoc.owner)); this.response.template = 'discussion_main_or_node.html'; this.response.body = { - ddocs, dpcount, udict, page, + ddocs, dpcount, udict, page, page_name: 'discussion_main', vnode: {}, }; } } @@ -77,11 +79,17 @@ class DiscussionNodeHandler extends DiscussionHandler { const udict = await user.getList(ddocs.map((ddoc) => ddoc.owner)); const path = [ ['discussion_main', '/discuss'], - [this.title, null, true], + [this.vnode.title, null, true], ]; this.response.template = 'discussion_main_or_node.html'; this.response.body = { - ddocs, dpcount, udict, path, page, + ddocs, + dpcount, + udict, + path, + page, + vnode: this.vnode, + page_name: 'discussion_node', }; } } @@ -95,11 +103,11 @@ class DiscussionCreateHandler extends DiscussionHandler { async get({ type, docId }) { const path = [ ['discussion_main', '/discuss'], - [this.title, `/discuss/${type}/${docId}`, true], + [this.vnode.title, `/discuss/${type}/${docId}`, true], ['discussion_create', null], ]; this.response.template = 'discussion_create.html'; - this.response.body = { path, title: this.title }; + this.response.body = { path, vnode: this.vnode }; } async post({ @@ -139,7 +147,7 @@ class DiscussionDetailHandler extends DiscussionHandler { const udict = await user.getList(uids); const path = [ ['discussion_main', '/discuss'], - [this.title, '/discuss/{type}', true], + [this.vnode.title, '/discuss/{type}', true], [this.ddoc.title, null, true], ]; this.response.template = 'discussion_detail.html'; diff --git a/hydro/handler/manage.js b/hydro/handler/manage.js index af7253536..036effdb9 100644 --- a/hydro/handler/manage.js +++ b/hydro/handler/manage.js @@ -3,11 +3,12 @@ const user = require('../model/user'); const builtin = require('../model/builtin'); const { Route, Handler } = require('../service/server'); const { PERM_ADMIN } = require('../permission'); -const { RoleAlreadyExistError } = require('../error'); +const { RoleAlreadyExistError, ValidationError } = require('../error'); class ManageHandler extends Handler { async prepare() { this.checkPerm(PERM_ADMIN); + this.system = await user.getById(0); } } @@ -20,20 +21,21 @@ class ManageMainHandler extends ManageHandler { class ManageDashboardHandler extends ManageHandler { async get() { this.response.template = 'domain_manage_dashboard.html'; + this.response.body = { system: this.system }; } } class ManageEditHandler extends ManageHandler { async get() { this.response.template = 'domain_manage_edit.html'; + this.response.body = { system: this.system }; } - async post({ name, gravatar, bulletin }) { - await Promise.all([ - system.set('name', name), - system.set('gravatar', gravatar), - system.set('bulletin', bulletin), - ]); + async post({ uname, gravatar, bio }) { + const unameLower = uname.trim().toLowerCase(); + await user.setById(0, { + uname, unameLower, gravatar, bio, + }); this.back(); } } @@ -92,14 +94,19 @@ class ManageRoleHandler extends ManageHandler { } async postAdd({ role }) { - const roles = await user.getRoles(); - if (roles.includes(role)) throw new RoleAlreadyExistError(role); - await user.setRole(role, builtin.PERM_DEFAULT); + const r = await user.getRole(role); + if (r) throw new RoleAlreadyExistError(role); + await user.addRole(role, builtin.PERM_DEFAULT); this.back(); } - async postDelete({ role }) { - await user.deleteRoles(role); + async postDelete({ roles }) { + for (const role of roles) { + if (['admin', 'default', 'guest'].includes(role)) { + throw new ValidationError('role'); + } + } + await user.deleteRoles(roles); this.back(); } } diff --git a/hydro/handler/user.js b/hydro/handler/user.js index d468075e0..9b5b115db 100644 --- a/hydro/handler/user.js +++ b/hydro/handler/user.js @@ -4,7 +4,6 @@ const token = require('../model/token'); const system = require('../model/system'); const { sendMail } = require('../lib/mail'); const misc = require('../lib/misc'); -const validator = require('../lib/validator'); const options = require('../options'); const { PERM_REGISTER_USER, PERM_LOGGEDIN } = require('../permission'); const { @@ -55,7 +54,6 @@ class UserRegisterHandler extends Handler { } async post({ mail }) { - validator.checkEmail(mail); if (await user.getByEmail(mail, true)) throw new UserAlreadyExistError(mail); this.limitRate('send_mail', 3600, 30); const t = await token.add( @@ -112,7 +110,6 @@ class UserLostPassHandler extends Handler { } async post({ mail }) { - validator.checkEmail(mail); const udoc = await user.getByEmail(mail); if (!udoc) throw new UserNotFoundError(mail); const tid = await token.add( diff --git a/hydro/lib/validator.js b/hydro/lib/validator.js index 83c0c8c2c..09f556728 100644 --- a/hydro/lib/validator.js +++ b/hydro/lib/validator.js @@ -3,6 +3,7 @@ const { ValidationError } = require('../error'); const RE_UID = /^-?\d+$/i; const RE_PID = /^([a-zA-Z]+[a-zA-Z0-9]*)|$/i; const RE_UNAME = /[^\s\u3000](.{,254}[^\s\u3000])?$/i; +const RE_ROLE = /^[_0-9A-Za-z]{1,256}$/i; const RE_MAIL = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$/i; const isTitle = (s) => s && s.length < 64; @@ -11,6 +12,8 @@ const isUid = (s) => RE_UID.test(s); const checkUid = (s) => { if (!isUid(s)) throw new ValidationError('uid'); else return s; }; const isUname = (s) => RE_UNAME.test(s); const checkUname = (s) => { if (!isUname(s)) throw new ValidationError('uname'); else return s; }; +const isRole = (s) => RE_ROLE.test(s); +const checkRole = (s) => { if (!isRole(s)) throw new ValidationError('role'); else return s; }; const isPassword = (s) => s.length >= 5; const checkPassword = (s) => { if (!isPassword(s)) throw new ValidationError('password'); else return s; }; const isEmail = (s) => RE_MAIL.test(s); @@ -33,6 +36,8 @@ module.exports = { checkUid, isUname, checkUname, + isRole, + checkRole, isPassword, checkPassword, isEmail, @@ -50,8 +55,6 @@ module.exports = { }; /* ID_RE = re.compile(r'[^\\/\s\u3000]([^\\/\n\r]*[^\\/\s\u3000])?') -ROLE_RE = re.compile(r'[_0-9A-Za-z]{1,256}') - def is_id(s): return bool(ID_RE.fullmatch(s)) @@ -67,14 +70,6 @@ def check_node_name(s): raise error.ValidationError('node_name') -def is_role(s): - return bool(ROLE_RE.fullmatch(s)) - - -def check_role(s): - if not is_role(s): - raise error.ValidationError('role') - def is_intro(s): return isinstance(s, str) and 0 < len(s.strip()) < 500 @@ -93,15 +88,6 @@ def check_description(s): raise error.ValidationError('description') -def is_bulletin(s): - return isinstance(s, str) and len(s) < 65536 - - -def check_bulletin(s): - if not is_bulletin(s): - raise error.ValidationError('bulletin') - - def is_lang(i): return i in constant.language.LANG_TEXTS @@ -110,13 +96,4 @@ def check_lang(i): if not is_lang(i): raise error.ValidationError('lang') - -def is_domain_invitation_code(s): - return bool(DOMAIN_INVITATION_CODE_RE.fullmatch(s)) - - -def check_domain_invitation_code(s): - if not is_domain_invitation_code(s): - raise error.ValidationError('invitation_code') - */ diff --git a/hydro/model/builtin.js b/hydro/model/builtin.js index 6aa6e9c6c..fe28aaf70 100644 --- a/hydro/model/builtin.js +++ b/hydro/model/builtin.js @@ -2,8 +2,8 @@ const perm = require('../permission'); const BUILTIN_ROLES = [ { _id: 'guest', perm: perm.PERM_BASIC }, - { _id: 'default', perm: perm.PERM_DEFAULT }, - { _id: 'admin', perm: perm.PERM_ADMIN }, + { _id: 'default', perm: perm.PERM_DEFAULT, count: 0 }, + { _id: 'admin', perm: perm.PERM_ADMIN, count: 0 }, ]; const CATEGORIES = { 动态规划: [ diff --git a/hydro/model/discussion.js b/hydro/model/discussion.js index a6acf1296..e8b876a41 100644 --- a/hydro/model/discussion.js +++ b/hydro/model/discussion.js @@ -41,7 +41,7 @@ function count(query) { } function getMulti(query) { - return coll.find(query).sort([{ updateAt: -1 }, { _id: -1 }]); + return coll.find(query).sort('updateAt', -1); } async function addReply(did, owner, content, ip) { diff --git a/hydro/model/user.js b/hydro/model/user.js index fa61dc4d1..5262ffdea 100644 --- a/hydro/model/user.js +++ b/hydro/model/user.js @@ -1,7 +1,6 @@ const system = require('./system'); const { UserNotFoundError, UserAlreadyExistError } = require('../error'); const pwhash = require('../lib/pwhash'); -const validator = require('../lib/validator'); const db = require('../service/db'); const coll = db.collection('user'); @@ -33,6 +32,7 @@ class USER { return pwhash.check(password, this.salt, this.hash); } } + async function getById(_id) { const udoc = await coll.findOne({ _id }); if (!udoc) throw new UserNotFoundError(_id); @@ -40,11 +40,13 @@ async function getById(_id) { udoc.perm = role.perm; return new USER(udoc); } + async function getList(uids) { const r = {}; for (const uid of uids) r[uid] = await getById(uid); // eslint-disable-line no-await-in-loop return r; } + async function getByUname(uname) { const unameLower = uname.trim().toLowerCase(); const udoc = await coll.findOne({ unameLower }); @@ -53,6 +55,7 @@ async function getByUname(uname) { udoc.perm = role.perm; return new USER(udoc); } + async function getByEmail(mail, ignoreMissing = false) { const mailLower = mail.trim().toLowerCase(); const udoc = await coll.findOne({ mailLower }); @@ -64,22 +67,23 @@ async function getByEmail(mail, ignoreMissing = false) { udoc.perm = role.perm; return new USER(udoc); } + function setPassword(uid, password) { - validator.checkPassword(password); const salt = pwhash.salt(); return coll.findOneAndUpdate({ _id: uid }, { $set: { salt, hash: pwhash.hash(password, salt) }, }); } + function setById(uid, args) { - coll.findOneAndUpdate({ _id: uid }, { $set: args }); + return coll.findOneAndUpdate({ _id: uid }, { $set: args }); } + function setEmail(uid, mail) { - validator.checkEmail(mail); return setById(uid, { mail, mailLower: mail.trim().toLowerCase() }); } + async function changePassword(uid, currentPassword, newPassword) { - validator.checkPassword(newPassword); const udoc = await getById(uid); udoc.checkPassword(currentPassword); const salt = pwhash.salt(); @@ -89,59 +93,86 @@ async function changePassword(uid, currentPassword, newPassword) { $set: { salt, hash: pwhash.hash(newPassword, salt) }, }); } + async function inc(_id, field, n) { await coll.findOneAndUpdate({ _id }, { $inc: { [field]: n } }); const udoc = await getById(_id); return udoc; } + async function create({ uid, mail, uname, password, regip = '127.0.0.1', role = 'default', }) { - validator.checkUname(uname); - validator.checkPassword(password); - validator.checkEmail(mail); const salt = pwhash.salt(); if (!uid) uid = system.inc('user'); try { - await coll.insertOne({ - _id: uid, - mail, - mailLower: mail.trim().toLowerCase(), - uname, - unameLower: uname.trim().toLowerCase(), - password: pwhash.hash(password, salt), - salt, - regat: new Date(), - regip, - loginat: new Date(), - loginip: regip, - role, - gravatar: mail, - }); + await Promise.all([ + coll.insertOne({ + _id: uid, + mail, + mailLower: mail.trim().toLowerCase(), + uname, + unameLower: uname.trim().toLowerCase(), + password: pwhash.hash(password, salt), + salt, + regat: new Date(), + regip, + loginat: new Date(), + loginip: regip, + role, + gravatar: mail, + }), + collRole.updateOne({ _id: role }, { $inc: { count: 1 } }) + ]); } catch (e) { throw new UserAlreadyExistError([uid, uname, mail]); } } -function getMany(params) { +function getMulti(params) { return coll.find(params); } +async function setRole(uid, role) { + const udoc = await getById(uid); + return await Promise.all([ + coll.findOneAndUpdate({ _id: uid }, { role }), + collRole.updateOne({ _id: udoc.role }, { $inc: { count: -1 } }), + collRole.updateOne({ _id: role }, { $inc: { count: 1 } }), + ]); +} + function getRoles() { return collRole.find().toArray(); } +function getRole(name) { + return collRole.findOne({ _id: name }); +} + +function addRole(name, perm) { + return collRole.insertOne({ _id: name, perm, count: 0 }); +} + +function deleteRoles(roles) { + return collRole.deleteMany({ _id: { $in: roles } }); +} + module.exports = { changePassword, create, getByEmail, getById, getByUname, - getMany, + getMulti, inc, setById, setEmail, setPassword, + setRole, + getRole, getList, getRoles, + addRole, + deleteRoles, }; diff --git a/hydro/options.js b/hydro/options.js index dfd6d41e4..65708113d 100644 --- a/hydro/options.js +++ b/hydro/options.js @@ -43,6 +43,7 @@ let options = { SOLUTION_PER_PAGE: 20, CONTEST_PER_PAGE: 20, TRAINING_PER_PAGE: 10, + DISCUSSION_PER_PAGE: 50, CONTESTS_ON_MAIN: 5, TRAININGS_ON_MAIN: 5, DISCUSSIONS_ON_MAIN: 20, diff --git a/hydro/service/db.js b/hydro/service/db.js index e82fe41f4..e353c1bbb 100644 --- a/hydro/service/db.js +++ b/hydro/service/db.js @@ -1,5 +1,5 @@ const Mongo = require('mongodb'); -const bus = require('../service/bus'); +const bus = require('./bus'); const options = require('../options'); let mongourl = 'mongodb://'; diff --git a/hydro/service/server.js b/hydro/service/server.js index 817a075c9..450e2066c 100644 --- a/hydro/service/server.js +++ b/hydro/service/server.js @@ -113,6 +113,7 @@ class Handler { back(body) { if (body) this.response.body = body; + else if (this.preferJson) this.response.body = {}; this.response.redirect = this.request.headers.referer || '/'; } @@ -165,17 +166,19 @@ class Handler { } async renderBody() { - if (!(this.response.body || this.response.template)) { - this.response.body = { error: new NotFoundError() }; - this.response.template = 'error.html'; - } - if (!this.preferJson) { - if (this.response.body || this.response.template) { - if (this.request.query.noTemplate || this.preferJson) return; - const templateName = this.request.query.template || this.response.template; - if (templateName) { - this.response.body = this.response.body || {}; - await this.render(templateName, this.response.body); + if (!this.response.redirect) { + if (!(this.response.body || this.response.template)) { + this.response.body = { error: new NotFoundError() }; + this.response.template = 'error.html'; + } + if (!this.preferJson) { + if (this.response.body || this.response.template) { + if (this.request.query.noTemplate || this.preferJson) return; + const templateName = this.request.query.template || this.response.template; + if (templateName) { + this.response.body = this.response.body || {}; + await this.render(templateName, this.response.body); + } } } } @@ -192,7 +195,11 @@ class Handler { this.ctx.response.body = this.response.body; this.ctx.response.status = this.response.status || 200; } - if (this.response.type) this.ctx.response.type = this.response.type; + this.ctx.response.type = this.preferJson + ? 'application/json' + : this.response.type + ? this.response.type + : this.ctx.response.type; } } @@ -233,7 +240,7 @@ class Handler { console.error(error.message, error.params); console.error(error.stack); this.response.template = error instanceof UserFacingError ? 'error.html' : 'bsod.html'; - this.response.body = { error }; + this.response.body = { error: { message: error.message, params: error.params, stack: error.stack } }; await this.___cleanup().catch(() => { }); } } @@ -247,6 +254,8 @@ function Route(route, RouteHandler) { const method = ctx.method.toLowerCase(); const args = { ...ctx.params, ...ctx.query, ...ctx.request.body }; + if (h.___prepare) await h.___prepare(args); + for (const l of check) { if (args[l]) { args[l] = new ObjectID(args[l]); @@ -256,11 +265,17 @@ function Route(route, RouteHandler) { if (args.content) validator.checkContent(args.content); if (args.title) validator.checkContent(args.title); if (args.uid) args.uid = parseInt(validator.checkUid(args.uid)); + if (args.password) validator.checkPassword(args.password); + if (args.mail) validator.checkEmail(args.mail); + if (args.uname) validator.checkUname(args.uname); if (args.page) args.page = parseInt(args.page); if (args.duration) args.duration = parseFloat(args.duration); if (args.pids) args.pids = args.pids.split(',').map((i) => i.trim()); + if (args.role) validator.checkRole(args.role); + if (args.roles) { + for (const i of args.roles) validator.checkRole(i); + } - if (h.___prepare) await h.___prepare(args); if (h.__prepare) await h.__prepare(args); if (h._prepare) await h._prepare(args); if (h.prepare) await h.prepare(args); diff --git a/locales/zh_CN.yaml b/locales/zh_CN.yaml index f98c007b7..15615ed53 100644 --- a/locales/zh_CN.yaml +++ b/locales/zh_CN.yaml @@ -386,7 +386,7 @@ Solve: 解决 Time: 时间 required: 必填 Name: 名称 -Will be used as the domain icon.: 将被用作域图标。 +Will be used as the system icon.: 将被用作系统图标。 My Role: 我的角色 What's domain?: 什么是域？ Visit: 查看 diff --git a/locales/zh_TW.yaml b/locales/zh_TW.yaml index 7fde431f7..f87122058 100644 --- a/locales/zh_TW.yaml +++ b/locales/zh_TW.yaml @@ -375,7 +375,7 @@ Solve: 解決 Time: 時間 required: 必填 Name: 名稱 -Will be used as the domain icon.: 將被用作域圖示。 +Will be used as the system icon.: 將被用作圖示。 My Role: 我的角色 What's domain?: 什麼是域？ Visit: 檢視 diff --git a/templates/components/sidemenu.html b/templates/components/sidemenu.html index 293bf2467..efe3723f7 100644 --- a/templates/components/sidemenu.html +++ b/templates/components/sidemenu.html @@ -1,7 +1,6 @@ -{% macro render_item(icon_name, page_name, label=none) %} +{% macro render_item(icon_name, page_name, target_url, label=none) %}
  • - {% set target_url = reverse_url(page_name, args) %} - + {% if icon_name %} {% endif %} diff --git a/templates/discussion_detail.html b/templates/discussion_detail.html index 470decd28..f0d11e994 100644 --- a/templates/discussion_detail.html +++ b/templates/discussion_detail.html @@ -7,10 +7,10 @@
    -
    - {{ ddoc['content']|markdown }} +
    + {{ ddoc['content']|markdown|safe }}
    @@ -64,15 +64,11 @@ comment_ref = 'drid', reply_ref = 'drrid', comment_post_perm = perm.PERM_REPLY_DISCUSSION, - comment_edit_perm = perm.PERM_NONE if handler.own(ddoc, perm.PERM_EDIT_DISCUSSION_REPLY_SELF_DISCUSSION) else perm.PERM_EDIT_DISCUSSION_REPLY, - comment_edit_self_perm = perm.PERM_EDIT_DISCUSSION_REPLY_SELF, - comment_delete_perm = perm.PERM_NONE if handler.own(ddoc, perm.PERM_DELETE_DISCUSSION_REPLY_SELF_DISCUSSION) else perm.PERM_DELETE_DISCUSSION_REPLY, - comment_delete_self_perm = perm.PERM_DELETE_DISCUSSION_REPLY_SELF, + comment_edit_perm = perm.PERM_LOGGEDIN if ddoc.owner == handler.user._id else perm.PERM_EDIT_DISCUSSION_REPLY, + comment_delete_perm = perm.PERM_LOGGEDIN if ddoc.owner == handler.user._id else perm.PERM_DELETE_DISCUSSION_REPLY, reply_post_perm = perm.PERM_REPLY_DISCUSSION, - reply_edit_perm = perm.PERM_NONE if handler.own(ddoc, perm.PERM_EDIT_DISCUSSION_REPLY_SELF_DISCUSSION) else perm.PERM_EDIT_DISCUSSION_REPLY, - reply_edit_self_perm = perm.PERM_EDIT_DISCUSSION_REPLY_SELF, - reply_delete_perm = perm.PERM_NONE if handler.own(ddoc, perm.PERM_DELETE_DISCUSSION_REPLY_SELF_DISCUSSION) else perm.PERM_DELETE_DISCUSSION_REPLY, - reply_delete_self_perm = perm.PERM_DELETE_DISCUSSION_REPLY_SELF + reply_edit_perm = perm.PERM_LOGGEDIN if ddoc.owner == handler.user._id else perm.PERM_EDIT_DISCUSSION_REPLY, + reply_delete_perm = perm.PERM_LOGGEDIN if ddoc.owner == handler.user._id else perm.PERM_DELETE_DISCUSSION_REPLY, ) }} {{ paginator.render(page, pcount) }} {% if drcount == 0 %} diff --git a/templates/discussion_edit.html b/templates/discussion_edit.html index a20f714d8..b7d27c5aa 100644 --- a/templates/discussion_edit.html +++ b/templates/discussion_edit.html @@ -11,7 +11,7 @@ - {% if handler.own(ddoc, perm.PERM_DELETE_DISCUSSION_SELF) or handler.hasPerm(perm.PERM_DELETE_DISCUSSION) %} + {% if ddoc.owner == handler.user._id or handler.hasPerm(perm.PERM_DELETE_DISCUSSION) %} diff --git a/templates/discussion_main_or_node.html b/templates/discussion_main_or_node.html index db359b8ee..1618968dd 100644 --- a/templates/discussion_main_or_node.html +++ b/templates/discussion_main_or_node.html @@ -7,17 +7,17 @@
    - {% if vnode['doc_type'] == vj4.model.document.TYPE_PROBLEM %} - {% with pdoc=vnode, owner_udoc=udict[vnode['owner']] %} + {% if vnode.parentType == 'problem' %} + {% set pdoc = vnode %} + {% set owner_udoc = udict[vnode.owner] %} {% include "partials/problem_sidebar.html" %} - {% endwith %} - {% elif vnode['doc_type'] == vj4.model.document.TYPE_CONTEST %} - {% with tdoc=vnode, owner_udoc=udict[vnode['owner']] %} + {% elif vnode.parentType == 'contest' %} + {% set tdoc = vnode %} + {% set owner_udoc = udict[vnode.owner] %} {% include "partials/contest_sidebar.html" %} - {% endwith %} - {% elif vnode['doc_type'] == vj4.model.document.TYPE_DISCUSSION_NODE %} + {% elif vnode.parentType == 'node' %}
    - {% if vnode['pic'] %}
    {% endif %} + {% if vnode.pic %}
    {% endif %}

    {{ vnode['title'] or _('Create Discussion') }}

    @@ -38,7 +38,6 @@
    {% endif %} - {% include 'discussion_nodes_widget.html' %} {% endblock %} diff --git a/templates/discussion_nodes_widget.html b/templates/discussion_nodes_widget.html deleted file mode 100644 index 516b771e5..000000000 --- a/templates/discussion_nodes_widget.html +++ /dev/null @@ -1,17 +0,0 @@ -
    -
    -

    {{ _('Discussion Nodes') }}

    -
    -
      - {% for category, nodes in discussionNodes.items() %} -
    • -

      {{ category }}

      -
        - {% for node in nodes %} -
      1. {{ node['name'] }}
        2. - {% endfor %} -
      -
      • - {% endfor %} -
    -
    diff --git a/templates/domain_join.html b/templates/domain_join.html deleted file mode 100644 index 9e37af742..000000000 --- a/templates/domain_join.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "layout/basic.html" %} -{% block content %} -
    -
    -
    -
    -

    - {{ _('Join {0}').format(handler.domain['name']) }} -

    -
    -
    -

    {{ _('By clicking the button, you will become a member of the domain {0}.').format(handler.domain['name']) }}

    -
    -
    -
    - - {% if join_settings['method'] == vj4.constant.domain.JOIN_METHOD_CODE %} - {{ form.form_text(columns=None, label='Invitation Code', name='code', required=true, help_text='You need to enter the invitation code to join the domain.', value=code, autofocus=True) }} - {% endif %} - -
    -
    -
    -
    -
    -{% endblock %} diff --git a/templates/domain_manage_dashboard.html b/templates/domain_manage_dashboard.html index 277842437..59ce2d6e2 100644 --- a/templates/domain_manage_dashboard.html +++ b/templates/domain_manage_dashboard.html @@ -1,10 +1,11 @@ +{% set page_name = "domain_manage_dashboard" %} {% import "components/user.html" as user %} -{% extends "domain_base.html" %} +{% extends "manage_base.html" %} {% block domain_content %} -{% if handler.domain['bulletin'] %} +{% if system.bio %}
    - {{ handler.domain['bulletin']|markdown }} + {{ system.bio|markdown|safe }}
    {% endif %} @@ -14,8 +15,8 @@
    -
    {{ _('Gravatar') }}
    -
    {{ _('Name') }}
    {{ handler.domain['name'] }}
    +
    {{ _('Gravatar') }}
    +
    {{ _('Name') }}
    {{ system.uname }}
    diff --git a/templates/domain_manage_discussion.html b/templates/domain_manage_discussion.html deleted file mode 100644 index ce941830e..000000000 --- a/templates/domain_manage_discussion.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "domain_base.html" %} -{% block domain_content %} -
    -
    -

    {{ _('Initialize') }}

    -
    -
    -
    - - -
    -
    -
    -
    -
    - -
    -
    -{% include 'discussion_nodes_widget.html' %} -{% endblock %} diff --git a/templates/domain_manage_edit.html b/templates/domain_manage_edit.html index c15864cf1..3be043044 100644 --- a/templates/domain_manage_edit.html +++ b/templates/domain_manage_edit.html @@ -1,11 +1,31 @@ -{% extends "domain_base.html" %} +{% set page_name = "domain_manage_edit" %} +{% import "components/form.html" as form with context %} +{% extends "manage_base.html" %} {% block domain_content %}
    - {% with ddoc=handler.domain %} - {% include "partials/domain_edit_form.html" %} - {% endwith %} + {{ form.form_text({ + label:'Name', + name:'uname', + value:system.uname, + autofocus:true, + required:true + }) }} + {{ form.form_text({ + label:'Gravatar Email', + help_text:'Will be used as the system icon.', + name:'gravatar', + value:system.gravatar + }) }} + {{ form.form_textarea({ + columns:12, + label:'Bulletin', + name:'bio', + value:system.bio, + markdown:true, + required:false + }) }}
    - -
    -
    -
    -
    - -{% endblock %} diff --git a/templates/layout/html5.html b/templates/layout/html5.html index 4f6f9be5e..5523cbeae 100644 --- a/templates/layout/html5.html +++ b/templates/layout/html5.html @@ -37,7 +37,6 @@ - diff --git a/templates/domain_base.html b/templates/manage_base.html similarity index 62% rename from templates/domain_base.html rename to templates/manage_base.html index 290ad317b..67f6a98ac 100644 --- a/templates/domain_base.html +++ b/templates/manage_base.html @@ -12,27 +12,20 @@ {{ _('Properties') }}
    • - {% if handler.hasPerm(perm.PERM_EDIT_PERM) %}
    • - {% endif %} diff --git a/templates/partials/domain_edit_form.html b/templates/partials/domain_edit_form.html index 8b3974ab2..8b1378917 100644 --- a/templates/partials/domain_edit_form.html +++ b/templates/partials/domain_edit_form.html @@ -1,9 +1 @@ -{% import "components/form.html" as form with context %} -{% if page_name == 'domain_manage_edit' %} - {{ form.form_text(label='ID', name='id', value=ddoc['_id'], disabled=true) }} -{% elif page_name == 'home_domain_create' %} - {{ form.form_text(label='ID', name='id', autofocus=true, required=true) }} -{% endif %} - {{ form.form_text(label='Name', name='name', value=ddoc['name']|default(''), autofocus=(page_name == 'domain_manage_edit'), required=true) }} - {{ form.form_text(label='Gravatar Email', help_text='Will be used as the domain icon.', name='gravatar', value=ddoc['gravatar']|default('')) }} - {{ form.form_textarea(columns=12, label='Bulletin', name='bulletin', value=ddoc['bulletin']|default(''), markdown=true, required=false) }} + diff --git a/templates/partials/nav.html b/templates/partials/nav.html index 12f4f3688..313bba9d3 100644 --- a/templates/partials/nav.html +++ b/templates/partials/nav.html @@ -18,13 +18,13 @@ {{ nav_item('/t', 'training_main', 'training') }} {% endif %} {% if handler.hasPerm(perm.PERM_VIEW_DISCUSSION) %} - {{ nav_item('/d', 'discussion_main', 'discussion') }} + {{ nav_item('/discuss', 'discussion_main', 'discussion') }} {% endif %} {% if handler.hasPerm(perm.PERM_VIEW_CONTEST) %} {{ nav_item('/c', 'contest_main', 'contest') }} {% endif %} {% if handler.hasPerm(perm.PERM_EDIT_DESCRIPTION) or handler.hasPerm(perm.PERM_EDIT_PERM) %} - {{ nav_item('/d', 'domain_manage', 'domain_manage') }} + {{ nav_item('/manage', 'domain_manage', 'domain_manage') }} {% endif %}
      diff --git a/ui/pages/domain_manage_join_applications.page.js b/ui/pages/domain_manage_join_applications.page.js deleted file mode 100644 index 90d22f6d9..000000000 --- a/ui/pages/domain_manage_join_applications.page.js +++ /dev/null @@ -1,19 +0,0 @@ -import { NamedPage } from 'vj/misc/PageLoader'; - -import * as domainEnum from 'vj/constant/domain'; - -const page = new NamedPage('domain_manage_join_applications', () => { - const $role = $('[name="role"]'); - const $expire = $('[name="expire"]'); - const $code = $('[name="invitation_code"]'); - function updateFormState() { - const method = parseInt($('[name="method"]:checked').val(), 10); - $role.prop('disabled', method === domainEnum.JOIN_METHOD_NONE).trigger('vjFormDisableUpdate'); - $expire.prop('disabled', method === domainEnum.JOIN_METHOD_NONE).trigger('vjFormDisableUpdate'); - $code.prop('disabled', method !== domainEnum.JOIN_METHOD_CODE).trigger('vjFormDisableUpdate'); - } - updateFormState(); - $('[name="method"]').change(() => updateFormState()); -}); - -export default page; diff --git a/ui/pages/domain_manage_role.page.js b/ui/pages/domain_manage_role.page.js index c02ae3a08..c0d694e49 100644 --- a/ui/pages/domain_manage_role.page.js +++ b/ui/pages/domain_manage_role.page.js @@ -73,7 +73,7 @@ const page = new NamedPage('domain_manage_role', () => { try { await request.post('', { operation: 'delete', - role: selectedRoles, + roles: selectedRoles, }); Notification.success(i18n('Selected roles have been deleted.')); await delay(2000); diff --git a/ui/pages/domain_manage_role.page.styl b/ui/pages/domain_manage_role.page.styl index 67306cbf0..c09dcfd39 100644 --- a/ui/pages/domain_manage_role.page.styl +++ b/ui/pages/domain_manage_role.page.styl @@ -2,8 +2,5 @@ .col--checkbox width: 60px - .col--id - width: 140px - .col--users width: 100px