Merge branch 'main' into add_contributor_thanks

src/shared/components/instances.tsx

@@ -6,7 +6,7 @@ const title = i18n.t("join_title");
 
 // TODO wait until new lemmy-instances is written to refactor this
 
-export class Join extends Component<any, any> {
+export class Instances extends Component<any, any> {
   constructor(props: any, context: any) {
     super(props, context);
   }

src/shared/components/link-line.tsx

@@ -9,7 +9,7 @@ export class LinkLine extends Component<any, any> {
   render() {
     return (
       <>
-        <Link to="/join">{i18n.t("join")}</Link>
+        <Link to="/instances">{i18n.t("join")}</Link>
         <Link to="/apps">{i18n.t("apps")}</Link>
         <Link to="/support">{i18n.t("support")}</Link>
         <a href="/docs/en/index.html">{i18n.t("docs")}</a>

src/shared/components/main.tsx

@@ -14,7 +14,7 @@ export class Main extends Component<any, any> {
 
   joinServer() {
     return (
-      <Link className="button primary" to="/join">
+      <Link className="button primary" to="/instances">
         {i18n.t("join_a_server")}
       </Link>
     );

src/shared/routes.ts

@@ -1,7 +1,7 @@
 import { IRouteProps } from "inferno-router/dist/Route";
 import { Main } from "./components/main";
 import { Apps } from "./components/apps";
-import { Join } from "./components/join";
+import { Instances } from "./components/instances";
 import { Contact } from "./components/contact";
 import { Support } from "./components/support";
 
@@ -17,9 +17,9 @@ export const routes: IRouteProps[] = [
     component: Apps,
   },
   {
-    path: `/join`,
+    path: `/instances`,
     exact: true,
-    component: Join,
+    component: Instances,
   },
   {
     path: `/contact`,