-
Notifications
You must be signed in to change notification settings - Fork 338
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Updating translations. * Adding registration applications. * Updating translations. * Adding verify email route. * Fix missing signup question bug. * Updating translations. * A few fixes from comments on lemmy PR. * v0.15.0-rc.4 * Some suggestions from PR. * v0.15.0-rc.5 * Adding optional auth to modlog fetches. * v0.15.0-rc.6 * Hide deny / approve buttons
- Loading branch information
1 parent
4c6713d
commit b96e16b
Showing
23 changed files
with
849 additions
and
65 deletions.
There are no files selected for viewing
Submodule lemmy-translations
updated
2 files
| +28 −0 | translations/en.json | |
| +280 −0 | translations/lt.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "lemmy-ui", | ||
| "description": "An isomorphic UI for lemmy", | ||
| "version": "0.14.5", | ||
| "version": "0.15.0-rc.6", | ||
| "author": "Dessalines <[email protected]>", | ||
| "license": "AGPL-3.0", | ||
| "scripts": { | ||
|
|
@@ -72,7 +72,7 @@ | |
| "husky": "^7.0.4", | ||
| "import-sort-style-module": "^6.0.0", | ||
| "iso-639-1": "^2.1.10", | ||
| "lemmy-js-client": "0.14.0-rc.1", | ||
| "lemmy-js-client": "0.15.0-rc.6", | ||
| "lint-staged": "^12.1.2", | ||
| "mini-css-extract-plugin": "^2.4.5", | ||
| "node-fetch": "^2.6.1", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
150 changes: 150 additions & 0 deletions
150
src/shared/components/common/registration-application.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| import { Component, linkEvent } from "inferno"; | ||
| import { T } from "inferno-i18next-dess"; | ||
| import { | ||
| ApproveRegistrationApplication, | ||
| RegistrationApplicationView, | ||
| } from "lemmy-js-client"; | ||
| import { i18n } from "../../i18next"; | ||
| import { WebSocketService } from "../../services"; | ||
| import { authField, mdToHtml, wsClient } from "../../utils"; | ||
| import { PersonListing } from "../person/person-listing"; | ||
| import { MarkdownTextArea } from "./markdown-textarea"; | ||
| import { MomentTime } from "./moment-time"; | ||
|
|
||
| interface RegistrationApplicationProps { | ||
| application: RegistrationApplicationView; | ||
| } | ||
|
|
||
| interface RegistrationApplicationState { | ||
| denyReason?: string; | ||
| denyExpanded: boolean; | ||
| } | ||
|
|
||
| export class RegistrationApplication extends Component< | ||
| RegistrationApplicationProps, | ||
| RegistrationApplicationState | ||
| > { | ||
| private emptyState: RegistrationApplicationState = { | ||
| denyReason: this.props.application.registration_application.deny_reason, | ||
| denyExpanded: false, | ||
| }; | ||
|
|
||
| constructor(props: any, context: any) { | ||
| super(props, context); | ||
|
|
||
| this.state = this.emptyState; | ||
| this.handleDenyReasonChange = this.handleDenyReasonChange.bind(this); | ||
| } | ||
|
|
||
| render() { | ||
| let a = this.props.application; | ||
| let ra = this.props.application.registration_application; | ||
| let accepted = a.creator_local_user.accepted_application; | ||
|
|
||
| return ( | ||
| <div> | ||
| <div> | ||
| {i18n.t("applicant")}: <PersonListing person={a.creator} /> | ||
| </div> | ||
| <div> | ||
| {i18n.t("created")}: <MomentTime showAgo data={ra} /> | ||
| </div> | ||
| <div>{i18n.t("answer")}:</div> | ||
| <div className="md-div" dangerouslySetInnerHTML={mdToHtml(ra.answer)} /> | ||
|
|
||
| {a.admin && ( | ||
| <div> | ||
| {accepted ? ( | ||
| <T i18nKey="approved_by"> | ||
| # | ||
| <PersonListing person={a.admin} /> | ||
| </T> | ||
| ) : ( | ||
| <div> | ||
| <T i18nKey="denied_by"> | ||
| # | ||
| <PersonListing person={a.admin} /> | ||
| </T> | ||
| <div> | ||
| {i18n.t("deny_reason")}:{" "} | ||
| <div | ||
| className="md-div d-inline-flex" | ||
| dangerouslySetInnerHTML={mdToHtml(ra.deny_reason || "")} | ||
| /> | ||
| </div> | ||
| </div> | ||
| )} | ||
| </div> | ||
| )} | ||
|
|
||
| {this.state.denyExpanded && ( | ||
| <div class="form-group row"> | ||
| <label class="col-sm-2 col-form-label"> | ||
| {i18n.t("deny_reason")} | ||
| </label> | ||
| <div class="col-sm-10"> | ||
| <MarkdownTextArea | ||
| initialContent={this.state.denyReason} | ||
| onContentChange={this.handleDenyReasonChange} | ||
| hideNavigationWarnings | ||
| /> | ||
| </div> | ||
| </div> | ||
| )} | ||
| {(!ra.admin_id || (ra.admin_id && !accepted)) && ( | ||
| <button | ||
| className="btn btn-secondary mr-2 my-2" | ||
| onClick={linkEvent(this, this.handleApprove)} | ||
| aria-label={i18n.t("approve")} | ||
| > | ||
| {i18n.t("approve")} | ||
| </button> | ||
| )} | ||
| {(!ra.admin_id || (ra.admin_id && accepted)) && ( | ||
| <button | ||
| className="btn btn-secondary mr-2" | ||
| onClick={linkEvent(this, this.handleDeny)} | ||
| aria-label={i18n.t("deny")} | ||
| > | ||
| {i18n.t("deny")} | ||
| </button> | ||
| )} | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| handleApprove(i: RegistrationApplication) { | ||
| i.setState({ denyExpanded: false }); | ||
| let form: ApproveRegistrationApplication = { | ||
| id: i.props.application.registration_application.id, | ||
| deny_reason: "", | ||
| approve: true, | ||
| auth: authField(), | ||
| }; | ||
| WebSocketService.Instance.send( | ||
| wsClient.approveRegistrationApplication(form) | ||
| ); | ||
| } | ||
|
|
||
| handleDeny(i: RegistrationApplication) { | ||
| if (i.state.denyExpanded) { | ||
| i.setState({ denyExpanded: false }); | ||
| let form: ApproveRegistrationApplication = { | ||
| id: i.props.application.registration_application.id, | ||
| approve: false, | ||
| deny_reason: i.state.denyReason, | ||
| auth: authField(), | ||
| }; | ||
| WebSocketService.Instance.send( | ||
| wsClient.approveRegistrationApplication(form) | ||
| ); | ||
| } else { | ||
| i.setState({ denyExpanded: true }); | ||
| } | ||
| } | ||
|
|
||
| handleDenyReasonChange(val: string) { | ||
| this.state.denyReason = val; | ||
| this.setState(this.state); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.