Skip to content

Commit

Permalink
Apply feedback (#541)
Browse files Browse the repository at this point in the history 
* fix map

* try to fix background

* fix home page

* fixed typo

* typos

* intensity with icons

* meals have toggle
  • Loading branch information
@carlotacb
carlotacb authored Apr 15, 2024
1 parent 0c50c09 commit 341941b
Show file tree
Hide file tree
Showing 8 changed files with 446 additions and 310 deletions.
3 changes: 1 addition & 2 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/data/travel.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 [[email protected]](mailto:[email protected]). \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 [[email protected]](mailto:[email protected]). \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!',
Expand Down
5 changes: 4 additions & 1 deletion src/main.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -92,7 +93,9 @@ library.add(
faFileInvoiceDollar,
faMoneyBillWave,
faEnvelope,
faGlobe
faGlobe,
faCircle,
faCircleDot
)

const app = createApp(App)
Expand Down
2 changes: 1 addition & 1 deletion src/router/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const routes: RouteRecordRaw[] = [
component: () => import('@/views/Hardware.vue'),
},
{
path: '/meals',
path: '/meals/:mealsId?',
name: 'meals',
component: () => import('@/views/Meals.vue'),
},
Expand Down
244 changes: 117 additions & 127 deletions src/views/Home.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,142 +184,132 @@ const hideWifiConfig = ref(config.hideWifiConfig)
number: <b>112</b>
</p>
</Panel>
<div>
<div style="width: 100%; margin-top: 3rem">
<div class="panel">
<h2 class="travel__title">How to get and leave HackUPC</h2>
</div>
<Panel title="✈️ By plane" size="small">
<h3 class="travel__subtitle text-centered">Arriving</h3>
<p>
Take the metro L9 in either <b>Aeroport T2</b> or
<b>Aeroport T1</b> towards <b>Zona Universitària</b>. Go to the last
station <b>Zona Universitària</b>. Our venue is a 10 minute walk from
there. To get to our check-in point please check out our
<RouterLink
:to="{
name: 'map',
params: { mapId: 'campus' },
}"
>map</RouterLink
>.
</p>
<p>
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
<b>Sants Estació</b> (3rd stop) and take the metro as explained below.
</p>
<h3 class="travel__subtitle text-centered">Leaving</h3>
<p>
Take the metro L9 in <b>Zona Universitària</b> towards
<b>Aeroport T1</b>. Stop at either <b> Aeroport T1</b> or
<b>Aeroport T2</b> depending on the terminal your plane is departing
from.
</p>
<div class="travel__accessible">
<p>
<span class="wheelchair-icon">
<FontAwesomeIcon
class="wheelchair-icon__icon"
icon="wheelchair"
/>
</span>
This itinerary is completely accessible.
</p>
</div>
</Panel>
<Panel title="🚂 By train" size="small">
<h3 class="travel__subtitle">Arriving</h3>
<p>
If you take the train, you will probably arrive at
<b>Sants Estació</b>. 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 <b>Zona Universitària</b> (to the right if coming from
underground). Get off at <b>Palau Reial</b>, from there you should see
some signs pointing where HackUPC is, otherwise you can check out our
<RouterLink
:to="{
name: 'map',
params: { mapId: 'campus' },
}"
>map</RouterLink
>.
</p>
<h3 class="travel__subtitle" style="margin-top: 20px">Leaving</h3>
<p>
Take the metro L3 in <b>Palau Reial</b> towards
<b>Trinitat Nova</b> and get off at <b>Sants Estació</b>. 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.
</p>
<div class="travel__accessible">
<p>
<span class="wheelchair-icon">
<FontAwesomeIcon
class="wheelchair-icon__icon"
icon="wheelchair"
/>
</span>
This itinerary is completely accessible. To enter the metro, you
will have to reach the elevator on the street at Sants Estació.
</p>
</div>
</Panel>
<Panel title="🚌 By bus" size="small">
<h3 class="travel__subtitle">Arriving</h3>
<p>
If you are coming by bus you can take one of the following lines
<b>67</b>, <b>75</b>, <b>113</b> or <b>H6</b> until
<b>Palau Reial</b> 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 <b>33</b> bus line, which will leave you right in front of the
Campus Nord, check out everything on our
<RouterLink
:to="{
name: 'map',
params: { mapId: 'campus' },
}"
>map</RouterLink
>.
</p>
<h3 class="travel__subtitle" style="margin-top: 20px">Leaving</h3>
</div>
<Panel title="✈️ By plane" size="small">
<h3 class="travel__subtitle text-centered">Arriving</h3>
<p>
Take the metro L9 in either <b>Aeroport T2</b> or
<b>Aeroport T1</b> towards <b>Zona Universitària</b>. Go to the last
station <b>Zona Universitària</b>. Our venue is a 10 minute walk from
there. To get to our check-in point please check out our
<RouterLink
:to="{
name: 'map',
params: { mapId: 'campus' },
}"
>map</RouterLink
>.
</p>
<p>
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
<b>Sants Estació</b> (3rd stop) and take the metro as explained below.
</p>
<h3 class="travel__subtitle text-centered">Leaving</h3>
<p>
Take the metro L9 in <b>Zona Universitària</b> towards
<b>Aeroport T1</b>. Stop at either <b> Aeroport T1</b> or
<b>Aeroport T2</b> depending on the terminal your plane is departing
from.
</p>
<div class="travel__accessible">
<p>
In front of the Campus Nord you have a stop for bus line <b>33</b>.
Otherwise, if you need any of the other lines <b>67</b>, <b>75</b>,
<b>113</b>, or <b>H6</b>you will have to go down to Diagonal and look
for the stop for the line you need.
<span class="wheelchair-icon">
<FontAwesomeIcon class="wheelchair-icon__icon" icon="wheelchair" />
</span>
This itinerary is completely accessible.
</p>
<div class="travel__accessible">
<p>
<span class="wheelchair-icon">
<FontAwesomeIcon
class="wheelchair-icon__icon"
icon="wheelchair"
/>
</span>
This itinerary is completely accessible.
</p>
</div>
</Panel>
<Panel title="🚗 By car" size="small">
<h3 class="travel__subtitle">Arriving</h3>
</div>
</Panel>
<Panel title="🚂 By train" size="small">
<h3 class="travel__subtitle">Arriving</h3>
<p>
If you take the train, you will probably arrive at
<b>Sants Estació</b>. 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
<b>Zona Universitària</b> (to the right if coming from underground). Get
off at <b>Palau Reial</b>, from there you should see some signs pointing
where HackUPC is, otherwise you can check out our
<RouterLink
:to="{
name: 'map',
params: { mapId: 'campus' },
}"
>map</RouterLink
>.
</p>
<h3 class="travel__subtitle" style="margin-top: 20px">Leaving</h3>
<p>
Take the metro L3 in <b>Palau Reial</b> towards <b>Trinitat Nova</b> and
get off at <b>Sants Estació</b>. 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.
</p>
<div class="travel__accessible">
<p>
If you come by car, you can find a place to park in the top of the
campus, you can check in the streets: <b>Sor Eulàlia d’Anzizu</b> or
<b>Cavallers</b>. The green parking area is free during the weekend.
<span class="wheelchair-icon">
<FontAwesomeIcon class="wheelchair-icon__icon" icon="wheelchair" />
</span>
This itinerary is completely accessible. To enter the metro, you will
have to reach the elevator on the street at Sants Estació.
</p>
<h3 class="travel__subtitle" style="margin-top: 20px">Leaving</h3>
</div>
</Panel>
<Panel title="🚌 By bus" size="small">
<h3 class="travel__subtitle">Arriving</h3>
<p>
If you are coming by bus you can take one of the following lines
<b>67</b>, <b>75</b>, <b>113</b> or <b>H6</b> until
<b>Palau Reial</b> 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 <b>33</b> bus line, which will leave you right in front of the
Campus Nord, check out everything on our
<RouterLink
:to="{
name: 'map',
params: { mapId: 'campus' },
}"
>map</RouterLink
>.
</p>
<h3 class="travel__subtitle" style="margin-top: 20px">Leaving</h3>
<p>
In front of the Campus Nord you have a stop for bus line <b>33</b>.
Otherwise, if you need any of the other lines <b>67</b>, <b>75</b>,
<b>113</b>, or <b>H6</b> you will have to go down to Diagonal and look
for the stop for the line you need.
</p>
<div class="travel__accessible">
<p>
Google Maps will know for sure your way back home. Just remember where
you parked your car.
<span class="wheelchair-icon">
<FontAwesomeIcon class="wheelchair-icon__icon" icon="wheelchair" />
</span>
This itinerary is completely accessible.
</p>
</Panel>
</div>
</div>
</Panel>
<Panel title="🚗 By car" size="small">
<h3 class="travel__subtitle">Arriving</h3>
<p>
If you come by car, you can find a place to park in the top of the
campus, you can check in the streets: <b>Sor Eulàlia d’Anzizu</b> or
<b>Cavallers</b>. The green parking area is free during the weekend.
</p>
<h3 class="travel__subtitle" style="margin-top: 20px">Leaving</h3>
<p>
Google Maps will know for sure your way back home. Just remember where
you parked your car.
</p>
</Panel>
</PanelContainer>
</template>

Expand Down
26 changes: 18 additions & 8 deletions src/views/Map.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
}
}
Expand Down
Loading

0 comments on commit 341941b

Please sign in to comment.