nostr/iris-messenger
1
0
Fork 0
mirror of https://github.com/irislib/iris-messenger.git synced 2024-10-18 14:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

profile tab link fix

Browse Source
This commit is contained in:
Martti Malmi 2023-06-28 11:18:10 +03:00
parent 304f8e2b8f
commit b222f3786f
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/components/Header.tsx
View File

@ -73,6 +73,7 @@ export default class Header extends Component {
localState.get('unseenMsgsTotal').on(this.inject());
localState.get('unseenNotificationCount').on(this.inject());
localState.get('showConnectedRelays').on(this.inject());
localState.get('activePubKey').on(this.inject());
localState.get('activeRoute').on(
this.sub((activeRoute) => {
this.setState({

4
src/js/components/events/Note.tsx
View File

@ -324,8 +324,8 @@ const Note = ({
{(replyingToUsers?.length && !isQuoting && renderReplyingTo()) || null}
{standalone && renderHelmet()}
{meta.torrentId && <Torrent torrentId={meta.torrentId} autopause={!standalone} />}
{text?.length > 0 && (
<div className={`whitespace-pre-wrap break-all py-2 ${emojiOnly && 'text-2xl'}`}>
{text?.length > 0 && ( // TODO: remove whitespace-pre-wrap, replace \n with <br />
<div className={`whitespace-pre-wrap break-words py-2 ${emojiOnly && 'text-2xl'}`}>
{text}
{translatedText && (
<p>

1
src/js/components/modal/Modal.tsx
View File

@ -25,7 +25,6 @@ const Overlay = styled.div`
align-items: center;
overflow-y: auto;
overflow-x: hidden;
padding: 20px 0;
`;
const ModalContentContainer = styled.div<{ width?: string; height?: string }>`

25
src/js/views/Profile.tsx
View File

@ -249,24 +249,25 @@ class Profile extends View {
}
renderTabs() {
const currentProfileUrl = window.location.pathname.split('/')[1];
const path = window.location.pathname;
const linkClass = (href) =>
path === href ? 'btn btn-sm btn-primary' : 'btn btn-sm btn-neutral';
return html`
<div className="flex mx-2 md:mx-0 gap-2 mb-4 overflow-x-scroll">
<${Link}
className="btn btn-sm btn-neutral"
activeClassName="btn-primary"
href="/${this.state.nostrAddress || this.state.npub}"
<div class="flex mx-2 md:mx-0 gap-2 mb-4 overflow-x-scroll">
<${Link} className="${linkClass('/' + currentProfileUrl)}" href="/${currentProfileUrl}"
>${t('posts')} ${this.state.noPosts ? '(0)' : ''}<//
>
<${Link}
className="btn btn-sm btn-neutral"
activeClassName="btn-primary"
href="/${this.state.nostrAddress || this.state.npub}/replies"
className="${linkClass('/' + currentProfileUrl + '/replies')}"
href="/${currentProfileUrl}/replies"
>${t('posts')} & ${t('replies')} ${this.state.noReplies ? '(0)' : ''}<//
>
<${Link}
className="btn btn-sm btn-neutral"
activeClassName="btn-primary"
href="/${this.state.nostrAddress || this.state.npub}/likes"
className="${linkClass('/' + currentProfileUrl + '/likes')}"
href="/${currentProfileUrl}/likes"
>${t('likes')} ${this.state.noLikes ? '(0)' : ''}<//
>
</div>
@ -464,6 +465,7 @@ class Profile extends View {
loadProfile(hexPub: string, nostrAddress?: string) {
const isMyProfile = hexPub === Key.getPubKey();
localState.get('activePubKey').put(hexPub);
this.setState({ isMyProfile });
this.followedUsers = new Set();
this.followers = new Set();
@ -479,6 +481,7 @@ class Profile extends View {
componentWillUnmount() {
super.componentWillUnmount();
this.unsub?.();
localState.get('activePubKey').put(null);
}
componentDidUpdate(_prevProps, prevState) {