feat: moved footer to settings page (#257)

nthumodifications · Apr 1, 2024 · 179ecdf · 179ecdf
2 parents 31d1fbd + e1a9ed1
commit 179ecdf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/src/app/[lang]/(mods-pages)/layout.tsx b/src/app/[lang]/(mods-pages)/layout.tsx
@@ -1,6 +1,5 @@
 import Header from '@/components/Header';
 import SideNav from '@/components/SideNav';
-import Footer from '@/components/Footer';
 import GoogleAnalytics from '@/components/GoogleAnalytics';
 import { Suspense } from 'react';
 import { Toaster } from '@/components/ui/toaster';
@@ -17,13 +16,12 @@ const NTHUModsLayout = ({
         <GoogleAnalytics />
         <ConsoleLogger />
         <Header />
-        <div className='hidden md:flex h-screen px-2 pt-8 pl-8'>
+        <div className='hidden md:flex h-full px-2 pt-8 pl-8'>
             <SideNav />
         </div>
         <main className='overflow-y-auto overflow-x-hidden h-full w-full scroll-smooth [&>div]:h-full pt-8 md:pl-8'>
             {children}
         </main>
-        <Footer />
     </div>
 }
 

diff --git a/src/app/[lang]/(mods-pages)/settings/page.tsx b/src/app/[lang]/(mods-pages)/settings/page.tsx
@@ -11,6 +11,7 @@ import { Separator } from "@/components/ui/separator";
 import { Switch } from "@/components/ui/switch";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Language } from "@/types/settings";
+import Footer from '@/components/Footer';
 
 const SettingsPage = () => {
 
@@ -79,6 +80,8 @@ const SettingsPage = () => {
                     {ais.enabled && !ais.ACIXSTORE && <span className="text-red-600 dark:text-red-400 text-sm">{dict.ccxp.failed}</span>}
                 </div>
             </div>
+            <Separator orientation="horizontal"/>
+            <Footer/>
         </div>
     )
 };

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -2,19 +2,22 @@ import { Github, Mail, Instagram, Facebook } from "lucide-react"
 import { Button } from "@/components/ui/button"
 import { Badge } from "@/components/ui/badge"
 import FullLogo from "./Branding/FullLogo"
+import NTHUModsLogo from "@/components/Branding/NTHUModsLogo"
 import Link from "next/link"
 
 const Footer = () => {
   return (
-    <footer className="hidden md:grid w-screen dark:bg-neutral-800 bg-neutral-50 p-6 rounded-lg shadow-lg grid-cols-2">
+    <footer className="hidden md:grid w-screen py-16 grid-cols-2">
       <div className="">
 
-        <h1 className="font-bold text-3xl flex flex-row space-x-3 mb-2">
-          <FullLogo/>
-        </h1>
+        <div className="flex gap-4">
+          <NTHUModsLogo/>
+          <div className="flex flex-col">
+            <FullLogo/>
+            <p className="text-muted-foreground text-sm">Made with ❤️ by students for students</p>
+          </div>
+        </div>
 
-        <p className="text-gray-600 dark:text-gray-400">Made with ❤️ by students for students</p>
-
         <div className="py-2">
           <p className="text-xs text-gray-600 dark:text-gray-400">We desperately need more contributers, join us if you're interested</p>
           <p className="text-xs text-gray-600 dark:text-gray-400">就是你！我們很需要你加入我們，讓這個平臺更加完善！</p>
@@ -26,7 +29,7 @@ const Footer = () => {
           </Link>
         </Button>
         <Button variant="ghost" size="icon" asChild>
-          <Link target="_blank" href="mailto:chewtzihwee@gmail.com">
+          <Link target="_blank" href="mailto:nthumods@gmail.com">
             <Mail/>
           </Link>
         </Button>