- {i18n.t("support_donate")}
+ {i18n.t("donate")}
diff --git a/src/shared/components/crypto.tsx b/src/shared/components/crypto.tsx
new file mode 100644
index 0000000..a21bf8d
--- /dev/null
+++ b/src/shared/components/crypto.tsx
@@ -0,0 +1,59 @@
+import { Helmet } from "inferno-helmet";
+import { Badge } from "./common";
+
+const title = "Crypto";
+
+interface Crypto {
+ name: string;
+ address: string;
+}
+
+const CRYPTOS: Crypto[] = [
+ {
+ name: "bitcoin",
+ address: "1Hefs7miXS5ff5Ck5xvmjKjXf5242KzRtK",
+ },
+ {
+ name: "ethereum",
+ address: "0x400c96c96acbC6E7B3B43B1dc1BB446540a88A01",
+ },
+ {
+ name: "monero",
+ address:
+ "41taVyY6e1xApqKyMVDRVxJ76sPkfZhALLTjRvVKpaAh2pBd4wv9RgYj1tSPrx8wc6iE1uWUfjtQdTmTy2FGMeChGVKPQuV",
+ },
+ {
+ name: "cardano",
+ address:
+ "addr1q858t89l2ym6xmrugjs0af9cslfwvnvsh2xxp6x4dcez7pf5tushkp4wl7zxfhm2djp6gq60dk4cmc7seaza5p3slx0sakjutm",
+ },
+];
+
+export const Crypto = () => (
+
+
+
+
+
{title}
+
+
+
+ {CRYPTOS.map(c => (
+
+ {c.name} |
+
+
+ {c.address}
+
+ }
+ />
+ |
+
+ ))}
+
+
+
+
+);
diff --git a/src/shared/components/donate-definitions.ts b/src/shared/components/donate-definitions.ts
index 0a7371a..e02ecdb 100644
--- a/src/shared/components/donate-definitions.ts
+++ b/src/shared/components/donate-definitions.ts
@@ -99,8 +99,8 @@ export interface Coder {
}
export const CODERS: Coder[] = [
- { name: "dessalines", link: "https://mastodon.social/@dessalines" },
- { name: "Nutomic", link: "https://lemmy.ml/u/nutomic" },
+ { name: "dessalines", link: "https://github.com/dessalines" },
+ { name: "Nutomic", link: "https://github.com/nutomic" },
{ name: "phiresky", link: "https://github.com/phiresky" },
{ name: "SleeplessOne1917", link: "https://github.com/SleeplessOne1917" },
{ name: "asonix", link: "https://github.com/asonix" },
@@ -124,32 +124,6 @@ export interface Translator {
link?: string;
}
-export interface Crypto {
- name: string;
- address: string;
-}
-
-export const CRYPTOS: Crypto[] = [
- {
- name: "bitcoin",
- address: "1Hefs7miXS5ff5Ck5xvmjKjXf5242KzRtK",
- },
- {
- name: "ethereum",
- address: "0x400c96c96acbC6E7B3B43B1dc1BB446540a88A01",
- },
- {
- name: "monero",
- address:
- "41taVyY6e1xApqKyMVDRVxJ76sPkfZhALLTjRvVKpaAh2pBd4wv9RgYj1tSPrx8wc6iE1uWUfjtQdTmTy2FGMeChGVKPQuV",
- },
- {
- name: "cardano",
- address:
- "addr1q858t89l2ym6xmrugjs0af9cslfwvnvsh2xxp6x4dcez7pf5tushkp4wl7zxfhm2djp6gq60dk4cmc7seaza5p3slx0sakjutm",
- },
-];
-
interface FundingPlatform {
supporterCount: number;
monthlyEUR: number;
diff --git a/src/shared/components/donate.tsx b/src/shared/components/donate.tsx
index cbe5986..5d61039 100644
--- a/src/shared/components/donate.tsx
+++ b/src/shared/components/donate.tsx
@@ -5,12 +5,7 @@ import { T } from "inferno-i18next";
import { translators } from "../translations/translators";
import { languagesAll, countries } from "countries-list";
import { isBrowser } from "../utils";
-import {
- Badge,
- BottomSpacer,
- SupportDonateBlock,
- TEXT_GRADIENT,
-} from "./common";
+import { Badge, BottomSpacer, DonateBlock, TEXT_GRADIENT } from "./common";
import {
CODERS,
GOLD_SPONSORS,
@@ -20,7 +15,6 @@ import {
LATINUM_SPONSORS,
GENERAL_SPONSORS,
Translation,
- CRYPTOS,
} from "./donate-definitions";
import classNames from "classnames";
import { Icon } from "./icon";
@@ -44,7 +38,7 @@ const ContributorsBlock = () => (
#
#
@@ -191,32 +185,6 @@ const GeneralSponsorCard = () => {
);
};
-const CryptoBlock = () => (
-
-
-
-
-
- {CRYPTOS.map(c => (
-
- {c.name} |
-
-
- {c.address}
-
- }
- />
- |
-
- ))}
-
-
-
-
-);
-
interface PersonBadgeData {
name: string;
link?: string;
@@ -284,16 +252,15 @@ export class Donate extends Component {
}
render() {
- const title = i18n.t("support_title");
+ const title = i18n.t("donate_title");
return (
-
+
-
);
diff --git a/src/shared/components/icon.tsx b/src/shared/components/icon.tsx
index 27ff774..3e7017f 100644
--- a/src/shared/components/icon.tsx
+++ b/src/shared/components/icon.tsx
@@ -2,6 +2,7 @@ export enum IconSize {
Small = "w-3 h-3",
Medium = "w-4 h-4",
Large = "w-6 h-6",
+ Largest = "w-8 h-8",
}
interface IconProps {
diff --git a/src/shared/components/instance-picker.tsx b/src/shared/components/instance-picker.tsx
index 72d43b6..6b8801c 100644
--- a/src/shared/components/instance-picker.tsx
+++ b/src/shared/components/instance-picker.tsx
@@ -8,7 +8,10 @@ import { Icon } from "./icon";
enum Step {
Interest,
Language,
- Join,
+}
+
+interface Props {
+ reset?: boolean;
}
interface State {
@@ -17,14 +20,21 @@ interface State {
language?: string;
}
-export class InstancePicker extends Component {
+export class InstancePicker extends Component {
state: State = {
activeStep: Step.Interest,
};
+
constructor(props: any, context: any) {
super(props, context);
}
+ componentWillReceiveProps(): void {
+ this.setState({
+ activeStep: Step.Interest,
+ });
+ }
+
render() {
return (
diff --git a/src/shared/components/instances.tsx b/src/shared/components/instances.tsx
index ea4eb7f..75890b8 100644
--- a/src/shared/components/instances.tsx
+++ b/src/shared/components/instances.tsx
@@ -12,20 +12,44 @@ import {
All_TOPIC,
TOPICS,
} from "./instances-definitions";
-import { Icon } from "./icon";
+import { Icon, IconSize } from "./icon";
import { I18nKeys } from "i18next";
const TitleBlock = () => (
);
@@ -122,7 +146,7 @@ const InstanceCard = ({ instance }: InstanceCardProps) => {
class="btn btn-primary text-white sm:max-md:btn-block bg-gradient-to-r from-[#69D066] to-[#03A80E] normal-case"
href={buildUrl(domain)}
>
- {i18n.t("join_a_server")}
+ {i18n.t("browse_instance")}