From 36297366fa4fcd11cef46990f1cfdaee10dded2e Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 26 May 2022 16:48:58 -0400 Subject: [PATCH] Legal info dess (#666) * Add legal information (fixes #652) * add legal_info field to SiteForm, add missing file * Moving legal to SiteForm. Co-authored-by: Felix Ableitner --- lemmy-translations | 2 +- src/shared/components/app/footer.tsx | 7 ++++ src/shared/components/home/admin-settings.tsx | 2 +- src/shared/components/home/legal.tsx | 42 +++++++++++++++++++ src/shared/components/home/site-form.tsx | 20 +++++++++ src/shared/routes.ts | 2 + 6 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 src/shared/components/home/legal.tsx diff --git a/lemmy-translations b/lemmy-translations index 1cbac3a..29c689a 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit 1cbac3a1521e26b9b5c1c97a0c9852655ddcf00b +Subproject commit 29c689af8d16417c1b84d9491f6bcea888720a87 diff --git a/src/shared/components/app/footer.tsx b/src/shared/components/app/footer.tsx index d4edd78..601551b 100644 --- a/src/shared/components/app/footer.tsx +++ b/src/shared/components/app/footer.tsx @@ -32,6 +32,13 @@ export class Footer extends Component { {i18n.t("modlog")} + {this.props.site.site_view?.site.legal_information && ( +
  • + + {i18n.t("legal_information")} + +
    • + )} {this.props.site.federated_instances && (
  • diff --git a/src/shared/components/home/admin-settings.tsx b/src/shared/components/home/admin-settings.tsx index f848f8a..cb78484 100644 --- a/src/shared/components/home/admin-settings.tsx +++ b/src/shared/components/home/admin-settings.tsx @@ -237,7 +237,7 @@ export class AdminSettings extends Component { event.preventDefault(); i.state.siteConfigLoading = true; let form: SaveSiteConfig = { - config_hjson: this.state.siteConfigHjson, + config_hjson: i.state.siteConfigHjson, auth: authField(), }; WebSocketService.Instance.send(wsClient.saveSiteConfig(form)); diff --git a/src/shared/components/home/legal.tsx b/src/shared/components/home/legal.tsx new file mode 100644 index 0000000..b2904c8 --- /dev/null +++ b/src/shared/components/home/legal.tsx @@ -0,0 +1,42 @@ +import { Component } from "inferno"; +import { GetSiteResponse } from "lemmy-js-client"; +import { i18n } from "../../i18next"; +import { mdToHtml, setIsoData } from "../../utils"; +import { HtmlTags } from "../common/html-tags"; + +interface LegalState { + siteRes: GetSiteResponse; +} + +export class Legal extends Component { + private isoData = setIsoData(this.context); + private emptyState: LegalState = { + siteRes: this.isoData.site_res, + }; + + constructor(props: any, context: any) { + super(props, context); + this.state = this.emptyState; + } + + get documentTitle(): string { + return i18n.t("legal_information"); + } + + render() { + return ( +
    + +
    +
    + ); + } +} diff --git a/src/shared/components/home/site-form.tsx b/src/shared/components/home/site-form.tsx index f364059..7016e6f 100644 --- a/src/shared/components/home/site-form.tsx +++ b/src/shared/components/home/site-form.tsx @@ -42,6 +42,7 @@ export class SiteForm extends Component { private_instance: null, default_theme: null, default_post_listing_type: null, + legal_information: null, auth: authField(false), }, loading: false, @@ -53,6 +54,7 @@ export class SiteForm extends Component { this.state = this.emptyState; this.handleSiteSidebarChange = this.handleSiteSidebarChange.bind(this); + this.handleSiteLegalInfoChange = this.handleSiteLegalInfoChange.bind(this); this.handleSiteApplicationQuestionChange = this.handleSiteApplicationQuestionChange.bind(this); @@ -83,6 +85,7 @@ export class SiteForm extends Component { private_instance: site.private_instance, default_theme: site.default_theme, default_post_listing_type: site.default_post_listing_type, + legal_information: site.legal_information, auth: authField(false), }; } @@ -199,6 +202,18 @@ export class SiteForm extends Component { />
    +
    + +
    + +
    +
    {this.state.siteForm.require_application && (