Merge pull request 'proposition of some fixes' (#1 ) from PGL/Clyde:tonitch/max/front/fix/vue into master

Reviewed-on: #1
proposition of some fixes
2024-04-07 14:59:12 +02:00 · 2024-04-05 09:44:41 +02:00 · 2024-04-05 09:06:01 +02:00 · 2024-04-04 21:27:51 +02:00 · 2024-04-04 16:14:19 +02:00 · 2024-04-04 15:01:10 +02:00
20 changed files with 382 additions and 294 deletions
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@ -25,7 +25,7 @@ dependencies {
 	implementation("com.kohlschutter.junixsocket:junixsocket-core:2.9.0")
 	// implementation("org.springframework.session:spring-session-jdbc")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
-	developmentOnly("org.springframework.boot:spring-boot-docker-compose")
+	// developmentOnly("org.springframework.boot:spring-boot-docker-compose")
 	runtimeOnly("org.postgresql:postgresql")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")
 	testImplementation("org.springframework.boot:spring-boot-testcontainers")
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java
@ -81,7 +81,7 @@ public class InscriptionService {
            );

            userRepo.save(userFromRequest);
-            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId()),0));
+            userCurriculumRepo.save(new UserCurriculum(userFromRequest, curriculumRepo.findById(inscrRequest.getCurriculumId())));
        }
        inscrRequest.setState(requestState);
        save(inscrRequest);
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ExemptionsRequest.java
@ -1,66 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-
-import jakarta.persistence.*;
-
-@Entity
-public class ExemptionsRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    private User user;
-
-    @ManyToOne
-    @JoinColumn(name = "Course")
-    private Course course;
-    private String justifDocument;
-
-    private RequestState state;
-
-
-    public ExemptionsRequest(User user, Course course, String justifDocument, RequestState state){
-        this.user = user;
-        this.course = course;
-        this.justifDocument = justifDocument;
-        this.state = state;
-    }
-
-
-    public ExemptionsRequest(){}
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Course getCourse() {
-        return course;
-    }
-
-    public void setCourse(Course course) {
-        this.course = course;
-    }
-
-    public String getJustifDocument() {
-        return justifDocument;
-    }
-
-    public void setJustifDocument(String justifDocument) {
-        this.justifDocument = justifDocument;
-    }
-
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-}
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/ScholarshipRequest.java
@ -1,59 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import jakarta.persistence.*;
-
-@Entity
-public class ScholarshipRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-
-    @ManyToOne
-    @JoinColumn(name = "Users")
-    private User user;
-    private RequestState state;
-    private String requestForm;
-    private int amount;
-
-
-    public ScholarshipRequest(User user, RequestState state, String requestForm, int amount){
-        this.user = user;
-        this.state = state;
-        this.requestForm = requestForm;
-        this.amount = amount;
-    }
-
-    public ScholarshipRequest(){}
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-
-    public String getRequestForm() {
-        return requestForm;
-    }
-
-    public void setRequestForm(String requestForm) {
-        this.requestForm = requestForm;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-}
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/UninscriptionRequest.java
@ -1,28 +0,0 @@
-package ovh.herisson.Clyde.Tables;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-@Entity
-public class UninscriptionRequest {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private int id;
-    private RequestState state;
-
-    public UninscriptionRequest(RequestState state){
-        this.state = state;
-    }
-
-    public UninscriptionRequest(){}
-
-    public RequestState getState() {
-        return state;
-    }
-
-    public void setState(RequestState state) {
-        this.state = state;
-    }
-}
--- a/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCurriculum.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Tables/UserCurriculum.java
@ -21,12 +21,9 @@ public class UserCurriculum {
    @OnDelete(action = OnDeleteAction.CASCADE)
    private Curriculum curriculum;

-    private int year;
-
-    public UserCurriculum(User user, Curriculum curriculum, int year){
+    public UserCurriculum(User user, Curriculum curriculum){
        this.user = user;
        this.curriculum = curriculum;
-        this.year = year;
    }

    public UserCurriculum() {}
@ -50,12 +47,4 @@ public class UserCurriculum {
    public void setCurriculum(Curriculum curriculum) {
        this.curriculum = curriculum;
    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
 }
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@ -8,6 +8,7 @@
      "name": "clyde",
      "version": "0.0.0",
      "dependencies": {
+        "@canvasjs/vue-charts": "^1.0.4",
        "vite-plugin-top-level-await": "^1.4.1",
        "vue": "^3.4.15",
        "vue3-toastify": "^0.2.1"
@ -29,6 +30,20 @@
        "node": ">=6.0.0"
      }
    },
+    "node_modules/@canvasjs/charts": {
+      "version": "3.7.45",
+      "resolved": "https://registry.npmjs.org/@canvasjs/charts/-/charts-3.7.45.tgz",
+      "integrity": "sha512-FPMX8wn+PEHzAa/GLBsL5lWB81AzKZLw51t7SiSUjMbtUN5/OIrmDcwUTw+53/Bbdd9gm2LLmxAdZsQ75JI31g=="
+    },
+    "node_modules/@canvasjs/vue-charts": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@canvasjs/vue-charts/-/vue-charts-1.0.4.tgz",
+      "integrity": "sha512-PzOA8xeb/f68a39uoFZNn843dGPU36bsqmbO5DWjP7k6FwkK5AeGkYa/H3RHC02Xc6mG68vg9aFNj2Fyqhu4UQ==",
+      "dependencies": {
+        "@canvasjs/charts": "^3.7.5",
+        "vue": ">=3.0.0"
+      }
+    },
    "node_modules/@esbuild/aix-ppc64": {
      "version": "0.19.12",
      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
--- a/frontend/package.json
+++ b/frontend/package.json
@ -9,6 +9,7 @@
    "preview": "vite preview"
  },
  "dependencies": {
+    "@canvasjs/vue-charts": "^1.0.4",
    "vite-plugin-top-level-await": "^1.4.1",
    "vue": "^3.4.15",
    "vue3-toastify": "^0.2.1"
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@ -86,19 +86,18 @@ window.addEventListener('hashchange', () => {
    </ul>
    </div>
    <div class="page">
-      <div style=" margin:50px;">
        <Suspense>
-        
 				<component :is="currentView" />
        </Suspense>
    </div>
  </div>
-  </div>
 </template>

 <style scoped>
  
  .container{
+			height: 100%;
+			width: 100%;
    display:grid;
    grid-template-columns:[firstCol-start]70px[firstCol-end secondCol-start]auto[endCol];
    grid-template-rows:[firstRow-start]61px[firstRow-end secondRow-start] auto [endRow];
@ -111,6 +110,8 @@ window.addEventListener('hashchange', () => {

  .page {
    grid-area:page;
+		height: 100%;
+		width: 100%;
    place-self:center;
  }

--- a/frontend/src/Apps/AboutStudent.vue
+++ b/frontend/src/Apps/AboutStudent.vue
@ -1,24 +0,0 @@
-<script setup>
-</script>
-
-<template>
-  <div class="aboutbox">
-    <h1 class="test">Coucou</h1>
-  </div>
-</template>
-
-<style scoped>
-.aboutbox {
-  background-color: rgb(24,24,24);
-  width: 400px;
-  display:flex;
-  justify-content: center;
-  padding: 40px;
-  border-radius: 20px;
-  box-shadow:0 5px 25px #000000;
-}
-
-.test{
-  color: red;
-}
-</style>
--- a/frontend/src/Apps/Inscription.vue
+++ b/frontend/src/Apps/Inscription.vue
@ -16,10 +16,9 @@


 <template> 
-  <div  v-for="item of requests">
+  <div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
  <div class="bodu" v-if="item.state === 'Pending'">
  <div class="container">
- 
    <div class="id"><a>{{item.id}}</a></div>
    <div class="surname"><a>{{item.lastName}}</a></div>
    <div class="firstname"><a>{{item.firstName}}</a></div>
@ -37,10 +36,9 @@
    height:100px;
    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:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
    grid-template-areas:
    "id type surname firstname infos accept refuse"; 
-    column-gap:10px;
    
  }
  
@ -100,8 +98,8 @@
  }

 .bodu {
-    width:100%;
-    margin-bottom:10px;
+    margin-top:2%;
+    width:66%;
    border:2px solid black;
    border-radius:9px;
    background-color:rgb(50,50,50);
--- a/frontend/src/Apps/Login.vue
+++ b/frontend/src/Apps/Login.vue
@ -56,9 +56,9 @@


 <template>
-      <div class='loginBox'>
-
+    <div class="setup">
        <div v-if="loginPage">
+      <div class='loginBox' style="margin-top:30%;">
          <form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"class="form">
            <h1 style="color:rgb(239,60,168); font-family: sans-serif;">
              {{i18n("login.guest.signin")}}
@ -74,13 +74,14 @@
            <div class="register">
              <a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a>
            </div>
-            <div class="inputBox">
+            <div class="inputBox" style="margin-bottom:35px;">
              <input type="submit" v-model="submitValue">
            </div>
          </form>
        </div>
-
+      </div>
        <div v-else>
+          <div class='loginBox' style="margin-top:30%; margin-bottom:50%;">
            <form class="form">
            <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
              {{i18n("login.guest.welcome")}}
@ -128,9 +129,12 @@
                <p>{{i18n("login.guest.country")}}</p>
                <input type="text" v-model="outputs.country">
              </div>
-              <form novalidate enctype="multipart/form-data" class="inputBox">
+              <form class="inputBox"novalidate enctype="multipart/form-data">
              	<p>{{i18n("profile.picture").toUpperCase()}}</p>
+              <label class="browser">
+                Parcourir . . .
 				        <input  type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
+              </label>
              </form>
              <div class="inputBox">
                <p>{{i18n("Curriculum").toUpperCase()}}</p> 
@ -154,34 +158,25 @@
          </form>
         </div>
    </div>
+  </div>
 </template>

 <style scoped>
-.Home{
-  position:absolute;
- 	display: flex;
-  z-index: 100;
-	padding: 8px 16px;
-	color:rgb(255, 255, 255);
-	text-decoration: none;
-}

-.Home:hover{
-  width:40px;
-  background-color: black;
-	border-radius:6px;
-	color:white;
-  transform: translate(0px ,1px);
-}
+.setup {
+  margin-left: auto;
+  margin-right:auto;
+  min-width:400px;

+  width:25%;
+  height:60%;
+}

 .loginBox {
  background-color: rgb(24,24,24);
-  width: 400px;
  display:flex;
  justify-content: center;
-  padding: 40px;
-  border-radius: 20px;
+  border-radius: 5%;
  box-shadow:0 5px 25px #000000;
  
 }
@ -190,9 +185,8 @@
  width:100%;
  display: flex;
  flex-direction: column;
-  justify-content: center;
  align-items:center;
-  gap: 15px;
+  gap: 3%;
 }


@ -200,12 +194,12 @@
  
  width:100%;
  border: none;
-  margin-right: 50px;
-  padding-left: 10px;
-  padding-top:10px;
-  padding-bottom:10px;
+  margin-right: 12.5%;
+  padding-left: 2.5%;
+  padding-top:2.5%;
+  padding-bottom:2.5%;
  outline:none;
-  border-radius: 4px;
+  border-radius: 10px;
  font-size:1.35em;
 }

@ -220,8 +214,9 @@

 .register{
  color:rgb(239,60,168);
-  width: 100%;
-  display:flex;
+  width:70%;
+  margin-bottom:20px;
+  margin-top:20px;
  cursor: pointer;
 }

@ -250,6 +245,21 @@ input[type=submit],button,select{

 }

+input[type=file]{
+  display:none;
+}
+
+.browser{
+  display:inline-block;
+  cursor:pointer;
+  border-radius:20px;
+  background-color:rgb(239,60,168);
+  padding:5%;
+  font-size:1.35em;
+  font-family:sans-serif;
+  background:#FFFFFF;
+}
+
 button:active ,.switchpage:active{
  opacity:0.8;

--- a/frontend/src/Apps/ManageCourses.vue
+++ b/frontend/src/Apps/ManageCourses.vue
@ -105,7 +105,8 @@
      </button>
    </div>
    <div v-if="createMod">
-      <form class="listElement">
+      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
+        
        <div style="margin-bottom:20px;">
         {{i18n("name")}} : 
        <input v-model="toAdd.title">
@ -125,7 +126,7 @@
      </form>
    </div>
    <div v-if="deleteMod">
-      <form class="listElement">
+      <form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
        <div style="margin-bottom:20px;">
          {{i18n("courses.toDelete")}} :
         <select style="max-width:200px;" class="teacher" v-model="toRemove">
@ -138,7 +139,7 @@
      </form>
    </div>

-    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title">
+    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title" style="width:50%;margin-left:auto; margin-right:auto;">
      <div  v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
        <button   @click="editElementID = item.title; setModify(item); ">
        {{i18n("courses.modify")}}
@ -149,6 +150,7 @@
        <button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
      </div>
      <div  class="listElement" >
+
      <div class="containerElement" v-if="editElementID !== item.title" >

        <div class="name"> {{item.title}} </div>
@ -172,17 +174,27 @@
 <style scoped>
 .body {
    width:100%;
-    margin-bottom:10px;
+    margin-top:3.5%;
  }
+
+.infosContainer {
+  min-width:350px;
+  padding-bottom:50px;
+  border:2px solid black;
+  font-size:25px;
+  color:white;
+  padding:20px;
+  background-color:rgb(50,50,50);
+  border-radius:20px;
+}
+
 .containerElement{ 
    justify-content:center;
    display:grid;
-    grid-template-columns:350px 350px 200px;
+    grid-template-columns:38.8% 38.8% 22.4%;
    grid-template-areas:
    "name teacher credits"; 
-    column-gap:10px;
-    
-  }
+    column-gap:10px;  }
  
  .name {
    grid-area:name;
@ -200,6 +212,7 @@
  }

 .listElement{
+ min-width:625px;
  border:2px solid black;
  font-size:25px;
  color:white;
@ -207,6 +220,7 @@
  background-color:rgb(50,50,50);
  border-radius:20px;
  margin-bottom:10px;
+
 }

 .modify{
@ -255,10 +269,11 @@
  }

  .listTitle{
+    min-width:380px;
    display: flex;
    justify-content: center;
    align-items: center;
-    width:400px;
+    width:25%;
    margin-left:auto;
    margin-right:auto;
    border:2px solid black;
@ -266,7 +281,8 @@
    color:white;
    padding:20px;
    background-color:rgb(50,50,50);
-    border-radius:20px;margin-bottom:10px;
+    border-radius:20px;
+    margin-bottom:10px;

    button:hover{
      opacity:0.8;
--- a/frontend/src/Apps/Profil.vue
+++ b/frontend/src/Apps/Profil.vue
@ -210,11 +210,11 @@
 <style scoped>

 .container{
-  
+  min-width:675px;
  display:grid;
-  grid-template-columns:200px 900px;
+  grid-template-columns:10vw 50vw;
  grid-template-rows:200px auto;
-  column-gap:30px;
+  column-gap:2.7%;
  row-gap:45px;
  grid-template-areas:
  "profilPic globalInfos"
@ -222,6 +222,7 @@
 }

 .profilPic{
+  width:100%;
  grid-area:profilPic;
 }

@ -242,13 +243,17 @@
  grid-area:minfos;
 }
 .body {
+    min-width:960px;
    width:100%;
-    margin-bottom:10px;
+    display:flex;
+    align-items:center;
+    justify-content:center;
+    margin-top:5%;
  }
 .containerElement{ 
   justify-content:center;
    display:grid;
-    grid-template-columns:350px 350px 200px;
+    grid-template-columns:38.8% 38.8% 22.4%;
    grid-template-areas:
    "name teacher credits"; 
    column-gap:10px;
@ -271,10 +276,11 @@
  }

 .listTitle{
+    min-width:197px;
    display: flex;
    justify-content: center;
    align-items: center;
-    width:200px;
+    width:8vw;
    margin-left:auto;
    margin-right:auto;
    border:2px solid black;
@ -286,6 +292,7 @@
 }

 .listElement{
+  min-width:625px;
  border:2px solid black;
  font-size:25px;
  color:white;
@ -296,6 +303,7 @@
 }

 .infosContainer {
+min-width:350px;
 padding-bottom:50px;
 border:2px solid black;
 font-size:25px;
--- a/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
+++ b/frontend/src/Apps/ScientificPublications/ResearcherProfile.vue
@ -0,0 +1,236 @@
+<!----------------------------------------------------
+	File:  ResearcherProfile.vue
+	Author: Maxime Bartha
+	Scope: Extension Publicatons scientifiquess
+	Description: Researcher Profile Page containing his articles and his statistics
+----------------------------------------------------->
+
+<script setup>
+import { ref, reactive } from "vue";
+const input = ref("");
+const statsOf = ref("");
+const statsBy = ref("");
+let chart;
+
+const jsonMockViewsByYears= [
+  {label: "2004", y:4},
+  {label: "2005", y:99},
+  {label: "2007", y:555},
+  {label: "2009", y:22},
+  {label: "2011", y:1666},
+]
+
+function inputKeyUp() {
+  let filter, ul, li, a, txtValue;
+  filter = input.value.toUpperCase();
+  if (document.getElementById("myUL") != null) {
+    ul = document.getElementById("myUL");
+    li = ul.getElementsByTagName("li");
+
+    // Loop through all list items, and hide those who don't match the search query
+    for (let i = 0; i < li.length; i++) {
+      a = li[i].getElementsByTagName("a")[0];
+      txtValue = a.textContent || a.innerText;
+      if (txtValue.toUpperCase().indexOf(filter) > -1) {
+        li[i].style.display = "";
+      } else {
+        li[i].style.display = "none";
+      }
+    }
+  }
+}
+
+const options = reactive({
+    backgroundColor:null,
+    theme: "light2",
+    animationEnabled: true,
+    title: {
+      fontColor: "white",
+      text : "please select options",
+    },
+    data: [
+      {
+        type: "pie",
+        indexLabel: "{label} (#percent%)",
+        yValueFormatString: "#,##0",
+        indexLabelFontColor: "white",
+        toolTipContent:
+          "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
+      }]
+	});
+
+function update(){
+      options.title = {
+        fontColor: "white",
+        text: statsOf.value + " By "+ statsBy.value,
+      }
+      if (statsOf.value === "views" && statsBy.value === "years") {
+        options.data[0].dataPoints = jsonMockViewsByYears;
+      }
+
+      options.title.text = statsOf.value + " By "+ statsBy.value;
+      chart.render()
+    }
+</script>
+
+<template>
+  <div id="main">
+    <div id="profilePicture">
+      <img src="/Clyde.png" />
+    </div>
+    <div id="researcherInfos">
+      <div class="surrounded">John Doe</div>
+      <div class="surrounded">Orcid : 12144-2144-12336-B</div>
+      <div class="surrounded">Email : John.Doe@umons.ac.be</div>
+
+      <div class="surrounded">
+        site :
+        <a href="http://localhost:5173" style="color: #007aff">here</a>
+      </div>
+      <div class="surrounded">Domain : physics, IT</div>
+      <div id="coAuthorList" class="surrounded">Co-authors list : D</div>
+    </div>
+    <div id="stats">
+      <div class="surrounded">
+        Stat type :
+        <select @change="update()" id="stats-select" v-model="statsOf">
+          <option value="views">Views</option>
+          <option value="co-authors">Co-authors</option>
+          <option value="articles">Articles</option>
+          <option value="language">Languages</option>
+        </select>
+      </div>
+      <div class="surrounded">
+        Class by:
+        <select @change="update()" id="classed-select" v-model="statsBy">
+          <option selected="selected" value="years">Years</option>
+          <option value="months">Months</option>
+          <option value="topics">Topics</option>
+        </select>
+      </div>
+      <div id="statsPie">
+		  <CanvasJSChart :options="options" id=chart @chart-ref="c => chart = c "/>
+      </div>
+    </div>
+    <div id="articles">
+      <input
+        type="text"
+        id="search-input"
+        @keyup="inputKeyUp()"
+        placeholder="search articles"
+        v-model="input"
+      />
+      <ul id="myUL">
+        <li><a href="#">Adele</a></li>
+        <li><a href="#">Agnes</a></li>
+
+        <li><a href="#">Billy</a></li>
+        <li><a href="#">Bob</a></li>
+
+        <li><a href="#">Calvin</a></li>
+        <li><a href="#">Christina</a></li>
+        <li><a href="#">Cindy</a></li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+#main {
+  display: grid;
+  grid-template-columns: 22% auto;
+  grid-template-rows: 26% auto;
+  height: 100%;
+  width: 100%;
+}
+
+#profilePicture {
+  display: flex;
+  justify-content: center;
+}
+
+#profilePicture img {
+  align-self: center;
+  justify-self: center;
+  width: 60%;
+}
+
+#researcherInfos {
+  display: grid;
+  grid-template-columns: auto auto auto;
+  column-gap: 5px;
+  grid-template-rows: auto auto;
+}
+
+.surrounded {
+  border: 2px solid black;
+  color: white;
+  font-size: x-large;
+  align-self: center;
+  text-align: center;
+  background-color: rgba(255, 255, 255, 0.09);
+  border-radius: 20px;
+  margin-bottom: 10px;
+}
+
+.surrounded select {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  border: 1px solid black;
+  color: white;
+  background-color: rgb(255, 255, 255, 0.1);
+  font-size: large;
+  align-self: center;
+  text-align: center;
+}
+
+#statsPie {
+
+}
+
+#articles {
+  background-color: orange;
+}
+
+#search-input {
+  width: 60%;
+  font-size: 16px;
+  padding: 12px 20px 12px 40px;
+  border: 1px solid #ddd;
+  margin-bottom: 12px;
+}
+
+#myUL {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+}
+
+#myUL li a {
+  border: 1px solid #ddd;
+  /* Add a border to all links */
+  margin-top: -1px;
+  /* Prevent double borders */
+  background-color: #f6f6f6;
+  /* Grey background color */
+  padding: 12px;
+  /* Add some padding */
+  text-decoration: none;
+  /* Remove default text underline */
+  font-size: 18px;
+  /* Increase the font-size */
+  color: black;
+  /* Add a black text color */
+  display: block;
+  /* Make it into a block element to fill the whole list */
+}
+
+#myUL li a:hover:not(.header) {
+  background-color: #eee;
+}
+
+#Chart{
+    width: "100%";
+    height: "100%";
+}
+</style>
--- a/frontend/src/Apps/StudentsList.vue
+++ b/frontend/src/Apps/StudentsList.vue
@ -5,8 +5,8 @@

  const users = await getStudents();
 </script> 
-<template>
-  <div v-for="item in users">
+<template style="margin-top:5%;">
+  <div style="display:flex; justify-content:center; " v-for="item in users">
    <div class="bodu">
      <div class="container">
        <div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
@ -25,10 +25,9 @@
    height:100px;
    font-size:30px;
    display:grid;
-    grid-template-columns:250px 250px 250px 250px 150px;
+    grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
    grid-template-areas:
    "status option surname firstname infos"; 
-    column-gap:10px;
    
  }
  
@ -42,21 +41,6 @@
    align-self:center;
  }

-  .refuse{
-    grid-area:refuse;
-    align-self:center;
-  }
-
-  .titles {
-    grid-area:titles;
-    background-color:rgb(215,215,215);
-  }
-  .id{
-    grid-area:id;
-    margin-left:40px;
-    align-self:center;
-  }
-
  .status{
    grid-area:status;
    align-self:center;
@ -81,15 +65,15 @@
  button{
    font-size:15px;
     height:50px;
-     width:100px;
+     width:75%;
    border:none;
    border-radius:20px;

  }

  .bodu {
-    width:100%;
-    margin-bottom:10px;
+    margin-top:2%;
+    width:66%;
    border:2px solid black;
    border-radius:9px;
    background-color:rgb(50,50,50);
--- a/frontend/src/Apps/UsersList.vue
+++ b/frontend/src/Apps/UsersList.vue
@ -7,8 +7,8 @@
  const users = await getAllUsers();
  
 </script> 
-<template>
-  <div v-for="item in users">
+<template style="margin-top:5%;">
+  <div style="display:flex; justify-content:center; min-width:1140px;" v-for="item in users">
    <div class="bodu">
      <div class="container">
        <div class="role"><a style="margin-left:30px">{{i18n(item.role)}}</a></div>
@ -22,23 +22,20 @@

 <style scoped>
  .container{
-    justify-content:center;
-    align-items:center;
    color:white;
    height:100px;
    font-size:30px;
    display:grid;
-    grid-template-columns:250px 250px 250px 150px;
+    grid-template-columns:27.7% 27.7% 27.7% 16.9%;
    grid-template-areas:
    "role surname firstname infos"; 
-    column-gap:10px;

  }
  
  .infos {

    grid-area:infos;
-    align-items:center;
+    align-self:center;
  }

  .role {
@ -67,20 +64,18 @@
  button{
    font-size:15px;
     height:50px;
-     width:100px;
+     width:75%;
    border:none;
    border-radius:20px;

  }

  .bodu {
-    width:100%;
-    margin-bottom:10px;
+    margin-top:2%;
+    width:66%;
    border:2px solid black;
    border-radius:9px;
    background-color:rgb(50,50,50);
  }
-
-
 </style>

--- a/frontend/src/assets/main.css
+++ b/frontend/src/assets/main.css
@ -1,4 +1,11 @@
 body {
   background-color: rgb(53, 25, 60);
   margin:0;
+   width: 100vw;
+   height: 100vh;
+}
+
+#app {
+   width: 100%;
+   height: 100%;
 }
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@ -4,5 +4,8 @@ import 'https://kit.fontawesome.com/fb3bbd0a95.js'

 import { createApp } from 'vue'
 import App from './App.vue'
+import CanvasJSChart from '@canvasjs/vue-charts';

-createApp(App).mount('#app')
+const app = createApp(App);
+app.use(CanvasJSChart);
+app.mount('#app');
--- a/frontend/src/rest/apps.js
+++ b/frontend/src/rest/apps.js
@ -9,6 +9,7 @@ import Profil from "@/Apps/Profil.vue"
 import Courses from "@/Apps/ManageCourses.vue"
 import Users from "@/Apps/UsersList.vue"
 import Students from "@/Apps/StudentsList.vue"
+import ResearcherProfile from "@/Apps/ScientificPublications/ResearcherProfile.vue";

 const apps = {
 		'/login': LoginPage,
@ -17,6 +18,7 @@ const apps = {
 		'/manage-courses' : Courses,
 		'/users-list' : Users,
 		'/students-list' : Students,
+		'/researcher-profile' : ResearcherProfile,
 }

 const appsList = {
Author	SHA1	Message	Date
Maxime	ec2b975467	Merge pull request 'proposition of some fixes' (#1 ) from PGL/Clyde:tonitch/max/front/fix/vue into master Reviewed-on: #1	2024-04-07 14:59:12 +02:00
Anthony Debucquoy	b8b193f344	proposition of some fixes	2024-04-05 09:44:41 +02:00
Bartha Maxime	05359d64ac	Merge remote-tracking branch 'origin/master'	2024-04-05 09:06:01 +02:00
Bartha Maxime	3d78851b29	moving file into extensions directory	2024-04-04 21:27:51 +02:00
Bartha Maxime	dbe28a7fed	making the chart responsive	2024-04-04 16:14:19 +02:00
Bartha Maxime	bd7d2c2d51	adding colors to piechart	2024-04-04 15:01:10 +02:00
Bartha Maxime	91c7f42521	finished mock researcher profile	2024-04-02 19:52:38 +02:00
Bartha Maxime	bd27ffd3cb	search bar not working (to be shared with william)	2024-04-01 19:13:39 +02:00
Bartha Maxime	91ee3adbcd	adding the dependance	2024-03-30 13:10:11 +01:00
Bartha Maxime	c1b2742a8f	better select buttons	2024-03-30 12:38:18 +01:00
Bartha Maxime	2805fede4b	researcher profile page separations	2024-03-30 12:38:18 +01:00
Wawilski	951feed3c8	Full screen apps	2024-03-30 12:38:18 +01:00
Wawilski	95054fa973	Login 'fixed'	2024-03-30 12:38:18 +01:00
Wawilski	3af83a58d3	Just to merge	2024-03-30 12:38:17 +01:00
Anthony Debucquoy	47c5c14862	Make app use full space	2024-03-30 12:38:17 +01:00
Debucquoy Anthony	9e0db361b8	Merge pull request 'Make app use full space' (#148 ) from tonitch/front/fullSpaceApp into master Reviewed-on: PGL/Clyde#148 Reviewed-by: Wal <karpinskiwal@gmail.com> Reviewed-by: Maxime <231026@umons.ac.be>	2024-03-24 22:32:46 +01:00
Wawilski	7a13d412f1	Full screen apps	2024-03-23 23:56:24 +01:00
Bartha Maxime	db895a6091	added temporary fix to docker issue	2024-03-23 14:38:26 +01:00
Wawilski	9de4b06e75	Login 'fixed'	2024-03-23 13:57:46 +01:00
Wawilski	123fa97611	Merge branch 'wal/front/temp' into tonitch/front/fullSpaceApp	2024-03-22 20:15:45 +01:00
Wawilski	1fad792be7	Just to merge	2024-03-22 20:14:20 +01:00
Anthony Debucquoy	acd1262955	Make app use full space	2024-03-22 13:56:04 +01:00