fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-25 07:36:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #258 from LemmyNet/change_password

Browse source 
Moved ChangePassword to its own action.
This commit is contained in:
Dessalines 2021-04-08 22:12:35 -04:00 committed by GitHub
parent 873c748dd1 e6bbed89ec
commit 2cde42a48a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 452 additions and 409 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.drone.yml
View file

@ -36,7 +36,7 @@ steps:
dockerfile: Dockerfile dockerfile: Dockerfile
repo: dessalines/lemmy-ui repo: dessalines/lemmy-ui
tags: tags:
- dev-linux-arm64 - dev-linux-amd64
username: username:
from_secret: docker_username from_secret: docker_username
password: password:

2
lemmy-translations

@ -1 +1 @@
Subproject commit 764d35d913453d1fd8eeec6007f0d94f59c8b0ee Subproject commit f05562455f5260d266d72b6130abb6f633e88a02

2
package.json
View file

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

4
src/shared/components/navbar.tsx
View file

@ -346,8 +346,8 @@ export class Navbar extends Component<NavbarProps, NavbarState> {
{localUserView.person.avatar && showAvatars() && ( {localUserView.person.avatar && showAvatars() && (
<PictrsImage src={localUserView.person.avatar} icon /> <PictrsImage src={localUserView.person.avatar} icon />
)} )}
{localUserView.person.preferred_username {localUserView.person.display_name
? localUserView.person.preferred_username ? localUserView.person.display_name
: localUserView.person.name} : localUserView.person.name}
</span> </span>
</Link> </Link>

6
src/shared/components/person-listing.tsx
View file

@ -34,11 +34,11 @@ export class PersonListing extends Component<PersonListingProps, any> {
let displayName = this.props.useApubName let displayName = this.props.useApubName
? apubName ? apubName
: person.preferred_username : person.display_name
? person.preferred_username ? person.display_name
: apubName; : apubName;
if (this.props.showApubName && !local && person.preferred_username) { if (this.props.showApubName && !local && person.display_name) {
displayName = `${displayName} (${apubName})`; displayName = `${displayName} (${apubName})`;
} }

829
src/shared/components/person.tsx
View file

File diff suppressed because it is too large Load diff

8
src/shared/components/sidebar.tsx
View file

@ -299,7 +299,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
<Icon icon="edit" classes="icon-inline" /> <Icon icon="edit" classes="icon-inline" />
</span> </span>
</li> </li>
{!this.amCreator && {!this.amTopMod &&
(!this.state.showConfirmLeaveModTeam ? ( (!this.state.showConfirmLeaveModTeam ? (
<li className="list-inline-item-action"> <li className="list-inline-item-action">
<span <span
@ -341,7 +341,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
</li> </li>
</> </>
))} ))}
{this.amCreator && ( {this.amTopMod && (
<li className="list-inline-item-action"> <li className="list-inline-item-action">
<span <span
class="pointer" class="pointer"
@ -488,9 +488,9 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
WebSocketService.Instance.send(wsClient.followCommunity(form)); WebSocketService.Instance.send(wsClient.followCommunity(form));
} }
private get amCreator(): boolean { private get amTopMod(): boolean {
return ( return (
this.props.community_view.creator.id == this.props.moderators[0].moderator.id ==
UserService.Instance.localUserView.person.id UserService.Instance.localUserView.person.id
); );
} }

8
yarn.lock
View file

@ -5125,10 +5125,10 @@ lcid@^1.0.0:
dependencies: dependencies:
invert-kv "^1.0.0" invert-kv "^1.0.0"
lemmy-js-client@0.10.3: lemmy-js-client@0.11.0-rc.4:
version "0.10.3" version "0.11.0-rc.4"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.3.tgz#815fe3f49b696c010858331aafc3850318b9e15d" resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.11.0-rc.4.tgz#bd5652538309efac686aa10329b3a04fac6f85c2"
integrity sha512-ay5RQZSfoErLYh+b3aHpjA34dH/8rlNUcZF3L5nN+1cp4UWC4qWl97XjUM52QFyRzHslFPeP8D99fpgVe4USIQ== integrity sha512-7pCEEWkmaOoxxJ9+QSTVQFwThdjIWFp/mSs4c82TYs6tKAJsmfqzBkvSK9QVpSA2OOeYVWoThklKcrlmNV2d6A==
levn@^0.4.1: levn@^0.4.1:
version "0.4.1" version "0.4.1"