diff --git a/week5/Makefile b/week5/Makefile index e505351..5515819 100644 --- a/week5/Makefile +++ b/week5/Makefile @@ -8,3 +8,6 @@ local: breadcube: @SCRIPT_NAME=${OVERLAP_APPLICATION_ROOT} gunicorn -b localhost:${OVERLAP_PORTNUMBER} --reload app:app + +breadcube2: + @SCRIPT_NAME=${OVERLAP_APPLICATION_ROOT} gunicorn -b localhost:${OVERLAP_PORTNUMBER} --reload app2:app diff --git a/week5/app2.py b/week5/app2.py new file mode 100644 index 0000000..d14412e --- /dev/null +++ b/week5/app2.py @@ -0,0 +1,128 @@ +# 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, redirect +from flask import render_template +import glob +import os +from shutil import copyfile, move +from datetime import datetime + +UPLOAD_FOLDER = os.path.join("static", "img") +ALLOWED_EXTENSIONS = {'txt', 'pdf', 'png', 'jpg', 'jpeg', 'gif', 'mp3', 'm4a', 'ogg', 'ogv', 'mp4', 'mkv'} +def allowed_file(filename): + return '.' in filename and \ + filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS + +def lastupload(imgpath): + files = glob.glob('./static/img/' + imgpath[0:2] + '/*') + files.sort(reverse=True) + return files[0] + + # create flask application +app = Flask(__name__) + +# configure the upload folder +app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER + +# load the settings of the applicaiton +# (to handle the routing correctly) +app.config.from_pyfile('settings.py') + +@app.route("/") +def overlap(): + lastfiles = [] + for i in range (0,42): + last=lastupload(str(i).zfill(2)) + lastfiles.append(last) + images = glob.glob('./static/img/*.png') + images.sort() + print(images) + print(lastfiles) + + return render_template("mosaic2.html", lastfiles=lastfiles, images=images) + +from flask import request + +@app.route('/upload/', methods=['POST']) +def upload_file(): + if request.method == 'POST': + file = request.files['tile'] + + if file and allowed_file(file.filename): + filename, fileextension = os.path.splitext(file.filename) + overwrite = request.form["overwrite"] + + input_file_path = os.path.join(app.config['UPLOAD_FOLDER'], overwrite + '/' + filename + fileextension) + overwritten_file_path = os.path.join(app.config['UPLOAD_FOLDER'], overwrite + fileextension) + + print("[input file path]:", input_file_path) + print("[overwritten file path]:", overwritten_file_path) + + # if 'png' not in fileextension: + # print("--- convert uploaded image to png") + # cmd = f"convert { input_file_path } { overwritten_file_path }" + # os.system(cmd) + + file.save(input_file_path) + + file.save(overwritten_file_path) + + # print("==============================================================") + # print(fileextension) + # print(f"copy { UPLOAD_FOLDER + file.filename} { UPLOAD_FOLDER + overwrite + fileextension }") + # os.system(f"copy { UPLOAD_FOLDER + file.filename} { UPLOAD_FOLDER + overwrite + fileextension }") + # print(f"del { UPLOAD_FOLDER + file.filename }") + # os.system(f"del { UPLOAD_FOLDER + file.filename }") + + return redirect("/") + # f = request.files['the_file'] + # f.save('/var/www/uploads/uploaded_file.txt') + +#to refer backto zoomreplace.html +@app.route('/image/static/img/') +def zoomedimage(imgpath): + print (imgpath) + # list the files in imgpath[0:2], pass them to template + files = glob.glob('./static/img/' + imgpath[0:2] + '/*') + files.sort(reverse=True) + print(files) + return render_template("zoomreplace2.html", image=imgpath, files=files ) + +@app.route('/upload2/', methods=['POST']) +def upload2_file(image): + if request.method == 'POST': + file = request.files['tile'] + + if file and allowed_file(file.filename): + filename, fileextension = os.path.splitext(file.filename) + overwrite = os.path.splitext(image)[0] #00 . png + + input_file_path = os.path.join(app.config['UPLOAD_FOLDER'], overwrite + '/' + filename + fileextension) + # overwritten_file_path = os.path.join(app.config['UPLOAD_FOLDER'], overwrite + fileextension) + + print("[input file path]:", input_file_path) + # print("[overwritten file path]:", overwritten_file_path) + + # if 'png' not in fileextension: + # print("--- convert uploaded image to png") + # cmd = f"convert { input_file_path } { overwritten_file_path }" + # os.system(cmd) + + # save it in the main folder with the number as the name + + file.save(input_file_path) + + # file.save(overwritten_file_path) + + # and save it in the folder with the date as the name + number_folder = image[0:2] + datething = str(datetime.now()).replace(":", "").replace(" ", "").replace("-", "").replace(".", "") + print(datething) + memory_file_path = os.path.join(app.config['UPLOAD_FOLDER'],number_folder, datething + fileextension) + + print(memory_file_path) + # tempfile.save(memory_file_path) + move(input_file_path, memory_file_path) + + return redirect("/breadcube/overlap/") diff --git a/week5/static/img/00.png b/week5/static/img/00.png index 35c284f..29c2ded 100644 Binary files a/week5/static/img/00.png and b/week5/static/img/00.png differ diff --git a/week5/static/img/00/000.png b/week5/static/img/00/000.png new file mode 100644 index 0000000..35c284f Binary files /dev/null and b/week5/static/img/00/000.png differ diff --git a/week5/static/img/00/20230619160202689573.png b/week5/static/img/00/20230619160202689573.png new file mode 100644 index 0000000..217b22f Binary files /dev/null and b/week5/static/img/00/20230619160202689573.png differ diff --git a/week5/static/img/00/20230619161156212105.png b/week5/static/img/00/20230619161156212105.png new file mode 100644 index 0000000..29c2ded Binary files /dev/null and b/week5/static/img/00/20230619161156212105.png differ diff --git a/week5/static/img/01/001.png b/week5/static/img/01/001.png new file mode 100644 index 0000000..79d9656 Binary files /dev/null and b/week5/static/img/01/001.png differ diff --git a/week5/static/img/02/002.png b/week5/static/img/02/002.png new file mode 100644 index 0000000..e8f8feb Binary files /dev/null and b/week5/static/img/02/002.png differ diff --git a/week5/static/img/02/20230628174439109580.mp4 b/week5/static/img/02/20230628174439109580.mp4 new file mode 100644 index 0000000..26be3d0 Binary files /dev/null and b/week5/static/img/02/20230628174439109580.mp4 differ diff --git a/week5/static/img/03.png b/week5/static/img/03.png index 898ad2d..c816674 100644 Binary files a/week5/static/img/03.png and b/week5/static/img/03.png differ diff --git a/week5/static/img/03/003.png b/week5/static/img/03/003.png new file mode 100644 index 0000000..898ad2d Binary files /dev/null and b/week5/static/img/03/003.png differ diff --git a/week5/static/img/03/20230619163252443272.png b/week5/static/img/03/20230619163252443272.png new file mode 100644 index 0000000..c816674 Binary files /dev/null and b/week5/static/img/03/20230619163252443272.png differ diff --git a/week5/static/img/04.png b/week5/static/img/04.png index d686846..9889fb3 100644 Binary files a/week5/static/img/04.png and b/week5/static/img/04.png differ diff --git a/week5/static/img/04/004.png b/week5/static/img/04/004.png new file mode 100644 index 0000000..d686846 Binary files /dev/null and b/week5/static/img/04/004.png differ diff --git a/week5/static/img/04/20230619163316857389.png b/week5/static/img/04/20230619163316857389.png new file mode 100644 index 0000000..9889fb3 Binary files /dev/null and b/week5/static/img/04/20230619163316857389.png differ diff --git a/week5/static/img/05/005.png b/week5/static/img/05/005.png new file mode 100644 index 0000000..dac338e Binary files /dev/null and b/week5/static/img/05/005.png differ diff --git a/week5/static/img/06.png b/week5/static/img/06.png index 7017c0d..f142ed4 100644 Binary files a/week5/static/img/06.png and b/week5/static/img/06.png differ diff --git a/week5/static/img/06/006.png b/week5/static/img/06/006.png new file mode 100644 index 0000000..7017c0d Binary files /dev/null and b/week5/static/img/06/006.png differ diff --git a/week5/static/img/06/20230619163409153464.png b/week5/static/img/06/20230619163409153464.png new file mode 100644 index 0000000..f142ed4 Binary files /dev/null and b/week5/static/img/06/20230619163409153464.png differ diff --git a/week5/static/img/07.png.png b/week5/static/img/07.png.png new file mode 100644 index 0000000..6151752 Binary files /dev/null and b/week5/static/img/07.png.png differ diff --git a/week5/static/img/07/007.png b/week5/static/img/07/007.png new file mode 100644 index 0000000..72ff332 Binary files /dev/null and b/week5/static/img/07/007.png differ diff --git a/week5/static/img/07/20230612114103798450.png b/week5/static/img/07/20230612114103798450.png new file mode 100644 index 0000000..aeb20c5 Binary files /dev/null and b/week5/static/img/07/20230612114103798450.png differ diff --git a/week5/static/img/07/20230619155806373413.png b/week5/static/img/07/20230619155806373413.png new file mode 100644 index 0000000..2fecd86 Binary files /dev/null and b/week5/static/img/07/20230619155806373413.png differ diff --git a/week5/static/img/07/20230619160951247409.png b/week5/static/img/07/20230619160951247409.png new file mode 100644 index 0000000..6151752 Binary files /dev/null and b/week5/static/img/07/20230619160951247409.png differ diff --git a/week5/static/img/08.png b/week5/static/img/08.png index 5c4739b..7244214 100644 Binary files a/week5/static/img/08.png and b/week5/static/img/08.png differ diff --git a/week5/static/img/08/008.png b/week5/static/img/08/008.png new file mode 100644 index 0000000..5c4739b Binary files /dev/null and b/week5/static/img/08/008.png differ diff --git a/week5/static/img/08/20230619164637849135.png b/week5/static/img/08/20230619164637849135.png new file mode 100644 index 0000000..7244214 Binary files /dev/null and b/week5/static/img/08/20230619164637849135.png differ diff --git a/week5/static/img/09.png b/week5/static/img/09.png index 84f394c..04acd0d 100644 Binary files a/week5/static/img/09.png and b/week5/static/img/09.png differ diff --git a/week5/static/img/09/009.png b/week5/static/img/09/009.png new file mode 100644 index 0000000..84f394c Binary files /dev/null and b/week5/static/img/09/009.png differ diff --git a/week5/static/img/09/20230619163136756832.png b/week5/static/img/09/20230619163136756832.png new file mode 100644 index 0000000..04acd0d Binary files /dev/null and b/week5/static/img/09/20230619163136756832.png differ diff --git a/week5/static/img/10.png b/week5/static/img/10.png index b4cb799..f51f3ee 100644 Binary files a/week5/static/img/10.png and b/week5/static/img/10.png differ diff --git a/week5/static/img/10/010.png b/week5/static/img/10/010.png new file mode 100644 index 0000000..b4cb799 Binary files /dev/null and b/week5/static/img/10/010.png differ diff --git a/week5/static/img/10/20230619163402013286.png b/week5/static/img/10/20230619163402013286.png new file mode 100644 index 0000000..f51f3ee Binary files /dev/null and b/week5/static/img/10/20230619163402013286.png differ diff --git a/week5/static/img/11/011.png b/week5/static/img/11/011.png new file mode 100644 index 0000000..cdc5965 Binary files /dev/null and b/week5/static/img/11/011.png differ diff --git a/week5/static/img/12.png b/week5/static/img/12.png index d0692a8..d2e862e 100644 Binary files a/week5/static/img/12.png and b/week5/static/img/12.png differ diff --git a/week5/static/img/12/012.png b/week5/static/img/12/012.png new file mode 100644 index 0000000..d2e862e Binary files /dev/null and b/week5/static/img/12/012.png differ diff --git a/week5/static/img/12/20230612113709728601.png b/week5/static/img/12/20230612113709728601.png new file mode 100644 index 0000000..d2e862e Binary files /dev/null and b/week5/static/img/12/20230612113709728601.png differ diff --git a/week5/static/img/13/013.png b/week5/static/img/13/013.png new file mode 100644 index 0000000..8e06f52 Binary files /dev/null and b/week5/static/img/13/013.png differ diff --git a/week5/static/img/14.png b/week5/static/img/14.png index de6403e..198ee60 100644 Binary files a/week5/static/img/14.png and b/week5/static/img/14.png differ diff --git a/week5/static/img/14/014.png b/week5/static/img/14/014.png new file mode 100644 index 0000000..de6403e Binary files /dev/null and b/week5/static/img/14/014.png differ diff --git a/week5/static/img/14/20230619161813608882.png b/week5/static/img/14/20230619161813608882.png new file mode 100644 index 0000000..198ee60 Binary files /dev/null and b/week5/static/img/14/20230619161813608882.png differ diff --git a/week5/static/img/15/015.png b/week5/static/img/15/015.png new file mode 100644 index 0000000..fbed87e Binary files /dev/null and b/week5/static/img/15/015.png differ diff --git a/week5/static/img/16.png b/week5/static/img/16.png index a03a783..395716a 100644 Binary files a/week5/static/img/16.png and b/week5/static/img/16.png differ diff --git a/week5/static/img/16/016.png b/week5/static/img/16/016.png new file mode 100644 index 0000000..a03a783 Binary files /dev/null and b/week5/static/img/16/016.png differ diff --git a/week5/static/img/16/20230619163455026315.png b/week5/static/img/16/20230619163455026315.png new file mode 100644 index 0000000..395716a Binary files /dev/null and b/week5/static/img/16/20230619163455026315.png differ diff --git a/week5/static/img/17.png b/week5/static/img/17.png index 63c2c24..6010620 100644 Binary files a/week5/static/img/17.png and b/week5/static/img/17.png differ diff --git a/week5/static/img/17/017.png b/week5/static/img/17/017.png new file mode 100644 index 0000000..63c2c24 Binary files /dev/null and b/week5/static/img/17/017.png differ diff --git a/week5/static/img/17/20230619161617520816.png b/week5/static/img/17/20230619161617520816.png new file mode 100644 index 0000000..6010620 Binary files /dev/null and b/week5/static/img/17/20230619161617520816.png differ diff --git a/week5/static/img/18.png b/week5/static/img/18.png index 1b03682..1a5a215 100644 Binary files a/week5/static/img/18.png and b/week5/static/img/18.png differ diff --git a/week5/static/img/18/018.png b/week5/static/img/18/018.png new file mode 100644 index 0000000..1b03682 Binary files /dev/null and b/week5/static/img/18/018.png differ diff --git a/week5/static/img/18/20230619163517806047.png b/week5/static/img/18/20230619163517806047.png new file mode 100644 index 0000000..1a5a215 Binary files /dev/null and b/week5/static/img/18/20230619163517806047.png differ diff --git a/week5/static/img/19.png b/week5/static/img/19.png index d359c6b..395716a 100644 Binary files a/week5/static/img/19.png and b/week5/static/img/19.png differ diff --git a/week5/static/img/19/019.png b/week5/static/img/19/019.png new file mode 100644 index 0000000..221d117 Binary files /dev/null and b/week5/static/img/19/019.png differ diff --git a/week5/static/img/19/20230614152424699148.png b/week5/static/img/19/20230614152424699148.png new file mode 100644 index 0000000..221d117 Binary files /dev/null and b/week5/static/img/19/20230614152424699148.png differ diff --git a/week5/static/img/19/20230619162834783248.png b/week5/static/img/19/20230619162834783248.png new file mode 100644 index 0000000..395716a Binary files /dev/null and b/week5/static/img/19/20230619162834783248.png differ diff --git a/week5/static/img/19/20230628180006378896.gif b/week5/static/img/19/20230628180006378896.gif new file mode 100644 index 0000000..5f4043b Binary files /dev/null and b/week5/static/img/19/20230628180006378896.gif differ diff --git a/week5/static/img/20.png b/week5/static/img/20.png index e2bae67..10efca7 100644 Binary files a/week5/static/img/20.png and b/week5/static/img/20.png differ diff --git a/week5/static/img/20/020.png b/week5/static/img/20/020.png new file mode 100644 index 0000000..e2bae67 Binary files /dev/null and b/week5/static/img/20/020.png differ diff --git a/week5/static/img/20/20230619164026789123.png b/week5/static/img/20/20230619164026789123.png new file mode 100644 index 0000000..10efca7 Binary files /dev/null and b/week5/static/img/20/20230619164026789123.png differ diff --git a/week5/static/img/21/021.png b/week5/static/img/21/021.png new file mode 100644 index 0000000..78b70b3 Binary files /dev/null and b/week5/static/img/21/021.png differ diff --git a/week5/static/img/22.png b/week5/static/img/22.png index f9d12c9..034ac78 100644 Binary files a/week5/static/img/22.png and b/week5/static/img/22.png differ diff --git a/week5/static/img/22/022.png b/week5/static/img/22/022.png new file mode 100644 index 0000000..d2e862e Binary files /dev/null and b/week5/static/img/22/022.png differ diff --git a/week5/static/img/22/20230612113751171285.png b/week5/static/img/22/20230612113751171285.png new file mode 100644 index 0000000..d2e862e Binary files /dev/null and b/week5/static/img/22/20230612113751171285.png differ diff --git a/week5/static/img/22/20230619161154236553.png b/week5/static/img/22/20230619161154236553.png new file mode 100644 index 0000000..d011fa7 Binary files /dev/null and b/week5/static/img/22/20230619161154236553.png differ diff --git a/week5/static/img/22/20230619161945447204.png b/week5/static/img/22/20230619161945447204.png new file mode 100644 index 0000000..034ac78 Binary files /dev/null and b/week5/static/img/22/20230619161945447204.png differ diff --git a/week5/static/img/23.png b/week5/static/img/23.png index a3cea86..eb7344f 100644 Binary files a/week5/static/img/23.png and b/week5/static/img/23.png differ diff --git a/week5/static/img/23/023.png b/week5/static/img/23/023.png new file mode 100644 index 0000000..d2e862e Binary files /dev/null and b/week5/static/img/23/023.png differ diff --git a/week5/static/img/23/20230612113609612858.png b/week5/static/img/23/20230612113609612858.png new file mode 100644 index 0000000..d2e862e Binary files /dev/null and b/week5/static/img/23/20230612113609612858.png differ diff --git a/week5/static/img/23/20230619162537279816.png b/week5/static/img/23/20230619162537279816.png new file mode 100644 index 0000000..eb7344f Binary files /dev/null and b/week5/static/img/23/20230619162537279816.png differ diff --git a/week5/static/img/24.png b/week5/static/img/24.png index 8d60334..2eef86f 100644 Binary files a/week5/static/img/24.png and b/week5/static/img/24.png differ diff --git a/week5/static/img/24/024.png b/week5/static/img/24/024.png new file mode 100644 index 0000000..8d60334 Binary files /dev/null and b/week5/static/img/24/024.png differ diff --git a/week5/static/img/24/20230619162554245049.png b/week5/static/img/24/20230619162554245049.png new file mode 100644 index 0000000..028d3a4 Binary files /dev/null and b/week5/static/img/24/20230619162554245049.png differ diff --git a/week5/static/img/24/20230619162729882853.png b/week5/static/img/24/20230619162729882853.png new file mode 100644 index 0000000..2eef86f Binary files /dev/null and b/week5/static/img/24/20230619162729882853.png differ diff --git a/week5/static/img/25.png b/week5/static/img/25.png index 9443415..11c8d99 100644 Binary files a/week5/static/img/25.png and b/week5/static/img/25.png differ diff --git a/week5/static/img/25/025.png b/week5/static/img/25/025.png new file mode 100644 index 0000000..9443415 Binary files /dev/null and b/week5/static/img/25/025.png differ diff --git a/week5/static/img/25/20230619162755814672.png b/week5/static/img/25/20230619162755814672.png new file mode 100644 index 0000000..11c8d99 Binary files /dev/null and b/week5/static/img/25/20230619162755814672.png differ diff --git a/week5/static/img/26/026.png b/week5/static/img/26/026.png new file mode 100644 index 0000000..c0515ee Binary files /dev/null and b/week5/static/img/26/026.png differ diff --git a/week5/static/img/26/20230628180319812260.png b/week5/static/img/26/20230628180319812260.png new file mode 100644 index 0000000..4878314 Binary files /dev/null and b/week5/static/img/26/20230628180319812260.png differ diff --git a/week5/static/img/27/027.png b/week5/static/img/27/027.png new file mode 100644 index 0000000..c93e966 Binary files /dev/null and b/week5/static/img/27/027.png differ diff --git a/week5/static/img/28.png b/week5/static/img/28.png index e8cc670..bb84edb 100644 Binary files a/week5/static/img/28.png and b/week5/static/img/28.png differ diff --git a/week5/static/img/28/028.png b/week5/static/img/28/028.png new file mode 100644 index 0000000..e8cc670 Binary files /dev/null and b/week5/static/img/28/028.png differ diff --git a/week5/static/img/28/20230619161714293157.png b/week5/static/img/28/20230619161714293157.png new file mode 100644 index 0000000..bb84edb Binary files /dev/null and b/week5/static/img/28/20230619161714293157.png differ diff --git a/week5/static/img/29.png b/week5/static/img/29.png index 3128dac..1a5a215 100644 Binary files a/week5/static/img/29.png and b/week5/static/img/29.png differ diff --git a/week5/static/img/29/029.png b/week5/static/img/29/029.png new file mode 100644 index 0000000..3128dac Binary files /dev/null and b/week5/static/img/29/029.png differ diff --git a/week5/static/img/29/20230619161831307284.png b/week5/static/img/29/20230619161831307284.png new file mode 100644 index 0000000..1a5a215 Binary files /dev/null and b/week5/static/img/29/20230619161831307284.png differ diff --git a/week5/static/img/30/030.png b/week5/static/img/30/030.png new file mode 100644 index 0000000..40857c5 Binary files /dev/null and b/week5/static/img/30/030.png differ diff --git a/week5/static/img/31/031.png b/week5/static/img/31/031.png new file mode 100644 index 0000000..3f42fb4 Binary files /dev/null and b/week5/static/img/31/031.png differ diff --git a/week5/static/img/32.png b/week5/static/img/32.png index 490b1d8..395716a 100644 Binary files a/week5/static/img/32.png and b/week5/static/img/32.png differ diff --git a/week5/static/img/32/032.png b/week5/static/img/32/032.png new file mode 100644 index 0000000..062624e Binary files /dev/null and b/week5/static/img/32/032.png differ diff --git a/week5/static/img/32/20230606173002602802.png b/week5/static/img/32/20230606173002602802.png deleted file mode 100644 index 1357d22..0000000 Binary files a/week5/static/img/32/20230606173002602802.png and /dev/null differ diff --git a/week5/static/img/32/20230606173125107243.png b/week5/static/img/32/20230606173125107243.png deleted file mode 100644 index 1af299f..0000000 Binary files a/week5/static/img/32/20230606173125107243.png and /dev/null differ diff --git a/week5/static/img/32/20230606174639861056.png b/week5/static/img/32/20230606174639861056.png deleted file mode 100644 index 1af299f..0000000 Binary files a/week5/static/img/32/20230606174639861056.png and /dev/null differ diff --git a/week5/static/img/32/20230606174654702967.png b/week5/static/img/32/20230606174654702967.png deleted file mode 100644 index 1357d22..0000000 Binary files a/week5/static/img/32/20230606174654702967.png and /dev/null differ diff --git a/week5/static/img/32/20230614151327107103.png b/week5/static/img/32/20230614151327107103.png new file mode 100644 index 0000000..4d5939b Binary files /dev/null and b/week5/static/img/32/20230614151327107103.png differ diff --git a/week5/static/img/32/20230617113929362079.png b/week5/static/img/32/20230617113929362079.png new file mode 100644 index 0000000..062624e Binary files /dev/null and b/week5/static/img/32/20230617113929362079.png differ diff --git a/week5/static/img/32/20230619162720412752.png b/week5/static/img/32/20230619162720412752.png new file mode 100644 index 0000000..395716a Binary files /dev/null and b/week5/static/img/32/20230619162720412752.png differ diff --git a/week5/static/img/33.png b/week5/static/img/33.png index bf3d49e..cad0b55 100644 Binary files a/week5/static/img/33.png and b/week5/static/img/33.png differ diff --git a/week5/static/img/33/033.png b/week5/static/img/33/033.png new file mode 100644 index 0000000..bf3d49e Binary files /dev/null and b/week5/static/img/33/033.png differ diff --git a/week5/static/img/33/20230619163347256889.png b/week5/static/img/33/20230619163347256889.png new file mode 100644 index 0000000..cad0b55 Binary files /dev/null and b/week5/static/img/33/20230619163347256889.png differ diff --git a/week5/static/img/34.png b/week5/static/img/34.png index 2d9967f..3bda813 100644 Binary files a/week5/static/img/34.png and b/week5/static/img/34.png differ diff --git a/week5/static/img/34/034.png b/week5/static/img/34/034.png new file mode 100644 index 0000000..2d9967f Binary files /dev/null and b/week5/static/img/34/034.png differ diff --git a/week5/static/img/34/20230619162527517761.png b/week5/static/img/34/20230619162527517761.png new file mode 100644 index 0000000..3bda813 Binary files /dev/null and b/week5/static/img/34/20230619162527517761.png differ diff --git a/week5/static/img/35.png b/week5/static/img/35.png index 3d23dcc..369c283 100644 Binary files a/week5/static/img/35.png and b/week5/static/img/35.png differ diff --git a/week5/static/img/35/035.png b/week5/static/img/35/035.png new file mode 100644 index 0000000..3d23dcc Binary files /dev/null and b/week5/static/img/35/035.png differ diff --git a/week5/static/img/35/20230619162624674150.png b/week5/static/img/35/20230619162624674150.png new file mode 100644 index 0000000..369c283 Binary files /dev/null and b/week5/static/img/35/20230619162624674150.png differ diff --git a/week5/static/img/36.png b/week5/static/img/36.png index c6aa095..6134d86 100644 Binary files a/week5/static/img/36.png and b/week5/static/img/36.png differ diff --git a/week5/static/img/36/036.png b/week5/static/img/36/036.png new file mode 100644 index 0000000..c6aa095 Binary files /dev/null and b/week5/static/img/36/036.png differ diff --git a/week5/static/img/36/20230619163114035040.png b/week5/static/img/36/20230619163114035040.png new file mode 100644 index 0000000..7a6b2c3 Binary files /dev/null and b/week5/static/img/36/20230619163114035040.png differ diff --git a/week5/static/img/36/20230619163932536262.png b/week5/static/img/36/20230619163932536262.png new file mode 100644 index 0000000..6134d86 Binary files /dev/null and b/week5/static/img/36/20230619163932536262.png differ diff --git a/week5/static/img/37.png b/week5/static/img/37.png index daacfa2..56a33d6 100644 Binary files a/week5/static/img/37.png and b/week5/static/img/37.png differ diff --git a/week5/static/img/37/037.png b/week5/static/img/37/037.png new file mode 100644 index 0000000..daacfa2 Binary files /dev/null and b/week5/static/img/37/037.png differ diff --git a/week5/static/img/37/20230619163038334976.png b/week5/static/img/37/20230619163038334976.png new file mode 100644 index 0000000..e60f095 Binary files /dev/null and b/week5/static/img/37/20230619163038334976.png differ diff --git a/week5/static/img/37/20230619164025415658.png b/week5/static/img/37/20230619164025415658.png new file mode 100644 index 0000000..56a33d6 Binary files /dev/null and b/week5/static/img/37/20230619164025415658.png differ diff --git a/week5/static/img/38.png b/week5/static/img/38.png index 14242f9..c0eaabb 100644 Binary files a/week5/static/img/38.png and b/week5/static/img/38.png differ diff --git a/week5/static/img/38/038.png b/week5/static/img/38/038.png new file mode 100644 index 0000000..14242f9 Binary files /dev/null and b/week5/static/img/38/038.png differ diff --git a/week5/static/img/38/20230619161437804597.png b/week5/static/img/38/20230619161437804597.png new file mode 100644 index 0000000..c0eaabb Binary files /dev/null and b/week5/static/img/38/20230619161437804597.png differ diff --git a/week5/static/img/39.png b/week5/static/img/39.png index d8a3573..0ad446e 100644 Binary files a/week5/static/img/39.png and b/week5/static/img/39.png differ diff --git a/week5/static/img/39/039.png b/week5/static/img/39/039.png new file mode 100644 index 0000000..d8a3573 Binary files /dev/null and b/week5/static/img/39/039.png differ diff --git a/week5/static/img/39/20230619163714922202.png b/week5/static/img/39/20230619163714922202.png new file mode 100644 index 0000000..0ad446e Binary files /dev/null and b/week5/static/img/39/20230619163714922202.png differ diff --git a/week5/static/img/40/040.png b/week5/static/img/40/040.png new file mode 100644 index 0000000..cf05fa3 Binary files /dev/null and b/week5/static/img/40/040.png differ diff --git a/week5/static/img/41/041.png b/week5/static/img/41/041.png new file mode 100644 index 0000000..06ddd9b Binary files /dev/null and b/week5/static/img/41/041.png differ diff --git a/week5/static/img/42.png b/week5/static/img/42.png index b0c9c93..55aeed6 100644 Binary files a/week5/static/img/42.png and b/week5/static/img/42.png differ diff --git a/week5/static/img/42/042.png b/week5/static/img/42/042.png new file mode 100644 index 0000000..b0c9c93 Binary files /dev/null and b/week5/static/img/42/042.png differ diff --git a/week5/static/img/42/20230619163840859892.png b/week5/static/img/42/20230619163840859892.png new file mode 100644 index 0000000..55aeed6 Binary files /dev/null and b/week5/static/img/42/20230619163840859892.png differ diff --git a/week5/static/img/43.png b/week5/static/img/43.png index 9f0875c..1596267 100644 Binary files a/week5/static/img/43.png and b/week5/static/img/43.png differ diff --git a/week5/static/img/43/043.png b/week5/static/img/43/043.png new file mode 100644 index 0000000..9f0875c Binary files /dev/null and b/week5/static/img/43/043.png differ diff --git a/week5/static/img/43/20230619162430377355.png b/week5/static/img/43/20230619162430377355.png new file mode 100644 index 0000000..1596267 Binary files /dev/null and b/week5/static/img/43/20230619162430377355.png differ diff --git a/week5/static/img/44.png b/week5/static/img/44.png index 90aab54..c2bc51e 100644 Binary files a/week5/static/img/44.png and b/week5/static/img/44.png differ diff --git a/week5/static/img/44/044.png b/week5/static/img/44/044.png new file mode 100644 index 0000000..90aab54 Binary files /dev/null and b/week5/static/img/44/044.png differ diff --git a/week5/static/img/44/20230619162450329028.png b/week5/static/img/44/20230619162450329028.png new file mode 100644 index 0000000..9289bdc Binary files /dev/null and b/week5/static/img/44/20230619162450329028.png differ diff --git a/week5/static/img/44/20230619165047951667.png b/week5/static/img/44/20230619165047951667.png new file mode 100644 index 0000000..c2bc51e Binary files /dev/null and b/week5/static/img/44/20230619165047951667.png differ diff --git a/week5/static/img/45/045.png b/week5/static/img/45/045.png new file mode 100644 index 0000000..68861d3 Binary files /dev/null and b/week5/static/img/45/045.png differ diff --git a/week5/static/img/46.png b/week5/static/img/46.png index b87cebf..8ff14d8 100644 Binary files a/week5/static/img/46.png and b/week5/static/img/46.png differ diff --git a/week5/static/img/46/046.png b/week5/static/img/46/046.png new file mode 100644 index 0000000..b87cebf Binary files /dev/null and b/week5/static/img/46/046.png differ diff --git a/week5/static/img/46/20230619164240373396.png b/week5/static/img/46/20230619164240373396.png new file mode 100644 index 0000000..8ff14d8 Binary files /dev/null and b/week5/static/img/46/20230619164240373396.png differ diff --git a/week5/static/img/47.png b/week5/static/img/47.png index 17b9aee..02460c6 100644 Binary files a/week5/static/img/47.png and b/week5/static/img/47.png differ diff --git a/week5/static/img/47/047.png b/week5/static/img/47/047.png new file mode 100644 index 0000000..17b9aee Binary files /dev/null and b/week5/static/img/47/047.png differ diff --git a/week5/static/img/47/20230619163821384786.png b/week5/static/img/47/20230619163821384786.png new file mode 100644 index 0000000..02460c6 Binary files /dev/null and b/week5/static/img/47/20230619163821384786.png differ diff --git a/week5/static/img/48.png b/week5/static/img/48.png index aed0bbc..c448cdd 100644 Binary files a/week5/static/img/48.png and b/week5/static/img/48.png differ diff --git a/week5/static/img/48/048.png b/week5/static/img/48/048.png new file mode 100644 index 0000000..aed0bbc Binary files /dev/null and b/week5/static/img/48/048.png differ diff --git a/week5/static/img/48/20230619161256118005.png b/week5/static/img/48/20230619161256118005.png new file mode 100644 index 0000000..c448cdd Binary files /dev/null and b/week5/static/img/48/20230619161256118005.png differ diff --git a/week5/static/img/49/049.png b/week5/static/img/49/049.png new file mode 100644 index 0000000..67e08f2 Binary files /dev/null and b/week5/static/img/49/049.png differ diff --git a/week5/static/img/50/050.png b/week5/static/img/50/050.png new file mode 100644 index 0000000..9d10ee7 Binary files /dev/null and b/week5/static/img/50/050.png differ diff --git a/week5/static/img/51/051.png b/week5/static/img/51/051.png new file mode 100644 index 0000000..e6c4210 Binary files /dev/null and b/week5/static/img/51/051.png differ diff --git a/week5/static/img/52/052.png b/week5/static/img/52/052.png new file mode 100644 index 0000000..9ebbc4f Binary files /dev/null and b/week5/static/img/52/052.png differ diff --git a/week5/static/img/53.png b/week5/static/img/53.png index cdf8b22..c9f72a6 100644 Binary files a/week5/static/img/53.png and b/week5/static/img/53.png differ diff --git a/week5/static/img/53/053.png b/week5/static/img/53/053.png new file mode 100644 index 0000000..cdf8b22 Binary files /dev/null and b/week5/static/img/53/053.png differ diff --git a/week5/static/img/53/20230619162330559116.png b/week5/static/img/53/20230619162330559116.png new file mode 100644 index 0000000..c9f72a6 Binary files /dev/null and b/week5/static/img/53/20230619162330559116.png differ diff --git a/week5/static/img/54.png b/week5/static/img/54.png index 5256a67..da362ef 100644 Binary files a/week5/static/img/54.png and b/week5/static/img/54.png differ diff --git a/week5/static/img/54/054.png b/week5/static/img/54/054.png new file mode 100644 index 0000000..5256a67 Binary files /dev/null and b/week5/static/img/54/054.png differ diff --git a/week5/static/img/54/20230619161650563409.png b/week5/static/img/54/20230619161650563409.png new file mode 100644 index 0000000..da362ef Binary files /dev/null and b/week5/static/img/54/20230619161650563409.png differ diff --git a/week5/static/img/55.png b/week5/static/img/55.png index 64b2ae0..fbffa56 100644 Binary files a/week5/static/img/55.png and b/week5/static/img/55.png differ diff --git a/week5/static/img/55/055.png b/week5/static/img/55/055.png new file mode 100644 index 0000000..fbffa56 Binary files /dev/null and b/week5/static/img/55/055.png differ diff --git a/week5/static/img/55/20230614152651628212.png b/week5/static/img/55/20230614152651628212.png new file mode 100644 index 0000000..fbffa56 Binary files /dev/null and b/week5/static/img/55/20230614152651628212.png differ diff --git a/week5/static/img/56.png b/week5/static/img/56.png index 947719e..8102716 100644 Binary files a/week5/static/img/56.png and b/week5/static/img/56.png differ diff --git a/week5/static/img/56/056.png b/week5/static/img/56/056.png new file mode 100644 index 0000000..947719e Binary files /dev/null and b/week5/static/img/56/056.png differ diff --git a/week5/static/img/56/20230619162404609868.png b/week5/static/img/56/20230619162404609868.png new file mode 100644 index 0000000..8102716 Binary files /dev/null and b/week5/static/img/56/20230619162404609868.png differ diff --git a/week5/static/img/57/057.png b/week5/static/img/57/057.png new file mode 100644 index 0000000..12c2d86 Binary files /dev/null and b/week5/static/img/57/057.png differ diff --git a/week5/static/img/58.png b/week5/static/img/58.png index f89c478..4c48f4d 100644 Binary files a/week5/static/img/58.png and b/week5/static/img/58.png differ diff --git a/week5/static/img/58/058.png b/week5/static/img/58/058.png new file mode 100644 index 0000000..f89c478 Binary files /dev/null and b/week5/static/img/58/058.png differ diff --git a/week5/static/img/58/20230619163735507457.png b/week5/static/img/58/20230619163735507457.png new file mode 100644 index 0000000..4c48f4d Binary files /dev/null and b/week5/static/img/58/20230619163735507457.png differ diff --git a/week5/static/img/59/059.png b/week5/static/img/59/059.png new file mode 100644 index 0000000..7f7c264 Binary files /dev/null and b/week5/static/img/59/059.png differ diff --git a/week5/static/img/60/060.png b/week5/static/img/60/060.png new file mode 100644 index 0000000..03b49a4 Binary files /dev/null and b/week5/static/img/60/060.png differ diff --git a/week5/static/img/61.png b/week5/static/img/61.png index 2e0fa77..90c0b6d 100644 Binary files a/week5/static/img/61.png and b/week5/static/img/61.png differ diff --git a/week5/static/img/61/061.png b/week5/static/img/61/061.png new file mode 100644 index 0000000..2e0fa77 Binary files /dev/null and b/week5/static/img/61/061.png differ diff --git a/week5/static/img/61/20230619162254798739.png b/week5/static/img/61/20230619162254798739.png new file mode 100644 index 0000000..90c0b6d Binary files /dev/null and b/week5/static/img/61/20230619162254798739.png differ diff --git a/week5/static/img/62.png b/week5/static/img/62.png index 6460e6a..70508ec 100644 Binary files a/week5/static/img/62.png and b/week5/static/img/62.png differ diff --git a/week5/static/img/62/062.png b/week5/static/img/62/062.png new file mode 100644 index 0000000..abe27b8 Binary files /dev/null and b/week5/static/img/62/062.png differ diff --git a/week5/static/img/62/20230612113801006803.png b/week5/static/img/62/20230612113801006803.png new file mode 100644 index 0000000..abe27b8 Binary files /dev/null and b/week5/static/img/62/20230612113801006803.png differ diff --git a/week5/static/img/62/20230619161920440723.png b/week5/static/img/62/20230619161920440723.png new file mode 100644 index 0000000..70508ec Binary files /dev/null and b/week5/static/img/62/20230619161920440723.png differ diff --git a/week5/static/img/63/063.png b/week5/static/img/63/063.png new file mode 100644 index 0000000..bb7f713 Binary files /dev/null and b/week5/static/img/63/063.png differ diff --git a/week5/static/img/64.png b/week5/static/img/64.png index 6484624..70508ec 100644 Binary files a/week5/static/img/64.png and b/week5/static/img/64.png differ diff --git a/week5/static/img/64/064.png b/week5/static/img/64/064.png new file mode 100644 index 0000000..6484624 Binary files /dev/null and b/week5/static/img/64/064.png differ diff --git a/week5/static/img/64/20230619162133298497.png b/week5/static/img/64/20230619162133298497.png new file mode 100644 index 0000000..97e7286 Binary files /dev/null and b/week5/static/img/64/20230619162133298497.png differ diff --git a/week5/static/img/64/20230619162156738966.png b/week5/static/img/64/20230619162156738966.png new file mode 100644 index 0000000..70508ec Binary files /dev/null and b/week5/static/img/64/20230619162156738966.png differ diff --git a/week5/static/img/65.png b/week5/static/img/65.png index 8c751ae..66637a5 100644 Binary files a/week5/static/img/65.png and b/week5/static/img/65.png differ diff --git a/week5/static/img/65/065.png b/week5/static/img/65/065.png new file mode 100644 index 0000000..8c751ae Binary files /dev/null and b/week5/static/img/65/065.png differ diff --git a/week5/static/img/65/20230606172523987059.png b/week5/static/img/65/20230606172523987059.png deleted file mode 100644 index a37065c..0000000 Binary files a/week5/static/img/65/20230606172523987059.png and /dev/null differ diff --git a/week5/static/img/65/20230606172532075936.png b/week5/static/img/65/20230606172532075936.png deleted file mode 100644 index 4f740b0..0000000 Binary files a/week5/static/img/65/20230606172532075936.png and /dev/null differ diff --git a/week5/static/img/65/20230619163029550730.png b/week5/static/img/65/20230619163029550730.png new file mode 100644 index 0000000..66637a5 Binary files /dev/null and b/week5/static/img/65/20230619163029550730.png differ diff --git a/week5/static/img/66.png b/week5/static/img/66.png index 26812f4..a364f18 100644 Binary files a/week5/static/img/66.png and b/week5/static/img/66.png differ diff --git a/week5/static/img/66/066.png b/week5/static/img/66/066.png new file mode 100644 index 0000000..26812f4 Binary files /dev/null and b/week5/static/img/66/066.png differ diff --git a/week5/static/img/66/20230619163051085425.png b/week5/static/img/66/20230619163051085425.png new file mode 100644 index 0000000..a364f18 Binary files /dev/null and b/week5/static/img/66/20230619163051085425.png differ diff --git a/week5/static/img/67.png b/week5/static/img/67.png index 14ae8d5..476cb60 100644 Binary files a/week5/static/img/67.png and b/week5/static/img/67.png differ diff --git a/week5/static/img/67/067.png b/week5/static/img/67/067.png new file mode 100644 index 0000000..14ae8d5 Binary files /dev/null and b/week5/static/img/67/067.png differ diff --git a/week5/static/img/67/20230619162537140927.png b/week5/static/img/67/20230619162537140927.png new file mode 100644 index 0000000..9ddbac9 Binary files /dev/null and b/week5/static/img/67/20230619162537140927.png differ diff --git a/week5/static/img/67/20230619165833049556.png b/week5/static/img/67/20230619165833049556.png new file mode 100644 index 0000000..476cb60 Binary files /dev/null and b/week5/static/img/67/20230619165833049556.png differ diff --git a/week5/static/img/68/068.png b/week5/static/img/68/068.png new file mode 100644 index 0000000..9224228 Binary files /dev/null and b/week5/static/img/68/068.png differ diff --git a/week5/static/img/69.png b/week5/static/img/69.png index 5b105a8..45cb061 100644 Binary files a/week5/static/img/69.png and b/week5/static/img/69.png differ diff --git a/week5/static/img/69/069.png b/week5/static/img/69/069.png new file mode 100644 index 0000000..5b105a8 Binary files /dev/null and b/week5/static/img/69/069.png differ diff --git a/week5/static/img/69/20230619164714601607.png b/week5/static/img/69/20230619164714601607.png new file mode 100644 index 0000000..45cb061 Binary files /dev/null and b/week5/static/img/69/20230619164714601607.png differ diff --git a/week5/static/img/70/070.png b/week5/static/img/70/070.png new file mode 100644 index 0000000..1874aa5 Binary files /dev/null and b/week5/static/img/70/070.png differ diff --git a/week5/static/img/71.png b/week5/static/img/71.png index 94d2ef7..f79e4a1 100644 Binary files a/week5/static/img/71.png and b/week5/static/img/71.png differ diff --git a/week5/static/img/71/071.png b/week5/static/img/71/071.png new file mode 100644 index 0000000..94d2ef7 Binary files /dev/null and b/week5/static/img/71/071.png differ diff --git a/week5/static/img/71/20230619160932292041.png b/week5/static/img/71/20230619160932292041.png new file mode 100644 index 0000000..d3cc405 Binary files /dev/null and b/week5/static/img/71/20230619160932292041.png differ diff --git a/week5/static/img/71/20230619161300660127.png b/week5/static/img/71/20230619161300660127.png new file mode 100644 index 0000000..bad2a49 Binary files /dev/null and b/week5/static/img/71/20230619161300660127.png differ diff --git a/week5/static/img/71/20230619162759970114.png b/week5/static/img/71/20230619162759970114.png new file mode 100644 index 0000000..f79e4a1 Binary files /dev/null and b/week5/static/img/71/20230619162759970114.png differ diff --git a/week5/static/img/72.png b/week5/static/img/72.png index bfbe426..6a3a82a 100644 Binary files a/week5/static/img/72.png and b/week5/static/img/72.png differ diff --git a/week5/static/img/72/072.png b/week5/static/img/72/072.png new file mode 100644 index 0000000..bfbe426 Binary files /dev/null and b/week5/static/img/72/072.png differ diff --git a/week5/static/img/72/20230619162943167183.png b/week5/static/img/72/20230619162943167183.png new file mode 100644 index 0000000..6a3a82a Binary files /dev/null and b/week5/static/img/72/20230619162943167183.png differ diff --git a/week5/static/img/73.png b/week5/static/img/73.png index 88115a3..6ce4bc9 100644 Binary files a/week5/static/img/73.png and b/week5/static/img/73.png differ diff --git a/week5/static/img/73/073.png b/week5/static/img/73/073.png new file mode 100644 index 0000000..88115a3 Binary files /dev/null and b/week5/static/img/73/073.png differ diff --git a/week5/static/img/73/20230619161247362511.png b/week5/static/img/73/20230619161247362511.png new file mode 100644 index 0000000..6ce4bc9 Binary files /dev/null and b/week5/static/img/73/20230619161247362511.png differ diff --git a/week5/static/img/73/20230619161253964164.png b/week5/static/img/73/20230619161253964164.png new file mode 100644 index 0000000..6ce4bc9 Binary files /dev/null and b/week5/static/img/73/20230619161253964164.png differ diff --git a/week5/static/img/74.png b/week5/static/img/74.png index 3376705..24a6148 100644 Binary files a/week5/static/img/74.png and b/week5/static/img/74.png differ diff --git a/week5/static/img/74/074.png b/week5/static/img/74/074.png new file mode 100644 index 0000000..3376705 Binary files /dev/null and b/week5/static/img/74/074.png differ diff --git a/week5/static/img/74/20230619164120061223.png b/week5/static/img/74/20230619164120061223.png new file mode 100644 index 0000000..24a6148 Binary files /dev/null and b/week5/static/img/74/20230619164120061223.png differ diff --git a/week5/static/img/75/075.png b/week5/static/img/75/075.png new file mode 100644 index 0000000..29e88e0 Binary files /dev/null and b/week5/static/img/75/075.png differ diff --git a/week5/static/img/76.png b/week5/static/img/76.png index b46da7e..261c0c7 100644 Binary files a/week5/static/img/76.png and b/week5/static/img/76.png differ diff --git a/week5/static/img/76/076.png b/week5/static/img/76/076.png new file mode 100644 index 0000000..b46da7e Binary files /dev/null and b/week5/static/img/76/076.png differ diff --git a/week5/static/img/76/20230619161625975894.png b/week5/static/img/76/20230619161625975894.png new file mode 100644 index 0000000..f1a2df8 Binary files /dev/null and b/week5/static/img/76/20230619161625975894.png differ diff --git a/week5/static/img/76/20230619162225309949.png b/week5/static/img/76/20230619162225309949.png new file mode 100644 index 0000000..2c47608 Binary files /dev/null and b/week5/static/img/76/20230619162225309949.png differ diff --git a/week5/static/img/76/20230619164632637753.png b/week5/static/img/76/20230619164632637753.png new file mode 100644 index 0000000..681dcdd Binary files /dev/null and b/week5/static/img/76/20230619164632637753.png differ diff --git a/week5/static/img/76/20230619165242184320.png b/week5/static/img/76/20230619165242184320.png new file mode 100644 index 0000000..261c0c7 Binary files /dev/null and b/week5/static/img/76/20230619165242184320.png differ diff --git a/week5/static/img/77/077.png b/week5/static/img/77/077.png new file mode 100644 index 0000000..037d19a Binary files /dev/null and b/week5/static/img/77/077.png differ diff --git a/week5/static/img/78.png b/week5/static/img/78.png index 5aa3f78..7895af1 100644 Binary files a/week5/static/img/78.png and b/week5/static/img/78.png differ diff --git a/week5/static/img/78/078.png b/week5/static/img/78/078.png new file mode 100644 index 0000000..5aa3f78 Binary files /dev/null and b/week5/static/img/78/078.png differ diff --git a/week5/static/img/78/20230619163218623891.png b/week5/static/img/78/20230619163218623891.png new file mode 100644 index 0000000..7895af1 Binary files /dev/null and b/week5/static/img/78/20230619163218623891.png differ diff --git a/week5/static/img/79/079.png b/week5/static/img/79/079.png new file mode 100644 index 0000000..5544bc1 Binary files /dev/null and b/week5/static/img/79/079.png differ diff --git a/week5/static/img/80/080.png b/week5/static/img/80/080.png new file mode 100644 index 0000000..ea90ae4 Binary files /dev/null and b/week5/static/img/80/080.png differ diff --git a/week5/static/img/81/081.png b/week5/static/img/81/081.png new file mode 100644 index 0000000..20f646f Binary files /dev/null and b/week5/static/img/81/081.png differ diff --git a/week5/static/img/82/082.png b/week5/static/img/82/082.png new file mode 100644 index 0000000..aee6cff Binary files /dev/null and b/week5/static/img/82/082.png differ diff --git a/week5/static/img/83/083.png b/week5/static/img/83/083.png new file mode 100644 index 0000000..5428542 Binary files /dev/null and b/week5/static/img/83/083.png differ diff --git a/week5/static/img/84/084.png b/week5/static/img/84/084.png new file mode 100644 index 0000000..b323c00 Binary files /dev/null and b/week5/static/img/84/084.png differ diff --git a/week5/static/img/85.png b/week5/static/img/85.png index a986ff2..b4bed59 100644 Binary files a/week5/static/img/85.png and b/week5/static/img/85.png differ diff --git a/week5/static/img/85/085.png b/week5/static/img/85/085.png new file mode 100644 index 0000000..a986ff2 Binary files /dev/null and b/week5/static/img/85/085.png differ diff --git a/week5/static/img/85/20230619162105705719.png b/week5/static/img/85/20230619162105705719.png new file mode 100644 index 0000000..0fa099a Binary files /dev/null and b/week5/static/img/85/20230619162105705719.png differ diff --git a/week5/static/img/85/20230619164430387738.png b/week5/static/img/85/20230619164430387738.png new file mode 100644 index 0000000..b4bed59 Binary files /dev/null and b/week5/static/img/85/20230619164430387738.png differ diff --git a/week5/static/img/86.png b/week5/static/img/86.png index 98028cb..0fa099a 100644 Binary files a/week5/static/img/86.png and b/week5/static/img/86.png differ diff --git a/week5/static/img/86/086.png b/week5/static/img/86/086.png new file mode 100644 index 0000000..98028cb Binary files /dev/null and b/week5/static/img/86/086.png differ diff --git a/week5/static/img/86/20230619162011719043.png b/week5/static/img/86/20230619162011719043.png new file mode 100644 index 0000000..0fa099a Binary files /dev/null and b/week5/static/img/86/20230619162011719043.png differ diff --git a/week5/static/img/87.png b/week5/static/img/87.png index 19f6216..0fa099a 100644 Binary files a/week5/static/img/87.png and b/week5/static/img/87.png differ diff --git a/week5/static/img/87/087.png b/week5/static/img/87/087.png new file mode 100644 index 0000000..19f6216 Binary files /dev/null and b/week5/static/img/87/087.png differ diff --git a/week5/static/img/87/20230619162127125309.png b/week5/static/img/87/20230619162127125309.png new file mode 100644 index 0000000..0fa099a Binary files /dev/null and b/week5/static/img/87/20230619162127125309.png differ diff --git a/week5/static/img/88/088.png b/week5/static/img/88/088.png new file mode 100644 index 0000000..38a1e49 Binary files /dev/null and b/week5/static/img/88/088.png differ diff --git a/week5/static/img/89.png b/week5/static/img/89.png index 09c07b7..6fafe29 100644 Binary files a/week5/static/img/89.png and b/week5/static/img/89.png differ diff --git a/week5/static/img/89/089.png b/week5/static/img/89/089.png new file mode 100644 index 0000000..09c07b7 Binary files /dev/null and b/week5/static/img/89/089.png differ diff --git a/week5/static/img/89/20230619161820760348.png b/week5/static/img/89/20230619161820760348.png new file mode 100644 index 0000000..6fafe29 Binary files /dev/null and b/week5/static/img/89/20230619161820760348.png differ diff --git a/week5/static/img/90.png b/week5/static/img/90.png index 1ed2c1a..1237abc 100644 Binary files a/week5/static/img/90.png and b/week5/static/img/90.png differ diff --git a/week5/static/img/90/090.png b/week5/static/img/90/090.png new file mode 100644 index 0000000..1ed2c1a Binary files /dev/null and b/week5/static/img/90/090.png differ diff --git a/week5/static/img/90/20230619161023857851.png b/week5/static/img/90/20230619161023857851.png new file mode 100644 index 0000000..1237abc Binary files /dev/null and b/week5/static/img/90/20230619161023857851.png differ diff --git a/week5/static/img/91.png b/week5/static/img/91.png index e035da8..7895af1 100644 Binary files a/week5/static/img/91.png and b/week5/static/img/91.png differ diff --git a/week5/static/img/91/091.png b/week5/static/img/91/091.png new file mode 100644 index 0000000..ad900c0 Binary files /dev/null and b/week5/static/img/91/091.png differ diff --git a/week5/static/img/91/20230614153348680858.png b/week5/static/img/91/20230614153348680858.png new file mode 100644 index 0000000..ad900c0 Binary files /dev/null and b/week5/static/img/91/20230614153348680858.png differ diff --git a/week5/static/img/91/20230619162212276428.png b/week5/static/img/91/20230619162212276428.png new file mode 100644 index 0000000..7895af1 Binary files /dev/null and b/week5/static/img/91/20230619162212276428.png differ diff --git a/week5/static/img/92.png b/week5/static/img/92.png index a16ce63..f5a8815 100644 Binary files a/week5/static/img/92.png and b/week5/static/img/92.png differ diff --git a/week5/static/img/92/092.png b/week5/static/img/92/092.png new file mode 100644 index 0000000..a16ce63 Binary files /dev/null and b/week5/static/img/92/092.png differ diff --git a/week5/static/img/92/20230619161615235446.png b/week5/static/img/92/20230619161615235446.png new file mode 100644 index 0000000..f5a8815 Binary files /dev/null and b/week5/static/img/92/20230619161615235446.png differ diff --git a/week5/static/img/93/093.png b/week5/static/img/93/093.png new file mode 100644 index 0000000..784f574 Binary files /dev/null and b/week5/static/img/93/093.png differ diff --git a/week5/static/img/94/094.png b/week5/static/img/94/094.png new file mode 100644 index 0000000..59e30c7 Binary files /dev/null and b/week5/static/img/94/094.png differ diff --git a/week5/static/img/95.png b/week5/static/img/95.png index 26ac7f5..077ebbd 100644 Binary files a/week5/static/img/95.png and b/week5/static/img/95.png differ diff --git a/week5/static/img/95/095.png b/week5/static/img/95/095.png new file mode 100644 index 0000000..26ac7f5 Binary files /dev/null and b/week5/static/img/95/095.png differ diff --git a/week5/static/img/95/20230619161805046206.png b/week5/static/img/95/20230619161805046206.png new file mode 100644 index 0000000..077ebbd Binary files /dev/null and b/week5/static/img/95/20230619161805046206.png differ diff --git a/week5/static/img/96.png b/week5/static/img/96.png index 380bcf7..da037cf 100644 Binary files a/week5/static/img/96.png and b/week5/static/img/96.png differ diff --git a/week5/static/img/96/096.png b/week5/static/img/96/096.png new file mode 100644 index 0000000..380bcf7 Binary files /dev/null and b/week5/static/img/96/096.png differ diff --git a/week5/static/img/96/20230619164022952584.png b/week5/static/img/96/20230619164022952584.png new file mode 100644 index 0000000..da037cf Binary files /dev/null and b/week5/static/img/96/20230619164022952584.png differ diff --git a/week5/static/img/97.png b/week5/static/img/97.png index 3a28499..f8137a0 100644 Binary files a/week5/static/img/97.png and b/week5/static/img/97.png differ diff --git a/week5/static/img/97/097.png b/week5/static/img/97/097.png new file mode 100644 index 0000000..3a28499 Binary files /dev/null and b/week5/static/img/97/097.png differ diff --git a/week5/static/img/97/20230619162725374677.png b/week5/static/img/97/20230619162725374677.png new file mode 100644 index 0000000..f8137a0 Binary files /dev/null and b/week5/static/img/97/20230619162725374677.png differ diff --git a/week5/static/img/98.png b/week5/static/img/98.png index 10c193e..0d6f4ed 100644 Binary files a/week5/static/img/98.png and b/week5/static/img/98.png differ diff --git a/week5/static/img/98/098.png b/week5/static/img/98/098.png new file mode 100644 index 0000000..10c193e Binary files /dev/null and b/week5/static/img/98/098.png differ diff --git a/week5/static/img/98/20230619162232188199.png b/week5/static/img/98/20230619162232188199.png new file mode 100644 index 0000000..0d6f4ed Binary files /dev/null and b/week5/static/img/98/20230619162232188199.png differ diff --git a/week5/static/img/99.png b/week5/static/img/99.png index 26e85e2..6e224f4 100644 Binary files a/week5/static/img/99.png and b/week5/static/img/99.png differ diff --git a/week5/static/img/99/099.png b/week5/static/img/99/099.png new file mode 100644 index 0000000..26e85e2 Binary files /dev/null and b/week5/static/img/99/099.png differ diff --git a/week5/static/img/99/20230619163725051482.png b/week5/static/img/99/20230619163725051482.png new file mode 100644 index 0000000..6e224f4 Binary files /dev/null and b/week5/static/img/99/20230619163725051482.png differ diff --git a/week5/templates/mosaic2.html b/week5/templates/mosaic2.html new file mode 100644 index 0000000..f09baae --- /dev/null +++ b/week5/templates/mosaic2.html @@ -0,0 +1,56 @@ + + + + + + {% for file in range (0,42) -%} + {%- set filez = '%02d' % file -%} + {%- set filename = lastfiles[file] -%} + + {%- if 'png' in filename or 'jpg' in filename or 'jpeg' in filename or 'gif' in filename -%} + + {%- endif -%} + {%- if 'mp3' in filename or 'm4a' in filename or 'ogg' in filename -%} +
+ +
+ {%- endif -%} + {%- if 'mp4' in filename or 'mkv' in filename or 'ogv' in filename -%} + + {%- endif -%} + + {%- endfor %} + + + diff --git a/week5/templates/zoomreplace2.html b/week5/templates/zoomreplace2.html new file mode 100644 index 0000000..d37a2f1 --- /dev/null +++ b/week5/templates/zoomreplace2.html @@ -0,0 +1,28 @@ + + + + + + {% for file in files %} + {% if 'png' in file or 'jpg' in file or 'jpeg' in file or 'gif' in file%} + + {% endif %} + {% if 'mp3' in file or 'm4a' in file or 'ogg' in file %} + + {% endif %} + {% if 'mp4' in file or 'mkv' in file or 'ogv' in file %} + + {% endif %} + {% endfor %} +
+ + + +
+ +