Skip to content

Commit f20a6e3

Browse files
samipesamipe
committed
breaks to program
1 parent 7bc3417 commit f20a6e3

9 files changed

Lines changed: 57 additions & 38 deletions

dist/css/app.f172e905.css renamed to dist/css/app.7f510cfa.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/app.26ffba68.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dist/js/app.b0a9fca6.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/chunk-vendors.a81d898d.js renamed to dist/js/chunk-vendors.34debd33.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/precache-manifest.827d55a17ca518843f00fe2d793799db.js renamed to dist/precache-manifest.5ae938fee83c42f98f9cea28a5f72dfa.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
44
"url": "dist/404.html"
55
},
66
{
7-
"revision": "0f814046abe281053629",
8-
"url": "dist/css/app.f172e905.css"
7+
"revision": "470108aa8254fa4ac20b",
8+
"url": "dist/css/app.7f510cfa.css"
99
},
1010
{
1111
"revision": "27679e61bfd27e1093f4bf200900b8e7",
@@ -140,16 +140,16 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
140140
"url": "dist/img/ticket-depth.jpg"
141141
},
142142
{
143-
"revision": "b235a192c39db3dd339892e365ae0bef",
143+
"revision": "40a1cdcb61a09abea3011bafbbe42556",
144144
"url": "dist/index.html"
145145
},
146146
{
147-
"revision": "0f814046abe281053629",
148-
"url": "dist/js/app.26ffba68.js"
147+
"revision": "470108aa8254fa4ac20b",
148+
"url": "dist/js/app.b0a9fca6.js"
149149
},
150150
{
151-
"revision": "248f0cb09ac52c723f77",
152-
"url": "dist/js/chunk-vendors.a81d898d.js"
151+
"revision": "a902c40df3ed2ea7b365",
152+
"url": "dist/js/chunk-vendors.34debd33.js"
153153
},
154154
{
155155
"revision": "ae69c76f0db87375aa82706bd2ce675f",

‎dist/service-worker.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
1515

1616
importScripts(
17-
"dist/precache-manifest.827d55a17ca518843f00fe2d793799db.js"
17+
"dist/precache-manifest.5ae938fee83c42f98f9cea28a5f72dfa.js"
1818
);
1919

2020
workbox.core.setCacheNameDetails({prefix: "robot-framework"});

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
l.pathname.slice(0, -1) + decoded + l.hash
1818
);
1919
}
20-
}(window.location))</script><link href="dist/css/app.f172e905.css" rel="preload" as="style"><link href="dist/fonts/CourierCode-Bold.27679e61.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/CourierCode-Italic.bb0ae798.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/CourierCode-Roman.b0e06d28.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/OCRA.2b7be849.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/RBCN-thin.9ed7d404.woff2" rel="preload" as="script"><link href="dist/fonts/RBTFNT.63ef3191.woff" rel="preload" as="font" crossorigin=""><link href="dist/js/app.26ffba68.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.a81d898d.js" rel="preload" as="script"><link href="dist/css/app.f172e905.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="dist/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="dist/img/icons/favicon-16x16.png"><link rel="manifest" href="dist/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="robot-framework"><link rel="apple-touch-icon" href="dist/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="dist/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="dist/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but robot-framework doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="dist/js/chunk-vendors.a81d898d.js"></script><script src="dist/js/app.26ffba68.js"></script></body></html>
20+
}(window.location))</script><link href="dist/css/app.7f510cfa.css" rel="preload" as="style"><link href="dist/fonts/CourierCode-Bold.27679e61.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/CourierCode-Italic.bb0ae798.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/CourierCode-Roman.b0e06d28.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/OCRA.2b7be849.woff" rel="preload" as="font" crossorigin=""><link href="dist/fonts/RBCN-thin.9ed7d404.woff2" rel="preload" as="script"><link href="dist/fonts/RBTFNT.63ef3191.woff" rel="preload" as="font" crossorigin=""><link href="dist/js/app.b0a9fca6.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.34debd33.js" rel="preload" as="script"><link href="dist/css/app.7f510cfa.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="dist/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="dist/img/icons/favicon-16x16.png"><link rel="manifest" href="dist/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="robot-framework"><link rel="apple-touch-icon" href="dist/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="dist/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="dist/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but robot-framework doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="dist/js/chunk-vendors.34debd33.js"></script><script src="dist/js/app.b0a9fca6.js"></script></body></html>

‎src/components/Talks2023.vue‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,43 @@
44
<div class="col-sm-12">
55
<div class="row between">
66
<div>
7-
<div v-if="talk.submission_type.en === 'Keynote' && $store.state.isMobile" class="rounded-small bg-grey-dark color-theme px-small pt-3xsmall pb-3xsmall mb-2xsmall" style="width: fit-content">
7+
<div v-if="talk.submission_type === 'Keynote' && $store.state.isMobile" class="rounded-small bg-grey-dark color-theme px-small pt-3xsmall pb-3xsmall mb-2xsmall" style="width: fit-content">
88
Keynote
99
</div>
1010
<h3 class="mb-3xsmall title" :id="getSlug(talk.title)">
11-
{{ talk.title }}
11+
<template v-if="talk.submission_type === 'Break'">
12+
Break: {{ getShownTime(talk.slot.start) }} - {{ getShownTime(talk.slot.end) }}
13+
</template>
14+
<template v-else>
15+
{{ talk.title }}
16+
</template>
1217
</h3>
13-
<p class="type-small m-none">
18+
<p v-if="talk.submission_type !== 'Break'" class="type-small m-none">
1419
{{ format(new Date(talk.slot.start), 'MMM dd') }} {{ getShownTime(talk.slot.start) }} - {{ getShownTime(talk.slot.end) }}
1520
</p>
1621
</div>
1722
<div class="flex top">
18-
<a v-if="!$store.state.isMobile" title="get link to talk" :class="talk.submission_type.en === 'Keynote' && 'm-xsmall'" :href="`#${getSlug(talk.title)}`">
23+
<a v-if="!$store.state.isMobile && talk.submission_type !== 'Break'" title="get link to talk" :class="talk.submission_type === 'Keynote' && 'm-xsmall'" :href="`#${getSlug(talk.title)}`">
1924
<link-icon style="transform: translateY(2px)" />
2025
</a>
21-
<div v-if="talk.submission_type.en === 'Keynote' && !$store.state.isMobile" class="rounded-small bg-grey-dark color-theme p-xsmall" style="height: fit-content">
26+
<div v-if="talk.submission_type === 'Keynote' && !$store.state.isMobile" class="rounded-small bg-grey-dark color-theme p-xsmall" style="height: fit-content">
2227
Keynote
2328
</div>
2429
</div>
2530
</div>
2631
</div>
27-
<div class="col-sm-12">
32+
<div v-if="talk.submission_type !== 'Break'" class="col-sm-12">
2833
<p
2934
class="relative"
30-
:class="!talk.expanded && talk.abstract.length > 100 && 'intro-gradient'"
35+
:class="!talk.expanded && talk.abstract && talk.abstract.length > 100 && 'intro-gradient'"
3136
v-html="parseText(talk.abstract)" />
3237
<button v-if="!talk.expanded" class="theme small block mx-auto" @click="talk.expanded = true">
3338
Show more
3439
</button>
3540
<div v-if="talk.expanded" v-html="parseText(talk.description)" />
3641
</div>
37-
<div class="col-sm-12">
42+
<div v-else v-html="parseText(talk.description.en)" />
43+
<div v-if="talk.submission_type !== 'Break'" class="col-sm-12">
3844
<div
3945
v-for="speaker in talk.speakers"
4046
:key="speaker.code"
@@ -111,6 +117,7 @@ export default {
111117
return DOMPurify.sanitize(marked.parse(description || ''))
112118
},
113119
getSlug(title) {
120+
if (!title) return ''
114121
return title.replace(/[ ]/g, '-').replace(/[^a-zA-Z0-9-]/g, '').toLowerCase()
115122
}
116123
}

‎src/views/Home.vue‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<page-section title-id="talks" title="Talks">
4545
<talks-2023 v-if="talks.length" :talks="talks" />
4646
<div v-else>
47-
Ti
47+
Loading talks...
4848
</div>
4949
</page-section>
5050
</div>
@@ -74,23 +74,35 @@ export default {
7474
talks: []
7575
}),
7676
created() {
77-
// fa63d553-692a-4c25-9a0d-865af22271f3
78-
fetch('https://cfp.robocon.io/api/events/robocon-2023/submissions/')
79-
.then((res) => res.json())
80-
.then(({ results }) => {
81-
this.talks = results
82-
.filter(({ submission_type }) => ['Talk', 'Keynote'].includes(submission_type.en)) // eslint-disable-line
77+
Promise.all([
78+
fetch('https://cfp.robocon.io/api/events/robocon-2023/submissions/'),
79+
fetch('https://pretalx.com/api/events/robocon-2023/schedules/latest/')
80+
])
81+
.then(async([submissions, schedule]) => {
82+
const talks = await submissions.json()
83+
const { breaks } = await schedule.json()
84+
return [...talks.results, ...breaks]
85+
})
86+
.then((list) => {
87+
this.talks = list
88+
.filter(({ submission_type }) => !submission_type || ['Talk', 'Keynote'].includes(submission_type.en)) // eslint-disable-line
89+
.map((item) => ({
90+
...item,
91+
submission_type: item.submission_type?.en || 'Break',
92+
slot: item.slot || { start: item.start, end: item.end }
93+
}))
8394
.sort((a, b) => new Date(a.slot.start) < new Date(b.slot.start) ? -1 : 1)
8495
this.$nextTick(() => {
8596
const hash = window.location.hash
8697
if (!hash || hash === '') return
87-
console.log(hash.slice(1))
8898
const el = document.getElementById(hash.slice(1))
89-
if (!el) return
90-
el.scrollIntoView()
91-
window.scrollTo(el)
99+
if (el) el.scrollIntoView()
92100
})
93101
})
102+
// fa63d553-692a-4c25-9a0d-865af22271f3
103+
// fetch('https://cfp.robocon.io/api/events/robocon-2023/submissions/')
104+
// .then((res) => res.json())
105+
// fetch('https://pretalx.com/api/events/robocon-2023/schedules/latest/')
94106
}
95107
}
96108
</script>

0 commit comments

Comments
 (0)