From 2679519d23f153b44ba1fac555b64f40d386d830 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Feb 2022 17:25:20 -0600 Subject: [PATCH] Display account location on profile --- .../__fixtures__/truthsocial-account.json | 26 ++++++++++++++++++ .../ui/components/profile_info_panel.js | Bin 10034 -> 10286 bytes .../normalizers/__tests__/account-test.js | Bin 2134 -> 2608 bytes app/soapbox/normalizers/account.js | Bin 1459 -> 1737 bytes app/styles/components/profile-info-panel.scss | 1 + 5 files changed, 27 insertions(+) create mode 100644 app/soapbox/__fixtures__/truthsocial-account.json diff --git a/app/soapbox/__fixtures__/truthsocial-account.json b/app/soapbox/__fixtures__/truthsocial-account.json new file mode 100644 index 0000000000..6b451ca8bd --- /dev/null +++ b/app/soapbox/__fixtures__/truthsocial-account.json @@ -0,0 +1,26 @@ +{ + "id": "107759994408336377", + "username": "alex", + "acct": "alex", + "display_name": "Alex G.", + "locked": false, + "bot": false, + "discoverable": null, + "group": false, + "created_at": "2022-02-08T00:00:00.000Z", + "note": "

Launching Truth Social

", + "url": "https://truthsocial.com/@alex", + "avatar": "https://static-assets.truthsocial.com/tmtg:prime-truth-social-assets/accounts/avatars/107/759/994/408/336/377/original/119cb0dd1fa615b7.png", + "avatar_static": "https://static-assets.truthsocial.com/tmtg:prime-truth-social-assets/accounts/avatars/107/759/994/408/336/377/original/119cb0dd1fa615b7.png", + "header": "https://static-assets.truthsocial.com/tmtg:prime-truth-social-assets/accounts/headers/107/759/994/408/336/377/original/31f62b0453ccf554.png", + "header_static": "https://static-assets.truthsocial.com/tmtg:prime-truth-social-assets/accounts/headers/107/759/994/408/336/377/original/31f62b0453ccf554.png", + "followers_count": 966, + "following_count": 39, + "statuses_count": 4, + "last_status_at": "2022-02-20", + "verified": true, + "location": "Texas", + "website": "https://soapbox.pub", + "emojis": [], + "fields": [] +} diff --git a/app/soapbox/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js index 72e033e1e75f6dda697aebf59484d7ee03f68eff..1bddee296cde2086ed782bcf1485083ee92f975e 100644 GIT binary patch delta 83 zcmdnww=Q5qh}7iUBD`EV`N@eTnfZC@nv*-l?0Df^J1zx<$&!*L?74{rx&@helNF^U ZC*Km`u$j9FPD2 delta 12 TcmZ1%u*q*jh}7l)>3ci?B$fpw diff --git a/app/soapbox/normalizers/__tests__/account-test.js b/app/soapbox/normalizers/__tests__/account-test.js index f00dd57c5b1270c77bc324b893886f14549c664b..5199e3492a3871b982b217edeb3ce29358f1c77b 100644 GIT binary patch delta 151 zcmca6ut8))5Xa=%tU?oeIXQCjlM_oa^YbP*Fu6>8&RhR-aGnUE6nRw0IQd2UMGK*65LyAgEG8BUIlQR=@6ms&D6H7Al^SF}p^NLFp z^74yv6LT`FQhlJ}6CY>_!_=tjz?Dz-W|8E9iR*AFC`=AxRuhK_sK;u8#1s@__0lr) jQYK$yxji|Dm0Jd8s77LPa(-!EiKaDBRV|RLwdMi<7Xmv> delta 19 bcmX@fyP12#GnUDBSdX#SYFcyET5|yaQt}5K diff --git a/app/styles/components/profile-info-panel.scss b/app/styles/components/profile-info-panel.scss index 65e70c4bd4..3089622fce 100644 --- a/app/styles/components/profile-info-panel.scss +++ b/app/styles/components/profile-info-panel.scss @@ -24,6 +24,7 @@ &__join-date, &__birthday, + &__location, &__note { display: flex; font-size: 14px;