From c5946f44341c29594803c5b2ca64dcaf335fbca3 Mon Sep 17 00:00:00 2001
From: Fibinger Ádám <adam.fibinger@wup.hu>
Date: Wed, 27 Nov 2019 21:03:23 +0100
Subject: [PATCH] Némi refaktor és új overlay
---
info.php | 3
/dev/null | 67 ----------------
templates/overlays/start-soon.twig | 7 +
form.php | 6
EOG/Models/Stripe.php | 6 +
templates/overlays/html-base.twig | 15 +++
templates/admin/stripe-form.twig | 4
create.php | 25 -----
templates/overlays/stripe.twig | 67 ++++++++++++++++
9 files changed, 104 insertions(+), 96 deletions(-)
diff --git a/EOG/Models/Stripe.php b/EOG/Models/Stripe.php
index 52bd5e9..a3bd134 100644
--- a/EOG/Models/Stripe.php
+++ b/EOG/Models/Stripe.php
@@ -134,9 +134,11 @@
$this->setClass($state['stripe']["class"]);
}
- if (!empty($state['cup']['name']) && !empty($state['cup']['number']))
+ if (!empty($state['cup']['name']) || !empty($state['cup']['number']))
{
- $this->setCup($state['cup']['number'], $state['cup']['name']);
+ $cupNum = $state['cup']['number'] ?? '';
+ $cupName = $state['cup']['name'] ?? '';
+ $this->setCup($cupNum, $cupName);
}
if (!empty($state['team']))
diff --git a/create.php b/create.php
index 297d22a..41388a1 100644
--- a/create.php
+++ b/create.php
@@ -1,25 +1,6 @@
<?php
-ini_set('display_errors',E_ALL);
+include_once "common/base.php";
-include "vendor/autoload.php";
+$html_content = $twig->render('overlays/start-soon.twig');
-define('IS_DEV', (!isset($_SERVER['HTTP_HOST'])));
-define('SITE_ROOT', __DIR__);
-
-if (IS_DEV)
-{
- define('OVERLAY_DIR', dirname(__DIR__) . '/esl-overlay/');
-}
-else
-{
- define('OVERLAY_DIR', dirname(__DIR__).'/overlays/');
-}
-
-$twig = \EOG\Utils\TwigFactory::getEnvironment(SITE_ROOT);
-$s = new \EOG\Models\Stripe();
-
-$html_content = $twig->render('templates/overlay-base.twig', ['stripe' => $s]);
-
-file_put_contents(OVERLAY_DIR . 'generated.html', $html_content);
-
-echo OVERLAY_DIR . 'generated.html';
+file_put_contents('../esl-overlay/overlays/start-soon.html', $html_content);
\ No newline at end of file
diff --git a/form.php b/form.php
index 5e543f0..f2bf36e 100644
--- a/form.php
+++ b/form.php
@@ -11,15 +11,15 @@
}
$s->setClass('simple');
- $html_content = $twig->render('overlay-base.twig', ['stripe' => $s]);
+ $html_content = $twig->render('overlays/stripe.twig', ['stripe' => $s]);
file_put_contents(OVERLAY_DIR . 'simple.html', $html_content);
$s->setClass('team');
- $html_content = $twig->render('overlay-base.twig', ['stripe' => $s]);
+ $html_content = $twig->render('overlays/stripe.twig', ['stripe' => $s]);
file_put_contents(OVERLAY_DIR . 'team.html', $html_content);
$s->setClass('team-ban');
- $html_content = $twig->render('overlay-base.twig', ['stripe' => $s]);
+ $html_content = $twig->render('overlays/stripe.twig', ['stripe' => $s]);
file_put_contents(OVERLAY_DIR . 'team-ban.html', $html_content);
} else {
diff --git a/info.php b/info.php
new file mode 100644
index 0000000..83f1549
--- /dev/null
+++ b/info.php
@@ -0,0 +1,3 @@
+<?php
+
+phpinfo();
diff --git a/templates/admin/stripe-form.twig b/templates/admin/stripe-form.twig
index 6d759fd..7673f0b 100644
--- a/templates/admin/stripe-form.twig
+++ b/templates/admin/stripe-form.twig
@@ -8,13 +8,13 @@
<div class="col-md-8 mb-3">
<label for="validationServer01">Kupa neve</label>
<input type="text" name="stripe[cup][name]" class="form-control" id="validationServer01"
- placeholder="Pld.: 5on5 Bomb Cup" value="{{ stripe.cup.name }}" required>
+ placeholder="Pld.: 5on5 Bomb Cup" value="{{ stripe.cup.name }}">
</div>
<div class="col-md-2 mb-3">
<label for="validationServer02">Kupa sorszám</label>
<input type="text" name="stripe[cup][number]" class="form-control" id="validationServer02"
placeholder="Pld.: #654"
- value="{{ stripe.cup.number }}" required>
+ value="{{ stripe.cup.number }}">
</div>
</div>
</div>
diff --git a/templates/bo1-full.twig b/templates/bo1-full.twig
deleted file mode 100644
index a16e3f6..0000000
--- a/templates/bo1-full.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-<div id="stripe">
- <span class="info left">
- <img src="/assets/hun.png" class="flag hun">
- <span class="text">
- <em>#76</em> 5on5 Open Cup
- </span>
- </span>
- <span class="team orange">
- <span class="name">Lucky Strike Esport</span>
- </span>
- <span class="team blue">
- <span class="name">The Grizz Esports</span>
- </span>
- <span class="logo"></span>
- <span class="ban blue">
- <span class="operator montagne">
- <span class="prohibit">x</span>
- </span>
- <span class="operator goyo">
- <span class="prohibit">x</span>
- </span>
- </span>
- <span class="ban orange">
- <span class="operator jackal"><span class="prohibit">x</span></span>
- <span class="operator mira"><span class="prohibit">x</span></span>
- </span>
- <span class="info right">
- <img class="esl-logo" src="/assets/ESL_Logo.png"/>
- </span>
-</div>
\ No newline at end of file
diff --git a/templates/overlay-base.twig b/templates/overlay-base.twig
deleted file mode 100644
index 91eeb45..0000000
--- a/templates/overlay-base.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="UTF-8">
- <link href="https://fonts.googleapis.com/css?family=Oswald&display=swap" rel="stylesheet">
- <link rel="stylesheet" href="/assets/overlay.css">
- <link rel="stylesheet" href="/assets/operators-color.css">
- <base href="/">
-</head>
-<body>
-{% block stripe %}
- <div id="stripe" class="{{ stripe.stripe.class }}">
- {% block info_left %}
- <span class="info left">
- <img src="/assets/hun.png" class="flag hun">
- <span class="text">
- <em>{{ stripe.cup.number }}</em> {{ stripe.cup.name }}
- </span>
- </span>
- {% endblock %}
- {% block team_blue %}
- {% if stripe.team.blue and stripe.stripe.class in ['team-ban', 'team'] %}
- <span class="team blue">
- <span class="name">{{ stripe.team.blue.name }}</span>
- </span>
- {% if stripe.stripe.class == 'team-ban' %}
- <span class="ban blue">
- {% for op in stripe.team.blue.ban %}
- <span class="operator {{ op }}">
- <span class="prohibit">x</span>
- </span>
- {% endfor %}
- </span>
- {% endif %}
- {% endif %}
- {% endblock %}
- {% block logo %}
- <span class="logo"></span>
- {% endblock %}
-
- {% block team_orange %}
- {% if stripe.team.orange and stripe.stripe.class in ['team-ban', 'team'] %}
- <span class="team orange">
- <span class="name">{{ stripe.team.orange.name }}</span>
- </span>
-
- {% if stripe.stripe.class == 'team-ban' %}
- <span class="ban orange">
- {% for op in stripe.team.orange.ban %}
- <span class="operator {{ op }}">
- <span class="prohibit">x</span>
- </span>
- {% endfor %}
- </span>
- {% endif %}
- {% endif %}
- {% endblock %}
-
- {% block info_right %}
- <span class="info right">
- {# <img class="esl-logo" src="/assets/ESL_Logo.png"/> #}
- </span>
- {% endblock %}
- </div>
-{% endblock %}
-</body>
-</html>
diff --git a/templates/overlays/html-base.twig b/templates/overlays/html-base.twig
new file mode 100644
index 0000000..c12ea3b
--- /dev/null
+++ b/templates/overlays/html-base.twig
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="UTF-8">
+ <base href="/">
+ {% block head %}
+ <link href="https://fonts.googleapis.com/css?family=Oswald&display=swap" rel="stylesheet">
+ <link rel="stylesheet" href="/assets/overlay.css">
+ {% endblock %}
+</head>
+<body>
+{% block body %}
+{% endblock %}
+</body>
+</html>
diff --git a/templates/overlays/start-soon.twig b/templates/overlays/start-soon.twig
new file mode 100644
index 0000000..d235a2c
--- /dev/null
+++ b/templates/overlays/start-soon.twig
@@ -0,0 +1,7 @@
+{% extends "overlays/html-base.twig" %}
+{% block body %}
+ <div id="main" class="soon">
+ <div class="placeholder"> </div>
+ <div class="text">Hamarosan kezdünk!</div>
+ </div>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/overlays/stripe.twig b/templates/overlays/stripe.twig
new file mode 100644
index 0000000..5a2fc7f
--- /dev/null
+++ b/templates/overlays/stripe.twig
@@ -0,0 +1,67 @@
+{% extends "overlays/html-base.twig" %}
+{% block head %}
+ {{ parent() }}
+ <link rel="stylesheet" href="/assets/operators-color.css">
+{% endblock %}
+{% block body %}
+ {% block stripe %}
+ <div id="stripe" class="{{ stripe.stripe.class }}">
+ {% block info_left %}
+ <span class="info left">
+ {% if stripe.cup.number %}
+ <img src="/assets/hun.png" class="flag hun">
+ {% endif %}
+ <span class="text">
+ {% if stripe.cup.number %}
+ <em>{{ stripe.cup.number }}</em>
+ {% endif %}
+ {{ stripe.cup.name -}}
+ </span>
+ </span>
+ {% endblock %}
+ {% block team_blue %}
+ {% if stripe.team.blue and stripe.stripe.class in ['team-ban', 'team'] %}
+ <span class="team blue">
+ <span class="name">{{ stripe.team.blue.name }}</span>
+ </span>
+ {% if stripe.stripe.class == 'team-ban' %}
+ <span class="ban blue">
+ {% for op in stripe.team.blue.ban %}
+ <span class="operator {{ op }}">
+ <span class="prohibit">x</span>
+ </span>
+ {% endfor %}
+ </span>
+ {% endif %}
+ {% endif %}
+ {% endblock %}
+ {% block logo %}
+ <span class="logo"></span>
+ {% endblock %}
+
+ {% block team_orange %}
+ {% if stripe.team.orange and stripe.stripe.class in ['team-ban', 'team'] %}
+ <span class="team orange">
+ <span class="name">{{ stripe.team.orange.name }}</span>
+ </span>
+
+ {% if stripe.stripe.class == 'team-ban' %}
+ <span class="ban orange">
+ {% for op in stripe.team.orange.ban %}
+ <span class="operator {{ op }}">
+ <span class="prohibit">x</span>
+ </span>
+ {% endfor %}
+ </span>
+ {% endif %}
+ {% endif %}
+ {% endblock %}
+
+ {% block info_right %}
+ <span class="info right">
+ <img class="esl-logo" src="/assets/ESL_Logo.png"/>
+ </span>
+ {% endblock %}
+ </div>
+ {% endblock %}
+{% endblock %}
\ No newline at end of file
--
Gitblit v1.8.0