Skip to content

Commit 2c0f3ca

Browse files
saumon-brulesaumon-brule
committed
Merge branch 'working' of github.com:Magic-Fishes/Ecole-Directe-Plus into working
2 parents 952a6d7 + a6a977c commit 2c0f3ca

File tree

7 files changed

+24
-58
lines changed

7 files changed

+24
-58
lines changed

‎src/App.jsx

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { useCreateNotification } from "./components/generic/PopUps/Notification"
2020
import { getGradeValue, calcAverage, findCategory, calcCategoryAverage, calcGeneralAverage, formatSkills, safeParseFloat, calcClassGeneralAverage, calcClassAverage } from "./utils/gradesTools";
2121
import { areOccurenciesEqual, createUserLists, encrypt, decrypt, getBrowser } from "./utils/utils";
2222
import { getCurrentSchoolYear } from "./utils/date";
23-
import { getProxiedURL } from "./utils/requests";
2423
import EdpuLogo from "./components/graphics/EdpuLogo";
2524
import { tr } from "date-fns/locale";
2625

@@ -1505,7 +1504,7 @@ export default function App({ edpFetch }) {
15051504
referrerPolicy: "no-referrer"
15061505
}
15071506

1508-
edpFetch(getProxiedURL(`https://api.ecoledirecte.com/v3/login.awp?v=${apiVersion}`, true), options, "text")
1507+
edpFetch(`https://api.ecoledirecte.com/v3/login.awp?v=${apiVersion}`, options, "text")
15091508
.then((response) => {
15101509
if (!response) {
15111510
setIsEDPUnblockInstalled(false);
@@ -1615,7 +1614,7 @@ export default function App({ edpFetch }) {
16151614
anneeScolaire: getUserSettingValue("isSchoolYearEnabled") ? getUserSettingValue("schoolYear").join("-") : ""
16161615
}
16171616

1618-
edpFetch(getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/timeline.awp?verbe=get&v=${apiVersion}`, true),
1617+
edpFetch(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/timeline.awp?verbe=get&v=${apiVersion}`,
16191618
{
16201619
method: "POST",
16211620
headers: {
@@ -1664,7 +1663,7 @@ export default function App({ edpFetch }) {
16641663
anneeScolaire: getUserSettingValue("isSchoolYearEnabled") ? getUserSettingValue("schoolYear").join("-") : "",
16651664
}
16661665
edpFetch(
1667-
getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[userId].id}/notes.awp?verbe=get&v=${apiVersion}`, true),
1666+
`https://api.ecoledirecte.com/v3/eleves/${accountsListState[userId].id}/notes.awp?verbe=get&v=${apiVersion}`,
16681667
{
16691668
method: "POST",
16701669
headers: {
@@ -1733,7 +1732,7 @@ export default function App({ edpFetch }) {
17331732
abortControllers.current.splice(abortControllers.current.indexOf(controller), 1);
17341733
} else {
17351734
edpFetch(
1736-
getProxiedURL(`https://api.ecoledirecte.com/v3/Eleves/${accountsListState[userId].id}/${endpoint}.awp?verbe=get&v=${apiVersion}`, true),
1735+
`https://api.ecoledirecte.com/v3/Eleves/${accountsListState[userId].id}/${endpoint}.awp?verbe=get&v=${apiVersion}`,
17371736
{
17381737
method: "POST",
17391738
headers: {
@@ -1798,7 +1797,7 @@ export default function App({ edpFetch }) {
17981797
} else {
17991798
try {
18001799
const response = await edpFetch(
1801-
getProxiedURL(`https://api.ecoledirecte.com/v3/Eleves/${accountsListState[userId].id}/${endpoint}.awp?verbe=get&v=${apiVersion}`, true),
1800+
`https://api.ecoledirecte.com/v3/Eleves/${accountsListState[userId].id}/${endpoint}.awp?verbe=get&v=${apiVersion}`,
18021801
{
18031802
method: "POST",
18041803
headers: {
@@ -1847,7 +1846,7 @@ export default function App({ edpFetch }) {
18471846
const userId = activeAccount;
18481847

18491848
return edpFetch(
1850-
getProxiedURL(`https://api.ecoledirecte.com/v3/Eleves/${accountsListState[userId].id}/cahierdetexte.awp?verbe=put&v=${apiVersion}`, true),
1849+
`https://api.ecoledirecte.com/v3/Eleves/${accountsListState[userId].id}/cahierdetexte.awp?verbe=put&v=${apiVersion}`,
18511850
{
18521851
method: "POST",
18531852
headers: {
@@ -1909,7 +1908,7 @@ export default function App({ edpFetch }) {
19091908
folderId = 0;
19101909
}
19111910
edpFetch(
1912-
getProxiedURL(`https://api.ecoledirecte.com/v3/${accountsListState[userId].accountType === "E" ? "eleves/" + accountsListState[userId].id : "familles/" + accountsListState[userId].familyId}/messages.awp?force=false&typeRecuperation=${specialFolderType}&idClasseur=${folderId}&orderBy=date&order=desc&query=&onlyRead=&getAll=1&verbe=get&v=${apiVersion}`, true),
1911+
`https://api.ecoledirecte.com/v3/${accountsListState[userId].accountType === "E" ? "eleves/" + accountsListState[userId].id : "familles/" + accountsListState[userId].familyId}/messages.awp?force=false&typeRecuperation=${specialFolderType}&idClasseur=${folderId}&orderBy=date&order=desc&query=&onlyRead=&getAll=1&verbe=get&v=${apiVersion}`,
19131912
{
19141913
method: "POST",
19151914
headers: {
@@ -1983,7 +1982,7 @@ export default function App({ edpFetch }) {
19831982
const mode = (oldSortedMessages.find((item) => item.id === id).folderId === -1 || oldSortedMessages.find((item) => item.id === id).folderId === -4) ? "expediteur" : "destinataire";
19841983

19851984
edpFetch(
1986-
getProxiedURL(`https://api.ecoledirecte.com/v3/${accountsListState[userId].accountType === "E" ? "eleves/" + accountsListState[userId].id : "familles/" + accountsListState[userId].familyId}/messages/${id}.awp?verbe=get&mode=${mode}&v=${apiVersion}`, true),
1985+
`https://api.ecoledirecte.com/v3/${accountsListState[userId].accountType === "E" ? "eleves/" + accountsListState[userId].id : "familles/" + accountsListState[userId].familyId}/messages/${id}.awp?verbe=get&mode=${mode}&v=${apiVersion}`,
19871986
{
19881987
method: "POST",
19891988
headers: {
@@ -2032,7 +2031,7 @@ export default function App({ edpFetch }) {
20322031
ids: ids
20332032
}
20342033
edpFetch(
2035-
getProxiedURL(`https://api.ecoledirecte.com/v3/${accountsListState[userId].accountType === "E" ? "eleves/" + accountsListState[userId].id : "familles/" + accountsListState[userId].familyId}/messages.awp?verbe=put&v=${apiVersion}`, true),
2034+
`https://api.ecoledirecte.com/v3/${accountsListState[userId].accountType === "E" ? "eleves/" + accountsListState[userId].id : "familles/" + accountsListState[userId].familyId}/messages.awp?verbe=put&v=${apiVersion}`,
20362035
{
20372036
method: "POST",
20382037
headers: {
@@ -2071,7 +2070,7 @@ export default function App({ edpFetch }) {
20712070
anneeScolaire: getUserSettingValue("isSchoolYearEnabled") ? getUserSettingValue("schoolYear").join("-") : ""
20722071
}
20732072

2074-
edpFetch(getProxiedURL(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/viescolaire.awp?verbe=get&v=${apiVersion}`, true),
2073+
edpFetch(`https://api.ecoledirecte.com/v3/eleves/${accountsListState[activeAccount].id}/viescolaire.awp?verbe=get&v=${apiVersion}`,
20752074
{
20762075
method: "POST",
20772076
headers: {
@@ -2116,7 +2115,7 @@ export default function App({ edpFetch }) {
21162115
function fetchA2F({ method = "get", choice = "", callback = (() => { }), errorCallback = (() => { }), controller = (new AbortController()) }) {
21172116
abortControllers.current.push(controller);
21182117
edpFetch(
2119-
getProxiedURL(`https://api.ecoledirecte.com/v3/connexion/doubleauth.awp?verbe=${method}&v=${apiVersion}`, true),
2118+
`https://api.ecoledirecte.com/v3/connexion/doubleauth.awp?verbe=${method}&v=${apiVersion}`,
21202119
{
21212120
method: "POST",
21222121
headers: {
@@ -2153,7 +2152,7 @@ export default function App({ edpFetch }) {
21532152
const data = {
21542153
libelle: name,
21552154
}
2156-
edpFetch(getProxiedURL("https://api.ecoledirecte.com/v3/messagerie/classeurs.awp?verbe=post%26v=4.52.0", true),
2155+
edpFetch("https://api.ecoledirecte.com/v3/messagerie/classeurs.awp?verbe=post%26v=4.52.0",
21572156
{
21582157
method: "POST",
21592158
headers: {
@@ -2185,8 +2184,7 @@ export default function App({ edpFetch }) {
21852184

21862185
async function fetchAdministrativeDocuments(selectedYear, controller = (new AbortController())) {
21872186
abortControllers.current.push(controller);
2188-
return edpFetch(
2189-
getProxiedURL(`https://api.ecoledirecte.com/v3/${accountsListState[activeAccount].accountType === "E" ? "eleves" : "famille"}Documents.awp?archive=${selectedYear}&verbe=get&v=${apiVersion}`, true),
2187+
return edpFetch(`https://api.ecoledirecte.com/v3/${accountsListState[activeAccount].accountType === "E" ? "eleves" : "famille"}Documents.awp?archive=${selectedYear}&verbe=get&v=${apiVersion}`,
21902188
{
21912189
method: "POST",
21922190
headers: {

‎src/components/Feedback/FeedbackForm.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import { AppContext } from "../../App";
1313
// graphics
1414
import PasteIcon from "../graphics/PasteIcon"
1515
import AtWhite from "../graphics/AtWhite"
16-
import { getProxiedURL } from "../../utils/requests";
1716

1817
import "./FeedbackForm.css";
1918
import { getBrowser, getOS } from "../../utils/utils";
@@ -301,7 +300,7 @@ ${getBrowser()} ; ${getOS()} ; <inconnu> (Complété automatiquement. Modifiable
301300
color: parseInt("0x" + color),
302301
author: {
303302
name: ((activeUser && isAnonymous) ? activeUser.lastName + " " + activeUser.firstName : "Poisson-zèbre Augmenté") + " (" + (isAnonymous ? "N/A" : (userEmail || (activeUser ? activeUser.email : ""))) + ")",
304-
icon_url: ((isAnonymous || !activeUser) ? "https://i.ibb.co/CKmD9z8/poisson-z-bre.jpg" : getProxiedURL("https:" + activeUser.picture))
303+
icon_url: ((isAnonymous || !activeUser) ? "https://i.ibb.co/CKmD9z8/poisson-z-bre.jpg" : "https:" + activeUser.picture)
305304
},
306305
title: "**__" + selectedFeedbackType + "__ : " + subject + "**",
307306
description: feedbackContent,

‎src/components/Lab/Lab.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,12 @@ export default function Lab({ fetchGrades }) {
322322
ac ut consequat semper viverra nam libero justo laoreet sit amet cursus sit amet dictum sit amet justo donec enim diam vulputate ut pharetra sit amet aliquam id diam maecenas ultricies mi eget mauris pharetra et ultrices neque ornare aenean euismod elementum nisi quis eleifend quam adipiscing vitae proin sagittis nisl rhoncus mattis rhoncus urna neque viverra justo nec ultrices dui sapien eget mi proin sed libero enim sed
323323
</OutlineEffectDiv>
324324

325+
<h4>OutlineEffectDiv</h4>
326+
<Button onClick={() => fetch("https://doc1.ecoledirecte.com/PhotoEleves/073TEST2_714d424d764c7533325151/65766a305651.jpg")}>
327+
Fetch pp
328+
</Button>
329+
<img src="https://doc1.ecoledirecte.com/PhotoEleves/073TEST2_714d424d764c7533325151/65766a305651.jpg"></img>
330+
325331
{/* FOOTER */}
326332
<div style={{ height: "100px" }}></div>
327333
</div>

‎src/components/UnsubscribeEmails/UnsubscribeEmails.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import "./UnsubscribeEmails.css";
66
// graphics
77
import LoadingAnimation from "../graphics/LoadingAnimation";
88
import { Link } from "react-router-dom";
9-
import { getProxiedURL } from "../../utils/requests";
10-
119

1210
export default function UnsubscribeEmails({ activeUser, thonFrustre }) {
1311
const [isUnsubscribed, setIsUnsubscribed] = useState(false);
@@ -33,7 +31,7 @@ export default function UnsubscribeEmails({ activeUser, thonFrustre }) {
3331
color: parseInt("0xB4B4F0"),
3432
author: {
3533
name: (activeUser ? activeUser.lastName + " " + activeUser.firstName : "Poisson-zèbre Augmenté") + " (" + (activeUser ? activeUser.email : "") + ")",
36-
icon_url: (!activeUser ? "https://i.ibb.co/CKmD9z8/poisson-z-bre.jpg" : getProxiedURL("https:" + activeUser.picture))
34+
icon_url: (!activeUser ? "https://i.ibb.co/CKmD9z8/poisson-z-bre.jpg" : "https:" + activeUser.picture)
3735
},
3836
title: "Désabonnement aux emails",
3937
description: "Cet utilisateur ne souhaite plus recevoir d'email d'Ecole Directe Plus",

‎src/components/app/Account/Account.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { AppContext } from "../../../App";
44
import HolographicDiv from "../../generic/CustomDivs/HolographicDiv";
55
import Button from "../../generic/UserInputs/Button";
66
import DropDownMenu from "../../generic/UserInputs/DropDownMenu";
7-
import { getProxiedURL } from "../../../utils/requests";
87
import FileComponent from "../../generic/FileComponent";
98
import ContentLoader from "react-content-loader";
109
import CanardmanSleeping from "../../graphics/CanardmanSleeping";
@@ -112,7 +111,7 @@ export default function Account({ schoolLife, fetchSchoolLife, fetchAdministrati
112111
<img
113112
ref={(el) => (profilePictureRefs.current[0] = el)}
114113
className="profile-picture"
115-
src={(settings.get("isStreamerModeEnabled") ? "/images/scholar-canardman.png" : ((accountsListState[activeAccount].firstName !== "Guest") ? getProxiedURL("https:" + accountsListState[activeAccount].picture) : accountsListState[activeAccount].picture))}
114+
src={(settings.get("isStreamerModeEnabled") ? "/images/scholar-canardman.png" : ((accountsListState[activeAccount].firstName !== "Guest") ? "https:" + accountsListState[activeAccount].picture : accountsListState[activeAccount].picture))}
116115
alt={"Photo de profil de " + accountsListState[activeAccount].firstName}
117116
/>
118117
</div>

‎src/components/app/Header/AccountSelector.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import LogoutIcon from "../../graphics/LogoutIcon";
1616
import { AppContext } from "../../../App";
1717

1818
import "./AccountSelector.css";
19-
import { getProxiedURL } from "../../../utils/requests";
2019

2120
export default function AccountSelector({ accountsList, activeAccount, setActiveAccount, isTabletLayout, logout, ...props }) {
2221

@@ -137,7 +136,7 @@ export default function AccountSelector({ accountsList, activeAccount, setActive
137136
<div className="account">
138137
<div className="pp-container">
139138
<img ref={(el) => (profilePictureRefs.current[0] = el)} className="profile-picture" src={((accountsList[activeAccount].firstName !== "Guest")
140-
? settings.get("isStreamerModeEnabled") ? "/images/scholar-canardman.png" : getProxiedURL("https:" + accountsList[activeAccount].picture)
139+
? settings.get("isStreamerModeEnabled") ? "/images/scholar-canardman.png" : accountsList[activeAccount].picture
141140
: accountsList[activeAccount].picture
142141
)} alt={"Photo de profil de " + accountsList[activeAccount].firstName} />
143142
</div>
@@ -157,7 +156,7 @@ export default function AccountSelector({ accountsList, activeAccount, setActive
157156
return <div className="alt-account" key={account.id} role="button" tabIndex="0" onKeyDown={(event) => handleKeyDown2(event, () => { switchAccount(index); handleClose() })} onClick={() => { switchAccount(index); handleClose() }}>
158157
<div className="account">
159158
<div className="pp-container">
160-
<img ref={(el) => (profilePictureRefs.current[index+1] = el)} className="profile-picture" src={getProxiedURL("https:" + account.picture)} alt={"Photo de profil de " + account.firstName} />
159+
<img ref={(el) => (profilePictureRefs.current[index+1] = el)} className="profile-picture" src={account.picture} alt={"Photo de profil de " + account.firstName} />
161160
</div>
162161
<address className="account-info">
163162
<span className="name"><span className="first-name">{account.firstName}</span> <span className="last-name">{account.lastName.toUpperCase()}</span></span>

‎src/utils/requests.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)