Merge branch 'main' into fix/vite-hmr

.editorconfig

@@ -8,5 +8,5 @@ trim_trailing_whitespace = true
 indent_size = 4
 indent_style = space
 
-[*.{nix,yaml,yml}]
+[*.nix]
 indent_size = 2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,9 +1,10 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: '[BUG] '
+title: "[BUG] "
 labels: ''
 assignees: ''
+
 ---
 
 **Pre-submission Checklist**
@@ -29,11 +30,11 @@ assignees: ''
 
 **Expected Behavior**
 
-<!-- What you expected to happen -->
+<!-- A clear and concise description of what you expected to happen -->
 
 **Current Behavior**
 
-<!-- What actually happened -->
+<!-- A clear and concise description of what actually happened -->
 
 **Screenshots**
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,10 @@
 ---
 name: Feature Request
 about: Suggest an idea for this project
-title: '[FEATURE] '
+title: "[FEATURE] "
 labels: feature
 assignees: ''
+
 ---
 
 **Pre-submission Checklist**
@@ -16,14 +17,18 @@ assignees: ''
 -   [ ] I have reviewed the documentation to confirm this feature doesn't exist
 -   [ ] I have completed all sections below with detailed information
 
-**Your Idea**
+**Feature Description**
 
-<!-- A clear and concise description of the feature you'd like to see, and how it would work -->
+<!-- A clear and concise description of the feature you'd like to see -->
+
+**Proposed Solution**
+
+<!-- A clear and concise description of what you want to happen -->
 
 **UI/UX Considerations**
 
-<!-- If this feature involves UI changes (aka how it looks), please describe the visual aspects -->
+<!-- If this feature involves UI changes, please describe the visual aspects -->
 
-**Other**
+**Technical Implementation Details**
 
-<!-- Any other comments you have can go here! -->
+<!-- If you have specific technical suggestions, list them here -->

.github/ISSUE_TEMPLATE/updating-build-dependencies.md

@@ -4,6 +4,7 @@ about: Updating Build Dependencies
 title: ''
 labels: build, dependencies
 assignees: doprz, Razboy20
+
 ---
 
 - [ ] Updated Nix Flake

.github/dependabot.yml

@@ -15,6 +15,7 @@ updates:
           major-updates:
               update-types:
                   - 'major'
+
       ignore:
          - dependency-name: '@crxjs/vite-plugin'
          - dependency-name: '@unocss/vite'

.github/workflows/best-practices.yml

@@ -1,33 +1,43 @@
 name: Best Practices
+
 on: [push, pull_request]
+
 jobs:
     lint:
         runs-on: ubuntu-latest
+
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
                   fetch-depth: 0
+
             - name: Setup pnpm
               uses: pnpm/action-setup@v4
               with:
                   version: 10
+
             - name: Install dependencies
               run: pnpm install
+
             - name: Run ESLint
               run: pnpm run lint
     format:
         runs-on: ubuntu-latest
+
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
                   fetch-depth: 0
+
             - name: Setup pnpm
               uses: pnpm/action-setup@v4
               with:
                   version: 10
+
             - name: Install dependencies
               run: pnpm install
+
             - name: Run Prettier
               run: pnpm run prettier

.github/workflows/check-types.yml

@@ -1,18 +1,24 @@
 name: Type Check
+
 on: [push, pull_request]
+
 jobs:
     type-check:
         runs-on: ubuntu-latest
+
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
                   fetch-depth: 0
+
             - name: Setup pnpm
               uses: pnpm/action-setup@v4
               with:
                   version: 10
+
             - name: Install dependencies
               run: pnpm install
+
             - name: Run tests
               run: pnpm run check-types

.github/workflows/chromatic.yml

@@ -1,5 +1,7 @@
 name: 'Chromatic'
+
 on: [push, pull_request]
+
 jobs:
     chromatic:
         runs-on: ubuntu-latest
@@ -12,8 +14,10 @@ jobs:
               uses: pnpm/action-setup@v4
               with:
                   version: 10
+
             - name: Install dependencies
               run: pnpm install
+
             - name: Publish to Chromatic
               uses: chromaui/action@latest
               with:

.github/workflows/release.yml

@@ -15,6 +15,7 @@ jobs:
             - uses: actions/checkout@master
             - name: Get file permission
               run: chmod -R 777 .
+
             - name: Install dependencies
               run: npm ci
             - name: Release with semantic-release

.github/workflows/tests.yml

@@ -1,18 +1,24 @@
 name: Tests
+
 on: [push, pull_request]
+
 jobs:
     test:
         runs-on: ubuntu-latest
+
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
               with:
                   fetch-depth: 0
+
             - name: Setup pnpm
               uses: pnpm/action-setup@v4
               with:
                   version: 10
+
             - name: Install dependencies
               run: pnpm install
+
             - name: Run tests
               run: pnpm test

.github/workflows/validate-pr.yml

@@ -1,6 +1,8 @@
 name: Validate PR Title
+
 # thank you ben limmer for this workflow:
 # https://github.com/blimmer/semantic-release-demo-2/blob/main/.github/workflows/lint-pr.yml
+
 on:
     pull_request_target:
         types:
@@ -8,6 +10,7 @@ on:
             - reopened
             - edited
             - synchronize
+
 jobs:
     main:
         runs-on: ubuntu-latest

.gitignore

@@ -212,9 +212,4 @@ package-lock.json
 storybook-static/
 package/
 
-# Nix
-result
-result-*
-
-# direnv
-.direnv
+.direnv/

.vscode/launch.json

@@ -6,9 +6,13 @@
             "request": "launch",
             "name": "Run current script",
             "runtimeExecutable": "npx",
-            "runtimeArgs": ["tsx"],
+            "runtimeArgs": [
+                "tsx"
+            ],
             "program": "${file}",
-            "skipFiles": ["<node_internals>/**"]
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
         }
     ]
 }

.vscode/settings.json

@@ -26,7 +26,7 @@
         "navigation": "Routes",
         "logging": "log",
         "popup": "Layout",
-        "storage": "Database"
+        "storage": "Database",
     },
     "material-icon-theme.files.associations": {
         "tsconfig.extension.json": "tsconfig",
@@ -36,5 +36,5 @@
     "[html]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "typescript.tsdk": "node_modules/typescript/lib"
+    "typescript.tsdk": "node_modules/typescript/lib",
 }

CHANGELOG.md

@@ -1,43 +1,9 @@
-## [2.3.0](https://github.com/Longhorn-Developers/UT-Registration-Plus/compare/v2.2.2...v2.3.0) (2026-01-07)
-
-### Features
-
-* add drag-and-drop import for schedules ([#661](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/661)) ([549c52a](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/549c52a39fee718f2bb07cfce33a294835a2246b)), closes [#446](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/446)
-* allow bypassing the 10-schedule limit ([#675](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/675)) ([6a67a32](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/6a67a32e4f50a5bdd20aa43789f199b822483e2d))
-* condense resourceLinks course schedule ([#676](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/676)) ([cee5f02](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/cee5f0284f09f39ca5ae64559d0b697646c77e74))
-* LHD birthday ([#717](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/717)) ([2d18553](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/2d18553f98c5146fa18699ae20462e7dcbc9d35c))
-* **nix:** add prettier-version-match check ([#713](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/713)) ([8ccf7fb](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/8ccf7fb37e769ba445f39c140ca9c1c4245cc1c1))
-* **nix:** build UTRP ([#714](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/714)) ([38bb29b](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/38bb29b20b97ed3cf8fd6511df16553fed1d58bb))
-
-### Bug Fixes
-
-* .editorconfig syntax for nix files ([b406d4d](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/b406d4dd244a25688c2b9621cf5d441228bd8913))
-* toSorted outdated chrome bug  ([#694](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/694)) ([4f5d8c6](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/4f5d8c6d20e3cfeb7b62520ba1819e297d2cc60f))
-## [2.2.2](https://github.com/Longhorn-Developers/UT-Registration-Plus/compare/v2.2.1...v2.2.2) (2025-10-13)
-
-### Features
-
-* add nix flake ([#593](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/593)) ([7b401ad](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/7b401add1565ff401bad99745ff9e53b9a7f899f))
-* automatically select new or duplicated schedules ([#583](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/583)) ([#589](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/589)) ([2a50f55](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/2a50f5580d3dbeb0d66546c23cf29bbb37d80da2))
-* **env:** add SENTRY env vars ([8f7e1bc](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/8f7e1bc0af6336549068e02b80df21d4e8f4ef9c))
-* export schedule button add to calendar ([#594](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/594)) ([5994ded](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/5994ded8be876cb55174d27d3fdb0832b21a0ff9))
-* **release:** v2.2.2 ([c21cbd7](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/c21cbd77f0764c03a711589ff4f957cb8c936eec))
-* search result shading ([#617](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/617)) ([be861b8](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/be861b823cb2cb7f6f4a1f266351eec3fc1c2f99))
-* show warning for courses of different semesters ([#570](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/570)) ([2e7dac1](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/2e7dac1e3eba757231ac07ac966231c08c703a16))
-* support summer grades, fix summer course parser ([#596](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/596)) ([2d92dd4](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/2d92dd47f00a44b7d48e92a8ffba94480e4e73f9))
-
-### Bug Fixes
-
-* fix or ignore various eslint warning ([#609](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/609)) ([95de8df](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/95de8df37243b6d59625df515a60442f11b7a9d3))
-* limit height of schedule list dropdown in the extension popup ([#543](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/543)) ([eb8141e](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/eb8141ee8c3d32bce901457178d50781b78f86dd))
-* whitespace wrapping in semester warning ([#629](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/629)) ([46fe591](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/46fe591fa72ef017eea7cfb8aa37d12d8f223926))
 ## [2.2.1](https://github.com/Longhorn-Developers/UT-Registration-Plus/compare/v2.2.0...v2.2.1) (2025-06-04)
 
 ### Features
 
 * add dining app promo ([#598](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/598)) ([be1dccf](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/be1dccfcb9d052c6b291b50cc53418d6bb645beb))
 * inside jokes005 ([#590](https://github.com/Longhorn-Developers/UT-Registration-Plus/issues/590)) ([37471ef](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/37471efb740c7a5828cf3b54bac70954694359d7))
-* **release:** v2.2.1 ([234f3d6](https://github.com/Longhorn-Developers/UT-Registration-Plus/commit/234f3d627d603adf8555b4d0e93106d198918169))
 
 ### Bug Fixes
 

CODE_OF_CONDUCT.md

@@ -1,32 +0,0 @@
-# UT Registration Plus Code of Conduct
-
-Like the technical community as a whole, the UT Registration Plus team and community is made up of a mixture of professionals and volunteers from all over the world, working on every aspect of the mission - including mentorship, teaching, and connecting people.
-
-Diversity is one of our huge strengths, but it can also lead to communication issues and unhappiness. To that end, we have a few ground rules that we ask people to adhere to. This code applies equally to founders, mentors and those seeking help and guidance.
-
-This isn’t an exhaustive list of things that you can’t do. Rather, take it in the spirit in which it’s intended - a guide to make it easier to enrich all of us and the technical communities in which we participate.
-
-This code of conduct applies to all spaces managed by the UT Registration Plus project or Longhorn Developers. This includes IRC, the mailing lists, the issue tracker, DSF events, and any other forums created by the project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them.
-
-If you believe someone is violating the code of conduct, we ask that you report it by emailing [contact@longhorns.dev](mailto:contact@longhorns.dev). For more details please see our
-
-- **Be friendly and patient.**
-- **Be welcoming.** We strive to be a community that welcomes and supports people of all backgrounds and identities. This includes, but is not limited to members of any race, ethnicity, culture, national origin, colour, immigration status, social and economic class, educational level, sex, sexual orientation, gender identity and expression, age, size, family status, political belief, religion, and mental and physical ability.
-- **Be considerate.** Your work will be used by other people, and you in turn will depend on the work of others. Any decision you take will affect users and colleagues, and you should take those consequences into account when making decisions. Remember that we're a world-wide community, so you might not be communicating in someone else's primary language.
-- **Be respectful.** Not all of us will agree all the time, but disagreement is no excuse for poor behavior and poor manners. We might all experience some frustration now and then, but we cannot allow that frustration to turn into a personal attack. It’s important to remember that a community where people feel uncomfortable or threatened is not a productive one. Members of the UT Registration Plus community should be respectful when dealing with other members as well as with people outside the UT Registration Plus community.
-- **Be careful in the words that you choose.** We are a community of professionals, and we conduct ourselves professionally. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behavior aren't acceptable. This includes, but is not limited to:
-- Violent threats or language directed against another person.
-- Discriminatory jokes and language.
-- Posting sexually explicit or violent material.
-- Posting (or threatening to post) other people's personally identifying information ("doxing").
-- Personal insults, especially those using racist or sexist terms.
-- Unwelcome sexual attention.
-- Advocating for, or encouraging, any of the above behavior.
-- Repeated harassment of others. In general, if someone asks you to stop, then stop.
-- **When we disagree, try to understand why.** Disagreements, both social and technical, happen all the time and UT Registration Plus is no exception. It is important that we resolve disagreements and differing views constructively. Remember that we’re different. The strength of UT Registration Plus comes from its varied community, people from a wide range of backgrounds. Different people have different perspectives on issues. Being unable to understand why someone holds a viewpoint doesn’t mean that they’re wrong. Don’t forget that it is human to err and blaming each other doesn’t get us anywhere. Instead, focus on helping to resolve issues and learning from mistakes.
-
-Original text courtesy of the [Speak Up! project](http://web.archive.org/web/20141109123859/http://speakup.io/coc.html).
-
-## Questions?
-
-If you have questions, please see . If that doesn't answer your questions, feel free to [contact us](mailto:contact@longhorns.dev).

README.md

@@ -205,7 +205,7 @@ Special thanks to the developers and contributors behind these amazing tools and
 
 ## Activity
 
-![UT-Registration-Plus Activity](https://repobeats.axiom.co/api/embed/47930fa3916ac1b475cd63a05948c449eb5ad502.svg 'UT-Registration-Plus Repobeats analytics image')
+![UT-Registration-Plus Activity](https://repobeats.axiom.co/api/embed/47930fa3916ac1b475cd63a05948c449eb5ad502.svg "UT-Registration-Plus Repobeats analytics image")
 
 ## Star History
 

default.nix

@@ -1,10 +0,0 @@
-(import (
-  let
-    rev = "v1.1.0";
-    sha256 = "sha256:19d2z6xsvpxm184m41qrpi1bplilwipgnzv9jy17fgw421785q1m";
-  in
-  fetchTarball {
-    inherit sha256;
-    url = "https://github.com/NixOS/flake-compat/archive/${rev}.tar.gz";
-  }
-) { src = ./.; }).defaultNix

docker-entrypoint.sh

@@ -24,7 +24,7 @@ else
 fi
 
 # Validate the mode
-if [[ ! " ${SUPPORTED_MODES[*]} " =~  ${mode}  ]]; then
+if [[ ! " ${SUPPORTED_MODES[*]} " =~ " ${mode} " ]]; then
     echo "Error: Invalid mode '${mode}'" >&2
     usage
 fi

flake.lock

@@ -1,30 +1,30 @@
 {
   "nodes": {
-    "flake-parts": {
+    "flake-utils": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1767609335,
-        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
+        "owner": "numtide",
+        "repo": "flake-utils",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767640445,
-        "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=",
+        "lastModified": 1754725699,
+        "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5",
+        "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054",
         "type": "github"
       },
       "original": {
@@ -34,59 +34,24 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1765674936,
-        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1761236834,
-        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs",
-        "treefmt-nix": "treefmt-nix"
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
+    "systems": {
       "locked": {
-        "lastModified": 1767468822,
-        "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
+        "owner": "nix-systems",
+        "repo": "default",
         "type": "github"
       }
     }

flake.nix

@@ -1,33 +1,36 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-parts.url = "github:hercules-ci/flake-parts";
-    treefmt-nix.url = "github:numtide/treefmt-nix";
+    flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs =
-    inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = inputs.nixpkgs.lib.systems.flakeExposed;
-
-      imports = [
-        ./nix/packages.nix
-        ./nix/devShells.nix
-        ./nix/treefmt.nix
-      ];
-
-      perSystem =
-        { system, ... }:
     {
-          _module.args.pkgs = import inputs.nixpkgs {
-            inherit system;
-            overlays = [
-              (final: prev: {
-                nodejs = prev.nodejs_20; # v20.19.5
-              })
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = (import nixpkgs { inherit system; });
+      in
+      {
+        formatter = pkgs.nixfmt-rfc-style;
+
+        devShells.default = pkgs.mkShell {
+          name = "utrp-dev";
+          buildInputs = with pkgs; [
+            nodejs_20 # v20.19.4
+            pnpm_10 # v10.14.0
           ];
-            config = { };
-          };
-        };
+
+          shellHook = ''
+            echo "UTRP Nix Flake Environment Loaded"
+            echo "Node: $(node --version)"
+            echo "pnpm: $(pnpm --version)"
+          '';
         };
       }
+    );
+}

nix/devShells.nix

@@ -1,30 +0,0 @@
-{
-  perSystem =
-    {
-      pkgs,
-      ...
-    }:
-    let
-      commonPackages = with pkgs; [
-        nodejs # Defined in overlay
-        pnpm_10 # v10.18.2
-      ];
-
-      additionalPackages = with pkgs; [
-        bun
-        nodePackages.conventional-changelog-cli
-        sentry-cli
-      ];
-    in
-    {
-      devShells.default = pkgs.mkShell {
-        name = "utrp-dev";
-        packages = commonPackages;
-      };
-
-      devShells.full = pkgs.mkShell {
-        name = "utrp-dev-full";
-        packages = commonPackages ++ additionalPackages;
-      };
-    };
-}

nix/package.nix

@@ -1,51 +0,0 @@
-{
-  stdenv,
-  lib,
-  nodejs,
-  pnpm_10,
-  git,
-  version ? "dev",
-  gitRev ? "unknown",
-  gitBranch ? "unknown",
-  buildScript ? "build",
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  inherit version;
-  pname = "ut-registration-plus";
-
-  src = ../.;
-
-  nativeBuildInputs = [
-    nodejs
-    pnpm_10.configHook
-    git
-  ];
-
-  pnpmDeps = pnpm_10.fetchDeps {
-    inherit (finalAttrs) pname version src;
-    fetcherVersion = 2;
-    hash = "sha256-UqHymJWvlTV4glra/6DkxuCxbG5dpPkFcnvq3vuxsJ8=";
-  };
-
-  # Pass git info to the build
-  VITE_GIT_COMMIT = gitRev;
-  VITE_GIT_BRANCH = gitBranch;
-
-  buildPhase = ''
-    pnpm run ${buildScript}
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r dist/* $out/
-  '';
-
-  meta = {
-    description = "UT Registration Plus";
-    homepage = "https://github.com/Longhorn-Developers/UT-Registration-Plus";
-    license = lib.licenses.mit;
-    maintainers = lib.maintainers.doprz;
-    platforms = lib.platforms.unix;
-  };
-})

nix/packages.nix

@@ -1,40 +0,0 @@
-{ inputs, ... }:
-{
-  perSystem =
-    { pkgs, ... }:
-    let
-      packageJson = builtins.fromJSON (builtins.readFile ../package.json);
-      gitRev = inputs.self.shortRev or inputs.self.dirtyShortRev or "dev";
-      gitBranch = if inputs.self ? ref then inputs.self.ref else "unknown";
-      baseVersion = packageJson.version;
-
-      commonArgs = {
-        inherit gitRev gitBranch;
-      };
-
-      # Prod variant
-      ut-registration-plus = pkgs.callPackage ./package.nix (
-        commonArgs
-        // {
-          version = "${baseVersion}+git.${gitRev}";
-          buildScript = "build";
-        }
-      );
-
-      # Dev variant
-      ut-registration-plus-dev = pkgs.callPackage ./package.nix (
-        commonArgs
-        // {
-          version = "${baseVersion}-dev+git.${gitRev}";
-          buildScript = "build:dev";
-        }
-      );
-    in
-    {
-      packages = {
-        inherit ut-registration-plus ut-registration-plus-dev;
-        default = ut-registration-plus;
-        dev = ut-registration-plus-dev;
-      };
-    };
-}

nix/treefmt.nix

@@ -1,63 +0,0 @@
-{ inputs, ... }:
-{
-  imports = [
-    inputs.treefmt-nix.flakeModule
-  ];
-
-  perSystem =
-    { pkgs, ... }:
-    {
-      treefmt = {
-        projectRootFile = "flake.nix";
-        programs.nixfmt.enable = pkgs.lib.meta.availableOn pkgs.stdenv.buildPlatform pkgs.nixfmt-rfc-style.compiler;
-        programs.nixfmt.package = pkgs.nixfmt-rfc-style;
-
-        # NOTE: Make sure the prettier version in package.json and the one used by treefmt are the same for consistent results
-        programs.prettier.enable = true;
-        programs.shellcheck.enable = true;
-        programs.yamlfmt.enable = true;
-        programs.dockerfmt.enable = true;
-
-        settings.formatter.prettier.excludes = [ "pnpm-lock.yaml" ];
-        settings.formatter.shellcheck.excludes = [ ".envrc" ];
-        settings.formatter.yamlfmt.excludes = [ "pnpm-lock.yaml" ];
-      };
-
-      checks = {
-        prettier-version-match =
-          pkgs.runCommand "check-prettier-version"
-            {
-              buildInputs = [ pkgs.jq ];
-            }
-            ''
-              # Extract prettier version from package.json
-              packageJsonVersion=$(jq -r '.devDependencies.prettier // empty' ${../package.json})
-
-              if [ -z "$packageJsonVersion" ]; then
-                echo "Error: prettier not found in package.json devDependencies"
-                exit 1
-              fi
-
-              # Remove any semver prefix characters (^, ~, etc...)
-              packageJsonVersion=$(echo "$packageJsonVersion" | sed 's/^[\^~>=<]*//')
-
-              # Get prettier version from nixpkgs
-              nixVersion="${pkgs.nodePackages.prettier.version}"
-
-              if [ "$packageJsonVersion" != "$nixVersion" ]; then
-                echo ""
-                echo "ERROR: Prettier version mismatch!"
-                echo "  package.json: $packageJsonVersion"
-                echo "  nixpkgs:      $nixVersion"
-                echo ""
-                echo "Please update one of the following:"
-                echo "  - Update prettier in package.json to match nixpkgs: $nixVersion"
-                echo "  - Override prettier in your flake to match package.json"
-                exit 1
-              fi
-
-              touch $out
-            '';
-      };
-    };
-}

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ut-registration-plus",
     "displayName": "UT Registration Plus",
-    "version": "2.3.0",
+    "version": "2.2.1",
     "description": "UT Registration Plus is a Chrome extension that allows students to easily register for classes.",
     "private": true,
     "homepage": "https://github.com/Longhorn-Developers/UT-Registration-Plus",
@@ -39,11 +39,8 @@
         "@phosphor-icons/react": "^2.1.7",
         "@sentry/react": "^8.55.0",
         "@tanstack/react-query": "^5.69.0",
-        "@tsparticles/engine": "^3.9.1",
-        "@tsparticles/react": "^3.0.0",
-        "@tsparticles/slim": "^3.9.1",
-        "@unocss/vite": "^0.63.6",
-        "@vitejs/plugin-react": "^4.3.4",
+		"@unocss/vite": "^66.5.1",
+		"@vitejs/plugin-react": "^5.0.2",
         "chrome-extension-toolkit": "^0.0.54",
         "clsx": "^2.1.1",
         "conventional-changelog": "^6.0.0",
@@ -69,7 +66,7 @@
         "@commitlint/cli": "^19.7.1",
         "@commitlint/config-conventional": "^19.7.1",
         "@commitlint/types": "^19.5.0",
-        "@crxjs/vite-plugin": "2.0.0-beta.21",
+		"@crxjs/vite-plugin": "2.2.0",
         "@iconify-json/bi": "^1.2.2",
         "@iconify-json/ic": "^1.2.2",
         "@iconify-json/iconoir": "^1.2.7",
@@ -91,7 +88,7 @@
         "@types/conventional-changelog": "^3.1.5",
         "@types/gulp": "^4.0.17",
         "@types/gulp-zip": "^4.0.4",
-        "@types/node": "^22.13.5",
+		"@types/node": "^22.18.0",
         "@types/prompts": "^2.4.9",
         "@types/react": "^18.3.18",
         "@types/react-dom": "^18.3.5",
@@ -101,14 +98,14 @@
         "@types/sql.js": "^1.4.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
-        "@unocss/eslint-config": "^0.63.6",
-        "@unocss/postcss": "^0.63.6",
-        "@unocss/preset-uno": "^0.63.6",
-        "@unocss/preset-web-fonts": "^0.63.6",
-        "@unocss/reset": "^0.63.6",
-        "@unocss/transformer-directives": "^0.63.6",
-        "@unocss/transformer-variant-group": "^0.63.6",
-        "@vitejs/plugin-react-swc": "^3.8.0",
+		"@unocss/eslint-config": "^66.5.1",
+		"@unocss/postcss": "^66.5.1",
+		"@unocss/preset-web-fonts": "^66.5.1",
+		"@unocss/preset-wind4": "^66.5.1",
+		"@unocss/reset": "^66.5.1",
+		"@unocss/transformer-directives": "^66.5.1",
+		"@unocss/transformer-variant-group": "^66.5.1",
+		"@vitejs/plugin-react-swc": "^4.0.1",
         "@vitest/coverage-v8": "^2.1.9",
         "@vitest/ui": "^2.1.9",
         "chalk": "^5.4.1",
@@ -139,16 +136,16 @@
         "gulp-zip": "^6.1.0",
         "path": "^0.12.7",
         "postcss": "^8.5.3",
-        "prettier": "3.6.2",
+        "prettier": "^3.5.2",
         "react-dev-utils": "^12.0.1",
         "semantic-release": "^24.2.3",
         "storybook": "^8.6.0",
         "typescript": "^5.7.3",
-        "unocss": "^0.63.6",
-        "unocss-preset-primitives": "0.0.2-beta.1",
+		"unocss": "^66.5.1",
+		"unocss-preset-primitives": "0.0.2-beta.2",
         "unplugin-icons": "^0.19.3",
-        "vite": "^5.4.20",
-        "vite-plugin-inspect": "^0.8.9",
+		"vite": "^7.1.5",
+		"vite-plugin-inspect": "^11.3.3",
         "vitest": "^2.1.9"
     },
     "engineStrict": true,
@@ -157,14 +154,11 @@
     },
     "pnpm": {
         "patchedDependencies": {
-            "@crxjs/vite-plugin@2.0.0-beta.21": "patches/@crxjs__vite-plugin@2.0.0-beta.21.patch",
-            "@unocss/vite": "patches/@unocss__vite.patch"
-        },
-        "overrides": {
-            "es-module-lexer": "^1.5.4"
+			"@unocss/vite": "patches/@unocss__vite.patch",
+			"@crxjs/vite-plugin": "patches/@crxjs__vite-plugin.patch"
         },
 		"onlyBuiltDependencies": [
-            "@tsparticles/engine"
+			"@swc/core"
 		]
     },
     "volta": {

patches/@crxjs__vite-plugin@2.0.0-beta.21.patch

@@ -1,105 +0,0 @@
-diff --git a/dist/index.mjs b/dist/index.mjs
-index 5c3f6291168987c56b816428080e6f1fe9de7107..abaf6290fe9454ae036a81eacbe7dc3be2fdfbc3 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -499,16 +499,43 @@ ${sourceMap}
-     }),
-     mergeMap(async ({ target, code, deps }) => {
-       await lexer.init;
--      const [imports] = lexer.parse(code, fileName);
-+      const [imports, exports] = lexer.parse(code, fileName);
-       const depSet = new Set(deps);
-       const magic = new MagicString(code);
--      for (const i of imports)
-+      for (const i of imports) {
-         if (i.n) {
-           depSet.add(i.n);
-           const fileName2 = getFileName({ type: "module", id: i.n });
-           const fullImport = code.substring(i.s, i.e);
--          magic.overwrite(i.s, i.e, fullImport.replace(i.n, `/${fileName2}`));
-+          const hmrTimestamp = fullImport.match(/\bt=\d{13}&?\b/);
-+          magic.overwrite(
-+            i.s,
-+            i.e,
-+            fullImport.replace(
-+              i.n,
-+              `/${fileName2}${hmrTimestamp ? `?${hmrTimestamp[0]}` : ""}`
-+            )
-+          );
-+        }
-+      }
-+      for (const e of exports) {
-+        if (e.n === "default") {
-+          const regex = /\s+['"](.*)['"]/y;
-+          regex.lastIndex = e.e;
-+          const fullExport = regex.exec(code)?.[1];
-+          if (!fullExport)
-+            continue;
-+          const start = regex.lastIndex - fullExport.length - 1;
-+          const end = regex.lastIndex - 1;
-+          if (fullExport.startsWith("/node_modules")) {
-+            magic.overwrite(
-+              start,
-+              end,
-+              `http://localhost:5173${fullExport}`
-+            );
-+          }
-         }
-+      }
-       return { target, source: magic.toString(), deps: [...depSet] };
-     })
-   );
-@@ -1229,10 +1256,14 @@ const pluginHMR = () => {
-       handleHotUpdate({ modules, server }) {
-         const { root } = server.config;
-         const relFiles = /* @__PURE__ */ new Set();
--        for (const m of modules)
-+        function getRelFile(file) {
-+          return file.startsWith(root) ? file.slice(server.config.root.length) : file;
-+        }
-+        for (const m of modules) {
-           if (m.id?.startsWith(root)) {
-             relFiles.add(m.id.slice(server.config.root.length));
-           }
-+        }
-         if (inputManifestFiles.background.length) {
-           const background = prefix$1("/", inputManifestFiles.background[0]);
-           if (relFiles.has(background) || modules.some(isImporter(join(server.config.root, background)))) {
-@@ -1244,7 +1275,14 @@ const pluginHMR = () => {
-         for (const [key, script] of contentScripts)
-           if (key === script.id) {
-             if (relFiles.has(script.id) || modules.some(isImporter(join(server.config.root, script.id)))) {
--              relFiles.forEach((relFile) => update(relFile));
-+              modules.filter((mod) => mod.id?.startsWith(root)).forEach((mod) => {
-+                update(getRelFile(mod.id));
-+                if (mod.file?.endsWith(".scss")) {
-+                  mod.importers.forEach((imp) => {
-+                    update(getRelFile(imp.id));
-+                  });
-+                }
-+              });
-             }
-           }
-       }
-@@ -1882,7 +1920,7 @@ const pluginWebAccessibleResources = () => {
-         if (contentScripts.size > 0) {
-           const viteManifest = parseJsonAsset(
-             bundle,
--            "manifest.json"
-+            ".vite/manifest.json"
-           );
-           const viteFiles = /* @__PURE__ */ new Map();
-           for (const [, file] of Object.entries(viteManifest))
-diff --git a/package.json b/package.json
-index e0c47ae66ff399ad3a78abf38d8d93d1f038c55d..f84eb09ffbb5c41094935dd06e04ffe831e2d05a 100644
---- a/package.json
-+++ b/package.json
-@@ -70,7 +70,7 @@
-     "connect-injector": "^0.4.4",
-     "convert-source-map": "^1.7.0",
-     "debug": "^4.3.3",
--    "es-module-lexer": "^0.10.0",
-+    "es-module-lexer": "^1.4.1",
-     "fast-glob": "^3.2.11",
-     "fs-extra": "^10.0.1",
-     "jsesc": "^3.0.2",

patches/@unocss__vite.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/index.mjs b/dist/index.mjs
-index 7210f5fd650a0b7bb36b467fff85feb0d8e4ec63..c8f98bd314daec0b91c514ea9d9fc2b79cea8502 100644
+index 3b94c870f00ce7e70be208199db48a3bd5569830..4aaaec7d5b656f1c4066c6295d5228d746420d17 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -369,15 +369,15 @@ const VIRTUAL_ENTRY_ALIAS = [
+@@ -24,8 +24,8 @@ const VIRTUAL_ENTRY_ALIAS = [
    /^(?:virtual:)?uno(?::(.+))?\.css(\?.*)?$/
  ];
  const LAYER_MARK_ALL = "__ALL__";
@@ -10,27 +10,19 @@ index 7210f5fd650a0b7bb36b467fff85feb0d8e4ec63..c8f98bd314daec0b91c514ea9d9fc2b7
 -const RESOLVED_ID_RE = /[/\\]__uno(?:_(.*?))?\.css$/;
 +const RESOLVED_ID_WITH_QUERY_RE = /[/\\]uno(_.*?)?\.css(\?.*)?$/;
 +const RESOLVED_ID_RE = /[/\\]uno(?:_(.*?))?\.css$/;
- function resolveId(id) {
-   if (id.match(RESOLVED_ID_WITH_QUERY_RE))
-     return id;
+ 
+ const defaultPipelineExclude = [cssIdRE];
+ const defaultPipelineInclude = [/\.(vue|svelte|[jt]sx|vine.ts|mdx?|astro|elm|php|phtml|html)($|\?)/];
+@@ -468,7 +468,7 @@ function resolveId(id, importer) {
    for (const alias of VIRTUAL_ENTRY_ALIAS) {
      const match = id.match(alias);
      if (match) {
--      return match[1] ? `/__uno_${match[1]}.css` : "/__uno.css";
-+      return match[1] ? `/uno_${match[1]}.css` : "/uno.css";
-     }
-   }
- }
-@@ -652,7 +652,7 @@ function GlobalModeBuildPlugin(ctx) {
-         css = await applyCssTransform(css, fakeCssId, options.dir, this);
-         const transformHandler = "handler" in cssPost.transform ? cssPost.transform.handler : cssPost.transform;
-         if (isLegacy) {
--          await transformHandler.call({}, css, "/__uno.css");
-+          await transformHandler.call({}, css, "/uno.css");
-         } else {
-           const hash = getHash(css);
-           await transformHandler.call({}, getHashPlaceholder(hash), fakeCssId);
-@@ -914,7 +914,7 @@ function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules,
+-      let virtual = match[1] ? `__uno_${match[1]}.css` : "__uno.css";
++      let virtual = match[1] ? `uno_${match[1]}.css` : "uno.css";
+       virtual += match[2] || "";
+       if (importer)
+         virtual = resolve$1(importer, "..", virtual);
+@@ -813,7 +813,7 @@ function GlobalModeDevPlugin(ctx) {
          const { hash, css } = await generateCSS(layer);
          return {
            // add hash to the chunk of CSS that it will send back to client to check if there is new CSS generated
@@ -39,7 +31,7 @@ index 7210f5fd650a0b7bb36b467fff85feb0d8e4ec63..c8f98bd314daec0b91c514ea9d9fc2b7
            map: { mappings: "" }
          };
        },
-@@ -933,7 +933,7 @@ function GlobalModeDevPlugin({ uno, tokens, tasks, flushTasks, affectedModules,
+@@ -832,7 +832,7 @@ function GlobalModeDevPlugin(ctx) {
          if (layer && code.includes("import.meta.hot")) {
            let hmr = `
  try {

shell.nix

@@ -1,10 +0,0 @@
-(import (
-  let
-    rev = "v1.1.0";
-    sha256 = "sha256:19d2z6xsvpxm184m41qrpi1bplilwipgnzv9jy17fgw421785q1m";
-  in
-  fetchTarball {
-    inherit sha256;
-    url = "https://github.com/NixOS/flake-compat/archive/${rev}.tar.gz";
-  }
-) { src = ./.; }).shellNix

src/manifest.ts

@@ -38,7 +38,12 @@ const manifest = defineManifest(async () => ({
     host_permissions: process.env.MODE === 'development' ? [...HOST_PERMISSIONS, '<all_urls>'] : HOST_PERMISSIONS,
     action: {
         default_popup: 'src/pages/popup/index.html',
-        default_icon: `icons/icon_${mode}_32.png`,
+        default_icon: {
+            '16': `icons/icon_${mode}_16.png`,
+            '32': `icons/icon_${mode}_32.png`,
+            '48': `icons/icon_${mode}_48.png`,
+            '128': `icons/icon_${mode}_128.png`,
+        },
     },
     icons: {
         '16': `icons/icon_${mode}_16.png`,

src/pages/404/Page404.tsx

@@ -271,12 +271,12 @@ export default function Page404(): JSX.Element {
         }
         function _0x5629d1() {
             let _0x13c635 = _0xdd3699;
-            (_0x5b7f43(),
+            _0x5b7f43(),
                 _0x16f39e[_0x13c635(0x81)](
                     _0x228047,
                     0x9c + -0x1 * 0x23ab + 0x230f * 0x1,
                     -0x1c26 + 0x7bf + -0x6cd * -0x3
-                ));
+                );
         }
         let _0x93f360 = 0x64 * 0x49 + 0x1e1e + -0x3aa2;
         function _0x5b7f43() {
@@ -373,12 +373,12 @@ export default function Page404(): JSX.Element {
                                         (-0x2469 + 0x156a * -0x1 + 0x39e2)) +
                                     (-0x1 * 0x13f8 + 0x6df + -0x1 * -0xd29);
                                 if (_0x3e178a == 0x1 * -0x1a87 + 0x1fdd + -0x555 * 0x1) {
-                                    ((_0x546fb5 =
+                                    (_0x546fb5 =
                                         (_0x227002 * (-0x10d7 + 0x1 * 0x15ad + -0x2 * 0x263)) &
                                         (-0x25ca * 0x1 + 0x8 * 0x278 + -0x1 * -0x1219)),
                                         (_0x1667c5 =
                                             (_0x32116b * (0x4d3 + 0x1c09 * -0x1 + 0x3 * 0x7c2)) &
-                                            (-0xf06 * 0x2 + -0x144f * -0x1 + -0x344 * -0x3)));
+                                            (-0xf06 * 0x2 + -0x144f * -0x1 + -0x344 * -0x3));
                                     if (_0x5b3085 < -0xa * 0xed + -0xd19 + 0x1 * 0x165b)
                                         _0x1667c5 += -0xd48 + 0xf6c + 0xc * -0x2b;
                                 }
@@ -410,10 +410,10 @@ export default function Page404(): JSX.Element {
                                         (-0x2709 + -0x6 * -0x312 + -0x39a * -0x6)),
                                     (_0x267dd3 = _0x38c463));
                             }
-                            ((_0x227002 += _0x4b089b),
+                            (_0x227002 += _0x4b089b),
                                 (_0x2aec99 += _0x5b3085),
                                 (_0x32116b += _0x1eaaad),
-                                (_0x38c463 += _0x57383c));
+                                (_0x38c463 += _0x57383c);
                         }
                     }
                     let _0x5cba48 =
@@ -430,7 +430,7 @@ export default function Page404(): JSX.Element {
                     let _0xdf8389 =
                         ((_0x13f1b0 & (-0x247a + -0x4 * -0x9c2 + -0x39 * 0x7)) * _0x2062a9 * _0x5c387a) /
                         ((0x1d5 * 0xa + -0x250a + -0x31 * -0x67) * (-0x7 * 0x25f + -0xae7 + 0x1c7f * 0x1));
-                    ((_0x228047[_0x4626de(0x8e)][
+                    (_0x228047[_0x4626de(0x8e)][
                         (_0x132623 + _0x1a573d * _0x124180) * (0x29 * -0xa9 + -0x94 * -0x2b + -0x239 * -0x1) +
                             (0x55d * 0x2 + 0xeed * 0x1 + -0xc7 * 0x21)
                     ] = _0x5cba48),
@@ -441,7 +441,7 @@ export default function Page404(): JSX.Element {
                         (_0x228047[_0x4626de(0x8e)][
                             (_0x132623 + _0x1a573d * _0x124180) * (0x1e2a + -0x21df + -0x1 * -0x3b9) +
                                 (0x1e79 + 0x860 * -0x2 + 0x1 * -0xdb7)
-                        ] = _0xdf8389));
+                        ] = _0xdf8389);
                 }
             }
         }

src/pages/background/background.ts

@@ -9,7 +9,6 @@ import onUpdate from './events/onUpdate';
 import browserActionHandler from './handler/browserActionHandler';
 import calendarBackgroundHandler from './handler/calendarBackgroundHandler';
 import CESHandler from './handler/CESHandler';
-import gitHubStatsHandler from './handler/gitHubStatsHandler';
 import tabManagementHandler from './handler/tabManagementHandler';
 import userScheduleHandler from './handler/userScheduleHandler';
 
@@ -53,7 +52,6 @@ const messageListener = new MessageListener<BACKGROUND_MESSAGES>({
     ...userScheduleHandler,
     ...CESHandler,
     ...calendarBackgroundHandler,
-    ...gitHubStatsHandler,
 });
 
 messageListener.listen();

src/pages/background/handler/gitHubStatsHandler.ts

@@ -1,31 +0,0 @@
-import type GitHubStatsMessages from '@shared/messages/GitHubStatsMessages';
-import { GitHubStatsService } from '@views/lib/getGitHubStats';
-import type { MessageHandler } from 'chrome-extension-toolkit';
-
-const gitHubStatsService = new GitHubStatsService();
-
-/**
- * Handler for GitHub stats related messages
- */
-const gitHubStatsHandler: MessageHandler<GitHubStatsMessages> = {
-    async fetchGitHubStats({ data, sendResponse }) {
-        try {
-            const includeMergedPRs = data ?? false;
-            const stats = await gitHubStatsService.fetchGitHubStats({ includeMergedPRs });
-            sendResponse(stats);
-        } catch (error) {
-            console.error('Error fetching GitHub stats in background:', error);
-            sendResponse({
-                adminGitHubStats: {},
-                userGitHubStats: {},
-                contributors: [],
-                names: {},
-                dataFetched: new Date(),
-                lastUpdated: new Date(),
-                isCached: false,
-            });
-        }
-    },
-};
-
-export default gitHubStatsHandler;

src/pages/content/index.tsx

@@ -10,9 +10,8 @@ const support = getSiteSupport(window.location.href);
 
 const renderComponent = (Component: React.ComponentType) => {
     const container = document.createElement('div');
-    container.id = 'extension-root';
-    document.body.appendChild(container);
 
+    // all components are portaled away, not actually rendered to screen
     createRoot(container).render(
         <React.StrictMode>
             <Component />

src/shared/messages/GitHubStatsMessages.ts

@@ -1,14 +0,0 @@
-import type { GitHubStatsService } from '@views/lib/getGitHubStats';
-
-/* eslint-disable jsdoc/require-jsdoc */
-
-export type GitHubStatsResult = Awaited<ReturnType<GitHubStatsService['fetchGitHubStats']>>;
-
-export default interface GitHubStatsMessages {
-    /**
-     * Fetch GitHub statistics for all contributors
-     * @param includeMergedPRs - Whether to include merged PR counts (optional, default: false)
-     * @returns GitHub stats including commits, lines added/deleted, and optionally merged PRs
-     */
-    fetchGitHubStats: (includeMergedPRs?: boolean) => GitHubStatsResult;
-}

src/shared/messages/index.ts

@@ -3,7 +3,6 @@ import { createMessenger } from 'chrome-extension-toolkit';
 import type BrowserActionMessages from './BrowserActionMessages';
 import type { CalendarBackgroundMessages, CalendarTabMessages } from './CalendarMessages';
 import type CESMessage from './CESMessage';
-import type GitHubStatsMessages from './GitHubStatsMessages';
 import type TabInfoMessages from './TabInfoMessages';
 import type TabManagementMessages from './TabManagementMessages';
 import type { UserScheduleMessages } from './UserScheduleMessages';
@@ -15,8 +14,7 @@ export type BACKGROUND_MESSAGES = BrowserActionMessages &
     TabManagementMessages &
     UserScheduleMessages &
     CESMessage &
-    CalendarBackgroundMessages &
-    GitHubStatsMessages;
+    CalendarBackgroundMessages;
 
 /**
  * This is a type with all the message definitions that can be sent TO specific tabs

src/shared/storage/OptionsStore.ts

@@ -24,8 +24,6 @@ export interface IOptionsStore {
 
     /** whether the promo should be shown */
     showUTDiningPromo: boolean;
-    /** whether users are allowed to bypass the 10 schedule limit */
-    allowMoreSchedules: boolean;
 }
 
 export const OptionsStore = createSyncStore<IOptionsStore>({
@@ -36,7 +34,6 @@ export const OptionsStore = createSyncStore<IOptionsStore>({
     alwaysOpenCalendarInNewTab: false,
     showCalendarSidebar: true,
     showUTDiningPromo: true,
-    allowMoreSchedules: false,
 });
 
 /**
@@ -53,7 +50,6 @@ export const initSettings = async () =>
         alwaysOpenCalendarInNewTab: await OptionsStore.get('alwaysOpenCalendarInNewTab'),
         showCalendarSidebar: await OptionsStore.get('showCalendarSidebar'),
         showUTDiningPromo: await OptionsStore.get('showUTDiningPromo'),
-        allowMoreSchedules: await OptionsStore.get('allowMoreSchedules'),
     }) satisfies IOptionsStore;
 
 // Clothing retailer right

src/stories/components/CalendarFooter.stories.tsx

@@ -1,19 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/react';
-import CalendarFooter from '@views/components/calendar/CalendarFooter';
-import React from 'react';
-
-const meta = {
-    title: 'Components/Calendar/CalendarFooter',
-    component: CalendarFooter,
-    parameters: {
-        layout: 'centered',
-    },
-    tags: ['autodocs'],
-} satisfies Meta<typeof CalendarFooter>;
-
-export default meta;
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {
-    args: {},
-};

src/views/components/calendar/Calendar.tsx

@@ -114,12 +114,11 @@ export default function Calendar(): ReactNode {
                             <LargeLogo />
                             <Button
                                 variant='minimal'
-                                size='small'
                                 color='theme-black'
                                 onClick={() => {
                                     setShowSidebar(!showSidebar);
                                 }}
-                                className='screenshot:hidden'
+                                className='h-fit screenshot:hidden !p-0'
                                 icon={Sidebar}
                             />
                         </div>

src/views/components/calendar/CalendarCourseCellColorPicker/CourseCellColorPicker.tsx

@@ -124,7 +124,9 @@ export default function CourseCellColorPicker({ defaultColor }: CourseCellColorP
                 <>
                     <Divider orientation='horizontal' size='100%' className='my-1' />
                     <div className='grid grid-cols-6 gap-1'>
-                        {colorPatchColors.get(selectedBaseColor)?.map(shadeColor => (
+                        {colorPatchColors
+                            .get(selectedBaseColor)
+                            ?.map(shadeColor => (
                                 <ColorPatch
                                     key={shadeColor}
                                     color={shadeColor}

src/views/components/calendar/CalendarFooter.tsx

@@ -58,7 +58,13 @@ export default function CalendarFooter(): JSX.Element {
                 ))}
             </div>
             <div>
-                <Button variant='minimal' size='small' icon={GearSix} color='ut-black' onClick={handleOpenOptions} />
+                <Button
+                    className='h-fit w-fit !p-0'
+                    variant='minimal'
+                    icon={GearSix}
+                    color='ut-black'
+                    onClick={handleOpenOptions}
+                />
             </div>
         </footer>
     );

src/views/components/calendar/CalendarHeader/CalendarHeader.tsx

@@ -28,15 +28,14 @@ export default function CalendarHeader({ sidebarOpen, onSidebarToggle }: Calenda
     return (
         <div
             style={{ scrollbarGutter: 'stable' }}
-            className='sticky left-0 right-0 top-0 z-10 min-h-[85px] flex items-center gap-5 overflow-x-auto overflow-y-hidden bg-white pl-spacing-7 pt-spacing-5'
+            className='sticky left-0 right-0 top-0 z-10 min-h-[85px] flex items-center gap-5 overflow-x-scroll overflow-y-hidden bg-white pl-spacing-7 pt-spacing-5'
         >
             {!sidebarOpen && (
                 <Button
                     variant='minimal'
-                    size='small'
                     color='theme-black'
                     onClick={onSidebarToggle}
-                    className='screenshot:hidden'
+                    className='h-fit w-fit screenshot:hidden !p-0'
                     icon={Sidebar}
                 />
             )}

src/views/components/calendar/CalendarSchedules.tsx

@@ -26,16 +26,15 @@ export function CalendarSchedules() {
     };
 
     return (
-        <div className='min-w-full w-0 flex flex-col items-center gap-y-spacing-2'>
-            <div className='m0 w-full flex items-center justify-between'>
+        <div className='min-w-full w-0 flex flex-col items-center gap-y-spacing-3'>
+            <div className='m0 w-full flex justify-between'>
                 <Text variant='h3' className='text-nowrap text-theme-black'>
                     MY SCHEDULES
                 </Text>
                 <Button
                     variant='minimal'
-                    size='small'
                     color='theme-black'
-                    className='!p-0 btn'
+                    className='h-fit w-fit !p-0 btn'
                     onClick={handleAddSchedule}
                     icon={Plus}
                 />

src/views/components/calendar/ResourceLinks.tsx

@@ -14,21 +14,21 @@ interface LinkItem {
 }
 
 const links: LinkItem[] = [
-    // {
-    //     text: "Fall '25 Course Schedule",
-    //     url: 'https://utdirect.utexas.edu/apps/registrar/course_schedule/20259/',
-    // },
-    // {
-    //     text: 'Course Schedule Archives',
-    //     url: 'https://registrar.utexas.edu/schedules/archive',
-    // },
     {
         text: "Spring '26 Course Schedule",
         url: 'https://utdirect.utexas.edu/apps/registrar/course_schedule/20262/',
     },
     {
-        text: 'Other Course Schedules',
-        url: 'https://registrar.utexas.edu/schedules',
+        text: "Fall '25 Course Schedule",
+        url: 'https://utdirect.utexas.edu/apps/registrar/course_schedule/20259/',
+    },
+    {
+        text: "Summer '25 Course Schedule",
+        url: 'https://utdirect.utexas.edu/apps/registrar/course_schedule/20256/',
+    },
+    {
+        text: 'Course Schedule Archives',
+        url: 'https://registrar.utexas.edu/schedules/archive',
     },
     {
         text: 'My Degree Audit (IDA)',

src/views/components/calendar/utils.ts

@@ -444,8 +444,7 @@ export const calculateCourseCellColumns = (dayCells: CalendarGridCourse[]) => {
                 typeof cell.calendarGridPoint.startIndex === 'number' &&
                 cell.calendarGridPoint.startIndex >= 0
         )
-        .slice()
-        .sort((a, b) => a.calendarGridPoint.startIndex - b.calendarGridPoint.startIndex);
+        .toSorted((a, b) => a.calendarGridPoint.startIndex - b.calendarGridPoint.startIndex);
 
     // Initialize metadata
     for (const cell of cells) {

src/views/components/common/FileUpload.tsx

@@ -4,7 +4,7 @@ import type { ThemeColor } from '@shared/types/ThemeColors';
 import { getThemeColorHexByName, getThemeColorRgbByName } from '@shared/util/themeColors';
 import Text from '@views/components/common/Text/Text';
 import clsx from 'clsx';
-import React, { useEffect, useRef, useState } from 'react';
+import React from 'react';
 
 interface Props {
     className?: string;
@@ -21,8 +21,9 @@ interface Props {
 }
 
 /**
- * A reusable input button component that follows Button.tsx consistency.
- * Now supports drag-and-drop file uploads (issue #446).
+ * A reusable input button component that follows the Button.tsx consistency
+ *
+ * @returns
  */
 export default function FileUpload({
     className,
@@ -42,74 +43,22 @@ export default function FileUpload({
     const isIconOnly = !children && !!icon;
     const colorHex = getThemeColorHexByName(color);
     const colorRgb = getThemeColorRgbByName(color)?.join(' ');
-    const inputRef = useRef<HTMLInputElement>(null);
-    const [isDragging, setIsDragging] = useState(false);
 
-    // Convert accept array to comma-separated list
+    // Convert accept to a comma-separated string if it's an array
     const acceptValue = Array.isArray(accept) ? accept.join(',') : accept;
 
-    // --- Prevent Chrome from opening the file on drop anywhere else ---
-    useEffect(() => {
-        const preventDefault = (e: DragEvent) => {
-            e.preventDefault();
-            e.stopPropagation();
-        };
-
-        window.addEventListener('dragover', preventDefault);
-        window.addEventListener('drop', preventDefault);
-
-        return () => {
-            window.removeEventListener('dragover', preventDefault);
-            window.removeEventListener('drop', preventDefault);
-        };
-    }, []);
-    // ------------------------------------------------------------------
-
-    // --- Local drag and drop handlers for this button only -------------
-    const handleDrop = (event: React.DragEvent<HTMLLabelElement>) => {
-        event.preventDefault();
-        event.stopPropagation();
-        setIsDragging(false);
-        if (disabled) return;
-
-        const file = event.dataTransfer.files?.[0];
-        if (file && inputRef.current && onChange) {
-            const dataTransfer = new DataTransfer();
-            dataTransfer.items.add(file);
-            inputRef.current.files = dataTransfer.files;
-
-            // Trigger change event manually
-            onChange({ target: inputRef.current } as React.ChangeEvent<HTMLInputElement>);
-        }
-    };
-
-    const handleDragOver = (event: React.DragEvent<HTMLLabelElement>) => {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!disabled) setIsDragging(true);
-    };
-
-    const handleDragLeave = (event: React.DragEvent<HTMLLabelElement>) => {
-        event.preventDefault();
-        event.stopPropagation();
-        setIsDragging(false);
-    };
-    // ------------------------------------------------------------------
-
     return (
         <label
-            onDrop={handleDrop}
-            onDragOver={handleDragOver}
-            onDragLeave={handleDragLeave}
-            style={{
+            style={
+                {
                     ...style,
                     color: disabled ? 'ut-gray' : colorHex,
-                backgroundColor: `rgb(${colorRgb} / var(--un-bg-opacity))`,
-            }}
+                    backgroundColor: `rgb(${colorRgb} / var(--un-bg-opacity)`,
+                } satisfies React.CSSProperties
+            }
             className={clsx(
-                'btn transition-colors select-none',
+                'btn',
                 {
-                    'ring-2 ring-offset-2 ring-blue-400': isDragging && !disabled,
                     'text-white! bg-opacity-100 hover:enabled:shadow-md active:enabled:shadow-sm shadow-black/20':
                         variant === 'filled',
                     'bg-opacity-0 border-current hover:enabled:bg-opacity-8 border stroke-width-[1px]':
@@ -121,7 +70,6 @@ export default function FileUpload({
                     'h-[35px] w-[35px] p-spacing-2': size === 'small' && isIconOnly,
                     'h-6 p-spacing-2': size === 'mini' && !isIconOnly,
                     'h-6 w-6 p-0': size === 'mini' && isIconOnly,
-                    'opacity-60 cursor-not-allowed': disabled,
                 },
                 className
             )}
@@ -137,7 +85,6 @@ export default function FileUpload({
                 </Text>
             )}
             <input
-                ref={inputRef}
                 type='file'
                 {...(accept ? { accept: acceptValue } : {})}
                 className='hidden'

src/views/components/common/Link.tsx

@@ -34,7 +34,7 @@ export default function Link(props: PropsWithChildren<Props>): JSX.Element {
             tabIndex={isDisabled ? -1 : 0}
             className={clsx(
                 {
-                    'underline cursor-pointer p-2': !isDisabled,
+                    'underline cursor-pointer': !isDisabled,
                     'cursor-not-allowed color-ut-gray': isDisabled,
                 },
                 className

src/views/components/injected/CourseCatalogInjectedPopup/HeadingAndActions.tsx

@@ -175,11 +175,11 @@ export default function HeadingAndActions({ course, activeSchedule, onClose }: H
                     description: (
                         <>
                             The section you&apos;re adding is for{' '}
-                            <span className='whitespace-nowrap text-ut-burntorange'>
+                            <span className='text-ut-burntorange whitespace-nowrap'>
                                 {course.semester.season} {course.semester.year}
                             </span>
                             , but your current schedule contains sections in{' '}
-                            <span className='whitespace-nowrap text-ut-burntorange'>{activeSemesters}</span>. Mixing
+                            <span className='text-ut-burntorange whitespace-nowrap'>{activeSemesters}</span>. Mixing
                             semesters in one schedule may cause confusion.
                         </>
                     ),

src/views/components/settings/AdvancedSettings.tsx

@@ -1,197 +0,0 @@
-import { Trash } from '@phosphor-icons/react';
-import { OptionsStore } from '@shared/storage/OptionsStore';
-import MIMEType from '@shared/types/MIMEType';
-import type { UserSchedule } from '@shared/types/UserSchedule';
-import { handleExportJson } from '@views/components/calendar/utils';
-import { Button } from '@views/components/common/Button';
-import Divider from '@views/components/common/Divider';
-import SwitchButton from '@views/components/common/SwitchButton';
-import Text from '@views/components/common/Text/Text';
-import clsx from 'clsx';
-import React from 'react';
-
-import FileUpload from '../common/FileUpload';
-import { DISPLAY_PREVIEWS, PREVIEW_SECTION_DIV_CLASSNAME } from './constants';
-import Preview from './Preview';
-
-interface AdvancedSettingsProps {
-    highlightConflicts: boolean;
-    setHighlightConflicts: (value: boolean) => void;
-    loadAllCourses: boolean;
-    setLoadAllCourses: (value: boolean) => void;
-    increaseScheduleLimit: boolean;
-    setIncreaseScheduleLimit: (value: boolean) => void;
-    calendarNewTab: boolean;
-    setCalendarNewTab: (value: boolean) => void;
-    activeSchedule: UserSchedule;
-    handleEraseAll: () => void;
-    handleImportClick: (event: React.ChangeEvent<HTMLInputElement>) => Promise<void>;
-}
-
-/**
- * Settings section component for advanced settings
- */
-export const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
-    highlightConflicts,
-    setHighlightConflicts,
-    loadAllCourses,
-    setLoadAllCourses,
-    increaseScheduleLimit,
-    setIncreaseScheduleLimit,
-    calendarNewTab,
-    setCalendarNewTab,
-    activeSchedule,
-    handleEraseAll,
-    handleImportClick,
-}) => (
-    <section className='mb-8'>
-        <h2 className='mb-4 text-xl text-ut-black font-semibold'>ADVANCED SETTINGS</h2>
-        <div className='flex space-x-4'>
-            <div className={PREVIEW_SECTION_DIV_CLASSNAME}>
-                <div className='flex items-center justify-between'>
-                    <div className='max-w-xs'>
-                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
-                            Export Current Schedule
-                        </Text>
-                        <p className='text-sm text-gray-600'>Backup your active schedule to a portable file</p>
-                    </div>
-                    <Button
-                        variant='outline'
-                        color='ut-burntorange'
-                        onClick={() => handleExportJson(activeSchedule.id)}
-                    >
-                        Export
-                    </Button>
-                </div>
-
-                <Divider size='auto' orientation='horizontal' />
-
-                <div className='flex items-center justify-between'>
-                    <div className='max-w-xs'>
-                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
-                            Import Schedule
-                        </Text>
-                        <p className='text-sm text-gray-600'>Import from a schedule file</p>
-                    </div>
-                    <FileUpload
-                        variant='filled'
-                        color='ut-burntorange'
-                        onChange={handleImportClick}
-                        accept={MIMEType.JSON}
-                    >
-                        Import Schedule
-                    </FileUpload>
-                </div>
-
-                <Divider size='auto' orientation='horizontal' />
-
-                <div className='flex items-center justify-between'>
-                    <div className='max-w-xs'>
-                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
-                            Course Conflict Highlight
-                        </Text>
-                        <p className='text-sm text-gray-600'>
-                            Adds a red strikethrough to courses that have conflicting times.
-                        </p>
-                    </div>
-                    <SwitchButton
-                        isChecked={highlightConflicts}
-                        onChange={() => {
-                            setHighlightConflicts(!highlightConflicts);
-                            OptionsStore.set('enableHighlightConflicts', !highlightConflicts);
-                        }}
-                    />
-                </div>
-
-                <Divider size='auto' orientation='horizontal' />
-
-                <div className='flex items-center justify-between'>
-                    <div className='max-w-xs'>
-                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
-                            Load All Courses in Course Schedule
-                        </Text>
-                        <p className='text-sm text-gray-600'>
-                            Loads all courses in the Course Schedule site by scrolling, instead of using next/prev page
-                            buttons.
-                        </p>
-                    </div>
-                    <SwitchButton
-                        isChecked={loadAllCourses}
-                        onChange={() => {
-                            setLoadAllCourses(!loadAllCourses);
-                            OptionsStore.set('enableScrollToLoad', !loadAllCourses);
-                        }}
-                    />
-                </div>
-
-                <Divider size='auto' orientation='horizontal' />
-
-                <div className='flex items-center justify-between'>
-                    <div className='max-w-xs'>
-                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
-                            Allow more than 10 schedules
-                        </Text>
-                        <p className='text-sm text-gray-600'>
-                            Allow bypassing the 10-schedule limit. Intended for advisors or staff who need to create
-                            many schedules on behalf of students.
-                        </p>
-                    </div>
-                    <SwitchButton
-                        isChecked={increaseScheduleLimit}
-                        onChange={() => {
-                            setIncreaseScheduleLimit(!increaseScheduleLimit);
-                            OptionsStore.set('allowMoreSchedules', !increaseScheduleLimit);
-                        }}
-                    />
-                </div>
-
-                <Divider size='auto' orientation='horizontal' />
-
-                <div className='flex items-center justify-between'>
-                    <div className='max-w-xs'>
-                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
-                            Always Open Calendar in New Tab
-                        </Text>
-                        <p className='text-sm text-gray-600'>
-                            Always opens the calendar view in a new tab when navigating to the calendar page. May
-                            prevent issues where the calendar refuses to open.
-                        </p>
-                    </div>
-                    <SwitchButton
-                        isChecked={calendarNewTab}
-                        onChange={() => {
-                            setCalendarNewTab(!calendarNewTab);
-                            OptionsStore.set('alwaysOpenCalendarInNewTab', !calendarNewTab);
-                        }}
-                    />
-                </div>
-
-                <Divider size='auto' orientation='horizontal' />
-
-                <div className='flex items-center justify-between'>
-                    <div className='max-w-xs'>
-                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
-                            Reset All Data
-                        </Text>
-                        <p className='text-sm text-gray-600'>Erases all schedules and courses you have.</p>
-                    </div>
-                    <Button variant='outline' color='theme-red' icon={Trash} onClick={handleEraseAll}>
-                        Erase All
-                    </Button>
-                </div>
-            </div>
-            {DISPLAY_PREVIEWS && (
-                <Preview>
-                    <Text
-                        variant='h2-course'
-                        className={clsx('text-center text-theme-red font-normal', {
-                            'line-through': highlightConflicts,
-                        })}
-                    >
-                        01234 MWF 10:00 AM - 11:00 AM UTC 1.234
-                    </Text>
-                </Preview>
-            )}
-        </div>
-    </section>
-);

src/views/components/settings/ContributorCard.tsx

@@ -1,54 +0,0 @@
-import Text from '@views/components/common/Text/Text';
-import React from 'react';
-
-interface ContributorCardProps {
-    name: string;
-    githubUsername: string;
-    roles: string[];
-    stats?: {
-        commits: number;
-        linesAdded: number;
-        linesDeleted: number;
-        mergedPRs?: number;
-    };
-    showStats: boolean;
-    includeMergedPRs: boolean;
-}
-
-/**
- * GitHub contributor card component
- */
-export const ContributorCard: React.FC<ContributorCardProps> = ({
-    name,
-    githubUsername,
-    roles,
-    stats,
-    showStats,
-    includeMergedPRs,
-}) => (
-    <div className='border border-gray-300 rounded bg-ut-gray/10 p-4'>
-        <Text
-            variant='p'
-            className='text-ut-burntorange font-semibold hover:cursor-pointer'
-            onClick={() => window.open(`https://github.com/${githubUsername}`, '_blank')}
-        >
-            {name}
-        </Text>
-        {roles.map(role => (
-            <p key={`${githubUsername}-${role}`} className='text-sm text-gray-600'>
-                {role}
-            </p>
-        ))}
-        {showStats && stats && (
-            <div className='mt-2'>
-                <p className='text-xs text-gray-500'>GitHub Stats (UTRP repo):</p>
-                {includeMergedPRs && stats.mergedPRs !== undefined && (
-                    <p className='text-xs'>Merged PRs: {stats.mergedPRs}</p>
-                )}
-                <p className='text-xs'>Commits: {stats.commits}</p>
-                <p className='text-xs text-ut-green'>{stats.linesAdded}++</p>
-                <p className='text-xs text-theme-red'>{stats.linesDeleted}--</p>
-            </div>
-        )}
-    </div>
-);

src/views/components/settings/Settings.tsx

@@ -1,68 +1,114 @@
-// Pages
+// import addCourse from '@pages/background/lib/addCourse';
 import { addCourseByURL } from '@pages/background/lib/addCourseByURL';
 import { deleteAllSchedules } from '@pages/background/lib/deleteSchedule';
 import importSchedule from '@pages/background/lib/importSchedule';
-import { CalendarDots } from '@phosphor-icons/react';
-// Shared
+import { CalendarDots, Trash } from '@phosphor-icons/react';
 import { background } from '@shared/messages';
 import { DevStore } from '@shared/storage/DevStore';
 import { initSettings, OptionsStore } from '@shared/storage/OptionsStore';
 import { CRX_PAGES } from '@shared/types/CRXPages';
-import Particles from '@tsparticles/react';
+import MIMEType from '@shared/types/MIMEType';
+// import { addCourseByUrl } from '@shared/util/courseUtils';
+// import { getCourseColors } from '@shared/util/colors';
+// import CalendarCourseCell from '@views/components/calendar/CalendarCourseCell';
 import { Button } from '@views/components/common/Button';
 import { usePrompt } from '@views/components/common/DialogProvider/DialogProvider';
-// Views
 import Divider from '@views/components/common/Divider';
 import { LargeLogo } from '@views/components/common/LogoIcon';
+// import PopupCourseBlock from '@views/components/common/PopupCourseBlock';
+import SwitchButton from '@views/components/common/SwitchButton';
 import Text from '@views/components/common/Text/Text';
-// Hooks
 import useChangelog from '@views/hooks/useChangelog';
 import useSchedules from '@views/hooks/useSchedules';
+// import { CourseCatalogScraper } from '@views/lib/CourseCatalogScraper';
+// import getCourseTableRows from '@views/lib/getCourseTableRows';
 import { GitHubStatsService, LONGHORN_DEVELOPERS_ADMINS, LONGHORN_DEVELOPERS_SWE } from '@views/lib/getGitHubStats';
-// Misc
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+// import { SiteSupport } from '@views/lib/getSiteSupport';
+import clsx from 'clsx';
+import React, { useCallback, useEffect, useState } from 'react';
 
-// Icons
 import IconoirGitFork from '~icons/iconoir/git-fork';
 
+import { handleExportJson } from '../calendar/utils';
+// import { ExampleCourse } from 'src/stories/components/ConflictsWithWarning.stories';;
+import FileUpload from '../common/FileUpload';
 import { useMigrationDialog } from '../common/MigrationDialog';
-import { AdvancedSettings } from './AdvancedSettings';
-import { DEV_MODE_CLICK_TARGET, INCLUDE_MERGED_PRS, STATS_TOGGLE_KEY } from './constants';
-import { ContributorCard } from './ContributorCard';
+// import RefreshIcon from '~icons/material-symbols/refresh';
 import DevMode from './DevMode';
-import { useBirthdayCelebration } from './useBirthdayCelebration';
-import { useDevMode } from './useDevMode';
+import Preview from './Preview';
 
 const manifest = chrome.runtime.getManifest();
 
+const gitHubStatsService = new GitHubStatsService();
+const includeMergedPRs = false;
+
+const DISPLAY_PREVIEWS = false;
+const PREVIEW_SECTION_DIV_CLASSNAME = DISPLAY_PREVIEWS ? 'w-1/2 space-y-4' : 'flex-grow space-y-4';
+
 /**
- * Main Settings Component for managing user settings and preferences.
+ * Custom hook for enabling developer mode.
+ *
+ * @param targetCount - The target count to activate developer mode.
+ * @returns A tuple containing a boolean indicating if developer mode is active and a function to increment the count.
+ */
+const useDevMode = (targetCount: number): [boolean, () => void] => {
+    const [count, setCount] = useState(0);
+    const [active, setActive] = useState(false);
+    const [lastClick, setLastClick] = useState(0);
+
+    const incrementCount = useCallback(() => {
+        const now = Date.now();
+        if (now - lastClick < 500) {
+            setCount(prevCount => {
+                const newCount = prevCount + 1;
+                if (newCount === targetCount) {
+                    setActive(true);
+                }
+                return newCount;
+            });
+        } else {
+            setCount(1);
+        }
+        setLastClick(now);
+    }, [lastClick, targetCount]);
+
+    useEffect(() => {
+        const timer = setTimeout(() => setCount(0), 3000);
+        return () => clearTimeout(timer);
+    }, [count]);
+
+    return [active, incrementCount];
+};
+
+/**
+ * Component for managing user settings and preferences.
  *
  * @returns The Settings component.
  */
 export default function Settings(): JSX.Element {
-    const gitHubStatsService = useMemo(() => new GitHubStatsService(), []);
+    const [_enableCourseStatusChips, setEnableCourseStatusChips] = useState<boolean>(false);
+    // const [_showTimeLocation, setShowTimeLocation] = useState<boolean>(false);
+    const [highlightConflicts, setHighlightConflicts] = useState<boolean>(false);
+    const [loadAllCourses, setLoadAllCourses] = useState<boolean>(false);
+    const [_enableDataRefreshing, setEnableDataRefreshing] = useState<boolean>(false);
+    const [calendarNewTab, setCalendarNewTab] = useState<boolean>(false);
 
-    // State
-    const [highlightConflicts, setHighlightConflicts] = useState(false);
-    const [loadAllCourses, setLoadAllCourses] = useState(false);
-    const [calendarNewTab, setCalendarNewTab] = useState(false);
-    const [increaseScheduleLimit, setIncreaseScheduleLimit] = useState(false);
-    const [showGitHubStats, setShowGitHubStats] = useState(false);
+    const showMigrationDialog = useMigrationDialog();
+
+    // Toggle GitHub stats when the user presses the 'S' key
+    const [showGitHubStats, setShowGitHubStats] = useState<boolean>(false);
     const [githubStats, setGitHubStats] = useState<Awaited<
         ReturnType<typeof gitHubStatsService.fetchGitHubStats>
     > | null>(null);
-    const [isDeveloper, setIsDeveloper] = useState(false);
 
     const [activeSchedule] = useSchedules();
+    // const [isRefreshing, setIsRefreshing] = useState<boolean>(false);
+
+    const [isDeveloper, setIsDeveloper] = useState<boolean>(false);
+
     const showDialog = usePrompt();
     const handleChangelogOnClick = useChangelog();
-    const showMigrationDialog = useMigrationDialog();
 
-    const [devMode, toggleDevMode] = useDevMode(DEV_MODE_CLICK_TARGET);
-    const { showParticles, particlesInit, particlesOptions, triggerCelebration, isBirthday } = useBirthdayCelebration();
-
-    // Initialize settings and listeners
     useEffect(() => {
         const fetchGitHubStats = async () => {
             try {
@@ -74,12 +120,19 @@ export default function Settings(): JSX.Element {
         };
 
         const initAndSetSettings = async () => {
-            const { enableHighlightConflicts, enableScrollToLoad, alwaysOpenCalendarInNewTab, allowMoreSchedules } =
-                await initSettings();
+            const {
+                enableCourseStatusChips,
+                enableHighlightConflicts,
+                enableScrollToLoad,
+                enableDataRefreshing,
+                alwaysOpenCalendarInNewTab,
+            } = await initSettings();
+            setEnableCourseStatusChips(enableCourseStatusChips);
+            // setShowTimeLocation(enableTimeAndLocationInPopup);
             setHighlightConflicts(enableHighlightConflicts);
             setLoadAllCourses(enableScrollToLoad);
+            setEnableDataRefreshing(enableDataRefreshing);
             setCalendarNewTab(alwaysOpenCalendarInNewTab);
-            setIncreaseScheduleLimit(allowMoreSchedules);
         };
 
         const initDS = async () => {
@@ -87,50 +140,68 @@ export default function Settings(): JSX.Element {
             setIsDeveloper(isDev);
         };
 
-        const handleKeyPress = (event: KeyboardEvent) => {
-            if (event.key === STATS_TOGGLE_KEY || event.key === STATS_TOGGLE_KEY.toUpperCase()) {
-                setShowGitHubStats(prev => !prev);
-            }
-        };
-
-        // Listeners
         const ds_l1 = DevStore.listen('isDeveloper', async ({ newValue }) => {
             setIsDeveloper(newValue);
         });
 
-        const l1 = OptionsStore.listen('enableHighlightConflicts', async ({ newValue }) => {
-            setHighlightConflicts(newValue);
-        });
-
-        const l2 = OptionsStore.listen('enableScrollToLoad', async ({ newValue }) => {
-            setLoadAllCourses(newValue);
-        });
-
-        const l3 = OptionsStore.listen('alwaysOpenCalendarInNewTab', async ({ newValue }) => {
-            setCalendarNewTab(newValue);
-        });
-
-        const l4 = OptionsStore.listen('allowMoreSchedules', async ({ newValue }) => {
-            setIncreaseScheduleLimit(newValue);
-        });
-
-        window.addEventListener('keydown', handleKeyPress);
-
         initDS();
         fetchGitHubStats();
         initAndSetSettings();
 
+        const handleKeyPress = (event: KeyboardEvent) => {
+            if (event.key === 'S' || event.key === 's') {
+                setShowGitHubStats(prev => !prev);
+            }
+        };
+
+        window.addEventListener('keydown', handleKeyPress);
+
+        // Listen for changes in the settings
+        const l1 = OptionsStore.listen('enableCourseStatusChips', async ({ newValue }) => {
+            setEnableCourseStatusChips(newValue);
+            // console.log('enableCourseStatusChips', newValue);
+        });
+
+        // const l2 = OptionsStore.listen('enableTimeAndLocationInPopup', async ({ newValue }) => {
+        //     setShowTimeLocation(newValue);
+        //     // console.log('enableTimeAndLocationInPopup', newValue);
+        // });
+
+        const l2 = OptionsStore.listen('enableHighlightConflicts', async ({ newValue }) => {
+            setHighlightConflicts(newValue);
+            // console.log('enableHighlightConflicts', newValue);
+        });
+
+        const l3 = OptionsStore.listen('enableScrollToLoad', async ({ newValue }) => {
+            setLoadAllCourses(newValue);
+            // console.log('enableScrollToLoad', newValue);
+        });
+
+        const l4 = OptionsStore.listen('enableDataRefreshing', async ({ newValue }) => {
+            setEnableDataRefreshing(newValue);
+            // console.log('enableDataRefreshing', newValue);
+        });
+
+        const l5 = OptionsStore.listen('alwaysOpenCalendarInNewTab', async ({ newValue }) => {
+            setCalendarNewTab(newValue);
+            // console.log('alwaysOpenCalendarInNewTab', newValue);
+        });
+
+        // Remove listeners when the component is unmounted
         return () => {
             OptionsStore.removeListener(l1);
             OptionsStore.removeListener(l2);
             OptionsStore.removeListener(l3);
             OptionsStore.removeListener(l4);
+            OptionsStore.removeListener(l5);
+
             DevStore.removeListener(ds_l1);
+
             window.removeEventListener('keydown', handleKeyPress);
         };
-    }, [gitHubStatsService]);
+    }, []);
 
-    const handleEraseAll = useCallback(() => {
+    const handleEraseAll = () => {
         showDialog({
             title: 'Erase All Course/Schedule Data',
             description: (
@@ -157,45 +228,34 @@ export default function Settings(): JSX.Element {
                 </Button>
             ),
         });
-    }, [showDialog]);
+    };
 
-    const handleImportClick = useCallback(async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const handleImportClick = async (event: React.ChangeEvent<HTMLInputElement>) => {
         const file = event.target.files?.[0];
-        if (!file) return;
-
+        if (file) {
+            const reader = new FileReader();
+            reader.onload = async e => {
                 try {
-            const text = await file.text();
-            const data = JSON.parse(text);
-            await importSchedule(data);
-            alert('Schedule imported successfully.');
+                    const result = e.target?.result as string;
+                    const jsonObject = JSON.parse(result);
+                    await importSchedule(jsonObject);
                 } catch (error) {
-            console.error('Error importing schedule:', error);
-            alert('Failed to import schedule. Make sure the file is a valid .json format.');
+                    console.error('Invalid import file!');
                 }
-    }, []);
+            };
+            reader.readAsText(file);
+        }
+    };
 
-    const sortedContributors = useMemo(() => {
-        if (!githubStats) return LONGHORN_DEVELOPERS_SWE;
-        return [...LONGHORN_DEVELOPERS_SWE].sort(
-            (a, b) =>
-                (githubStats.userGitHubStats[b.githubUsername]?.commits ?? 0) -
-                (githubStats.userGitHubStats[a.githubUsername]?.commits ?? 0)
-        );
-    }, [githubStats]);
+    // const handleAddCourseByLink = async () => {
+    //     // todo: Use a proper modal instead of a prompt
+    //     const link: string | null = prompt('Enter course link');
+    //     // Exit if the user cancels the prompt
+    //     if (link === null) return;
+    //     await addCourseByUrl(link, activeSchedule);
+    // };
 
-    const additionalContributors = useMemo(() => {
-        if (!githubStats) return [];
-        return Object.keys(githubStats.userGitHubStats)
-            .filter(
-                username =>
-                    !LONGHORN_DEVELOPERS_ADMINS.some(admin => admin.githubUsername === username) &&
-                    !LONGHORN_DEVELOPERS_SWE.some(swe => swe.githubUsername === username)
-            )
-            .sort(
-                (a, b) =>
-                    (githubStats.userGitHubStats[b]?.commits ?? 0) - (githubStats.userGitHubStats[a]?.commits ?? 0)
-            );
-    }, [githubStats]);
+    const [devMode, toggleDevMode] = useDevMode(10);
 
     if (devMode) {
         DevStore.set('isDeveloper', true);
@@ -203,32 +263,13 @@ export default function Settings(): JSX.Element {
     }
 
     return (
-        <div className='relative'>
-            {particlesInit && showParticles && (
-                <Particles
-                    id='birthday-particles'
-                    options={particlesOptions}
-                    className='pointer-events-none absolute inset-0 z-50'
-                />
-            )}
-
+        <div>
             <header className='flex items-center gap-5 overflow-x-auto overflow-y-hidden border-b border-ut-offwhite px-7 py-4 md:overflow-x-hidden'>
                 <LargeLogo />
                 <Divider className='mx-2 self-center md:mx-4' size='2.5rem' orientation='vertical' />
-                <div className='flex flex-1 items-center gap-2'>
-                    <Text variant='h1' className='text-ut-burntorange normal-case'>
+                <Text variant='h1' className='flex-1 text-ut-burntorange normal-case!'>
                     Settings and Credits
                 </Text>
-                    {isBirthday && (
-                        <span
-                            onClick={triggerCelebration}
-                            className='cursor-pointer px-4 text-sm text-ut-burntorange transition-transform hover:scale-110'
-                            title='Click to celebrate!'
-                        >
-                            🎉 Happy Birthday LHD! 🎉
-                        </span>
-                    )}
-                </div>
                 <div className='hidden flex-row items-center justify-end gap-6 screenshot:hidden lg:flex'>
                     <Button variant='minimal' color='theme-black' onClick={handleChangelogOnClick}>
                         <IconoirGitFork className='h-6 w-6 text-ut-gray' />
@@ -249,19 +290,219 @@ export default function Settings(): JSX.Element {
 
             <div className='p-6 lg:flex'>
                 <div className='mr-4 lg:w-1/2 xl:w-xl'>
-                    <AdvancedSettings
-                        highlightConflicts={highlightConflicts}
-                        setHighlightConflicts={setHighlightConflicts}
-                        loadAllCourses={loadAllCourses}
-                        setLoadAllCourses={setLoadAllCourses}
-                        increaseScheduleLimit={increaseScheduleLimit}
-                        setIncreaseScheduleLimit={setIncreaseScheduleLimit}
-                        calendarNewTab={calendarNewTab}
-                        setCalendarNewTab={setCalendarNewTab}
-                        activeSchedule={activeSchedule}
-                        handleEraseAll={handleEraseAll}
-                        handleImportClick={handleImportClick}
+                    {/* <section className='mb-8'>
+                        <h2 className='mb-4 text-xl text-ut-black font-semibold'>CUSTOMIZATION OPTIONS</h2>
+                        <div className='flex space-x-4'>
+                            <div className='w-1/2 space-y-4'>
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <h3 className='text-ut-burntorange font-semibold'>Show Course Status</h3>
+                                        <p className='text-sm text-gray-600'>
+                                            Shows an indicator for waitlisted, cancelled, and closed courses.
+                                        </p>
+                                    </div>
+                                    <SwitchButton
+                                        isChecked={enableCourseStatusChips}
+                                        onChange={() => {
+                                            setEnableCourseStatusChips(!enableCourseStatusChips);
+                                            OptionsStore.set('enableCourseStatusChips', !enableCourseStatusChips);
+                                        }}
                                     />
+                                </div>
+
+                                <Divider size='auto' orientation='horizontal' />
+
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <h3 className='text-ut-burntorange font-semibold'>
+                                            Show Time & Location in Popup
+                                        </h3>
+                                        <p className='text-sm text-gray-600'>
+                                            Shows the course&apos;s time and location in the extension&apos;s popup.
+                                        </p>
+                                    </div>
+                                    <SwitchButton
+                                        isChecked={showTimeLocation}
+                                        onChange={() => {
+                                            setShowTimeLocation(!showTimeLocation);
+                                            OptionsStore.set('enableTimeAndLocationInPopup', !showTimeLocation);
+                                        }}
+                                    />
+                                </div>
+                            </div>
+                            {DISPLAY_PREVIEWS && (
+                                <Preview>
+                                    <CalendarCourseCell
+                                        colors={getCourseColors('orange')}
+                                        courseDeptAndInstr={ExampleCourse.department}
+                                        className={ExampleCourse.number}
+                                        status={ExampleCourse.status}
+                                        timeAndLocation={ExampleCourse.schedule.meetings[0]!.getTimeString({
+                                            separator: '-',
+                                        })}
+                                    />
+                                    <PopupCourseBlock colors={getCourseColors('orange')} course={ExampleCourse} />
+                                </Preview>
+                            )}
+                        </div>
+                    </section>
+
+                    <Divider size='auto' orientation='horizontal' /> */}
+
+                    <section className='mb-8'>
+                        <h2 className='mb-4 text-xl text-ut-black font-semibold'>ADVANCED SETTINGS</h2>
+                        <div className='flex space-x-4'>
+                            <div className={PREVIEW_SECTION_DIV_CLASSNAME}>
+                                {/* <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <h3 className='text-ut-burntorange font-semibold'>Refresh Data</h3>
+                                        <p className='text-sm text-gray-600'>
+                                            Refreshes waitlist, course status, and other info with the latest data from
+                                            UT&apos;s site.
+                                        </p>
+                                    </div>
+                                    <Button
+                                        variant='outline'
+                                        color='ut-black'
+                                        icon={RefreshIcon}
+                                        onClick={() => console.log('Refresh clicked')}
+                                        disabled={!enableDataRefreshing}
+                                    >
+                                        Refresh
+                                    </Button>
+                                </div>
+
+                                <Divider size='auto' orientation='horizontal' /> */}
+
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
+                                            Export Current Schedule
+                                        </Text>
+                                        <p className='text-sm text-gray-600'>
+                                            Backup your active schedule to a portable file
+                                        </p>
+                                    </div>
+                                    <Button
+                                        variant='outline'
+                                        color='ut-burntorange'
+                                        onClick={() => handleExportJson(activeSchedule.id)}
+                                    >
+                                        Export
+                                    </Button>
+                                </div>
+
+                                <Divider size='auto' orientation='horizontal' />
+
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
+                                            Import Schedule
+                                        </Text>
+                                        <p className='text-sm text-gray-600'>Import from a schedule file</p>
+                                    </div>
+                                    <FileUpload
+                                        variant='filled'
+                                        color='ut-burntorange'
+                                        onChange={handleImportClick}
+                                        accept={MIMEType.JSON}
+                                    >
+                                        Import Schedule
+                                    </FileUpload>
+                                </div>
+
+                                <Divider size='auto' orientation='horizontal' />
+
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
+                                            Course Conflict Highlight
+                                        </Text>
+                                        <p className='text-sm text-gray-600'>
+                                            Adds a red strikethrough to courses that have conflicting times.
+                                        </p>
+                                    </div>
+                                    <SwitchButton
+                                        isChecked={highlightConflicts}
+                                        onChange={() => {
+                                            setHighlightConflicts(!highlightConflicts);
+                                            OptionsStore.set('enableHighlightConflicts', !highlightConflicts);
+                                        }}
+                                    />
+                                </div>
+
+                                <Divider size='auto' orientation='horizontal' />
+
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
+                                            Load All Courses in Course Schedule
+                                        </Text>
+                                        <p className='text-sm text-gray-600'>
+                                            Loads all courses in the Course Schedule site by scrolling, instead of using
+                                            next/prev page buttons.
+                                        </p>
+                                    </div>
+                                    <SwitchButton
+                                        isChecked={loadAllCourses}
+                                        onChange={() => {
+                                            setLoadAllCourses(!loadAllCourses);
+                                            OptionsStore.set('enableScrollToLoad', !loadAllCourses);
+                                        }}
+                                    />
+                                </div>
+
+                                <Divider size='auto' orientation='horizontal' />
+
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
+                                            Always Open Calendar in New Tab
+                                        </Text>
+                                        <p className='text-sm text-gray-600'>
+                                            Always opens the calendar view in a new tab when navigating to the calendar
+                                            page. May prevent issues where the calendar refuses to open.
+                                        </p>
+                                    </div>
+                                    <SwitchButton
+                                        isChecked={calendarNewTab}
+                                        onChange={() => {
+                                            setCalendarNewTab(!calendarNewTab);
+                                            OptionsStore.set('alwaysOpenCalendarInNewTab', !calendarNewTab);
+                                        }}
+                                    />
+                                </div>
+
+                                <Divider size='auto' orientation='horizontal' />
+
+                                <div className='flex items-center justify-between'>
+                                    <div className='max-w-xs'>
+                                        <Text variant='h4' className='text-ut-burntorange font-semibold'>
+                                            Reset All Data
+                                        </Text>
+                                        <p className='text-sm text-gray-600'>
+                                            Erases all schedules and courses you have.
+                                        </p>
+                                    </div>
+                                    <Button variant='outline' color='theme-red' icon={Trash} onClick={handleEraseAll}>
+                                        Erase All
+                                    </Button>
+                                </div>
+                            </div>
+                            {DISPLAY_PREVIEWS && (
+                                <Preview>
+                                    <Text
+                                        variant='h2-course'
+                                        className={clsx('text-center text-theme-red !font-normal', {
+                                            'line-through': highlightConflicts,
+                                        })}
+                                    >
+                                        01234 MWF 10:00 AM - 11:00 AM UTC 1.234
+                                    </Text>
+                                </Preview>
+                            )}
+                        </div>
+                    </section>
 
                     <Divider size='auto' orientation='horizontal' />
 
@@ -322,21 +563,17 @@ export default function Settings(): JSX.Element {
                                         Open Debug Page
                                     </Button>
                                 </div>
+                            </>
+                        )}
 
                         <Divider size='auto' orientation='horizontal' />
 
-                                <Button
-                                    variant='filled'
-                                    color='ut-black'
-                                    onClick={() => addCourseByURL(activeSchedule)}
-                                >
+                        <Button variant='filled' color='ut-black' onClick={() => addCourseByURL(activeSchedule)}>
                             Add course by link
                         </Button>
                         <Button variant='filled' color='ut-burntorange' onClick={showMigrationDialog}>
                             Show Migration Dialog
                         </Button>
-                            </>
-                        )}
                     </section>
                 </div>
 
@@ -349,43 +586,143 @@ export default function Settings(): JSX.Element {
                         </h2>
                         <div className='grid grid-cols-2 gap-4 2xl:grid-cols-4 md:grid-cols-3'>
                             {LONGHORN_DEVELOPERS_ADMINS.map(admin => (
-                                <ContributorCard
+                                <div
                                     key={admin.githubUsername}
-                                    name={admin.name}
-                                    githubUsername={admin.githubUsername}
-                                    roles={admin.role}
-                                    stats={githubStats?.adminGitHubStats[admin.githubUsername]}
-                                    showStats={showGitHubStats}
-                                    includeMergedPRs={INCLUDE_MERGED_PRS}
-                                />
+                                    className='border border-gray-300 rounded bg-ut-gray/10 p-4'
+                                >
+                                    <Text
+                                        variant='p'
+                                        className='text-ut-burntorange font-semibold hover:cursor-pointer'
+                                        onClick={() =>
+                                            window.open(`https://github.com/${admin.githubUsername}`, '_blank')
+                                        }
+                                    >
+                                        {admin.name}
+                                    </Text>
+                                    {admin.role.map(role => (
+                                        <p key={admin.githubUsername} className='text-sm text-gray-600'>
+                                            {role}
+                                        </p>
+                                    ))}
+                                    {showGitHubStats && githubStats && (
+                                        <div className='mt-2'>
+                                            <p className='text-xs text-gray-500'>GitHub Stats (UTRP repo):</p>
+                                            {includeMergedPRs && (
+                                                <p className='text-xs'>
+                                                    Merged PRS:{' '}
+                                                    {githubStats.adminGitHubStats[admin.githubUsername]?.mergedPRs}
+                                                </p>
+                                            )}
+                                            <p className='text-xs'>
+                                                Commits: {githubStats.adminGitHubStats[admin.githubUsername]?.commits}
+                                            </p>
+                                            <p className='text-xs text-ut-green'>
+                                                {githubStats.adminGitHubStats[admin.githubUsername]?.linesAdded} ++
+                                            </p>
+                                            <p className='text-xs text-theme-red'>
+                                                {githubStats.adminGitHubStats[admin.githubUsername]?.linesDeleted} --
+                                            </p>
+                                        </div>
+                                    )}
+                                </div>
                             ))}
                         </div>
                     </section>
-
                     <section className='my-8'>
                         <h2 className='mb-4 text-xl text-ut-black font-semibold'>UTRP CONTRIBUTORS</h2>
                         <div className='grid grid-cols-2 gap-4 2xl:grid-cols-4 md:grid-cols-3 xl:grid-cols-3'>
-                            {sortedContributors.map(swe => (
-                                <ContributorCard
+                            {LONGHORN_DEVELOPERS_SWE.sort(
+                                (a, b) =>
+                                    (githubStats?.userGitHubStats[b.githubUsername]?.commits ?? 0) -
+                                    (githubStats?.userGitHubStats[a.githubUsername]?.commits ?? 0)
+                            ).map(swe => (
+                                <div
                                     key={swe.githubUsername}
-                                    name={swe.name}
-                                    githubUsername={swe.githubUsername}
-                                    roles={swe.role}
-                                    stats={githubStats?.userGitHubStats[swe.githubUsername]}
-                                    showStats={showGitHubStats}
-                                    includeMergedPRs={INCLUDE_MERGED_PRS}
-                                />
+                                    className='border border-gray-300 rounded bg-ut-gray/10 p-4'
+                                >
+                                    <Text
+                                        variant='p'
+                                        className='text-ut-burntorange font-semibold hover:cursor-pointer'
+                                        onClick={() =>
+                                            window.open(`https://github.com/${swe.githubUsername}`, '_blank')
+                                        }
+                                    >
+                                        {swe.name}
+                                    </Text>
+                                    {swe.role.map(role => (
+                                        <p key={swe.githubUsername} className='text-sm text-gray-600'>
+                                            {role}
+                                        </p>
                                     ))}
-                            {additionalContributors.map(username => (
-                                <ContributorCard
+                                    {showGitHubStats && githubStats && (
+                                        <div className='mt-2'>
+                                            <p className='text-xs text-gray-500'>GitHub Stats (UTRP repo):</p>
+                                            {includeMergedPRs && (
+                                                <p className='text-xs'>
+                                                    Merged PRS:{' '}
+                                                    {githubStats.userGitHubStats[swe.githubUsername]?.mergedPRs}
+                                                </p>
+                                            )}
+                                            <p className='text-xs'>
+                                                Commits: {githubStats.userGitHubStats[swe.githubUsername]?.commits}
+                                            </p>
+                                            <p className='text-xs text-ut-green'>
+                                                {githubStats.userGitHubStats[swe.githubUsername]?.linesAdded} ++
+                                            </p>
+                                            <p className='text-xs text-theme-red'>
+                                                {githubStats.userGitHubStats[swe.githubUsername]?.linesDeleted} --
+                                            </p>
+                                        </div>
+                                    )}
+                                </div>
+                            ))}
+                            {githubStats &&
+                                Object.keys(githubStats.userGitHubStats)
+                                    .filter(
+                                        username =>
+                                            !LONGHORN_DEVELOPERS_ADMINS.some(
+                                                admin => admin.githubUsername === username
+                                            ) && !LONGHORN_DEVELOPERS_SWE.some(swe => swe.githubUsername === username)
+                                    )
+                                    .sort(
+                                        (a, b) =>
+                                            (githubStats.userGitHubStats[b]?.commits ?? 0) -
+                                            (githubStats.userGitHubStats[a]?.commits ?? 0)
+                                    )
+                                    .map(username => (
+                                        <div
                                             key={username}
-                                    name={githubStats!.names[username] || username}
-                                    githubUsername={username}
-                                    roles={['Contributor']}
-                                    stats={githubStats!.userGitHubStats[username]}
-                                    showStats={showGitHubStats}
-                                    includeMergedPRs={INCLUDE_MERGED_PRS}
-                                />
+                                            className='overflow-clip border border-gray-300 rounded bg-ut-gray/10 p-4'
+                                        >
+                                            <Text
+                                                variant='p'
+                                                className='text-ut-burntorange font-semibold hover:cursor-pointer'
+                                                onClick={() => window.open(`https://github.com/${username}`, '_blank')}
+                                            >
+                                                {githubStats.names[username]}
+                                            </Text>
+                                            <p className='text-sm text-gray-600'>Contributor</p>
+                                            {showGitHubStats && (
+                                                <div className='mt-2'>
+                                                    <p className='text-xs text-gray-500'>GitHub Stats (UTRP repo):</p>
+                                                    {includeMergedPRs && (
+                                                        <p className='text-xs'>
+                                                            Merged PRs:{' '}
+                                                            {githubStats.userGitHubStats[username]?.mergedPRs}
+                                                        </p>
+                                                    )}
+                                                    <p className='text-xs'>
+                                                        Commits: {githubStats.userGitHubStats[username]?.commits}
+                                                    </p>
+                                                    <p className='text-xs text-ut-green'>
+                                                        {githubStats.userGitHubStats[username]?.linesAdded} ++
+                                                    </p>
+                                                    <p className='text-xs text-theme-red'>
+                                                        {githubStats.userGitHubStats[username]?.linesDeleted} --
+                                                    </p>
+                                                </div>
+                                            )}
+                                        </div>
                                     ))}
                         </div>
                     </section>

src/views/components/settings/constants.ts

@@ -1,13 +0,0 @@
-export const DISPLAY_PREVIEWS = false;
-export const PREVIEW_SECTION_DIV_CLASSNAME = DISPLAY_PREVIEWS ? 'w-1/2 space-y-4' : 'flex-grow space-y-4';
-
-export const STATS_TOGGLE_KEY = 's';
-export const INCLUDE_MERGED_PRS = false;
-export const DEV_MODE_CLICK_TARGET = 5;
-export const DEV_MODE_CLICK_TIMEOUT = 5000;
-export const DEV_MODE_CLICK_INTERVAL = 500;
-
-// LHD Birthday: January 9th, 2025
-export const LHD_BIRTHDAY = { month: 0, day: 9 };
-export const BIRTHDAY_CELEBRATION_DURATION = 5000;
-export const BIRTHDAY_CELEBRATION_DEBOUNCE = 2000;

src/views/components/settings/useBirthdayCelebration.ts

@@ -1,140 +0,0 @@
-import type { Engine, ISourceOptions } from '@tsparticles/engine';
-import { initParticlesEngine } from '@tsparticles/react';
-import { loadSlim } from '@tsparticles/slim';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-
-import { BIRTHDAY_CELEBRATION_DEBOUNCE, BIRTHDAY_CELEBRATION_DURATION, LHD_BIRTHDAY } from './constants';
-
-/**
- * Custom hook for birthday celebration particles
- */
-export const useBirthdayCelebration = () => {
-    const [showParticles, setShowParticles] = useState(false);
-    const [particlesInit, setParticlesInit] = useState(false);
-    const [lastCelebration, setLastCelebration] = useState(0);
-
-    const isBirthday = useMemo(() => {
-        const today = new Date();
-        return today.getMonth() === LHD_BIRTHDAY.month && today.getDate() === LHD_BIRTHDAY.day;
-    }, []);
-
-    useEffect(() => {
-        initParticlesEngine(async (engine: Engine) => {
-            await loadSlim(engine);
-        }).then(() => {
-            setParticlesInit(true);
-        });
-    }, []);
-
-    const triggerCelebration = useCallback(() => {
-        if (!isBirthday) return;
-
-        const now = Date.now();
-        // Debounce: prevent triggering again within BIRTHDAY_CELEBRATION_DEBOUNCE ms
-        if (now - lastCelebration < BIRTHDAY_CELEBRATION_DEBOUNCE) return;
-
-        setLastCelebration(now);
-        setShowParticles(true);
-        setTimeout(() => setShowParticles(false), BIRTHDAY_CELEBRATION_DURATION);
-    }, [isBirthday, lastCelebration]);
-
-    const particlesOptions: ISourceOptions = useMemo(
-        () => ({
-            fullScreen: { enable: true, zIndex: 1 },
-            particles: {
-                color: { value: ['#BF5700', '#333F48', '#FFFFFF'] }, // UT colors
-                move: {
-                    direction: 'bottom',
-                    enable: true,
-                    outModes: {
-                        default: 'out',
-                    },
-                    size: true,
-                    speed: {
-                        min: 1,
-                        max: 3,
-                    },
-                },
-                number: {
-                    value: 500,
-                    density: {
-                        enable: true,
-                        area: 800,
-                    },
-                },
-                opacity: {
-                    value: 1,
-                    animation: {
-                        enable: false,
-                        startValue: 'max',
-                        destroy: 'min',
-                        speed: 0.3,
-                        sync: true,
-                    },
-                },
-                rotate: {
-                    value: {
-                        min: 0,
-                        max: 360,
-                    },
-                    direction: 'random',
-                    move: true,
-                    animation: {
-                        enable: true,
-                        speed: 60,
-                    },
-                },
-                tilt: {
-                    direction: 'random',
-                    enable: true,
-                    move: true,
-                    value: {
-                        min: 0,
-                        max: 360,
-                    },
-                    animation: {
-                        enable: true,
-                        speed: 60,
-                    },
-                },
-                shape: {
-                    type: ['circle', 'square'],
-                    options: {},
-                },
-                size: {
-                    value: {
-                        min: 2,
-                        max: 4,
-                    },
-                },
-                roll: {
-                    darken: {
-                        enable: true,
-                        value: 30,
-                    },
-                    enlighten: {
-                        enable: true,
-                        value: 30,
-                    },
-                    enable: true,
-                    speed: {
-                        min: 15,
-                        max: 25,
-                    },
-                },
-                wobble: {
-                    distance: 30,
-                    enable: true,
-                    move: true,
-                    speed: {
-                        min: -15,
-                        max: 15,
-                    },
-                },
-            },
-        }),
-        []
-    );
-
-    return { showParticles, particlesInit, particlesOptions, triggerCelebration, isBirthday };
-};

src/views/components/settings/useDevMode.ts

@@ -1,35 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-
-import { DEV_MODE_CLICK_INTERVAL, DEV_MODE_CLICK_TIMEOUT } from './constants';
-
-/**
- * Custom hook for enabling developer mode via rapid clicking
- */
-export const useDevMode = (targetCount: number): [boolean, () => void] => {
-    const [count, setCount] = useState(0);
-    const [active, setActive] = useState(false);
-    const [lastClick, setLastClick] = useState(0);
-
-    const incrementCount = useCallback(() => {
-        const now = Date.now();
-        if (now - lastClick < DEV_MODE_CLICK_INTERVAL) {
-            setCount(prevCount => {
-                const newCount = prevCount + 1;
-                if (newCount === targetCount) {
-                    setActive(true);
-                }
-                return newCount;
-            });
-        } else {
-            setCount(1);
-        }
-        setLastClick(now);
-    }, [lastClick, targetCount]);
-
-    useEffect(() => {
-        const timer = setTimeout(() => setCount(0), DEV_MODE_CLICK_TIMEOUT);
-        return () => clearTimeout(timer);
-    }, [count]);
-
-    return [active, incrementCount];
-};

src/views/hooks/useEnforceScheduleLimit.tsx

@@ -1,8 +1,5 @@
-import { background } from '@shared/messages';
-import { OptionsStore } from '@shared/storage/OptionsStore';
-import { CRX_PAGES } from '@shared/types/CRXPages';
 import useSchedules from '@views/hooks/useSchedules';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback } from 'react';
 
 import { Button } from '../components/common/Button';
 import { usePrompt } from '../components/common/DialogProvider/DialogProvider';
@@ -20,33 +17,8 @@ const SCHEDULE_LIMIT = 10;
 export function useEnforceScheduleLimit(): () => boolean {
     const [, schedules] = useSchedules();
     const showDialog = usePrompt();
-    const [allowMoreSchedules, setAllowMoreSchedules] = useState<boolean>(false);
-
-    useEffect(() => {
-        let mounted = true;
-        (async () => {
-            try {
-                const val = await OptionsStore.get('allowMoreSchedules');
-                if (mounted) setAllowMoreSchedules(val ?? false);
-            } catch (err) {
-                console.error('Failed to read allowMoreSchedules from OptionsStore:', err);
-            }
-        })();
-
-        const listener = OptionsStore.listen('allowMoreSchedules', async ({ newValue }) => {
-            setAllowMoreSchedules(newValue);
-        });
-
-        return () => {
-            mounted = false;
-            OptionsStore.removeListener(listener);
-        };
-    }, []);
 
     return useCallback(() => {
-        // If user has enabled bypass, allow creating more schedules
-        if (allowMoreSchedules) return true;
-
         if (schedules.length >= SCHEDULE_LIMIT) {
             showDialog({
                 title: `You have too many schedules!`,
@@ -55,33 +27,19 @@ export function useEnforceScheduleLimit(): () => boolean {
                     <>
                         To encourage organization,{' '}
                         <span className='text-ut-burntorange'>please consider deleting any unused schedules</span> you
-                        may have. You can increase the limit in the settings if it’s really necessary.
+                        may have.
                     </>
                 ),
 
                 buttons: close => (
-                    <>
-                        <Button
-                            variant='outline'
-                            color='ut-black'
-                            onClick={() => {
-                                close();
-                                // open options/settings page so user can enable bypass if they are advising staff
-                                const url = chrome.runtime.getURL(CRX_PAGES.OPTIONS);
-                                background.openNewTab({ url });
-                            }}
-                        >
-                            Open Settings
-                        </Button>
                     <Button variant='filled' color='ut-burntorange' onClick={close}>
                         I understand
                     </Button>
-                    </>
                 ),
             });
 
             return false;
         }
         return true;
-    }, [schedules, showDialog, allowMoreSchedules]);
+    }, [schedules, showDialog]);
 }

unocss.config.ts

@@ -1,4 +1,4 @@
-import presetUno from '@unocss/preset-uno';
+import presetWind4 from '@unocss/preset-wind4';
 import presetWebFonts from '@unocss/preset-web-fonts';
 import transformerDirectives from '@unocss/transformer-directives';
 import transformerVariantGroup from '@unocss/transformer-variant-group';
@@ -50,7 +50,8 @@ export default defineConfig({
         },
     ],
     presets: [
-        presetUno(),
+        presetWind4(),
+        // todo: for some reason, breaking eslint ._.
         presetWebFonts({
             provider: 'none',
             fonts: {

vite.config.ts

@@ -88,31 +88,6 @@ const fixManifestOptionsPage = (): Plugin => ({
     },
 });
 
-function getGitInfo() {
-    // Try environment variables first (for Nix builds)
-    if (process.env.VITE_GIT_BRANCH && process.env.VITE_GIT_COMMIT) {
-        return {
-            gitBranch: process.env.VITE_GIT_BRANCH,
-            gitCommit: process.env.VITE_GIT_COMMIT,
-        };
-    }
-
-    // Fall back to git commands (for local development)
-    try {
-        return {
-            gitBranch: execSync('git rev-parse --abbrev-ref HEAD').toString().trim(),
-            gitCommit: execSync('git rev-parse --short HEAD').toString().trim(),
-        };
-    } catch {
-        return {
-            gitBranch: 'unknown',
-            gitCommit: 'unknown',
-        };
-    }
-}
-
-const gitInfo = getGitInfo();
-
 let config: ResolvedConfig;
 let server: ViteDevServer;
 
@@ -205,14 +180,12 @@ export default defineConfig({
                 'PROD',
                 'VITE_SENTRY_ENVIRONMENT',
                 'VITE_BETA_BUILD',
-                'VITE_GIT_BRANCH',
-                'VITE_GIT_COMMIT',
             ],
             includeTimestamp: true,
             includeBuildTime: true,
             customMetadata: {
-                gitBranch: () => gitInfo.gitBranch,
-                gitCommit: () => gitInfo.gitCommit,
+                gitBranch: () => execSync('git rev-parse --abbrev-ref HEAD').toString().trim(),
+                gitCommit: () => execSync('git rev-parse --short HEAD').toString().trim(),
                 nodeVersion: () => process.version,
             },
         }),
@@ -234,6 +207,9 @@ export default defineConfig({
         hmr: {
             clientPort: 5173,
         },
+        cors: {
+            origin: [/chrome-extension:\/\//],
+        },
         proxy: {
             '/debug.html': {
                 target: 'http://localhost:5173',
@@ -283,16 +259,16 @@ export default defineConfig({
             },
         },
     },
-    test: {
-        coverage: {
-            provider: 'v8',
-        },
-    },
-    css: {
-        preprocessorOptions: {
-            scss: {
-                api: 'modern-compiler',
-            },
-        },
-    },
+    // test: {
+    // 	coverage: {
+    // 		provider: "v8",
+    // 	},
+    // },
+    // css: {
+    // 	preprocessorOptions: {
+    // 		scss: {
+    // 			api: "modern-compiler",
+    // 		},
+    // 	},
+    // },
 });