LemmyNet
/
lemmy-ui
mirror of https://github.com/LemmyNet/lemmy-ui.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #249 from LemmyNet/fix_instances_page 

Fix instances page. Fixes #237
This commit is contained in:
Dessalines 2021-04-07 12:52:43 -04:00 committed by GitHub
parent b7f7038804 e74db79c0f
commit 2e95c97add
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -68,7 +68,7 @@
"eslint-plugin-prettier": "^3.3.1", "eslint-plugin-prettier": "^3.3.1",
"husky": "^5.1.0", "husky": "^5.1.0",
"iso-639-1": "^2.1.9", "iso-639-1": "^2.1.9",
"lemmy-js-client": "0.10.0-rc.13", "lemmy-js-client": "0.10.3",
"lint-staged": "^10.5.4", "lint-staged": "^10.5.4",
"mini-css-extract-plugin": "^1.3.8", "mini-css-extract-plugin": "^1.3.8",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",

4
src/shared/components/instances.tsx
View File

@ -37,13 +37,13 @@ export class Instances extends Component<any, InstancesState> {
<h5>{i18n.t("linked_instances")}</h5> <h5>{i18n.t("linked_instances")}</h5>
{this.itemList(federated_instances.linked)} {this.itemList(federated_instances.linked)}
</div> </div>
{federated_instances.allowed.length > 0 && ( {federated_instances.allowed?.length > 0 && (
<div class="col-md-6"> <div class="col-md-6">
<h5>{i18n.t("allowed_instances")}</h5> <h5>{i18n.t("allowed_instances")}</h5>
{this.itemList(federated_instances.allowed)} {this.itemList(federated_instances.allowed)}
</div> </div>
)} )}
{federated_instances.blocked.length > 0 && ( {federated_instances.blocked?.length > 0 && (
<div class="col-md-6"> <div class="col-md-6">
<h5>{i18n.t("blocked_instances")}</h5> <h5>{i18n.t("blocked_instances")}</h5>
{this.itemList(federated_instances.blocked)} {this.itemList(federated_instances.blocked)}

8
yarn.lock
View File

@ -5027,10 +5027,10 @@ lcid@^1.0.0:
dependencies: dependencies:
invert-kv "^1.0.0" invert-kv "^1.0.0"
lemmy-js-client@0.10.0-rc.13: lemmy-js-client@0.10.3:
version "0.10.0-rc.13" version "0.10.3"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.0-rc.13.tgz#ea2e88857243374d7fbd49ee6b4bb94c34359d85" resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.3.tgz#815fe3f49b696c010858331aafc3850318b9e15d"
integrity sha512-zodvYkwBYR7iP27ah6L/QPUphUUdq38kCH7QF2CUYBrsSAEkGmq2kdz+iusnQ1Ht7Ad80GtYycFprsZBveV5eQ== integrity sha512-ay5RQZSfoErLYh+b3aHpjA34dH/8rlNUcZF3L5nN+1cp4UWC4qWl97XjUM52QFyRzHslFPeP8D99fpgVe4USIQ==
levn@^0.4.1: levn@^0.4.1:
version "0.4.1" version "0.4.1"