diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c01f00c..937aef2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -77,5 +77,4 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} publish_branch: master publish_dir: public - cname: nuhacks.io enable_jekyll: false diff --git a/package.json b/package.json index 4ae99ee..30d1f65 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" } } diff --git a/src/assets/members/alexreed.jpeg b/src/assets/members/alexreed.jpeg deleted file mode 100644 index 004f82b..0000000 Binary files a/src/assets/members/alexreed.jpeg and /dev/null differ diff --git a/src/assets/members/alexreed.png b/src/assets/members/alexreed.png deleted file mode 100644 index c0497b9..0000000 Binary files a/src/assets/members/alexreed.png and /dev/null differ diff --git a/src/assets/members/ari.png b/src/assets/members/ari.png new file mode 100644 index 0000000..8e0b82a Binary files /dev/null and b/src/assets/members/ari.png differ diff --git a/src/assets/members/brandonliang.jpeg b/src/assets/members/brandonliang.jpeg deleted file mode 100644 index 4b952b9..0000000 Binary files a/src/assets/members/brandonliang.jpeg and /dev/null differ diff --git a/src/assets/members/brandonliang.png b/src/assets/members/brandonliang.png deleted file mode 100644 index 8092b6c..0000000 Binary files a/src/assets/members/brandonliang.png and /dev/null differ diff --git a/src/assets/members/danielmelcer.jpeg b/src/assets/members/danielmelcer.jpeg deleted file mode 100644 index 2db1dbb..0000000 Binary files a/src/assets/members/danielmelcer.jpeg and /dev/null differ diff --git a/src/assets/members/danielmelcer.png b/src/assets/members/danielmelcer.png deleted file mode 100644 index 52f883f..0000000 Binary files a/src/assets/members/danielmelcer.png and /dev/null differ diff --git a/src/assets/members/danishfarooq.jpeg b/src/assets/members/danishfarooq.jpeg deleted file mode 100644 index 6649178..0000000 Binary files a/src/assets/members/danishfarooq.jpeg and /dev/null differ diff --git a/src/assets/members/danishfarooq.png b/src/assets/members/danishfarooq.png deleted file mode 100644 index d73c4e5..0000000 Binary files a/src/assets/members/danishfarooq.png and /dev/null differ diff --git a/src/assets/members/deannaturner.jpg b/src/assets/members/deannaturner.jpg new file mode 100644 index 0000000..4d4c72f Binary files /dev/null and b/src/assets/members/deannaturner.jpg differ diff --git a/src/assets/members/deannaturner.png b/src/assets/members/deannaturner.png new file mode 100644 index 0000000..aa185c3 Binary files /dev/null and b/src/assets/members/deannaturner.png differ diff --git a/src/assets/members/hannaheichinger.jpg b/src/assets/members/hannaheichinger.jpg new file mode 100644 index 0000000..99a2711 Binary files /dev/null and b/src/assets/members/hannaheichinger.jpg differ diff --git a/src/assets/members/hannaheichinger.png b/src/assets/members/hannaheichinger.png new file mode 100644 index 0000000..752542a Binary files /dev/null and b/src/assets/members/hannaheichinger.png differ diff --git a/src/assets/members/jenningszhang.jpeg b/src/assets/members/jenningszhang.jpeg deleted file mode 100644 index ee50298..0000000 Binary files a/src/assets/members/jenningszhang.jpeg and /dev/null differ diff --git a/src/assets/members/jenningszhang.png b/src/assets/members/jenningszhang.png deleted file mode 100644 index bf8aca8..0000000 Binary files a/src/assets/members/jenningszhang.png and /dev/null differ diff --git a/src/assets/members/kyleposluns.jpeg b/src/assets/members/kyleposluns.jpeg deleted file mode 100644 index 3fdafd9..0000000 Binary files a/src/assets/members/kyleposluns.jpeg and /dev/null differ diff --git a/src/assets/members/kyleposluns.png b/src/assets/members/kyleposluns.png deleted file mode 100644 index bb44b79..0000000 Binary files a/src/assets/members/kyleposluns.png and /dev/null differ diff --git a/src/assets/members/marinchilders.jpg b/src/assets/members/marinchilders.jpg new file mode 100644 index 0000000..c143793 Binary files /dev/null and b/src/assets/members/marinchilders.jpg differ diff --git a/src/assets/members/marinchilders.png b/src/assets/members/marinchilders.png new file mode 100644 index 0000000..1d45494 Binary files /dev/null and b/src/assets/members/marinchilders.png differ diff --git a/src/assets/members/natdhsu.jpeg b/src/assets/members/natdhsu.jpeg deleted file mode 100644 index 77a00d6..0000000 Binary files a/src/assets/members/natdhsu.jpeg and /dev/null differ diff --git a/src/assets/members/natdhsu.png b/src/assets/members/natdhsu.png deleted file mode 100644 index a34dcaa..0000000 Binary files a/src/assets/members/natdhsu.png and /dev/null differ diff --git a/src/assets/members/shashwatpatel.jpg b/src/assets/members/shashwatpatel.jpg new file mode 100644 index 0000000..be7022a Binary files /dev/null and b/src/assets/members/shashwatpatel.jpg differ diff --git a/src/assets/members/shashwatpatel.png b/src/assets/members/shashwatpatel.png new file mode 100644 index 0000000..f7f9e93 Binary files /dev/null and b/src/assets/members/shashwatpatel.png differ diff --git a/src/assets/members/shoaibrakhangi.jpg b/src/assets/members/shoaibrakhangi.jpg new file mode 100644 index 0000000..446bfb3 Binary files /dev/null and b/src/assets/members/shoaibrakhangi.jpg differ diff --git a/src/assets/members/shoaibrakhangi.png b/src/assets/members/shoaibrakhangi.png new file mode 100644 index 0000000..446bfb3 Binary files /dev/null and b/src/assets/members/shoaibrakhangi.png differ diff --git a/src/assets/members/skyetoral.jpg b/src/assets/members/skyetoral.jpg new file mode 100644 index 0000000..b4bad88 Binary files /dev/null and b/src/assets/members/skyetoral.jpg differ diff --git a/src/assets/members/skyetoral.png b/src/assets/members/skyetoral.png new file mode 100644 index 0000000..f82c0a1 Binary files /dev/null and b/src/assets/members/skyetoral.png differ diff --git a/src/components/hacks-modal.vue b/src/components/hacks-modal.vue index 308de8f..98f7742 100644 --- a/src/components/hacks-modal.vue +++ b/src/components/hacks-modal.vue @@ -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"; diff --git a/src/data/board.js b/src/data/board.js index a24b1ad..0a8feb0 100644 --- a/src/data/board.js +++ b/src/data/board.js @@ -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: "reed.al@northeastern.edu", - 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: 'lee.junw@northeastern.edu' + 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: 'jz@nuhacks.io' + website: '', + gitHub: '', + email: '', + linkedIn: '' } } ]; diff --git a/src/data/members.js b/src/data/members.js index 381fc41..b744ca4 100644 --- a/src/data/members.js +++ b/src/data/members.js @@ -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: 'jz@nuhacks.io', - }, + 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: 'liang.bra@northeastern.edu', - }, - interests: [ - 'Anime', - 'Hackathons', - 'Travel', - 'YGO' - ] - }, - { - name: 'Junwoo Lee', - school: 'Khoury', - year: '2023', - imgName: '', - links: { - github: 'danwo0', - website: '', - email: 'lee.junw@northeastern.edu', - }, - 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: 'melcer.d@northeastern.edu', - }, - 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: 'hsu.na@northeastern.edu', - }, - 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); diff --git a/src/main.js b/src/main.js index d272312..b8fc575 100644 --- a/src/main.js +++ b/src/main.js @@ -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')); +}); diff --git a/src/router/index.js b/src/router/index.js index f3a39dd..713ae27 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -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 = [ { @@ -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 }; diff --git a/src/sections/hacks-announce.vue b/src/sections/hacks-announce.vue index 5c69b99..3ff8ff7 100644 --- a/src/sections/hacks-announce.vue +++ b/src/sections/hacks-announce.vue @@ -1,18 +1,10 @@