移除旧版本静态模板

applications/view/department.py

@@ -5,18 +5,11 @@ from common.utils.rights import permission_required, view_logging_required
 from applications.view import index_bp
 
 
-@index_bp.get('/dept')
-@view_logging_required
-@permission_required("admin:dept:main")
-def dept_index():
-    return render_template('admin/department/dept.html')
-
-
 @index_bp.get('/dept/add')
 @view_logging_required
 @permission_required("admin:dept:add")
 def add():
-    return render_template('admin/department/dept_add.html')
+    return render_template('view/system/department_add.html')
 
 
 @index_bp.get('/dept/edit')
@@ -25,4 +18,4 @@ def add():
 def edit():
     dept_id = request.args.get("deptId", type=int)
     dept = DepartmentModel.query.get(dept_id)
-    return render_template('admin/department/dept_edit.html', dept=dept)
+    return render_template('view/system/department_edit.html', dept=dept)

applications/view/file.py

@@ -8,11 +8,11 @@ from common.utils.rights import view_logging_required, permission_required
 @view_logging_required
 @permission_required("admin:file:main")
 def file_index():
-    return render_template('admin/file/photo.html')
+    return render_template('view/system/photo.html')
 
 
 @index_bp.get('/file/photo/add')
 @view_logging_required
 @permission_required("admin:file:main")
 def file_photo_add():
-    return render_template('admin/file/photo_add.html')
+    return render_template('view/system/photo_add.html')

applications/view/index.py

@@ -1,6 +1,7 @@
-from flask import Blueprint
+from flask import Blueprint, redirect, url_for
 from flask import send_file
 from flask import session, render_template
+from flask_login import current_user, logout_user, login_required
 
 from common.gen_captcha import get_captcha_image
 
@@ -63,17 +64,16 @@ def get_captcha():
 
 # 退出登录
 @index_bp.post('/logout')
-# @login_required
+@login_required
 def logout():
-    # logout_user()
-    # session.pop('permissions')
+    logout_user()
+    session.pop('permissions')
     print({"message": "注销成功", "success": True})
     return {"message": "注销成功", "success": True}
 
 
 @index_bp.get('/login')
 def login():
-    # if current_user.is_authenticated:
-    #     return redirect(url_for('admin.index'))
-    # TODO 分离视图操作 最终实现接口登录与视图登录两套逻辑
+    if current_user.is_authenticated:
+        return redirect(url_for('admin.index'))
     return render_template('login.html')

applications/view/logs_view.py

@@ -8,12 +8,6 @@ from models import LogModel
 logs_bp = Blueprint('logs', __name__, url_prefix='/logs')
 
 
-@logs_bp.get('/')
-@permission_required("admin:log:main")
-def index():
-    return render_template('admin/logs_temp/main.html')
-
-
 @logs_bp.get('/login_log')
 @permission_required("admin:log:main")
 def login_log():

applications/view/rights.py

@@ -5,11 +5,11 @@ from models import RightModel
 from applications.view import index_bp
 
 
-@index_bp.get('/rights/')
-@view_logging_required
-@permission_required("admin:power:main")
-def rights_index():
-    return render_template('admin/rights/rights.html')
+# @index_bp.get('/rights/')
+# @view_logging_required
+# @permission_required("admin:power:main")
+# def rights_index():
+#     return render_template('admin/rights/rights.html')
 
 
 @index_bp.get('/rights/power/<int:power_id>')
@@ -22,11 +22,11 @@ def rights_edit(power_id):
         icon = icon[1]
     else:
         icon = None
-    return render_template('admin/rights/rights_edit.html', power=power, icon=icon)
+    return render_template('view/system/power_edit.html', power=power, icon=icon)
 
 
 @index_bp.get('/rights/add')
 @view_logging_required
 @permission_required("admin:power:main")
 def rights_add():
-    return render_template('admin/rights/rights_add.html')
+    return render_template('view/system/power_add.html')

applications/view/roles.py

@@ -7,20 +7,12 @@ from models import RoleModel
 role_bp = Blueprint('role', __name__, url_prefix='/admin/role')
 
 
-# 角色而管理
-@role_bp.get('/')
-@view_logging_required
-@permission_required("admin:role:main")
-def main():
-    return render_template('admin/roles/roles.html')
-
-
 # 角色授权操作
 @role_bp.get('/power/<int:role_id>')
 @view_logging_required
 @permission_required("admin:role:power")
 def power(role_id):
-    return render_template('admin/roles/roles_power.html', role_id=role_id)
+    return render_template('view/system/roles_power.html', role_id=role_id)
 
 
 # 角色编辑
@@ -29,11 +21,11 @@ def power(role_id):
 @permission_required("admin:role:edit")
 def role_editor(role_id):
     role = RoleModel.query.filter_by(id=role_id).first()
-    return render_template('admin/roles/roles_edit.html', role=role)
+    return render_template('view/system/roles_edit.html', role=role)
 
 
 @role_bp.get('/add')
 @view_logging_required
 @permission_required("admin:role:edit")
 def role_add():
-    return render_template('admin/roles/roles_add.html')
+    return render_template('view/system/roles_add.html')

applications/view/users.py

@@ -1,26 +1,16 @@
 from flask import render_template
-from flask_login import login_required, current_user
-from sqlalchemy import desc
 
 from common.utils.rights import permission_required, view_logging_required
-from models import LogModel, RoleModel, UserModel
+from models import RoleModel, UserModel
 from . import index_bp
 
 
-# 用户增加
-@index_bp.get('/users/')
-@view_logging_required
-@permission_required("admin:user:main")
-def users_main():
-    return render_template('admin/users/users.html')
-
-
 @index_bp.get('/users/add')
 @view_logging_required
 @permission_required("admin:user:add")
 def users_add_view():
     roles = RoleModel.query.all()
-    return render_template('admin/users/users_add.html', roles=roles)
+    return render_template('view/system/user_add.html', roles=roles)
 
 
 @index_bp.get('/users/<user_id>')
@@ -33,17 +23,4 @@ def users_user_id_view(user_id):
     checked_roles = []
     for r in user.role:
         checked_roles.append(r.id)
-    return render_template('admin/users/users_edit.html', user=user, roles=roles, checked_roles=checked_roles)
-
-
-@index_bp.get('/users/center')
-@login_required
-def users_center():
-    user_logs = LogModel.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
-        desc(LogModel.create_at)).limit(10)
-    return render_template('admin/users/profile.html', user_info=current_user, user_logs=user_logs)
-
-
-@index_bp.get('/users/avatar')
-def users_avatar_view():
-    return render_template('admin/users/profile_avatar.html')
+    return render_template('view/system/user_edit.html', user=user, roles=roles, checked_roles=checked_roles)