Miscellaneous Tweaks (#212)

* Update index.tsx * Other tweaks * add ada lovelace rank --------- Co-authored-by: Faris Ashai <[email protected]>
acmucsd · Mar 31, 2024 · c93ec2f · c93ec2f
1 parent 4af1a9f
commit c93ec2f
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/src/components/layout/Navbar/index.tsx b/src/components/layout/Navbar/index.tsx
@@ -81,7 +81,9 @@ const Navbar = ({ accessType }: NavbarProps) => {
           <p aria-hidden>·</p>
           <Link href={config.eventsRoute}>Events</Link>
           <p aria-hidden>·</p>
-          <Link href="/leaderboard">Leaderboard</Link>
+          <Link href={config.leaderboardRoute}>Leaderboard</Link>
+          <p aria-hidden>·</p>
+          <Link href={config.store.homeRoute}>Store</Link>
         </nav>
         <nav className={styles.iconLinks}>
           <ThemeToggle />
@@ -90,9 +92,6 @@ const Navbar = ({ accessType }: NavbarProps) => {
               <SettingsIcon color="var(--theme-text-on-background-1)" className={styles.iconLink} />
             </Link>
           ) : null}
-          <Link href="/store" className={styles.iconLink}>
-            <ShopIcon color="var(--theme-text-on-background-1)" className={styles.iconLink} />
-          </Link>
           <Link href={config.profile.route} className={styles.iconLink}>
             <ProfileIcon color="var(--theme-text-on-background-1)" />
           </Link>
@@ -132,7 +131,7 @@ const Navbar = ({ accessType }: NavbarProps) => {
             Admin Settings
           </Link>
         ) : null}
-        <div>
+        <div className={styles.mobileSwitch}>
           <ThemeToggle />
         </div>
         <hr className={styles.wainbow} />

diff --git a/src/components/layout/Navbar/style.module.scss b/src/components/layout/Navbar/style.module.scss
@@ -158,6 +158,10 @@
         width: 24px;
       }
     }
+
+    .mobileSwitch {
+      padding-bottom: 0.75rem;
+    }
   }
 
   .wainbow {

diff --git a/src/components/layout/Navbar/style.module.scss.d.ts b/src/components/layout/Navbar/style.module.scss.d.ts
@@ -10,6 +10,7 @@ export type Styles = {
   loggedOut: string;
   mobileNav: string;
   mobileNavItem: string;
+  mobileSwitch: string;
   navLeft: string;
   portalLinks: string;
   toggleIcon: string;

diff --git a/src/lib/constants/ranks.ts b/src/lib/constants/ranks.ts
@@ -8,6 +8,22 @@ const ranks = [
   'nlog Naan',
   'Constant Cornbread',
   'Binary Baguette',
+  'Boolean Biscuit',
+  'Byte-sized Bagel',
+  'Gigabit Gingerbread',
+  'Hashed Hashbrown',
+  'Recursed Ravioli',
+  'Algorithmic Apple Pie',
+  'Kernel Krispie',
+  'Virtual Viennoiserie',
+  'Cybernetic Scone',
+  'Quantum Quiche',
+  'Firewall Flan',
+  'Turing Tart',
+  'Lovelace Layer Cake',
+  'Syntax Soufflé',
+  'Debugging Danish',
+  'Neural Network Nougat',
   'Blessed Boba',
   'Super Snu',
   'Soon(TM)',

diff --git a/src/pages/store/orders.tsx b/src/pages/store/orders.tsx
@@ -33,7 +33,7 @@ const orderInFilter = (order: PublicOrder, filter: string): boolean => {
 };
 
 const StoreOrderPage = ({ user: { credits }, orders, futurePickupEvents }: OrderPageProps) => {
-  const [filter, setFilter] = useState('past-6-months');
+  const [filter, setFilter] = useState('all-time');
 
   const filteredOrders = orders.filter(o => orderInFilter(o, filter));