overlay-generator.git

parent: cffd2c46 | patch | commit | ignore whitespace

Nagy és káoszos form szétrobbantása plusz primitív navigáció

Fibinger Ádám

2020-02-21 f6a0dc34d96cd54707367ff0154a1b96331878b6

Nagy és káoszos form szétrobbantása plusz primitív navigáció

1 files renamed

4 files modified

3 files added

	EOG/Models/Stripe.php	6 ●●●●● patch \| view \| raw \| blame \| history
	form.php	5 ●●●●● patch \| view \| raw \| blame \| history
	templates/admin/html-skeleton.twig	2 ●●●●● patch \| view \| raw \| blame \| history
	templates/admin/modules/interview.twig	18 ●●●●● patch \| view \| raw \| blame \| history
	templates/admin/modules/overlay.twig	29 ●●●●● patch \| view \| raw \| blame \| history
	templates/admin/modules/update.twig	14 ●●●●● patch \| view \| raw \| blame \| history
	templates/admin/site-base.twig	14 ●●●●● patch \| view \| raw \| blame \| history
	templates/overlays/stripe.twig	6 ●●●●● patch \| view \| raw \| blame \| history

 EOG/Models/Stripe.php

@@ -75,17 +75,17 @@
    {
        if (!in_array($color, $this->allowedColors))
        {
            throw new \InvalidArgumentException("Given colour " . $team_color . " not allowed. Allowed colours: " . implode(', ', $this->allowedColors));
            throw new \InvalidArgumentException("Given colour " . $color . " not allowed. Allowed colours: " . implode(', ', $this->allowedColors));
        }
    }

    public function setTeamName(string $team_color = self::TEAM_BLUE, $name)
    public function setTeamName(string $team_color = self::TEAM_BLUE, $name= '')
    {
        $this->testColor($team_color);
        $this->state['team'][$team_color]['name'] = $name;
    }

    public function addTeamBan(string $team_color = self::TEAM_BLUE, $operator)
    public function addTeamBan(string $team_color = self::TEAM_BLUE, $operator = '')
    {
        $this->testColor($team_color);
        if (!in_array($operator, $this->allowedOperators))

 form.php

@@ -41,13 +41,16 @@
if (file_exists(TEAMS_JSON)) {
    $teams->fromJson(file_get_contents(TEAMS_JSON));
}
$page = isset($_GET['page']) ? $_GET['page'] : 'overlay';
$page = in_array($page,['overlay','interview','update']) ? $page : 'overlay';

$var = [
    'page' => $page,
    'stripe' => $s,
    'teamNames' => $teams->getTeamNames(),
    'operators' => $s->getOperators(),
    'post' => !empty($_POST['stripe'])
];

echo $twig->render('admin/stripe-form.twig', $var);
echo $twig->render('admin/modules/'.$page .'.twig', $var);


 templates/admin/html-skeleton.twig

@@ -12,6 +12,8 @@
    {% endblock %}
</head>
<body>
{% block navigation %}
{% endblock %}
{% block body %}
    <h1>Hello, world!</h1>
{% endblock %}

 templates/admin/modules/interview.twig

New file
@@ -0,0 +1,18 @@
{% extends "admin/site-base.twig" %}
{% block body %}
<h1 class="display-4">Interjú overlay</h1>

<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>
{% endblock %}

 templates/admin/modules/overlay.twig

File was renamed from templates/admin/stripe-form.twig
@@ -1,5 +1,7 @@
{% extends "admin/html-skeleton.twig" %}
{% extends "admin/site-base.twig" %}
{% block body %}
    <h1 class="display-4">Mérkőzés overlay</h1>

    <form action="/generator/form.php" method="post">
        <input type="hidden" name="stripe[class]" value="team-ban"/>

@@ -28,11 +30,17 @@
                </select>
                <button class="btn btn-primary"
                        title="Legyen az itt kiválasztott a kék csapat"
                        onclick="$('#team_blue_name').val($('#teamname').val()); return false;">Legyen kék</button>
                        onclick="$('#team_blue_name').val($('#teamname').val()); return false;">Legyen kék
                </button>

                <button class="btn btn-warning"
                        title="Csapat színcsere"
                        onclick="$('#team_orange_name').val($('#teamname').val()); return false;">Legyen narancs</button>
                        title="Legyen az itt kiválasztott a narancs csapat"
                        onclick="$('#team_orange_name').val($('#teamname').val()); return false;">Legyen narancs
                </button>
                <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>
        <div class="form-group">
@@ -77,19 +85,6 @@
        </div>
        <div class="form-group">
            <button class="btn btn-primary mx-auto" type="submit">Overlay felülírása</button>
        </div>
    </form>

    <a href="/generator/match-history.php" class="btn btn-secondary">Meccstörténet</a>

    <form action="/generator/save-teams.php" method="post">
        <div class="form-group">
            <div class="col-md-4 mb-4">
                <label for="json">Csapatok API Input adatai:</label>
                Pld: https://api.eslgaming.com/play/v1/leagues/198846/contestants válasz eredménye
                <textarea class="form-control" name="json" id="json"></textarea>
                <button class="btn btn-secondary" type="submit">Csapatok frissítése</button>
            </div>
        </div>
    </form>
{% endblock %}

 templates/admin/modules/update.twig

New file
@@ -0,0 +1,14 @@
{% extends "admin/site-base.twig" %}
{% block body %}
    <h1 class="display-4">Overlay beállítások - Csapatok frissítése</h1>
<form action="/generator/save-teams.php" method="post">
    <div class="form-group">
        <div class="col-md-4 mb-4">
            <label for="json">Csapatok API Input adatai:</label>
            Pld: https://api.eslgaming.com/play/v1/leagues/198846/contestants válasz eredménye
            <textarea class="form-control" name="json" id="json"></textarea>
            <button class="btn btn-secondary" type="submit">Csapatok frissítése</button>
        </div>
    </div>
</form>
{% endblock %}

 templates/admin/site-base.twig

New file
@@ -0,0 +1,14 @@
{% extends "admin/html-skeleton.twig" %}
{% block navigation %}
    <ul class="nav nav-tabs nav-fill">
        <li class="nav-item">
            <a class="nav-link {{ page == 'overlay' ? 'active' }}" href="?page=overlay">Meccs overlay</a>
        </li>
        <li class="nav-item">
            <a class="nav-link {{ page == 'update' ? 'active' }}" href="?page=update">Csapatok frissítése</a>
        </li>
        <li class="nav-item">
            <a class="nav-link {{ page == 'interview' ? 'active' }}" href="?page=interview">Interjú</a>
        </li>
    </ul>
{% endblock %}

 templates/overlays/stripe.twig

@@ -61,8 +61,10 @@
            {% endblock %}

            {% block info_right %}
                <span class="info right">
                <img class="esl-logo" src="/assets/ESL_Logo.png"/>
            <span class="info right">
                {% if stripe.cup.number %}
                    <img class="esl-logo" src="/assets/ESL_Logo.png"/>
                {% endif %}
            </span>
            {% endblock %}
        </div>

			@@ -75,17 +75,17 @@
			{
			if (!in_array($color, $this->allowedColors))
			{
			throw new \InvalidArgumentException("Given colour " . $team_color . " not allowed. Allowed colours: " . implode(', ', $this->allowedColors));
			throw new \InvalidArgumentException("Given colour " . $color . " not allowed. Allowed colours: " . implode(', ', $this->allowedColors));
			}
			}

			public function setTeamName(string $team_color = self::TEAM_BLUE, $name)
			public function setTeamName(string $team_color = self::TEAM_BLUE, $name= '')
			{
			$this->testColor($team_color);
			$this->state['team'][$team_color]['name'] = $name;
			}

			public function addTeamBan(string $team_color = self::TEAM_BLUE, $operator)
			public function addTeamBan(string $team_color = self::TEAM_BLUE, $operator = '')
			{
			$this->testColor($team_color);
			if (!in_array($operator, $this->allowedOperators))

			@@ -41,13 +41,16 @@
			if (file_exists(TEAMS_JSON)) {
			$teams->fromJson(file_get_contents(TEAMS_JSON));
			}
			$page = isset($_GET['page']) ? $_GET['page'] : 'overlay';
			$page = in_array($page,['overlay','interview','update']) ? $page : 'overlay';

			$var = [
			'page' => $page,
			'stripe' => $s,
			'teamNames' => $teams->getTeamNames(),
			'operators' => $s->getOperators(),
			'post' => !empty($_POST['stripe'])
			];

			echo $twig->render('admin/stripe-form.twig', $var);
			echo $twig->render('admin/modules/'.$page .'.twig', $var);

			@@ -12,6 +12,8 @@
			{% endblock %}
			</head>
			<body>
			{% block navigation %}
			{% endblock %}
			{% block body %}
			<h1>Hello, world!</h1>
			{% endblock %}

New file
			@@ -0,0 +1,18 @@
			{% extends "admin/site-base.twig" %}
			{% block body %}
			<h1 class="display-4">Interjú overlay</h1>

			<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>
			{% endblock %}

File was renamed from templates/admin/stripe-form.twig
			@@ -1,5 +1,7 @@
			{% extends "admin/html-skeleton.twig" %}
			{% extends "admin/site-base.twig" %}
			{% block body %}
			<h1 class="display-4">Mérkőzés overlay</h1>

			<form action="/generator/form.php" method="post">
			<input type="hidden" name="stripe[class]" value="team-ban"/>

			@@ -28,11 +30,17 @@
			</select>
			<button class="btn btn-primary"
			title="Legyen az itt kiválasztott a kék csapat"
			onclick="$('#team_blue_name').val($('#teamname').val()); return false;">Legyen kék</button>
			onclick="$('#team_blue_name').val($('#teamname').val()); return false;">Legyen kék
			</button>

			<button class="btn btn-warning"
			title="Csapat színcsere"
			onclick="$('#team_orange_name').val($('#teamname').val()); return false;">Legyen narancs</button>
			title="Legyen az itt kiválasztott a narancs csapat"
			onclick="$('#team_orange_name').val($('#teamname').val()); return false;">Legyen narancs
			</button>
			<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>
			<div class="form-group">
			@@ -77,19 +85,6 @@
			</div>
			<div class="form-group">
			<button class="btn btn-primary mx-auto" type="submit">Overlay felülírása</button>
			</div>
			</form>

			<a href="/generator/match-history.php" class="btn btn-secondary">Meccstörténet</a>

			<form action="/generator/save-teams.php" method="post">
			<div class="form-group">
			<div class="col-md-4 mb-4">
			<label for="json">Csapatok API Input adatai:</label>
			Pld: https://api.eslgaming.com/play/v1/leagues/198846/contestants válasz eredménye
			<textarea class="form-control" name="json" id="json"></textarea>
			<button class="btn btn-secondary" type="submit">Csapatok frissítése</button>
			</div>
			</div>
			</form>
			{% endblock %}

New file
			@@ -0,0 +1,14 @@
			{% extends "admin/site-base.twig" %}
			{% block body %}
			<h1 class="display-4">Overlay beállítások - Csapatok frissítése</h1>
			<form action="/generator/save-teams.php" method="post">
			<div class="form-group">
			<div class="col-md-4 mb-4">
			<label for="json">Csapatok API Input adatai:</label>
			Pld: https://api.eslgaming.com/play/v1/leagues/198846/contestants válasz eredménye
			<textarea class="form-control" name="json" id="json"></textarea>
			<button class="btn btn-secondary" type="submit">Csapatok frissítése</button>
			</div>
			</div>
			</form>
			{% endblock %}

			@@ -61,8 +61,10 @@
			{% endblock %}

			{% block info_right %}
			<span class="info right">
			<img class="esl-logo" src="/assets/ESL_Logo.png"/>
			<span class="info right">
			{% if stripe.cup.number %}
			<img class="esl-logo" src="/assets/ESL_Logo.png"/>
			{% endif %}
			</span>
			{% endblock %}
			</div>