Skip to content

Commit 047d75e

Browse files
VitorCarvalho67VitorCarvalho67
authored
Merge pull request #102 from VitorCarvalho67/dev
Create ranking page
2 parents daecc02 + 7617ba2 commit 047d75e

File tree

12 files changed

+409
-6
lines changed

12 files changed

+409
-6
lines changed

‎client/src/assets/icons/m1.png‎

20.8 KB
Loading

‎client/src/assets/icons/m2.png‎

14.6 KB
Loading

‎client/src/assets/icons/m3.png‎

20.6 KB
Loading

‎client/src/components/aluno/Aside.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<router-link to="/aluno/vagas">Estágios</router-link>
2323
</li>
2424
<li>
25-
<router-link to="">Rankings</router-link>
25+
<router-link to="/aluno/ranking">Rankings</router-link>
2626
</li>
2727
<li>
2828
<router-link to="/config">Configurações</router-link>

‎client/src/components/aluno/AsideDashboard.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</router-link>
4646
</li>
4747
<li :class="getClassForPage('rankings')">
48-
<router-link to="">
48+
<router-link to="/aluno/ranking">
4949
<img :src="icons.ranking" />
5050
<p v-if="showPs">Rankings</p>
5151
</router-link>

‎client/src/router/routes/aluno.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import Messages from '../../views/aluno/Messages.vue';
1313
import ChatAluno from '../../views/aluno/Message.vue';
1414
import Pesquisa from '../../views/aluno/Pesquisa.vue';
1515
import Vagas from '../../views/aluno/Vagas.vue';
16+
import Ranking from '../../views/aluno/Ranking.vue';
1617

1718
import {
1819
isRecoveringAluno,
@@ -142,5 +143,13 @@ export const alunoRoutes = [
142143
beforeEnter: async (to, from, next) => {
143144
(await isCompletedAluno()) ? ((await isAuthAluno()) ? next() : next("/login")) : next("/register/complete");
144145
}
146+
},
147+
{
148+
path: "/aluno/ranking",
149+
name: "Ranking",
150+
component: Ranking,
151+
beforeEnter: async (to, from, next) => {
152+
(await isAuthAluno()) ? next() : next("/login");
153+
}
145154
}
146155
];

‎client/src/scss/pages/aluno/_home.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ main {
2020
}
2121

2222
#box1 {
23+
padding: 50px 0px 0px 100px;
2324
h1 {
2425
font-size: 2rem;
2526
color: $secondary-color-orange;

‎client/src/scss/pages/aluno/_rede.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ main {
7070
object-fit: cover;
7171
border-radius: 50%;
7272
margin-right: 20px;
73+
74+
@include m-screen(440px) {
75+
margin-right: 10px
76+
}
7377
}
7478

7579
.infoVinculo {

‎client/src/scss/pages/shared/_perfilAluno.scss‎

Lines changed: 124 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,31 +44,43 @@ main {
4444
height: 300px;
4545
}
4646

47+
@include m-screen(820px) {
48+
height: 200px;
49+
}
50+
4751
.capaProfile {
4852
height: 66.66%;
4953
border-radius: 6px;
5054
background-color: $secondary-color-dark;
51-
55+
5256
> img {
5357
height: 100%;
5458
width: 100%;
5559
border-radius: 6px;
5660
@include flex-center;
5761
object-fit: cover;
58-
}
62+
}
5963
}
6064

6165
.infoProfile {
6266
@include flex(row, flex-start, center);
6367
z-index: 2;
6468
position: relative;
6569

70+
@include m-screen(580px) {
71+
@include flex(column, flex-start, start);
72+
position: absolute;
73+
top: 20px;
74+
}
75+
6676
> img {
6777
@include flex-center;
6878
position: absolute;
6979
bottom: 0;
7080
height: 250px;
7181
width: 250px;
82+
background-color: $secondary-color-dark;
83+
padding: 1px;
7284
object-fit: cover;
7385
border-radius: 50%;
7486
background-color: $terciary-color-dark;
@@ -82,6 +94,15 @@ main {
8294
height: 180px;
8395
width: 180px;
8496
}
97+
98+
@include m-screen(660px) {
99+
height: 140px;
100+
width: 140px;
101+
}
102+
103+
@include m-screen(580px) {
104+
position: relative;
105+
}
85106
}
86107

87108
.info {
@@ -97,6 +118,18 @@ main {
97118
margin-left: 170px;
98119
}
99120

121+
@include m-screen(660px) {
122+
margin-left: 140px;
123+
}
124+
125+
@include m-screen(580px) {
126+
margin-left: 0px;
127+
}
128+
129+
@include m-screen(600px) {
130+
padding: 10px 0px 20px 0px;
131+
}
132+
100133

101134
.box1 h1 {
102135
@include font-inter(300);
@@ -109,9 +142,16 @@ main {
109142
@include m-screen(760px) {
110143
font-size: 1.4rem;
111144
}
145+
@include m-screen(580px) {
146+
font-size: 1.2rem;
147+
}
112148
}
113149
.box2 {
114150
@include flex(row, flex-start, center);
151+
152+
@include m-screen(600px) {
153+
@include flex(column, flex-start, start);
154+
}
115155

116156
p {
117157
margin-inline-end: 10px;
@@ -122,6 +162,10 @@ main {
122162
@include m-screen(760px) {
123163
font-size: 0.9rem;
124164
}
165+
166+
@include m-screen(600px) {
167+
margin-top: 5px
168+
}
125169
}
126170

127171
a, button {
@@ -133,7 +177,11 @@ main {
133177
border: none;
134178
cursor: pointer;
135179
@include font-inter(400);
136-
margin-right: 15px
180+
margin-right: 15px;
181+
182+
@include m-screen(600px) {
183+
margin-top: 10px
184+
}
137185
}
138186
}
139187
}
@@ -143,16 +191,47 @@ main {
143191
.sobreMim {
144192
@include flex(column, flex-start, start);
145193
width: 100%;
194+
margin-top: 30px;
195+
196+
@include m-screen(580px) {
197+
margin-top: 60px;
198+
}
199+
200+
@include m-screen(600px) {
201+
margin-top: 70px
202+
}
146203

147204
h2 {
148205
@include font-inter(700);
149206
font-size: 1.5rem;
207+
width: 100%;
150208
color: $secondary-color-orange;
151209
margin: 20px 0px 10px 0px;
210+
@include flex(row, space-between, center);
152211

153212
@include m-screen(760px) {
154213
font-size: 1.3rem;
155214
}
215+
216+
#getCurriculo {
217+
@include flex-center;
218+
219+
p{
220+
font-size: 1rem;
221+
margin-right: 10px;
222+
color: $font-color-dark;
223+
font-weight: 400;
224+
}
225+
226+
button {
227+
background-color: $secondary-color-orange;
228+
color: $secondary-color-dark;
229+
padding: 5px 10px;
230+
border-radius: 5px;
231+
border: none;
232+
font-weight: 400;
233+
}
234+
}
156235
}
157236

158237
> div {
@@ -174,6 +253,21 @@ main {
174253
font-size: 0.9rem;
175254
}
176255
}
256+
257+
textarea {
258+
background-color: transparent;
259+
border: none;
260+
outline: none;
261+
min-width: 100%;
262+
height: auto;
263+
resize: none;
264+
}
265+
> .editButtons {
266+
position: absolute;
267+
top: auto;
268+
bottom: 10px;
269+
right: 10px;
270+
}
177271
}
178272
}
179273

@@ -293,7 +387,7 @@ main {
293387
border-radius: 8px;
294388
margin-bottom: 5px;
295389
@include flex(column, flex-start, flex-start);
296-
flex: 1 1 auto;
390+
flex: 1 1 300px;
297391
max-width: 400px;
298392

299393
p {
@@ -333,6 +427,32 @@ main {
333427
}
334428
}
335429

430+
.button-box {
431+
width: 100%;
432+
@include flex(row, flex-end, center);
433+
434+
button {
435+
padding: 8px 12px;
436+
background-color: transparent;
437+
border: none;
438+
color: $primary-color-orange;
439+
@include font-inter(300);
440+
font-size: 0.9rem;
441+
cursor: pointer;
442+
transition: 0.2s linear;
443+
margin: 0px 10px;
444+
445+
&:hover {
446+
color: $secondary-color-orange;
447+
}
448+
449+
&:nth-child(1) {
450+
background-color: $primary-color-orange;
451+
color: $font-color-light;
452+
}
453+
}
454+
}
455+
336456
> button {
337457
background-color: $primary-color-orange;
338458
border: none;

0 commit comments

Comments
 (0)