summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/banner.js6
-rwxr-xr-xapp/bits/assets/graph.js11
-rw-r--r--app/demo/index.php2
-rw-r--r--app/emergency/index.php4
-rw-r--r--app/fronters/ponies/auvwc.pngbin0 -> 6074 bytes
-rw-r--r--app/fronters/ponies/bbrig.pngbin0 -> 5945 bytes
-rw-r--r--app/fronters/ponies/ghrby.pngbin0 -> 6337 bytes
-rw-r--r--app/fronters/ponies/mvaws.pngbin0 -> 7189 bytes
-rw-r--r--app/fronters/ponies/rirgf.pngbin24981 -> 5480 bytes
-rw-r--r--app/fronters/profiles/auvwc.pngbin0 -> 504733 bytes
-rw-r--r--app/fronters/profiles/ckqsw.pngbin237290 -> 237290 bytes
-rw-r--r--app/fronters/profiles/cmeyc.pngbin0 -> 1542918 bytes
-rw-r--r--app/fronters/profiles/dogwu.pngbin0 -> 2055 bytes
-rw-r--r--app/fronters/profiles/epvhq.pngbin0 -> 825561 bytes
-rw-r--r--app/fronters/profiles/erefx.pngbin826530 -> 826530 bytes
-rw-r--r--app/fronters/profiles/erknz.pngbin56915 -> 56915 bytes
-rw-r--r--app/fronters/profiles/exidq.pngbin0 -> 45898 bytes
-rw-r--r--app/fronters/profiles/ezqym.pngbin0 -> 184686 bytes
-rw-r--r--app/fronters/profiles/famxl.pngbin0 -> 825561 bytes
-rw-r--r--app/fronters/profiles/gevde.pngbin100880 -> 100880 bytes
-rw-r--r--app/fronters/profiles/gfhsr.pngbin2283131 -> 2283131 bytes
-rw-r--r--app/fronters/profiles/ghrby.pngbin0 -> 167497 bytes
-rw-r--r--app/fronters/profiles/ghuln.pngbin370233 -> 370233 bytes
-rw-r--r--app/fronters/profiles/hpwyq.pngbin2770 -> 2770 bytes
-rw-r--r--app/fronters/profiles/irxyh.pngbin26543 -> 26543 bytes
-rw-r--r--app/fronters/profiles/jhemc.pngbin0 -> 100880 bytes
-rw-r--r--app/fronters/profiles/jnbae.pngbin60223 -> 60223 bytes
-rw-r--r--app/fronters/profiles/khsbb.pngbin249236 -> 249236 bytes
-rw-r--r--app/fronters/profiles/kkhbw.pngbin40300 -> 40300 bytes
-rw-r--r--app/fronters/profiles/lllfw.pngbin745786 -> 745786 bytes
-rw-r--r--app/fronters/profiles/lzlaq.pngbin26543 -> 26543 bytes
-rw-r--r--app/fronters/profiles/mglyq.pngbin91476 -> 91476 bytes
-rw-r--r--app/fronters/profiles/mhnqy.pngbin27452 -> 27452 bytes
-rw-r--r--app/fronters/profiles/mvaws.pngbin0 -> 473421 bytes
-rw-r--r--app/fronters/profiles/pabmo.pngbin124750 -> 124750 bytes
-rw-r--r--app/fronters/profiles/ppukh.pngbin0 -> 2843 bytes
-rw-r--r--app/fronters/profiles/qbzxm.pngbin2843 -> 2843 bytes
-rw-r--r--app/fronters/profiles/qraku.pngbin45898 -> 45898 bytes
-rw-r--r--app/fronters/profiles/qzbpf.pngbin0 -> 56915 bytes
-rw-r--r--app/fronters/profiles/rdstg.pngbin16881 -> 16881 bytes
-rw-r--r--app/fronters/profiles/rirgf.pngbin825561 -> 825561 bytes
-rw-r--r--app/fronters/profiles/rpjok.pngbin1542918 -> 1542918 bytes
-rw-r--r--app/fronters/profiles/sbxze.pngbin50554 -> 50554 bytes
-rw-r--r--app/fronters/profiles/sehke.pngbin1947 -> 1947 bytes
-rw-r--r--app/fronters/profiles/sjuao.pngbin0 -> 1045570 bytes
-rw-r--r--app/fronters/profiles/souga.pngbin0 -> 45898 bytes
-rw-r--r--app/fronters/profiles/tfbob.pngbin14049 -> 14049 bytes
-rw-r--r--app/fronters/profiles/tmgiu.pngbin260760 -> 260760 bytes
-rw-r--r--app/fronters/profiles/trefr.pngbin0 -> 1947 bytes
-rw-r--r--app/fronters/profiles/vahcl.pngbin0 -> 45898 bytes
-rw-r--r--app/fronters/profiles/vncoa.pngbin46475 -> 46475 bytes
-rw-r--r--app/fronters/profiles/vvsxf.pngbin61010 -> 61010 bytes
-rw-r--r--app/fronters/profiles/wjovt.pngbin0 -> 2097 bytes
-rw-r--r--app/fronters/profiles/xbvwt.pngbin70342 -> 70342 bytes
-rw-r--r--app/fronters/profiles/xcjhj.pngbin107053 -> 107053 bytes
-rw-r--r--app/fronters/profiles/ynpba.pngbin0 -> 69145 bytes
-rw-r--r--app/fronters/profiles/zajrk.pngbin2097 -> 2097 bytes
-rw-r--r--app/fronters/profiles/zdtsg.pngbin3046 -> 3046 bytes
-rw-r--r--app/fronters/profiles/zhtzs.pngbin673763 -> 673763 bytes
-rw-r--r--app/fronters/profiles/ztfjz.pngbin184686 -> 184686 bytes
-rw-r--r--app/fronters/profiles/zzise.pngbin69145 -> 69145 bytes
-rwxr-xr-xapp/fronters/script.js2
-rw-r--r--app/functions.js4
-rw-r--r--app/index.html4
-rw-r--r--app/load.js105
-rw-r--r--app/planner/index.php14
-rw-r--r--app/sw.js29
67 files changed, 107 insertions, 74 deletions
diff --git a/app/banner.js b/app/banner.js
index 6815de1..a3e6173 100644
--- a/app/banner.js
+++ b/app/banner.js
@@ -183,20 +183,20 @@ async function refreshBanner(offline, french) {
<span>
<b>${french ? (data['relations']['marefriends'].length > 1 ? 'Partenaires ' : 'Partenaire ') : `Marefriend${data['relations']['marefriends'].length > 1 ? 's' : ''}`}: </b>${data['relations']['marefriends'].length > 1 ? '<span class="list-separator-mobile"><br></span>' : ''}
${data['relations']['marefriends'].map(relation => `
- <a title="${relation['name']}" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="${relation['link']}"><img src="${offline ? relation['icon_offline'] : `/assets/uploads/${relation['icon']}`}" style="width:24px;"></a>`).join(``)}
+ <a title="${relation['name']}" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="${relation['link']}"><img src="${offline ? relation['icon_offline'] : `${relation['icon']}`}" style="width:24px;"></a>`).join(``)}
${data['relations']['marefriends'].length === 0 ? '-' : ''}
</span>
<span>
<b>${french ? (data['relations']['sisters'].length > 1 ? 'Sœurs ' : 'Sœur ') : `Sister${data['relations']['sisters'].length > 1 ? 's' : ''}`}: </b>${data['relations']['sisters'].length > 1 ? '<span class="list-separator-mobile"><br></span>' : ''}
${data['relations']['sisters'].map(relation => `
- <a title="${relation['name']}" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="${relation['link']}"><img src="${offline ? relation['icon_offline'] : `/assets/uploads/${relation['icon']}`}" style="width:24px;"></a>`).join(``)}
+ <a title="${relation['name']}" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="${relation['link']}"><img src="${offline ? relation['icon_offline'] : `${relation['icon']}`}" style="width:24px;"></a>`).join(``)}
${data['relations']['sisters'].length === 0 ? '-' : ''}
</span>
${data['little'] ? `
<span>
<b>${french ? (data['relations']['sisters'].length > 1 ? 'Caretakers ' : 'Caretaker ') : `Caretaker${data['relations']['caretakers'].length > 1 ? 's' : ''}`}: </b>${data['relations']['caretakers'].length > 1 ? '<span class="list-separator-mobile"><br></span>' : ''}
${data['relations']['caretakers'].map(relation => `
- <a title="${relation['name']}" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="${relation['link']}"><img src="${offline ? relation['icon_offline'] : `/assets/uploads/${relation['icon']}`}" style="width:24px;"></a>`).join(``)}
+ <a title="${relation['name']}" data-bs-toggle="tooltip" class="member-link tooltip-nohelp" href="${relation['link']}"><img src="${offline ? relation['icon_offline'] : `${relation['icon']}`}" style="width:24px;"></a>`).join(``)}
${data['relations']['caretakers'].length === 0 ? '-' : ''}
</span>
` : ''}
diff --git a/app/bits/assets/graph.js b/app/bits/assets/graph.js
index 908c2e9..0503b99 100755
--- a/app/bits/assets/graph.js
+++ b/app/bits/assets/graph.js
@@ -25,14 +25,9 @@ const graph = new Chart(ctx, {
}
},
scaleLabel: "<%=value%>%",
- legend: {
- display: false
- },
- tooltips: {
- callbacks: {
- label: function(tooltipItem, data) {
- return data.labels[tooltipItem.index] + ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index] + '€';
- }
+ plugins: {
+ legend: {
+ display: false
}
}
}
diff --git a/app/demo/index.php b/app/demo/index.php
index 154f099..cd54738 100644
--- a/app/demo/index.php
+++ b/app/demo/index.php
@@ -1,3 +1,3 @@
<?php
-require_once $_SERVER['DOCUMENT_ROOT'] . "/pages/demo.php"; \ No newline at end of file
+require_once $_SERVER['DOCUMENT_ROOT'] . "/pages/demo.inc"; \ No newline at end of file
diff --git a/app/emergency/index.php b/app/emergency/index.php
index d8cfedf..c6e1436 100644
--- a/app/emergency/index.php
+++ b/app/emergency/index.php
@@ -1,4 +1,4 @@
-<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; global $isLoggedIn; if (!$isLoggedIn) header("Location: /-/login") and die(); ?>
+<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.inc"; global $isLoggedIn; if (!$isLoggedIn) header("Location: /-/login") and die(); ?>
<!DOCTYPE html>
<html lang="en">
@@ -26,7 +26,7 @@
<body>
<div class="container">
<br>
- <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/emergency.php"; ?>
+ <?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/emergency.inc"; ?>
</div>
</body>
</html> \ No newline at end of file
diff --git a/app/fronters/ponies/auvwc.png b/app/fronters/ponies/auvwc.png
new file mode 100644
index 0000000..c87a4f8
--- /dev/null
+++ b/app/fronters/ponies/auvwc.png
Binary files differ
diff --git a/app/fronters/ponies/bbrig.png b/app/fronters/ponies/bbrig.png
new file mode 100644
index 0000000..c5e2e3c
--- /dev/null
+++ b/app/fronters/ponies/bbrig.png
Binary files differ
diff --git a/app/fronters/ponies/ghrby.png b/app/fronters/ponies/ghrby.png
new file mode 100644
index 0000000..f7fe2f8
--- /dev/null
+++ b/app/fronters/ponies/ghrby.png
Binary files differ
diff --git a/app/fronters/ponies/mvaws.png b/app/fronters/ponies/mvaws.png
new file mode 100644
index 0000000..5f51abe
--- /dev/null
+++ b/app/fronters/ponies/mvaws.png
Binary files differ
diff --git a/app/fronters/ponies/rirgf.png b/app/fronters/ponies/rirgf.png
index 9f4096c..315321f 100644
--- a/app/fronters/ponies/rirgf.png
+++ b/app/fronters/ponies/rirgf.png
Binary files differ
diff --git a/app/fronters/profiles/auvwc.png b/app/fronters/profiles/auvwc.png
new file mode 100644
index 0000000..824a20f
--- /dev/null
+++ b/app/fronters/profiles/auvwc.png
Binary files differ
diff --git a/app/fronters/profiles/ckqsw.png b/app/fronters/profiles/ckqsw.png
index aa8b705..c12493f 100644
--- a/app/fronters/profiles/ckqsw.png
+++ b/app/fronters/profiles/ckqsw.png
Binary files differ
diff --git a/app/fronters/profiles/cmeyc.png b/app/fronters/profiles/cmeyc.png
new file mode 100644
index 0000000..b13c2b1
--- /dev/null
+++ b/app/fronters/profiles/cmeyc.png
Binary files differ
diff --git a/app/fronters/profiles/dogwu.png b/app/fronters/profiles/dogwu.png
new file mode 100644
index 0000000..4404e65
--- /dev/null
+++ b/app/fronters/profiles/dogwu.png
Binary files differ
diff --git a/app/fronters/profiles/epvhq.png b/app/fronters/profiles/epvhq.png
new file mode 100644
index 0000000..30b1160
--- /dev/null
+++ b/app/fronters/profiles/epvhq.png
Binary files differ
diff --git a/app/fronters/profiles/erefx.png b/app/fronters/profiles/erefx.png
index e5175fb..afdef5c 100644
--- a/app/fronters/profiles/erefx.png
+++ b/app/fronters/profiles/erefx.png
Binary files differ
diff --git a/app/fronters/profiles/erknz.png b/app/fronters/profiles/erknz.png
index 4d1f0dd..2fbea15 100644
--- a/app/fronters/profiles/erknz.png
+++ b/app/fronters/profiles/erknz.png
Binary files differ
diff --git a/app/fronters/profiles/exidq.png b/app/fronters/profiles/exidq.png
new file mode 100644
index 0000000..9b72e5a
--- /dev/null
+++ b/app/fronters/profiles/exidq.png
Binary files differ
diff --git a/app/fronters/profiles/ezqym.png b/app/fronters/profiles/ezqym.png
new file mode 100644
index 0000000..36d34f6
--- /dev/null
+++ b/app/fronters/profiles/ezqym.png
Binary files differ
diff --git a/app/fronters/profiles/famxl.png b/app/fronters/profiles/famxl.png
new file mode 100644
index 0000000..9a28b13
--- /dev/null
+++ b/app/fronters/profiles/famxl.png
Binary files differ
diff --git a/app/fronters/profiles/gevde.png b/app/fronters/profiles/gevde.png
index f08887d..b000840 100644
--- a/app/fronters/profiles/gevde.png
+++ b/app/fronters/profiles/gevde.png
Binary files differ
diff --git a/app/fronters/profiles/gfhsr.png b/app/fronters/profiles/gfhsr.png
index 1d12f37..72f5a89 100644
--- a/app/fronters/profiles/gfhsr.png
+++ b/app/fronters/profiles/gfhsr.png
Binary files differ
diff --git a/app/fronters/profiles/ghrby.png b/app/fronters/profiles/ghrby.png
new file mode 100644
index 0000000..c0d75f8
--- /dev/null
+++ b/app/fronters/profiles/ghrby.png
Binary files differ
diff --git a/app/fronters/profiles/ghuln.png b/app/fronters/profiles/ghuln.png
index d975de1..3856e60 100644
--- a/app/fronters/profiles/ghuln.png
+++ b/app/fronters/profiles/ghuln.png
Binary files differ
diff --git a/app/fronters/profiles/hpwyq.png b/app/fronters/profiles/hpwyq.png
index 6014172..447f028 100644
--- a/app/fronters/profiles/hpwyq.png
+++ b/app/fronters/profiles/hpwyq.png
Binary files differ
diff --git a/app/fronters/profiles/irxyh.png b/app/fronters/profiles/irxyh.png
index ff9b84a..652a951 100644
--- a/app/fronters/profiles/irxyh.png
+++ b/app/fronters/profiles/irxyh.png
Binary files differ
diff --git a/app/fronters/profiles/jhemc.png b/app/fronters/profiles/jhemc.png
new file mode 100644
index 0000000..4c71982
--- /dev/null
+++ b/app/fronters/profiles/jhemc.png
Binary files differ
diff --git a/app/fronters/profiles/jnbae.png b/app/fronters/profiles/jnbae.png
index 67a3cc6..0a9d069 100644
--- a/app/fronters/profiles/jnbae.png
+++ b/app/fronters/profiles/jnbae.png
Binary files differ
diff --git a/app/fronters/profiles/khsbb.png b/app/fronters/profiles/khsbb.png
index 4a19d1d..27a85bd 100644
--- a/app/fronters/profiles/khsbb.png
+++ b/app/fronters/profiles/khsbb.png
Binary files differ
diff --git a/app/fronters/profiles/kkhbw.png b/app/fronters/profiles/kkhbw.png
index db09107..62ff738 100644
--- a/app/fronters/profiles/kkhbw.png
+++ b/app/fronters/profiles/kkhbw.png
Binary files differ
diff --git a/app/fronters/profiles/lllfw.png b/app/fronters/profiles/lllfw.png
index 922ae6f..c09cfc1 100644
--- a/app/fronters/profiles/lllfw.png
+++ b/app/fronters/profiles/lllfw.png
Binary files differ
diff --git a/app/fronters/profiles/lzlaq.png b/app/fronters/profiles/lzlaq.png
index 19890f3..3341acf 100644
--- a/app/fronters/profiles/lzlaq.png
+++ b/app/fronters/profiles/lzlaq.png
Binary files differ
diff --git a/app/fronters/profiles/mglyq.png b/app/fronters/profiles/mglyq.png
index 2350ce9..9258fb2 100644
--- a/app/fronters/profiles/mglyq.png
+++ b/app/fronters/profiles/mglyq.png
Binary files differ
diff --git a/app/fronters/profiles/mhnqy.png b/app/fronters/profiles/mhnqy.png
index bbc296e..fdd5963 100644
--- a/app/fronters/profiles/mhnqy.png
+++ b/app/fronters/profiles/mhnqy.png
Binary files differ
diff --git a/app/fronters/profiles/mvaws.png b/app/fronters/profiles/mvaws.png
new file mode 100644
index 0000000..6a2cc05
--- /dev/null
+++ b/app/fronters/profiles/mvaws.png
Binary files differ
diff --git a/app/fronters/profiles/pabmo.png b/app/fronters/profiles/pabmo.png
index 855989d..5bda618 100644
--- a/app/fronters/profiles/pabmo.png
+++ b/app/fronters/profiles/pabmo.png
Binary files differ
diff --git a/app/fronters/profiles/ppukh.png b/app/fronters/profiles/ppukh.png
new file mode 100644
index 0000000..a0f10cd
--- /dev/null
+++ b/app/fronters/profiles/ppukh.png
Binary files differ
diff --git a/app/fronters/profiles/qbzxm.png b/app/fronters/profiles/qbzxm.png
index 59cfdaf..21fd437 100644
--- a/app/fronters/profiles/qbzxm.png
+++ b/app/fronters/profiles/qbzxm.png
Binary files differ
diff --git a/app/fronters/profiles/qraku.png b/app/fronters/profiles/qraku.png
index 0935261..67fb221 100644
--- a/app/fronters/profiles/qraku.png
+++ b/app/fronters/profiles/qraku.png
Binary files differ
diff --git a/app/fronters/profiles/qzbpf.png b/app/fronters/profiles/qzbpf.png
new file mode 100644
index 0000000..904b914
--- /dev/null
+++ b/app/fronters/profiles/qzbpf.png
Binary files differ
diff --git a/app/fronters/profiles/rdstg.png b/app/fronters/profiles/rdstg.png
index 3a28375..ac28034 100644
--- a/app/fronters/profiles/rdstg.png
+++ b/app/fronters/profiles/rdstg.png
Binary files differ
diff --git a/app/fronters/profiles/rirgf.png b/app/fronters/profiles/rirgf.png
index 3fdf039..428032d 100644
--- a/app/fronters/profiles/rirgf.png
+++ b/app/fronters/profiles/rirgf.png
Binary files differ
diff --git a/app/fronters/profiles/rpjok.png b/app/fronters/profiles/rpjok.png
index 1475d47..283cd2a 100644
--- a/app/fronters/profiles/rpjok.png
+++ b/app/fronters/profiles/rpjok.png
Binary files differ
diff --git a/app/fronters/profiles/sbxze.png b/app/fronters/profiles/sbxze.png
index 4390c22..f70ee90 100644
--- a/app/fronters/profiles/sbxze.png
+++ b/app/fronters/profiles/sbxze.png
Binary files differ
diff --git a/app/fronters/profiles/sehke.png b/app/fronters/profiles/sehke.png
index efcdf4a..ef93187 100644
--- a/app/fronters/profiles/sehke.png
+++ b/app/fronters/profiles/sehke.png
Binary files differ
diff --git a/app/fronters/profiles/sjuao.png b/app/fronters/profiles/sjuao.png
new file mode 100644
index 0000000..16a4dd5
--- /dev/null
+++ b/app/fronters/profiles/sjuao.png
Binary files differ
diff --git a/app/fronters/profiles/souga.png b/app/fronters/profiles/souga.png
new file mode 100644
index 0000000..fdde626
--- /dev/null
+++ b/app/fronters/profiles/souga.png
Binary files differ
diff --git a/app/fronters/profiles/tfbob.png b/app/fronters/profiles/tfbob.png
index a63b6e3..edf68db 100644
--- a/app/fronters/profiles/tfbob.png
+++ b/app/fronters/profiles/tfbob.png
Binary files differ
diff --git a/app/fronters/profiles/tmgiu.png b/app/fronters/profiles/tmgiu.png
index acaf6f3..bb45dc3 100644
--- a/app/fronters/profiles/tmgiu.png
+++ b/app/fronters/profiles/tmgiu.png
Binary files differ
diff --git a/app/fronters/profiles/trefr.png b/app/fronters/profiles/trefr.png
new file mode 100644
index 0000000..fec4dc3
--- /dev/null
+++ b/app/fronters/profiles/trefr.png
Binary files differ
diff --git a/app/fronters/profiles/vahcl.png b/app/fronters/profiles/vahcl.png
new file mode 100644
index 0000000..aeb7ba9
--- /dev/null
+++ b/app/fronters/profiles/vahcl.png
Binary files differ
diff --git a/app/fronters/profiles/vncoa.png b/app/fronters/profiles/vncoa.png
index ac1596f..e49a38f 100644
--- a/app/fronters/profiles/vncoa.png
+++ b/app/fronters/profiles/vncoa.png
Binary files differ
diff --git a/app/fronters/profiles/vvsxf.png b/app/fronters/profiles/vvsxf.png
index df4566d..009b060 100644
--- a/app/fronters/profiles/vvsxf.png
+++ b/app/fronters/profiles/vvsxf.png
Binary files differ
diff --git a/app/fronters/profiles/wjovt.png b/app/fronters/profiles/wjovt.png
new file mode 100644
index 0000000..8d40347
--- /dev/null
+++ b/app/fronters/profiles/wjovt.png
Binary files differ
diff --git a/app/fronters/profiles/xbvwt.png b/app/fronters/profiles/xbvwt.png
index 2b94fa8..2d76e48 100644
--- a/app/fronters/profiles/xbvwt.png
+++ b/app/fronters/profiles/xbvwt.png
Binary files differ
diff --git a/app/fronters/profiles/xcjhj.png b/app/fronters/profiles/xcjhj.png
index 02a635f..31ca4b9 100644
--- a/app/fronters/profiles/xcjhj.png
+++ b/app/fronters/profiles/xcjhj.png
Binary files differ
diff --git a/app/fronters/profiles/ynpba.png b/app/fronters/profiles/ynpba.png
new file mode 100644
index 0000000..61e9a74
--- /dev/null
+++ b/app/fronters/profiles/ynpba.png
Binary files differ
diff --git a/app/fronters/profiles/zajrk.png b/app/fronters/profiles/zajrk.png
index ebfc4d8..3f960fb 100644
--- a/app/fronters/profiles/zajrk.png
+++ b/app/fronters/profiles/zajrk.png
Binary files differ
diff --git a/app/fronters/profiles/zdtsg.png b/app/fronters/profiles/zdtsg.png
index 1c1704d..e3aff68 100644
--- a/app/fronters/profiles/zdtsg.png
+++ b/app/fronters/profiles/zdtsg.png
Binary files differ
diff --git a/app/fronters/profiles/zhtzs.png b/app/fronters/profiles/zhtzs.png
index 2af80d2..b802367 100644
--- a/app/fronters/profiles/zhtzs.png
+++ b/app/fronters/profiles/zhtzs.png
Binary files differ
diff --git a/app/fronters/profiles/ztfjz.png b/app/fronters/profiles/ztfjz.png
index cb81f5f..e604ed1 100644
--- a/app/fronters/profiles/ztfjz.png
+++ b/app/fronters/profiles/ztfjz.png
Binary files differ
diff --git a/app/fronters/profiles/zzise.png b/app/fronters/profiles/zzise.png
index d200bdf..d767964 100644
--- a/app/fronters/profiles/zzise.png
+++ b/app/fronters/profiles/zzise.png
Binary files differ
diff --git a/app/fronters/script.js b/app/fronters/script.js
index 6450bba..4e51b22 100755
--- a/app/fronters/script.js
+++ b/app/fronters/script.js
@@ -1,7 +1,7 @@
function getMiniName(name) {
let parts = name.split(" ");
- if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy") {
+ if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy" && parts[1] !== "Brightdawn") {
if (parts[0].includes("/")) {
return parts[0].split("/")[0];
} else {
diff --git a/app/functions.js b/app/functions.js
index 207bc42..4d89e30 100644
--- a/app/functions.js
+++ b/app/functions.js
@@ -1,9 +1,9 @@
-// Function ported from /includes/header.php (line 18)
+// Function ported from /includes/header.inc (line 18)
// Ported function has matched behavior.
function getMiniName(name) {
let parts = name.split(" ");
- if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy") {
+ if (parts[0].length > 3 && !parts[0].endsWith("e") && parts[0] !== "Filly" && parts[0] !== "Windy" && parts[1] !== "Brightdawn") {
if (parts[0].includes("/")) {
return parts[0].split("/")[0];
} else {
diff --git a/app/index.html b/app/index.html
index 22ee9a9..e8fd5a0 100644
--- a/app/index.html
+++ b/app/index.html
@@ -291,7 +291,7 @@
<div style="width:100%;">
<div class="container">
<br><br>
- <h2 style="text-align: center;"><img id="home-avatar" alt="" src="" style="width: 48px;height: 48px;border-radius: 999px;vertical-align: middle;"> &nbsp;<span style="vertical-align: middle;"><span id="home-greeting">Greetings</span> <span id="home-name">Name</span>!</span></h2>
+ <h2 style="text-align: center;" id="home-front"><img id="home-avatar" alt="" src="" style="width: 48px;height: 48px;border-radius: 999px;vertical-align: middle;"> &nbsp;<span style="vertical-align: middle;"><span id="home-greeting">Greetings</span> <span id="home-name">Name</span>!</span></h2>
<br>
<div id="home-apps">
@@ -313,7 +313,7 @@
</a>
</div>
</div>
- <p style="text-align: center;margin-top:15px;"><b style="vertical-align: middle;">In the <span id="home-other-system">other system</span>:</b> <img id="home-other-img" alt="" src="" style="vertical-align:middle;width:24px;height:24px;border-radius:999px;background:#333;"> <span id="home-other-name" style="vertical-align: middle;">Some member</span></p>
+ <p id="home-other" style="text-align: center;margin-top:15px;"><b style="vertical-align: middle;">In the <span id="home-other-system">other system</span>:</b> <img id="home-other-img" alt="" src="" style="vertical-align:middle;width:24px;height:24px;border-radius:999px;background:#333;"> <span id="home-other-name" style="vertical-align: middle;">Some member</span></p>
</div>
</div>
<div>
diff --git a/app/load.js b/app/load.js
index 1be0b57..97b030a 100644
--- a/app/load.js
+++ b/app/load.js
@@ -17,32 +17,32 @@ window.connected = false;
let valuesToGet = {
"pluralkit-cloudburst-members": {
- url: "/api/data?f=ynmuc-members.json",
+ url: "/api/data?f=ynmuc/members.json",
limited: false,
name: "Members at Cloudburst...",
},
"pluralkit-cloudburst-fronters": {
- url: "/api/data?f=ynmuc-fronters.json",
+ url: "/api/data?f=ynmuc/fronters.json",
limited: false,
name: "Fronters at Cloudburst...",
},
"pluralkit-cloudburst-switches": {
- url: "/api/data?f=ynmuc-switches.json",
+ url: "/api/data?f=ynmuc/switches.json",
limited: false,
name: "Switches at Cloudburst...",
},
"pluralkit-raindrops-members": {
- url: "/api/data?f=gdapd-members.json",
+ url: "/api/data?f=gdapd/members.json",
limited: false,
name: "Members at Raindrops...",
},
"pluralkit-raindrops-fronters": {
- url: "/api/data?f=gdapd-fronters.json",
+ url: "/api/data?f=gdapd/fronters.json",
limited: false,
name: "Fronters at Raindrops...",
},
"pluralkit-raindrops-switches": {
- url: "/api/data?f=gdapd-switches.json",
+ url: "/api/data?f=gdapd/switches.json",
limited: false,
name: "Switches at Raindrops...",
},
@@ -243,55 +243,64 @@ async function postLoad() {
try {
let member = window.currentFronter;
await (await window.fetch("/bits/Application/SetCurrentIdentity/index.php?Name=" + btoa(member['display_name'] ?? member['name']).replaceAll("+", "-").replaceAll("/", "_") + "&Picture=" + btoa(member['avatar_url'] ?? "./assets/default.png").replaceAll("+", "-").replaceAll("/", "_"))).text();
- } catch (e) {}
+ } catch (e) {
+ try {
+ await (await window.fetch("/bits/Application/SetCurrentIdentity/index.php?Name=" + btoa(window.data['pluralkit-' + window.data['identity'].id + '-members'].filter(i => i.name === "unknown")[0]['display_name']).replaceAll("+", "-").replaceAll("/", "_") + "&Picture=" + btoa(window.data['pluralkit-' + window.data['identity'].id + '-members'].filter(i => i.name === "unknown")[0]['avatar_url']).replaceAll("+", "-").replaceAll("/", "_"))).text();
+ } catch (e) {}
+ }
- document.getElementById("home-name").innerText = getMiniName(window.currentFronter['display_name'] ?? window.currentFronter['name']);
- document.getElementById("home-avatar").src = window.data['image-me'];
-
- switch (new Date().getHours()) {
- case 0:
- case 1:
- case 2:
- case 3:
- case 4:
- case 5:
- document.getElementById("home-greeting").innerText = "Good night";
- break;
-
- case 6:
- case 7:
- case 8:
- case 9:
- case 10:
- case 11:
- document.getElementById("home-greeting").innerText = "Good morning";
- break;
-
- case 12:
- case 13:
- case 14:
- case 15:
- case 16:
- case 17:
- document.getElementById("home-greeting").innerText = "Good afternoon";
- break;
-
- case 18:
- case 19:
- case 20:
- case 21:
- case 22:
- case 23:
- document.getElementById("home-greeting").innerText = "Good evening";
- break;
+ try {
+ document.getElementById("home-name").innerText = getMiniName(window.currentFronter['display_name'] ?? window.currentFronter['name']);
+ document.getElementById("home-avatar").src = window.data['image-me'];
+
+ switch (new Date().getHours()) {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ case 4:
+ case 5:
+ document.getElementById("home-greeting").innerText = "Good night";
+ break;
+
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ document.getElementById("home-greeting").innerText = "Good morning";
+ break;
+
+ case 12:
+ case 13:
+ case 14:
+ case 15:
+ case 16:
+ case 17:
+ document.getElementById("home-greeting").innerText = "Good afternoon";
+ break;
+
+ case 18:
+ case 19:
+ case 20:
+ case 21:
+ case 22:
+ case 23:
+ document.getElementById("home-greeting").innerText = "Good evening";
+ break;
+ }
+ } catch (e) {
+ document.getElementById("home-front").style.display = "none";
}
window.otherSystem = window.data.identity.id === "raindrops" ? "cloudburst" : "raindrops";
window.otherFronters = window.data["pluralkit-" + otherSystem + "-fronters"];
document.getElementById("home-other-system").innerText = otherSystem === "raindrops" ? "Raindrops System" : "Cloudburst System";
- document.getElementById("home-other-name").innerText = window.otherFronters.members[0].display_name ?? window.otherFronters.members[0].name;
- document.getElementById("home-other-img").src = window.images.profile[otherSystem === "raindrops" ? "gdapd" : "ynmuc"][window.otherFronters.members[0].id];
+ if (window.otherFronters.members[0]) document.getElementById("home-other-name").innerText = window.otherFronters.members[0].display_name ?? window.otherFronters.members[0].name;
+ if (window.otherFronters.members[0]) document.getElementById("home-other-img").src = window.images.profile[otherSystem === "raindrops" ? "gdapd" : "ynmuc"][window.otherFronters.members[0].id];
+ if (!window.otherFronters.members[0]) document.getElementById("home-other").style.display = "none";
if (!window.connected) {
document.getElementById("home-app-planner").classList.add("disabled");
diff --git a/app/planner/index.php b/app/planner/index.php
index 775fec3..0ae3663 100644
--- a/app/planner/index.php
+++ b/app/planner/index.php
@@ -1,4 +1,4 @@
-<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.php"; global $isLoggedIn; if (!$isLoggedIn) header("Location: /-/login") and die(); ?>
+<?php require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/session.inc"; global $isLoggedIn; if (!$isLoggedIn) header("Location: /-/login") and die(); ?>
<!DOCTYPE html>
<html lang="en">
@@ -33,13 +33,13 @@
<br>
<?php
- require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/score.php";
- require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/bitset.php";
+ require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/score.inc";
+ require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/bitset.inc";
function getMiniName(string $name) {
$parts = explode(" ", $name);
- if (strlen($parts[0]) > 3 && !str_ends_with($parts[0], "e") && $parts[0] !== "Filly" && $parts[0] !== "Windy") {
+ if (strlen($parts[0]) > 3 && !str_ends_with($parts[0], "e") && $parts[0] !== "Filly" && $parts[0] !== "Windy" && (isset($parts[1]) && $parts[1] !== "Brightdawn")) {
if (str_contains($parts[0], "/")) {
return explode("/", $parts[0])[0];
} else {
@@ -53,17 +53,19 @@
function getSystemMember(string $system, string $id) {
$systemID = $system;
- $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID-members.json"), true);
+ $members = json_decode(file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/includes/data/$systemID/members.json"), true);
$member = null;
foreach ($members as $m) {
if ($m["id"] === $id) $member = $m;
}
+ $member["system"] = $member["_system"] = $system;
+
return $member;
}
- require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/planner.php"; ?>
+ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/planner.inc"; ?>
</div>
</body>
</html> \ No newline at end of file
diff --git a/app/sw.js b/app/sw.js
index f355509..bb275bb 100644
--- a/app/sw.js
+++ b/app/sw.js
@@ -57,11 +57,13 @@ let filesToCache = [
"/app/fronters/bootstrap/bootstrap.js",
"/app/fronters/bootstrap/bootstrap.js.map",
"/app/fronters/index.html",
+ "/app/fronters/ponies/auvwc.png",
"/app/fronters/ponies/ckqsw.png",
"/app/fronters/ponies/erefx.png",
"/app/fronters/ponies/erknz.png",
"/app/fronters/ponies/gevde.png",
"/app/fronters/ponies/gfhsr.png",
+ "/app/fronters/ponies/ghrby.png",
"/app/fronters/ponies/hpwyq.png",
"/app/fronters/ponies/jnbae.png",
"/app/fronters/ponies/khsbb.png",
@@ -69,6 +71,7 @@ let filesToCache = [
"/app/fronters/ponies/lllfw.png",
"/app/fronters/ponies/mglyq.png",
"/app/fronters/ponies/mhnqy.png",
+ "/app/fronters/ponies/mvaws.png",
"/app/fronters/ponies/nabky.png",
"/app/fronters/ponies/pabmo.png",
"/app/fronters/ponies/qbzxm.png",
@@ -86,16 +89,25 @@ let filesToCache = [
"/app/fronters/ponies/zhtzs.png",
"/app/fronters/ponies/ztfjz.png",
"/app/fronters/ponies/zzise.png",
+ "/app/fronters/profiles/auvwc.png",
"/app/fronters/profiles/ckqsw.png",
+ "/app/fronters/profiles/cmeyc.png",
"/app/fronters/profiles/djnko.png",
+ "/app/fronters/profiles/dogwu.png",
+ "/app/fronters/profiles/epvhq.png",
"/app/fronters/profiles/erefx.png",
"/app/fronters/profiles/erknz.png",
+ "/app/fronters/profiles/exidq.png",
+ "/app/fronters/profiles/ezqym.png",
+ "/app/fronters/profiles/famxl.png",
"/app/fronters/profiles/flukm.png",
"/app/fronters/profiles/gevde.png",
"/app/fronters/profiles/gfhsr.png",
+ "/app/fronters/profiles/ghrby.png",
"/app/fronters/profiles/ghuln.png",
"/app/fronters/profiles/hpwyq.png",
"/app/fronters/profiles/irxyh.png",
+ "/app/fronters/profiles/jhemc.png",
"/app/fronters/profiles/jnbae.png",
"/app/fronters/profiles/khsbb.png",
"/app/fronters/profiles/kkhbw.png",
@@ -104,25 +116,34 @@ let filesToCache = [
"/app/fronters/profiles/lzlaq.png",
"/app/fronters/profiles/mglyq.png",
"/app/fronters/profiles/mhnqy.png",
+ "/app/fronters/profiles/mvaws.png",
"/app/fronters/profiles/mxpxm.png",
"/app/fronters/profiles/nabky.png",
"/app/fronters/profiles/pabmo.png",
+ "/app/fronters/profiles/ppukh.png",
"/app/fronters/profiles/qbzxm.png",
"/app/fronters/profiles/qraku.png",
+ "/app/fronters/profiles/qzbpf.png",
"/app/fronters/profiles/rdstg.png",
"/app/fronters/profiles/rirgf.png",
"/app/fronters/profiles/rmlbf.png",
"/app/fronters/profiles/rpjok.png",
"/app/fronters/profiles/sbxze.png",
"/app/fronters/profiles/sehke.png",
+ "/app/fronters/profiles/sjuao.png",
+ "/app/fronters/profiles/souga.png",
"/app/fronters/profiles/tfbob.png",
"/app/fronters/profiles/tgxst.png",
"/app/fronters/profiles/tmgiu.png",
+ "/app/fronters/profiles/trefr.png",
+ "/app/fronters/profiles/vahcl.png",
"/app/fronters/profiles/vncoa.png",
"/app/fronters/profiles/vvsxf.png",
+ "/app/fronters/profiles/wjovt.png",
"/app/fronters/profiles/xbvwt.png",
"/app/fronters/profiles/xcjhj.png",
"/app/fronters/profiles/ybmig.png",
+ "/app/fronters/profiles/ynpba.png",
"/app/fronters/profiles/zajrk.png",
"/app/fronters/profiles/zdtsg.png",
"/app/fronters/profiles/zhtzs.png",
@@ -160,9 +181,11 @@ let filesToCache = [
"/assets/uploads/pt-duskrainbow.png",
"/assets/uploads/pt-fluttershy.png",
"/assets/uploads/pt-frostcrystals.png",
- "/assets/uploads/pt-izzy.png",
+ "/assets/uploads/pt-izzymoonbow.png",
"/assets/uploads/pt-lavender.png",
+ "/assets/uploads/pt-lilacbloom.png",
"/assets/uploads/pt-mintygrape.png",
+ "/assets/uploads/pt-mistybrightdawn.png",
"/assets/uploads/pt-mistycloud.png",
"/assets/uploads/pt-mossystorm.png",
"/assets/uploads/pt-pipppetals.png",
@@ -172,20 +195,24 @@ let filesToCache = [
"/assets/uploads/pt-scootaloo.png",
"/assets/uploads/pt-skydream.png",
"/assets/uploads/pt-smolscoots.png",
+ "/assets/uploads/pt-smolsunny.png",
"/assets/uploads/pt-smoltwi.png",
"/assets/uploads/pt-starrynight.png",
"/assets/uploads/pt-stuffie.png",
"/assets/uploads/pt-sunnystarscout.png",
"/assets/uploads/pt-sweetiebelle.png",
"/assets/uploads/pt-sweetiebot.png",
+ "/assets/uploads/pt-thunder.png",
"/assets/uploads/pt-twilight.png",
"/assets/uploads/pt-velvet.png",
"/assets/uploads/pt-violetdawn.png",
"/assets/uploads/pt-windy.png",
"/assets/uploads/pt-windyleaves.png",
"/assets/uploads/pt-zippstorm.png",
+ "/assets/uploads/pt-zoomzephyrwing.png",
"/assets/uploads/pt.png",
"/assets/uploads/raindrops.png",
+ "/assets/uploads/ss-lostequestrians.png",
"/assets/uploads/ss-sparkles.png"
];