Skip to content

Commit

Permalink
Merge pull request #116 from VitorCarvalho67/dev
Browse files Browse the repository at this point in the history 
Update style and fix many erros on client
  • Loading branch information
@VitorCarvalho67
VitorCarvalho67 authored Nov 25, 2024
2 parents 7169693 + d5d027a commit c77760c
Show file tree
Hide file tree
Showing 8 changed files with 193 additions and 46 deletions.
4 changes: 2 additions & 2 deletions client/src/components/aluno/Header.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</div>
<nav>
<ul>
<li><router-link to="">Rankings</router-link></li>
<li><router-link to="">Estágios</router-link></li>
<li><router-link to="/aluno/ranking">Rankings</router-link></li>
<li><router-link to="/aluno/vagas">Estágios</router-link></li>
<li><router-link to="/mensagens">Mensagens</router-link></li>
<li class="hamburger">
<button @click="showAside = true">
Expand Down
9 changes: 9 additions & 0 deletions client/src/scss/pages/aluno/_home.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ main {

#box1 {
padding: 50px 0px 0px 100px;

@include m-screen(1400px){
padding: 50px 0px 0px 40px;
}

@include m-screen(1000px){
padding: 50px 0px 0px 10px;
}

h1 {
font-size: 2rem;
color: $secondary-color-orange;
Expand Down
139 changes: 139 additions & 0 deletions client/src/scss/pages/funcionario/_boletins.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
main {
height: calc(100vh - 80px);
background-color: $primary-color-dark;
@include flex(row, flex-start, start);
overflow: hidden;
flex: 1;

.content {
@include flex(column, flex-start, start);
padding: 20px 100px 40px 100px;
width: calc(100% - 300px);
flex: 1;
height: calc(100vh - 80px);
overflow-y: auto;

@media (max-width: 1000px) {
width: calc(100% - 100px);
}

@include m-screen(1300px) {
padding: 20px 50px;
}

@include m-screen(700px) {
padding: 20px 30px;
}

.box {
padding: 50px 0px 0px 100px;

@include m-screen(1400px) {
padding: 50px 0px 0px 40px;
}

@include m-screen(1000px) {
padding: 50px 0px 0px 10px;
}

h1 {
font-size: 2rem;
color: $secondary-color-orange;
@include font-inter(700);
@include m-screen(1400px) {
font-size: 1.8rem;
}
@include m-screen(1120px) {
font-size: 1.6rem;
}
}

h2 {
font-size: 1.3rem;
color: $font-color-dark-2;
@include font-inter(300);
margin-bottom: 60px;
@include m-screen(1400px) {
font-size: 1.1rem;
}
@include m-screen(1120px) {
font-size: 1rem;
}
}

.nb{
@include font-inter(700);
color: $primary-color-orange;
}

.boletim-item {
padding: 16px;
margin-bottom: 16px;
border: none;
border-left: 3px solid $secondary-color-orange;
background-color: $secondary-color-dark;
border-radius: 0px 8px 8px 0px;
@include font-inter(300);

div {
margin-bottom: 12px;

strong {
@include font-inter(bold);
color: $font-color-dark;
}

a {
color: $primary-color-orange;
text-decoration: none;

&:hover {
text-decoration: underline;
}
}
}

input[type="file"] {
display: block;
margin-top: 8px;
margin-bottom: 12px;
}

.button-box {
width: 100%;
margin-top: 10px;
@include flex(row, flex-end, center);

button {
height: 40px;
width: 140px;
background-color: $primary-color-orange;
border: none;
border-radius: 3px;
@include font-inter(400);
font-size: 0.9rem;
color: $secondary-color-dark;
border: solid 1px $primary-color-orange;
cursor: pointer;
transition: 0.1s linear;

&:hover {
background-color: $secondary-color-dark;
color: $primary-color-orange;
}
}

@include m-screen(1800px) {
margin-top: 20px;
}
@include m-screen(600px) {
@include flex(row, flex-end, center);
}
}
}


}

}
}
3 changes: 0 additions & 3 deletions client/src/scss/pages/shared/_ranking.scss
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
main {
height: calc(100vh - 80px);
@include flex(row, flex-start, start);
border-bottom: 1px solid #0000008f;

.content {
@include flex(row, center, start);
width: calc(100% - 300px);
height: calc(100vh - 80px);
padding: 0px 20px;
background-color: $primary-color-dark;

overflow-y: auto; /* Ativa o scroll vertical */
max-height: calc(100vh - 80px);

@include m-screen(700px) {
@include flex(column-reverse, flex-start, start);
Expand Down
11 changes: 5 additions & 6 deletions client/src/views/aluno/Ranking.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
:class="(index + 1 < 4) ? 'medalha' : 'medalha normal'" alt="" />
<img v-if="item.aluno.imagem != 'default'" :src="item.aluno.imagem" alt="Foto do aluno">
<img v-else src="../../assets/icons/artwork.png" alt="Foto padrão">
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }} pontos</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }}</p>
</div>
<div class="zz">
<p class="name">{{ item.aluno.nome }} - 3º DS</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }} pontos</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }}</p>
</div>
</router-link>
</div>
Expand Down Expand Up @@ -95,18 +95,17 @@ export default {
#app {
display: flex;
flex-direction: column;
min-height: calc(100vh - 80px);
min-height: 510px;
height: calc(100vh - 80px);
main {
display: flex;
flex: 1;
min-height: calc(100vh - 80px);
height: calc(100vh - 80px);
overflow: hidden;
.content {
flex: 1;
min-height: calc(100vh - 80px);
height: calc(100vh - 80px);
padding: 20px;
overflow-y: auto;
Expand Down
4 changes: 2 additions & 2 deletions client/src/views/empresa/Ranking.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
:class="(index + 1 < 4) ? 'medalha' : 'medalha normal'" alt="" />
<img v-if="item.aluno.imagem != 'default'" :src="item.aluno.imagem" alt="Foto do aluno">
<img v-else src="../../assets/icons/artwork.png" alt="Foto padrão">
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }} pontos</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }}</p>
</div>
<div class="zz">
<p class="name">{{ item.aluno.nome }} - 3º DS</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }} pontos</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }}</p>
</div>
</router-link>
</div>
Expand Down
42 changes: 20 additions & 22 deletions client/src/views/funcionario/Boletins.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,27 @@
<main>
<AsideDashboard pageName='home' />
<div class="content">
<h1>Boletins a serem validados</h1>

<div v-if="boletins.length === 0">Nenhum boletim para análise no momento</div>

<div v-for="boletim in boletins" :key="boletim.id" class="boletim-item">
<div>
<strong>Aluno:</strong> {{ boletim.aluno.name }} <br />
<strong>Turma:</strong> {{ boletim.aluno.turma }} <br />
<strong>Link:</strong> <a :href="boletim.url" target="_blank">Baixar Boletim</a>
<div class="box">
<h1>Boletins a serem validados</h1>
<h2>Aqui estão boletins enviados para validação pela plataforma.</h2>

<div class="nb" v-if="boletins.length === 0">Nenhum boletim para análise no momento</div>

<div v-for="boletim in boletins" :key="boletim.id" class="boletim-item">
<div>
<strong>Aluno:</strong> {{ boletim.aluno.name }} <br />
<strong>Turma:</strong> {{ boletim.aluno.turma }} <br />
<strong>Link:</strong> <a :href="boletim.url" target="_blank">Baixar Boletim</a>
</div>
<input type="file" @change="(event) => handleFileChange(event, boletim.id)" />
<div class="button-box">
<button :disabled="!selectedFiles[boletim.id]" @click="compareBoletim(boletim.id)">
Comparar
</button>
</div>
</div>
<input type="file" @change="(event) => handleFileChange(event, boletim.id)" />
<button :disabled="!selectedFiles[boletim.id]" @click="compareBoletim(boletim.id)">
Comparar
</button>
</div>
</div>
</div>
</main>
</div>
<Footer />
Expand Down Expand Up @@ -73,7 +78,7 @@ export default {
</script>

<style lang="scss" scoped>
@import "../../scss/pages/funcionario/_dashboard.scss";
@import "../../scss/pages/funcionario/_boletins.scss";
#app {
display: flex;
Expand All @@ -94,13 +99,6 @@ export default {
@media (max-width: 1000px) {
width: calc(100% - 100px);
}
.boletim-item {
margin-bottom: 20px;
padding: 10px;
border: 1px solid #ccc;
border-radius: 5px;
}
}
}
}
Expand Down
27 changes: 16 additions & 11 deletions client/src/views/shared/Ranking.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,27 @@
<section class="content">
<div class="box" id="box1">
<H1>Rankings</H1>
<h2>Ranking gerado a partir das notas dos alunos. O objetivo desse ranking é proporcionar competitividade e destacar os alunos para as empresas.</h2>

<h2>Ranking gerado a partir das notas dos alunos. O objetivo desse ranking é proporcionar
competitividade e destacar os alunos para as empresas.</h2>

<div class="alunos">
<p class="info">Ranking geral:</p>

<router-link v-for="(item, index) in ranking" :key="index" :to="`/aluno/profile/${item.aluno.rm}`" class="aluno">

<router-link v-for="(item, index) in ranking" :key="index"
:to="`/aluno/profile/${item.aluno.rm}`" class="aluno">
<div class="xx">
<b>#{{ index + 1 }}</b>
<img :src="index + 1 < 4 ? medalhas[index] : medalhas[3]"
:class="(index + 1 < 4) ? 'medalha' : 'medalha normal'" alt="" />
<img v-if="item.aluno.imagem != 'default'" :src="item.aluno.imagem" alt="Foto do aluno">
<img v-else src="../../assets/icons/artwork.png" alt="Foto padrão">
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }} pontos</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }}
</p>
</div>
<div class="zz">
<p class="name">{{ item.aluno.nome }} - 3º DS</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }} pontos</p>
<p class="pontos">{{ (item.rankingNota * 1000).toFixed(2) }} / {{ item.numeroNotas }}
</p>
</div>
</router-link>
</div>
Expand Down Expand Up @@ -91,25 +95,26 @@ export default {
</script>

<style lang="scss" scoped>
@import "../../scss/pages/shared/_ranking.scss";
@import "../../scss/pages/shared/_ranking.scss";
#app {
#app {
display: flex;
flex-direction: column;
height: calc(100vh - 80px);
overflow: hidden;
height: auto;
main {
display: flex;
flex: 1;
height: calc(100vh - 80px);
overflow: hidden;
height: auto;
.content {
flex: 1;
height: calc(100vh - 80px);
padding: 20px;
overflow-y: auto;
overflow: hidden;
height: auto;
@media (max-width: 1000px) {
width: calc(100% - 100px);
Expand Down

0 comments on commit c77760c

Please sign in to comment.