From 27e21be5a39831413d9bad70d7c974994e77f176 Mon Sep 17 00:00:00 2001 From: Dooho Yi Date: Tue, 23 Nov 2021 12:33:21 +0000 Subject: [PATCH 1/5] sorting by 'number' @ TIMELINE page --- test_data/src/scripts/updateEventList.js | 68 +++++++++++++++++------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/test_data/src/scripts/updateEventList.js b/test_data/src/scripts/updateEventList.js index bd14272..5903e64 100644 --- a/test_data/src/scripts/updateEventList.js +++ b/test_data/src/scripts/updateEventList.js @@ -13,26 +13,56 @@ ed_resquest.onload = function() { event_list = ed_resquest.response; console.log(event_list) - for (let key in event_list){ - console.log(key); + // for (let key in event_list){ + // console.log(key); - // convert date format( `.` -> `/` ) - let event = event_list[key]; - let date = event.date.split('.'); - date.pop(); - let date_str = date.join(' /'); - - let row = document.createElement('div'); - row.classList.add("event_row") - row.innerHTML = `${date_str}    #${key} ${event.title}` - let link = document.createElement('a'); - link.href = `${key}/` - link.appendChild(row) - - document.getElementById("about_wrapper").appendChild(link); - // TODO: add hover effect - // TODO: add - } + // // convert date format( `.` -> `/` ) + // let event = event_list[key]; + // let date = event.date.split('.'); + // date.pop(); + // let date_str = date.join(' /'); + + // let row = document.createElement('div'); + // row.classList.add("event_row") + // row.innerHTML = `${date_str}    #${key} ${event.title}` + // let link = document.createElement('a'); + // link.href = `${key}/` + // link.appendChild(row) + + // document.getElementById("about_wrapper").appendChild(link); + // // TODO: add hover effect + // // TODO: add + // } + + Object.entries(event_list) + + .sort(function(a, b) { + return a[1].number > b[1].number + }) + + .forEach(function(item) { + console.log(item); + + // + let key = item[0]; + let event = item[1]; + + // convert date format( `.` -> `/` ) + let date = event.date.split('.'); + date.pop(); + let date_str = date.join(' /'); + + let row = document.createElement('div'); + row.classList.add("event_row") + row.innerHTML = `${date_str}    #${key} ${event.title}` + let link = document.createElement('a'); + link.href = `${key}/` + link.appendChild(row) + + document.getElementById("about_wrapper").appendChild(link); + // TODO: add hover effect + // TODO: add + }) } From f296f5e9252d47cafdf792b8d1793a0cee77ba8a Mon Sep 17 00:00:00 2001 From: Dooho Yi Date: Tue, 23 Nov 2021 13:34:59 +0000 Subject: [PATCH 2/5] sorting order upd. --- test_data/src/scripts/updateEventList.js | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/test_data/src/scripts/updateEventList.js b/test_data/src/scripts/updateEventList.js index 5903e64..453054e 100644 --- a/test_data/src/scripts/updateEventList.js +++ b/test_data/src/scripts/updateEventList.js @@ -13,31 +13,11 @@ ed_resquest.onload = function() { event_list = ed_resquest.response; console.log(event_list) - // for (let key in event_list){ - // console.log(key); - - // // convert date format( `.` -> `/` ) - // let event = event_list[key]; - // let date = event.date.split('.'); - // date.pop(); - // let date_str = date.join(' /'); - - // let row = document.createElement('div'); - // row.classList.add("event_row") - // row.innerHTML = `${date_str}    #${key} ${event.title}` - // let link = document.createElement('a'); - // link.href = `${key}/` - // link.appendChild(row) - - // document.getElementById("about_wrapper").appendChild(link); - // // TODO: add hover effect - // // TODO: add - // } Object.entries(event_list) .sort(function(a, b) { - return a[1].number > b[1].number + return a[1].number < b[1].number }) .forEach(function(item) { From a87cc2d48923a86345f61546e120532e82f63025 Mon Sep 17 00:00:00 2001 From: Dooho Yi Date: Tue, 23 Nov 2021 13:46:08 +0000 Subject: [PATCH 3/5] added traceback --- distribusi/distribusi/distribusi.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distribusi/distribusi/distribusi.py b/distribusi/distribusi/distribusi.py index 1634180..7cf85b8 100644 --- a/distribusi/distribusi/distribusi.py +++ b/distribusi/distribusi/distribusi.py @@ -17,6 +17,8 @@ from distribusi import fragments import uuid from distribusi.ignore import Ignore +import traceback + MIME_TYPE = magic.Magic(mime=True) ignore = Ignore() @@ -79,6 +81,7 @@ def thumbnail(image, name, args): "
{}
" ).format(name, data_url, cap) except Exception as e: + traceback.print_exc() print('Thumbnailer:', e) return "
{}
".format(name, name, name) From 22adda7adc0e378da04dc527fa0a28424a7490d5 Mon Sep 17 00:00:00 2001 From: Dooho Yi Date: Tue, 23 Nov 2021 14:37:45 +0000 Subject: [PATCH 4/5] added thumbconf.json support -> customize thumb size --- distribusi/distribusi/distribusi.py | 15 ++++++++++++--- test_data/.ignore | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/distribusi/distribusi/distribusi.py b/distribusi/distribusi/distribusi.py index 7cf85b8..f6eb696 100644 --- a/distribusi/distribusi/distribusi.py +++ b/distribusi/distribusi/distribusi.py @@ -18,6 +18,7 @@ import uuid from distribusi.ignore import Ignore import traceback +import json MIME_TYPE = magic.Magic(mime=True) @@ -41,9 +42,10 @@ def caption(image): return caption -def thumbnail(image, name, args): +def thumbnail(image, name, args, size=(450,450)): + try: - size = (450, 450) + # size = (450, 450) im = Image.open(image) exif = None try: @@ -201,7 +203,14 @@ def render_dir(args, directory): if type_ == 'image': a = FILE_TYPES[type_].format(relative_path, c, c) if args.thumbnail: - a = thumbnail(full_path, relative_path, args) + thumbconf_path = "./{}/{}".format(root, "thumbconf.json") + size = (450, 450) + if os.path.isfile(thumbconf_path): + with open(thumbconf_path) as json_file: + json_data = json.load(json_file) + size = tuple(json_data['size']) + print("applying thumbconf.json: size: ", size) + a = thumbnail(full_path, relative_path, args, size) if args.no_filenames: c = "" if args.captions: diff --git a/test_data/.ignore b/test_data/.ignore index 97a206e..f6e4eda 100644 --- a/test_data/.ignore +++ b/test_data/.ignore @@ -12,4 +12,5 @@ style.css 404.html main.js .+.alt -events \ No newline at end of file +events +thumbconf.json \ No newline at end of file From e7879641e17749eab5fe1692eca7e7a9c30a0a38 Mon Sep 17 00:00:00 2001 From: Dooho Yi Date: Tue, 23 Nov 2021 14:56:27 +0000 Subject: [PATCH 5/5] added style.css/main.js support to 'events' pages --- distribusi/distribusi/page_template_event.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/distribusi/distribusi/page_template_event.py b/distribusi/distribusi/page_template_event.py index 646c0c1..9eb4ce8 100644 --- a/distribusi/distribusi/page_template_event.py +++ b/distribusi/distribusi/page_template_event.py @@ -18,8 +18,10 @@ html_head_event = """ %s + +