Skip to content

Commit a2e4e59

Browse files
munjoonteomunjoonteo
committed
fixed navbar
1 parent ed9fe88 commit a2e4e59

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎frontend/src/components/Navbar.vue‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@
1111
<v-container class="hidden-sm-and-down">
1212
<v-row class="d-flex justify-center">
1313
<v-col class="d-flex align-center justify-start">
14-
<a @click="goto('showcase')" style="text-decoration: none;">
14+
<RouterLink to="/" style="text-decoration: none;" v-on:click.native="showMenu = false">
1515
<v-img contain max-height="60px" max-width="100px" src="@/assets/csesocwhiteblue.png" />
16-
</a>
16+
</RouterLink>
1717
</v-col>
1818
<v-col class="d-flex align-center justify-center">
19-
<a @click="goto('mission')" style="text-decoration: none;">
19+
<a @click="goto('aboutus')" style="text-decoration: none;">
2020
<v-btn text color="white">ABOUT US</v-btn>
2121
</a>
2222
</v-col>
2323
<v-col class="d-flex align-center justify-center">
24-
<a @click="goto('student-resources')" style="text-decoration: none;">
24+
<a @click="goto('community')" style="text-decoration: none;">
2525
<v-btn text color="white">GET IN TOUCH</v-btn>
2626
</a>
2727
</v-col>
2828
<v-col class="d-flex align-center justify-center">
29-
<a @click="goto('student-resources')" style="text-decoration: none;">
30-
<v-btn text color="white">RESOURCES</v-btn>
29+
<a @click="goto('resources')" style="text-decoration: none;">
30+
<v-btn text color="white">RESOURCES</v-btn>
3131
</a>
3232
</v-col>
3333
<v-col class="d-flex align-center justify-center">
34-
<v-btn text to="/sponsorship" color="white">SPONSORSHIP</v-btn>
34+
<v-btn text to="/sponsors" color="white">SPONSORSHIP</v-btn>
3535
</v-col>
3636
</v-row>
3737
</v-container>
@@ -40,7 +40,7 @@
4040
<v-container class="hidden-md-and-up">
4141
<v-row class="d-flex justify-space-between">
4242
<v-col class="d-flex align-center">
43-
<RouterLink to="/" style="text-decoration: none;" v-on:click.native="showMenu = false">
43+
<RouterLink to="/" style="text-decoration: none;" v-on:click.native="showMenu = false">
4444
<v-img contain max-height="40px" max-width="100px" src="@/assets/csesocwhiteblue.png" />
4545
</RouterLink>
4646
</v-col>
@@ -53,7 +53,7 @@
5353
</template>
5454
<v-list>
5555
<v-list-item>
56-
<a @click="goto('mission')" style="text-decoration: none; color: black;">
56+
<a @click="goto('aboutus')" style="text-decoration: none; color: black;">
5757
About us
5858
</a>
5959
</v-list-item>
@@ -63,12 +63,12 @@
6363
</a>
6464
</v-list-item>
6565
<v-list-item>
66-
<a @click="goto('student-resources')" style="text-decoration: none; color: black;">
66+
<a @click="goto('resources')" style="text-decoration: none; color: black;">
6767
Resources
6868
</a>
6969
</v-list-item>
7070
<v-list-item>
71-
<RouterLink style="text-decoration: none; color: black;" to="/sponsorship">
71+
<RouterLink style="text-decoration: none; color: black;" to="/sponsors">
7272
Sponsorship
7373
</RouterLink>
7474
</v-list-item>

‎frontend/src/views/Home/StudentResources.vue‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,43 @@
66

77
<template>
88
<!-- Student Resources -->
9-
<div id="student-resouces" class="content">
9+
<div id="resources" class="content">
1010
<v-container class="resource--styles">
1111
<HeaderTitle title="STUDENT RESOURCES" />
1212

1313
<v-row no-gutters justify="space-between">
1414
<v-col xs="12" sm="7">
1515
<a target="_blank" :href="resources.big_box_1.link">
16-
<div data-cy="resources-box" class="box big">
17-
<h2>{{resources.big_box_1.title}}</h2>
18-
<h3>{{resources.big_box_1.description}}</h3>
19-
<v-img data-cy="resources-img" :src="resources.big_box_1.src" contain class="image" />
20-
</div>
16+
<div data-cy="resources-box" class="box big">
17+
<h2>{{ resources.big_box_1.title }}</h2>
18+
<h3>{{ resources.big_box_1.description }}</h3>
19+
<v-img data-cy="resources-img" :src="resources.big_box_1.src" contain class="image" />
20+
</div>
2121
</a>
2222
</v-col>
2323
<v-col xs="12" sm="4">
2424
<a target="_blank" :href="resources.small_box_1.link">
25-
<div data-cy="resources-box" class="box small rounded-lg hidden-xs-only">
26-
<h2>{{resources.small_box_1.title}}</h2>
27-
<v-img data-cy="resources-img" :src="resources.small_box_1.src" contain class="image" />
28-
</div>
25+
<div data-cy="resources-box" class="box small rounded-lg hidden-xs-only">
26+
<h2>{{ resources.small_box_1.title }}</h2>
27+
<v-img data-cy="resources-img" :src="resources.small_box_1.src" contain class="image" />
28+
</div>
2929
</a>
3030
</v-col>
3131
<v-col xs="12" sm="4">
3232
<a target="_blank" :href="resources.small_box_2.link">
33-
<div data-cy="resources-box" class="box small rounded-lg hidden-xs-only">
34-
<h2>{{resources.small_box_2.title}}</h2>
35-
<v-img data-cy="resources-img" :src="resources.small_box_2.src" class="image" />
36-
</div>
33+
<div data-cy="resources-box" class="box small rounded-lg hidden-xs-only">
34+
<h2>{{ resources.small_box_2.title }}</h2>
35+
<v-img data-cy="resources-img" :src="resources.small_box_2.src" class="image" />
36+
</div>
3737
</a>
3838
</v-col>
3939
<v-col xs="12" sm="7">
4040
<a target="_blank" :href="resources.small_box_2.link">
41-
<div data-cy="resources-box" class="box big rounded-lg">
42-
<h2>{{resources.big_box_2.title}}</h2>
43-
<h3>{{resources.big_box_2.description}}</h3>
44-
<v-img data-cy="resources-img" :src="resources.big_box_2.src" class="image" />
45-
</div>
41+
<div data-cy="resources-box" class="box big rounded-lg">
42+
<h2>{{ resources.big_box_2.title }}</h2>
43+
<h3>{{ resources.big_box_2.description }}</h3>
44+
<v-img data-cy="resources-img" :src="resources.big_box_2.src" class="image" />
45+
</div>
4646
</a>
4747
</v-col>
4848
</v-row>
@@ -55,15 +55,15 @@ import HeaderTitle from '@/components/HeaderTitle';
5555
5656
export default {
5757
components: {
58-
HeaderTitle,
58+
HeaderTitle
5959
},
6060
data: () => ({
6161
resources: {
6262
big_box_1: {
6363
link: 'https://jobsboard.csesoc.unsw.edu.au/login',
6464
title: 'Job Board',
6565
description: 'A place where CSESoc students can look for relevant job opportunities.',
66-
src: require('../../assets/resource-job-board.png'),
66+
src: require('../../assets/resource-job-board.png')
6767
},
6868
small_box_1: {
6969
link: 'https://media.csesoc.org.au/first-year-guide/',
@@ -73,15 +73,15 @@ export default {
7373
small_box_2: {
7474
link: 'https://media.csesoc.org.au/',
7575
title: 'CSESOC Media',
76-
src: require('../../assets/resource-media.png'),
76+
src: require('../../assets/resource-media.png')
7777
},
7878
big_box_2: {
7979
link: 'https://notangles.csesoc.unsw.edu.au/',
8080
title: 'Notangles',
8181
description: 'Trimester timetabling tool - no more timetable tangles!',
82-
src: require('../../assets/resource-notangles.png'),
82+
src: require('../../assets/resource-notangles.png')
8383
}
84-
},
84+
}
8585
})
8686
};
8787
</script>
@@ -109,10 +109,10 @@ export default {
109109
height: 100%;
110110
overflow: hidden;
111111
112-
&.big{
112+
&.big {
113113
@include linearGradient($primary-color, $secondary-color-2);
114114
}
115-
&.small{
115+
&.small {
116116
@include linearGradient($primary-color, $secondary-color-1);
117117
}
118118
@@ -132,7 +132,7 @@ export default {
132132
.image {
133133
border-bottom-left-radius: 10px;
134134
border-bottom-right-radius: 10px;
135-
transition: transform .2s;
135+
transition: transform 0.2s;
136136
}
137137
}
138138

0 commit comments

Comments
 (0)