1
0
forked from PGL/Clyde

Compare commits

..

No commits in common. "91ee3adbcd471d23c63bdd1c41dc1953f18b7fcf" and "db895a609128e847eb059e4fde08ff919ed2e466" have entirely different histories.

13 changed files with 104 additions and 300 deletions

View File

@ -8,7 +8,6 @@
"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"
@ -30,20 +29,6 @@
"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",

View File

@ -9,7 +9,6 @@
"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"

View File

@ -52,7 +52,7 @@ window.addEventListener('hashchange', () => {
<a class="icon" href="#Notifications">
<div class="fa-solid fa-bell" style="margin-top: 7px; margin-bottom: 3px;"></div>
</a></li>
<li @click="active=!active" class="option"style="float: right;" title=settings>
<li @click="active=!active" class="option"style="float: right;" title=settings>
<a class="icon" >
<div class="fa-solid fa-gear" style="margin-top: 7px; margin-bottom: 3px;"></div>
<div v-if="active" class="dropdown">
@ -86,9 +86,12 @@ window.addEventListener('hashchange', () => {
</ul>
</div>
<div class="page">
<div style=" margin:50px;">
<Suspense>
<component :is="currentView" />
<component :is="currentView" />
</Suspense>
</div>
</div>
</div>
</template>
@ -96,8 +99,6 @@ window.addEventListener('hashchange', () => {
<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];
@ -110,8 +111,6 @@ window.addEventListener('hashchange', () => {
.page {
grid-area:page;
height: 100%;
width: 100%;
place-self:center;
}

View File

@ -16,9 +16,10 @@
<template>
<div style='display:flex; justify-content:center; min-width:1140px;' v-for="item of requests">
<div 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>
@ -36,9 +37,10 @@
height:100px;
font-size:20px;
display:grid;
grid-template-columns:10% 14.2% 19% 14.2% 14.2% 14.2% 14.2%;
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:
"id type surname firstname infos accept refuse";
column-gap:10px;
}
@ -97,9 +99,9 @@
}
.bodu {
margin-top:2%;
width:66%;
.bodu {
width:100%;
margin-bottom:10px;
border:2px solid black;
border-radius:9px;
background-color:rgb(50,50,50);

View File

@ -56,10 +56,10 @@
<template>
<div class="setup">
<div class='loginBox'>
<div v-if="loginPage">
<div class='loginBox' style="margin-top:30%;">
<form @submit.prevent="login(outputs.email,outputs.password);goBackHome();"class="form">
<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")}}
</h1>
@ -74,15 +74,14 @@
<div class="register">
<a @click="loginPage=!loginPage">{{i18n("login.guest.register")}}</a>
</div>
<div class="inputBox" style="margin-bottom:35px;">
<div class="inputBox">
<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">
<form class="form">
<h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
{{i18n("login.guest.welcome")}}
</h1>
@ -129,12 +128,9 @@
<p>{{i18n("login.guest.country")}}</p>
<input type="text" v-model="outputs.country">
</div>
<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 novalidate enctype="multipart/form-data" class="inputBox">
<p>{{i18n("profile.picture").toUpperCase()}}</p>
<input type="file" :disabled="imageSaved" @change="ppData = uploadProfilePicture($event.target.files); imageSaved = true;" accept="image/*">
</form>
<div class="inputBox">
<p>{{i18n("Curriculum").toUpperCase()}}</p>
@ -157,26 +153,35 @@
</div>
</form>
</div>
</div>
</div>
</div>
</template>
<style scoped>
.setup {
margin-left: auto;
margin-right:auto;
min-width:400px;
width:25%;
height:60%;
.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);
}
.loginBox {
background-color: rgb(24,24,24);
width: 400px;
display:flex;
justify-content: center;
border-radius: 5%;
padding: 40px;
border-radius: 20px;
box-shadow:0 5px 25px #000000;
}
@ -185,8 +190,9 @@
width:100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items:center;
gap: 3%;
gap: 15px;
}
@ -194,12 +200,12 @@
width:100%;
border: none;
margin-right: 12.5%;
padding-left: 2.5%;
padding-top:2.5%;
padding-bottom:2.5%;
margin-right: 50px;
padding-left: 10px;
padding-top:10px;
padding-bottom:10px;
outline:none;
border-radius: 10px;
border-radius: 4px;
font-size:1.35em;
}
@ -214,9 +220,8 @@
.register{
color:rgb(239,60,168);
width:70%;
margin-bottom:20px;
margin-top:20px;
width: 100%;
display:flex;
cursor: pointer;
}
@ -245,21 +250,6 @@ 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;

View File

@ -105,8 +105,7 @@
</button>
</div>
<div v-if="createMod">
<form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
<form class="listElement">
<div style="margin-bottom:20px;">
{{i18n("name")}} :
<input v-model="toAdd.title">
@ -126,7 +125,7 @@
</form>
</div>
<div v-if="deleteMod">
<form class="listElement" style="width:40%;margin-right:auto;margin-left:auto;">
<form class="listElement">
<div style="margin-bottom:20px;">
{{i18n("courses.toDelete")}} :
<select style="max-width:200px;" class="teacher" v-model="toRemove">
@ -139,7 +138,7 @@
</form>
</div>
<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="!createMod && !deleteMod" v-for="item in curriculum" :key="item.title">
<div v-if="editElementID !== item.title" style ="padding:15px 15px 15px 15px;">
<button @click="editElementID = item.title; setModify(item); ">
{{i18n("courses.modify")}}
@ -149,8 +148,7 @@
<button @click="editElementID= '';patchCourse(item)"> {{i18n("courses.confirm")}} </button>
<button @click="editElementID= '';"> {{i18n("courses.back")}} </button>
</div>
<div class="listElement" >
<div class="listElement" >
<div class="containerElement" v-if="editElementID !== item.title" >
<div class="name"> {{item.title}} </div>
@ -174,27 +172,17 @@
<style scoped>
.body {
width:100%;
margin-top:3.5%;
margin-bottom:10px;
}
.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;
justify-content:center;
display:grid;
grid-template-columns:38.8% 38.8% 22.4%;
grid-template-columns:350px 350px 200px;
grid-template-areas:
"name teacher credits";
column-gap:10px; }
column-gap:10px;
}
.name {
grid-area:name;
@ -212,7 +200,6 @@
}
.listElement{
min-width:625px;
border:2px solid black;
font-size:25px;
color:white;
@ -220,7 +207,6 @@
background-color:rgb(50,50,50);
border-radius:20px;
margin-bottom:10px;
}
.modify{
@ -269,11 +255,10 @@
}
.listTitle{
min-width:380px;
display: flex;
justify-content: center;
align-items: center;
width:25%;
width:400px;
margin-left:auto;
margin-right:auto;
border:2px solid black;
@ -281,8 +266,7 @@
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;

View File

@ -210,11 +210,11 @@
<style scoped>
.container{
min-width:675px;
display:grid;
grid-template-columns:10vw 50vw;
grid-template-columns:200px 900px;
grid-template-rows:200px auto;
column-gap:2.7%;
column-gap:30px;
row-gap:45px;
grid-template-areas:
"profilPic globalInfos"
@ -222,7 +222,6 @@
}
.profilPic{
width:100%;
grid-area:profilPic;
}
@ -243,17 +242,13 @@
grid-area:minfos;
}
.body {
min-width:960px;
width:100%;
display:flex;
align-items:center;
justify-content:center;
margin-top:5%;
margin-bottom:10px;
}
.containerElement{
justify-content:center;
display:grid;
grid-template-columns:38.8% 38.8% 22.4%;
grid-template-columns:350px 350px 200px;
grid-template-areas:
"name teacher credits";
column-gap:10px;
@ -276,11 +271,10 @@
}
.listTitle{
min-width:197px;
display: flex;
justify-content: center;
align-items: center;
width:8vw;
width:200px;
margin-left:auto;
margin-right:auto;
border:2px solid black;
@ -292,7 +286,6 @@
}
.listElement{
min-width:625px;
border:2px solid black;
font-size:25px;
color:white;
@ -303,7 +296,6 @@
}
.infosContainer {
min-width:350px;
padding-bottom:50px;
border:2px solid black;
font-size:25px;

View File

@ -1,156 +0,0 @@
<script setup>
import CanvasJSChart from "@canvasjs/vue-charts";
const chartData ={
options: {
theme: "light2",
animationEnabled: true,
title:{
text: "Visitors By Channel"
},
data: [{
type: "pie",
indexLabel: "{label} (#percent%)",
yValueFormatString: "#,##0",
toolTipContent: "<span style='\"'color: {color};'\"'>{label}</span> {y}(#percent%)",
dataPoints: [
{ label: "Organic Traffic", y: 130631 },
{ label: "Direct", y: 28874 },
{ label: "Referral", y: 15467 },
{ label: "Social", y: 10543 },
{ label: "Email", y: 5613 },
{ label: "Others", y: 8492 }
]
}]
},
styleOptions: {
width: "100%",
height: "360px"
}
}
</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 name="stats" id="stats-select">
<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 name="classedBy" id="classed-select">
<option value="years">Years</option>
<option value="months">Months</option>
<option value="topics">Topics</option>
</select>
</div>
<div id="statsPie">
<CanvasJSChart :data="chartData"/>
</div>
</div>
<div id="articles">
</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;
}
#stats {
}
#articles {
background-color: orange;
}
</style>

View File

@ -5,8 +5,8 @@
const users = await getStudents();
</script>
<template style="margin-top:5%;">
<div style="display:flex; justify-content:center; " v-for="item in users">
<template>
<div v-for="item in users">
<div class="bodu">
<div class="container">
<div class="status"><a style="margin-left:30px">{{item.status}}</a></div>
@ -25,9 +25,10 @@
height:100px;
font-size:30px;
display:grid;
grid-template-columns:21.7% 21.7% 21.7% 21.7% 13.1%;
grid-template-columns:250px 250px 250px 250px 150px;
grid-template-areas:
"status option surname firstname infos";
column-gap:10px;
}
@ -41,6 +42,21 @@
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;
@ -65,15 +81,15 @@
button{
font-size:15px;
height:50px;
width:75%;
width:100px;
border:none;
border-radius:20px;
}
.bodu {
margin-top:2%;
width:66%;
width:100%;
margin-bottom:10px;
border:2px solid black;
border-radius:9px;
background-color:rgb(50,50,50);

View File

@ -7,8 +7,8 @@
const users = await getAllUsers();
</script>
<template style="margin-top:5%;">
<div style="display:flex; justify-content:center; min-width:1140px;" v-for="item in users">
<template>
<div 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,20 +22,23 @@
<style scoped>
.container{
justify-content:center;
align-items:center;
color:white;
height:100px;
font-size:30px;
display:grid;
grid-template-columns:27.7% 27.7% 27.7% 16.9%;
grid-template-columns:250px 250px 250px 150px;
grid-template-areas:
"role surname firstname infos";
column-gap:10px;
}
.infos {
grid-area:infos;
align-self:center;
align-items:center;
}
.role {
@ -64,18 +67,20 @@
button{
font-size:15px;
height:50px;
width:75%;
width:100px;
border:none;
border-radius:20px;
}
.bodu {
margin-top:2%;
width:66%;
width:100%;
margin-bottom:10px;
border:2px solid black;
border-radius:9px;
background-color:rgb(50,50,50);
}
</style>

View File

@ -1,11 +1,4 @@
body {
background-color: rgb(53, 25, 60);
margin:0;
width: 100vw;
height: 100vh;
}
#app {
width: 100%;
height: 100%;
}

View File

@ -4,8 +4,5 @@ import 'https://kit.fontawesome.com/fb3bbd0a95.js'
import { createApp } from 'vue'
import App from './App.vue'
import CanvasJSChart from '@canvasjs/vue-charts';
const app = createApp(App);
app.use(CanvasJSChart);
app.mount('#app');
createApp(App).mount('#app')

View File

@ -9,7 +9,6 @@ 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/ResearcherProfile.vue";
const apps = {
'/login': LoginPage,
@ -18,7 +17,6 @@ const apps = {
'/manage-courses' : Courses,
'/users-list' : Users,
'/students-list' : Students,
'/researcher-profile' : ResearcherProfile,
}
const appsList = {