diff --git a/app/features/calendar/loaders/events.server.ts b/app/features/calendar/loaders/events.server.ts index a201e6108..4257f2939 100644 --- a/app/features/calendar/loaders/events.server.ts +++ b/app/features/calendar/loaders/events.server.ts @@ -12,7 +12,7 @@ export const loader = async () => { const user = requireUser(); const [tournamentsData, scrimsData] = await Promise.all([ - ShowcaseTournaments.frontPageTournamentsByUserId(user.id), + ShowcaseTournaments.categorizedTournamentsByUserId(user.id), ScrimPostRepository.findUserScrims(user.id), ]); diff --git a/app/features/front-page/core/ShowcaseTournaments.server.ts b/app/features/front-page/core/ShowcaseTournaments.server.ts index b40f92214..c0470e1c9 100644 --- a/app/features/front-page/core/ShowcaseTournaments.server.ts +++ b/app/features/front-page/core/ShowcaseTournaments.server.ts @@ -31,7 +31,7 @@ export async function upcomingTournaments(): Promise { return tournaments.upcoming; } -export async function frontPageTournamentsByUserId( +export async function categorizedTournamentsByUserId( userId: number | null, ): Promise { const tournaments = await cachedTournaments(); diff --git a/app/features/front-page/loaders/index.server.ts b/app/features/front-page/loaders/index.server.ts index 4a8bf883f..37f6e0fbc 100644 --- a/app/features/front-page/loaders/index.server.ts +++ b/app/features/front-page/loaders/index.server.ts @@ -1,6 +1,5 @@ import cachified from "@epic-web/cachified"; import type { Tables } from "~/db/tables"; -import { getUser } from "~/features/auth/core/user.server"; import * as Changelog from "~/features/front-page/core/Changelog.server"; import { cachedFullUserLeaderboard } from "~/features/leaderboards/core/leaderboards.server"; import * as LeaderboardRepository from "~/features/leaderboards/LeaderboardRepository.server"; @@ -10,10 +9,8 @@ import { discordAvatarUrl, teamPage, userPage } from "~/utils/urls"; import * as ShowcaseTournaments from "../core/ShowcaseTournaments.server"; export const loader = async () => { - const user = getUser(); - const [tournaments, changelog, leaderboards] = await Promise.all([ - ShowcaseTournaments.frontPageTournamentsByUserId(user?.id ?? null), + ShowcaseTournaments.categorizedTournamentsByUserId(null), cachified({ key: "front-changelog", cache, diff --git a/app/features/front-page/routes/index.tsx b/app/features/front-page/routes/index.tsx index 847a04b2a..d2619f768 100644 --- a/app/features/front-page/routes/index.tsx +++ b/app/features/front-page/routes/index.tsx @@ -4,23 +4,13 @@ import { useTranslation } from "react-i18next"; import { Link, useLoaderData } from "react-router"; import { Avatar } from "~/components/Avatar"; import { Divider } from "~/components/Divider"; -import { - SendouTab, - SendouTabList, - SendouTabPanel, - SendouTabs, -} from "~/components/elements/Tabs"; import { Image } from "~/components/Image"; import { ArrowRightIcon } from "~/components/icons/ArrowRight"; import { BSKYLikeIcon } from "~/components/icons/BSKYLike"; import { BSKYReplyIcon } from "~/components/icons/BSKYReply"; import { BSKYRepostIcon } from "~/components/icons/BSKYRepost"; import { ExternalIcon } from "~/components/icons/External"; -import { KeyIcon } from "~/components/icons/Key"; -import { SearchIcon } from "~/components/icons/Search"; -import { UsersIcon } from "~/components/icons/Users"; import { Main } from "~/components/Main"; -import type { ShowcaseCalendarEvent } from "~/features/calendar/calendar-types"; import { TournamentCard } from "~/features/calendar/components/TournamentCard"; import type * as Changelog from "~/features/front-page/core/Changelog.server"; import * as Seasons from "~/features/mmr/core/Seasons"; @@ -30,7 +20,6 @@ import styles from "~/styles/front.module.css"; import type { SendouRouteHandle } from "~/utils/remix.server"; import { BLANK_IMAGE_URL, - CALENDAR_TOURNAMENTS_PAGE, LUTI_PAGE, leaderboardsPage, navIconUrl, @@ -50,7 +39,6 @@ export default function FrontPage() {
-
@@ -120,96 +108,6 @@ function LeagueBanner() { ); } -function TournamentCards() { - const { t } = useTranslation(["front"]); - const data = useLoaderData(); - - if ( - data.tournaments.participatingFor.length === 0 && - data.tournaments.organizingFor.length === 0 && - data.tournaments.showcase.length === 0 - ) { - return null; - } - - const showSignedUpTab = data.tournaments.participatingFor.length > 0; - const showOrganizerTab = data.tournaments.organizingFor.length > 0; - const showDiscoverTab = data.tournaments.showcase.length > 0; - - return ( -
- - - {showSignedUpTab ? ( - }> - {t("front:showcase.tabs.signedUp")} - - ) : null} - {showOrganizerTab ? ( - }> - {t("front:showcase.tabs.organizer")} - - ) : null} - {showDiscoverTab ? ( - }> - {t("front:showcase.tabs.discover")} - - ) : null} - - - - - - - - - - - -
- ); -} - -function ShowcaseTournamentScroller({ - tournaments, -}: { - tournaments: ShowcaseCalendarEvent[]; -}) { - return ( -
-
- {tournaments.map((tournament) => ( - - ))} -
- -
- ); -} - -function AllTournamentsLinkCard() { - const { t } = useTranslation(["front"]); - - return ( - - - {t("front:showcase.viewAll")} - - ); -} - function ResultHighlights() { const { t } = useTranslation(["front"]); const data = useLoaderData(); diff --git a/app/features/sidebar/core/sidebar.server.ts b/app/features/sidebar/core/sidebar.server.ts index 0192e1da5..25ea6cdd4 100644 --- a/app/features/sidebar/core/sidebar.server.ts +++ b/app/features/sidebar/core/sidebar.server.ts @@ -58,7 +58,7 @@ const TOURNAMENT_SUB_QUOTA = 2; export async function resolveSidebarData(userId: number | null) { if (!userId) { const tournamentsData = - await ShowcaseTournaments.frontPageTournamentsByUserId(null); + await ShowcaseTournaments.categorizedTournamentsByUserId(null); return { events: showcaseEventsToSidebarEvents(tournamentsData.showcase), friends: [] as SidebarFriend[], @@ -67,7 +67,7 @@ export async function resolveSidebarData(userId: number | null) { } const [tournamentsData, scrimsData, friendsWithActivity] = await Promise.all([ - ShowcaseTournaments.frontPageTournamentsByUserId(userId), + ShowcaseTournaments.categorizedTournamentsByUserId(userId), ScrimPostRepository.findUserScrims(userId), FriendRepository.findByUserIdWithActivity(userId), ]); diff --git a/app/styles/front.module.css b/app/styles/front.module.css index 4777e676e..935783ceb 100644 --- a/app/styles/front.module.css +++ b/app/styles/front.module.css @@ -100,13 +100,6 @@ translate: 2px; } -.tournamentCards { - display: flex; - justify-content: space-between; - gap: var(--s-2); - margin-block-start: var(--s-2); -} - .tournamentCardsSpacer { display: flex; gap: var(--s-2); @@ -114,28 +107,6 @@ padding: var(--s-2); } -.tournamentCardsViewAllCard { - background-color: var(--color-bg-high); - height: var(--card-height); - border-radius: var(--radius-box); - display: grid; - place-items: center; - padding: var(--s-2); - font-size: var(--font-2xs); - font-weight: var(--weight-bold); - text-align: center; - color: var(--color-text); - transition: 0.2s ease-out; - min-width: 90px; - max-width: 90px; - border: var(--border-style); - margin-top: var(--s-2); -} - -.tournamentCardsViewAllCard:hover { - background-color: var(--color-bg-higher); -} - .resultHighlights { display: flex; gap: var(--s-2); diff --git a/locales/da/front.json b/locales/da/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/da/front.json +++ b/locales/da/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/de/front.json b/locales/de/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/de/front.json +++ b/locales/de/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/en/front.json b/locales/en/front.json index 39c20b3c9..43f045745 100644 --- a/locales/en/front.json +++ b/locales/en/front.json @@ -6,10 +6,6 @@ "sq.season": "Season {{nth}}", "sq.prepare": "Prepare now!", "sq.participate": "Participate now!", - "showcase.tabs.signedUp": "Signed up", - "showcase.tabs.organizer": "Organizing", - "showcase.tabs.discover": "Discover", - "showcase.viewAll": "View all tournaments", "showcase.card.ranked": "Ranked", "showcase.card.unranked": "Unranked", "showcase.card.winner": "Winner", diff --git a/locales/es-ES/front.json b/locales/es-ES/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/es-ES/front.json +++ b/locales/es-ES/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/es-US/front.json b/locales/es-US/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/es-US/front.json +++ b/locales/es-US/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/fr-CA/front.json b/locales/fr-CA/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/fr-CA/front.json +++ b/locales/fr-CA/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/fr-EU/front.json b/locales/fr-EU/front.json index e7dbbb615..098c0a105 100644 --- a/locales/fr-EU/front.json +++ b/locales/fr-EU/front.json @@ -6,10 +6,6 @@ "sq.season": "Saison {{nth}}", "sq.prepare": "Preparez-vous maintenant!", "sq.participate": "Participez maintenant!", - "showcase.tabs.signedUp": "Inscrit", - "showcase.tabs.organizer": "Organisater", - "showcase.tabs.discover": "Découvrir", - "showcase.viewAll": "Regarder tous les tournois", "showcase.card.ranked": "Classé", "showcase.card.unranked": "Non classé", "showcase.card.winner": "Gagnant", diff --git a/locales/he/front.json b/locales/he/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/he/front.json +++ b/locales/he/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/it/front.json b/locales/it/front.json index 4895a21e7..298214f4e 100644 --- a/locales/it/front.json +++ b/locales/it/front.json @@ -6,10 +6,6 @@ "sq.season": "Stagione {{nth}}", "sq.prepare": "Preparati!", "sq.participate": "Partecipa ora!", - "showcase.tabs.signedUp": "Iscritto", - "showcase.tabs.organizer": "Organizing", - "showcase.tabs.discover": "Scopri", - "showcase.viewAll": "Visualizza tutti i tornei", "showcase.card.ranked": "Classificata", "showcase.card.unranked": "Non classificata", "showcase.card.winner": "Vincitore", diff --git a/locales/ja/front.json b/locales/ja/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/ja/front.json +++ b/locales/ja/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/ko/front.json b/locales/ko/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/ko/front.json +++ b/locales/ko/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/nl/front.json b/locales/nl/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/nl/front.json +++ b/locales/nl/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/pl/front.json b/locales/pl/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/pl/front.json +++ b/locales/pl/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/pt-BR/front.json b/locales/pt-BR/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/pt-BR/front.json +++ b/locales/pt-BR/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "", diff --git a/locales/ru/front.json b/locales/ru/front.json index 998842c63..363feb8e5 100644 --- a/locales/ru/front.json +++ b/locales/ru/front.json @@ -6,10 +6,6 @@ "sq.season": "Сезон {{nth}}", "sq.prepare": "Будьте готовы!", "sq.participate": "Участвуйте!", - "showcase.tabs.signedUp": "Записаны", - "showcase.tabs.organizer": "Организуете", - "showcase.tabs.discover": "Найти", - "showcase.viewAll": "Посмотреть все турниры", "showcase.card.ranked": "Рейтинговый", "showcase.card.unranked": "Без Рейтинга", "showcase.card.winner": "Победитель", diff --git a/locales/zh/front.json b/locales/zh/front.json index 8abcd8c9a..a90957736 100644 --- a/locales/zh/front.json +++ b/locales/zh/front.json @@ -6,10 +6,6 @@ "sq.season": "", "sq.prepare": "", "sq.participate": "", - "showcase.tabs.signedUp": "", - "showcase.tabs.organizer": "", - "showcase.tabs.discover": "", - "showcase.viewAll": "", "showcase.card.ranked": "", "showcase.card.unranked": "", "showcase.card.winner": "",