Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/hackupc/hackupc-live
Browse files Browse the repository at this point in the history
…into meals
  • Loading branch information
carlotacb committed Apr 13, 2024
2 parents 227a0ef + b20eccd commit 71342f6
Show file tree
Hide file tree
Showing 22 changed files with 2,206 additions and 1,814 deletions.
200 changes: 100 additions & 100 deletions src/assets/img/maps/campus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,156 changes: 547 additions & 609 deletions src/assets/img/maps/indoors.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1,656 changes: 883 additions & 773 deletions src/assets/img/maps/judging.svg
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/img/mentorShirt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 4 additions & 6 deletions src/components/IconLabel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ defineProps<{
padding: 6px;
margin: 0;
margin-right: 0.25em;
background-color: $secondary-color;
background-color: $primary-color;
border-radius: 5px;
color: #fff;
font-weight: normal;
Expand All @@ -53,15 +53,13 @@ defineProps<{
height: 2rem;
padding: 0 12px;
margin: 4px;
background-color: $secondary-light-color;
background-color: $primary-color-light;
border-radius: 3px;
color: $primary-color !important;
font-size: 1rem;
font-weight: bold;
line-height: 2;
vertical-align: middle;
a {
color: currentcolor !important;
}
}
}
</style>
8 changes: 6 additions & 2 deletions src/components/Panel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,12 @@ defineProps<Props>()
}
::v-deep(a) {
color: $highlight-color;
text-decoration: underline;
color: $links-color;
font-weight: bold;
&:hover {
color: color.adjust($links-color-hover, $lightness: -10%);
}
}
::v-deep(h3) {
Expand Down
11 changes: 10 additions & 1 deletion src/components/SecretContent.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
<script setup lang="ts">
interface Props {
secretText?: string
}
defineProps<Props>()
</script>

<template>
<div class="secret">
<div class="secret__title">Secret</div>
<div class="secret__text">Come back after the opening cerimony</div>
<div class="secret__text">
{{ secretText ? secretText : 'Come back after the opening ceremony' }}
</div>
</div>
</template>

Expand Down
2 changes: 2 additions & 0 deletions src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ interface Config {
readonly hideMission: boolean
readonly hideCafeteria: boolean
readonly hideMeals: boolean
readonly hideWifiConfig: boolean
}

const config: Config = {
Expand All @@ -16,6 +17,7 @@ const config: Config = {
hideMission: true,
hideCafeteria: false,
hideMeals: false,
hideWifiConfig: true,
}

export default config
96 changes: 42 additions & 54 deletions src/data/challenges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,78 +11,66 @@ export interface Challenge {

export const challenges: Challenge[] = [
{
title: 'Making Markets to Make a Change',
companyEncrypted: 'FpDvGOwa9WVr4riRPXIFmg',
company: 'Optiver',
videoUrl: 'https://youtu.be/R2B7QNEAH3c',
companyEncrypted: 'Company challenge',
title: '',
company: '',
videoUrl: '',
//description: /* markdown */ ``,
prize: '1st: An iPhone 13 for each member of the team',
channel: 'optiver',
prize: '',
channel: '',
},
{
companyEncrypted: 'OJ4LCmSBly+3JmL7P7/V1w',
company: 'HP',
title: 'HP Inventory & Sales Forecasting',
videoUrl: 'https://youtu.be/BDkC4cb-bb8',
companyEncrypted: 'Company challenge',
company: '',
title: '',
videoUrl: '',
//description: /* markdown */ ``,
prize: '1st: 4 HP Laptop 15, 2nd: 4 Hyper X Keyboard, 3rd: 4 Omen Sweater',
channel: 'hp',
prize: '',
channel: '',
},
{
companyEncrypted: 'TZABPAEwSHar7SLMqkDmuA',
company: 'Bunge',
title: 'Mission to Improve the Agribusiness Markets',
companyEncrypted: 'Company challenge',
company: '',
title: '',
videoUrl: '',
//description: /* markdown */ ``,
videoUrl: 'https://youtu.be/pSKdCW41170',
prize: 'Each member wins a Meta Quest 2',
channel: 'bunge',
prize: '',
channel: '',
},
{
companyEncrypted: 'IXZ07J9j2ognub5PeUbefg',
company: 'Restb.ai',
title: 'Most innovative usage of our data',
videoUrl: 'https://youtu.be/r-G4yDL2ZpA',
companyEncrypted: 'Company challenge',
company: '',
title: '',
videoUrl: '',
//description: /* markdown */ ``,
prize: 'Travel anywhere up to 200€ for each team member.',
channel: 'restbai',
prize: '',
channel: '',
},
{
companyEncrypted: 'OKOOYK8p3e6ixR3KQ05l8Q',
company: 'Strands',
title: 'Build the bank experience you need.',
videoUrl: 'https://youtu.be/GkmVmZwSygo',
companyEncrypted: 'Company challenge',
company: '',
title: '',
videoUrl: '',
//description: /* markdown */ ``,
prize:
'1 Windows 11 Pro, 12GB RAM 256GB ROM Ιntel Celeron J4125 Mini, 2 New Kindle Paperwhite, 3 Amazon voucher 100€',
channel: 'strands',
prize: '',
channel: '',
},
{
companyEncrypted: '+5CxQKLiDwgwXZEp3ePpFw',
company: 'Vueling',
title: 'Flight Fest',
videoUrl: 'https://youtu.be/AlECmra8YAo',
companyEncrypted: 'Company challenge',
company: '',
title: '',
videoUrl: '',
//description: /* markdown */ ``,
prize:
'The prize for the winners will be a round trip flight to any Vueling destination for the whole team',
channel: 'vueling',
prize: '',
channel: '',
},
{
companyEncrypted: 'MZHdrReJtUe0TWxiyNwFTA',
company: 'Capchase',
title: 'SQLillo Royale',
videoUrl: 'https://youtu.be/dMfcT_hs_rU',
companyEncrypted: 'Company challenge',
company: '',
title: '',
videoUrl: '',
//description: /* markdown */ ``,
prize: '1. Impresora 3D, 2. Set Arduino, 3. Amazon Voucher 100EUR',
channel: 'capchase',
},
{
companyEncrypted: '8KmM/3LZtmAsuR4vnOPTvg',
company: 'IThinkUPC',
title: 'Build an AI Powered App',
videoUrl: 'https://youtu.be/QmfVvugVLjA',
//description: /* markdown */ ``,
prize:
'1rt Amazon Voucher 100€, 2nd Amazon Voucher 50€, 3rd Amazon Voucher 30€',
channel: 'ithinkupc',
prize: '',
channel: '',
},
]
30 changes: 15 additions & 15 deletions src/data/mentors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@ export interface Mentor {
readonly title: string
readonly description: string
readonly slack: string
readonly linkedin: string
readonly linkedin?: string
readonly languages: string
readonly webpage?: string
}

export const mentors: Mentor[] = [
{
title: 'Mentor 1',
description: `I am a mentor.`,
slack: 'mentor1',
linkedin: 'mentor1',
title: 'Maurici Abad Gutierrez',
description: `Senior Frontend Engineer`,
slack: '@mauri',
linkedin: 'https://www.linkedin.com/in/mauriciabad',
languages: 'JavaScript, TypeScript, CSS, React, Vue, Next.js, Figma, Git',
webpage: 'https://mauri.app/',
},
{
title: 'Mentor 2',
description: `I am a mentor.`,
slack: 'mentor2',
linkedin: 'mentor2',
},
{
title: 'Mentor 3',
description: `I am a mentor.`,
slack: 'mentor3',
linkedin: 'mentor3',
title: 'Andrea Querol de Porras',
description: `FPGA developer`,
slack: '@drea',
linkedin: 'https://linkedin.com/in/dreaqdp',
languages:
'C, C++, verilog and system verilog, FPGA shell development, RISC-V, Arduino, Raspberry, Linux, Vim, R, Git, MPI, OMP',
},
]
6 changes: 0 additions & 6 deletions src/data/missions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ export interface Mission {
}

export const missions: Mission[] = [
{
title: 'The Mission',
description: `The main goal of **HackUPC** is not to create a project or win a prize, but to have a great time and create lasting memories. It is for this reason that we have prepared The Mission.
To participate, you only need **the Mission card**, that can be found in your swag bag received at check-in. Complete the tasks and **win prizes** of all kinds!`,
size: 'big',
},
{
title: 'Your Mission Card',
description: `\n-(logo Talk) Learn new things going to a talk or workshop from our sponsors :speech_balloon:
Expand Down
Loading

0 comments on commit 71342f6

Please sign in to comment.