diff --git a/.gitmodules b/.gitmodules index 8ecda16..f3c38d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "joinlemmy-translations"] path = joinlemmy-translations url = https://github.com/lemmynet/joinlemmy-translations - branch = main + branch = tailwind_rework [submodule "lemmy-translations"] path = lemmy-translations url = https://github.com/lemmynet/lemmy-translations diff --git a/crawl.mjs b/crawl.mjs index 1639200..9777636 100644 --- a/crawl.mjs +++ b/crawl.mjs @@ -52,7 +52,7 @@ try { process.stdout.write(strData); }); - run.on("close", exitCode => { + run.on("close", _exitCode => { var stats = JSON.parse(savedOutput); // Crawl results from all instances include tons of data which needs to be compiled. // If it is too much data it breaks the build, so we need to exclude as much as possible. diff --git a/joinlemmy-translations b/joinlemmy-translations index f96ec38..57cc965 160000 --- a/joinlemmy-translations +++ b/joinlemmy-translations @@ -1 +1 @@ -Subproject commit f96ec38a927aa2477d9a1d21f6a637ed8838b913 +Subproject commit 57cc965548287bbf508fbbe8aadf15b1449fb839 diff --git a/lemmy-docs b/lemmy-docs index 46e7d37..bc063f4 160000 --- a/lemmy-docs +++ b/lemmy-docs @@ -1 +1 @@ -Subproject commit 46e7d377c5e27418c89df28e6c620a7a3265b62f +Subproject commit bc063f46eb15fa09391639a4777b0cabb0cdcef5 diff --git a/lemmy-translations b/lemmy-translations index 18da108..0a5b979 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit 18da10858d8c63750beb06247947f25d91944741 +Subproject commit 0a5b9790fbae41e8dc51021c2d20ec0f5743b1d8 diff --git a/recommended-instances.json b/recommended-instances.json index 95e9a2b..2faa471 100644 --- a/recommended-instances.json +++ b/recommended-instances.json @@ -1,23 +1,12 @@ { - "en": [ - "sopuli.xyz", - "sh.itjust.works", - "lemmy.fmhy.ml", - "discuss.tchncs.de", + "recommended": [ + "lemmy.ml", "lemm.ee", + "lemmygrad.ml", "reddthat.com", - "discuss.online" + "hexbear.net", + "lemmy.fmhy.ml" ], - "fr": ["sh.itjust.works"], - "da": ["feddit.dk"], - "de": ["feddit.de", "discuss.tchncs.de"], - "nl": ["feddit.nl"], - "pt": ["lemmy.pt"], - "pt-PT": ["lemmy.pt"], - "pt-BR": ["lemmy.pt"], - "eu": ["lemmy.eus"], - "ja": ["tabinezumi.net", "lm.korako.me"], - "it": ["feddit.it"], "exclude": [ "lemmy.glasgow.social", "ds9.lemmy.ml", diff --git a/src/assets/images/code_pic.webp b/src/assets/images/code_pic.webp deleted file mode 100644 index 673af09..0000000 Binary files a/src/assets/images/code_pic.webp and /dev/null differ diff --git a/src/assets/images/main_img.webp b/src/assets/images/main_img.webp deleted file mode 100644 index 2601ab1..0000000 Binary files a/src/assets/images/main_img.webp and /dev/null differ diff --git a/src/assets/images/mod_pic.webp b/src/assets/images/mod_pic.webp deleted file mode 100644 index e9e4d12..0000000 Binary files a/src/assets/images/mod_pic.webp and /dev/null differ diff --git a/src/assets/images/reply_vid.webm b/src/assets/images/reply_vid.webm deleted file mode 100644 index 8814fa5..0000000 Binary files a/src/assets/images/reply_vid.webm and /dev/null differ diff --git a/src/assets/images/review_pic.webp b/src/assets/images/review_pic.webp deleted file mode 100644 index b2d56e1..0000000 Binary files a/src/assets/images/review_pic.webp and /dev/null differ diff --git a/src/shared/components/apps.tsx b/src/shared/components/apps.tsx index 633fab4..5293a22 100644 --- a/src/shared/components/apps.tsx +++ b/src/shared/components/apps.tsx @@ -1,6 +1,7 @@ import { Component } from "inferno"; import { Helmet } from "inferno-helmet"; import { i18n } from "../i18next"; +import { T } from "inferno-i18next"; import { BottomSpacer, TEXT_GRADIENT } from "./common"; import { ANDROID_APPS, @@ -15,7 +16,9 @@ import { Icon } from "./icon"; const TitleBlock = () => (
-

{i18n.t("lemmy_apps")}

+ + ## +

{i18n.t("choose_from_apps")}

@@ -45,7 +48,7 @@ interface AppDetailsButtonsProps { const AppDetailsButtons = ({ links }: AppDetailsButtonsProps) => (
{links.map(l => ( - + ))} diff --git a/src/shared/components/common.tsx b/src/shared/components/common.tsx index 89bb106..b7eea2a 100644 --- a/src/shared/components/common.tsx +++ b/src/shared/components/common.tsx @@ -6,6 +6,9 @@ import classNames from "classnames"; export const TEXT_GRADIENT = "bg-gradient-to-r bg-clip-text text-transparent from-[#69D066] to-[#03A80E]"; +export const CARD_GRADIENT = + "bg-gradient-to-r from-[#797979]/[.05] via-[#07B0BA]/[.15] to-[#797979]/[.05]"; + export const BACKGROUND_GRADIENT_1 = "min-h-full bg-gradient-to-r from-transparent via-[#12D10E]/[.15] to-transparent"; @@ -37,29 +40,35 @@ export const DonateDesc = () => ( export const DonateButtons = () => (
- {i18n.t("support_on_liberapay")} + + ## + - {i18n.t("support_on_patreon")} + + ## + - {i18n.t("support_on_opencollective")} + + ## +
); export const SupportDonateBlock = () => (
-
+

{i18n.t("support_donate")} diff --git a/src/shared/components/contact.tsx b/src/shared/components/contact.tsx index c31b78e..91af0fa 100644 --- a/src/shared/components/contact.tsx +++ b/src/shared/components/contact.tsx @@ -29,7 +29,10 @@ const ContactBlock = () => ( ); const ContactBtn = ({ title, url }) => ( - + {title} diff --git a/src/shared/components/donate.tsx b/src/shared/components/donate.tsx index 92f8ce1..c6b62d5 100644 --- a/src/shared/components/donate.tsx +++ b/src/shared/components/donate.tsx @@ -137,7 +137,10 @@ const GoldSponsorCards = ({ title, sponsors }: GoldSponsorCardsProps) =>

{title}

{sponsors.map(s => ( - + ))} diff --git a/src/shared/components/instances-definitions.ts b/src/shared/components/instances-definitions.ts index 889bc6f..312fb6c 100644 --- a/src/shared/components/instances-definitions.ts +++ b/src/shared/components/instances-definitions.ts @@ -29,3 +29,101 @@ export const INSTANCE_HELPERS: InstanceHelper[] = [ link: "https://browse.feddit.de/", }, ]; + +// TODO add i18n strings, Icons +export enum InstanceCategory { + Tech, + Sports, +} + +export interface RecommendedInstance { + domain: string; + languages: string[]; + categories: InstanceCategory[]; +} + +// TODO fix these up +export const RECOMMENDED_INSTANCES: RecommendedInstance[] = [ + { + domain: "lemmy.fmhy.ml", + languages: ["en"], + categories: [InstanceCategory.Tech], + }, + { + domain: "discuss.tchncs.de", + languages: ["en"], + categories: [InstanceCategory.Tech], + }, + { + domain: "lemm.ee", + languages: ["en"], + categories: [InstanceCategory.Tech], + }, + { + domain: "reddthat.com", + languages: ["en"], + categories: [InstanceCategory.Tech], + }, + { + domain: "discuss.online", + languages: ["en"], + categories: [InstanceCategory.Tech], + }, + { + domain: "feddit.dk", + languages: ["da"], + categories: [InstanceCategory.Tech], + }, + { + domain: "feddit.de", + languages: ["de"], + categories: [InstanceCategory.Tech], + }, + + { + domain: "discuss.tchncs.de", + languages: ["de"], + categories: [InstanceCategory.Tech], + }, + { + domain: "feddit.nl", + languages: ["nl"], + categories: [InstanceCategory.Tech], + }, + + { + domain: "lemmy.pt", + languages: ["pt", "pt-PT", "pt-BR"], + categories: [InstanceCategory.Tech], + }, + + { + domain: "lemmy.pt", + languages: ["pt", "pt-PT", "pt-BR"], + categories: [InstanceCategory.Tech], + }, + + { + domain: "lemmy.eus", + languages: ["eu"], + categories: [InstanceCategory.Tech], + }, + + { + domain: "tabinezumi.net", + languages: ["ja"], + categories: [InstanceCategory.Tech], + }, + + { + domain: "lm.korako.me", + languages: ["ja"], + categories: [InstanceCategory.Tech], + }, + + { + domain: "feddit.it", + languages: ["it"], + categories: [InstanceCategory.Tech], + }, +]; diff --git a/src/shared/components/instances.tsx b/src/shared/components/instances.tsx index 283a740..c8f32c6 100644 --- a/src/shared/components/instances.tsx +++ b/src/shared/components/instances.tsx @@ -1,6 +1,7 @@ import { Component, InfernoEventHandler } from "inferno"; import { Helmet } from "inferno-helmet"; import { i18n } from "../i18next"; +import { T } from "inferno-i18next"; import { instance_stats } from "../instance_stats"; import { mdToHtml, numToSI } from "../utils"; import { Badge, TEXT_GRADIENT } from "./common"; @@ -9,9 +10,9 @@ import { Icon } from "./icon"; const TitleBlock = () => (
-

- {i18n.t("lemmy_servers")} -

+ + ## +

{i18n.t("instance_totals", { instances: numToSI(instance_stats.stats.crawled_instances), @@ -89,8 +90,6 @@ const InstanceCard = ({ instance }: InstanceCardProps) => { const modalId = `modal_${domain}`; - // TODO do users / month, posts / month, comments / month instead of totals - return (

@@ -116,19 +115,18 @@ const InstanceCard = ({ instance }: InstanceCardProps) => {

{description}

{i18n.t("join_a_server")}
@@ -178,7 +176,7 @@ export const StatsBadges = ({ users, comments, monthlyUsers }) => (
- {i18n.t("users_active_per_month", { + {i18n.t("per_month", { formattedCount: monthlyUsers.toLocaleString(), })} @@ -221,8 +219,8 @@ export const DetailsModal = ({ comments={comments} monthlyUsers={monthlyUsers} /> - {sidebar && ( @@ -231,10 +229,10 @@ export const DetailsModal = ({ )} - {i18n.t("join_a_server")} + {i18n.t("join")}
diff --git a/src/shared/components/main.tsx b/src/shared/components/main.tsx index 4d3683b..01dfbb8 100644 --- a/src/shared/components/main.tsx +++ b/src/shared/components/main.tsx @@ -5,11 +5,16 @@ import { i18n } from "../i18next"; import { T } from "inferno-i18next"; import { isBrowser } from "../utils"; import { Icon } from "./icon"; -import { BottomSpacer, SupportDonateBlock, TEXT_GRADIENT } from "./common"; +import { + BottomSpacer, + CARD_GRADIENT, + SupportDonateBlock, + TEXT_GRADIENT, +} from "./common"; const TitleBlock = () => ( -
-
+
+

Lemmy

{i18n.t("lemmy_desc")}

@@ -20,15 +25,51 @@ const TitleBlock = () => (
); +const CarouselBlock = () => ( +
+
+
+ +
+
+ +
+
+ +
+
+ +
+); + const JoinServerButton = () => ( - + {i18n.t("join_a_server")} ); const RunServerButton = () => ( {i18n.t("run_a_server")} @@ -37,11 +78,14 @@ const RunServerButton = () => ( const FollowCommunitiesBlock = () => (
-
+
-

- {i18n.t("follow_communities")} -

+ + ## +

{i18n.t("lemmy_long_desc")}

@@ -51,10 +95,10 @@ const FollowCommunitiesBlock = () => (
); -const FeatureCard = ({ pic, title, subtitle }) => ( -
-
- +const FeatureCard = ({ pic, title, subtitle, classes }) => ( +
+
+

{title}

@@ -63,9 +107,10 @@ const FeatureCard = ({ pic, title, subtitle }) => (
); -const OpenSourceCard = () => ( +const OpenSourceCard = ({ classes }) => ( @@ -87,9 +132,10 @@ const OpenSourceCard = () => ( /> ); -const BlazingFastCard = () => ( +const BlazingFastCard = ({ classes }) => ( @@ -114,33 +160,40 @@ const BlazingFastCard = () => ( /> ); -const ModToolsCard = () => ( +const ModToolsCard = ({ classes }) => ( ); +const CensorshipCard = ({ classes }) => ( + +); + +const FederationCard = ({ classes }) => ( + +); + const FeatureCardsBlock = () => (
-
- -
-
- -
-
- -
- {/* TODO Add censorship and other cards */} - -
- -
-
- -
+ + + + +
); @@ -148,39 +201,41 @@ const DiscussionPlatformBlock = () => ( ); -// TODO more FEATURES(needs to be green) -// TODO add all of these ones const MoreFeaturesBlock = () => (
-
- {i18n.t("more_features")} -
+ + ## +
} @@ -343,7 +398,7 @@ const MoreFeaturesBlock = () => (
} - text={"TODO Censorship resistant"} + text={i18n.t("censorship_resistant_desc")} />
@@ -372,17 +427,22 @@ export class Main extends Component { render() { const title = i18n.t("lemmy_title"); return ( -
+
- - - - - - - +
+ +
+ +
+ + + + + + +
); } diff --git a/src/shared/components/navbar.tsx b/src/shared/components/navbar.tsx index 444954d..f602368 100644 --- a/src/shared/components/navbar.tsx +++ b/src/shared/components/navbar.tsx @@ -8,7 +8,7 @@ const NavLink = ({ content }) =>
  • {content}
    • ; const NavLinks = () => ( <> - {i18n.t("join_a_server")}} /> + {i18n.t("join")}} /> {i18n.t("news")}} /> {i18n.t("apps")}} /> {i18n.t("donate")}} /> @@ -45,14 +45,14 @@ export const Navbar = ({ footer = false }) => (
    {footer ? ( - - @c Lemmy -2023. All Rights Reserved. + + {i18n.t("copyright_line")} ) : ( <>