Atualizando suas informações...
\n\n
NÃO SAIA DESSA PÁGINA,
@@ -33,6 +33,8 @@ const toast = new Toastify({
},
});
+const nextApi = new NextAPI().init();
+
const basePortalAlunoURL = new URL(document.location.href);
const isPortalAluno = basePortalAlunoURL.pathname === "/dados_pessoais";
const isFichasIndividuais =
@@ -44,37 +46,42 @@ if (isPortalAluno) {
anchor.setAttribute("id", "app");
document.body.append(anchor);
- extensionUtils.injectStyle("styles/portal.css");
+ extensionUtils.injectStyle("dist/contentScripts/style.css");
toastr.info(
- "Clique em
Ficha Individual para atualizar suas informações!"
+ "Clique em
Ficha Individual para atualizar suas informações!",
);
} else if (isFichasIndividuais) {
- extensionUtils.injectStyle("styles/portal.css");
-
+ extensionUtils.injectStyle("dist/contentScripts/style.css");
toast.showToast();
iterateTabelaCursosAndSaveToLocalStorage();
} else if (isStudentFicha) {
- extensionUtils.injectStyle("styles/portal.css");
+ extensionUtils.injectStyle("dist/contentScripts/style.css");
}
function iterateTabelaCursosAndSaveToLocalStorage() {
- var tabelaCursos = $("tbody").children().slice(1);
+ const tabelaCursos = $("tbody").children().slice(1);
let count = 0;
tabelaCursos.each(async function () {
- var linhaCurso = $(this).children();
+ const linhaCurso = $(this).children();
+
+ const coursename = $(linhaCurso[0]).children("a").text();
+ const fichaAlunoURL = $(linhaCurso[1]).children("a").attr("href");
+ const gradeYear = $(linhaCurso[2]).text();
- var nomeDoCurso = $(linhaCurso[0]).children("a").text();
- var fichaAlunoUrl = $(linhaCurso[1]).children("a").attr("href");
- var anoDaGrade = $(linhaCurso[2]).text();
+ const curso = await getFichaAluno(fichaAlunoURL, coursename, fichaAlunoURL);
+ console.log(curso);
+ if (count === 0) {
+ toast.hideToast();
+ }
- const curso = await getFichaAluno(fichaAlunoUrl, nomeDoCurso, anoDaGrade);
- if (count == 0) toast.hideToast();
count++;
- if (!curso) return;
+ if (!curso) {
+ return;
+ }
curso.curso = linhaCurso[0].innerText.replace("Novo", "");
curso.turno = linhaCurso[3].innerText;
@@ -86,92 +93,96 @@ function iterateTabelaCursosAndSaveToLocalStorage() {
}
async function getFichaAluno(fichaAlunoUrl, nomeDoCurso, anoDaGrade) {
+ const STUDENT_FICHA_TIMEOUT = 60 * 1000;
try {
- var curso = {};
- var ficha_url = fichaAlunoUrl.replace(".json", "");
+ const curso = {};
+ const ficha_url = fichaAlunoUrl.replace(".json", "");
- const ficha = await Axios.get("https://aluno.ufabc.edu.br" + ficha_url, {
- timeout: 60 * 1 * 1000, // 1 minute
- });
- const ficha_obj = $($.parseHTML(ficha.data));
- const info = ficha_obj.find(".coeficientes tbody tr td");
+ const { data: ficha } = await Axios.get(
+ `https://aluno.ufabc.edu.br${ficha_url}`,
+ {
+ timeout: STUDENT_FICHA_TIMEOUT,
+ },
+ );
+
+ const parsedStudentFicha = $($.parseHTML(ficha));
+
+ const info = parsedStudentFicha.find(".coeficientes tbody tr td");
+ const rawStudentCourseAndRa = parsedStudentFicha
+ .find("#page")
+ .children("p")[2].innerText;
- const ra =
- /.*?(\d+).*/g.exec(
- ficha_obj.find("#page").children("p")[2].innerText
- )[1] || "some ra";
+ const [, ra] = /.*?(\d+).*/g.exec(rawStudentCourseAndRa);
- const storageRA = "ufabc-extension-ra-" + getEmailAluno();
+ const storageRA = `ufabc-extension-ra-${emailAluno()}`;
await NextStorage.setItem(storageRA, ra);
- const jsonFicha = await Axios.get(
- "https://aluno.ufabc.edu.br" + fichaAlunoUrl,
+ const { data: jsonFicha } = await Axios.get(
+ `https://aluno.ufabc.edu.br${fichaAlunoUrl}`,
{
- timeout: 60 * 1 * 1000, // 1 minute
- }
+ timeout: STUDENT_FICHA_TIMEOUT,
+ },
);
- const disciplinasCategory = ficha_obj.find(
- ".quantidades:last-child tbody tr td"
+ const disciplinasCategory = parsedStudentFicha.find(
+ ".quantidades:last-child tbody tr td",
);
// free
const totalCreditsCoursedFree = toNumber(disciplinasCategory[2]);
const totalPercentageCoursedFree = toNumber(disciplinasCategory[3]);
const totalCreditsFree = Math.round(
- (totalCreditsCoursedFree * 100) / totalPercentageCoursedFree
+ (totalCreditsCoursedFree * 100) / totalPercentageCoursedFree,
);
// mandatory
const totalCreditsCoursedMandatory = toNumber(disciplinasCategory[7]);
const totalPercentageCoursedMandatory = toNumber(disciplinasCategory[8]);
const totalCreditsMandatory = Math.round(
- (totalCreditsCoursedMandatory * 100) / totalPercentageCoursedMandatory
+ (totalCreditsCoursedMandatory * 100) / totalPercentageCoursedMandatory,
);
// limited
const totalCreditsCoursedLimited = toNumber(disciplinasCategory[12]);
const totalPercentageCoursedLimited = toNumber(disciplinasCategory[13]);
const totalCreditsLimited = Math.round(
- (totalCreditsCoursedLimited * 100) / totalPercentageCoursedLimited
+ (totalCreditsCoursedLimited * 100) / totalPercentageCoursedLimited,
);
- await nextApi.post(
- "/histories",
- {
- ra: ra,
- disciplinas: jsonFicha.data,
- curso: nomeDoCurso,
- grade: anoDaGrade,
-
- // credits total
- mandatory_credits_number: totalCreditsMandatory,
- limited_credits_number: totalCreditsLimited,
- free_credits_number: totalCreditsFree,
- credits_total:
- totalCreditsMandatory + totalCreditsLimited + totalCreditsFree,
- },
- {
- timeout: 60 * 1 * 1000, // 1 minute
- }
- );
+ const userHistory = {
+ ra,
+ disciplinas: jsonFicha,
+ curso: nomeDoCurso,
+ grade: anoDaGrade,
+
+ // credits total
+ mandatory_credits_number: totalCreditsMandatory,
+ limited_credits_number: totalCreditsLimited,
+ free_credits_number: totalCreditsFree,
+ credits_total:
+ totalCreditsMandatory + totalCreditsLimited + totalCreditsFree,
+ };
+
+ await nextApi.post("/histories", userHistory, {
+ timeout: STUDENT_FICHA_TIMEOUT,
+ });
curso.ra = ra;
curso.cp = toNumber(info[0]);
curso.cr = toNumber(info[1]);
curso.ca = toNumber(info[2]);
- curso.quads = ficha_obj.find(".ano_periodo").length;
+ curso.quads = parsedStudentFicha.find(".ano_periodo").length;
- curso.cursadas = jsonFicha.data;
+ curso.cursadas = jsonFicha;
return curso;
} catch (err) {
- console.log(err);
+ console.error("some bad happened", err);
Toastify({
text: `
Não foi possível salvar seus dados, recarregue a página e aguarde.
`,
@@ -188,56 +199,63 @@ async function getFichaAluno(fichaAlunoUrl, nomeDoCurso, anoDaGrade) {
}
}
-function getEmailAluno() {
- return $("#top li")
- .last()
- .text()
- .replace(/\s*/, "")
- .split("|")[0]
- .replace(" ", "")
- .toLowerCase();
-}
-
-function toNumber(el) {
- return parseFloat(el.innerText.replace(",", "."));
-}
-
async function saveToLocalStorage(curso) {
- const storageUser = "ufabc-extension-" + getEmailAluno();
+ const storageUser = `ufabc-extension-${emailAluno()}`;
let user = await NextStorage.getItem(storageUser);
- if (!user || _.isEmpty(user)) user = [];
+
+ if (!user || _.isEmpty(user)) {
+ user = [];
+ }
user.push(curso);
+
user = _.uniqBy(user, "curso");
await NextStorage.setItem(storageUser, user);
+ const SUCCESS_TOAST_TTL = 100000;
+
toastr.success(
`Suas informações foram salvas! Disciplinas do curso do ${curso.curso}
- para o usuário ${getEmailAluno()}.
+ para o usuário ${emailAluno()}.
`,
- { timeout: 100000 }
+ { timeout: SUCCESS_TOAST_TTL },
);
}
async function saveStudentsToLocalStorage(curso) {
- const storageUser = "ufabc-extension-" + getEmailAluno();
+ const storageUser = `ufabc-extension-${emailAluno()}`;
const cursos = await NextStorage.getItem(storageUser);
- const ra = (curso && curso.ra) || null;
+ const ra = curso?.ra || null;
let allSavedStudents = [];
const students = await NextStorage.getItem("ufabc-extension-students");
- if (students && students.length) {
+ if (students?.length) {
allSavedStudents.push(...students);
}
- allSavedStudents = allSavedStudents.filter((student) => student.ra != ra);
+ allSavedStudents = allSavedStudents.filter((student) => student.ra !== ra);
const student = {
- cursos: cursos,
- ra: ra,
- name: getEmailAluno(),
+ cursos,
+ ra,
+ name: emailAluno(),
lastUpdate: Date.now(),
};
+
allSavedStudents.unshift(student);
await NextStorage.setItem("ufabc-extension-students", allSavedStudents);
}
+
+function toNumber(el) {
+ return parseFloat(el.innerText.replace(",", "."));
+}
+
+function emailAluno() {
+ const alunoUFABCHTMLHeader = $("#top li").last();
+ const [rawAlunoLoginName] = alunoUFABCHTMLHeader
+ .text()
+ .replace(/\s*/, "")
+ .split("|");
+ const alunoLoginName = rawAlunoLoginName.replace(" ", "").toLowerCase();
+ return alunoLoginName;
+}
diff --git a/src/scripts/contentscript.js b/src/scripts/contentscript.js
index b17e162..c928c79 100644
--- a/src/scripts/contentscript.js
+++ b/src/scripts/contentscript.js
@@ -1,25 +1,30 @@
-// CSS imports
-import "element-ui/lib/theme-chalk/index.css";
-
import $ from "jquery";
import _ from "lodash";
+import Vue from "vue";
+
+// CSS imports
+import "element-ui/lib/theme-chalk/index.css";
+import "vuetify/dist/vuetify.min.css";
-import { ufabcMatricula } from "../services/UFABCMatricula";
-import { setupStorage } from "../utils/setupStorage";
-import { extensionUtils } from "../utils/extensionUtils";
-import { NextStorage } from "../services/NextStorage";
+import { ufabcMatricula } from "@/services/UFABCMatricula";
+import { NextStorage } from "@/services/NextStorage";
+import { setupStorage } from "@/utils/setupStorage";
+import { extensionUtils } from "@/utils/extensionUtils";
+import Matricula from "./contentscripts/views/Matricula.vue";
const isBrowser = typeof chrome != "undefined" && !!chrome.storage;
-let matricula_url;
+
+/** @type {string[] | null} */
+let matriculasURL;
if (process.env.NODE_ENV == "production") {
- matricula_url = [
+ matriculasURL = [
"matricula.ufabc.edu.br/matricula",
"ufabc-matricula.cdd.naoseiprogramar.com.br/snapshot",
"api.ufabcnext.com/snapshot",
];
} else {
- matricula_url = [
+ matriculasURL = [
"matricula.ufabc.edu.br/matricula",
"api.ufabcnext.com/snapshot",
"api.ufabcnext.com/snapshot/backup.html",
@@ -40,59 +45,85 @@ if (!isBrowser) {
}
async function load() {
- const currentUrl = document.location.href;
+ const INJECT_CONTENT_DELAY = 1_500;
+ const currentUrl = new URL(document.location.href);
+ const shouldExecuteScript = matriculasURL.some(
+ (url) => `${currentUrl.hostname}${currentUrl.pathname}` === url,
+ );
+
// add cross-domain local storage
- extensionUtils.injectScript("lib/xdLocalStorage.min.js");
+ extensionUtils.injectScript("dist/lib/xdLocalStorage.min.js");
extensionUtils.injectIframe("pages/iframe.html");
- extensionUtils.injectScript("lib/init.js");
+ extensionUtils.injectScript("dist/lib/init.js");
setupStorage();
await import("./contentScriptPortal");
- if (matricula_url.some((url) => currentUrl.indexOf(url) != -1)) {
- // update teachers locally
- setTimeout(async () => {
- let lastUpdate = null;
- try {
- lastUpdate = await NextStorage.getItem("ufabc-extension-last");
- } catch (err) {
- lastUpdate = Date.now();
- } finally {
- ufabcMatricula.updateProfessors(lastUpdate);
- }
-
- // this is the main vue app
- // i.e, where all the filters live
- const anchor = document.createElement("div");
- anchor.setAttribute("id", "app");
- $("#meio").prepend(anchor);
-
- //inject styles
- extensionUtils.injectStyle("styles/main.css");
-
- // manda as informacoes para o servidor
- ufabcMatricula.sendAlunoData();
-
- // load vue app modal
- const modal = document.createElement("div");
- modal.setAttribute("id", "modal");
- modal.setAttribute("data-app", true);
- document.body.append(modal);
-
- // load vue app teacherReview
- const teacherReview = document.createElement("div");
- teacherReview.setAttribute("id", "teacherReview");
- teacherReview.setAttribute("data-app", true);
- document.body.append(teacherReview);
-
- // load vue app review subjects
- const reviewSubject = document.createElement("div");
- reviewSubject.setAttribute("id", "review-subject");
- reviewSubject.setAttribute("data-app", true);
- document.body.append(reviewSubject);
-
- // inject Vue app
- extensionUtils.injectScript("scripts/main.js");
- }, 1500);
+ if (!shouldExecuteScript) {
+ return;
}
+
+ setTimeout(async () => {
+ // update teachers locally
+ let lastUpdate = null;
+ try {
+ lastUpdate = await NextStorage.getItem("ufabc-extension-last");
+ } catch (err) {
+ lastUpdate = Date.now();
+ } finally {
+ ufabcMatricula.updateProfessors(lastUpdate);
+ }
+
+ // this is the main vue app
+ // i.e, where all the filters live
+ const container = document.createElement("div");
+ container.id = __NAME__;
+ const root = document.createElement("div");
+
+ const shadowDOM =
+ container.attachShadow?.({ mode: __DEV__ ? "open" : "closed" }) ||
+ container;
+
+ shadowDOM.appendChild(
+ extensionUtils.injectStyle("dist/contentScripts/style.css"),
+ );
+ shadowDOM.appendChild(root);
+
+ container.setAttribute("id", "app");
+ $("#meio").prepend(container);
+ new Vue({
+ el: "#app",
+ data: {
+ name: "popup-next-extension",
+ },
+ render: (h) => h(Matricula),
+ });
+
+ //inject styles
+ // extensionUtils.injectStyle("./style.css");
+
+ // manda as informacoes para o servidor
+ ufabcMatricula.sendAlunoData();
+
+ // // load vue app modal
+ // const modal = document.createElement("div");
+ // modal.setAttribute("id", "modal");
+ // modal.setAttribute("data-app", true);
+ // document.body.append(modal);
+
+ // // load vue app teacherReview
+ // const teacherReview = document.createElement("div");
+ // teacherReview.setAttribute("id", "teacherReview");
+ // teacherReview.setAttribute("data-app", true);
+ // document.body.append(teacherReview);
+
+ // // load vue app review subjects
+ // const reviewSubject = document.createElement("div");
+ // reviewSubject.setAttribute("id", "review-subject");
+ // reviewSubject.setAttribute("data-app", true);
+ // document.body.append(reviewSubject);
+
+ // // inject Vue app
+ extensionUtils.injectScript("scripts/main.js");
+ }, INJECT_CONTENT_DELAY);
}
diff --git a/src/scripts/contentscripts/views/Matricula.vue b/src/scripts/contentscripts/views/Matricula.vue
new file mode 100644
index 0000000..afdea58
--- /dev/null
+++ b/src/scripts/contentscripts/views/Matricula.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
![]()
+
+
+
+
Campus
+ {{ filter.name }}
+
+
+
+
diff --git a/src/utils/extensionUtils.js b/src/utils/extensionUtils.js
index 4c6c12b..b7111c5 100644
--- a/src/utils/extensionUtils.js
+++ b/src/utils/extensionUtils.js
@@ -3,16 +3,14 @@ import is from "is_js";
class ExtensionUtils {
IS_BROWSER = typeof chrome !== "undefined" && !!chrome.storage;
- #EXTENSION_ID = this.IS_BROWSER
- ? chrome.i18n.getMessage("@@extension_id")
- : null;
+ #EXTENSION_ID = this.IS_BROWSER ? chrome.runtime.id : null;
extensionURL(link) {
if (this.#EXTENSION_ID) {
const prefix = is.chrome() ? "chrome-extension://" : "moz-extension://";
return `${prefix}${this.#EXTENSION_ID}/${link.replace(/^\//, "")}`;
} else {
- // fallback in case we cant detect the browser
+ // this fallback is necessary because of the `src/lib`
return `https://next-extension.captain.sv.ufabcnext.com/static/${link}`;
}
}
@@ -27,9 +25,8 @@ class ExtensionUtils {
injectStyle(link) {
const styleTag = document.createElement("link");
- styleTag.href = this.extensionURL(link);
- styleTag.type = "text/css";
- styleTag.rel = "stylesheet";
+ styleTag.setAttribute("rel", "stylesheet");
+ styleTag.setAttribute("href", chrome.runtime.getURL(link));
document.head.appendChild(styleTag);
}
diff --git a/src/views/Matricula.vue b/src/views/Matricula.vue
index 4b24199..56cffbe 100644
--- a/src/views/Matricula.vue
+++ b/src/views/Matricula.vue
@@ -88,6 +88,7 @@
+