Verified Commit dc70b703 authored by Jonatan Zint's avatar Jonatan Zint
Browse files

Some fixes, disabling map, fixing scrolling and PWA orientation

parent bda1cfea
Pipeline #1256 passed with stages
in 43 seconds
......@@ -101,7 +101,7 @@ module.exports = function(ctx) {
short_name: 'Worldcongress 2019',
description: 'The Hedonist Worldcongress 2019 companion app',
display: "standalone",
orientation: "portrait",
orientation: "landscape-primary",
background_color: "#ffffff",
theme_color: "#027be3",
icons: [
......
<template lang="pug">
q-tabs(class="bg-primary text-white")
q-route-tab(icon='alarm', to='/timetable', exact='', replace='') Timetable
q-route-tab(icon='lens', to='/space/Chaoswiese', exact='', replace='') Spaces
q-route-tab(icon='lens', :to='"/space/" + defaultRoom', exact='', replace='') Spaces
q-route-tab(icon='search', to='/search', exact='', replace='') Search
q-route-tab(icon='info', to='/info', exact='', replace='') Info
q-route-tab(icon='map', to='/map', exact='', replace='') Map
//q-route-tab(icon='map', to='/map', exact='', replace='') Map
</template>
<script>
export default {
props: ["defaultRoom"],
name: "Navigation"
};
</script>
......@@ -69,7 +69,7 @@
<script>
import moment from "moment";
import { viewEventHub } from "../common/event-hubs";
import { TIMESLOT_WIDTH, TIMESLOT_DURATION, LIST_ROOMS } from '../store/types';
import { TIMESLOT_WIDTH, TIMESLOT_DURATION, LIST_ROOMS } from "../store/types";
export default {
props: ["start", "end", "height"],
......
#q-app
height 100vh
overflow hidden
\ No newline at end of file
overflow hidden
.kyrene-loader
align-self center
margin-top 5vh
\ No newline at end of file
......@@ -18,6 +18,7 @@
.event-detail
padding: 1%
width: 100%
overflow auto
.details
display: flex
width: 100%
......
<template lang="pug">
.layout
header.header
Navigation
Navigation(defaultRoom="Kino")
main
keep-alive(include="search")
router-view
......@@ -16,6 +16,7 @@ main
flex 1
display flex
flex-direction column
overflow hidden
</style>
<script>
......
<template lang="pug">
.info-content
span german below
h2 Instruction leaflet
p With the following manual, we want to inform you about a few important details:
ul
......@@ -20,7 +19,7 @@
| and provides a safer space where you can find help and support. The Auszeit is the location where you can find psycare and medic aid. Additionally, the Sternchenteam is mobile and can be called by radio.
h2 Kitchen
p The congress kitchen this year is again available centrally at the village square, according to the tried and tested concept of the last years. FoodforAction Berlin, FoodConnection Greifswald, Black Wok Dresden and some more cook together for the congress to strengthen the resistance against the G20 in Hamburg. All donation surpluses flow into the support of camp and kitchen structures. The congress kitchen is a participatory project and invites to collective dishwashing and snipping.
p The congress kitchen this year is again available centrally at the village square, according to the tried and tested concept of the last years. FoodforAction Berlin, FoodConnection Greifswald, Black Wok Dresden and some more cook together for the congress to strengthen the resistance against the G20 in Hamburg. All donation surpluses flow into the support of camp and kitchen structures. The congress kitchen is a participatory project and invites to collective dishwashing and snipping.
h2 Beipackzettel
p Ein paar wichtige Hinweise:
......@@ -39,12 +38,14 @@
strong „Auszeit“.
| &nbsp;Die Auszeit ist rund um die Uhr besetzt und bietet einen Safer Space, an den ihr jederzeit kommen könnt und an dem ihr Ansprechpartner:innen und Unterstützung findet. In der Auszeit befinden sich der Psycarestand und das Mediteam. Das Sternchenteam ist mobil und per Funk erreichbar.“
h2 Kongress-Küche
p Die Kongressküche gibt es dieses Jahr wieder nach bewährtem Konzept zentral am Dorfplatz. FoodforAction Berlin, FoodConnection Greifswald, Black Wok Dresden und einige mehr kochen gemeinsam für den Kongress, um den Widerstand gegen den G20 in Hamburg zu stärken. Alle Spendenüberschüsse fließen in den Support von dortigen Camp- und Küchenstrukturen. Die Kongressküche versteht sich als Mitmachprojekt und lädt zu kollektiven Spül- und Schnippelorgien ein.
p Die Kongressküche gibt es dieses Jahr wieder nach bewährtem Konzept zentral am Dorfplatz. FoodforAction Berlin, FoodConnection Greifswald, Black Wok Dresden und einige mehr kochen gemeinsam für den Kongress, um den Widerstand gegen den G20 in Hamburg zu stärken. Alle Spendenüberschüsse fließen in den Support von dortigen Camp- und Küchenstrukturen. Die Kongressküche versteht sich als Mitmachprojekt und lädt zu kollektiven Spül- und Schnippelorgien ein.
</template>
<style lang="stylus" scoped>
.info-content
padding: 1%
overflow auto
</style>
<script>
......
......@@ -2,7 +2,7 @@
.space
q-timeline(color="secondary")
q-timeline-entry(heading="") {{ roomName }}
q-timeline-entry(v-for="day in GET_DAYS_FOR_ROOM(roomName)", :title="dateToWeekday(day.date)", :name="dateToWeekday(day.date)")
q-timeline-entry(v-for="day in GET_DAYS_FOR_ROOM(roomName)", :key="day.date", :title="dateToWeekday(day.date)", :name="dateToWeekday(day.date)")
.timeline-item(v-for="event in day.events")
.timeline-badge
img(:src="frabLink(event.logo)", v-if="event.logo")
......
<template lang="pug">
.spaces
q-spinner-cube(v-if="!READY")
q-spinner-cube.kyrene-loader(v-if="!READY", color="secondary" size="6em")
template(v-if="READY")
q-tabs(ref="tabs")
q-route-tab(v-for="(events, room) in LIST_ROOMS", :key="room", :to="{ name: 'space', params: { room: room }}", exact) {{ room }}
......
......@@ -2,7 +2,7 @@
.speaker
h4.headline Speaker: {{ speaker.full_public_name }}
.image
img(:src="frabLink(speaker.image)", v-if="speaker.image")
img.responsive(:src="frabLink(speaker.image)", v-if="speaker.image")
.details
p {{ speaker.abstract }}
.events(v-if="speaker.events.length > 0")
......@@ -16,7 +16,9 @@
.speaker
width: 100%
padding: 1%
overflow auto
img.responsive
max-width 100%
.speaker-event
margin: 5px 0 0
</style>
......@@ -24,14 +26,13 @@
<script>
import moment from "moment";
import urljoin from "urljoin";
import { GET_SPEAKER } from "../store/types";
export default {
name: "SpeakerDetailPage",
computed: {
speaker() {
return this.$store.getters.getSpeakerById(
parseInt(this.$route.params.id)
);
return this.$store.getters[GET_SPEAKER](parseInt(this.$route.params.id));
}
},
methods: {
......
<template lang="pug">
.timetable-wrapper
q-spinner-cube(v-if="!READY")
q-spinner-cube.kyrene-loader(v-if="!READY", color="primary" size="6em")
.timetable(v-if="READY")
q-tabs(ref="tabs", class="bg-secondary text-white", dense="", v-model="activeTab")
q-tab.items-center.justify-center(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment