Skip to content

Commit 3c12420

Browse files
authored
Merge branch 'master' into Admin
2 parents 8dbdb83 + 689dce3 commit 3c12420

File tree

8 files changed

+82
-8
lines changed

8 files changed

+82
-8
lines changed

src/assets/images/bowman.jpg

228 KB
Loading

src/components/HotCard.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export default {
7878
title: "Interested in Coding?",
7979
body: `HacKSU teaches anyone, regardless of skill level or major, how to code!`,
8080
meetings: `Tuesdays, 7PM - 8PM`,
81-
meetings2: `via Discord`,
81+
meetings2: `IN PERSON`,
8282
discord: 'discord.gg/sfBBXCJt83',
8383
showcases: [
8484
"Design a website",

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/details.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const discord = "https://discord.gg/rJDdvnt";
22

3-
import MSBImage from "@/assets/images/msb.jpg";
3+
import bowmanImage from "@/assets/images/bowman.jpg";
44
import githubImage from "@/assets/images/github-white.svg";
55

66
export const landing = {
@@ -26,10 +26,10 @@ export const meetings = {
2626
virtual: `Due to COVID-19, all meetings are being held virtually through
2727
<a class="link" href="${discord}">discord</a>.`,
2828
building: {
29-
name: "Mathematical Sciences Building (MSB)",
30-
room: "Room 228",
31-
image: MSBImage,
32-
url: 'https://map.concept3d.com/?id=568#!m/57924?s/',
29+
name: "Bowman Hall",
30+
room: "Room 219",
31+
image: bowmanImage,
32+
url: 'https://map.concept3d.com/?id=568#!ct/74937,78237,78239?m/57856?s/bowman',
3333
},
3434

3535
},

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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,14 @@ onMounted(async () => {
117117
118118
@media (max-width: 768px) {
119119
padding: 2rem 1rem;
120+
.fall-fest-container{
121+
background: linear-gradient(to top left, #35c982, #4683FF);
122+
width: 100%;
123+
background-repeat: repeat;
124+
min-height: 50vh;
125+
padding: 100px;
126+
@media (max-width: 1000px){
127+
padding: 100px 10px;
120128
}
121129
}
122130

src/views/HelpPage.vue

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
const allData = await repo.find(); // Fetch all data
18+
informations.value = allData.slice(4); // Skip the first 4 items
19+
});
20+
</script>
21+
<style scoped lang="scss">
22+
* {
23+
box-sizing: border-box;
24+
}
25+
26+
.information{
27+
background-color: lightgrey;
28+
color: darkslategrey;
29+
width: 100%;
30+
padding: 15px 15px 15px 15px;
31+
display: flex;
32+
align-items: center;
33+
margin-bottom: 30px;
34+
max-width: 850px;
35+
h2 {
36+
margin: 5px 0;
37+
}
38+
&:deep(p) {
39+
margin: 5px 0;
40+
}
41+
}
42+
43+
.info-page-container{
44+
background: linear-gradient(to top left, #35c982, #4683FF);
45+
width: 100%;
46+
background-repeat: repeat;
47+
min-height: 50vh;
48+
padding: 100px;
49+
@media (max-width: 1000px){
50+
padding: 100px 10px;
51+
}
52+
overflow: auto;
53+
}
54+
55+
</style>

src/views/Meetings.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ const groupedEvents = computed(() => {
9191
9292
// reverse the order of events within each group to make them
9393
// forward-chronological within each semester
94-
result.forEach(value => value.reverse());
94+
// result.forEach(value => value.reverse());
95+
// I like reverse chronological order more :-) -Brandon
9596
9697
return result;
9798
});

0 commit comments

Comments
 (0)