diff --git a/week5/__pycache__/app.cpython-310.pyc b/week5/__pycache__/app.cpython-310.pyc index 24d9df1..bf73781 100644 Binary files a/week5/__pycache__/app.cpython-310.pyc and b/week5/__pycache__/app.cpython-310.pyc differ diff --git a/week5/app.py b/week5/app.py index ec3f222..ed93707 100644 --- a/week5/app.py +++ b/week5/app.py @@ -1,11 +1,19 @@ # This is a flask application that overlaps uploaded images and text on top of images laid out in a grid on the browser. from flask import Flask -from flask import request +from flask import request, redirect from flask import render_template import glob +import os + +UPLOAD_FOLDER = './static/img/' +ALLOWED_EXTENSIONS = {'txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif'} +def allowed_file(filename): + return '.' in filename and \ + filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS app = Flask(__name__) +app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER @app.route("/") def overlap(): @@ -13,3 +21,23 @@ def overlap(): print(images) return render_template("mosaic.html", images=images) + +from flask import request + +@app.route('/upload', methods=['POST']) +def upload_file(): + if request.method == 'POST': + file = request.files['tile'] + # print(request.files["zine test.png"]) + if file and allowed_file(file.filename): + filename = file.filename + print("zine test.png",filename) + file.save(os.path.join(app.config['UPLOAD_FOLDER'], filename)) + overwrite = request.form["overwrite"] + os.system(f"cp ./static/img/{ filename } ./static/img/{ overwrite }") + os.system(f"rm ./static/img/{ filename }") + + return redirect("/") + # f = request.files['the_file'] + # f.save('/var/www/uploads/uploaded_file.txt') + diff --git a/week5/static/img/output00.png b/week5/static/img/output00.png index 2201ef9..35b56b9 100644 Binary files a/week5/static/img/output00.png and b/week5/static/img/output00.png differ diff --git a/week5/static/img/output01.png b/week5/static/img/output01.png index 51e80af..56bab55 100644 Binary files a/week5/static/img/output01.png and b/week5/static/img/output01.png differ diff --git a/week5/static/img/output02.png b/week5/static/img/output02.png index 490349b..1c57151 100644 Binary files a/week5/static/img/output02.png and b/week5/static/img/output02.png differ diff --git a/week5/static/img/output03.png b/week5/static/img/output03.png index 3e0f8fa..5de5c46 100644 Binary files a/week5/static/img/output03.png and b/week5/static/img/output03.png differ diff --git a/week5/static/img/output04.png b/week5/static/img/output04.png index 2ab8259..a9a69be 100644 Binary files a/week5/static/img/output04.png and b/week5/static/img/output04.png differ diff --git a/week5/static/img/output05.png b/week5/static/img/output05.png index ad57967..6f5e17a 100644 Binary files a/week5/static/img/output05.png and b/week5/static/img/output05.png differ diff --git a/week5/static/img/output06.png b/week5/static/img/output06.png index 2e960fd..3545d00 100644 Binary files a/week5/static/img/output06.png and b/week5/static/img/output06.png differ diff --git a/week5/static/img/output07.png b/week5/static/img/output07.png index 31da81b..a5cadef 100644 Binary files a/week5/static/img/output07.png and b/week5/static/img/output07.png differ diff --git a/week5/static/img/output08.png b/week5/static/img/output08.png index dba82dd..22fa747 100644 Binary files a/week5/static/img/output08.png and b/week5/static/img/output08.png differ diff --git a/week5/static/img/output09.png b/week5/static/img/output09.png index 8009b22..0aa4a88 100644 Binary files a/week5/static/img/output09.png and b/week5/static/img/output09.png differ diff --git a/week5/static/img/output10.png b/week5/static/img/output10.png index 7219802..c2bfdae 100644 Binary files a/week5/static/img/output10.png and b/week5/static/img/output10.png differ diff --git a/week5/static/img/output11.png b/week5/static/img/output11.png index 2cd23b2..1ea457e 100644 Binary files a/week5/static/img/output11.png and b/week5/static/img/output11.png differ diff --git a/week5/static/img/output12.png b/week5/static/img/output12.png index 8dd6ea8..8b1fe8e 100644 Binary files a/week5/static/img/output12.png and b/week5/static/img/output12.png differ diff --git a/week5/static/img/output13.png b/week5/static/img/output13.png index e7597de..d1e9c3e 100644 Binary files a/week5/static/img/output13.png and b/week5/static/img/output13.png differ diff --git a/week5/static/img/output14.png b/week5/static/img/output14.png index a3dd563..e78b455 100644 Binary files a/week5/static/img/output14.png and b/week5/static/img/output14.png differ diff --git a/week5/static/img/output15.png b/week5/static/img/output15.png index 84e3ffd..4918651 100644 Binary files a/week5/static/img/output15.png and b/week5/static/img/output15.png differ diff --git a/week5/templates/mosaic.html b/week5/templates/mosaic.html index 530a09f..ee41253 100644 --- a/week5/templates/mosaic.html +++ b/week5/templates/mosaic.html @@ -6,7 +6,7 @@ margin: 0; } img{ - width: 20vw; + width: 25vw; margin: 0; padding: 0; } @@ -17,5 +17,13 @@ {% for image in images %}{% endfor %} + +
+ + + + +
\ No newline at end of file