diff --git a/src/assets/img/maps/campus.svg b/src/assets/img/maps/campus.svg index 5f195d3b..83a83519 100644 --- a/src/assets/img/maps/campus.svg +++ b/src/assets/img/maps/campus.svg @@ -1,175 +1,175 @@ - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - - - + + + - + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + - + - + - + diff --git a/src/assets/img/maps/indoors.svg b/src/assets/img/maps/indoors.svg index 3c29373d..adfb3e2b 100644 --- a/src/assets/img/maps/indoors.svg +++ b/src/assets/img/maps/indoors.svg @@ -1,952 +1,890 @@ - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/src/assets/img/maps/judging.svg b/src/assets/img/maps/judging.svg index 975efe50..aa26a3b1 100644 --- a/src/assets/img/maps/judging.svg +++ b/src/assets/img/maps/judging.svg @@ -1,1001 +1,1111 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + - + - - + + - + - + - + + + + + + + + + - + + + + + + + + + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + + + + - + - + + + + + + + - + - + - + - - - - - - - diff --git a/src/assets/img/mentorShirt.png b/src/assets/img/mentorShirt.png new file mode 100644 index 00000000..fcbc8813 Binary files /dev/null and b/src/assets/img/mentorShirt.png differ diff --git a/src/components/IconLabel.vue b/src/components/IconLabel.vue index 51423470..ced37582 100644 --- a/src/components/IconLabel.vue +++ b/src/components/IconLabel.vue @@ -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; @@ -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; - } } } diff --git a/src/components/Panel.vue b/src/components/Panel.vue index 31c5dd18..76edf87b 100644 --- a/src/components/Panel.vue +++ b/src/components/Panel.vue @@ -72,8 +72,12 @@ defineProps() } ::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) { diff --git a/src/components/SecretContent.vue b/src/components/SecretContent.vue index 0d415557..3193787a 100644 --- a/src/components/SecretContent.vue +++ b/src/components/SecretContent.vue @@ -1,7 +1,16 @@ + +
Secret
-
Come back after the opening cerimony
+
+ {{ secretText ? secretText : 'Come back after the opening ceremony' }} +
diff --git a/src/config.ts b/src/config.ts index 9ae3513a..4111670e 100644 --- a/src/config.ts +++ b/src/config.ts @@ -7,6 +7,7 @@ interface Config { readonly hideMission: boolean readonly hideCafeteria: boolean readonly hideMeals: boolean + readonly hideWifiConfig: boolean } const config: Config = { @@ -16,6 +17,7 @@ const config: Config = { hideMission: true, hideCafeteria: false, hideMeals: false, + hideWifiConfig: true, } export default config diff --git a/src/data/challenges.ts b/src/data/challenges.ts index 779eb2b6..3b930d34 100644 --- a/src/data/challenges.ts +++ b/src/data/challenges.ts @@ -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: '', }, ] diff --git a/src/data/mentors.ts b/src/data/mentors.ts index 8b156100..4cb6bc40 100644 --- a/src/data/mentors.ts +++ b/src/data/mentors.ts @@ -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', }, ] diff --git a/src/data/missions.ts b/src/data/missions.ts index 3872f3bf..ac178154 100644 --- a/src/data/missions.ts +++ b/src/data/missions.ts @@ -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: diff --git a/src/data/talks.ts b/src/data/talks.ts index 20a81cd3..82d94fa9 100644 --- a/src/data/talks.ts +++ b/src/data/talks.ts @@ -10,118 +10,146 @@ export interface Talk { readonly start: string readonly end?: string readonly streamLink?: string + readonly isSecret?: boolean + readonly isWorkshop?: boolean } export const talks: Talk[] = [ { - title: 'Making Markets to Make a Change', - //description: '', + title: '', + description: '', location: 'A5001', - company: 'Optiver', - videoUrl: 'https://youtu.be/-8G6BDClHws', - start: '12/5/2023 22:30', - end: '12/5/2023 23:00', - //streamLink: 'https://www.twitch.tv/hackersupc', + company: 'InterSystems', + // videoUrl: '', + start: '3/5/2024 22:30', + end: '3/5/2024 23:00', + streamLink: 'https://www.twitch.tv/hackersupc', + isSecret: true, }, { - title: 'HP Inventory & Sales Forecasting', - //description: 'https://youtu.be/0PzS-Hrddf4?si=SgBcDSHGo1DfkHo1', - location: 'A5001', - company: 'HP', - videoUrl: 'https://youtu.be/0PzS-Hrddf4', - start: '12/5/2023 23:00', - end: '12/5/2023 23:30', - //streamLink: 'https://www.twitch.tv/hackersupc', - }, - { - title: 'Mission to Improve the Agribusiness Markets', - //description: '', + title: '', + description: '', location: 'A5002', - company: 'Bunge', - videoUrl: 'https://youtu.be/L2ed8pfWQpo', - start: '12/5/2023 22:30', - end: '12/5/2023 23:00', - //streamLink: 'https://www.youtube.com/c/HackersUPC', + company: 'ESA', + // videoUrl: '', + start: '3/5/2024 22:30', + end: '3/5/2024 23:00', + streamLink: 'https://www.youtube.com/c/HackersUPC', + isSecret: true, }, { - title: 'Fine-tuning Computer Vision models for edge AI applications', - //description: '', + title: '', + description: '', location: 'A5001', - company: 'Midokura', - videoUrl: 'https://youtu.be/oWR10wBTA3Y', - start: '12/5/2023 23:30', - end: '13/5/2023 00:00', - //streamLink: 'https://www.twitch.tv/hackersupc', + company: 'GitHub', + // videoUrl: '', + start: '3/5/2024 23:00', + end: '3/5/2024 23:30', + streamLink: 'https://www.twitch.tv/hackersupc', + isWorkshop: true, + isSecret: true, }, { - title: 'Build the bank experience you need.', + title: '', //description: '', location: 'A5002', - company: 'Strands', - videoUrl: 'https://youtu.be/emrshDwqDbM', - start: '12/5/2023 23:00', - end: '12/5/2023 23:15', - //streamLink: 'https://www.youtube.com/c/HackersUPC', + company: 'Grafana', + // videoUrl: '', + start: '3/5/2024 22:30', + end: '3/5/2024 23:00', + streamLink: 'https://www.youtube.com/c/HackersUPC', + isSecret: true, }, { - title: 'Deep Learning: breaking the ice', + title: '', + description: '', + location: 'A5001', + company: 'BlueTab', + // videoUrl: '', + start: '3/5/2024 23:30', + end: '4/5/2024 00:00', + streamLink: 'https://www.twitch.tv/hackersupc', + isWorkshop: true, + isSecret: true, + }, + { + title: '', //description: '', location: 'A5002', - company: 'Restb.ai', - videoUrl: 'https://youtu.be/yQOf4gBzcAA', - start: '13/5/2023 00:00', - end: '13/5/2023 00:30', - //streamLink: 'https://www.youtube.com/c/HackersUPC', + company: 'TravelPerk', + // videoUrl: '', + start: '3/5/2024 23:30', + end: '4/5/2024 00:00', + streamLink: 'https://www.youtube.com/c/HackersUPC', + isSecret: true, }, { - title: 'How does technology impact trading?', - //description: '', + title: '', + description: '', location: 'A5001', - company: 'Optiver', - videoUrl: 'https://youtu.be/DOR0LPysiXg', - start: '13/5/2023 10:00', - end: '13/5/2023 11:00', - //streamLink: 'https://www.twitch.tv/hackersupc', + company: 'Seidor', + // videoUrl: '', + start: '4/5/2024 00:00', + end: '4/5/2024 00:30', + streamLink: 'https://www.twitch.tv/hackersupc', + isSecret: true, }, { - title: 'Digital revolution in Agribusiness', + title: '', //description: '', location: 'A5002', - company: 'Bunge', - videoUrl: 'https://youtu.be/3WjGcy2Drmo', - start: '12/5/2023 10:30', - end: '12/5/2023 11:00', - //streamLink: 'https://www.youtube.com/c/HackersUPC', + company: 'InditexTech', + // videoUrl: '', + start: '4/5/2024 00:00', + end: '4/5/2024 00:30', + isSecret: true, }, { - title: 'The Quanting Framework', - //description: '', + title: '', + description: '', + location: 'A5001', + company: 'Flanks', + // videoUrl: '', + start: '4/5/2024 10:00', + end: '4/5/2024 10:30', + streamLink: 'https://www.twitch.tv/hackersupc', + isWorkshop: true, + isSecret: true, + }, + { + title: '', + description: '', location: 'A5001', company: 'Vueling', - videoUrl: 'https://youtu.be/u9YVD7m6pVs', - start: '12/5/2023 11:00', - end: '12/5/2023 11:30', - //streamLink: 'https://www.twitch.tv/hackersupc', + // videoUrl: '', + start: '4/5/2024 10:30', + end: '4/5/2024 11:00', + streamLink: 'https://www.twitch.tv/hackersupc', + isWorkshop: true, + isSecret: true, }, { - title: 'Build and AI powered APP', - //description: '', - location: 'A5002', - company: 'IThinkUPC', - videoUrl: 'https://youtu.be/KN9U6aQ9FoM', - start: '12/5/2023 11:00', - end: '12/5/2023 11:30', - //streamLink: 'https://www.youtube.com/c/HackersUPC', + title: '', + description: '', + location: 'A5001', + company: 'Midu.dev', + // videoUrl: '', + start: '4/5/2024 11:00', + end: '4/5/2024 11:30', + streamLink: 'https://www.twitch.tv/hackersupc', + isWorkshop: true, + isSecret: true, }, { - title: - 'Artificial Intelligence Project Portfolio at HP Large Format Printing', - //description: '', - location: 'A5002', - company: 'HP', - videoUrl: 'https://youtu.be/QJuqyNemkKU', - start: '13/5/2023 10:00', - end: '13/5/2023 10:30', - //streamLink: 'https://www.youtube.com/c/HackersUPC', + title: '', + description: '', + location: 'A5001', + company: 'InterSystems', + // videoUrl: '', + start: '4/5/2024 11:30', + end: '4/5/2024 12:00', + streamLink: 'https://www.twitch.tv/hackersupc', + isWorkshop: true, + isSecret: true, }, ] diff --git a/src/data/travel.ts b/src/data/travel.ts index 2d3af3a9..c360746e 100644 --- a/src/data/travel.ts +++ b/src/data/travel.ts @@ -1,19 +1,46 @@ export interface Travel { readonly title: string + readonly tag: string readonly description: string + readonly emoji: string + // readonly image: string } export const travels: Travel[] = [ { - title: 'DISCOVER BCN', - description: `We will provide you with a flight to start your journey.`, + title: 'Get accepted into HackUPC', + tag: 'Invited to HackUPC', + emoji: 'gift', + description: `Congratulations! You are accepted to HackUPC, once you confirm your attendance you will be able to **check if you need travel reimbursement**. Take into account that we provide: \n - **Up to** 50€ for people coming from Spain (outside Catalunya) \n - **Up to** 120€ for people coming from Europe \n - **Up to** 200€ for people coming from outside Europe.`, }, { - title: 'Hotel', - description: `We will provide you with a hotel to keep you going through the day.`, + title: 'Confirm your attendance', + tag: 'Pending review', + emoji: 'hourglass-start', + description: `Now in your [MyHackUPC dashboard](https://my.hackupc.com/reimbursement/dash_board/) it appears a new tab called **Travel**, you can see that you are **Pending review**. \n\n We are reviewing all your demands to be able to give something to everyone, to help you to come to HackUPC. \n\n We will let you know if your demand is accepted or not. \n\n **Please, be patient!**`, }, { - title: 'Car', - description: `We will provide you with a car to keep you going through the night.`, + title: 'Submit your travel details', + tag: 'Pending receipt submission', + emoji: 'file-invoice-dollar', + description: `You've been granted with a **up to** amount!! Now it's time to submit your receipts to demonstrate your expenses at [MyHackUPC dashboard](https://my.hackupc.com/reimbursement/dash_board/). Remember that there are some rules: \n - Your full name should appear in your ticket \n - The total details of the price should appear, also with the total price \n - There should be a 2 way tickets, the way to barcelona and the way back home \n - The tickets should be between the April 26th and the May 10th \n - Only flight, bus or train tickets are allowed \n \n Remember to add your paypal account so we can be able to send you the money!`, + }, + { + title: 'Waiting for approval', + tag: 'Pending receipt approval', + emoji: 'hourglass-half', + description: `We have your ticket! We will review that it's following all the rules and we let you know, depending on the demand and our budget, taking in account the ticket price. How much we can give you. \n\n If your ticket it's not approved, you will receive a email with the reason. If you have any problem don't hesitate to contact us sending a email to [reimbursements@hackupc.com](mailto:reimbursements@hackupc.com). \n\n **Please, be patient!**`, + }, + { + title: 'Your travel has been approved', + tag: 'Receipt approved', + emoji: 'thumbs-up', + description: `Now it's your turn!! We have approved your ticket so your travel reimbursement will be granted, if you follow the last steps: \n - Demo a valid your project in our HackUPC judges. \n - Add your devpost link at [MyHackUPC dashboard](https://my.hackupc.com/reimbursement/dash_board/) \n\n Take in account the project should follow our rules, check them out in the [rules and judging section](/rules)`, + }, + { + title: 'You have completed all the steps!', + tag: 'Travel granted', + emoji: 'money-bill-wave', + description: `We know that was a lot of steps and rules! But you've completed all of them!! **Congratulations!!** \n\n We will send you the money to your paypal account in the next 60 days after the event. \n\n If you have any problem don't hesitate to contact us sending a email to [reimbursements@hackupc.com](mailto:reimbursements@hackupc.com) \n\n **Thank you for coming to HackUPC!**`, }, ] diff --git a/src/main.ts b/src/main.ts index b3b7647c..57b7b269 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,6 +4,7 @@ import { faFacebook, faGithub, faInstagram, + faLinkedin, faMedium, faSlack, faTwitch, @@ -11,23 +12,31 @@ import { faYoutube, } from '@fortawesome/free-brands-svg-icons' import { - faPlaneArrival, - faTrainSubway, - faWheelchair, - faCar, faBus, - faHome, faCalendarDays, - faMapLocationDot, - faUserSecret, - faUtensils, - faPlane, + faCar, + faChalkboardTeacher, faCircleQuestion, + faCode, + faEnvelope, + faFileInvoiceDollar, faGavel, + faGift, + faGlobe, + faHome, + faHourglassHalf, + faHourglassStart, + faMapLocationDot, faMessage, - faCode, - faChalkboardTeacher, faMicrochip, + faMoneyBillWave, + faPlane, + faPlaneArrival, + faThumbsUp, + faTrainSubway, + faUserSecret, + faUtensils, + faWheelchair, } from '@fortawesome/free-solid-svg-icons' import { createPinia } from 'pinia' import { registerSW } from 'virtual:pwa-register' @@ -54,6 +63,7 @@ library.add( faInstagram, faMedium, faSlack, + faLinkedin, faTwitch, faTwitter, faYoutube, @@ -73,7 +83,16 @@ library.add( faMessage, faCode, faChalkboardTeacher, - faMicrochip + faMicrochip, + faGift, + faLinkedin, + faHourglassStart, + faHourglassHalf, + faThumbsUp, + faFileInvoiceDollar, + faMoneyBillWave, + faEnvelope, + faGlobe ) const app = createApp(App) diff --git a/src/variables.scss b/src/variables.scss index 500253a6..37964050 100644 --- a/src/variables.scss +++ b/src/variables.scss @@ -16,7 +16,7 @@ $secondary-light-color-intensity: 100; $secondary-light-color: color.adjust($secondary-color, $red: $secondary-light-color-intensity, $green: $secondary-light-color-intensity, $blue: $secondary-light-color-intensity); $secondary-text-color: #dadada; $tertiary-light-color: #88A7B7; -$highlight-color: $secondary-color; +$highlight-color: #E3C3FF; $header-mobile-bg-color: rgb(40 40 40 / 90%); $header-desktop-bg-color: rgb(40 40 40 / 50%); diff --git a/src/views/Home.vue b/src/views/Home.vue index b149e3f2..8c794e6f 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -4,49 +4,58 @@ import Panel from '@/components/Panel.vue' import { formatDate } from '@/services/dates' import { useScheduleStore } from '@/stores/schedule' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' -import { MailIcon } from '@heroicons/vue/solid' -import { computed } from 'vue' +import { computed, ref } from 'vue' import { RouterLink } from 'vue-router' import PanelContainer from '../components/PanelContainer.vue' +import { DevpostIcon } from '@/components/icons' +import config from '@/config' +import SecretContent from '@/components/SecretContent.vue' const scheduleStore = useScheduleStore() const submitDeadline = computed(() => formatDate('weekday-time', scheduleStore.schedule.submitDeadline) ) + +const hideWifiConfig = ref(config.hideWifiConfig) @@ -346,18 +346,33 @@ const submitDeadline = computed(() => &:not(:first-child) { margin-left: 4px; } + + &:hover { + background-color: $links-color !important; + } + + &:active { + background-color: $links-color-hover !important; + } } } +.block { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; +} + .wifi { display: flex; align-items: center; justify-content: center; - margin-bottom: 1rem; - gap: 1rem; + margin-bottom: 2.5rem; + gap: 1.5rem; &__title { - margin: 0 0 0.5rem !important; + margin: 0 0 2rem !important; line-height: 1; text-align: center; } @@ -382,18 +397,24 @@ const submitDeadline = computed(() => &__inner { display: inline-block; - line-height: 2; + line-height: 2.5; text-align: left; code { + margin-left: 0.5rem; + background-color: $primary-color-light; color: $text-color-dark; } } } .icon-label-link { - color: $text-color-dark !important; + color: $primary-color !important; text-decoration: none !important; + + &:hover { + color: $links-color-hover !important; + } } .wheelchair-icon { @@ -407,10 +428,30 @@ const submitDeadline = computed(() => } } +.panel { + position: relative; + overflow: hidden; + flex: 1 1 350px; + margin: 16px; + background-color: $contrast-color; + border-radius: $border-radius; + box-shadow: 0 4px 8px 0 rgb(0 0 0 / 20%), 0 6px 20px 0 rgb(0 0 0 / 19%); + color: $text-color; + text-align: left; +} + .travel { &__title { - margin-top: 0; - margin-bottom: 15px; + position: relative; + overflow: hidden; + flex: 1 1 1300px; + padding: 12px 24px; + margin: 0; + background-color: $primary-color; + border-radius: $border-radius; + color: #fff; + font-size: 20px; + line-height: 1.6; text-align: center; } diff --git a/src/views/Map.vue b/src/views/Map.vue index df437188..c9e32c65 100644 --- a/src/views/Map.vue +++ b/src/views/Map.vue @@ -19,6 +19,35 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { @@ -79,32 +75,34 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { @use '@/variables' as *; .wrapper { - display: grid; - height: 100vh; + display: flex; box-sizing: border-box; + flex-direction: column; align-items: center; justify-content: center; - padding-top: 4rem; - background: #eee; - gap: 1rem; - grid-template: 1fr auto / 1fr; - text-align: center; + padding: 140px 0 0; + margin: 0 auto; + gap: 3rem; } .explore { - &__title { - margin: 0 0 8px; - } + display: flex; + width: 95%; + max-width: 1300px; + justify-content: flex-end; + margin-top: 20px; + margin-right: 20px; + gap: 0.5rem; } .button { display: inline-block; padding: 8px 24px; margin: 0 0.2em 16px; - background: $primary-color; + background: $links-color; border-radius: 3px; box-shadow: 0 2px 10px rgb(0 0 0 / 20%); - color: $contrast-color; + color: #000; cursor: url('../assets/img/rocket-fire.png'), auto; font-weight: bold; @@ -113,14 +111,17 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { opacity: 0.4; pointer-events: none; } + + &:hover { + background: $links-color-hover; + color: #fff; + } } .map { overflow: auto; - max-height: 700px; align-items: center; justify-content: center; - padding: 0 1rem; text-align: center; @media screen and (max-width: 900px) { @@ -129,8 +130,7 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { &__img { display: block; - width: 100%; - max-width: 1200px; + width: 98%; margin: 0 auto; @media screen and (max-width: 900px) { diff --git a/src/views/Mentors.vue b/src/views/Mentors.vue index f4283136..a8d2da37 100644 --- a/src/views/Mentors.vue +++ b/src/views/Mentors.vue @@ -1,16 +1,125 @@ + + diff --git a/src/views/Mission.vue b/src/views/Mission.vue index b1ca630b..41b671a5 100644 --- a/src/views/Mission.vue +++ b/src/views/Mission.vue @@ -12,6 +12,13 @@ const hideMission = ref(config.hideMission)