From ef9bda769a13e0aa0ea75208ccc3b2be6e077269 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Fri, 27 Aug 2021 19:49:22 -0700 Subject: [PATCH] Show following in profile detail component (#1082) * Got following indicator working in squeak profile detail component * Show following indicator in profile detail component and profile list item component * Update frontend build --- .../ProfileListItem/ProfileListItem.js | 4 + .../SqueakProfileDetailItem.js | 37 +++++++++ .../SqueakProfileFollowingIndicator.js | 78 +++++++++++++++++++ .../package.json | 6 ++ .../SqueakProfileFollowingIndicator/styles.js | 49 ++++++++++++ .../webapp/static/build/asset-manifest.json | 22 +++--- .../admin/webapp/static/build/index.html | 2 +- ...ifest.db97ef05bd05dd26814809eacff62865.js} | 16 ++-- .../webapp/static/build/service-worker.js | 2 +- ...a4ba2f0.chunk.css => 2.15110fae.chunk.css} | 2 +- ...chunk.css.map => 2.15110fae.chunk.css.map} | 2 +- .../build/static/js/2.248267c1.chunk.js | 3 - .../build/static/js/2.d8bd441e.chunk.js | 3 + ...SE.txt => 2.d8bd441e.chunk.js.LICENSE.txt} | 0 ...1.chunk.js.map => 2.d8bd441e.chunk.js.map} | 2 +- .../build/static/js/main.317b6c9d.chunk.js | 2 - .../static/js/main.317b6c9d.chunk.js.map | 1 - .../build/static/js/main.5792cef4.chunk.js | 2 + .../static/js/main.5792cef4.chunk.js.map | 1 + 19 files changed, 204 insertions(+), 30 deletions(-) create mode 100644 frontend/src/components/SqueakProfileFollowingIndicator/SqueakProfileFollowingIndicator.js create mode 100644 frontend/src/components/SqueakProfileFollowingIndicator/package.json create mode 100644 frontend/src/components/SqueakProfileFollowingIndicator/styles.js rename squeaknode/admin/webapp/static/build/{precache-manifest.e78d06cb584521fc0bad25ae80bb588a.js => precache-manifest.db97ef05bd05dd26814809eacff62865.js} (75%) rename squeaknode/admin/webapp/static/build/static/css/{2.ea4ba2f0.chunk.css => 2.15110fae.chunk.css} (99%) rename squeaknode/admin/webapp/static/build/static/css/{2.ea4ba2f0.chunk.css.map => 2.15110fae.chunk.css.map} (99%) delete mode 100644 squeaknode/admin/webapp/static/build/static/js/2.248267c1.chunk.js create mode 100644 squeaknode/admin/webapp/static/build/static/js/2.d8bd441e.chunk.js rename squeaknode/admin/webapp/static/build/static/js/{2.248267c1.chunk.js.LICENSE.txt => 2.d8bd441e.chunk.js.LICENSE.txt} (100%) rename squeaknode/admin/webapp/static/build/static/js/{2.248267c1.chunk.js.map => 2.d8bd441e.chunk.js.map} (53%) delete mode 100644 squeaknode/admin/webapp/static/build/static/js/main.317b6c9d.chunk.js delete mode 100644 squeaknode/admin/webapp/static/build/static/js/main.317b6c9d.chunk.js.map create mode 100644 squeaknode/admin/webapp/static/build/static/js/main.5792cef4.chunk.js create mode 100644 squeaknode/admin/webapp/static/build/static/js/main.5792cef4.chunk.js.map diff --git a/frontend/src/components/ProfileListItem/ProfileListItem.js b/frontend/src/components/ProfileListItem/ProfileListItem.js index 761cf669..0033da60 100644 --- a/frontend/src/components/ProfileListItem/ProfileListItem.js +++ b/frontend/src/components/ProfileListItem/ProfileListItem.js @@ -12,6 +12,7 @@ import VpnKeyIcon from '@material-ui/icons/VpnKey'; import useStyles from "../../pages/wallet/styles"; import SqueakUserAvatar from "../../components/SqueakUserAvatar"; +import SqueakProfileFollowingIndicator from "../../components/SqueakProfileFollowingIndicator"; import { @@ -71,6 +72,9 @@ export default function ProfileListItem({ {`Address: ${address}`} + ) } diff --git a/frontend/src/components/SqueakProfileDetailItem/SqueakProfileDetailItem.js b/frontend/src/components/SqueakProfileDetailItem/SqueakProfileDetailItem.js index 36c2f4e6..05979473 100644 --- a/frontend/src/components/SqueakProfileDetailItem/SqueakProfileDetailItem.js +++ b/frontend/src/components/SqueakProfileDetailItem/SqueakProfileDetailItem.js @@ -26,6 +26,8 @@ import Avatar from '@material-ui/core/Avatar'; import MoreVertIcon from '@material-ui/icons/MoreVert'; import VpnKeyIcon from '@material-ui/icons/VpnKey'; +import NotificationsActiveIcon from '@material-ui/icons/NotificationsActive'; +import NotificationsNoneIcon from '@material-ui/icons/NotificationsNone'; // styles import useStyles from "./styles"; @@ -37,6 +39,7 @@ import ExportPrivateKeyDialog from "../../components/ExportPrivateKeyDialog"; import ConfigureProfileDialog from "../../components/ConfigureProfileDialog"; import UpdateProfileImageDialog from "../../components/UpdateProfileImageDialog"; import ClearProfileImageDialog from "../../components/ClearProfileImageDialog"; +import SqueakProfileFollowingIndicator from "../../components/SqueakProfileFollowingIndicator"; import { @@ -248,6 +251,37 @@ export default function SqueakProfileDetailItem({ ) } + function FollowingIndicator() { + return ( + <> + + Following + + + ) + } + + function NotFollowingIndicator() { + return ( + <> + + Not Following + + + ) + } + + function IsFollowingContent() { + return ( + <> + {(squeakProfile.getFollowing()) + ? FollowingIndicator() + : NotFollowingIndicator() + } + + ) + } + return ( <> @@ -293,6 +327,9 @@ export default function SqueakProfileDetailItem({ {squeakProfile.getAddress()} +