Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/community points #4

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Feat/community points #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9819338
feat: added community points to break-away community:
Jun 27, 2022
8bb99de
feat: fixed remounting of communities, passed through props
Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/common/components/community-menu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ export class CommunityMenu extends Component<Props> {
}

render() {
const {community, match} = this.props;
const {filter, name} = match.params;
const { community, match, global } = this.props;
const { filter } = match.params;
const name = global.hive_id;

const menuConfig: {
history: History,
Expand Down
2 changes: 1 addition & 1 deletion src/common/components/landing-page/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const LandingPage = (props: any) => {
}, []);

return activeUser || (community && !time) ? (
<Redirect to={`/trending/${global.hive_id}`} />
<Redirect to={`/trending`} />
) : (
<div
className={global.isElectron ? "landing-wrapper pt-5" : "landing-wrapper"}
Expand Down
70 changes: 40 additions & 30 deletions src/common/components/user-nav/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,36 +217,46 @@ export default class UserNav extends Component<Props, State> {
};

return (
<>
<div className="user-nav">
{/* <PointsBadge activeUser={activeUser} /> */}

<WalletBadge activeUser={activeUser} dynamicProps={dynamicProps}/>

<ToolTip content={_t("user-nav.notifications")}>
<span className="notifications" onClick={this.toggleNotifications}>
{unread > 0 && (
<span className="notifications-badge notranslate">
{unread.toString().length < 3 ? unread : '...'}
</span>
)}
{global.notifications ? bellSvg : bellOffSvg}
</span>
</ToolTip>

<DropDown
{...dropDownConfig}
float="right"
header={`@${activeUser.username}`}
/>
</div>
{ui.notifications && <UserNotifications {...this.props} />}
{gallery && <Gallery {...this.props} onHide={this.toggleGallery}/>}
{drafts && <Drafts {...this.props} onHide={this.toggleDrafts}/>}
{bookmarks && <Bookmarks {...this.props} onHide={this.toggleBookmarks}/>}
{schedules && <Schedules {...this.props} onHide={this.toggleSchedules}/>}
{fragments && <Fragments {...this.props} onHide={this.toggleFragments}/>}
</>
<>
<div className="user-nav">
<PointsBadge activeUser={activeUser} />
<WalletBadge
activeUser={activeUser}
dynamicProps={dynamicProps}
/>
<ToolTip content={_t("user-nav.notifications")}>
<span
className="notifications"
onClick={this.toggleNotifications}
>
{unread > 0 && (
<span className="notifications-badge notranslate">
{unread.toString().length < 3 ? unread : "..."}
</span>
)}
{global.notifications ? bellSvg : bellOffSvg}
</span>
</ToolTip>

<DropDown
{...dropDownConfig}
float="right"
header={`@${activeUser.username}`}
/>
</div>
{ui.notifications && <UserNotifications {...this.props} />}
{gallery && <Gallery {...this.props} onHide={this.toggleGallery} />}
{drafts && <Drafts {...this.props} onHide={this.toggleDrafts} />}
{bookmarks && (
<Bookmarks {...this.props} onHide={this.toggleBookmarks} />
)}
{schedules && (
<Schedules {...this.props} onHide={this.toggleSchedules} />
)}
{fragments && (
<Fragments {...this.props} onHide={this.toggleFragments} />
)}
</>
);
}
}
Loading