diff --git a/Website/__init__.py b/Website/__init__.py index 33617d7..8184a2f 100644 --- a/Website/__init__.py +++ b/Website/__init__.py @@ -1,5 +1,6 @@ -import queue, time, uuid, json, logging, datetime, os -from flask import Flask, render_template, request, make_response, session, url_for, g +from calendar import c +import queue, sqlite3, time, atexit, sys, uuid, json, urllib.parse, logging, datetime, os +from flask import Flask, render_template, request, make_response, session, url_for, g, Blueprint from flask_socketio import SocketIO, join_room, leave_room from flask_session import Session from markupsafe import escape @@ -8,6 +9,7 @@ from .db import get_db #flask_config DATABASE = 'Website/mate.db' +bp = Blueprint('auth', __name__, url_prefix='/auth') def create_logs(app): now = datetime.datetime.now().strftime('%d-%m-%Y-%H-%M-%S') @@ -42,9 +44,11 @@ def create_app(test_config=None): # if db is not None: # db.close() # app.logger.info("Website exited") - #var + status = True users = queue.Queue() + finished = None + message = None #website @app.route('/favicon.ico') diff --git a/tests/test_website.py b/tests/test_website.py index c06615b..a728dd8 100644 --- a/tests/test_website.py +++ b/tests/test_website.py @@ -3,7 +3,6 @@ from urllib import response from Website import create_app import json import pdb -import Website from Website.db import get_db from .test_conf import client, app @@ -45,7 +44,8 @@ def test_addtag_userid_nan(client): def test_addtag(app, client): response_addtag = client.get('/addtag?id=1') - #hier muss der userque was hinzugefügt werden! + with app.app_context(): + None response_tagid = client.get('/api/tag_id?id=12345678') #/api