Skip to content

Commit bcfa4ea

Browse files
munjoonteomunjoonteo
committed
minor fixes
1 parent 32b6e74 commit bcfa4ea

File tree

9 files changed

+44
-85
lines changed

9 files changed

+44
-85
lines changed

‎frontend/src/assets/resources/resource-first-year-guide.png

-228 KB
Binary file not shown.

‎frontend/src/assets/resources/resource-job-board.png

-151 KB
Binary file not shown.

‎frontend/src/assets/resources/resource-media.png

-653 KB
Binary file not shown.

‎frontend/src/assets/resources/resource-notangles.png

-571 KB
Binary file not shown.

‎frontend/src/assets/resources/resource-pre-enrolment-guide.jpg

-364 KB
Binary file not shown.

‎frontend/src/components/SecondaryNavbar.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</RouterLink>
1717
</v-col>
1818
<v-col class="d-flex align-center justify-end pr-10">
19-
<v-btn text to='/about' class="mr-2" color="white">ABOUT US</v-btn>
19+
<v-btn text to="/about" class="mr-2" color="white">ABOUT US</v-btn>
2020
<v-btn text to="/sponsors" class="ms-2" color="white">SPONSORSHIP</v-btn>
2121
</v-col>
2222
</v-row>
@@ -58,6 +58,6 @@
5858

5959
<script type="text/javascript">
6060
export default {
61-
name: 'SecondaryNavbar',
61+
name: 'SecondaryNavbar'
6262
};
6363
</script>

‎frontend/src/plugins/router.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Router from 'vue-router';
33

44
Vue.use(Router);
55
export default new Router({
6+
mode: 'history',
67
routes: [
78
{
89
path: '/',
@@ -23,7 +24,7 @@ export default new Router({
2324
path: '/sponsors',
2425
name: 'sponsors',
2526
component: () => import('../views/Sponsor')
26-
},
27+
}
2728
// {
2829
// path: '/engage',
2930
// name: 'engage',
@@ -32,6 +33,6 @@ export default new Router({
3233
],
3334
scrollBehavior() {
3435
// Scroll to top for all route navigations
35-
return { x: 0, y: 0 };
36+
document.getElementById('main-app').scrollIntoView({ behavior: 'smooth' });
3637
}
3738
});

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

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88
<template>
99
<div id="sponsor" class="content">
1010
<v-container>
11-
<!-- "support csesoc" title -->
12-
<HeaderTitle title="SUPPORT CSESOC" />
13-
<!-- row for trophy image and text adjacent -->
14-
<v-row no-gutters v-for="info in supportInfo" :key="info.title">
15-
<v-col cols="4" align="center">
16-
<div class="icon-text-aligner">
17-
<img :src="info.logo">
18-
</div>
11+
<!-- "support csesoc" title -->
12+
<HeaderTitle title="SUPPORT CSESOC" />
13+
<!-- row for trophy image and text adjacent -->
14+
<v-row no-gutters v-for="info in supportInfo" :key="info.title">
15+
<v-col cols="4" align="center">
16+
<div class="icon-text-aligner">
17+
<img :src="info.logo" />
18+
</div>
19+
</v-col>
20+
<!-- h4 and p text adjacent to trophy image -->
21+
<v-col cols="8">
22+
<h4>{{ info.title }}</h4>
23+
<p>{{ info.desc }}</p>
24+
</v-col>
25+
</v-row>
26+
<!-- "sponsor us" button -->
27+
<v-col cols="12" align="right">
28+
<RouterLink to="/sponsors" class="link" style="text-decoration: none;">
29+
<button class="btn--sponsorUs">
30+
Sponsor Us
31+
</button>
32+
</RouterLink>
1933
</v-col>
20-
<!-- h4 and p text adjacent to trophy image -->
21-
<v-col cols="8">
22-
<h4>{{info.title}}</h4>
23-
<p>{{info.desc}}</p>
24-
</v-col>
25-
</v-row>
26-
<!-- "sponsor us" button -->
27-
<v-col cols="12" align="right">
28-
<RouterLink to="/sponsors" class="link" style="text-decoration: none;">
29-
<button class="btn--sponsorUs">
30-
Sponsor Us
31-
</button>
32-
</RouterLink>
33-
</v-col>
3434
</v-container>
3535
</div>
3636
</template>
@@ -45,25 +45,28 @@ export default {
4545
supportInfo: [
4646
{
4747
logo: require('../../assets/trophy.svg'),
48-
title: 'Reach Australia\'s Best Computing Graduates',
49-
desc: 'Many of our past members have gone on to work at our previous sponsor companies including Google, Facebook, Jane Street and Commonwealth Bank.'
48+
title: "Reach Australia's Best Computing Graduates",
49+
desc:
50+
'Many of our past members have gone on to work at our previous sponsor companies including Google, Facebook, Jane Street and Commonwealth Bank.'
5051
},
5152
{
5253
logo: require('../../assets/share.svg'),
5354
title: 'Interact With Our Huge Active Community',
54-
desc: 'We have an extremely active community of over 3000 CSE students, achieved through our offering of career, social and educational events.'
55-
},
55+
desc:
56+
'We have an extremely active community of over 3000 CSE students, achieved through our offering of career, social and educational events.'
57+
}
5658
]
5759
}),
5860
components: {
59-
HeaderTitle,
61+
HeaderTitle
6062
}
6163
};
6264
</script>
6365

6466
<style lang="scss" scoped>
6567
#sponsor {
66-
background-image: linear-gradient(transparent, transparent, $dark-color-1), url(../../assets/landing_page/sponsor_us.png);
68+
background-image: linear-gradient(transparent, transparent, $dark-color-1),
69+
url(../../assets/landing_page/sponsor_us.png);
6770
background-size: cover;
6871
background-attachment: local;
6972
}
@@ -80,6 +83,6 @@ export default {
8083
.btn--sponsorUs:hover {
8184
transition: 0.4s;
8285
// when on hover, change background from transparent to $brand-color with light opacity
83-
background: rgba(102,255,255, 0.2);
86+
background: rgba(102, 255, 255, 0.2);
8487
}
8588
</style>

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

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717
<div data-cy="resources-box" class="box primary rounded-lg">
1818
<h2>{{ resources.jobs_board.title }}</h2>
1919
<h3>{{ resources.jobs_board.description }}</h3>
20-
<v-img
21-
data-cy="resources-img"
22-
max-height="80px"
23-
position="top"
24-
:src="resources.jobs_board.src"
25-
class="image hidden-xs-only"
26-
/>
2720
</div>
2821
</a>
2922
</v-col>
@@ -34,13 +27,6 @@
3427
<h2>{{ resources.comp_club.title }}</h2>
3528
<h3 class="hidden-sm-above">{{ resources.comp_club.description }}</h3>
3629
<div class="flex-grow-1"></div>
37-
<v-img
38-
data-cy="resources-img"
39-
max-height="80px"
40-
position="top"
41-
:src="resources.comp_club.src"
42-
class="image hidden-xs-only"
43-
/>
4430
</div>
4531
</a>
4632
</v-col>
@@ -50,13 +36,6 @@
5036
<div data-cy="resources-box" class="box primary rounded-lg">
5137
<h2>{{ resources.notangles.title }}</h2>
5238
<h3>{{ resources.notangles.description }}</h3>
53-
<v-img
54-
data-cy="resources-img"
55-
max-height="80px"
56-
:src="resources.notangles.src"
57-
position="top"
58-
class="image hidden-xs-only"
59-
/>
6039
</div>
6140
</a>
6241
</v-col>
@@ -66,13 +45,6 @@
6645
<div data-cy="resources-box" class="box secondary rounded-lg">
6746
<h2>{{ resources.media.title }}</h2>
6847
<h3>{{ resources.media.description }}</h3>
69-
<v-img
70-
data-cy="resources-img"
71-
max-height="100px"
72-
:src="resources.media.src"
73-
position="top"
74-
class="image hidden-xs-only"
75-
/>
7648
</div>
7749
</a>
7850
</v-col>
@@ -82,12 +54,6 @@
8254
<div data-cy="resources-box" class="box primary rounded-lg">
8355
<h2>{{ resources.fy_guide.title }}</h2>
8456
<h3>{{ resources.fy_guide.description }}</h3>
85-
<v-img
86-
data-cy="resources-img"
87-
:src="resources.fy_guide.src"
88-
position="top"
89-
class="image hidden-xs-only flex-grow-1"
90-
/>
9157
</div>
9258
</a>
9359
</v-col>
@@ -97,12 +63,6 @@
9763
<div data-cy="resources-box" class="box secondary rounded-lg">
9864
<h2>{{ resources.pe_guide.title }}</h2>
9965
<h3>{{ resources.pe_guide.description }}</h3>
100-
<v-img
101-
data-cy="resources-img"
102-
position="top"
103-
:src="resources.pe_guide.src"
104-
class="image align hidden-xs-only"
105-
/>
10666
</div>
10767
</a>
10868
</v-col>
@@ -123,20 +83,17 @@ export default {
12383
jobs_board: {
12484
link: 'https://jobsboard.csesoc.unsw.edu.au/login',
12585
title: 'Job Board',
126-
description: 'A place where CSESoc students can look for relevant job opportunities.',
127-
src: require('../../assets/resources/resource-job-board.png')
86+
description: 'A place where CSESoc students can look for relevant job opportunities.'
12887
},
12988
fy_guide: {
13089
link: 'https://media.csesoc.org.au/first-year-guide/',
13190
title: 'First Year Guide',
132-
description: 'The ultimate guide to conquering first year at CSE.',
133-
src: require('../../assets/resources/resource-first-year-guide.png')
91+
description: 'The ultimate guide to conquering first year at CSE.'
13492
},
13593
media: {
13694
link: 'https://media.csesoc.org.au/',
13795
title: 'CSESOC Media',
138-
description: 'All things content',
139-
src: require('../../assets/resources/resource-media.png')
96+
description: 'All things content'
14097
},
14198
comp_club: {
14299
link: 'https://compclub.csesoc.unsw.edu.au/',
@@ -146,14 +103,12 @@ export default {
146103
notangles: {
147104
link: 'https://notangles.csesoc.unsw.edu.au/',
148105
title: 'Notangles',
149-
description: 'Trimster timetabling tool - no more timetable tangles!',
150-
src: require('../../assets/resources/resource-notangles.png')
106+
description: 'Trimster timetabling tool - no more timetable tangles!'
151107
},
152108
pe_guide: {
153-
link: ' https://media.csesoc.org.au/pre-enrolment-guide/',
154-
title: 'Pre-enrolment Guide',
155-
description: 'Learn how to get a headstart on uni',
156-
src: require('../../assets/resources/resource-pre-enrolment-guide.jpg')
109+
link: 'https://media.csesoc.org.au/enrolment-guide/',
110+
title: 'Enrolment Guide',
111+
description: 'Learn how to get a headstart on uni'
157112
}
158113
}
159114
})

0 commit comments

Comments
 (0)