Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Jonatan Zint
kyrene
Commits
4e9404f4
Commit
4e9404f4
authored
May 22, 2022
by
Jonatan Zint
Browse files
fix some console errors and colors
parent
8a1cb55d
Pipeline
#11070
passed with stages
in 55 seconds
Changes
7
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
quasar.conf.js
View file @
4e9404f4
...
...
@@ -72,8 +72,9 @@ module.exports = function(ctx) {
);
},
env
:
{
SCHEDULE_URL
:
"
https://pretalx.hedonist-international.org/worldcongress-2022/schedule/export/schedule.json
"
,
// SCHEDULE_URL:
// "https://pretalx.hedonist-international.org/worldcongress-2022/schedule/export/schedule.json",
SCHEDULE_URL
:
"
http://localhost:8000/schedule.json
"
}
},
...
...
src/css/quasar.variables.styl
View file @
4e9404f4
...
...
@@ -10,7 +10,7 @@
// Tip: Use the "Theme Builder" on Quasar's documentation website.
$primary = #FF00EF
$secondary = #
26A69A
$secondary = #
048BA8
$accent = #9C27B0
$positive = #21BA45
...
...
src/pages/Event.vue
View file @
4e9404f4
<
template
lang=
"pug"
>
.event-detail
h4.headline
{{
event
.
title
}}
.image
img(:src="frabLink(event.logo)", v-if="event.logo")
.details
p.start Start:
{{
date
}}
- Duration:
{{
event
.
duration
}}
- Room:
{{
event
.
room
}}
p
{{
event
.
abstract
}}
...
...
@@ -29,7 +27,6 @@
<
script
>
import
moment
from
"
moment
"
;
import
urljoin
from
"
urljoin
"
;
import
{
GET_EVENT
}
from
"
../store/types
"
;
export
default
{
...
...
@@ -45,10 +42,5 @@ export default {
return
this
.
event
.
persons
}
},
methods
:
{
frabLink
(
link
)
{
return
urljoin
(
process
.
env
.
FRAB_URL
,
link
);
}
}
};
</
script
>
src/pages/Index.vue
View file @
4e9404f4
<
template
lang=
"pug"
>
.layout
header.header
Navigation(defaultRoom="
Vornelinks
(Bühne 1)")
Navigation(defaultRoom="
Space
(Bühne 1)")
main
keep-alive(include="SearchPage")
router-view
...
...
src/pages/SpaceDetail.vue
View file @
4e9404f4
...
...
@@ -4,11 +4,11 @@
q-timeline-entry(heading="")
{{
roomName
}}
template(v-for="day in GET_DAYS_FOR_ROOM(roomName)")
q-timeline-entry(heading='')
{{
dateToWeekday
(
day
.
date
)
}}
q-timeline-entry(v-for="event in day.events", :key="event.id" :subtitle="timeFromDate(event.date)" :title="event.title"
, :avatar="frabLink(event.logo)"
)
q-timeline-entry(v-for="event in day.events", :key="event.id" :subtitle="timeFromDate(event.date)" :title="event.title")
div
{{
event
.
abstract
}}
br
router-link.link(:to="{ name: 'event', params: { id: event.id }}") more...
</
template
>
<
style
lang=
"stylus"
scoped
>
...
...
@@ -19,7 +19,6 @@
<
script
>
import
moment
from
"
moment
"
;
import
urljoin
from
"
urljoin
"
;
import
{
mapGetters
}
from
"
vuex
"
;
import
{
GET_DAYS_FOR_ROOM
}
from
"
../store/types
"
;
...
...
@@ -40,10 +39,6 @@ export default {
},
dateFromDate
(
date
)
{
return
moment
(
date
).
format
(
"
DD.MM.YYYY
"
);
},
frabLink
(
link
)
{
if
(
!
link
)
return
;
return
urljoin
(
process
.
env
.
FRAB_URL
,
link
);
}
}
};
...
...
src/pages/Spaces.vue
View file @
4e9404f4
...
...
@@ -2,7 +2,7 @@
.spaces
q-spinner-orbit.kyrene-loader(v-if="!READY" color="primary" size="6em")
template(v-if="READY")
q-tabs(ref="tabs")
q-tabs
.bg-secondary.text-white
(ref="tabs")
q-route-tab(v-for="(events, room) in LIST_ROOMS", :key="room", :to="{ name: 'space', params: { room: room }}", exact)
{{
room
}}
router-view
...
...
src/serivces/Schedule.js
View file @
4e9404f4
import
{
parseDuration
}
from
"
../common/utils/time
"
;
import
{
uniqBy
}
from
"
lodash-es
"
;
export
default
class
Schedule
{
constructor
(
scheduleData
)
{
...
...
@@ -43,6 +44,7 @@ export default class Schedule {
roomsObj
[
key
]
=
roomsObj
[
key
]
?
[].
concat
([],
roomsObj
[
key
],
rooms
[
key
])
:
rooms
[
key
];
roomsObj
[
key
]
=
uniqBy
(
roomsObj
[
key
],
"
id
"
)
});
});
return
roomsObj
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment