From 01f0e3f8c1e2302777077df8f5a4f7a161be8156 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Thu, 15 Aug 2024 09:57:18 +0200 Subject: [PATCH] Populate some bio when available --- routes/pkginfo.js | 3 +++ static/sidebar.js | 7 +------ views/layout.pug | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/routes/pkginfo.js b/routes/pkginfo.js index 2eb3fc5..542b909 100644 --- a/routes/pkginfo.js +++ b/routes/pkginfo.js @@ -222,6 +222,9 @@ router.get('/:package', function(req, res, next) { pkgdata._lastupdate = pretty_time_diff(pkgdata._commit.time); pkgdata._releases = filter_releases(pkgdata); pkgdata._contributions = filter_contributions(pkgdata); + pkgdata._universe_type = pkgdata._userbio.type; + pkgdata._universe_name = pkgdata._userbio.name; + pkgdata._universe_bio = pkgdata._userbio.description; pkgdata._checks = pkgdata._binaries.filter(x => x.check).sort((x,y) => `${x.r}${x.os}` < `${y.r}${y.os}` ? 1 : -1); pkgdata._checksummary = summarize_checks(pkgdata); res.render('pkginfo', pkgdata); diff --git a/static/sidebar.js b/static/sidebar.js index 233a15b..be4379c 100644 --- a/static/sidebar.js +++ b/static/sidebar.js @@ -88,12 +88,7 @@ function load_github_user_info(){ if(user.followers){ $("#github-user-followers").toggleClass("d-none").find('.content').text(countstr(user.followers) + " followers"); } - if(user.type == 'User'){ - $("#github-user-avatar").addClass("rounded-circle"); - } else { - $("#github-user-avatar").removeClass("rounded-circle"); - //$("#github-user-avatar").addClass("p-2"); - } + $("#github-user-avatar").toggleClass("rounded-circle", user.type == 'User'); }).catch(function(err){ $("#github-user-bio").text(err); }); diff --git a/views/layout.pug b/views/layout.pug index 2758173..0d49799 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -68,17 +68,17 @@ html div(style='width:280px;') .sidebar-metadata a(href='/') - img#github-user-avatar.rounded.card-img-top.rounded-circle.p-3(src=`https://r-universe.dev/avatars/${universe}.png?size=248` style='min-height: 262px;') + img#github-user-avatar.rounded.card-img-top.p-3(src=`https://r-universe.dev/avatars/${universe}.png?size=248` style='min-height: 262px;' class=`${_universe_type === 'organization' ? '' : 'rounded-circle'}`) .card-body h5.card-title - span#github-user-name + span#github-user-name #{_universe_name} a#github-user-mastodon.float-end.d-none.grow-on-over(target='_blank') span.fa-brands.fa-mastodon.fa-fw.me-1(style="color: #6364FF;") a#github-user-twitter.float-end.d-none.grow-on-over(target='_blank') span.fa-brands.fa-square-x-twitter.fa-fw.me-1 a#github-user-orcid.float-end.d-none.grow-on-over(target='_blank') span.fa-brands.fa-orcid.fa-fw.me-1.text-success - p#github-user-bio.card-text + p#github-user-bio.card-text #{_universe_bio} ul.list-group.list-group-flush.pb-2.sidebar-user-details li#github-user-universe-row.list-group-item.border-light-subtle.text-truncate span.fa.fa-satellite-dish.fa-fw.me-3