From 527552053336bcb601c2c0d2d4d895012585bc9d Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 4 Sep 2022 23:27:00 +0300
Subject: [PATCH] Show joining instructions when passing Plus Voting

Closes #911
---
 app/routes/plus/voting/results.tsx | 44 ++++++++++++++++++------------
 app/styles/plus-history.css        |  7 ++++-
 app/utils/urls.ts                  |  1 +
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/app/routes/plus/voting/results.tsx b/app/routes/plus/voting/results.tsx
index 34577b45a..502d381ca 100644
--- a/app/routes/plus/voting/results.tsx
+++ b/app/routes/plus/voting/results.tsx
@@ -14,7 +14,7 @@ import { makeTitle } from "~/utils/strings";
 import type { Unpacked } from "~/utils/types";
 import styles from "~/styles/plus-history.css";
 import { discordFullName } from "~/utils/strings";
-import { userPage } from "~/utils/urls";
+import { PLUS_SERVER_DISCORD_URL, userPage } from "~/utils/urls";
 import clsx from "clsx";
 import { getUser } from "~/modules/auth";
 
@@ -64,22 +64,32 @@ export default function PlusVotingResultsPage() {
         Voting results for {month + 1}/{year}
       </h2>
       {data.ownScores && data.ownScores.length > 0 ? (
-        <ul className="plus-history__own-scores stack sm">
-          {data.ownScores.map((result) => (
-            <li key={result.tier}>
-              You{" "}
-              {result.passedVoting ? (
-                <span className="plus-history__success">passed</span>
-              ) : (
-                <span className="plus-history__fail">didn&apos;t pass</span>
-              )}{" "}
-              the +{result.tier} voting
-              {typeof result.score === "number"
-                ? `, your score was ${result.score}% (at least 50% required to pass)`
-                : ""}
-            </li>
-          ))}
-        </ul>
+        <>
+          <ul className="plus-history__own-scores stack sm">
+            {data.ownScores.map((result) => (
+              <li key={result.tier}>
+                You{" "}
+                {result.passedVoting ? (
+                  <span className="plus-history__success">passed</span>
+                ) : (
+                  <span className="plus-history__fail">didn&apos;t pass</span>
+                )}{" "}
+                the +{result.tier} voting
+                {typeof result.score === "number"
+                  ? `, your score was ${result.score}% (at least 50% required to pass)`
+                  : ""}
+              </li>
+            ))}
+          </ul>
+          <div className="text-sm text-center text-lighter">
+            Click{" "}
+            <a href={PLUS_SERVER_DISCORD_URL} target="_blank" rel="noreferrer">
+              here
+            </a>{" "}
+            to join the Discord server. In some cases you might need to rejoin
+            the server to get the correct role.
+          </div>
+        </>
       ) : null}
       {!data.ownScores ? (
         <div className="text-center text-sm">
diff --git a/app/styles/plus-history.css b/app/styles/plus-history.css
index b44ac8ec0..a122bc66e 100644
--- a/app/styles/plus-history.css
+++ b/app/styles/plus-history.css
@@ -1,8 +1,13 @@
 .plus-history__own-scores {
-  padding: 0;
+  width: max-content;
+  padding: var(--s-2);
+  margin: 0 auto;
+  background-color: var(--bg-lighter);
+  border-radius: var(--rounded);
   font-size: var(--fonts-sm);
   font-weight: var(--semi-bold);
   list-style-type: none;
+  padding-inline: var(--s-4);
   text-align: center;
 }
 
diff --git a/app/utils/urls.ts b/app/utils/urls.ts
index 463e91a0b..c8d1ebf76 100644
--- a/app/utils/urls.ts
+++ b/app/utils/urls.ts
@@ -2,6 +2,7 @@ import type { Badge, GearType } from "~/db/types";
 import type { ModeShort } from "~/modules/in-game-lists";
 import type { AbilityWithUnknown } from "~/modules/in-game-lists/types";
 
+export const PLUS_SERVER_DISCORD_URL = "https://discord.gg/FW4dKrY";
 export const SENDOU_INK_DISCORD_URL = "https://discord.gg/sendou";
 export const SENDOU_TWITTER_URL = "https://twitter.com/sendouc";
 export const SENDOU_INK_TWITTER_URL = "https://twitter.com/sendouink";