Compare commits

..

No commits in common. "5c9b5fa56d8c2abbb113201276650add0979d1ab" and "18d399dbbf881d76d1a350dcc2006dfb133fb311" have entirely different histories.

2 changed files with 9 additions and 5 deletions

View file

@ -1,5 +1,6 @@
import queue, time, uuid, json, logging, datetime, os from calendar import c
from flask import Flask, render_template, request, make_response, session, url_for, g 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_socketio import SocketIO, join_room, leave_room
from flask_session import Session from flask_session import Session
from markupsafe import escape from markupsafe import escape
@ -8,6 +9,7 @@ from .db import get_db
#flask_config #flask_config
DATABASE = 'Website/mate.db' DATABASE = 'Website/mate.db'
bp = Blueprint('auth', __name__, url_prefix='/auth')
def create_logs(app): def create_logs(app):
now = datetime.datetime.now().strftime('%d-%m-%Y-%H-%M-%S') 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: # if db is not None:
# db.close() # db.close()
# app.logger.info("Website exited") # app.logger.info("Website exited")
#var #var
status = True
users = queue.Queue() users = queue.Queue()
finished = None
message = None
#website #website
@app.route('/favicon.ico') @app.route('/favicon.ico')

View file

@ -3,7 +3,6 @@ from urllib import response
from Website import create_app from Website import create_app
import json import json
import pdb import pdb
import Website
from Website.db import get_db from Website.db import get_db
from .test_conf import client, app from .test_conf import client, app
@ -45,7 +44,8 @@ def test_addtag_userid_nan(client):
def test_addtag(app, client): def test_addtag(app, client):
response_addtag = client.get('/addtag?id=1') 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') response_tagid = client.get('/api/tag_id?id=12345678')
#/api #/api