From 5db3b836487ed4f89e80501095639ac79f6bedc6 Mon Sep 17 00:00:00 2001 From: Aaron Gutierrez Date: Fri, 18 Dec 2020 22:13:35 -0800 Subject: [PATCH] Redesign bench pages --- bench/1.html | 20 ++----------------- bench/2.html | 22 +++------------------ bench/3.html | 22 +++------------------ bench/4.html | 22 +++------------------ bench/5.html | 22 +++------------------ bench/6.html | 15 ++------------ bench_view_template.html | 4 ++-- index.html | 26 +++++++++++++------------ pub.py | 42 +++++++++++++++++++++++++++++++--------- site.css | 15 ++++++-------- 10 files changed, 71 insertions(+), 139 deletions(-) diff --git a/bench/1.html b/bench/1.html index 04af4e0..34f0630 100644 --- a/bench/1.html +++ b/bench/1.html @@ -19,28 +19,12 @@ CC BY-NC Aaron Gutierrez.

- - - - - - - - - - - - - - - - - +
Prev Home - Next + Next
diff --git a/bench/2.html b/bench/2.html index 77803c4..204d448 100644 --- a/bench/2.html +++ b/bench/2.html @@ -19,28 +19,12 @@ CC BY-NC Aaron Gutierrez.

- - - - - - - - - - - - - - - - - +
- Prev + Prev Home - Next + Next
diff --git a/bench/3.html b/bench/3.html index f5ae4ce..8b22adb 100644 --- a/bench/3.html +++ b/bench/3.html @@ -19,28 +19,12 @@ CC BY-NC Aaron Gutierrez.

- - - - - - - - - - - - - - - - - +
- Prev + Prev Home - Next + Next
diff --git a/bench/4.html b/bench/4.html index 54e6fab..94ffbeb 100644 --- a/bench/4.html +++ b/bench/4.html @@ -19,28 +19,12 @@ CC BY-NC Aaron Gutierrez.

- - - - - - - - - - - - - - - - - +
- Prev + Prev Home - Next + Next
diff --git a/bench/5.html b/bench/5.html index ca50c0e..84530df 100644 --- a/bench/5.html +++ b/bench/5.html @@ -19,28 +19,12 @@ CC BY-NC Aaron Gutierrez.

- - - - - - - - - - - - - - - - - +
- Prev + Prev Home - Next + Next
diff --git a/bench/6.html b/bench/6.html index eee5237..0753432 100644 --- a/bench/6.html +++ b/bench/6.html @@ -19,21 +19,10 @@ CC BY-NC Aaron Gutierrez.

- - - - - - - - - - - - +
- Prev + Prev Home Next diff --git a/bench_view_template.html b/bench_view_template.html index 4957ae0..3a1e4ec 100644 --- a/bench_view_template.html +++ b/bench_view_template.html @@ -14,9 +14,9 @@ {0}
- Prev - Home Next + Home + Prev
diff --git a/index.html b/index.html index f6d5580..ef4a4ca 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@ Aaron

- Platform Engineer @ Asana
+ Program Lead @ Asana
Carnegie Mellon University, SCS 2017

@@ -27,25 +27,27 @@

Asana

    -
  • I've helped build Asana's +
  • I've helped build Asana's integrations with + Zoom, Jira, Adobe Creative Cloud, - - Forms, Slack, Gmail, - Outlook, + Outlook, and - Wufoo, and - CSV integrations. + Wufoo
    • -
  • I'm currently the Program Lead for our Platform Apps team as we - look to enable rich experiences for integration with Asana.
    • +
  • I've also built our + CSV importer and Asana + Forms
    • +
  • I'm currently the Program Lead for the Integrations team as we + look to scalably build more high-quality integrations on Asana's + platform
@@ -65,17 +67,17 @@
  • I served as Treasurer and President of the Delta Beta Chapter of ∆T∆, where I built and maintained our - reimbursement tracking web application.
    • + reimbursement tracking web application

    Links

    diff --git a/pub.py b/pub.py index 56b9c60..c054e37 100755 --- a/pub.py +++ b/pub.py @@ -3,6 +3,7 @@ import argparse import os import sys +import subprocess import boto3 @@ -11,9 +12,10 @@ BUCKET='www.aarongutierrez.com' session = boto3.Session(profile_name='push') s3 = session.client('s3') -bench_fmt = """""" + "\n" -bench_view_ftm = """""" +bench_fmt = """""" + +bench_view_ftm = """""" TYPE_MAP = { 'asc': 'text/plain', @@ -71,10 +73,32 @@ def upload_root(): upload_file('site.css') upload_file('pubkey.asc') + +def thumbnail_bench(src): + sizes = [1560, 780, 390] + formats = ["webp", "jpg"] + + filename = src.split(".")[0] + + for size in [1560, 780, 390]: + for image_type in ["webp", "jpg"]: + output = "img/bench/{}.{}.{}".format(filename, size, image_type) + if not os.path.exists(output): + print("Thumbnailing {}...".format(output)) + subprocess.run(["convert", "img/bench/{}".format(src), + "-resize", "{}x".format(size), + "-quality", "40", output], check=True) + else: + print("Thumbnail {} exists".format(output)) + def make_bench(): imgs = os.listdir('img/bench') - img_files = [f for f in filter_filenames(imgs, ['jpg', 'webp'])] - num_imgs = int(len(img_files) / 4) + img_files = [f for f in filter_filenames(imgs, 'png')] + + for img in img_files: + thumbnail_bench(img) + + num_imgs = int(len(img_files)) with open('bench_template.html', 'r') as f: template = f.read() @@ -82,21 +106,21 @@ def make_bench(): for i in range(1, num_imgs+1, 16): page = '' for j in range(i, min(num_imgs+1, i+16)): - page += bench_fmt.format(j) + page += bench_fmt.format(num_imgs + 1 - j) prev_pg = i//16 next_pg = i//16 + 2 - prev_link = '#' if (prev_pg == 0) else '/bench/{}.html'.format(prev_pg) - next_link = '#' if (i+16 > num_imgs) else '/bench/{}.html'.format(next_pg) + prev_link = '#' if (prev_pg == 0) else '/bench/{}'.format(prev_pg) + next_link = '#' if (i+16 > num_imgs) else '/bench/{}'.format(next_pg) with open('bench/{}.html'.format(i//16 + 1), 'w') as out: out.write(template.format(page, prev_link, next_link)) for i in range(1, num_imgs+1): make_bench_view(i, - '#' if (i-1 == 0) else str(i-1) + '.html', - '#' if (i+1 > num_imgs) else str(i+1) + '.html') + '#' if (i-1 == 0) else str(i-1), + '#' if (i+1 > num_imgs) else str(i+1)) def make_bench_view(idx, prev, nxt): diff --git a/site.css b/site.css index eafea57..b987e82 100644 --- a/site.css +++ b/site.css @@ -5,6 +5,7 @@ img#aaron { body { max-width: 780px; + margin: 0 auto; padding: 20px; } @@ -29,18 +30,18 @@ footer { } .img-grid a { - display: inline-block; - height: 160px; + align-items: flex-end; + display: flex; margin-bottom: 10px; - width: 160px; + max-height: calc(100vw - 40px); + overflow: hidden; } .img-grid img { display: block; margin-left: auto; margin-right: auto; - max-width: 160px; - max-height: 160px; + max-width: 100%; } .img-view { @@ -65,10 +66,6 @@ div.nav { header { text-align: left; } - - body { - margin: 0 auto; - } } @media(prefers-color-scheme: dark) {