Merge branch 'develop' into projects-page

UTDNebula · Apr 27, 2024 · e94103e · e94103e
2 parents 4e665f1 + 3119ec2
commit e94103e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 76 deletions.
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
@@ -45,21 +45,13 @@ const Footer = (props: FooterProps) => {
       </div>
       <div className="grid grid-cols-2 lg:grid-cols-4 gap-10">
         <div className="flex flex-col items-start gap-3">
-          <Link className={linkClasses} href="/about">
-            <h3 className="text-xl font-semibold mb-4">About us</h3>
-          </Link>
+          <h3 className="text-xl font-semibold mb-4">About us</h3>
           <Link className={linkClasses} href="/about/mission">
             Mission
           </Link>
           <Link className={linkClasses} href="/about/governance">
             Project Governance
           </Link>
-          <Link className={linkClasses} href="/membership">
-            Membership
-          </Link>
-          <Link className={linkClasses} href="/newsletter">
-            Newsletter
-          </Link>
           <Link className={linkClasses} href="/contact">
             Contact Us
           </Link>
@@ -156,17 +148,9 @@ const Footer = (props: FooterProps) => {
       <div className="md:pt-40 pt-10">
         <div className={'border-t-2 ' + (royalBg ? 'border-white' : 'border-black')} />
         <div className="flex md:flex-row flex-col justify-between gap-8 pt-8">
-          <div className="flex gap-x-8 gap-y-1 justify-around md:justify-normal flex-wrap">
-            <Link className={linkClasses} href="/legal/terms-of-service.txt">
-              Terms of Service
-            </Link>
-            <Link className={linkClasses} href="/legal/privacy-policy.txt">
-              Privacy Policy
-            </Link>
-            <Link className={linkClasses} href="/sitemap.xml">
-              Sitemap
-            </Link>
-          </div>
+          <Link className={linkClasses} href="/sitemap.xml">
+            Sitemap
+          </Link>
           <div className="md:text-right text-center text-xs">
             <p>© 2023 Nebula Labs Maintainers. All rights reserved.</p>
             <p>

diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
@@ -57,11 +57,7 @@ const childItems: Array<LinkItem> = [
   },
   {
     name: 'Membership',
-    link: '/membership',
-  },
-  {
-    name: 'Newsletter',
-    link: '/newsletter',
+    link: '/resources/roles',
   },
   {
     name: 'Contact Us',

diff --git a/src/pages/about/index.tsx b/src/pages/about/index.tsx
diff --git a/src/pages/membership.tsx b/src/pages/membership.tsx
diff --git a/src/pages/newsletter.tsx b/src/pages/newsletter.tsx