From ec50666534eaa3690f3deef21c048dcd4e5f0732 Mon Sep 17 00:00:00 2001 From: carlotacb Date: Sat, 13 Apr 2024 14:26:33 +0200 Subject: [PATCH 1/5] home page have everything with variables not commented code --- src/config.ts | 2 + src/main.ts | 39 +++++++------ src/views/Home.vue | 133 ++++++++++++++++++++++++++------------------- 3 files changed, 100 insertions(+), 74 deletions(-) diff --git a/src/config.ts b/src/config.ts index ebff96dc..4c3a9505 100644 --- a/src/config.ts +++ b/src/config.ts @@ -5,6 +5,7 @@ interface Config { readonly disabled: boolean readonly hideChallengesAndPrizes: boolean readonly hideMission: boolean + readonly hideWifiConfig: boolean } const config: Config = { @@ -12,6 +13,7 @@ const config: Config = { disabled: false, hideChallengesAndPrizes: true, hideMission: true, + hideWifiConfig: true, } export default config diff --git a/src/main.ts b/src/main.ts index ae50a679..0c714360 100644 --- a/src/main.ts +++ b/src/main.ts @@ -4,37 +4,38 @@ import { faFacebook, faGithub, faInstagram, + faLinkedin, faMedium, faSlack, faTwitch, faTwitter, faYoutube, - faLinkedin, } from '@fortawesome/free-brands-svg-icons' import { - faPlaneArrival, - faTrainSubway, - faWheelchair, - faCar, faBus, - faHome, faCalendarDays, - faMapLocationDot, - faUserSecret, - faUtensils, - faPlane, + faCar, + faChalkboardTeacher, faCircleQuestion, - faGavel, - faMessage, faCode, - faChalkboardTeacher, - faMicrochip, - faGift, - faHourglassStart, + faEnvelope, faFileInvoiceDollar, + faGavel, + faGift, + faHome, faHourglassHalf, - faThumbsUp, + faHourglassStart, + faMapLocationDot, + faMessage, + 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' @@ -61,6 +62,7 @@ library.add( faInstagram, faMedium, faSlack, + faLinkedin, faTwitch, faTwitter, faYoutube, @@ -87,7 +89,8 @@ library.add( faHourglassHalf, faThumbsUp, faFileInvoiceDollar, - faMoneyBillWave + faMoneyBillWave, + faEnvelope ) const app = createApp(App) diff --git a/src/views/Home.vue b/src/views/Home.vue index fd7c0223..5a0050a0 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) @@ -79,32 +75,34 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { @use '@/variables' as *; .wrapper { - display: grid; - height: 100vh; + display: flex; + flex-direction: column; box-sizing: border-box; align-items: center; justify-content: center; - padding-top: 4rem; - background: #eee; - gap: 1rem; - grid-template: 1fr auto / 1fr; - text-align: center; + gap: 3rem; + margin: 0 auto; + padding: 140px 0 0; } .explore { - &__title { - margin: 0 0 8px; - } + display: flex; + width: 95%; + gap: 0.5rem; + justify-content: flex-end; + max-width: 1300px; + margin-top: 20px; + margin-right: 20px; } .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) { From 1cc3a462b3618ee5fc8828ba56581eaac2a6f332 Mon Sep 17 00:00:00 2001 From: carlotacb Date: Sat, 13 Apr 2024 15:42:56 +0200 Subject: [PATCH 4/5] corrected maps section --- src/views/Map.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/Map.vue b/src/views/Map.vue index 8681fe59..c9e32c65 100644 --- a/src/views/Map.vue +++ b/src/views/Map.vue @@ -76,23 +76,23 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { .wrapper { display: flex; - flex-direction: column; box-sizing: border-box; + flex-direction: column; align-items: center; justify-content: center; - gap: 3rem; - margin: 0 auto; padding: 140px 0 0; + margin: 0 auto; + gap: 3rem; } .explore { display: flex; width: 95%; - gap: 0.5rem; - justify-content: flex-end; max-width: 1300px; + justify-content: flex-end; margin-top: 20px; margin-right: 20px; + gap: 0.5rem; } .button { From 9e4b66cdb8307e7967710da43d1b532a06c1709d Mon Sep 17 00:00:00 2001 From: carlotacb Date: Sat, 13 Apr 2024 15:53:29 +0200 Subject: [PATCH 5/5] proposta mentors --- src/data/mentors.ts | 10 ++--- src/main.ts | 4 +- src/views/Mentors.vue | 88 +++++++++++++++++++++++-------------------- 3 files changed, 56 insertions(+), 46 deletions(-) diff --git a/src/data/mentors.ts b/src/data/mentors.ts index afbce78c..4cb6bc40 100644 --- a/src/data/mentors.ts +++ b/src/data/mentors.ts @@ -2,15 +2,15 @@ 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: 'Maurici Abad Gutierrez', - description: `πŸ’Ό Senior Frontend Engineer`, + description: `Senior Frontend Engineer`, slack: '@mauri', linkedin: 'https://www.linkedin.com/in/mauriciabad', languages: 'JavaScript, TypeScript, CSS, React, Vue, Next.js, Figma, Git', @@ -18,10 +18,10 @@ export const mentors: Mentor[] = [ }, { title: 'Andrea Querol de Porras', - description: `πŸ’Ό FPGA developer`, + 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/main.ts b/src/main.ts index 0c714360..57b7b269 100644 --- a/src/main.ts +++ b/src/main.ts @@ -22,6 +22,7 @@ import { faFileInvoiceDollar, faGavel, faGift, + faGlobe, faHome, faHourglassHalf, faHourglassStart, @@ -90,7 +91,8 @@ library.add( faThumbsUp, faFileInvoiceDollar, faMoneyBillWave, - faEnvelope + faEnvelope, + faGlobe ) const app = createApp(App) diff --git a/src/views/Mentors.vue b/src/views/Mentors.vue index 42e8366d..a8d2da37 100644 --- a/src/views/Mentors.vue +++ b/src/views/Mentors.vue @@ -13,31 +13,25 @@ import PanelContainer from '@/components/PanelContainer.vue' Mentors are experts in various technologies and programming languages who can help you with:
    -
  • Issues with your code
    • -
  • Boosting up your project
    • -
  • Getting started with your project
    • -
  • Submitting it to Devpost
    • +
  • πŸ’£ Issues with your code
    • +
  • πŸš€ Boosting up your project
    • +
  • πŸ’» Getting started with your project
    • +
  • πŸ† Submitting it to Devpost
+ + + #help + You can always find a mentor in the Mentors lobby, located at A5105 next to the Cafeteria.

πŸ“Check where to find it in the Map!

Also you can ask for help through the help channel on Slack! - - - #help - -
@@ -54,33 +48,32 @@ import PanelContainer from '@/components/PanelContainer.vue' :key="mentor.title" :title="mentor.title" > - +

{{ mentor.slack }}

 -

{{ mentor.description }}

+

+ πŸ’ΌWorking as: + {{ mentor.description }} +

{{ mentor.languages }}

-
-

- - - -

-

- - - -

+
+ + + + + +
@@ -88,6 +81,8 @@ import PanelContainer from '@/components/PanelContainer.vue'