Merge branch 'main' into fix-tagline-on-home

fix error on admin panel
fix taglines on home
2023-06-29 10:33:10 -04:00 · 2023-06-29 10:29:05 -04:00 · 2023-06-29 10:26:14 -04:00
2 changed files with 5 additions and 3 deletions
--- a/src/shared/components/home/home.tsx
+++ b/src/shared/components/home/home.tsx
@ -279,13 +279,15 @@ export class Home extends Component<any, HomeState> {
        trendingCommunitiesRes,
        commentsRes,
        postsRes,
-        tagline: getRandomFromList(this.state?.siteRes?.taglines ?? [])
-          ?.content,
        isIsomorphic: true,
      };

      HomeCacheService.postsRes = postsRes;
    }
+
+    this.state.tagline = getRandomFromList(
+      this.state?.siteRes?.taglines ?? []
+    )?.content;
  }

  componentWillUnmount() {
--- a/src/shared/components/home/tagline-form.tsx
+++ b/src/shared/components/home/tagline-form.tsx
@ -141,7 +141,7 @@ export class TaglineForm extends Component<TaglineFormProps, TaglineFormState> {

  handleEditTaglineClick(d: { i: TaglineForm; index: number }, event: any) {
    event.preventDefault();
-    if (this.state.editingRow == d.index) {
+    if (d.i.state.editingRow == d.index) {
      d.i.setState({ editingRow: undefined });
    } else {
      d.i.setState({ editingRow: d.index });
Author	SHA1	Message	Date
Alec Armbruster	264106ed4e	Merge branch 'main' into fix-tagline-on-home	2023-06-29 10:33:10 -04:00
Alec Armbruster	158ea6dd34	fix error on admin panel	2023-06-29 10:29:05 -04:00
Alec Armbruster	2a51743967	fix taglines on home	2023-06-29 10:26:14 -04:00