From c14d0a9d21ca37e3ec409f4ee06dd70f4bef12af Mon Sep 17 00:00:00 2001 From: Wawilski Date: Sat, 9 Mar 2024 11:07:13 +0100 Subject: [PATCH 1/7] option language settings start --- frontend/src/App.vue | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 51f8882..2ee53b0 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -26,8 +26,10 @@ const notifications=ref(i18n("app.notifications")) const settings=ref(i18n("app.settings")) const login=ref(i18n("app.login")) - - + const active=ref(false) + function toggle() { + active = !active; + } @@ -52,9 +54,17 @@
-
  • +
  • +
    +
    Langage
    +
      +
      • +
      • +
    + +
  • @@ -122,8 +132,30 @@ .leftBar{ grid-area:leftBar; } +.option { + position: relative; + display: block; +} +.dropdown { + margin-top:55px; + display: block; + height:150px; + font-size: 13px; + position: absolute; + z-index: 1; + background-color:white; +} + +.dropdown .content { + color: #4CAF50; + padding: 8px 10px; + text-decoration: none; + display: block; + transition: 0.1s; +} + ul.vertical{ list-style-type: none; margin-top: 61px; @@ -176,7 +208,6 @@ position: fixed; height:61px; width: 100%; - overflow: hidden; background-color: rgb(24, 24, 24); } From 07e5fb3a7307a23e970f9a226be25a1c48638531 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Sat, 9 Mar 2024 22:48:33 +0100 Subject: [PATCH 2/7] profil menu base --- frontend/src/App.vue | 115 ++++++++++++---------------------- frontend/src/Apps/Login.vue | 10 --- frontend/src/Apps/Profil.vue | 98 +++++++++++++++++++++++++++++ frontend/src/Apps/Request.vue | 15 ++--- 4 files changed, 144 insertions(+), 94 deletions(-) create mode 100644 frontend/src/Apps/Profil.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 2ee53b0..bedd1f1 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -7,16 +7,21 @@ // Liste des apps import LoginPage from './Apps/Login.vue' import Inscription from "./Apps/Inscription.vue" + import Profil from "./Apps/Profil.vue" const apps = { '/login': LoginPage, - '/inscription': Inscription + '/inscription': Inscription, + '/profil': Profil } const currentPath = ref(window.location.hash) window.addEventListener('hashchange', () => { currentPath.value = window.location.hash }) + + function refreshPage() { + window.location.reload();} const currentView = computed(() => { return apps[currentPath.value.slice(1) || '/'] @@ -27,10 +32,7 @@ const settings=ref(i18n("app.settings")) const login=ref(i18n("app.login")) const active=ref(false) - function toggle() { - active = !active; - } - + @@ -32,11 +27,11 @@ .container{ color:white; height:100px; - font-size:20px; + font-size:20px; display:grid; - grid-template-columns:[firstCol-start]100px[firstCol-end secondCol-start]150px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol]; + grid-template-columns:[firstCol-start]100px[firstCol-end secondCol-start]150px[endCol]; grid-template-areas: - "id type surname firstname infos accept refuse"; + " accept refuse"; column-gap:10px; } From 3cf5153e79ac1b2114e0cded486b719b738faca2 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Sun, 10 Mar 2024 12:34:44 +0100 Subject: [PATCH 3/7] Profil Student Prototype --- frontend/src/Apps/Profil.vue | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue index 893104c..76f5017 100644 --- a/frontend/src/Apps/Profil.vue +++ b/frontend/src/Apps/Profil.vue @@ -13,14 +13,15 @@ "name": "Math pour l'info", "credits": 11, "faculty": "science", - "Teacher": 42, + "teacher": 42, "Assistants": []}, - cours2:{ "id": 42, + cours2:{ + "id": 42, "name": "Fonctionnement des ordinateurs", "credits": 11, "faculty": "science", - "Teacher": 42, - "Assistants": []} + "teacher": 42, + "Assistants": []}, }, option:"IT", @@ -37,8 +38,8 @@
    -
    -
    +
    +
    {{example.firstName}} {{example.lastName.toUpperCase()}}
    @@ -50,8 +51,17 @@
    -
    +
    +
    + Liste des cours +
    +
    + {{item.name}} Teacher: {{item.teacher}} Credits:{{item.credits}} +
    +
    From 042553c1239c7029214d5f6c0342bec5052b77e6 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Sun, 10 Mar 2024 16:01:47 +0100 Subject: [PATCH 4/7] Profil Teacher and examples --- frontend/src/Apps/Profil.vue | 160 +++++++++++++++++++++++++++++++--- frontend/src/Apps/Request.vue | 13 ++- 2 files changed, 156 insertions(+), 17 deletions(-) diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue index 76f5017..b95ff54 100644 --- a/frontend/src/Apps/Profil.vue +++ b/frontend/src/Apps/Profil.vue @@ -1,8 +1,11 @@ @@ -38,30 +70,60 @@
    -
    +
    - {{example.firstName}} {{example.lastName.toUpperCase()}} + {{user.firstName}} {{user.lastName.toUpperCase()}}
    - E-mail: {{example.email}} + E-mail: {{user.email}} +
    +
    + {{user.option}} {{user.role.toUpperCase()}} +
    +
    + Faculty: {{user.faculty}} + Role: {{user.role}}
    - {{example.option}} {{example.role.toUpperCase()}} + +
    +
    + +
    -
    -
    + +
    +
    Liste des cours
    -
    - {{item.name}} Teacher: {{item.teacher}} Credits:{{item.credits}} +
    +
    +
    {{item.name}}
    +
    {{item.teacher}}
    +
    Credits:{{item.credits}}
    +
    + +
    +
    + +
    +
    + Liste des cours +
    +
    + {{item.name}} +
    +
    + +
    +
    +
    @@ -104,5 +166,77 @@ width:100%; margin-bottom:10px; } + .containerElement{ + justify-content:center; + display:grid; + grid-template-columns:350px 350px 200px; + grid-template-areas: + "name teacher credits"; + column-gap:10px; + + } + + .name { + grid-area:name; + align-self:center; + } + .teacher{ + grid-area:teacher; + align-self:center; + } + + .credits{ + grid-area:credits; + align-self:center; + } + +.listTitle{ + display: flex; + justify-content: center; + align-items: center; + width:200px; + margin-left:auto; + margin-right:auto; + border:2px solid black; + font-size:25px; + color:white; + padding:20px; + background-color:rgb(50,50,50); + border-radius:20px;margin-bottom:10px; +} + +.listElement{ + border:2px solid black; + font-size:25px; + color:white; + padding:20px; + background-color:rgb(50,50,50); + border-radius:20px; + margin-bottom:10px; +} + +.infosContainer { +padding-bottom:50px; +border:2px solid black; +font-size:25px; +color:white; +padding:20px; +background-color:rgb(50,50,50); +border-radius:20px; +} + + +button{ + border:none; + background-color:rgb(239, 60, 168); + border-radius:10px; + height:35px; + margin-top:10px; + +} + +button:hover{ + opacity:0.8; +} diff --git a/frontend/src/Apps/Request.vue b/frontend/src/Apps/Request.vue index 7b65e80..b8ec6c1 100644 --- a/frontend/src/Apps/Request.vue +++ b/frontend/src/Apps/Request.vue @@ -17,8 +17,13 @@
    -
    -
    +
    {{id}}
    +
    {{type}}
    +
    {{lastName}}
    +
    {{firstName}}
    +
    +
    +
    @@ -29,9 +34,9 @@ height:100px; font-size:20px; display:grid; - grid-template-columns:[firstCol-start]100px[firstCol-end secondCol-start]150px[endCol]; + grid-template-columns:[firstCol-start]100px[firstCol-end secondCol-start]150px[secondCol-end thirdCol-start]200px[thirdCol-end fourthCol-start]150px[fourthCol-end]150px[fifthCol-end]150px[sixthCol-end]150px[endCol]; grid-template-areas: - " accept refuse"; + "id type surname firstname infos accept refuse"; column-gap:10px; } From 2fe615370551adfc9455c525782dd7f4d0e38c70 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Mon, 11 Mar 2024 12:02:27 +0100 Subject: [PATCH 5/7] Translation correction --- frontend/src/App.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index bedd1f1..6ed110c 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -20,9 +20,6 @@ currentPath.value = window.location.hash }) - function refreshPage() { - window.location.reload();} - const currentView = computed(() => { return apps[currentPath.value.slice(1) || '/'] }) @@ -63,10 +60,10 @@
    Langage
    • - +
      • -
      • +
    From 68df9f99fa392e57b097b351916aa680508f32f7 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Mon, 11 Mar 2024 21:24:40 +0100 Subject: [PATCH 6/7] modify profil strating setup --- frontend/src/Apps/Profil.vue | 38 ++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue index b95ff54..a4b1d45 100644 --- a/frontend/src/Apps/Profil.vue +++ b/frontend/src/Apps/Profil.vue @@ -1,5 +1,5 @@ @@ -70,7 +75,7 @@
    -
    +
    {{user.firstName}} {{user.lastName.toUpperCase()}}
    @@ -85,15 +90,40 @@ Role: {{user.role}}
    - +
    +
    +
    + Profil Picture + +
    +
    + E-mail: + +
    +
    + Address: + +
    +
    + Password + +
    +
    + Confirm Password + +
    +
    + +
    +
    -
    +
    From 86f1a6f17b2f5c9aa54fb2e49ce561a76c4b3e05 Mon Sep 17 00:00:00 2001 From: Wawilski Date: Mon, 11 Mar 2024 21:45:51 +0100 Subject: [PATCH 7/7] Little corrections --- frontend/src/App.vue | 2 +- frontend/src/Apps/Profil.vue | 19 ++++++++++--------- frontend/src/Apps/Request.vue | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 6ed110c..ef68173 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -56,7 +56,7 @@
  • -
    +
    Langage
    • diff --git a/frontend/src/Apps/Profil.vue b/frontend/src/Apps/Profil.vue index a4b1d45..7a97a68 100644 --- a/frontend/src/Apps/Profil.vue +++ b/frontend/src/Apps/Profil.vue @@ -1,6 +1,6 @@