Bug fixes

member-counter · Oct 16, 2024 · 6d2711d · 6d2711d
1 parent 8341383
commit 6d2711d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git a/apps/website/src/app/components/Footer.tsx b/apps/website/src/app/components/Footer.tsx
@@ -26,11 +26,9 @@ export default function Footer() {
     <>
       <footer className="mt-auto flex flex-col border-t border-border/40 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
         <div className="bg-accent-background py-5">
-          <div className="container flex flex-row gap-[60px] py-0">
-            <div className="flex flex-col">
-              <h3 className="pb-5 text-xl font-bold tracking-tight">
-                {t("components.footer.usefulLinks")}
-              </h3>
+          <div className="container flex flex-row flex-wrap gap-[60px] py-0 [&>*>h3]:pb-5 [&>*>h3]:text-xl [&>*>h3]:font-bold [&>*>h3]:tracking-tight [&>*]:flex [&>*]:max-w-[240px] [&>*]:flex-col">
+            <div>
+              <h3>{t("components.footer.usefulLinks")}</h3>
               <Link href={Routes.Support}>
                 {t("components.footer.supportServer")}
               </Link>
@@ -47,10 +45,8 @@ export default function Footer() {
                 </Link>
               )}
             </div>
-            <div className="flex flex-col">
-              <h3 className="pb-5 text-xl font-bold tracking-tight">
-                {t("components.footer.legal")}
-              </h3>
+            <div>
+              <h3>{t("components.footer.legal")}</h3>
               <Link href={Routes.Legal("terms-of-service")}>
                 {t("components.footer.termsOfService")}
               </Link>
@@ -64,10 +60,8 @@ export default function Footer() {
                 {t("components.footer.acceptableUsePolicy")}
               </Link>
             </div>
-            <div className="flex flex-col">
-              <h3 className="pb-5 text-xl font-bold tracking-tight">
-                {t("components.footer.improveMemberCounter")}
-              </h3>
+            <div>
+              <h3>{t("components.footer.improveMemberCounter")}</h3>
               <Link href={Routes.BotRepository}>
                 {t("components.footer.codeRepository")}
               </Link>
@@ -77,7 +71,7 @@ export default function Footer() {
               <Link href={Routes.Donors}>{t("components.footer.donate")}</Link>
             </div>
             <div
-              className={cn("flex flex-col", {
+              className={cn({
                 hidden: !userPermissions.has(
                   UserPermissions.SeeUsers |
                     UserPermissions.ManageUsers |
@@ -86,12 +80,10 @@ export default function Footer() {
                 ),
               })}
             >
-              <h3 className="pb-5 text-xl font-bold tracking-tight">
-                {t("components.footer.admin")}
-              </h3>
+              <h3>{t("components.footer.admin")}</h3>
               <Link
                 href={Routes.ManageUsers()}
-                className={cn("flex flex-col", {
+                className={cn({
                   hidden: !userPermissions.has(
                     UserPermissions.SeeUsers | UserPermissions.ManageUsers,
                   ),
@@ -101,7 +93,7 @@ export default function Footer() {
               </Link>
               <Link
                 href={Routes.ManageGuilds}
-                className={cn("flex flex-col", {
+                className={cn({
                   hidden: !userPermissions.has(
                     UserPermissions.SeeGuilds | UserPermissions.ManageGuilds,
                   ),
@@ -111,7 +103,7 @@ export default function Footer() {
               </Link>
               <Link
                 href={Routes.ManageHomePage}
-                className={cn("flex flex-col", {
+                className={cn({
                   hidden: !userPermissions.has(UserPermissions.ManageHomePage),
                 })}
               >

diff --git a/apps/website/src/app/components/LandingPage/index.tsx b/apps/website/src/app/components/LandingPage/index.tsx
@@ -66,14 +66,14 @@ export default function LandingPage() {
         src={bgImage}
         alt=""
       />
-      <div className=" flex min-h-screen w-full flex-col items-center justify-center gap-4">
+      <div className="flex min-h-screen w-full flex-col items-center justify-center gap-4">
         <div className="grow"></div>
         <div className="flex flex-row items-center">
-          <BotIcon className="relative top-[3px] ml-4 h-20 w-20 min-w-20" />
+          <BotIcon className="relative top-[3px] ml-4 hidden h-20 w-20 min-w-20 md:block " />
           <h1
             className={cn(
               major.className,
-              "ml-10 py-3 text-6xl font-extrabold ",
+              "py-3 text-center text-6xl font-extrabold md:ml-10 md:text-left",
             )}
           >
             Member counteR
@@ -87,7 +87,7 @@ export default function LandingPage() {
             {subheadings[currentSubheading]}
           </TextTransition>
         </h2>
-        <div className="mt-3 flex gap-2">
+        <div className="mt-6 flex w-full flex-col gap-2 px-2 sm:mt-3 sm:w-auto sm:flex-row">
           <Button icon={DiscordIcon}>Add to Discord</Button>
           <Button icon={LifeBuoyIcon}>Get Support</Button>
           <Button icon={SlidersHorizontalIcon}>Dashboard</Button>

diff --git a/apps/website/src/server/api/routers/demoServers.ts b/apps/website/src/server/api/routers/demoServers.ts
@@ -47,13 +47,14 @@ export const demoServersRouter = createTRPCRouter({
         id: z.string(),
         name: z.string().optional(),
         description: z.string().optional(),
+        icon: z.string().nullable(),
         priority: z.number().optional(),
         channels: z
           .array(
             z.object({
               name: z.string(),
               type: z.number(),
-              topic: z.string(),
+              topic: z.string().nullable(),
               showAsSkeleton: z.boolean(),
             }),
           )