From 3ac2acb75dbc5b9d8674cd733f96e95f15826961 Mon Sep 17 00:00:00 2001
From: Fibinger Ádám <adam.fibinger@wup.hu>
Date: Wed, 26 Feb 2020 09:49:56 +0100
Subject: [PATCH] Némi refaktor és új overlay
---
templates/admin/modules/interview.twig | 55 ++++++++++-------
common/base.php | 5 +
templates/overlays/start-soon.twig | 9 +-
templates/admin/modules/overlay.twig | 2
templates/overlays/interrogacion.twig | 12 ++++
EOG/Models/Interview.php | 69 +++++++++++++++++++++++
6 files changed, 123 insertions(+), 29 deletions(-)
diff --git a/EOG/Models/Interview.php b/EOG/Models/Interview.php
new file mode 100644
index 0000000..0ab3d10
--- /dev/null
+++ b/EOG/Models/Interview.php
@@ -0,0 +1,69 @@
+<?php
+
+
+namespace EOG\Models;
+
+
+class Interview
+{
+ /**
+ * @var string
+ */
+ protected $title = "Interrrrrogacioooon!";
+ /**
+ * @var string
+ */
+ protected $teamName = '';
+ /**
+ * @var string Csapattag neve
+ */
+ protected $players = '';
+
+ /**
+ * @return string
+ */
+ public function getTitle(): string
+ {
+ return $this->title;
+ }
+
+ /**
+ * @param string $title
+ */
+ public function setTitle(string $title): void
+ {
+ $this->title = $title;
+ }
+
+ /**
+ * @return string
+ */
+ public function getTeamName(): string
+ {
+ return $this->teamName;
+ }
+
+ /**
+ * @param string $teamName
+ */
+ public function setTeamName(string $teamName): void
+ {
+ $this->teamName = $teamName;
+ }
+
+ /**
+ * @return string
+ */
+ public function getPlayers(): string
+ {
+ return $this->players;
+ }
+
+ /**
+ * @param string $players
+ */
+ public function setPlayers(string $players): void
+ {
+ $this->players = $players;
+ }
+}
\ No newline at end of file
diff --git a/common/base.php b/common/base.php
index ba1197d..0071d85 100644
--- a/common/base.php
+++ b/common/base.php
@@ -7,7 +7,10 @@
define('IS_DEV', true);
define('SITE_ROOT', dirname(__DIR__));
-define('TARGET_DIR', dirname(SITE_ROOT) . '/overlays/');
+define('OVERLAY_DIR', dirname(SITE_ROOT) . '/overlays/');
+define('STRIPE_JSON', OVERLAY_DIR . 'last.json');
+define('TEAMS_JSON', OVERLAY_DIR . 'teams.json');
+define('HISTORY_JSON', OVERLAY_DIR . 'history.json');
$twig = \EOG\Utils\TwigFactory::getEnvironment(SITE_ROOT . '/templates/');
\ No newline at end of file
diff --git a/templates/admin/modules/interview.twig b/templates/admin/modules/interview.twig
index d15dbaf..fb95732 100644
--- a/templates/admin/modules/interview.twig
+++ b/templates/admin/modules/interview.twig
@@ -1,28 +1,37 @@
{% extends "admin/site-base.twig" %}
{% block body %}
-<h1 class="display-4">Interjú overlay</h1>
+ <h1 class="display-4">Interjú overlay</h1>
-<div class="form-group">
- {% include 'admin/modules/team-list-select.twig' %}
- <div class="form-row">
- <button class="btn btn-info"
- title="Legyen az itt kiválasztott az interjú csapat"
- onclick="$('#interview_team').val($('#teamname').val()); return false;">Interjú
- </button>
- </div>
-</div>
+ <form action="/generator/save-interview.php" method="post">
+ <div class="form-group">
+ <div class="col-md-12 mb-4">
+ <div class="form-row">
+ {% include 'admin/modules/team-list-select.twig' %}
+ </div>
+ <label for="interview_team">Interjú csapat</label>
+ <input type="text" name="interview[teamName]" class="form-control" id="interview_team"
+ placeholder="Pld.: Opress!ve" value="" required>
+ <label for="team_orange_name">Játékos(ok)</label>
+ <input type="text" name="interview[players]" class="form-control" id="interview_players"
+ placeholder="Pld.: Fiber / Dompa / Lucifer" value="" required>
+ </div>
+ <button class="btn btn-info" type="submit">Overlay frissítése</button>
+ </div>
+ </form>
-<form action="/generator/save-interview.php" method="post">
- <div class="form-group">
- <div class="col-md-12 mb-4">
- <label for="interview_team">Interjú csapat</label>
- <input type="text" name="interview[teamName]" class="form-control" id="interview_team"
- placeholder="Pld.: Opress!ve" value="" required>
- <label for="team_orange_name">Játékos(ok)</label>
- <input type="text" name="interview[players]" class="form-control" id="interview_team"
- placeholder="Pld.: Fiber / Dompa / Lucifer" value="" required>
- </div>
- <button class="btn btn-info" type="submit">Interjú overlayek frissítése</button>
- </div>
-</form>
+ <form action="/generator/save-interview.php" method="post">
+ <input type="hidden" name="reset" value="1">
+ <div class="form-group">
+ <button class="btn btn-danger" type="submit">Reset (Üres interrogacion)</button>
+ </div>
+ </form>
+{% endblock %}
+
+{% block lazyload %}
+ {{ parent() }}
+ <script type="text/javascript">
+ $('.teamname').chosen().on('change', function (event) {
+ document.getElementById('interview_team').value = event.target.value;
+ });
+ </script>
{% endblock %}
\ No newline at end of file
diff --git a/templates/admin/modules/overlay.twig b/templates/admin/modules/overlay.twig
index 7727d97..ebb4505 100644
--- a/templates/admin/modules/overlay.twig
+++ b/templates/admin/modules/overlay.twig
@@ -65,6 +65,8 @@
<button class="btn btn-primary mx-auto" type="submit">Overlay felülírása</button>
</div>
</form>
+
+ <iframe src="/overlays/team-ban-refresh.html" width="100%"></iframe>
{% endblock %}
{% block lazyload %}
{{ parent() }}
diff --git a/templates/overlays/interrogacion.twig b/templates/overlays/interrogacion.twig
new file mode 100644
index 0000000..9e26b38
--- /dev/null
+++ b/templates/overlays/interrogacion.twig
@@ -0,0 +1,12 @@
+{% extends "overlays/html-base.twig" %}
+{% block body %}
+ <div id="main" class="interview">
+ <div class="placeholder"> </div>
+ <div class="text main">{{ i.title }}</div>
+ <div class="team">
+ <div class="placeholder"></div>
+ <div class="text team">{{ i.teamName }}</div>
+ <div class="text player">{{ i.players }}</div>
+ </div>
+ </div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/overlays/start-soon.twig b/templates/overlays/start-soon.twig
index fed5749..57d09da 100644
--- a/templates/overlays/start-soon.twig
+++ b/templates/overlays/start-soon.twig
@@ -1,8 +1,7 @@
{% extends "overlays/html-base.twig" %}
-{% block head %}
- {{ parent() }}
- <link rel="stylesheet" href="/assets/operators-color.css">
-{% endblock %}
{% block body %}
- <div id="main-text" class="soon">Hamarosan kezdünk!</div>
+ <div id="main" class="soon">
+ <div class="placeholder"> </div>
+ <div class="text">Kezdés: 17:45</div>
+ </div>
{% endblock %}
\ No newline at end of file
--
Gitblit v1.8.0