From 803eca5b4e35b3334e11272e1b7d7b20c73a1426 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 1 Jun 2018 13:36:30 +0200 Subject: [PATCH] Aggiunta centrale atomica --- static/royal.css | 116 ----------------- templates/challenge1.html | 34 ----- templates/diario.html | 44 ------- templates/index.html | 31 ----- templates/leaderboards.html | 250 ------------------------------------ templates/main.html | 22 ++++ templates/music.html | 63 --------- 7 files changed, 22 insertions(+), 538 deletions(-) delete mode 100644 static/royal.css delete mode 100644 templates/challenge1.html delete mode 100644 templates/diario.html delete mode 100644 templates/index.html delete mode 100644 templates/leaderboards.html create mode 100644 templates/main.html delete mode 100644 templates/music.html diff --git a/static/royal.css b/static/royal.css deleted file mode 100644 index 10a9c98d..00000000 --- a/static/royal.css +++ /dev/null @@ -1,116 +0,0 @@ -body { - background-color: #ff7f00; - color: black; -} - -table { - background-color: #fff2cd !important; - border-radius: 5px; -} - -.table td, .table th { - border: none !important; -} - -table.rl { - background: linear-gradient(to bottom,rgba(35,91,139,.5),rgba(16,54,84,.5)),linear-gradient(to right,rgba(35,91,139,.7),rgba(16,54,84,.7)) !important; - border-radius: 6px !important; - border: none !important; - padding: 12px !important; - color: white !important; -} - -table.dota { - background-color: #2e2d45 !important; - border: none !important; - padding: 12px !important; - color: white !important; -} - -table.dota th { - border-bottom: 1px solid #666 !important; -} - -.dota-rank-medal-stars { - position: relative; - left: -32px; - margin-right: -32px; -} - -.rl-rank-hidden { - display: none; -} - -.rl-rank-text { - display: inline-block; - vertical-align: middle; -} - -.rl-rank-division { - font-size: 9px; -} - -.thirtytwo { - width: 32px; - height: 32px; -} - -.round { - border-radius: 16px; -} - -.slightly-round { - border-radius: 2px; -} - -.rl-rank-number { - line-height: 14px; -} - -.unranked { - color: grey; -} - -th { - cursor: pointer !important; -} - -.scatola { - background-color: #fff2cc; - border-radius: 5px; - padding-left: 12px; - padding-right: 12px; - margin-left: 5px; - margin-right: 5px; - font-size: large; -} - -.diario-entry { - margin-top: 8px; - margin-bottom: 8px; -} - -.diario-data { - font-size: small; -} - -.saver-data { - font-size: smaller; -} - -.timestamp-data { - text-align: right; -} - -.challenge-bar { - height: 100px; -} - -.challenge-bar.progress { - background-color: orange; -} - -.challenge-bar.progress-bar { - background-color: yellow; - color: black; -} \ No newline at end of file diff --git a/templates/challenge1.html b/templates/challenge1.html deleted file mode 100644 index cdbfbf3c..00000000 --- a/templates/challenge1.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - Challenge 1 - RYG - - - - -
-

- Royal Challenge -

-

- La Prima Sfida -

-

- L'obiettivo di questa settimana sarà di raggiungere {{ (target) | int }}pp totali su osu! Ovvero, di guadagnare {{ (target-starting) | int }}pp in qualsiasi modalità partendo da adesso. -

-

- - Più che altro è per provare una roba con il database della Royal Games, però sarebbe bello che tutti provassero a fare qualche pp... - -

-
-
- {{ (result-starting) | int }}pp -
-
-
- - \ No newline at end of file diff --git a/templates/diario.html b/templates/diario.html deleted file mode 100644 index fdfccffd..00000000 --- a/templates/diario.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - Diario - RYG - - - - -
-

- Diario Royal Games -

- {% for entry in diario_data %} -
-
-
- {% if entry.saver %} -
- Salvato da {{ entry.saver.royal.username }} -
- {% endif %} - {% if entry.author %} -
- {{ entry.author.royal.username }} -
- {% endif %} -
-
-
- {{ entry.timestamp.ctime() }} -
-
-
-
- {{ entry.text }} -
-
- {% endfor %} -
- - \ No newline at end of file diff --git a/templates/index.html b/templates/index.html deleted file mode 100644 index 0d69499c..00000000 --- a/templates/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Index - RYG - - - - -
-

- Royal Games -

-

- Prima o poi, qui ci sarà un sito bellissimo. - Molto poi che prima, secondo me. - Probabilmente farà prima ad uscire Half-Life 3 che il sito della Royal Games, ma almeno l'intenzione c'è. -

-
- Queste sono le pagine che sono più o meno finite: - -
-
- - \ No newline at end of file diff --git a/templates/leaderboards.html b/templates/leaderboards.html deleted file mode 100644 index 3481862e..00000000 --- a/templates/leaderboards.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - Leaderboards - RYG - - - - - -
-

- Royal Games Leaderboards -

-
- Le classifiche si aggiornano ogni ora -
-
-

- Dota 2 -

- - - - - - - - - - - {% for record in dota_data %} - - - - - - - {% endfor %} - -
RoyalSteamWinsRank
{{ record.steam.royal.username }} {{ record.steam.persona_name }}{{ record.wins }} - {% if record.rank_tier is none %} - {% elif record.rank_tier < 10 %} -
- - {{ record.rank_tier }} piazzamenti completati -
- {% else %} - {% if record.get_rank_stars_url() %}{% endif %} - {{ record.get_rank_name() }} {{ record.get_rank_number() }} - {% endif %} -
-
-
-

- Rocket League -

- - - - - - - - - - - - - {% for record in rl_data %} - - - - - - - - - {% endfor %} - -
RoyalSteamSingolo 1v1Doppio 2v2Standard 3v3Solo Standard SoloQ
{{ record.steam.royal.username }} {{ record.steam.persona_name }} - {% if record.single_rank is not none %} - -
-
{{ record.single_mmr }}
-
Div {{ record.single_div + 1 }}
-
- {% elif record.single_mmr is not none %} - -
-
{{ record.single_mmr }}
-
Inattivo
-
- {% endif %} - 		- {% if record.doubles_rank is not none %} - -
-
{{ record.doubles_mmr }}
-
Div {{ record.doubles_div + 1 }}
-
- {% elif record.doubles_mmr is not none %} - -
-
{{ record.doubles_mmr }}
-
Inattivo
-
- {% endif %} - 		- {% if record.standard_rank is not none %} - -
-
{{ record.standard_mmr }}
-
Div {{ record.standard_div + 1 }}
-
- {% elif record.standard_mmr is not none %} - -
-
{{ record.standard_mmr }}
-
Inattivo
-
- {% endif %} - 		- {% if record.solo_std_rank is not none %} - -
-
{{ record.solo_std_mmr }}
-
Div {{ record.solo_std_div + 1 }}
-
- {% elif record.solo_std_mmr is not none %} - -
-
{{ record.solo_std_mmr }}
-
Inattivo
-
- {% endif %} -
-
-
-

- Overwatch -

- - - - - - - - - - - {% for record in ow_data %} - - - - - - - {% endfor %} - -
RoyalBattletagLivelloRank
{{ record.royal.username }} {{ record }}{{ record.level }} - {% if record.rank is not none %} - - {{ record.rank }} - {% endif %} -
-
-
-

- Osu! -

- - - - - - - - - - - - - {% for record in osu_data %} - - - - - - - - - {% endfor %} - -
RoyalUsernameosu!osu!taikoosu!catchosu!mania
{{ record.royal.username }} {{ record.osu_name }}{{ record.std_pp|round(0, "floor")|int if record.std_pp is not none and record.std_pp >= 1 }}{{ record.taiko_pp|round(0, "floor")|int if record.taiko_pp is not none and record.taiko_pp >= 1 }}{{ record.catch_pp|round(0, "floor")|int if record.catch_pp is not none and record.catch_pp >= 1 }}{{ record.mania_pp|round(0, "floor")|int if record.mania_pp is not none and record.mania_pp >= 1 }}
-
-
-

- League of Legends -

- - - - - - - - - - - - - {% for record in lol_data %} - - - - - {% if record.solo_division is not none %} - - {% else %} - - {% endif %} - {% if record.flex_division is not none %} - - {% else %} - - {% endif %} - {% if record.twtr_division is not none %} - - {% else %} - - {% endif %} - - {% endfor %} - -
RoyalSummonerLivelloSolo SRFlex SRFlex TT
{{ record.royal.username }} {{ record.summoner_name }}{{ record.level }} {{ record.solo_division.name|capitalize }} {{ record.solo_rank.name }} {{ record.flex_division.name|capitalize }} {{ record.flex_rank.name }} {{ record.twtr_division.name|capitalize }} {{ record.twtr_rank.name }}
-
-
- - diff --git a/templates/main.html b/templates/main.html new file mode 100644 index 00000000..4e424b6c --- /dev/null +++ b/templates/main.html @@ -0,0 +1,22 @@ +{% extends 'base.html' %} + +{% block pagetitle %} + Royal Games +{% endblock %} + +{% block body %} +

+ Login +

+
+ + + + + +
+{% endblock %} \ No newline at end of file diff --git a/templates/music.html b/templates/music.html deleted file mode 100644 index d9738ab8..00000000 --- a/templates/music.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - Music - RYG - - - - - -
-

- Royal Music -

-
-

- File più ascoltati -

- - - - - - - - - {% for record in music_counts %} - - - - - {% endfor %} - -
FileAscoltato
{{ record.filename }}{{ record[1] }} volt{{ 'a' if record[1] == 1 else 'e' }}
-

- Cronologia -

- - - - - - - - - {% for record in music_last %} - - - {% if record.enqueuer is not none %} - - {% else %} - - {% endif %} - - {% endfor %} - -
FileAggiunto da
{{ record.filename }} {{ record.enqueuer }}
-
-
- -