From 118d89496afd3493bf077abb0e99ddc539604a15 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Tue, 26 Jul 2022 20:38:56 +0300 Subject: [PATCH] Plus suggestion redirect to tab with new user --- app/routes/plus/suggestions/new.tsx | 4 ++-- app/utils/urls.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/routes/plus/suggestions/new.tsx b/app/routes/plus/suggestions/new.tsx index 4f13a9cb5..0581c93ae 100644 --- a/app/routes/plus/suggestions/new.tsx +++ b/app/routes/plus/suggestions/new.tsx @@ -8,7 +8,7 @@ import { playerAlreadyMember, playerAlreadySuggested, } from "~/permissions"; -import { PLUS_SUGGESTIONS_PAGE } from "~/utils/urls"; +import { plusSuggestionPage, PLUS_SUGGESTIONS_PAGE } from "~/utils/urls"; import type { PlusSuggestionsLoaderData } from "../suggestions"; import * as React from "react"; import { Label } from "~/components/Label"; @@ -80,7 +80,7 @@ export const action: ActionFunction = async ({ request }) => { ...nextNonCompletedVoting(new Date()), }); - return redirect(PLUS_SUGGESTIONS_PAGE); + return redirect(plusSuggestionPage(data.tier)); }; export default function PlusNewSuggestionModalPage() { diff --git a/app/utils/urls.ts b/app/utils/urls.ts index 4bbbf61b4..52a2e3e2e 100644 --- a/app/utils/urls.ts +++ b/app/utils/urls.ts @@ -12,6 +12,8 @@ export const LEAN_TWITTER = "https://twitter.com/LeanYoshi"; export const UBERU_TWITTER = "https://twitter.com/uberu5"; export const LOG_IN_URL = "/auth"; export const LOG_OUT_URL = "/auth/logout"; + +// xxx: remove? export const PLUS_SUGGESTIONS_PAGE = "/plus/suggestions"; export const ADMIN_PAGE = "/admin"; export const FAQ_PAGE = "/faq"; @@ -23,6 +25,8 @@ export const userPage = (discordId: string) => `/u/${discordId}`; export const impersonateUrl = (idToLogInAs: number) => `/auth/impersonate?id=${idToLogInAs}`; export const badgePage = (badgeId: number) => `${BADGES_PAGE}/${badgeId}`; +export const plusSuggestionPage = (tier: string | number) => + `/plus/suggestions${tier ? `?tier=${tier}` : ""}`; export const badgeUrl = ({ code,