Bring back remote fetch modal

src/client/index.tsx

@@ -6,6 +6,7 @@ import { UserService } from "../shared/services";
 
 import "bootstrap/js/dist/collapse";
 import "bootstrap/js/dist/dropdown";
+import "bootstrap/js/dist/modal";
 
 async function startClient() {
   initializeSite(window.isoData.site_res);

src/shared/components/common/subscribe-button.tsx

@@ -1,22 +1,24 @@
+import classNames from "classnames";
 import { NoOptionI18nKeys } from "i18next";
-import { MouseEventHandler } from "inferno";
+import { Component, MouseEventHandler } from "inferno";
-import { SubscribedType } from "lemmy-js-client";
+import { CommunityView } from "lemmy-js-client";
 import { I18NextService, UserService } from "../../services";
 import { Icon, Spinner } from "./icon";
 
 interface SubscribeButtonProps {
-  subscribed: SubscribedType;
+  communityView: CommunityView;
   onFollow: MouseEventHandler;
   onUnFollow: MouseEventHandler;
   loading: boolean;
 }
 
 export function SubscribeButton({
-  subscribed,
+  communityView,
   onFollow,
   onUnFollow,
   loading,
 }: SubscribeButtonProps) {
+  const { subscribed } = communityView;
   let i18key: NoOptionI18nKeys;
 
   switch (subscribed) {
@@ -37,20 +39,31 @@ export function SubscribeButton({
     }
   }
 
+  const buttonClass = "btn d-block mb-2 w-100";
+
   if (!UserService.Instance.myUserInfo) {
     return (
-      <button type="button" className="btn btn-secondary d-block mb-2 w-100">
+      <>
-        {I18NextService.i18n.t("subscribe")}
+        <button
-      </button>
+          type="button"
+          className={classNames(buttonClass, "btn-secondary")}
+          data-bs-toggle="modal"
+          data-bs-target="#remoteFetchModal"
+        >
+          {I18NextService.i18n.t("subscribe")}
+        </button>
+        <RemoteFetchModal />
+      </>
     );
   }
 
   return (
     <button
       type="button"
-      className={`btn btn-${
+      className={classNames(
-        subscribed === "Pending" ? "warning" : "secondary"
+        buttonClass,
-      } d-block mb-2 w-100`}
+        `btn-${subscribed === "Pending" ? "warning" : "secondary"}`
+      )}
       onClick={subscribed === "NotSubscribed" ? onFollow : onUnFollow}
     >
       {loading ? (
@@ -66,3 +79,67 @@ export function SubscribeButton({
     </button>
   );
 }
+
+class RemoteFetchModal extends Component {
+  constructor(props, context) {
+    super(props, context);
+  }
+
+  render() {
+    return (
+      <div
+        className="modal fade"
+        id="remoteFetchModal"
+        tabIndex={-1}
+        aria-hidden
+        aria-labelledby="#remoteFetchModalTitle"
+      >
+        <div className="modal-dialog modal-fullscreen-sm-down">
+          <div className="modal-content">
+            <header className="modal-header">
+              <h3 className="modal-title" id="remoteFetchModalTitle">
+                Subscribe from Remote Instance
+              </h3>
+              <button
+                type="button"
+                className="btn-close"
+                data-bs-dismiss="modal"
+                aria-label="Close"
+              />
+            </header>
+            <form
+              id="remote-fetch-form"
+              className="modal-body d-flex flex-column justify-content-center"
+            >
+              <label className="form-label" htmlFor="remoteFetchInstance">
+                Enter the instance you would like to follow this community from:
+              </label>
+              <input
+                type="text"
+                id="remoteFetchInstance"
+                className="form-control"
+                name="instance"
+              />
+            </form>
+            <footer className="modal-footer">
+              <button
+                type="button"
+                className="btn btn-secondary"
+                data-bs-dismiss="modal"
+              >
+                Close
+              </button>
+              <button
+                type="submit"
+                className="btn btn-primary"
+                form="remote-fetch-form"
+              >
+                Save changes
+              </button>
+            </footer>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}

src/shared/components/community/sidebar.tsx

@@ -126,7 +126,6 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
     const myUSerInfo = UserService.Instance.myUserInfo;
     const {
       community: { name, actor_id },
-      subscribed,
     } = this.props.community_view;
     return (
       <aside className="mb-3">
@@ -136,7 +135,7 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
               {this.communityTitle()}
               {this.props.editable && this.adminButtons()}
               <SubscribeButton
-                subscribed={subscribed}
+                communityView={this.props.community_view}
                 onFollow={linkEvent(this, this.handleFollowCommunity)}
                 onUnFollow={linkEvent(this, this.handleUnfollowCommunity)}
                 loading={this.state.followCommunityLoading}

src/shared/components/remote-fetch.tsx

@@ -193,7 +193,7 @@ export class RemoteFetch extends Component<any, RemoteFetchState> {
                   </div>
                 )}
                 <SubscribeButton
-                  subscribed={_test_com_view.subscribed}
+                  communityView={_test_com_view}
                   onFollow={linkEvent(this, handleFollow)}
                   onUnFollow={linkEvent(this, handleUnfollow)}
                   loading={this.state.followCommunityLoading}