Fix CI, format files

NIAEFEUP · Jul 10, 2023 · 41d3c2e · 41d3c2e
1 parent f5900da
commit 41d3c2e
Show file tree

Hide file tree

Showing 19 changed files with 145 additions and 147 deletions.
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,9 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    needs:
+      - lint
+      - format
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -66,10 +69,7 @@ jobs:
       - name: Upload chrome extension
         uses: actions/upload-artifact@v2
         with:
-          name: Chrome extension
-          path: chrome.zip
-      - name: Upload firefox extension
-        uses: actions/upload-artifact@v2
-        with:
-          name: Firefox extension
-          path: firefox.zip
+          name: Extension
+          path: |
+            chrome.zip
+            firefox.zip
diff --git a/.postcssrc.js b/.postcssrc.js
@@ -3,7 +3,7 @@ import Tailwind from "tailwindcss";
 
 export default {
     plugins: [
-        PostcssPresetEnv, 
+        PostcssPresetEnv,
         // Tailwind
     ],
 };
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,10 +1,15 @@
 /** @type {import("prettier").Options} */
 export default {
-    semi: true,
-    trailingComma: "all",
-    singleQuote: false,
     printWidth: 80,
     tabWidth: 4,
-    endOfLine: "auto",
     useTabs: false,
+    semi: true,
+    singleQuote: false,
+    quoteProps: "consistent",
+    jsxSingleQuote: false,
+    trailingComma: "all",
+    bracketSpacing: true,
+    bracketSameLine: true,
+    arrowParens: "always",
+    endOfLine: "auto",
 };
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
         "watch": "vite build --watch --mode development --minify false",
         "dev": "vite",
         "lint": "eslint .",
-        "lint:fix": "eslint . --fix",
+        "lint:fix": "eslint --fix .",
         "format": "prettier --check .",
         "format:fix": "prettier --log-level warn --write ."
     },

diff --git a/src/common/options.ts b/src/common/options.ts
@@ -21,7 +21,7 @@ const options = {
         description: "Automatically login to sigarra",
         type: "boolean",
         default: false,
-    }
+    },
 } as const satisfies Record<string, Option>;
 
 export default options;
diff --git a/src/components/controls/CheckboxControl.tsx b/src/components/controls/CheckboxControl.tsx
@@ -33,8 +33,7 @@ function CheckboxControl({ label, storageKey, defaultState = false }: Props) {
             <div className="flex items-center justify-between w-full py-1">
                 <label
                     htmlFor={storageKey}
-                    className="text-base tracking-normal"
-                >
+                    className="text-base tracking-normal">
                     {label}
                 </label>
                 <div className="grid rounded-full cursor-pointer w-9 h-9 place-items-center hover:bg-accentFour">

diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx
@@ -6,8 +6,7 @@ const Footer = () => {
             <button
                 onClick={() => window.close()}
                 type="button"
-                className="inline-flex items-center px-4 py-2 text-[15px] font-bold text-white border border-transparent rounded-full shadow-sm bg-accentThree hover:bg-accentFive focus:outline-none w-fit"
-            >
+                className="inline-flex items-center px-4 py-2 text-[15px] font-bold text-white border border-transparent rounded-full shadow-sm bg-accentThree hover:bg-accentFive focus:outline-none w-fit">
                 Feito
             </button>
         </footer>

diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
@@ -13,8 +13,7 @@ const Header = () => (
                 href="https://ni.fe.up.pt"
                 target="_blank"
                 rel="noreferrer"
-                className="text-red hover:underline font-bold cursor-pointer"
-            >
+                className="text-red hover:underline font-bold cursor-pointer">
                 niaefeup
             </a>
         </p>

diff --git a/src/components/sections/Layout.tsx b/src/components/sections/Layout.tsx
@@ -1,11 +1,11 @@
+import React from "react";
 import LayoutContent from "./LayoutContent";
 
 const Layout = () => (
     <section className="flex flex-col gap-y-2">
         <label
             htmlFor="user-control-interface"
-            className="text-sm font-bold dark:text-accentOneDark text-accentOne"
-        >
+            className="text-sm font-bold dark:text-accentOneDark text-accentOne">
             Layout
         </label>
         <div id="user-control-interface">

diff --git a/src/components/sections/LayoutContent.tsx b/src/components/sections/LayoutContent.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import SwitchControl from "../controls/SwitchControl";
 
 const LayoutContent = () => (

diff --git a/src/content-scripts/modules/icons/constants.ts b/src/content-scripts/modules/icons/constants.ts
@@ -1,11 +1,11 @@
 export const IMG_ICON_MAP: Record<string, string | undefined> = {
-    Acreditado: "checkbox-circle",
-    Alerta: "alert",
-    Apagar: "close-circle",
-    Aprovado: "checkbox-circle",
-    Arroba: "at",
-    Ascendente: "arrow-up-s",
-    AscendenteS: "arrow-up-s",
+    "Acreditado": "checkbox-circle",
+    "Alerta": "alert",
+    "Apagar": "close-circle",
+    "Aprovado": "checkbox-circle",
+    "Arroba": "at",
+    "Ascendente": "arrow-up-s",
+    "AscendenteS": "arrow-up-s",
     "atalho_administracao.gif": "admin",
     "atalho_computador.gif": "computer",
     "atalho_coracao.gif": "heart",
@@ -28,29 +28,29 @@ export const IMG_ICON_MAP: Record<string, string | undefined> = {
     "atalho_smile_feliz.gif": "emotion-happy",
     "atalho_smile_triste.gif": "emotion-unhappy",
     "atalho_tomada.gif": "plug",
-    BotaoColapsar: "close-circle",
-    BotaoMin: "close-circle",
-    BotaoPersonalisar: "edit",
-    BotaoRestaurar: "add-circle",
+    "BotaoColapsar": "close-circle",
+    "BotaoMin": "close-circle",
+    "BotaoPersonalisar": "edit",
+    "BotaoRestaurar": "add-circle",
     "CERT-Certidao": "file-paper-2",
     "CERT-Visto": "checkbox-circle",
-    Comentario: "edit",
-    Completo: "checkbox-circle",
-    CriarNovo: "add-circle",
-    Descendente: "arrow-down-s",
-    DescendenteS: "arrow-down-s",
-    Documento: "file-text",
-    DocumentoCriar: "file-add",
-    EditarPerfil: "edit",
-    EnderecoEmail: "mail",
-    Erro: "error-warning",
-    EstadoSem1_off: "arrow-up-circle",
-    EstadoSem1: "checkbox-circle",
-    EstadoSem2: "arrow-down-circle",
-    EstadoSem3: "refresh",
-    EstadoSem4: "close-circle",
+    "Comentario": "edit",
+    "Completo": "checkbox-circle",
+    "CriarNovo": "add-circle",
+    "Descendente": "arrow-down-s",
+    "DescendenteS": "arrow-down-s",
+    "Documento": "file-text",
+    "DocumentoCriar": "file-add",
+    "EditarPerfil": "edit",
+    "EnderecoEmail": "mail",
+    "Erro": "error-warning",
+    "EstadoSem1_off": "arrow-up-circle",
+    "EstadoSem1": "checkbox-circle",
+    "EstadoSem2": "arrow-down-circle",
+    "EstadoSem3": "refresh",
+    "EstadoSem4": "close-circle",
     "facebook_32.png": "facebook-box",
-    Fazer: "indeterminate-circle",
+    "Fazer": "indeterminate-circle",
     "FEST-Selecionado": "radio-button",
     "FEST-Selecionar": "checkbox-blank-circle",
     "GENT-ContactoAguarda": "error-warning",
@@ -59,86 +59,86 @@ export const IMG_ICON_MAP: Record<string, string | undefined> = {
     "GPAG-Documento": "file-text",
     "GPAG-MB": "bank-card-2",
     "In_Logo_Web4Print_CMYK_1in.jpg": "linkedin-box",
-    Informa: "information",
-    Inscrito: "indeterminate-circle",
+    "Informa": "information",
+    "Inscrito": "indeterminate-circle",
     "instagram40x40.png": "instagram",
     "IT-AlocAdm": "admin",
     "IT-Email": "mail",
     "IT-Fotos4x4": "layout-grid",
     "IT-Fotos6x6": "grid",
-    LegendaSemaforos: "question",
-    Limpar: "eraser",
-    ListaMais: "add-circle",
-    ListaMenos: "close-circle",
-    LOV: "arrow-left",
-    Lupa: "search",
-    MarcaTemporal: "checkbox-circle",
-    MarcaTemporalActivo: "play-circle",
-    MarcaTemporalOff: "checkbox-blank-circle",
-    Mensagem: "chat-4",
-    MensagemBBom: "emotion-laugh",
-    MensagemBom: "emotion-happy",
-    MensagemFilhos: "question-answer",
-    MensagemMau: "emotion-sad",
-    MensagemMMau: "emotion-unhappy",
-    MensagemNao: "thumb-down",
-    MensagemNeutro: "emotion-normal",
-    MensagemNova: "folder-unknown",
-    MensagemResponder: "edit",
-    MensagemSemFilhos: "chat-off",
-    MensagemSim: "thumb-up",
-    MensagemVelha: "folder",
-    MensagemVelhaV: "folder-open",
-    MenuContextoDetalhesMaisG: "zoom-in",
-    MenuContextoDetalhesMenosG: "zoom-out",
-    MenuContextoEditarG: "edit",
-    MenuContextoImagemPisoDescerOff: "arrow-right-down",
-    MenuContextoImagemPisoSubirOff: "arrow-right-up",
-    MenuContextoInicioG: "",
-    MoodleIcon: undefined,
-    NaoInscrito: "close-circle",
-    Novo: "star",
-    Obr: "asterisk",
-    PaginaWeb: "global",
-    Pasta: "folder-open",
-    PastaFechada: "folder",
-    QuadradoMaisPeq: "add-circle",
-    QuadradoMenosPeq: "close-circle",
-    QuadradoPequenoMais: "add-circle",
-    QuadradoPequenoMenos: "close-circle",
-    ResultadoActual: "map-pin", // TODO (toino): find better icon
-    ResultadoAnt: "arrow-left-s",
-    ResultadoAntFin: "skip-back",
-    ResultadoAntInt: "more",
-    ResultadoSeg: "arrow-right-s",
-    ResultadoSegFin: "skip-forward",
-    ResultadoSegInt: "more",
-    SemAmarelo: "indeterminate-circle",
-    SemPermissoes: "error-warning",
-    SemRegistos: "forbid",
-    SemVerde: "checkbox-circle",
-    SemVermelho: "error-warning",
-    SetaDir: "arrow-right",
+    "LegendaSemaforos": "question",
+    "Limpar": "eraser",
+    "ListaMais": "add-circle",
+    "ListaMenos": "close-circle",
+    "LOV": "arrow-left",
+    "Lupa": "search",
+    "MarcaTemporal": "checkbox-circle",
+    "MarcaTemporalActivo": "play-circle",
+    "MarcaTemporalOff": "checkbox-blank-circle",
+    "Mensagem": "chat-4",
+    "MensagemBBom": "emotion-laugh",
+    "MensagemBom": "emotion-happy",
+    "MensagemFilhos": "question-answer",
+    "MensagemMau": "emotion-sad",
+    "MensagemMMau": "emotion-unhappy",
+    "MensagemNao": "thumb-down",
+    "MensagemNeutro": "emotion-normal",
+    "MensagemNova": "folder-unknown",
+    "MensagemResponder": "edit",
+    "MensagemSemFilhos": "chat-off",
+    "MensagemSim": "thumb-up",
+    "MensagemVelha": "folder",
+    "MensagemVelhaV": "folder-open",
+    "MenuContextoDetalhesMaisG": "zoom-in",
+    "MenuContextoDetalhesMenosG": "zoom-out",
+    "MenuContextoEditarG": "edit",
+    "MenuContextoImagemPisoDescerOff": "arrow-right-down",
+    "MenuContextoImagemPisoSubirOff": "arrow-right-up",
+    "MenuContextoInicioG": "",
+    "MoodleIcon": undefined,
+    "NaoInscrito": "close-circle",
+    "Novo": "star",
+    "Obr": "asterisk",
+    "PaginaWeb": "global",
+    "Pasta": "folder-open",
+    "PastaFechada": "folder",
+    "QuadradoMaisPeq": "add-circle",
+    "QuadradoMenosPeq": "close-circle",
+    "QuadradoPequenoMais": "add-circle",
+    "QuadradoPequenoMenos": "close-circle",
+    "ResultadoActual": "map-pin", // TODO (toino): find better icon
+    "ResultadoAnt": "arrow-left-s",
+    "ResultadoAntFin": "skip-back",
+    "ResultadoAntInt": "more",
+    "ResultadoSeg": "arrow-right-s",
+    "ResultadoSegFin": "skip-forward",
+    "ResultadoSegInt": "more",
+    "SemAmarelo": "indeterminate-circle",
+    "SemPermissoes": "error-warning",
+    "SemRegistos": "forbid",
+    "SemVerde": "checkbox-circle",
+    "SemVermelho": "error-warning",
+    "SetaDir": "arrow-right",
     "SUMARIOS-Anexo": "attachment",
     "SUMARIOS-AnexoOff": "attachment",
     "SUMARIOS-VerSumario": "file-text",
     "SUMARIOS-VerSumarioOff": "file-text",
-    Telef: "phone",
-    Visto: "checkbox-circle",
+    "Telef": "phone",
+    "Visto": "checkbox-circle",
     "youtube_32.png": "youtube",
-    ZipPeq: "file-zip",
+    "ZipPeq": "file-zip",
 } as const;
 
 export const FA_ICON_MAP: Record<string, string | undefined> = {
-    bars: "menu",
+    "bars": "menu",
     "ellipsis-v": "more-2",
     "envelope-o": "mail",
-    fax: "printer", // TODO (toino): find better icon
-    laptop: "computer",
-    phone: "phone",
+    "fax": "printer", // TODO (toino): find better icon
+    "laptop": "computer",
+    "phone": "phone",
     "plus-circle": "add-circle",
-    unlock: "login-circle",
-    envelope: "mail-unread",
+    "unlock": "login-circle",
+    "envelope": "mail-unread",
 } as const;
 
 export const BANNER_ICON_MAP: Record<string, string | undefined> = {

diff --git a/src/content-scripts/modules/options/autoLogin.ts b/src/content-scripts/modules/options/autoLogin.ts
@@ -1,6 +1,5 @@
-import { rememberLogin } from "../login"
+import { rememberLogin } from "../login";
 
 export default (value: boolean) => {
-    if (value)
-        rememberLogin()
-}
+    if (value) rememberLogin();
+};
diff --git a/src/content-scripts/pages/account.ts b/src/content-scripts/pages/account.ts
@@ -1,13 +1,13 @@
 const statusProperties = {
-    Pago: {
+    "Pago": {
         class: "success",
         text: "Pago",
     },
     "Não pago mas prazo ainda não foi excedido": {
         class: "pending",
         text: "Pendente",
     },
-    Anulado: {
+    "Anulado": {
         class: "cancelled",
         text: "Anulado",
     },

diff --git a/src/content-scripts/pages/schedule.ts b/src/content-scripts/pages/schedule.ts
@@ -2,16 +2,16 @@ import { lcmAll } from "~/common/math";
 import { keys } from "~/common/objects";
 
 const CLASS_TYPE_TO_ABBR = {
-    Teórica: "TE",
+    "Teórica": "TE",
     "Teórico-Prática": "TP",
-    Prática: "P",
-    Laboratório: "PL",
+    "Prática": "P",
+    "Laboratório": "PL",
     "Orientação Tutorial": "OT",
     "Prática Laboratorial": "PL",
     "Trabalho de Campo": "TC",
-    Seminário: "S",
-    Almoço: "almoco",
-    Outra: "O",
+    "Seminário": "S",
+    "Almoço": "almoco",
+    "Outra": "O",
 } as const;
 const CLASS_ABBR_TO_ABBR = {
     T: "TE",