From 810e6a6e608a29a095e239b05b66e291d3d55b78 Mon Sep 17 00:00:00 2001 From: ridethepig Date: Mon, 12 Dec 2022 11:46:59 +0800 Subject: [PATCH] beautify --- src/__init__.py | 4 +- src/admin.py | 20 +++++----- src/auth.py | 7 ++-- src/templates/admin/adduser.html | 58 ++++++++++++++++++++++++++--- src/templates/admin/index.html | 39 +++++++++++++------ src/templates/admin/removeuser.html | 12 ------ src/templates/admin/result.html | 26 +++++++++++++ src/templates/auth/loginadmin.html | 42 ++++++++++++++++----- src/templates/auth/loginbase.html | 14 ++++--- src/templates/auth/loginuser.html | 42 +++++++++++++++------ src/templates/base.html | 19 ++++++++-- src/templates/user/addbook.html | 13 +++---- src/templates/user/addtype.html | 13 +++---- src/templates/user/book.html | 31 +++++++-------- src/templates/user/home.html | 15 +++----- src/templates/user/result.html | 13 +++---- src/templates/user/search.html | 13 +++---- src/templates/user/updatebook.html | 13 +++---- src/user.py | 32 ++++++++-------- 19 files changed, 271 insertions(+), 155 deletions(-) delete mode 100644 src/templates/admin/removeuser.html create mode 100644 src/templates/admin/result.html diff --git a/src/__init__.py b/src/__init__.py index 469ce61..0e98fb7 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1,7 +1,7 @@ import os from flask import Flask, render_template, g, redirect, url_for - +from datetime import datetime def create_app(test_config=None): # create and configure the app @@ -44,5 +44,5 @@ def create_app(test_config=None): return redirect(url_for("admin.index")) else: return redirect(url_for("user.home")) - return render_template("index.html") + return render_template("auth/loginbase.html", cur_time=datetime.now()) return app \ No newline at end of file diff --git a/src/admin.py b/src/admin.py index 81b89a7..d2a325f 100644 --- a/src/admin.py +++ b/src/admin.py @@ -7,6 +7,7 @@ from werkzeug.security import generate_password_hash from src.auth import admin_login_required from src.db import get_db +from datetime import datetime import pymysql bp = Blueprint('admin', __name__, url_prefix='/admin') @@ -26,7 +27,7 @@ def index(): ) users = cur.fetchall() cur.close() - return render_template("admin/index.html", users=users) + return render_template("admin/index.html", users=users, cur_time=datetime.now()) @bp.route('/adduser', methods=("GET", "POST")) @admin_login_required @@ -41,9 +42,10 @@ def adduser(): error = '用户空间必须是整数GB' elif not validateEmail(usermail): error = 'email格式不合法' - userlimi = float(userlimi) - userlimi *= 1024 * 1024 # userlimit is stored and measured by KB - userlimi = int(userlimi) + if error is None: + userlimi = float(userlimi) + userlimi *= 1024 * 1024 # userlimit is stored and measured by KB + userlimi = int(userlimi) if error is None: db = get_db() cur = db.cursor() @@ -65,7 +67,7 @@ def adduser(): if error is None: return redirect(url_for('admin.index')) flash(error) - return render_template("admin/adduser.html") + return render_template("admin/adduser.html", cur_time=datetime.now()) @bp.route('/removeuser', methods=("GET",)) @admin_login_required @@ -92,8 +94,8 @@ def removeuser(): finally: cur.close() if error is None: - if rowcnt != 0: - error = "删除uid为%s的用户成功！" % uid_to_del - else: + if rowcnt == 0: error = "由于uid不存在，可能没有被删除，请再次检查删除结果" - return render_template("admin/removeuser.html", remove_result=error) \ No newline at end of file + else: + return redirect(url_for("admin.index")) + return render_template("admin/result.html", opname="删除用户出现意外", opresult=error, cur_time=datetime.now()) \ No newline at end of file diff --git a/src/auth.py b/src/auth.py index de6f206..63cb669 100644 --- a/src/auth.py +++ b/src/auth.py @@ -2,6 +2,7 @@ import functools from flask import Blueprint, flash, g, redirect, render_template, request, session, url_for from werkzeug.security import check_password_hash from src.db import get_db +from datetime import datetime bp = Blueprint('auth', __name__, url_prefix='/auth') @@ -30,7 +31,7 @@ def loginuser(): flash(error) - return render_template('auth/loginuser.html') + return render_template('auth/loginuser.html', cur_time=datetime.now()) @bp.route('/loginadmin', methods=('GET', 'POST')) def loginadmin(): @@ -52,11 +53,11 @@ def loginadmin(): session['user_id'] = 0 return redirect(url_for('admin.index')) flash(error) - return render_template('auth/loginadmin.html') + return render_template('auth/loginadmin.html', cur_time=datetime.now()) @bp.route('/login', methods=('GET', 'POST')) def login(): - return render_template("auth/loginbase.html") + return render_template("auth/loginbase.html", cur_time=datetime.now()) @bp.before_app_request def load_logged_in_user(): diff --git a/src/templates/admin/adduser.html b/src/templates/admin/adduser.html index 43a6346..c1d2060 100644 --- a/src/templates/admin/adduser.html +++ b/src/templates/admin/adduser.html @@ -1,12 +1,11 @@ {% extends 'base.html' %} {% block header %} -

{% block title %}管理主页{% endblock %}

+

{% block title %}管理主页{% endblock %}

{% endblock %} {% block content %} -

新建用户

-
-
+ +
+
+
+
+
+
新建用户
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+ 返回 +
+ +
+
+
- 返回 {% endblock %} diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index f03b7e7..03e4665 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -1,21 +1,36 @@ {% extends 'base.html' %} {% block header %} -

{% block title %}管理主页{% endblock %}

+

{% block title %}管理主页{% endblock %}

{% endblock %} {% block content %} -

用户列表

-
    - {% for user in users%} -
  • - UID:{{ user['user_id'] }}, 用户名: {{ user['user_name'] }}, - 邮箱: {{ user['user_mail'] }}, 用户空间大小: {{ user['user_limit'] / 1024 / 1024 }}GB - 删除 -
    • - {% endfor %} -
- 新建用户 + +

用户列表

+ +
+
+ + + + + + + + {% for user in users%} + + + + + + + + {% endfor %} + +
UID 用户名 邮箱 用户空间 操作
{{ user['user_id'] }}{{ user['user_name'] }}{{ user['user_mail'] }}{{ user['user_limit'] / 1024 / 1024 }}GB删除
+
+
+ 新建用户
{% endblock %} \ No newline at end of file diff --git a/src/templates/admin/removeuser.html b/src/templates/admin/removeuser.html deleted file mode 100644 index 4d05862..0000000 --- a/src/templates/admin/removeuser.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends 'base.html' %} - -{% block header %} -

{% block title %}管理主页{% endblock %}

-{% endblock %} -{% block content %} -

删除用户结果

-
- {{remove_result}} -
- 返回 -{% endblock %} diff --git a/src/templates/admin/result.html b/src/templates/admin/result.html new file mode 100644 index 0000000..4c4d7b4 --- /dev/null +++ b/src/templates/admin/result.html @@ -0,0 +1,26 @@ +{% extends 'base.html' %} + +{% block header %} +{% endblock %} + +{% block content %} +
+
+
+
+
+
+
{{opname}}
+
+
+

{{opresult}}

+ {% if ret_url %} +

返回

+ {% else %} +

返回

+ {% endif %} +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/src/templates/auth/loginadmin.html b/src/templates/auth/loginadmin.html index 85fbb23..655c4a0 100644 --- a/src/templates/auth/loginadmin.html +++ b/src/templates/auth/loginadmin.html @@ -1,14 +1,36 @@ {% extends 'base.html' %} -{% block header %} -

{% block title %}Log In{% endblock %}

-{% endblock %} - {% block content %} -
- - - - -
+
+
+
+
+
+
管理员登录
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+ {% endblock %} \ No newline at end of file diff --git a/src/templates/auth/loginbase.html b/src/templates/auth/loginbase.html index 2cdab94..12ddb0a 100644 --- a/src/templates/auth/loginbase.html +++ b/src/templates/auth/loginbase.html @@ -1,12 +1,16 @@ {% extends 'base.html' %} {% block header %} -

{% block title %}在访问前，需要登陆{% endblock %}

+

{% block title %}在访问前，需要登陆{% endblock %}

{% endblock %} {% block content %} - +
+
+ 管理员登陆 +
+
+ 用户登陆 +
+
{% endblock %} \ No newline at end of file diff --git a/src/templates/auth/loginuser.html b/src/templates/auth/loginuser.html index b7dd5dc..9ee28fc 100644 --- a/src/templates/auth/loginuser.html +++ b/src/templates/auth/loginuser.html @@ -1,15 +1,35 @@ {% extends 'base.html' %} -{% block header %} -

{% block title %}Log In{% endblock %}

-{% endblock %} - {% block content %} -
- - - - - -
+
+
+
+
+
+
用户登录
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
{% endblock %} \ No newline at end of file diff --git a/src/templates/base.html b/src/templates/base.html index 31a1b1c..1f12cc8 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -17,12 +17,18 @@ {% endif %} --> +
-

电子书管理系统

- +

电子书管理系统

{% if g.user %} @@ -34,7 +40,7 @@ {% endif %}
-
+
{% block header %}{% endblock %}
@@ -42,4 +48,9 @@
{{ message }}
{% endfor %} {% block content %}{% endblock %} -
\ No newline at end of file +
+
+
+ Made with Madness by Catfood
Rendered @ {{cur_time}} +
+
\ No newline at end of file diff --git a/src/templates/user/addbook.html b/src/templates/user/addbook.html index 7ceee92..e7abedb 100644 --- a/src/templates/user/addbook.html +++ b/src/templates/user/addbook.html @@ -44,19 +44,19 @@ {% block content %}
-
+
@@ -95,9 +95,6 @@
-
- Rendered @ {{cur_time}} -
diff --git a/src/templates/user/addtype.html b/src/templates/user/addtype.html index e636c50..f4f3c29 100644 --- a/src/templates/user/addtype.html +++ b/src/templates/user/addtype.html @@ -25,19 +25,19 @@ {% block content %}
-
+
@@ -66,9 +66,6 @@ {% endfor %}
-
- Rendered @ {{cur_time}} -
diff --git a/src/templates/user/book.html b/src/templates/user/book.html index cbb48a0..f9d8329 100644 --- a/src/templates/user/book.html +++ b/src/templates/user/book.html @@ -16,21 +16,21 @@ function control_modal(op, modal_id){ {% block content %}
-
+
+
  • + 主页 +
    • +
  • + 搜索 +
    • +
  • + 增加 +
    • +
  • + 分类 +
    • +
    {% endfor %}
    -
    - Rendered @ {{cur_time}} -
    diff --git a/src/templates/user/home.html b/src/templates/user/home.html index ef18ca1..88d4dd1 100644 --- a/src/templates/user/home.html +++ b/src/templates/user/home.html @@ -25,20 +25,20 @@ {% block content %}
    -
    +
    @@ -58,9 +58,6 @@
    {{user_stat['user_notecount']}}篇
    -
    - Rendered @ {{cur_time}} -
    diff --git a/src/templates/user/result.html b/src/templates/user/result.html index 402176d..0015d61 100644 --- a/src/templates/user/result.html +++ b/src/templates/user/result.html @@ -23,19 +23,19 @@ {% block content %}
    -
    +
    @@ -51,9 +51,6 @@

    返回

    {% endif %}
    -
    - Rendered @ {{cur_time}} -
    diff --git a/src/templates/user/search.html b/src/templates/user/search.html index d3a0b9e..34369ae 100644 --- a/src/templates/user/search.html +++ b/src/templates/user/search.html @@ -23,19 +23,19 @@ {% block content %}
    -
    +
    @@ -124,9 +124,6 @@
    -
    - Rendered @ {{cur_time}} -
    diff --git a/src/templates/user/updatebook.html b/src/templates/user/updatebook.html index d8c9c0f..a678376 100644 --- a/src/templates/user/updatebook.html +++ b/src/templates/user/updatebook.html @@ -25,19 +25,19 @@ {% block content %}
    -
    +
    @@ -76,9 +76,6 @@
    -
    - Rendered @ {{cur_time}} -
    diff --git a/src/user.py b/src/user.py index 6f4c755..8ce3cd5 100644 --- a/src/user.py +++ b/src/user.py @@ -6,7 +6,7 @@ import os from src.auth import login_required from src.db import get_db import pymysql -import datetime +from datetime import datetime bp = Blueprint('user', __name__) @@ -20,7 +20,7 @@ def home(): user_stat = cur.fetchone() print(user_stat) cur.close() - return render_template("user/home.html", user_stat=user_stat, cur_time=datetime.datetime.now()) + return render_template("user/home.html", user_stat=user_stat, cur_time=datetime.now()) @bp.route("/addbook", methods=('GET', 'POST')) @login_required @@ -86,7 +86,7 @@ def addbook(): cur.execute("select type_name from typetable") typelist = cur.fetchall() return render_template("user/addbook.html", typelist=typelist, error=error, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) @bp.route("/tags", methods=('GET', 'POST')) @login_required @@ -117,7 +117,7 @@ def tags(): cur.execute("select * from typetable") typelist = cur.fetchall() return render_template("user/addtype.html", typelist=typelist, error=error, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) @bp.route("/removetype", methods=("GET",)) @login_required @@ -140,10 +140,10 @@ def removetype(): if rowcnt == 0: error = "删除可能失败，再次检查是否完成" else: - error = "删除(type_id=%s)完成" % tid_to_del + return redirect(url_for("user.tags")) cur.close() return render_template("user/result.html", opname="删除分类", - opresult=error, cur_time=datetime.datetime.now()) + opresult=error, cur_time=datetime.now()) @bp.route("/search", methods=("GET", "POST")) @login_required @@ -196,7 +196,7 @@ def search(): prev_page_link = "/search?bookname=%s&bookattr=%s&page=%s" %(queryval, bookattr, page - 1) # print(prev_page_link, next_page_link) return render_template("user/search.html", - cur_time=datetime.datetime.now(), error=error, queryresult=queryresult, + cur_time=datetime.now(), error=error, queryresult=queryresult, next_page_link=next_page_link, prev_page_link=prev_page_link, page_last=page_last, page_first=(page==1), queryval=queryval, queryattr=attr_dict) @@ -215,7 +215,7 @@ def book(id): notes = cur.fetchall() return render_template("/user/book.html", book=book, booktype=booktype, documents=documents, notes=notes, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) @bp.route("/book/update//", methods=("GET", "POST")) @login_required @@ -294,7 +294,7 @@ def book_update(id): booktypestr += k['type_name'] + ';' return render_template("/user/updatebook.html", book=bookinfo, booktype=booktypestr, typelist=typelist, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) @bp.route("/doc/upload//", methods=("POST",)) @@ -307,7 +307,7 @@ def doc_upload(id): error = None if fileobj and fileobj.filename: _, filename = os.path.split(fileobj.filename) - filepath = os.path.join(current_app.config['UPLOADDIR'], filename + f'.{int(datetime.datetime.timestamp(datetime.datetime.now()))}') + filepath = os.path.join(current_app.config['UPLOADDIR'], filename + f'.{int(datetime.datetime.timestamp(datetime.now()))}') fileobj.save(filepath) filesz = os.stat(filepath).st_size // 1024 # original in bytes filetype = fileobj.mimetype @@ -336,7 +336,7 @@ def doc_upload(id): if error is not None: return render_template("/user/result.html", opname="上传文件失败", opresult=error, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) return redirect(url_for("user.book", id=id)) @bp.route("/doc/download//", methods=("GET",)) @@ -358,7 +358,7 @@ def doc_download(docid): error = "文件已被删除，严重的数据不一致，请联系管理员" return render_template("/user/result.html", opname="下载文件失败", opresult=error, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) @bp.route("/doc/delete//", methods=("GET",)) @login_required @@ -392,11 +392,11 @@ def doc_delete(docid): if error is not None: return render_template("/user/result.html", opname="删除文件失败", opresult=error, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) elif warning is not None: return render_template("/user/result.html", opname="删除文件出现了一些意外", opresult=warning, - cur_time=datetime.datetime.now(), ret_url=url_for("user.book", id=document['book_id'])) + cur_time=datetime.now(), ret_url=url_for("user.book", id=document['book_id'])) return redirect(url_for("user.book", id=document['book_id'])) @bp.route("/note/create//", methods=("POST",)) @@ -422,7 +422,7 @@ def note_create(bookid): if error is not None: return render_template("/user/result.html", opname="添加评论失败", opresult=error, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) return redirect(url_for("user.book", id=bookid)) @@ -446,5 +446,5 @@ def note_delete(noteid): if error is not None: return render_template("/user/result.html", opname="删除评论失败", opresult=error, - cur_time=datetime.datetime.now()) + cur_time=datetime.now()) return redirect(url_for("user.book", id=note['book_id'])) \ No newline at end of file