Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vue3 Upgrade and Fall 23 Eboard Update #84

Open
wants to merge 5 commits into
base: vue
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Install node.js (and yarn, I think)
uses: actions/setup-node@v2-beta
with:
node-version: '12.x'
node-version: '18.x'
# https://github.com/actions/cache/blob/master/examples.md#node---yarn
- name: Find out name of yarn cache path
id: yarn-cache-dir-path
Expand Down Expand Up @@ -77,5 +77,4 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: master
publish_dir: public
cname: nuhacks.io
enable_jekyll: false
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"ackee-tracker": "^4.1.0",
"core-js": "^3.6.4",
"vue": "^2.6.12",
"vue-router": "^3.4.8"
"vue": "3.2.13",
"vue-router": "4"
},
"devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@vue/cli-plugin-babel": "~4.5.8",
"@vue/cli-plugin-eslint": "~4.5.8",
"@vue/cli-plugin-router": "~4.5.8",
"@vue/cli-service": "~4.5.8",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/compiler-sfc": "^3.1.0",
"@vue/eslint-config-airbnb": "^5.0.2",
"babel-eslint": "^10.1.0",
"eslint": "^7.12.1",
Expand All @@ -27,7 +27,6 @@
"prerender-spa-plugin": "^3.2.1",
"sass": "^1.29.0",
"sass-loader": "^10.0.5",
"vue-cli-plugin-prerender-spa": "~1.1.6",
"vue-template-compiler": "^2.6.12"
"vue-cli-plugin-prerender-spa": "~1.1.6"
}
}
Binary file removed src/assets/members/alexreed.jpeg
Binary file not shown.
Binary file removed src/assets/members/alexreed.png
Binary file not shown.
Binary file added src/assets/members/ari.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/members/brandonliang.jpeg
Binary file not shown.
Binary file removed src/assets/members/brandonliang.png
Binary file not shown.
Binary file removed src/assets/members/danielmelcer.jpeg
Binary file not shown.
Binary file removed src/assets/members/danielmelcer.png
Binary file not shown.
Binary file removed src/assets/members/danishfarooq.jpeg
Binary file not shown.
Binary file removed src/assets/members/danishfarooq.png
Binary file not shown.
Binary file added src/assets/members/deannaturner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/deannaturner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/hannaheichinger.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/hannaheichinger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/members/jenningszhang.jpeg
Binary file not shown.
Binary file removed src/assets/members/jenningszhang.png
Binary file not shown.
Binary file removed src/assets/members/kyleposluns.jpeg
Binary file not shown.
Binary file removed src/assets/members/kyleposluns.png
Binary file not shown.
Binary file added src/assets/members/marinchilders.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/marinchilders.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/members/natdhsu.jpeg
Binary file not shown.
Binary file removed src/assets/members/natdhsu.png
Binary file not shown.
Binary file added src/assets/members/shashwatpatel.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/shashwatpatel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/shoaibrakhangi.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/shoaibrakhangi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/members/skyetoral.jpg
Binary file added src/assets/members/skyetoral.png
2 changes: 1 addition & 1 deletion src/components/hacks-modal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
document.body.style.overflow = "hidden";
document.body.style.width = "100vw";
},
destroyed() {
unmounted() {
const scrollY = document.body.style.top;
document.body.style.position = "";
document.body.style.overflow = "auto";
Expand Down
97 changes: 50 additions & 47 deletions src/data/board.js
Original file line number Diff line number Diff line change
@@ -1,91 +1,94 @@
const board = [
{
name: 'Nat Hsu',
name: 'Deanna Turner',
position: 'President',
school: 'KCCS + CAMD',
major: 'Computer Science & Interaction Design',
year: '2021',
imgName: 'natdhsu',
bio: 'yeah still thinking about what to say here 😬',
school: 'Khoury + CAMD',
major: 'Computer Science + Music Technology',
year: '2025',
imgName: 'deannaturner',
bio: 'Nerd, musician and occasional gamer.',
links: {
website: 'https://indefinities.gitHub.io',
gitHub: "indefinities",
email: 'hsu.na@northeastern.edu',
linkedIn: 'natdhsu'
website: '',
gitHub: 'rawsodium',
email: 'turner.de@northeastern.edu',
linkedIn: 'deanna-turner04'
}
},
{
name: 'Kyle Posluns',
name: 'Hannah Eichinger',
position: 'Vice President',
school: 'KCCS',
school: 'Khoury',
major: 'Computer Science',
year: '2022',
imgName: 'kyleposluns',
year: '2024',
imgName: 'hannaheichinger',
bio: '',
links: {
website: 'https://kyleposluns.com',
gitHub: 'kyleposluns',
email: 'posluns.k@northeastern.edu',
linkedIn: 'kyleposluns'
website: '',
gitHub: '',
email: 'eichinger.h@northeastern.edu',
linkedIn: 'hannah-eichinger-282168223'
}

},
{
name: 'Alex Reed',
name: 'this could be you!',
position: 'Treasurer',
school: 'KCCS',
major: 'Computer Science',
year: '2023',
imgName: 'alexreed',
bio: 'TODO',
school: '',
major: '',
year: '',
imgName: '',
bio: '',
links: {
gitHub: 'reeda19',
email: "[email protected]",
linkedIn: 'alex-reed-a84b9b183'
website: '',
gitHub: '',
email: '',
linkedIn: ''
}

},
{
name: 'this could be you!',
position: 'Webmaster',
position: 'Secretary',
school: '',
major: '',
year: '',
imgName: '',
bio: 'Apply using the link below!',
bio: '',
links: {
website: 'https://forms.gle/te7CMixoXdwv5GCv8',
website: '',
gitHub: '',
email: '',
linkedIn: ''
}
},
{
name: 'Junwoo Lee',
name: 'this could be you!',
position: 'Webmaster',
school: 'Khoury',
major: 'Computer Science',
year: '2023',
school: '',
major: '',
year: '',
imgName: '',
bio: 'If you see me outside, chances are you\'re in Snell',
bio: '',
links: {
website: '',
gitHub: 'danwo0',
email: '[email protected]'
gitHub: '',
email: '',
linkedIn: ''
}
},
{
name: 'Jennings Zhang',
position: 'Chief of Aquatics',
school: 'KCCS + COS',
major: 'Computer Science & Biology',
year: '2022',
imgName: 'jenningszhang',
bio: 'Opinionated and awkward person ;-;',
name: 'this could be you!',
position: 'Events Coordinator',
school: '',
major: '',
year: '',
imgName: '',
bio: '',
links: {
website: 'https://jennydaman.gitlab.io/',
gitHub: 'jennydaman',
email: '[email protected]'
website: '',
gitHub: '',
email: '',
linkedIn: ''
}
}
];
Expand Down
93 changes: 9 additions & 84 deletions src/data/members.js
Original file line number Diff line number Diff line change
@@ -1,93 +1,18 @@
const MEMBERS = [
{
name: 'Jennings Zhang',
school: 'CCIS + COS',
year: '2022',
imgName: 'jenningszhang',
name: 'Skye Toral',
school: 'Khoury + COS',
year: '2025',
imgName: 'skyetoral',
links: {
github: 'jennydaman',
website: 'https://jennydaman.gitlab.io/',
email: '[email protected]',
},
github: 'Hypefish',
},
interests: [
'Computational Medicine',
'Cybersecurity',
'{{buzzword[8]}}',
'Philosophy',
'Cooking'
'role playing games',
'music',
'writing software'
]
},
{
name: 'Brandon Liang',
school: 'KCCS',
year: '2023',
imgName: 'brandonliang',
links: {
github: '54skyxenon',
website: 'https://brandonliang.com/',
email: '[email protected]',
},
interests: [
'Anime',
'Hackathons',
'Travel',
'YGO'
]
},
{
name: 'Junwoo Lee',
school: 'Khoury',
year: '2023',
imgName: '',
links: {
github: 'danwo0',
website: '',
email: '[email protected]',
},
interests: [
'Cooking',
'Camping',
'Games',
'definitely not a League player',
'making cocktails'
]
},
{
name: 'Daniel Melcer',
school: 'KCCS',
year: '2021',
imgName: 'danielmelcer',
links: {
github: 'dmelcer9',
website: 'https://brandonliang.com/',
email: '[email protected]',
},
interests: [
'Hackathons',
'Robotics',
'TV shows',
"basically anything, though I don't really keep up with celebrities and such"
]
},
{
name: 'Natalie Hsu',
school: 'KCCS + CAMD',
year: '2022 + 1',
imgName: 'natdhsu',
links: {
github: 'indefinities',
website: 'https://indefinities.github.io/',
email: '[email protected]',
},
interests: [
'boba, bubble tea, any kind of tea',
'(ask me about where to get bubble tea in Boston)',
'silly shibes',
'Twitter and Instagram art',
'日本, アニメ',
'Teamfight Tactics'
]
}
];

Object.freeze(MEMBERS);
Expand Down
24 changes: 6 additions & 18 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,10 @@
import Vue from 'vue';
import { createApp } from 'vue';
import App from './App.vue';
import router from './router';
import * as Ackee from 'ackee-tracker';

Vue.config.productionTip = false;
const app = createApp(App);

new Vue({
router,
render: (h) => h(App),
mounted: () => document.dispatchEvent(new Event("x-app-rendered")),
}).$mount('#app');

if (typeof window !== 'undefined') {
Ackee.create({
server: 'https://ackee.nuhacks.io',
domainId: 'd7ef3906-37ed-4496-81d1-8c6a22e58231'
}, {
ignoreLocalhost: true,
detailed: false
}).record();
}
app.use(router);
app.mount('#app', () => {
document.dispatchEvent(new Event('x-app-rendered'));
});
12 changes: 5 additions & 7 deletions src/router/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import Vue from 'vue';
import VueRouter from 'vue-router';
import Home from '../views/Home.vue';
import About from '../views/About.vue';
import EBoard from '../views/EBoard.vue';
import Members from '../views/Members.vue';
import Conduct from '../views/Conduct.vue';

Vue.use(VueRouter);
import { createRouter, createWebHistory } from 'vue-router';

const routes = [
{
Expand Down Expand Up @@ -36,10 +33,11 @@ const routes = [
}
];

const router = new VueRouter({
routes
const router = createRouter({
history: createWebHistory(),
routes: routes,
});

export default router;
Object.freeze(routes);
export default router;
export { routes };
10 changes: 1 addition & 9 deletions src/sections/hacks-announce.vue
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
<template>
<div class="hacks-announce">
<iframe
src="https://discord.com/widget?id=809618860726157332&theme=dark"
width="293"
height="350"
allowtransparency="true"
frameborder="0"
sandbox="allow-popups allow-popups-to-escape-sandbox allow-same-origin allow-scripts"
></iframe>

<iframe
class="hacks-announce__discord-widget"
src="https://e.widgetbot.io/channels/809618860726157332/813553879764828161"
width="293"
width="500"
height="350"
frameborder="0"
></iframe>
Expand Down
Loading
Loading