Skip to content
Merged
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 added assets/img/events/atr2025/001.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 assets/img/events/atr2025/002.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 assets/img/events/atr2025/003.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 assets/img/events/atr2025/004.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 assets/img/events/atr2025/005.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 assets/img/events/atr2025/006.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 assets/img/events/atr2025/007.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 assets/img/events/atr2025/008.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 assets/img/events/atr2025/009.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 assets/img/events/atr2025/010.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 assets/img/events/atr2025/011.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 assets/img/events/atr2025/012.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 assets/img/events/lan2025/001.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 assets/img/events/lan2025/002.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 assets/img/events/lan2025/003.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 assets/img/events/lan2025/004.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 assets/img/events/lan2025/005.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 assets/img/events/lan2025/006.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 10 additions & 39 deletions pages/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
-->
</p>
</b-col>
<b-col md="auto" class="mt-5" style="width: 500px;">
<b-col md="auto" class="mt-5" style="width: 650px;">
<v-lazy-image
class="mb-5 rounded-corner"
width="500"
:src="'https://res.cloudinary.com/dec6mijn3/image/upload/c_scale,w_1000/v1693068628/ComSSA-Website/General/about_2024'"
:src-placeholder="'https://res.cloudinary.com/dec6mijn3/image/upload/c_scale,w_200/v1693068628/ComSSA-Website/General/about_2024'"
width="650"
:src="'https://res.cloudinary.com/dec6mijn3/image/upload/c_scale,w_1000/v1693068628/ComSSA-Website/General/about_2025'"
:src-placeholder="'https://res.cloudinary.com/dec6mijn3/image/upload/c_scale,w_200/v1693068628/ComSSA-Website/General/about_2025'"
/>
</b-col>
</b-row>
Expand All @@ -51,13 +51,13 @@
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Sean McGinty"
name="Justis Koh"
title="Vice President"
/>
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Stanley Zhong"
name="Kai Chen Chai"
title="Treasurer"
/>
</b-col>
Expand All @@ -79,13 +79,13 @@
/>
</b-col><b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Ethan Olson"
name="Alice Arvidson"
title="Marketing Coordinator"
/>
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Justis Koh"
name="Thomas Han"
title="Technical Coordinator"
/>
</b-col>
Expand Down Expand Up @@ -114,7 +114,7 @@
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Kai Chen Chai"
name="Daniela Degasperi"
/>
</b-col>
</b-row>
Expand All @@ -126,7 +126,7 @@
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Mia Tran"
name="Hua Chen"
/>
</b-col>
<b-col cols="6" md="3" class="mb-3">
Expand Down Expand Up @@ -156,39 +156,11 @@
name="Tri Dao"
/>
</b-col>
</b-row>
<h3 class="ord-subheading">
Sub-Committee Members
<!--Added extra row to balance subs better-->
</h3>
<b-row align-h="around" class="mt-3 text-center">
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Daniela Degasperi"
/>
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Hua Chen"
/>
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Patrick Jong"
/>
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Jerry Zhang"
/>
</b-col>
</b-row>
<b-row align-h="around" class="mt-3 text-center">
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Thomas Han"
/>
</b-col>
<b-col cols="6" md="3" class="mb-3">
<CloudProfile
name="Candle Visidsiri"
Expand All @@ -202,7 +174,6 @@
</b-row>
</b-container>
</template>

<script>
export default {
head: {
Expand Down
20 changes: 20 additions & 0 deletions pages/events/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,18 @@
Let us know.
</NuxtLink>
</p>
<EventsAccordion
name="lan2025"
accordion-text="LAN Night S1 @ Escape Portal - 2025"
root-dir="events/lan2025"
:images="lan2025"
/>
<EventsAccordion
name="atr2025"
accordion-text="Amazing Tech Race - 2025"
root-dir="events/atr2025"
:images="atr2025"
/>
<EventsAccordion
name="wadsihworkshop2025"
accordion-text="WADSIH Resume Workshop - 2025"
Expand Down Expand Up @@ -373,6 +385,12 @@ const getTFTI2025 = () =>

const getWADSIHWorkshop2025 = () =>
Array.from(require.context("~/assets/img/events/wadsihworkshop2025", true, /\.(jpg|JPG|png)$/).keys()).map(s => s.substr(2))

const getATR2025 = () =>
Array.from(require.context("~/assets/img/events/atr2025", true, /\.(jpg|JPG|png)$/).keys()).map(s => s.substr(2))

const getLAN2025 = () =>
Array.from(require.context("~/assets/img/events/lan2025", true, /\.(JPG|jpg|png)$/).keys()).map(s => s.substr(2))
export default {
data () {
return {
Expand All @@ -382,6 +400,7 @@ export default {
internationalnight2025: getInternationalNight2025(),
lan2021: getLan2021(),
lan2023: getLan2023(),
lan2025: getLAN2025(),
s2lan2023: getS2Lan2023(),
guildoday2021: getGuildODay2021(),
grillthedepartment2021: getGrillTheDepartment2021(),
Expand All @@ -403,6 +422,7 @@ export default {
guildoday2024: getGuildODay2024(),
guildoday2025: getGuildODay2025(),
atr2023: getATR2023(),
atr2025: getATR2025(),
internationalsundowner2023: getInternationalSundowner2023(),
networkingsundowner2023: getNetworkingSundowner2023(),
boardgamesnight2024: getBoardGamesNight2024(),
Expand Down
Loading