Merge pull request #199 from NIAEFEUP/refactor/ts-and-popup

Refactor javascript files and the popup
NIAEFEUP · Nov 7, 2024 · 84f4d1e · 84f4d1e
2 parents 713ad1d + 9d0e03d
commit 84f4d1e
Show file tree

Hide file tree

Showing 26 changed files with 3,546 additions and 5,106 deletions.
diff --git a/content-scripts/components/Header.tsx → content-scripts/components/Navbar/Header.tsx b/content-scripts/components/Header.tsx → content-scripts/components/Navbar/Header.tsx
@@ -1,10 +1,11 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import jsx from "texsaur";
 
+import { AuthSession } from "../../types";
 import HeaderLinks from "./HeaderLinks";
 import Authentication from "./HeaderAuthentication";
-import { AuthSession } from "../types";
 
+//TODO(thePeras): I think we should move this to a separate file dedicated to constants or a folder like `data`
 const HEADER_LINKS = {
     Estudantes: {
         Bolsas: "web_base.gera_pagina?p_pagina=242366",

diff --git a/...ripts/components/HeaderAuthentication.tsx → ...omponents/Navbar/HeaderAuthentication.tsx b/...ripts/components/HeaderAuthentication.tsx → ...omponents/Navbar/HeaderAuthentication.tsx
@@ -1,8 +1,8 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import jsx from "texsaur";
-import { AuthSession } from "../types";
-import { togglePopover } from "../modules/utilities/popover";
-import Icon from "./Icon";
+import { AuthSession } from "../../types";
+import { togglePopover } from "../../modules/utilities/popover";
+import Icon from "../Icon";
 
 interface Props {
     auth: AuthSession | null;

diff --git a/content-scripts/components/HeaderLinks.tsx → ...scripts/components/Navbar/HeaderLinks.tsx b/content-scripts/components/HeaderLinks.tsx → ...scripts/components/Navbar/HeaderLinks.tsx
diff --git a/content-scripts/index.js b/content-scripts/index.js
@@ -1,11 +1,10 @@
 import {
     injectOverrideFunctions,
     reverseDateDirection,
-    currentAccountPage,
     addSortTableActions,
 } from "./modules/initialize";
 import { injectAllChanges, userPreferences } from "./modules/options";
-import constructNewData from "./modules/utilities/constructNewData";
+import constructNewData from "./modules/options/constructNewData";
 import { getStorage, setStorage } from "./modules/utilities/storage";
 import { rememberLogin } from "./modules/login";
 import { replaceIcons } from "./modules/icons";
@@ -18,6 +17,7 @@ import { fixPagination } from "./modules/pagination";
 import { changeLayout } from "./modules/layout";
 import { addStarIconToCard } from "./modules/favorite-course";
 import { createComponentsPage } from "./pages/components_page";
+import { currentAccountPage } from "./pages/current_account_page";
 
 /*--
 - Docs: https://developer.chrome.com/docs/extensions/reference/storage/#synchronous-response-to-storage-updates

diff --git a/content-scripts/modules/icons/constants.js b/content-scripts/modules/icons/constants.js