diff --git a/backend/cdn/0ea1f30e-c82b-4346-988f-6a44b4028137.jpg b/backend/cdn/0ea1f30e-c82b-4346-988f-6a44b4028137.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/0ea1f30e-c82b-4346-988f-6a44b4028137.jpg differ diff --git a/backend/cdn/2bea4f35-5966-4543-ae34-c6f757bcd9b2.jpg b/backend/cdn/2bea4f35-5966-4543-ae34-c6f757bcd9b2.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/2bea4f35-5966-4543-ae34-c6f757bcd9b2.jpg differ diff --git a/backend/cdn/369e3e69-a100-489a-bdc9-5c2227a42ccc.jpg b/backend/cdn/369e3e69-a100-489a-bdc9-5c2227a42ccc.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/369e3e69-a100-489a-bdc9-5c2227a42ccc.jpg differ diff --git a/backend/cdn/652f05cb-6387-49ec-9284-0a8ae687f875.jpg b/backend/cdn/652f05cb-6387-49ec-9284-0a8ae687f875.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/652f05cb-6387-49ec-9284-0a8ae687f875.jpg differ diff --git a/backend/cdn/7f9a87b9-6d82-4e24-874d-6f96f6d55baa.jpg b/backend/cdn/7f9a87b9-6d82-4e24-874d-6f96f6d55baa.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/7f9a87b9-6d82-4e24-874d-6f96f6d55baa.jpg differ diff --git a/backend/cdn/87149c65-aaa6-4b0a-9121-1440f6b4252a.jpg b/backend/cdn/87149c65-aaa6-4b0a-9121-1440f6b4252a.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/87149c65-aaa6-4b0a-9121-1440f6b4252a.jpg differ diff --git a/backend/cdn/8baaebd9-a709-443e-ada9-785643263c13.jpg b/backend/cdn/8baaebd9-a709-443e-ada9-785643263c13.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/8baaebd9-a709-443e-ada9-785643263c13.jpg differ diff --git a/backend/cdn/97151d65-0c14-4bf2-95ab-83b74ecdfeb8.jpg b/backend/cdn/97151d65-0c14-4bf2-95ab-83b74ecdfeb8.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/97151d65-0c14-4bf2-95ab-83b74ecdfeb8.jpg differ diff --git a/backend/cdn/a03f90dc-fd7d-478a-a51d-805c409c851a.jpg b/backend/cdn/a03f90dc-fd7d-478a-a51d-805c409c851a.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/a03f90dc-fd7d-478a-a51d-805c409c851a.jpg differ diff --git a/backend/cdn/a6565a5f-53ee-42db-b8a4-69e336ba6ae6.jpg b/backend/cdn/a6565a5f-53ee-42db-b8a4-69e336ba6ae6.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/a6565a5f-53ee-42db-b8a4-69e336ba6ae6.jpg differ diff --git a/backend/cdn/b09c90b8-05fe-4849-a0a2-f957118c0e28.jpg b/backend/cdn/b09c90b8-05fe-4849-a0a2-f957118c0e28.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/b09c90b8-05fe-4849-a0a2-f957118c0e28.jpg differ diff --git a/backend/cdn/cb16ede7-57dc-491c-966d-60df52c56a16.jpg b/backend/cdn/cb16ede7-57dc-491c-966d-60df52c56a16.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/cb16ede7-57dc-491c-966d-60df52c56a16.jpg differ diff --git a/backend/cdn/d73b2112-67bf-46b7-ab0a-9ada0a13842c.jpg b/backend/cdn/d73b2112-67bf-46b7-ab0a-9ada0a13842c.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/d73b2112-67bf-46b7-ab0a-9ada0a13842c.jpg differ diff --git a/backend/cdn/f2e7429b-f466-4c97-9d92-d9e630357da5.jpg b/backend/cdn/f2e7429b-f466-4c97-9d92-d9e630357da5.jpg new file mode 100644 index 0000000..d8e38c9 Binary files /dev/null and b/backend/cdn/f2e7429b-f466-4c97-9d92-d9e630357da5.jpg differ diff --git a/frontend/src/Apps/Inscription.vue b/frontend/src/Apps/Inscription.vue index e47f6c1..5acec82 100644 --- a/frontend/src/Apps/Inscription.vue +++ b/frontend/src/Apps/Inscription.vue @@ -1,10 +1,107 @@ - - + + + + + + + + {{item.id}} + {{item.lastName}} + {{item.firstName}} + {{i18n("request.moreInfos")}} + {{i18n("request.accept")}} + {{i18n("request.refuse")}} + + + + + + + diff --git a/frontend/src/Apps/Login.vue b/frontend/src/Apps/Login.vue index be1ec00..68214e1 100644 --- a/frontend/src/Apps/Login.vue +++ b/frontend/src/Apps/Login.vue @@ -20,7 +20,7 @@ const email=ref("") const address=ref("") const country=ref("") - const curriculum=ref("") + let curriculum; const imageSaved = ref(false) const ppData = ref(false) @@ -29,7 +29,6 @@ function goBackHome(){ setTimeout(() => { - console.log("Delayed for 1 second."); window.location.href="#/home"; }, "500"); } @@ -48,6 +47,8 @@ disconnect(); window.location.reload();} + + @@ -129,14 +130,14 @@ - {{i18n("curriculum").toUpperCase()}} + {{i18n("Curriculum").toUpperCase()}} - {{item.option}} + {{item.curriculumId}} - + {{i18n("login.guest.submit")}} diff --git a/frontend/src/Apps/Request.vue b/frontend/src/Apps/Request.vue deleted file mode 100644 index 9d1bd9a..0000000 --- a/frontend/src/Apps/Request.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - {{id}} - {{type}} - {{lastName}} - {{firstName}} - {{i18n("request.moreInfos")}} - {{i18n("request.accept")}} - {{i18n("request.refuse")}} - - - - - - diff --git a/frontend/src/rest/ServiceInscription.js b/frontend/src/rest/ServiceInscription.js index 1f75123..c989911 100644 --- a/frontend/src/rest/ServiceInscription.js +++ b/frontend/src/rest/ServiceInscription.js @@ -33,6 +33,10 @@ export async function getRegisters(id){ return restGet("/request/register") } +export async function getAllRegisters(){ + return restGet("/requests/register") +} + /** * Change the state of a requests. */ diff --git a/frontend/src/rest/Users.js b/frontend/src/rest/Users.js index 7f28cba..7446c61 100644 --- a/frontend/src/rest/Users.js +++ b/frontend/src/rest/Users.js @@ -26,7 +26,7 @@ export function disconnect(){ * @param curriculum * @param imageId id of the image in database returned when uploaded */ -export async function register(firstname, lastname, birthDate, password, email, address, country, curriculum, imageId){ +export async function register(firstname, lastname, birthDate, password, email, address, country, curriculumId, imageId){ return restPost("/register", { firstname: firstname, lastname: lastname, @@ -35,7 +35,7 @@ export async function register(firstname, lastname, birthDate, password, email, email: email, address: address, country: country, - curriculum: curriculum + curriculumId: curriculumId }); } diff --git a/frontend/src/rest/courses.js b/frontend/src/rest/courses.js index 734d445..aeaf4e6 100644 --- a/frontend/src/rest/courses.js +++ b/frontend/src/rest/courses.js @@ -8,7 +8,7 @@ import { restGet, restPost, restDelete, restPatch } from './restConsumer.js' * Create a new course */ export async function createCourse(name, credits, teacher){ - return restPost("/course", {name: name, credits: credits, owner: teacher} ) + return restPost("/course", {title: name, credits: credits, owner: teacher} ) } /**
{{i18n("curriculum").toUpperCase()}}
{{i18n("Curriculum").toUpperCase()}}