Skip to content

Commit

Permalink
Merge pull request #308 from ddnet/pr-funding-2025
Browse files Browse the repository at this point in the history 
2025 costs
  • Loading branch information
@def-
def- authored Jan 1, 2025
2 parents 58d6c32 + 0b39729 commit 61cc414
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 47 deletions.
67 changes: 31 additions & 36 deletions www/_includes/funding.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,47 @@
return Object.prototype.toString.call(arr) == '[object Array]';
};
var costs = {
"ddnet": [358, 431 + 60 + 59 + 27, "Insanity, archimede67, Scrumplex & ReD"], // includes vpn
"master": [32, 32, "野织"], // hetzner.de
"master2": 108, // kamatera.com
"db": [213, 254, "David*°Villa, 番茄炒蛋不 & Zerol Acqua"],
"ger2": "heinrich5991", // hetzner.de
"ger10": [264, 288, "Davide"], // lowhosting.com
"pol": [99, 99, "Teelevision"], // ovh.com
"fin1": 270, // hetzner.de
"fin2": 135, // hetzner.de
"ukr1": [6, 96], // hostiko.com.ua
"ukr2": 12, // hostiko.com.ua
"ukr3": 6, // hostiko.com.ua
"rus1": [547, 547, "BratOK, anonymous, zhn, ByFox & kartofel14"], // myarena.ru
"rus2": [608, 608, "heinrich5991, Exit, Lumpy ◐ω◑ & iwa"], // myarena.ru
"rus4": 20, // hetzner.de
"rus6": 10, // hetzner.de
"tur": 70, // lightnode.com
"bhr": 42, // lightnode.com
"ddnet": 421 + 60 + 59 + 27, // includes vpn
"master": 47, // hetzner.com
"master3": 51, // ovh.com
"db": 609,
"ger1": 288, // lowhosting.com
"ger2": "heinrich5991", // hetzner.com
"pol": 99, // ovh.com
"fin": 530, // hetzner.com
"ukr": 156, // gmhost.ua
"rus1": 608, // myarena.ru
"rus2": 608, // myarena.ru
"rus4": 47, // hetzner.com
"rus6": 47, // hetzner.com
"tur": 108, // lightnode.com
"bhr": 61, // lightnode.com
"irn": "Murphy",
"chl": [156, 156, "Konsti"], // grupocg.cl
"bra1": [29, 92, "coentro"], // linode.com
"bra2": 92, // linode.com
"chl": 156, // grupocg.cl
"bra1": 97, // linode.com
"bra2": 97, // linode.com
"arg": "Miguilim",
"per": "Miguilim",
"usa2": [55, 55, "Matrose l_I & Insanity"], // hetzner.com
"usa3": [120, 120, "YupHio & orbilo"], // nfoservers.com
"chn": [12, 537], // www.fxyun.com for CHN0-1
"usa2": 55, // hetzner.com
"usa3": 120, // nfoservers.com
"chn2": "Mind",
"chn3": "Mind",
"chn5": "琛哥",
"chn6": "SuY1Ran",
"chn7": "mixun",
"chn8": "满月",
"chn10": "Coke",
"twn": 216, // lightnode.com
"kor": 276, // vultr.com
"sgp": 73, // linode.com
"ind": 73, // linode.com
"aus": [43, 43, "Lem0n"], // ovh.com
"zaf": [66, 66, "archimede67"], // ivecloud.co.za
"twn": 207, // lightnode.com
"kor": 140, // vultr.com
"sgp": 70, // linode.com
"ind": 70, // linode.com
"aus": 43, // ovh.com
"zaf": 66, // ivecloud.co.za
};
var donated = 1514;
var yearStr = "2024";
var costOld = 1540 + /*2018:*/ 917 + /*2019:*/ 1327 + /*2020:*/ 1118 + /*2021:*/ 2612 + /*2022:*/ 3253 + /*2023:*/ 3308;
var donatedOld = 14075;
var yearStrOld = "2013-23";
var donated = 0;
var yearStr = "2025";
var costOld = 1540 + /*2018:*/ 917 + /*2019:*/ 1327 + /*2020:*/ 1118 + /*2021:*/ 2612 + /*2022:*/ 3253 + /*2023:*/ 3308 + /*2024 WIP*/ 4973;
var donatedOld = 18197;
var yearStrOld = "2013-24";

var sum = 0;
var sumToPay = 0;
Expand Down
16 changes: 5 additions & 11 deletions www/funding/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,13 @@ <h2 id="funding">Funding</h2>
<tr><td><br/></td></tr>
<tr><td>DDNet.org</td><td class="funding-bar"><div class="progressbar" id="funding-ddnet"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet Master</td><td class="funding-bar"><div class="progressbar" id="funding-master"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet Master2</td><td class="funding-bar"><div class="progressbar" id="funding-master2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet Master3</td><td class="funding-bar"><div class="progressbar" id="funding-master3"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet Database</td><td class="funding-bar"><div class="progressbar" id="funding-db"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet GER1</td><td class="funding-bar"><div class="progressbar" id="funding-ger1"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet GER2</td><td class="funding-bar"><div class="progressbar" id="funding-ger2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet GER1</td><td class="funding-bar"><div class="progressbar" id="funding-ger10"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet POL</td><td class="funding-bar"><div class="progressbar" id="funding-pol"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet FIN1</td><td class="funding-bar"><div class="progressbar" id="funding-fin1"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet FIN2</td><td class="funding-bar"><div class="progressbar" id="funding-fin2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet UKR1</td><td class="funding-bar"><div class="progressbar" id="funding-ukr1"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet UKR2</td><td class="funding-bar"><div class="progressbar" id="funding-ukr2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet UKR3</td><td class="funding-bar"><div class="progressbar" id="funding-ukr3"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet FIN</td><td class="funding-bar"><div class="progressbar" id="funding-fin1"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet UKR</td><td class="funding-bar"><div class="progressbar" id="funding-ukr"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet RUS1</td><td class="funding-bar"><div class="progressbar" id="funding-rus1"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet RUS2</td><td class="funding-bar"><div class="progressbar" id="funding-rus2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet RUS4</td><td class="funding-bar"><div class="progressbar" id="funding-rus4"><div class="progress-label"></div></div></td></tr>
Expand All @@ -46,11 +43,8 @@ <h2 id="funding">Funding</h2>
<tr><td>DDNet Brazil1</td><td class="funding-bar"><div class="progressbar" id="funding-bra1"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet Brazil2</td><td class="funding-bar"><div class="progressbar" id="funding-bra2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet Argentina</td><td class="funding-bar"><div class="progressbar" id="funding-arg"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet Peru</td><td class="funding-bar"><div class="progressbar" id="funding-per"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet USA2</td><td class="funding-bar"><div class="progressbar" id="funding-usa2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet USA3</td><td class="funding-bar"><div class="progressbar" id="funding-usa3"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet CHN</td><td class="funding-bar"><div class="progressbar" id="funding-chn"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet CHN2</td><td class="funding-bar"><div class="progressbar" id="funding-chn2"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet CHN3</td><td class="funding-bar"><div class="progressbar" id="funding-chn3"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet CHN5</td><td class="funding-bar"><div class="progressbar" id="funding-chn5"><div class="progress-label"></div></div></td></tr>
<tr><td>DDNet CHN6</td><td class="funding-bar"><div class="progressbar" id="funding-chn6"><div class="progress-label"></div></div></td></tr>
Expand All @@ -64,7 +58,7 @@ <h2 id="funding">Funding</h2>
<tr><td>DDNet South Africa</td><td class="funding-bar"><div class="progressbar" id="funding-zaf"><div class="progress-label"></div></div></td></tr>
<tr><td><br/></td></tr>
<tr><td colspan="2">When the current year is fully covered, we still appreciate donations to cover the costs of the last years:</td></tr>
<tr><td><strong>Total 2013 - 2023</strong></td><td class="funding-bar"><div class="progressbar" id="funding-old"><div class="progress-label"></div></div></td></tr>
<tr><td><strong>Total 2013 - 2024</strong></td><td class="funding-bar"><div class="progressbar" id="funding-old"><div class="progress-label"></div></div></td></tr>
</table>
</div>
{% include funding.html %}
Expand Down

0 comments on commit 61cc414

Please sign in to comment.