diff --git a/servicePoints/__pycache__/config.cpython-36.pyc b/servicePoints/__pycache__/config.cpython-36.pyc index b5b6b7bc54a83e82d9e0f29d63af858771214640..e2f47fdc2b33a9855315f2cf9e0a9c0260d21cf5 100644 Binary files a/servicePoints/__pycache__/config.cpython-36.pyc and b/servicePoints/__pycache__/config.cpython-36.pyc differ diff --git a/servicePoints/config.py b/servicePoints/config.py index 5cd684c12ed1b5590e0e7468961b372088e4939f..31e4bbec6f4cc8c9afc9f650929022f3ff223702 100644 --- a/servicePoints/config.py +++ b/servicePoints/config.py @@ -6,7 +6,15 @@ SECRET_KEY = b'''\xf4\xb2\x9f\x80\xb1\xef\x01\xc6\x10 \xca\xdd\x84\xd4\xf3\x0c\x95\xad\xa6\xdc\xaf\xd3\xbeI\xf7''' SESSION_COOKIE_NAME = 'login' +IMAGES_FOLDER = os.path.join( + os.path.dirname(os.path.dirname(os.path.realpath(__file__))), + 'var', 'images' +) +ALLOWED_EXTENSIONS = set(['png', 'jpg', 'jpeg', 'gif']) +MAX_CONTENT_LENGTH = 16 * 1024 * 1024 + DATABASE_FILENAME = os.path.join( os.path.dirname(os.path.dirname(os.path.realpath(__file__))), 'var', 'servicePoints.sqlite3' ) + diff --git a/servicePoints/templates/index.html b/servicePoints/templates/index.html index dc70c0f0de7e77e573073ddce500354cb1d42f29..38f815182d8e99cee2fee0effa298b4da4ea7878 100644 --- a/servicePoints/templates/index.html +++ b/servicePoints/templates/index.html @@ -8,9 +8,31 @@ <p>Hours: {{hours}}</p> <a href="/accounts/logout/">logout</a> <a href="/accounts/delete/">delete</a> - <a href="/accounts/mask/">mask</a> + <p> + <a href="/accounts/mask/"> + <img src=/images/mask.png alt="mask"> + </a> + <a href="/accounts/mask/"> + <img src=/images/blood.png alt="mask"> + </a> + <a href="/accounts/mask/"> + <img src=/images/food.png alt="mask"> + </a> + <a href="/accounts/mask/"> + <img src=/images/tutor.png alt="mask"> + </a> + <a href="/accounts/mask/"> + <img src=/images/submit.png alt="mask"> + </a> + {% if leader == 1 %} - <p>leader!</p> + <a href="/accounts/mask/"> + <img src=/images/view.png alt="mask"> + </a> + <a href="/accounts/mask/"> + <img src=/images/requests.png alt="mask"> + </a> {% endif %} + </p> </head> </html> diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc index c356eda9522b3f823f962c3ee53e87c648fb3e8c..865419fc28b3340d4bb6e9312e8ea0508d78d314 100644 Binary files a/servicePoints/views/__pycache__/accounts.cpython-36.pyc and b/servicePoints/views/__pycache__/accounts.cpython-36.pyc differ diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py index fbbd27b60f4ebd8c2653d7063dd04401ca6b1379..e42976a4ea3967a269a80ce9853e43c3321e7d91 100644 --- a/servicePoints/views/accounts.py +++ b/servicePoints/views/accounts.py @@ -241,3 +241,9 @@ def mask(): context = {} return render_template('mask.html', **context) +@servicePoints.app.route('/images/<path:filename>', methods=['GET', 'POST']) +def images(filename): + if "username" in flask.session: + return flask.send_from_directory( + servicePoints.app.config['IMAGES_FOLDER'], filename, as_attachment=True) + return flask.redirect(flask.url_for('login')) diff --git a/var/images/blood.png b/var/images/blood.png new file mode 100644 index 0000000000000000000000000000000000000000..a5e6f34d757cb3cb9fd726c852c74a59d24a6bde Binary files /dev/null and b/var/images/blood.png differ diff --git a/var/images/food.png b/var/images/food.png new file mode 100644 index 0000000000000000000000000000000000000000..e88a4bab4d50bba501b0823e1a50c2123653d1ac Binary files /dev/null and b/var/images/food.png differ diff --git a/var/images/mask.png b/var/images/mask.png new file mode 100644 index 0000000000000000000000000000000000000000..b01ab5a949d660b8f78e797ace5e45dc61eda93b Binary files /dev/null and b/var/images/mask.png differ diff --git a/var/images/requests.png b/var/images/requests.png new file mode 100644 index 0000000000000000000000000000000000000000..c19768c9a99f47ab8bbb9c0d00b144cbb6594c6a Binary files /dev/null and b/var/images/requests.png differ diff --git a/var/images/submit.png b/var/images/submit.png new file mode 100644 index 0000000000000000000000000000000000000000..b2a8450a8a755b90047349c959fb87286435ae2d Binary files /dev/null and b/var/images/submit.png differ diff --git a/var/images/tutor.png b/var/images/tutor.png new file mode 100644 index 0000000000000000000000000000000000000000..f95693023352da6c7081574342df156eae961e90 Binary files /dev/null and b/var/images/tutor.png differ diff --git a/var/images/view.png b/var/images/view.png new file mode 100644 index 0000000000000000000000000000000000000000..3d91611cb92d89b358ce97a9495a305981ad946b Binary files /dev/null and b/var/images/view.png differ diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3 index 85d5394bf56a9cd92efe500641195ec587d06417..12b075764feae87c8ab17d440739fe167aa7a16e 100644 Binary files a/var/servicePoints.sqlite3 and b/var/servicePoints.sqlite3 differ