Skip to content

Commit 69ee5ef

Browse files
authored
Merge pull request #43 from hacksu/new-student-info-page
New student info page merger
2 parents 20503d7 + b4a6626 commit 69ee5ef

File tree

4 files changed

+70
-2
lines changed

4 files changed

+70
-2
lines changed

src/components/Navigation.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default {
3131
['Meetings', '/meetings'],
3232
['Leadership', '/leadership'],
3333
['Contact', '/contact'],
34-
['IBM Fall Fest!','/ibm']
34+
['Useful Information & Links','/helpful_info']
3535
];
3636
if (loggedIn.value){
3737
buttons.push(

src/router/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import EditEvents from "../views/EditEvents.vue";
1111
import EditNotes from "../views/EditNotes.vue";
1212
import AdminMeetings from "../views/AdminMeetings.vue";
1313
import FallFest from "../views/FallFest.vue";
14+
import HelpPage from "../views/HelpPage.vue";
1415
import AdminInformation from "../views/AdminInformation.vue";
1516

1617
export const routes = [
@@ -77,6 +78,15 @@ export const routes = [
7778
},
7879
component: FallFest,
7980
},
81+
{
82+
path: '/helpful_info',
83+
name: "Useful Links and Information",
84+
meta: {
85+
title: "Links and Resources!",
86+
description: "A collection of useful links and information for students."
87+
},
88+
component: HelpPage,
89+
},
8090
{
8191
path: "/admin",
8292
name: "Admin Stuff",

src/views/FallFest.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ onMounted(async () => {
4444
4545
.fall-fest-container{
4646
background: linear-gradient(to top left, #35c982, #4683FF);
47-
max-width: 1600px;
47+
width: 100%;
4848
background-repeat: repeat;
4949
min-height: 50vh;
5050
padding: 100px;

src/views/HelpPage.vue

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<template>
2+
<div class="info-page-container">
3+
<h1 style="margin: auto; text-align: center;">Helpful Resources</h1>
4+
<InformationCard v-for="information, j in informations" :key="information" ref=""
5+
:information="information"/>
6+
</div>
7+
</template>
8+
<script setup>
9+
import { onMounted, ref } from 'vue';
10+
import { remult } from 'remult';
11+
import { Information } from "../../db/entities.js";
12+
import InformationCard from "../components/InformationCard.vue";
13+
14+
const informations = ref([]);
15+
const repo = remult.repo(Information);
16+
onMounted(async () => {
17+
repo.find({
18+
skip: 4 // Skips the first 4 items (starts from the 5th, allows the fall-fest stuff to stay Anna's legacy and all that)
19+
}).then(e => {
20+
informations.value = e;
21+
});
22+
});
23+
</script>
24+
<style scoped lang="scss">
25+
* {
26+
box-sizing: border-box;
27+
}
28+
29+
.information{
30+
background-color: lightgrey;
31+
color: darkslategrey;
32+
width: 100%;
33+
padding: 15px 15px 15px 15px;
34+
display: flex;
35+
align-items: center;
36+
margin-bottom: 30px;
37+
max-width: 850px;
38+
h2 {
39+
margin: 5px 0;
40+
}
41+
&:deep(p) {
42+
margin: 5px 0;
43+
}
44+
}
45+
46+
.info-page-container{
47+
background: linear-gradient(to top left, #35c982, #4683FF);
48+
width: 100%;
49+
background-repeat: repeat;
50+
min-height: 50vh;
51+
padding: 100px;
52+
@media (max-width: 1000px){
53+
padding: 100px 10px;
54+
}
55+
overflow: auto;
56+
}
57+
58+
</style>

0 commit comments

Comments
 (0)