Merge branch 'dev'

giannisdaras · Mar 22, 2018 · 817ea23 · 817ea23
2 parents 9f667ed + 7206c6e
commit 817ea23
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 3 deletions.
diff --git 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
@@ -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
diff --git a/public/images/sponsors/large/large_athens-legal-firm.png b/public/images/sponsors/large/large_athens-legal-firm.png
diff --git a/public/images/sponsors/raw/anamnesia.png b/public/images/sponsors/raw/anamnesia.png
diff --git a/public/images/sponsors/raw/athens-legal-firm.jpg b/public/images/sponsors/raw/athens-legal-firm.jpg
diff --git a/public/images/sponsors/small/small_anamnesia.png b/public/images/sponsors/small/small_anamnesia.png
diff --git a/public/images/sponsors/small/small_athens-legal-firm.png b/public/images/sponsors/small/small_athens-legal-firm.png
diff --git 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
@@ -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
@@ -44,7 +44,7 @@
 				</div>
 
 				<div class="col col-12 col-lg-4">
-					<a href="https://www.nbg.gr/{{ getLocale() }}" target="_blank"><img class="img-fluid grid-image hover-zoom" src="{{ asset('images/sponsors/small/small_nbg_' ~ getLocale() ~ '.png') }}" srcset="{{ asset('images/sponsors/small/small_nbg_' ~ getLocale() ~ '.png') }} 576w, {{ asset('images/sponsors/large/large_nbg_' ~ getLocale() ~ '.png') }} 960w" alt="National Bank of Greece"></a>
+					<a href="https://www.nbg.gr/{{ getLocale() }}/i-bank" target="_blank"><img class="img-fluid grid-image hover-zoom" src="{{ asset('images/sponsors/small/small_nbg_' ~ getLocale() ~ '.png') }}" srcset="{{ asset('images/sponsors/small/small_nbg_' ~ getLocale() ~ '.png') }} 576w, {{ asset('images/sponsors/large/large_nbg_' ~ getLocale() ~ '.png') }} 960w" alt="National Bank of Greece"></a>
 				</div>
 
 			</div>
@@ -213,6 +213,10 @@
 					<a href="http://apopantaygeias.gr/" target="_blank"><img class="img-fluid grid-image hover-zoom" src="{{ asset('images/sponsors/small/small_pavlidis.png') }}" srcset="{{ asset('images/sponsors/small/small_pavlidis.png') }} 576w, {{ asset('images/sponsors/large/large_pavlidis.png') }} 960w" alt="Σοκολάτα Παυλίδης"></a>
 				</div>
 
+				<div class="col col-6 col-lg-2">
+					<a href="http://www.anamnesia.gr/" target="_blank"><img class="img-fluid grid-image hover-zoom" src="{{ asset('images/sponsors/small/small_anamnesia.png') }}" srcset="{{ asset('images/sponsors/small/small_anamnesia.png') }} 576w, {{ asset('images/sponsors/large/large_anamnesia.png') }} 960w" alt="Anamnesia"></a>
+				</div>
+
 			</div>
 
 		</div>