diff --git a/app/Http/Controllers/CurrentEventController.php b/app/Http/Controllers/CurrentEventController.php index 0724fc5..cf4d0d2 100644 --- a/app/Http/Controllers/CurrentEventController.php +++ b/app/Http/Controllers/CurrentEventController.php @@ -42,7 +42,7 @@ public function index(Request $request) { $where = [['visible', true]]; } - if(date('Y-m-d') == '2018-03-24') { + if($request->testLive == "yes" || date('Y-m-d') == '2018-03-24') { $events = Schedule :: where(array_merge($where, [['type', '!=', 'workshop']])) -> orderBy('hour', 'asc') -> get(); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 42b65d0..229c71e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -24,7 +24,7 @@ public function index(Request $request) { $speakers = $query->get()->sortByAppearance(); $now = date("Y-m-d H:i"); - $isToday = $request->testLive == "yes" || ($now >= "2018-03-24 10:30" && $now <= "2018-03-24 21:00"); + $isToday = $request->testLive == "yes" || ($now >= "2018-03-24 10:30" && $now <= "2018-03-24 23:59"); $isPjax = $request->header('X-PJAX'); if ($isPjax) { diff --git a/public/images/sponsors/large/large_anamnesia.png b/public/images/sponsors/large/large_anamnesia.png new file mode 100644 index 0000000..fd34269 Binary files /dev/null and b/public/images/sponsors/large/large_anamnesia.png differ diff --git a/public/images/sponsors/large/large_athens-legal-firm.png b/public/images/sponsors/large/large_athens-legal-firm.png index 4bb8244..1321426 100644 Binary files a/public/images/sponsors/large/large_athens-legal-firm.png and b/public/images/sponsors/large/large_athens-legal-firm.png differ diff --git a/public/images/sponsors/raw/anamnesia.png b/public/images/sponsors/raw/anamnesia.png new file mode 100644 index 0000000..364e451 Binary files /dev/null and b/public/images/sponsors/raw/anamnesia.png differ diff --git a/public/images/sponsors/raw/athens-legal-firm.jpg b/public/images/sponsors/raw/athens-legal-firm.jpg index 4e758bc..3819647 100644 Binary files a/public/images/sponsors/raw/athens-legal-firm.jpg and b/public/images/sponsors/raw/athens-legal-firm.jpg differ diff --git a/public/images/sponsors/small/small_anamnesia.png b/public/images/sponsors/small/small_anamnesia.png new file mode 100644 index 0000000..1360522 Binary files /dev/null and b/public/images/sponsors/small/small_anamnesia.png differ diff --git a/public/images/sponsors/small/small_athens-legal-firm.png b/public/images/sponsors/small/small_athens-legal-firm.png index 7f79a0e..b061b67 100644 Binary files a/public/images/sponsors/small/small_athens-legal-firm.png and b/public/images/sponsors/small/small_athens-legal-firm.png differ diff --git a/public/js/home-animations.js b/public/js/home-animations.js index 0848f6d..ae6d6ec 100644 --- a/public/js/home-animations.js +++ b/public/js/home-animations.js @@ -119,12 +119,15 @@ window.homeAnimations = function () { }, 5000); } + var testLiveVal = typeof window.URL === "function" ? new URL(location.href).searchParams.get("testLive") : undefined; + var update = function update() { if ($("#live").length > 0) { $.ajax({ type: "GET", url: "/currentEvent", dataType: "html", + data: { testLive: testLiveVal }, success: function success(data) { if (data != $("#hero .liveInfo").html()) { $("#hero .liveInfo").fadeOut(200, function () { diff --git a/resources/assets/js/home-animations.js b/resources/assets/js/home-animations.js index a569f60..f9c754d 100644 --- a/resources/assets/js/home-animations.js +++ b/resources/assets/js/home-animations.js @@ -41,12 +41,15 @@ window.homeAnimations = function() { }, 5000) } + let testLiveVal = typeof(window.URL) === "function" ? new URL(location.href).searchParams.get("testLive") : undefined + let update = function() { if($("#live").length > 0) { $.ajax({ type: "GET", url: "/currentEvent", dataType: "html", + data: {testLive: testLiveVal}, success: function(data) { if(data != $("#hero .liveInfo").html()) { $("#hero .liveInfo").fadeOut(200, function() { diff --git a/resources/views/sponsors.twig b/resources/views/sponsors.twig index e8e5c5c..482d0d1 100644 --- a/resources/views/sponsors.twig +++ b/resources/views/sponsors.twig @@ -44,7 +44,7 @@
@@ -213,6 +213,10 @@ + +