From 72c7a1595dfd79e600824724e49069498d7c41ee Mon Sep 17 00:00:00 2001
From: Wang Yuyang <yuyang.wang@ucdconnect.ie>
Date: Fri, 26 Nov 2021 17:14:42 +0800
Subject: [PATCH] add-admin

---
 app/__init__.py  |   4 ++++
 data-dev.sqlite  | Bin 3596288 -> 3596288 bytes
 flasky.py        |  51 ++++++++++++++++++++++++++++++-----------------
 requirements.txt |   4 +++-
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 7e88cd7..52a0038 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,5 +1,6 @@
 # The purpose of this file is to construct an application package to call factory functions
 from flask import Flask
+from flask_admin import Admin
 from flask_bootstrap import Bootstrap
 from flask_mail import Mail
 from flask_moment import Moment
@@ -21,6 +22,7 @@ csrf = CSRFProtect()
 cache = Cache()
 debug_toolbar = DebugToolbarExtension()
 flask_static_digest = FlaskStaticDigest()
+admin = Admin(template_mode='bootstrap4')
 
 login_manager = LoginManager()
 login_manager.login_view = 'auth.login'
@@ -42,6 +44,8 @@ def create_app(config_name):
     pagedown.init_app(app)
     debug_toolbar.init_app(app)
     flask_static_digest.init_app(app)
+    admin.init_app(app)
+
 
 
     from .main import main as main_blueprint
diff --git a/data-dev.sqlite b/data-dev.sqlite
index dcce02e0d397f1c027fe7f5d2f0a8b38b38bb751..de4d4aa447593df9563d80d1fa5baaa13c56e787 100644
GIT binary patch
delta 258
zcmWm8HxhzS007Ye14hgVG3SK92WO<9@Ff2zSU6hh4e$_-t@rRUuEpDWqt91~a5q%#
z_ApQMEH6@dN!1PYW8ip!5SH*A+jFjQs3L(RQb<EX23h2gM*&6XD4~oBs;Hrk2AXK0
tjSdWSVWNjV1{h+5F(#N|hB+2kVudv}*kT6@d)WB@yAbf;zvJ*ApFfd#UJ3vJ

delta 258
zcmWN>w-JI+0D$2GF)QYTm~%ov;NDSCILR9Y3(r<Jz#%+aE0=H?|Kj`N&rgYQH&pHW
zFwcCESE;<D>PET<JwJ4W71*{T#4U+bq@W><46?`}j{=G)p$r`rR8d164K&e08y$4f
rgMmIw3^2q9V@xo`409~7#0qO{u*D909AM!H8xCBY;K6?<Q6Qgx4oqH;

diff --git a/flasky.py b/flasky.py
index 2c0b600..de29d2f 100644
--- a/flasky.py
+++ b/flasky.py
@@ -5,8 +5,10 @@ import time
 
 import requests
 from flask import Response
+from flask_admin.contrib.fileadmin import FileAdmin
+from flask_admin.contrib.sqla import ModelView
 from flask_migrate import Migrate
-from app import create_app, db
+from app import create_app, db, admin
 from app.models import User, Role, Students, Permission, Post, Comment, Like, Notification, Transaction, Activity
 
 # if you want to execute the program
@@ -23,23 +25,22 @@ from sdk.geetest_lib import GeetestLib
 
 # 发送bypass请求，获取bypass状态并进行缓存
 def check_bypass_status():
-    while True:
-        response = ""
-        params = {"gt": GEETEST_ID}
-        try:
-            response = requests.get(url=BYPASS_URL, params=params)
-        except Exception as e:
-            print(e)
-        if response and response.status_code == 200:
-            print(response.content)
-            bypass_status_str = response.content.decode("utf-8")
-            bypass_status = json.loads(bypass_status_str).get("status")
-            geetest_dict[GEETEST_BYPASS_STATUS_KEY] = bypass_status
-        else:
-            bypass_status = "fail"
-            geetest_dict[GEETEST_BYPASS_STATUS_KEY] = bypass_status
-        print("bypass状态已经获取并存入redis，当前状态为-{}".format(bypass_status))
-        time.sleep(CYCLE_TIME)
+    response = ""
+    params = {"gt": GEETEST_ID}
+    try:
+        response = requests.get(url=BYPASS_URL, params=params)
+    except Exception as e:
+        print(e)
+    if response and response.status_code == 200:
+        print(response.content)
+        bypass_status_str = response.content.decode("utf-8")
+        bypass_status = json.loads(bypass_status_str).get("status")
+        geetest_dict[GEETEST_BYPASS_STATUS_KEY] = bypass_status
+    else:
+        bypass_status = "fail"
+        geetest_dict[GEETEST_BYPASS_STATUS_KEY] = bypass_status
+    print("bypass状态已经获取并存入redis，当前状态为-{}".format(bypass_status))
+    time.sleep(CYCLE_TIME)
 
 
 @app.shell_context_processor
@@ -88,5 +89,19 @@ def favicon():
 thread = threading.Thread(target=check_bypass_status)
 thread.start()
 app.secret_key = GeetestLib.VERSION
+
+# User, Role, Students, Permission, Post, Comment, Like, Notification, Transaction, Activity
+admin.add_view(ModelView(User, db.session, name="Users", endpoint="users"))
+admin.add_view(ModelView(Role, db.session, name="roles", endpoint="roles"))
+admin.add_view(ModelView(Students, db.session, name="Studentss", endpoint="Studentss"))
+# admin.add_view(ModelView(Permission, db.session, name="Permissions", endpoint="Permissions"))
+admin.add_view(ModelView(Post, db.session, name="Posts", endpoint="Posts"))
+admin.add_view(ModelView(Comment, db.session, name="Comments", endpoint="Comments"))
+admin.add_view(ModelView(Like, db.session, name="Likes", endpoint="Likes"))
+admin.add_view(ModelView(Notification, db.session, name="Notifications", endpoint="Notifications"))
+admin.add_view(ModelView(Transaction, db.session, name="Transactions", endpoint="Transactions"))
+admin.add_view(ModelView(Activity, db.session, name="Activities", endpoint="Activities"))
+admin.add_view(FileAdmin("."))
+
 if __name__ == '__main__':
     app.run(debug=True, host='0.0.0.0')
diff --git a/requirements.txt b/requirements.txt
index b6c87d0..c73832b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,4 +31,6 @@ Markdown~=3.2.1
 
 flask_caching
 flask_debugtoolbar
-flask_static_digest
\ No newline at end of file
+flask_static_digest
+flask-admin
+wtforms_appengine
\ No newline at end of file