From 341941bfb0d6099bbcef43a3f6c0ee03db875b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlota=20Catot=20Brag=C3=B3s?= Date: Mon, 15 Apr 2024 20:57:20 +0200 Subject: [PATCH] Apply feedback (#541) * fix map * try to fix background * fix home page * fixed typo * typos * intensity with icons * meals have toggle --- src/App.vue | 3 +- src/data/travel.ts | 6 +- src/main.ts | 5 +- src/router/index.ts | 2 +- src/views/Home.vue | 244 +++++++++++----------- src/views/Map.vue | 26 ++- src/views/Meals.vue | 468 ++++++++++++++++++++++++++++--------------- src/views/Travel.vue | 2 +- 8 files changed, 446 insertions(+), 310 deletions(-) diff --git a/src/App.vue b/src/App.vue index 04c0a55f..bf12186c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -57,8 +57,7 @@ body { background-attachment: fixed; background-color: $bg-color; background-image: url('@/assets/img/stars.jpeg'); - background-position: center / 640px; - background-repeat: no-repeat; + background-repeat: repeat; cursor: url('assets/img/rocket.png'), auto; font-family: Montserrat, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Open Sans', 'Helvetica Neue', sans-serif; diff --git a/src/data/travel.ts b/src/data/travel.ts index c360746e..86fb5233 100644 --- a/src/data/travel.ts +++ b/src/data/travel.ts @@ -23,19 +23,19 @@ export const travels: Travel[] = [ 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!`, + description: `You've been granted **up to** a certain 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 April 26th and 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!**`, + description: `We have your ticket! We will review that it's following all the rules and we'll 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)`, + 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 project to 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!', diff --git a/src/main.ts b/src/main.ts index 57b7b269..be21799f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -44,6 +44,7 @@ import { createApp } from 'vue' import App from './App.vue' import router from './router' import Antd from 'ant-design-vue' +import { faCircle, faCircleDot } from '@fortawesome/free-regular-svg-icons' registerSW({ immediate: true, @@ -92,7 +93,9 @@ library.add( faFileInvoiceDollar, faMoneyBillWave, faEnvelope, - faGlobe + faGlobe, + faCircle, + faCircleDot ) const app = createApp(App) diff --git a/src/router/index.ts b/src/router/index.ts index 5277d7cc..2c28c551 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -62,7 +62,7 @@ const routes: RouteRecordRaw[] = [ component: () => import('@/views/Hardware.vue'), }, { - path: '/meals', + path: '/meals/:mealsId?', name: 'meals', component: () => import('@/views/Meals.vue'), }, diff --git a/src/views/Home.vue b/src/views/Home.vue index 8c794e6f..fdc94a33 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -184,142 +184,132 @@ const hideWifiConfig = ref(config.hideWifiConfig) number: 112

-
+

How to get and leave HackUPC

- -

Arriving

-

- Take the metro L9 in either Aeroport T2 or - Aeroport T1 towards Zona Universitària. Go to the last - station Zona Universitària. Our venue is a 10 minute walk from - there. To get to our check-in point please check out our - map. -

-

- Don't get a T-Casual ticket if you are in the airport, you won't be - able to use it from there. Buy a single trip ticket from the airport - instead. If you really want to use a T-Casual, then you can take the - train (R2 to Sant Celoni or Maçanet-Massanes) from Terminal 2B (a free - shuttle bus from Terminal 1 to Terminal 2B departs every 5 minutes), - but the train only runs every 30 minutes. You will have to get down at - Sants Estació (3rd stop) and take the metro as explained below. -

-

Leaving

-

- Take the metro L9 in Zona Universitària towards - Aeroport T1. Stop at either Aeroport T1 or - Aeroport T2 depending on the terminal your plane is departing - from. -

-
-

- - - - This itinerary is completely accessible. -

-
- - -

Arriving

-

- If you take the train, you will probably arrive at - Sants Estació. From there you need to take the metro L3, it is - located on the north side of the station, follow the signs for the - green line (L3), not the blue one (L5). When you reach the station, go - towards Zona Universitària (to the right if coming from - underground). Get off at Palau Reial, from there you should see - some signs pointing where HackUPC is, otherwise you can check out our - map. -

-

Leaving

-

- Take the metro L3 in Palau Reial towards - Trinitat Nova and get off at Sants Estació. When - exiting, the easiest way is to turn left and follow the signs towards - the railway station, you can follow the plane sign or the letter R - with the orange background. -

-
-

- - - - This itinerary is completely accessible. To enter the metro, you - will have to reach the elevator on the street at Sants Estació. -

-
- - -

Arriving

-

- If you are coming by bus you can take one of the following lines - 67, 75, 113 or H6 until - Palau Reial stop, from there you need to walk up to Campus Nord - - UPC, placed on the top of Facultad d'economia de la UB. You can also - use the 33 bus line, which will leave you right in front of the - Campus Nord, check out everything on our - map. -

-

Leaving

+
+ +

Arriving

+

+ Take the metro L9 in either Aeroport T2 or + Aeroport T1 towards Zona Universitària. Go to the last + station Zona Universitària. Our venue is a 10 minute walk from + there. To get to our check-in point please check out our + map. +

+

+ Don't get a T-Casual ticket if you are in the airport, you won't be able + to use it from there. Buy a single trip ticket from the airport instead. + If you really want to use a T-Casual, then you can take the train (R2 to + Sant Celoni or Maçanet-Massanes) from Terminal 2B (a free shuttle bus + from Terminal 1 to Terminal 2B departs every 5 minutes), but the train + only runs every 30 minutes. You will have to get down at + Sants Estació (3rd stop) and take the metro as explained below. +

+

Leaving

+

+ Take the metro L9 in Zona Universitària towards + Aeroport T1. Stop at either Aeroport T1 or + Aeroport T2 depending on the terminal your plane is departing + from. +

+

- In front of the Campus Nord you have a stop for bus line 33. - Otherwise, if you need any of the other lines 67, 75, - 113, or H6you will have to go down to Diagonal and look - for the stop for the line you need. + + + + This itinerary is completely accessible.

-
-

- - - - This itinerary is completely accessible. -

-
- - -

Arriving

+
+ + +

Arriving

+

+ If you take the train, you will probably arrive at + Sants Estació. From there you need to take the metro L3, it is + located on the north side of the station, follow the signs for the green + line (L3), not the blue one (L5). When you reach the station, go towards + Zona Universitària (to the right if coming from underground). Get + off at Palau Reial, from there you should see some signs pointing + where HackUPC is, otherwise you can check out our + map. +

+

Leaving

+

+ Take the metro L3 in Palau Reial towards Trinitat Nova and + get off at Sants Estació. When exiting, the easiest way is to + turn left and follow the signs towards the railway station, you can + follow the plane sign or the letter R with the orange background. +

+

- If you come by car, you can find a place to park in the top of the - campus, you can check in the streets: Sor Eulàlia d’Anzizu or - Cavallers. The green parking area is free during the weekend. + + + + This itinerary is completely accessible. To enter the metro, you will + have to reach the elevator on the street at Sants Estació.

-

Leaving

+
+ + +

Arriving

+

+ If you are coming by bus you can take one of the following lines + 67, 75, 113 or H6 until + Palau Reial stop, from there you need to walk up to Campus Nord - + UPC, placed on the top of Facultad d'economia de la UB. You can also use + the 33 bus line, which will leave you right in front of the + Campus Nord, check out everything on our + map. +

+

Leaving

+

+ In front of the Campus Nord you have a stop for bus line 33. + Otherwise, if you need any of the other lines 67, 75, + 113, or H6 you will have to go down to Diagonal and look + for the stop for the line you need. +

+

- Google Maps will know for sure your way back home. Just remember where - you parked your car. + + + + This itinerary is completely accessible.

- -
+
+ + +

Arriving

+

+ If you come by car, you can find a place to park in the top of the + campus, you can check in the streets: Sor Eulàlia d’Anzizu or + Cavallers. The green parking area is free during the weekend. +

+

Leaving

+

+ Google Maps will know for sure your way back home. Just remember where + you parked your car. +

+ diff --git a/src/views/Map.vue b/src/views/Map.vue index c9e32c65..d39e5d42 100644 --- a/src/views/Map.vue +++ b/src/views/Map.vue @@ -75,24 +75,32 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { @use '@/variables' as *; .wrapper { - display: flex; + display: grid; box-sizing: border-box; - flex-direction: column; align-items: center; justify-content: center; - padding: 140px 0 0; + padding: 100px 0 0; margin: 0 auto; - gap: 3rem; + gap: 1rem; + grid-template: 1fr auto / 1fr; + text-align: center; + + @media screen and (max-width: 900px) { + height: 100vh; + } } .explore { display: flex; - width: 95%; - max-width: 1300px; justify-content: flex-end; margin-top: 20px; - margin-right: 20px; + margin-right: 50px; gap: 0.5rem; + + @media screen and (max-width: 900px) { + display: block; + margin: 0; + } } .button { @@ -130,13 +138,15 @@ const currentMap = computed<'indoors' | 'campus' | 'judging'>(() => { &__img { display: block; - width: 98%; + width: 95%; margin: 0 auto; @media screen and (max-width: 900px) { width: unset; max-width: unset; height: 100%; + margin-right: 12px; + margin-left: 12px; } } } diff --git a/src/views/Meals.vue b/src/views/Meals.vue index 2aed9dd5..c87649d6 100644 --- a/src/views/Meals.vue +++ b/src/views/Meals.vue @@ -2,195 +2,297 @@ import PanelContainer from '../components/PanelContainer.vue' import Panel from '@/components/Panel.vue' import { meals } from '@/data/meals' -import { RouterLink } from 'vue-router' -import { ref } from 'vue' +import { RouterLink, useRoute } from 'vue-router' +import { computed, ref } from 'vue' import config from '@/config' import SecretContent from '@/components/SecretContent.vue' +import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' const hideMeals = ref(config.hideMeals) const hideCafeteriaSchedule = ref(config.hideCafeteriaSchedule) + +const route = useRoute() + +const currentView = computed<'cafeteria' | 'regular'>(() => { + if ( + route.params?.mealsId !== 'cafeteria' && + route.params?.mealsId !== 'regular' + ) { + return 'regular' + } + + return route.params.mealsId +})