forked from nutomic/lemmy
parent
10533ff005
commit
655c5db59a
2 changed files with 14 additions and 18 deletions
31
ui/src/components/user.tsx
vendored
31
ui/src/components/user.tsx
vendored
|
@ -130,14 +130,7 @@ export class User extends Component<any, UserState> {
|
||||||
this.state.username = this.props.match.params.username;
|
this.state.username = this.props.match.params.username;
|
||||||
|
|
||||||
this.subscription = WebSocketService.Instance.subject
|
this.subscription = WebSocketService.Instance.subject
|
||||||
.pipe(
|
.pipe(retryWhen(errors => errors.pipe(delay(3000), take(10))))
|
||||||
retryWhen(errors =>
|
|
||||||
errors.pipe(
|
|
||||||
delay(3000),
|
|
||||||
take(10)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.subscribe(
|
.subscribe(
|
||||||
msg => this.parseMessage(msg),
|
msg => this.parseMessage(msg),
|
||||||
err => console.error(err),
|
err => console.error(err),
|
||||||
|
@ -449,16 +442,18 @@ export class User extends Component<any, UserState> {
|
||||||
htmlFor="file-upload"
|
htmlFor="file-upload"
|
||||||
class="pointer ml-4 text-muted small font-weight-bold"
|
class="pointer ml-4 text-muted small font-weight-bold"
|
||||||
>
|
>
|
||||||
<img
|
{!this.state.userSettingsForm.avatar ? (
|
||||||
height="80"
|
<span class="btn btn-sm btn-secondary">
|
||||||
width="80"
|
<T i18nKey="upload_avatar">#</T>
|
||||||
src={
|
</span>
|
||||||
this.state.userSettingsForm.avatar
|
) : (
|
||||||
? this.state.userSettingsForm.avatar
|
<img
|
||||||
: 'https://via.placeholder.com/300/000?text=Avatar'
|
height="80"
|
||||||
}
|
width="80"
|
||||||
class="rounded-circle"
|
src={this.state.userSettingsForm.avatar}
|
||||||
/>
|
class="rounded-circle"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
id="file-upload"
|
id="file-upload"
|
||||||
|
|
1
ui/src/translations/en.ts
vendored
1
ui/src/translations/en.ts
vendored
|
@ -29,6 +29,7 @@ export const en = {
|
||||||
preview: 'Preview',
|
preview: 'Preview',
|
||||||
upload_image: 'upload image',
|
upload_image: 'upload image',
|
||||||
avatar: 'Avatar',
|
avatar: 'Avatar',
|
||||||
|
upload_avatar: 'Upload Avatar',
|
||||||
show_avatars: 'Show Avatars',
|
show_avatars: 'Show Avatars',
|
||||||
formatting_help: 'formatting help',
|
formatting_help: 'formatting help',
|
||||||
view_source: 'view source',
|
view_source: 'view source',
|
||||||
|
|
Loading…
Reference in a new issue