From 66deca31fac1ad112a39492657047dcd4b7682ab Mon Sep 17 00:00:00 2001 From: Keplyx Date: Sat, 18 May 2019 17:58:23 +0200 Subject: [PATCH] Set up score displays for every team --- assets/css/score.css | 76 +++++++++++++++--------------------- assets/css/style.css | 6 +-- boomsouffle.php | 10 +++++ glissefondor.php | 11 ++++++ includes/score_counter.php | 27 +++++++------ includes/score_functions.php | 16 ++++++++ includes/template.php | 15 +------ index.php | 44 +++++++++++---------- peksentard.php | 10 +++++ urss.php | 34 ---------------- usa.php | 35 ----------------- verredaigle.php | 10 +++++ 12 files changed, 130 insertions(+), 164 deletions(-) create mode 100644 boomsouffle.php create mode 100755 glissefondor.php create mode 100644 includes/score_functions.php create mode 100644 peksentard.php delete mode 100755 urss.php delete mode 100644 usa.php create mode 100644 verredaigle.php diff --git a/assets/css/score.css b/assets/css/score.css index f35aa14..ce7360f 100755 --- a/assets/css/score.css +++ b/assets/css/score.css @@ -39,7 +39,7 @@ border-radius: 10px; display: inline-flex; vertical-align: center; - font-family: 'Russo One', sans-serif; + font-family: Harry-P, sans-serif; margin: 0; } @@ -53,52 +53,38 @@ font-size: 23px; } -.score-usa, .score-urss, .score-boomsouffle, .score-verredaigle { - font-size: 20px; - line-height: 40px; - text-align: center; - vertical-align: middle; - display: flex; - padding: 5px; - margin: 5px; - border-radius: 10px; -} - - -.score-usa{ - color: #292952; - background: url("../images/usa.png") no-repeat right ; +.score-gli{ + color: #d9341c; background-size: auto 100%; - text-shadow: 0 0 10px #fff; -} - -.score-urss{ - color: #fbce15; - background: url("../images/urss.png") no-repeat left ; - background-size: auto 100%; - text-shadow: 0 0 5px #000; -} -.score-verredaigle{ - color: #fbce15; - background: url("../images/urss.png") no-repeat left ; - background-size: auto 100%; - text-shadow: 0 0 5px #000; -} -.score-boomsouffle{ - color: #fbce15; - background: url("../images/urss.png") no-repeat left ; - background-size: auto 100%; - text-shadow: 0 0 5px #000; -} - - -/*.score-separator{ - font-size: 30px; - line-height: 40px; - text-align: center; - color: #fff; text-shadow: 0 0 10px #000; -}*/ + margin: 0 10px; +} + +.score-pek{ + color: #41fb32; + background-size: auto 100%; + text-shadow: 0 0 5px #000; + margin: 0 10px; +} +.score-boo{ + color: #fbce15; + background-size: auto 100%; + text-shadow: 0 0 5px #000; + margin: 0 10px; +} +.score-ver{ + color: #4bc3fb; + background-size: auto 100%; + text-shadow: 0 0 5px #000; + margin: 0 10px; +} + + +.score-separator{ + background-color: #d9d9d9; + width: 5px; + height: 5px; +} #main-score .score-logo { height: 60px; diff --git a/assets/css/style.css b/assets/css/style.css index 6373629..0911298 100755 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -64,15 +64,15 @@ h3 { } h4 { - font-size: 21px; + font-size: 2.3rem; } h5 { - font-size: 18px; + font-size: 2rem; } h6 { - font-size: 16px; + font-size: 1.8rem; } p { diff --git a/boomsouffle.php b/boomsouffle.php new file mode 100644 index 0000000..d470e93 --- /dev/null +++ b/boomsouffle.php @@ -0,0 +1,10 @@ + +

Boomsouffle

+ diff --git a/glissefondor.php b/glissefondor.php new file mode 100755 index 0000000..710a631 --- /dev/null +++ b/glissefondor.php @@ -0,0 +1,11 @@ + +

Glissefondor

+ + \ No newline at end of file diff --git a/includes/score_counter.php b/includes/score_counter.php index 7427015..c4fb3f2 100755 --- a/includes/score_counter.php +++ b/includes/score_counter.php @@ -2,20 +2,21 @@
- $scoreURSS) - $usaClass = 'winning'; - else if ($scoreUSA < $scoreURSS) - $urssClass = 'winning'; - ?> -
- + +
+
-
|
-
- +
+
+ +
+
+
+ +
+
+
+
diff --git a/includes/score_functions.php b/includes/score_functions.php new file mode 100644 index 0000000..7edc19e --- /dev/null +++ b/includes/score_functions.php @@ -0,0 +1,16 @@ +get_score_team($team) as $row) { + $points += $row['points']; + } + return $points; +} + +$scoreGli = get_total_points('gli', $relativePath); +$scorePek = get_total_points('pek', $relativePath); +$scoreBoo = get_total_points('boo', $relativePath); +$scoreVer = get_total_points('ver', $relativePath); \ No newline at end of file diff --git a/includes/template.php b/includes/template.php index e115edd..10f3783 100755 --- a/includes/template.php +++ b/includes/template.php @@ -7,22 +7,9 @@ if (!isset($customBackgroundId)) require_once $relativePath.'classes/dao.php'; +require_once $relativePath.'includes/score_functions.php'; - -function get_total_points($team, $path) -{ - $dao = new Dao($path); - $points = 0; - foreach ($dao->get_score_team($team) as $row) { - $points += $row['points']; - } - return $points; -} - -$scoreUSA = get_total_points('usa', $relativePath); -$scoreURSS = get_total_points('urss', $relativePath); - ?> diff --git a/index.php b/index.php index 0f3facd..69dbf68 100755 --- a/index.php +++ b/index.php @@ -1,18 +1,10 @@ get_score_team($team) as $row) { - $points += $row['points']; - } - return $points; -} - -$scoreUSA = get_total_points('usa'); -$scoreURSS = get_total_points('urss'); $relativePath = ''; + +require_once 'classes/dao.php'; +require_once 'includes/score_functions.php'; + + ?> @@ -93,23 +85,35 @@ $relativePath = ''; include("includes/main_button_template.php"); $is_image = true; - $link = "usa.php"; + $link = "glissefondor.php"; + $icon = "assets/images/urss_logo.png"; + $text = "La clique de Drago"; + include("includes/main_button_template.php"); + + $is_image = true; + $link = "peksentard.php"; $icon = "assets/images/usa_logo.png"; $text = "Les potes d'Harry"; include("includes/main_button_template.php"); + $is_image = true; + $link = "boomsouffle.php"; + $icon = "assets/images/urss_logo.png"; + $text = "La clique de Drago"; + include("includes/main_button_template.php"); + + $is_image = true; + $link = "verredaigle.php"; + $icon = "assets/images/urss_logo.png"; + $text = "La clique de Drago"; + include("includes/main_button_template.php"); + $is_image = false; $link = "stats.php"; $icon = "fas fa-list-ol"; $text = "Les stats de chaque équipe"; include("includes/main_button_template.php"); - $is_image = true; - $link = "urss.php"; - $icon = "assets/images/urss_logo.png"; - $text = "La clique de Drago"; - include("includes/main_button_template.php"); - $is_image = false; $link = "coms.php"; $icon = "fas fa-users"; diff --git a/peksentard.php b/peksentard.php new file mode 100644 index 0000000..6d2d954 --- /dev/null +++ b/peksentard.php @@ -0,0 +1,10 @@ + +

Peksentard

+ diff --git a/urss.php b/urss.php deleted file mode 100755 index 84a8ee0..0000000 --- a/urss.php +++ /dev/null @@ -1,34 +0,0 @@ - -
-

твоя родина

-

Приветствуйте молодого товарища, добро пожаловать на свою новую родину для этого монументального INSA WARS. - Вам придётся прибыть с вашей украшенной блузкой, чтобы покорить пространство под цветами вашей родины.

-

- присоединиться к битве на Facebook -

-

- Google trad est ton ami. -

-

- Вот твой генерал -

- -
- - музыка - -
- - - Team URSS | Semaine d'Accueil 2018 - \ No newline at end of file diff --git a/usa.php b/usa.php deleted file mode 100644 index 41b2cdf..0000000 --- a/usa.php +++ /dev/null @@ -1,35 +0,0 @@ - -

- Make INSA great again! -

-

- You have joined the greatest nation on the surface of the earth, and you will help us conquer outer space! As a - young patriot, your mission, if you choose to accept it, is to crush the Reds under the command of the most - competent General of the US! -

-

- Join the fight at Facebook, and ask to join the - special forces. -

-

- Here is your General -

- -
- - Music - - - -Team USA | Semaine d'Accueil 2018 - diff --git a/verredaigle.php b/verredaigle.php new file mode 100644 index 0000000..d446f67 --- /dev/null +++ b/verredaigle.php @@ -0,0 +1,10 @@ + +

Verredaigle

+