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

Updated Photos #62

Closed
wants to merge 5 commits into from
Closed
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
Binary file modified src/assets/images/index/bonfire.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/images/index/firstMeeting2024.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/images/index/firstplace.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 removed src/assets/images/index/inrixHack.png
Binary file not shown.
Binary file added src/assets/images/index/workshop.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 removed src/assets/images/index/workshop.png
Binary file not shown.
120 changes: 29 additions & 91 deletions src/pages/IndexHome.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
<template>
<v-app style="position: relative;">
<v-app style="position: relative">
<MainNavbar transparent no-elevation />
<div
ref="initContainer"
class="parallax"
:style="{ height: windowHeight - navigationHeight + 'px' }"
>
<v-container style="max-width: 1200px; margin: auto;">
<div ref="initContainer" class="parallax" :style="{ height: windowHeight - navigationHeight + 'px' }">
<v-container style="max-width: 1200px; margin: auto">
<v-scroll-x-transition appear>
<v-row>
<v-col cols="12" class="title-container">
Expand All @@ -26,68 +22,44 @@
</div>

<div ref="navigation" class="navigation">
<AnnouncementBanner :show="true" content="Thank you to everyone who participated in AWS x INRIX Hack! Check out the winners " link="https://aws.scuacm.com" linkTitle="here" />
<AnnouncementBanner :show="true"
content="Thank you to everyone who participated in AWS x INRIX Hack! Check out the winners "
link="https://aws.scuacm.com" linkTitle="here" />
<v-container style="max-width: 800px;">
<v-row
style="display: flex; justify-content: center; text-align: center;"
>
<v-row style="display: flex; justify-content: center; text-align: center">
<v-col cols="12">
<div class="navigation-header">
Learn more
</div>
<div class="navigation-header">Learn more</div>
</v-col>
<v-col v-for="(link, i) in navLinks" :key="i">
<v-btn
style="border-radius: 50px; border: solid white"
class="join-btn"
outlined
height="60px"
width="230px"
@click="scrollTo(link.to)"
>
<v-btn style="border-radius: 50px; border: solid white" class="join-btn" outlined height="60px"
width="230px" @click="scrollTo(link.to)">
{{ link.title }}
</v-btn>
</v-col>
</v-row>
</v-container>
</div>

<v-container style="max-width: 1000px; margin-top: 150px;">
<v-container style="max-width: 1000px; margin-top: 150px">
<!-- had to use style bind with js breakpoint because class didn't work for some reason... -->
<div class="related-club-title">
Club Affiliates
</div>
<div class="related-club-title">Club Affiliates</div>
<div class="related-club-container">
<span v-for="(club, i) in relatedClubContent" :key="i">
<RelatedClubCard :club="club" />
</span>
</div>
</v-container>

<v-container style="max-width: 1000px; margin-top: 150px;" ref="club-info">
<v-container style="max-width: 1000px; margin-top: 150px" ref="club-info">
<!-- had to use style bind with js breakpoint because class didn't work for some reason... -->
<div class="about-title">
About ACM
</div>
<v-row
v-for="(item, i) in boxContent"
:key="i"
:style="{ marginBottom: containerMarginBottom + 'px' }"
>
<div class="about-title">About ACM</div>
<v-row v-for="(item, i) in boxContent" :key="i" :style="{ marginBottom: containerMarginBottom + 'px' }">
<v-col v-if="i % 2 == 0" cols="12" sm="12" md="6" lg="6" xl="6">
<div class="item-container">
<v-img class="item-img" :src="item.src" :lazy-src="item.src" />
</div>
</v-col>
<v-col
v-if="i % 2 == 1"
class="hidden-md-and-up"
cols="12"
sm="12"
md="6"
lg="6"
xl="6"
>
<v-col v-if="i % 2 == 1" class="hidden-md-and-up" cols="12" sm="12" md="6" lg="6" xl="6">
<div class="item-container">
<v-img class="item-img" :src="item.src" :lazy-src="item.src" />
</div>
Expand All @@ -103,44 +75,23 @@
</div>
</div>
</v-col>
<v-col
class="hidden-sm-and-down"
v-if="i % 2 == 1"
cols="12"
sm="12"
md="6"
lg="6"
xl="6"
>
<v-col class="hidden-sm-and-down" v-if="i % 2 == 1" cols="12" sm="12" md="6" lg="6" xl="6">
<div class="item-container">
<v-img class="item-img" :src="item.src" :lazy-src="item.src" />
</div>
</v-col>
</v-row>
</v-container>

<v-container
ref="events"
style="max-width: 1200px; margin-bottom: 150px;"
>
<div class="event-title">
Events
</div>
<v-container ref="events" style="max-width: 1200px; margin-bottom: 150px">
<div class="event-title">Events</div>
<div class="event-sub-title">
We host a plethora of fun events for anyone of any background or major
interested in computer science!
</div>
<v-row>
<v-col
v-for="(event, i) in eventContent"
:key="i"
cols="12"
sm="12"
md="6"
lg="4"
xl="4"
style="text-align: center; margin-left: auto; margin-right: auto;"
>
<v-col v-for="(event, i) in eventContent" :key="i" cols="12" sm="12" md="6" lg="4" xl="4"
style="text-align: center; margin-left: auto; margin-right: auto">
<div>
<v-img class="event-img" :src="event.src" :lazy-src="event.src" />
</div>
Expand All @@ -154,28 +105,14 @@
</v-row>
</v-container>

<v-container
ref="resources"
style="margin-bottom: 100px;"
:style="{ maxWidth: resourceContainerWidth + 'px' }"
>
<div class="resource-title">
Resources
</div>
<v-container ref="resources" style="margin-bottom: 100px" :style="{ maxWidth: resourceContainerWidth + 'px' }">
<div class="resource-title">Resources</div>
<div class="event-sub-title">
Utilize our resources to learn more about computer science and
technology!
</div>
<v-row>
<v-col
cols="12"
sm="6"
md="6"
lg="3"
xl="3"
v-for="(resource, i) in resourceContent"
:key="i"
>
<v-col cols="12" sm="6" md="6" lg="3" xl="3" v-for="(resource, i) in resourceContent" :key="i">
<ResourceCard :resource="resource" />
</v-col>
</v-row>
Expand All @@ -197,12 +134,12 @@ import BroncoSec from "@/assets/images/clubs/BroncoSec.png";
import CPC from "@/assets/images/clubs/CPC.png";
import ACMG from "@/assets/images/clubs/ACM-G.png";

import image1 from "@/assets/images/index/firstMeeting2023.jpg";
import image1 from "@/assets/images/index/firstMeeting2024.jpg";
import image2 from "@/assets/images/index/bonfire.jpg";
import image3 from "@/assets/images/index/firstMeeting2022.jpg";

import hackathon from "@/assets/images/index/inrixHack.png";
import workshop from "@/assets/images/index/workshop.png";
import hackathon from "@/assets/images/index/firstplace.jpg";
import workshop from "@/assets/images/index/workshop.jpg";
import speaker from "@/assets/images/index/speaker.jpg";

import ACM from "@/assets/images/resources/ACM.svg";
Expand Down Expand Up @@ -378,7 +315,7 @@ export default {
link: "https://www.mastersindatascience.org/careers/data-analyst/",
title: "2U Data Science",
content:
"\"Mastersindatascience.org\" is a website dedicated to outlining everything Data Science for students interested in furthering their education in STEM fields, specifically in Technology departments.",
'"Mastersindatascience.org" is a website dedicated to outlining everything Data Science for students interested in furthering their education in STEM fields, specifically in Technology departments.',
},
],
}),
Expand Down Expand Up @@ -420,6 +357,7 @@ export default {
background-repeat: no-repeat;
background-size: cover;
}

.join-btn {
font-family: "Poppins", sans-serif;
font-size: 1rem !important;
Expand Down
125 changes: 45 additions & 80 deletions src/pages/ProfilePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,81 +2,46 @@
<v-app>
<MainNavbar />
<v-container style="margin-top: 75px; max-width: 750px">
<div class="events-title">
Manage Profile
<div class="events-title">
Manage Profile
</div>
<h2 style="text-align:center;" class="">
Events Attended: {{ attendance }}
</h2>
<v-form v-if="formData" @submit.prevent="updateFirebase" @input="callDebounce">
<div class="form-header">
Preferred Name
</div>
<h2 style="text-align:center;" class="">
Events Attended: {{ attendance }}
</h2>
<v-form v-if="formData" @submit.prevent="updateFirebase" @input="callDebounce">
<div class="form-header">
Preferred Name
</div>
<v-text-field
label="Preferred Name"
@input="callDebounce"
:disabled="!canEdit"
v-model="formData.name"
outlined
solo
>
</v-text-field>
<div class="form-header">
Graduation Year
</div>
<v-select
label="Graduation Year"
v-model="formData.year"
@input="callDebounce"
:disabled="!canEdit"
:items="graduationYears"
outlined
solo
>
</v-select>
<div class="form-header">
Major
</div>
<v-select
label="Major"
@input="callDebounce"
:items="majorsList"
:disabled="!canEdit"
v-model="formData.major"
outlined
solo
>
</v-select>
<div class="form-header">
Race/Ethnicity
</div>
<v-select
label="Race"
v-model="formData.race"
@input="callDebounce"
:items="race"
:disabled="!canEdit"
outlined
solo
multiple
>
</v-select>
<div class="form-header">
Gender
</div>
<v-select
label="Gender"
@input="callDebounce"
:items="gender"
:disabled="!canEdit"
v-model="formData.gender"
outlined
solo
>
</v-select>
</v-form>
<ManageResume v-if="viewResume" :canUpload="canUploadResume">
</ManageResume>
<v-text-field label="Preferred Name" @input="callDebounce" :disabled="!canEdit" v-model="formData.name" outlined
solo>
</v-text-field>
<div class="form-header">
Graduation Year
</div>
<v-select label="Graduation Year" v-model="formData.year" @input="callDebounce" :disabled="!canEdit"
:items="graduationYears" outlined solo>
</v-select>
<div class="form-header">
Major
</div>
<v-select label="Major" @input="callDebounce" :items="majorsList" :disabled="!canEdit" v-model="formData.major"
outlined solo>
</v-select>
<div class="form-header">
Race/Ethnicity
</div>
<v-select label="Race" v-model="formData.race" @input="callDebounce" :items="race" :disabled="!canEdit" outlined
solo multiple>
</v-select>
<div class="form-header">
Gender
</div>
<v-select label="Gender" @input="callDebounce" :items="gender" :disabled="!canEdit" v-model="formData.gender"
outlined solo>
</v-select>
</v-form>
<ManageResume v-if="viewResume" :canUpload="canUploadResume">
</ManageResume>
</v-container>
<MainFooter />
</v-app>
Expand All @@ -87,7 +52,7 @@ import MainNavbar from "@/layout/MainNavbar.vue";
import MainFooter from "@/layout/MainFooter.vue";

import 'firebase/compat/firestore'
import {db, auth, functions} from '../firebase';
import { db, auth, functions } from '../firebase';
import { debounce } from 'debounce';
import { getUserPerms, majorsList } from '../helpers';
import ManageResume from '../components/ManageResume.vue';
Expand All @@ -99,13 +64,13 @@ export default {
MainNavbar,
MainFooter,
ManageResume
},
},

methods: {
callDebounce() {
this.debouncedUpdate();
},
debouncedUpdate: debounce(function() {
debouncedUpdate: debounce(function () {
this.updateFirebase()
}, 1000),
async updateFirebase() {
Expand Down Expand Up @@ -137,9 +102,9 @@ export default {
}
this.formData = data;
let result;
if(this.user.uid.length > 0) {
result = await functions.httpsCallable("getUserAttendance")({id: user.uid});
this.attendance = result.data;
if (this.user.uid.length > 0) {
result = await functions.httpsCallable("getUserAttendance")({ id: user.uid });
this.attendance = result.data;
}
}
});
Expand Down