From 9e77148cb1c33677ca6a4ef44bdffce8933a8d52 Mon Sep 17 00:00:00 2001 From: Hermanto Lim Date: Sat, 24 Apr 2021 02:13:21 +0700 Subject: [PATCH 1/2] Change from using Link to NavLink. resolve #269 --- src/shared/components/footer.tsx | 10 +++---- src/shared/components/navbar.tsx | 46 ++++++++++++++++---------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/shared/components/footer.tsx b/src/shared/components/footer.tsx index 16f5fc76..d447cc3c 100644 --- a/src/shared/components/footer.tsx +++ b/src/shared/components/footer.tsx @@ -1,5 +1,5 @@ import { Component } from "inferno"; -import { Link } from "inferno-router"; +import { NavLink } from "inferno-router"; import { i18n } from "../i18next"; import { repoUrl, joinLemmyUrl, docsUrl } from "../utils"; import { GetSiteResponse } from "lemmy-js-client"; @@ -22,15 +22,15 @@ export class Footer extends Component { {this.props.site.version}
  • - + {i18n.t("modlog")} - +
    • {this.props.site.federated_instances && (
  • - + {i18n.t("instances")} - +
    • )}
  • diff --git a/src/shared/components/navbar.tsx b/src/shared/components/navbar.tsx index 35ed041a..ec440150 100644 --- a/src/shared/components/navbar.tsx +++ b/src/shared/components/navbar.tsx @@ -1,5 +1,5 @@ import { Component, linkEvent, createRef, RefObject } from "inferno"; -import { Link } from "inferno-router"; +import { NavLink } from "inferno-router"; import { Subscription } from "rxjs"; import { WebSocketService, UserService } from "../services"; import { @@ -171,8 +171,7 @@ export class Navbar extends Component { this.userSub.unsubscribe(); this.unreadCountSub.unsubscribe(); } - - // TODO class active corresponding to current page + navbar() { let localUserView = UserService.Instance.localUserView || this.props.site_res.my_user; @@ -180,10 +179,11 @@ export class Navbar extends Component {