From 60fac4f814746a966591c1464d4fd7f32ab8843d Mon Sep 17 00:00:00 2001 From: Rich Date: Sat, 10 Jul 2021 09:24:42 +0100 Subject: [PATCH] Working --- Pipfile | 4 ---- app/models.py | 17 ----------------- app/routes.py | 2 +- app/templates/index.html | 2 +- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/Pipfile b/Pipfile index 093540b..b2b7488 100644 --- a/Pipfile +++ b/Pipfile @@ -9,10 +9,6 @@ flask_wtf = "*" flask-login = "*" flask-sqlalchemy = "*" flask-migrate = "*" -flask_table = "*" -cffi = "*" -cryptography = "*" -pyopenssl = "*" [dev-packages] pylint = "*" diff --git a/app/models.py b/app/models.py index 2762f5c..1f0b91f 100644 --- a/app/models.py +++ b/app/models.py @@ -1,5 +1,4 @@ from flask_login import UserMixin -from flask_table import Col, Table, LinkCol # from sqlalchemy.ext.declarative.api import instrument_declarative from werkzeug.security import check_password_hash, generate_password_hash @@ -26,19 +25,3 @@ class User(UserMixin, db.Model): @login.user_loader def load_user(id): return User.query.get(int(id)) - - -class Networks(Table): - ssid = Col("SSID") - signal = Col("Signal Strength") - inuse = Col("Connected") - security = Col("Security") - connect = LinkCol("Connect", "connect", url_kwargs=dict(ssid="ssid", security="security")) - - -class Network(object): - def __init__(self, ssid, signal, inuse, security): - self.ssid = ssid - self.signal = signal - self.inuse = inuse - self.security = security diff --git a/app/routes.py b/app/routes.py index 3808920..60bbec5 100644 --- a/app/routes.py +++ b/app/routes.py @@ -6,7 +6,7 @@ from flask_login import current_user, login_required, login_user, logout_user from app import app from app.forms import LoginForm, WPAForm -from app.models import Network, Networks, User +from app.models import User CMD_SCAN = "sudo nmcli -t -f SSID,SIGNAL,IN-USE,SECURITY -e yes -m tab device wifi list ifname wlxf81a6719febb --rescan yes" CMD_JOIN = "sudo nmcli device wifi connect *SSID* ifname wlxf81a6719febb" diff --git a/app/templates/index.html b/app/templates/index.html index f870a82..cce7d44 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -6,7 +6,7 @@ SSID - Signle + Signal Connected Security Action