Skip to content

Commit

Permalink
Merge pull request #83 from Saamiyah/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
MrSunshyne authored Mar 6, 2020
2 parents 658b579 + cc7b355 commit 5ea7457
Show file tree
Hide file tree
Showing 7 changed files with 108 additions and 3 deletions.
Binary file added public/images/magnifier.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/images/map.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions src/components/footer-section.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
<li>
<router-link :to="{ name: 'PageCoc' }">Code of Conduct</router-link>
</li>
<li>
<router-link :to="{ name: 'PageVenue' }">Venue</router-link>
</li>
<li>
<router-link :to="{ name: 'PageExtras' }">Extras</router-link>
</li>
Expand Down Expand Up @@ -203,6 +206,11 @@
<router-link :to="{ name: 'PageCoc' }"
>Code of Conduct</router-link
>
</li>
<li>
<router-link :to="{ name: 'PageVenue' }"
>Venue</router-link
>
</li>
<li>
<router-link :to="{ name: 'PageExtras' }">Extras</router-link>
Expand Down
3 changes: 1 addition & 2 deletions src/components/past-events.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,4 @@
</div>
</div>
</section>
</template>

</template>
29 changes: 29 additions & 0 deletions src/components/venue.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<template>
<div>
<h2 class="section-title">Caudan Arts Centre</h2>
<img class="loupe" src="/images/magnifier.png">
<iframe class="map" src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2648.3447571157803!2d57.49989812791013!3d-20.162186187103163!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x217c5052b5d06023%3A0xf08c924a455acbaa!2sCaudan%20Arts%20Centre!5e0!3m2!1sen!2smu!4v1582306498836!5m2!1sen!2smu" frameborder="0" allowfullscreen="">
</iframe>

<div class="mx-auto w-1/2 h-screen flex flex-col align-center justify-center text-center">

<h2 class="section-title">How to get to Caudan Arts Centre</h2>

<img class="mapIcon" src="/images/map.svg">
<span class="tagline"> Caudan Waterfront, Port Louis 11307 </span>

</div>

<div class="mx-auto w-1/2 h-screen flex flex-col align-center justify-center text-center">
<h2 class="section-title">Site Plans</h2>
<span class="tagline"> Parking House </span>
<span class="tagline"> Indoor Site </span>
</div>


</div>

</template>



11 changes: 10 additions & 1 deletion src/router/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Vue from 'vue';
import VueRouter from 'vue-router';

import PageHome from '../views/PageHome.vue';
import PageCoc from '../views/PageCoc.vue';
import PageCredits from '../views/PageCredits.vue';
Expand All @@ -12,6 +11,8 @@ import PageSessions from '../views/PageSessions.vue';
import PageSessionSingle from '../views/PageSessionSingle.vue';
import PageSpeakers from '../views/PageSpeakers.vue';
import PageSpeakerSingle from '../views/PageSpeakerSingle.vue';
import PageVenue from '../views/PageVenue.vue';


Vue.use(VueRouter);

Expand All @@ -32,6 +33,14 @@ const routes = [
title: 'Code Of Conduct'
}
},
{
path: "/venue",
name: "PageVenue",
component: PageVenue,
meta: {
title: "Venue"
}
},
{
path: '/credits',
name: 'PageCredits',
Expand Down
54 changes: 54 additions & 0 deletions src/views/PageVenue.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<template>
<div class="page-venue">
<venue></venue>
</div>
</template>

<script>
import venue from "@/components/venue.vue";
export default {
name: "PageVenue",
components: {
venue
}
};
</script>

<style lang="scss">
.page-venue {
}
.loupe {
height: auto;
width: auto;
max-width: 500px;
max-height: 500px;
position: absolute;
left: 50%;
margin-left: -150px;
margin-top: 50px;
}
.map {
position:relative;
border-radius:50%;
width: 280px;
height: 280px;
top: 62px;
left: 50%;
margin-left: -139px;
}
.mapIcon {
width: 40px;
height: 40px;
margin-top: 30px;
margin-right: 160px;
right: 50%;
position: absolute;
}
</style>

0 comments on commit 5ea7457

Please sign in to comment.