修改部分细节

2022-04-15 20:47:05 +08:00
parent 1869e14d53
commit d306188caf
@@ -11,8 +11,7 @@ from flask import request
 from flask import make_response
 from flask import render_template
 from ..db.db import SQLite as db
-from ..utils.view import view_
-from ..utils.view import listing_
+from ..utils.response import index_
 from . import main


@@ -44,21 +43,8 @@ def home(name: str):
            db().update(name, 0)
        # 使用设置的长度减去已有数据的长度, 将结果转换为string类型, 再和数据库内的数据进行拼接
        number = '0' * (length - len(str(data[-1]))) + str(data[-1])
-        response = make_response(view_(theme, int(length), name, number))
+        response = make_response(index_(theme, int(length), name, number))
        response.headers['Content-Type'] = 'image/svg+xml; charset=utf-8'
        response.headers['cache-control'] = 'max-age=0, no-cache, no-store, must-revalidate'
        return response
    return abort(500)
-
-
-@main.route('/list/', methods=['GET', 'POST'])
-def listing():
-    """
-    列出所有数据库内已有的数据
-    :return:
-    """
-    data = db().exec('select * from reqcount;')
-    format_data = []
-    for i in data:
-        format_data.append({'name': i[0], 'times': i[1]})
-    return listing_(format_data)
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>All data</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='listing.css') }}">
-</head>
-<body>
-<div class="head">
-    <h2>
-        数据库内已有数据
-    </h2>
-    <table class="table">
-        <tr>
-            <th>
-                名称
-            </th>
-            <th>
-                次数
-            </th>
-        </tr>
-        {#使用Jinja2模板来快速遍历传入的列表数据#}
-        {% for value in data %}
-            <tr>
-                <td>{{ value['name'] }}</td>
-                <td>{{ value['times'] }}</td>
-            </tr>
-        {% endfor %}
-    </table>
-</div>
-</body>
-</html>
@@ -3,7 +3,7 @@
 # @Author: markushammered@gmail.com
 # @Development Tool: PyCharm
 # @Create Time: 2022/3/25
-# @File Name: view.py
+# @File Name: response.py


 from ..db.db import SQLite as db
@@ -12,7 +12,7 @@ from flask import render_template
 from typing import Tuple


-def view_(theme: str, length: int, name: str, count: str) -> str or Tuple[bool, str]:
+def index_(theme: str, length: int, name: str, count: str) -> str or Tuple[bool, str]:
    """
    渲染模板
    :param theme:
@@ -77,13 +77,3 @@ def view_(theme: str, length: int, name: str, count: str) -> str or Tuple[bool,
                           address=request.remote_addr,
                           general_height=general_height,
                           general_width=general_width)
-
-
-def listing_(data: list):
-    """
-    展示数据库内所有的数据
-    :param data:
-    :return:
-    """
-    return render_template('list.html',
-                           data=data)