Compare commits

..

5 Commits

Author SHA1 Message Date
Wal
4c5cae7ff5 Merge pull request 'Translations' (#104) from wal/front/Translations into master
Some checks are pending
Build and test backend / Build-backend (push) Waiting to run
Build and test backend / Test-backend (push) Waiting to run
deploy to production / deploy-frontend (push) Waiting to run
deploy to production / deploy-backend (push) Waiting to run
Build and test FrontEnd / Build-frontend (push) Waiting to run
Reviewed-on: #104
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
2024-03-14 22:34:45 +01:00
59c3442647 lil corrections
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m6s
Build and test backend / Test-backend (pull_request) Successful in 2m5s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-14 22:33:16 +01:00
1777e894e9 removing spaces
All checks were successful
Build and test backend / Build-backend (pull_request) Successful in 2m0s
Build and test backend / Test-backend (pull_request) Successful in 2m2s
Build and test FrontEnd / Build-frontend (pull_request) Successful in 23s
2024-03-14 21:33:36 +01:00
3c3659c056 Merge branch 'master' into wal/front/Translations 2024-03-14 21:31:22 +01:00
e05492f4a8 Adding all translations 2024-03-14 21:27:03 +01:00
6 changed files with 90 additions and 46 deletions

View File

@ -1,5 +1,3 @@
# English translations (some examples to remove)
login.guest.signin=Sign in login.guest.signin=Sign in
login.guest.register=Register login.guest.register=Register
login.guest.alregister=Already Registered login.guest.alregister=Already Registered
@ -15,6 +13,8 @@ login.guest.lastpage=Last Page
login.guest.submit=Submit login.guest.submit=Submit
login.guest.birthday=BIRTHDAY login.guest.birthday=BIRTHDAY
login.guest.confirm=CONFIRM login.guest.confirm=CONFIRM
login.cPassword=Confirm Password
login.password=Password
app.home=Home app.home=Home
app.login=Login app.login=Login
app.notifications=Notifications app.notifications=Notifications
@ -23,8 +23,28 @@ app.messages=Messages
app.forum=Forum app.forum=Forum
app.schedules=Schedules app.schedules=Schedules
app.inscription.requests=Inscription Requests app.inscription.requests=Inscription Requests
app.manage.courses=Manage Courses
app.language=Language
app.manage.profile=Manage profile
request.moreInfos=More Infos request.moreInfos=More Infos
request.accept=Accept request.accept=Accept
request.refuse=Refuse request.refuse=Refuse
#===================================================== courses.createCourse=Create course
courses.deleteCourse=Delete course
courses.modify=Modify
courses.toDelete=Course to Delete
courses.confirm=Confirm
courses.back=Back
profile.modify.data=Modify personnal data
profile.reRegister=Re-register
profile.unRegister=Unregister
profile.course.list=Courses list
profile.address=Address
profile.picture=Profile picture
name=Name
teacher=Teacher
student=Student
secretary=Secretary
curriculum=curriculum
credits=Credits
faculty=Faculty

View File

@ -1,5 +1,3 @@
# Traductions françaises (Quelques examples a enlever)
login.guest.signin=SE CONNECTER login.guest.signin=SE CONNECTER
login.guest.register=S'enregistrer login.guest.register=S'enregistrer
login.guest.alregister=Déjà Enregistré login.guest.alregister=Déjà Enregistré
@ -15,6 +13,8 @@ login.guest.lastpage=Derniere Page
login.guest.submit=Envoyer login.guest.submit=Envoyer
login.guest.birthday=DATE DE NAISSANCE login.guest.birthday=DATE DE NAISSANCE
login.guest.confirm=CONFIRMER login.guest.confirm=CONFIRMER
login.cPassword=Confirmer mot de passe
login.password=Mot de passe
app.home=Home app.home=Home
app.login=Se connecter app.login=Se connecter
app.notifications=Notifications app.notifications=Notifications
@ -23,7 +23,28 @@ app.messages=Messages
app.forum=Forum app.forum=Forum
app.schedules=Horaires app.schedules=Horaires
app.inscription.requests=Demandes d'Inscription app.inscription.requests=Demandes d'Inscription
app.manage.courses=Gérer les cours
app.language=Langue
app.manage.profile=Gérer le profil
request.moreInfos=Plus d'Infos request.moreInfos=Plus d'Infos
request.accept=Accepter request.accept=Accepter
request.refuse=Refuser request.refuse=Refuser
#===================================================== courses.createCourse=Créer un cours
courses.deleteCourse=Supprimer un cours
courses.modify=Modifier
courses.toDelete=Cours à supprimer
courses.confirm=Confirmer
courses.back=Retour
profile.modify.data=Modifier données personnelles
profile.reRegister=Réinsciption
profile.unRegister=Désinscription
profile.course.list=Liste des cours
profile.address=Adresse
profile.picture=Photo de profil
name=Nom
teacher=Enseignant
student=Etudiant
secretary=Secrétaire
curriculum=Cursus
credits=Credits
faculty=Faculté

View File

@ -59,7 +59,7 @@
<a class="icon" > <a class="icon" >
<div class="fa-solid fa-gear" style="margin-top: 7px; margin-bottom: 3px;"></div> <div class="fa-solid fa-gear" style="margin-top: 7px; margin-bottom: 3px;"></div>
<div v-if="active" class="dropdown"> <div v-if="active" class="dropdown">
<div class="dropdown-content">Langage</div> <div class="dropdown-content">{{i18n("app.language")}}</div>
<ul style="list-style-type:none;"> <ul style="list-style-type:none;">
<li style=" margin-bottom:10px;margin-right:20px;float:left; font-size:10px; color:black;"> <li style=" margin-bottom:10px;margin-right:20px;float:left; font-size:10px; color:black;">
<button @:click="setLang('en');" href="#home">EN</button> <button @:click="setLang('en');" href="#home">EN</button>
@ -69,7 +69,7 @@
</ul> </ul>
<div style='align-items:center;'> <div style='align-items:center;'>
<a style="cursor:pointer;font-size:20px;" href="#/profil" class="dropdown-content"> <a style="cursor:pointer;font-size:20px;" href="#/profil" class="dropdown-content">
Manage Profile {{i18n("app.manage.profile")}}
</a> </a>
</div> </div>
@ -104,7 +104,7 @@
<li><a href="#/manage-courses"> <li><a href="#/manage-courses">
<div class="fa-solid fa-book" style="align-self:center;font-size: 40px;overflow:none;"></div> <div class="fa-solid fa-book" style="align-self:center;font-size: 40px;overflow:none;"></div>
<div class="text">Manage courses</div></a></li> <div class="text">{{i18n("app.manage.courses")}}</div></a></li>
</ul> </ul>
</div> </div>

View File

@ -100,7 +100,7 @@
<input type="text" v-model="country"> <input type="text" v-model="country">
</div> </div>
<div class="inputBox"> <div class="inputBox">
<p>CURSUS</p> <p>{{i18n("curriculum").toUpperCase()}}</p>
<select v-model="cursus"> <select v-model="cursus">
<option value="Chemistry">Chemistry</option> <option value="Chemistry">Chemistry</option>
<option value="Psycho">Psychology</option> <option value="Psycho">Psychology</option>

View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import i18n from "@/i18n.js"
import {ref} from 'vue' import {ref} from 'vue'
const cursus=[ const cursus=[
{ {
@ -95,69 +95,71 @@ const cursus=[
<div class="body"> <div class="body">
<div v-if="!deleteMod && !createMod" class="listTitle buttonGrid"> <div v-if="!deleteMod && !createMod" class="listTitle buttonGrid">
<button class="create" @click="createMod = true"> <button class="create" @click="createMod = true">
Create Course {{i18n("courses.createCourse")}}
</button> </button>
<button class="delete" @click="deleteMod=true" > <button class="delete" @click="deleteMod=true" >
Delete Course {{i18n("courses.deleteCourse")}}
</button> </button>
</div> </div>
<div v-if="createMod"> <div v-if="createMod">
<form class="listElement"> <form class="listElement">
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;">
Name: {{i18n("name")}} :
<input v-model="toAdd.name"> <input v-model="toAdd.name">
</div> </div>
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;">
Teacher: {{i18n("teacher")}} :
<select style="max-width:200px;" class="teacher" v-model="toAdd.teacher"> <select style="max-width:200px;" class="teacher" v-model="toAdd.teacher">
<option v-for="item in profList">{{item}}</option> <option v-for="item in profList">{{item}}</option>
</select> </select>
</div> </div>
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;">
Credits: {{i18n("credits")}} :
<input v-model="toAdd.credits"> <input v-model="toAdd.credits">
</div> </div>
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;">
Faculty: {{i18n("faculty")}} :
<input v-model="toAdd.faculty"> <input v-model="toAdd.faculty">
</div> </div>
<button class="create" @click="createMod=!createMod; addToCourse();"> Confirm </button> <button class="create" @click="createMod=!createMod; addToCourse();"> {{i18n("courses.confirm")}} </button>
<button style="float:right;" @click="createMod=!createMod"> Back</button> <button style="float:right;" @click="createMod=!createMod">{{i18n("courses.back")}}</button>
</form> </form>
</div> </div>
<div v-if="deleteMod"> <div v-if="deleteMod">
<form class="listElement"> <form class="listElement">
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;">
Course to delete: {{i18n("courses.toDelete")}} :
<select style="max-width:200px;" class="teacher" v-model="toRemove"> <select style="max-width:200px;" class="teacher" v-model="toRemove">
<option v-for="item in cursus">{{item.name}}</option> <option v-for="item in cursus">{{item.name}}</option>
</select> </select>
</div> </div>
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;">
Password: {{i18n("login.password")}}:
<input > <input >
</div> </div>
<div style="margin-bottom:20px;"> <div style="margin-bottom:20px;">
Confirm Password: {{i18n("login.cPassword")}} :
<input> <input>
</div> </div>
<button class="delete" @click="deleteMod=!deleteMod;removeCourse();"> Delete </button> <button class="delete" @click="deleteMod=!deleteMod;removeCourse();"> {{i18n("courses.deleteCourse")}} </button>
<button style="float:right;" @click="deleteMod=!deleteMod"> Back</button> <button style="float:right;" @click="deleteMod=!deleteMod"> {{i18n("courses.back")}}</button>
</form> </form>
</div> </div>
<div v-if="!createMod && !deleteMod" v-for="item in cursus" :key="item.name"> <div v-if="!createMod && !deleteMod" v-for="item in cursus" :key="item.name">
<div style ="padding:15px 15px 15px 15px;"> <div style ="padding:15px 15px 15px 15px;">
<button v-if="editElementID !== item.name" @click="editElementID = item.name"> Modify</button> <button v-if="editElementID !== item.name" @click="editElementID = item.name">
<button v-else @click="editElementID= ''"> Confirm </button> {{i18n("courses.modify")}}
</button>
<button v-else @click="editElementID= ''"> {{i18n("courses.confirm")}} </button>
</div> </div>
<div class="listElement" > <div class="listElement" >
<div class="containerElement" v-if="editElementID !== item.name" > <div class="containerElement" v-if="editElementID !== item.name" >
<div class="name"> {{item.name}} </div> <div class="name"> {{item.name}} </div>
<div class="teacher">{{item.teacher}}</div> <div class="teacher">{{item.teacher}}</div>
<div class="credits">Credits:{{item.credits}}</div> <div class="credits">{{i18n("credits")}}:{{item.credits}}</div>
</div> </div>
<div class="containerElement"v-else> <div class="containerElement"v-else>
<input style="max-width:200px;" class="name" v-model="item.name"> <input style="max-width:200px;" class="name" v-model="item.name">

View File

@ -1,6 +1,7 @@
<script setup> <script setup>
import {reactive, ref} from 'vue' import {reactive, ref} from 'vue'
import {getUser} from '../rest/Users.js' import {getUser} from '../rest/Users.js'
import i18n from "@/i18n.js"
/* /*
const user = getUser(); const user = getUser();
*/ */
@ -84,23 +85,23 @@ const toModify = Object.assign({}, user);
E-mail: {{user.email}} E-mail: {{user.email}}
</div> </div>
<div v-if="user.role==='student'"> <div v-if="user.role==='student'">
{{user.option}} {{user.role.toUpperCase()}} {{user.option}} {{i18n(user.role).toUpperCase()}}
</div> </div>
<div v-else> <div v-else>
Faculty: {{user.faculty}} {{i18n("faculty")}}: {{user.faculty}}
Role: {{user.role}} Role: {{i18n(user.role).toUpperCase()}}
</div> </div>
<div> <div>
<button @click="modif=!modif"> Modifier données personnelles </button> <button @click="modif=!modif"> {{i18n("profile.modify.data")}} </button>
</div> </div>
<div v-if="(user.role==='student')"> <div v-if="(user.role==='student')">
<button>Réinscription</button> <button>{{i18n("profile.reRegister")}}</button>
<button style="float:right;background-color:rgb(150,0,0);">Désinscription</button> <button style="float:right;background-color:rgb(150,0,0);">{{i18n("profile.unRegister")}}</button>
</div> </div>
</div> </div>
<div v-else class="infosContainer"> <div v-else class="infosContainer">
<div> <div>
Profil Picture {{i18n("profile.picture")}}:
<input type="file"> <input type="file">
</div> </div>
<div> <div>
@ -108,19 +109,19 @@ const toModify = Object.assign({}, user);
<input type="mail" v-model="toModify.email" /> <input type="mail" v-model="toModify.email" />
</div> </div>
<div> <div>
Address: {{i18n("profile.address")}}:
<input type="text" v-model="toModify.address"> <input type="text" v-model="toModify.address">
</div> </div>
<div> <div>
Password {{i18n("login.password")}}:
<input type="password" v-model="toModify.password"> <input type="password" v-model="toModify.password">
</div> </div>
<div> <div>
Confirm Password {{i18n("login.cPassword")}}:
<input type="password" id="confirm"> <input type="password" id="confirm">
</div> </div>
<div> <div>
<button @click=" modif=!modif">Confirm</button> <button @click=" modif=!modif">{{i18n("courses.confirm")}}</button>
</div> </div>
</div> </div>
</div> </div>
@ -128,7 +129,7 @@ const toModify = Object.assign({}, user);
<div v-if="(user.role==='student')"> <div v-if="(user.role==='student')">
<div class="listTitle"> <div class="listTitle">
Liste des cours {{i18n("profile.course.list")}}
</div> </div>
<div class="listElement " <div class="listElement "
v-for="item in user.cursus"> v-for="item in user.cursus">
@ -145,7 +146,7 @@ const toModify = Object.assign({}, user);
<div v-if="(user.role==='teacher')"> <div v-if="(user.role==='teacher')">
<div class="listTitle"> <div class="listTitle">
Liste des cours {{i18n("profile.course.list")}}
</div> </div>
<div class="listElement " v-for="item in user.coursesOwned"> <div class="listElement " v-for="item in user.coursesOwned">
{{item.name}} {{item.name}}