From 3298b987b414e03b18dc18ef6b38e012832ebff1 Mon Sep 17 00:00:00 2001 From: miquelvir <41950283+miquelvir@users.noreply.github.com> Date: Sat, 1 Jul 2023 21:02:29 +0200 Subject: [PATCH] update a curs 23-24 --- README.md | 6 +----- web_app/src/PreEnrolmentPage/PreEnrolmentPage.js | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bb3f50aa..0914ed2d 100644 --- a/README.md +++ b/README.md @@ -45,17 +45,13 @@ v1-4 by @miquelvir Due to budget constraints, reduced development and maintenance group, and for simplicity's sake, centrifuga4 is build following a monolithic approach. However, code decoupling and modularity are still important. -We are using 2 processes (dynos, in Heroku's slang), if we are not to count the Postgres and the Redis instances: -1. Web process: a Flask server serving the static files (including the React frontend) and all the APIs. +Web process: a Flask server serving the static files (including the React frontend) and all the APIs. 1. Data API (for DB data access and modification) 2. Auth API (to login, logout and ping) 3. Front end static files 4. Invites API (to create and send user invites, as well as to create users from invites) 5. Password reset API (to ask for a password reset, as well as to change the password from a password reset request) 6. Document validation page (checks the content and validity of a JWT token signed by the server and displays it in a simple static page). -2. Worker process: a Redis Queue worker for emails and long exports. - -The worker process has been replaced with a threaded approach, so that the free dynos last for the whole month. ### DEPLOYMENT diff --git a/web_app/src/PreEnrolmentPage/PreEnrolmentPage.js b/web_app/src/PreEnrolmentPage/PreEnrolmentPage.js index c01f044f..94995564 100644 --- a/web_app/src/PreEnrolmentPage/PreEnrolmentPage.js +++ b/web_app/src/PreEnrolmentPage/PreEnrolmentPage.js @@ -505,13 +505,13 @@ __person1__surname1: '', {activeStep === 0 &&
- Podeu consultar el quadre horari del curs 22-23 aquí. + Podeu consultar el quadre horari del curs 23-24 aquí.
Enviar aquest formulari implica consentiment per fer ús de les dades per tal de rebre informació durant el període de preinscripció i inici de curs. -La posterior matrícula presencial al centre implica també l'ús de les dades durant tot el curs 2022-2023. +La posterior matrícula presencial al centre implica també l'ús de les dades durant tot el curs 2023-2024. La nostra política protecció de dades es basa en que: