Skip to content

Commit e51d2ea

Browse files
samipesamipe
committed
fix date formatting
1 parent 0987988 commit e51d2ea

File tree

7 files changed

+23
-20
lines changed

7 files changed

+23
-20
lines changed

‎dist/css/app.50e533fa.css renamed to ‎dist/css/app.3078d907.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.379f79b8.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/app.f035c7e7.js

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

‎dist/precache-manifest.30f6fe5b46624d03a566305cbb882f36.js renamed to ‎dist/precache-manifest.d16c3e6777f0dcda93eb7f4f2d64c9e7.js

Lines changed: 5 additions & 5 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": "018c8e7df337e72ed5e1",
8-
"url": "dist/css/app.50e533fa.css"
7+
"revision": "13e37e3f8a827a48877c",
8+
"url": "dist/css/app.3078d907.css"
99
},
1010
{
1111
"revision": "27679e61bfd27e1093f4bf200900b8e7",
@@ -176,12 +176,12 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
176176
"url": "dist/img/ticket-depth.jpg"
177177
},
178178
{
179-
"revision": "9329403c7e76e363d09167b2f51007a0",
179+
"revision": "a79b827e8389fc16eeaa3e29b0eb1cbe",
180180
"url": "dist/index.html"
181181
},
182182
{
183-
"revision": "018c8e7df337e72ed5e1",
184-
"url": "dist/js/app.f035c7e7.js"
183+
"revision": "13e37e3f8a827a48877c",
184+
"url": "dist/js/app.379f79b8.js"
185185
},
186186
{
187187
"revision": "cddc46ff89796b51188e",

‎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.30f6fe5b46624d03a566305cbb882f36.js"
17+
"dist/precache-manifest.d16c3e6777f0dcda93eb7f4f2d64c9e7.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.50e533fa.css" rel="preload" as="style"><link href="dist/js/app.f035c7e7.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.c5ab8b28.js" rel="preload" as="script"><link href="dist/css/app.50e533fa.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.c5ab8b28.js"></script><script src="dist/js/app.f035c7e7.js"></script></body></html>
20+
}(window.location))</script><link href="dist/css/app.3078d907.css" rel="preload" as="style"><link href="dist/js/app.379f79b8.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.c5ab8b28.js" rel="preload" as="script"><link href="dist/css/app.3078d907.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.c5ab8b28.js"></script><script src="dist/js/app.379f79b8.js"></script></body></html>

‎src/views/Home.vue

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
</div>
66
</banner>
77
<news-banner>
8-
<div v-if="currentTalk">
9-
<h3 class="color-white">
10-
Now ({{ format(new Date(currentTalk.slot.start), 'hh.mm') }} - {{ format(new Date(currentTalk.slot.end), 'hh.mm') }})
11-
</h3>
12-
<a :href="`/#${getSlug(currentTalk.title)}`">
13-
{{ currentTalk.title || currentTalk.description?.en || '-' }}
14-
</a>
15-
<div v-if="nextTalk" class="mt-small">
8+
<div v-if="currentTalk || nextTalk">
9+
<div v-if="currentTalk" class="mb-small">
1610
<h3 class="color-white">
17-
Next ({{ format(new Date(nextTalk.slot.start), 'hh.mm') }} - {{ format(new Date(nextTalk.slot.end), 'hh.mm') }})
11+
Now ({{ format(new Date(currentTalk.slot.start), 'k.mm') }} - {{ format(new Date(currentTalk.slot.end), 'k.mm') }})
12+
</h3>
13+
<a :href="`/#${getSlug(currentTalk.title)}`">
14+
{{ currentTalk.title || currentTalk.description?.en || '-' }}
15+
</a>
16+
</div>
17+
<div v-if="nextTalk">
18+
<h3 class="color-white">
19+
Next ({{ format(new Date(nextTalk.slot.start), 'k.mm') }} - {{ format(new Date(nextTalk.slot.end), 'k.mm') }})
1820
</h3>
1921
<a :href="`/#${getSlug(nextTalk.title)}`">
2022
{{ nextTalk.title || nextTalk.description?.en || '-' }}
@@ -214,6 +216,7 @@ export default {
214216
return null
215217
},
216218
nextTalk() {
219+
console.log('asd')
217220
const talksSorted = this.talks
218221
.filter(({ slot = {} }) => slot.start && slot.end)
219222
.filter(({ slot = {} }) => isToday(new Date(slot.start)))
@@ -223,8 +226,8 @@ export default {
223226
if (dateA && dateB) return dateA < dateB ? -1 : 1
224227
return 0
225228
})
226-
const current = talksSorted.findIndex(({ slot }) => isWithinInterval(new Date(), { start: new Date(slot.start), end: new Date(slot.end) }))
227-
return talksSorted[current + 1]
229+
const next = talksSorted.find(({ slot }) => new Date(slot.start) > new Date())
230+
return next
228231
}
229232
},
230233
methods: {

0 commit comments

Comments
 (0)