Skip to content

Commit db8db37

Browse files
ReadieFurReadieFur
committed
Merge branch 'development'
2 parents 4f24747 + e27c77b commit db8db37

File tree

14 files changed

+26
-26
lines changed

14 files changed

+26
-26
lines changed

Diff for: ‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# BSDP-Overlay
2-
## Access the tool [here.](https://readie.global-gaming.co/bsdp-overlay/)
2+
## Access the tool [here.](https://readiefur.com/bsdp-overlay/)
33
**Please Note:** that this tool is still in early acces and it is highly likley that there are many bugs that exist, the tool is not complete yet and there should be much more to come in the future.
44

55
## What is this?

Diff for: ‎src/assets/js/main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export class Main
9696
{
9797
let path = window.location.pathname.split("/").filter((el) => { return el != ""; });
9898
for (let i = 0; i < path.length; i++) { path[i] = path[i].replace("_", ""); }
99-
99+
100100
Main.ThrowIfNullOrUndefined(document.querySelector("#header")).querySelectorAll("a").forEach((element: HTMLLinkElement) =>
101101
{
102102
if (element.href == window.location.origin + window.location.pathname)
@@ -115,7 +115,7 @@ export class Main
115115
private WindowMessageEvent(ev: MessageEvent<any>): void
116116
{
117117
var host = window.location.host.split('.');
118-
if (ev.origin.split('/')[2] == `api-readie.global-gaming.${host[host.length - 1]}`)
118+
if (ev.origin.split('/')[2] == `api.readiefur.${host[host.length - 1]}`)
119119
{
120120
if (Main.TypeOfReturnData(ev.data))
121121
{

Diff for: ‎src/assets/js/overlay/client.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ export class SampleData
216216
SongAuthor: "Camellia",
217217
Mapper: "cerret",
218218
BSRKey: "11a27",
219-
coverImage: `https://readie.global-gaming.co/bsdp-overlay/assets/images/TeraIO.jpg`,
219+
coverImage: `https://readiefur.com/bsdp-overlay/assets/images/TeraIO.jpg`,
220220
Length: 336,
221221
TimeScale: 0,
222222
MapType: "Standard",

Diff for: ‎src/assets/overlay_elements/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<header id="header"><?php echo execAndRead("{$SITE_ROOT}/assets/php/header.php"); ?></header>
1818
<body>
1919
<span class="slideMenu"></span>
20-
<!--Example URL: http://readie.global-gaming.localhost/bsdp-overlay/assets/overlay_elements/?element=round_bar/time/01-->
20+
<!--Example URL: http://readiefur.localhost/bsdp-overlay/assets/overlay_elements/?element=round_bar/time/01-->
2121
<div id="overlay">
2222
<div id="element_01" class="elementContainer"></div>
2323
</div>

Diff for: ‎src/assets/php/head.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<meta property="og:type" content="website">
1212
<meta property="og:title" content="<?php echo $title != null ? $title : "$DirName | BSDP Overlay"; ?>"/>
1313
<meta property="og:description" content="<?php echo $description != null ? $description : $DirName; ?>"/>
14-
<meta property="og:url" content="https://readie.global-gaming.co/bsdp-overlay<?php echo $REQUEST_URI; ?>"/>
15-
<meta property="og:image" content="https://cdn-readie.global-gaming.co/images/team/members/readiecircle.png"/>
14+
<meta property="og:url" content="https://readiefur.com/bsdp-overlay<?php echo $REQUEST_URI; ?>"/>
15+
<meta property="og:image" content="https://cdn.readiefur.com/images/team/members/readiecircle.png"/>
1616
<title><?php echo $title != null ? $title : "$DirName | BSDP Overlay"; ?></title>
17-
<link rel="icon" href="https://cdn-readie.global-gaming.co/images/team/members/readiecircle.png" type="image/png">
18-
<link href="https://cdn-readie.global-gaming.co/resources/fonts/montserrat/stylesheet.css" rel="stylesheet" type="text/css"> <!--Main font-->
19-
<link href="https://cdn-readie.global-gaming.co/resources/fonts/open_sans/stylesheet.css" rel="stylesheet" type="text/css"> <!--Fallback font-->
17+
<link rel="icon" href="https://cdn.readiefur.com/images/team/members/readiecircle.png" type="image/png">
18+
<link href="https://cdn.readiefur.com/resources/fonts/montserrat/stylesheet.css" rel="stylesheet" type="text/css"> <!--Main font-->
19+
<link href="https://cdn.readiefur.com/resources/fonts/open_sans/stylesheet.css" rel="stylesheet" type="text/css"> <!--Fallback font-->
2020
<link rel="stylesheet" type="text/css" href="<?php echo $WEB_ROOT; ?>/assets/css/head.css"/>
2121
<link rel="stylesheet" type="text/css" href="<?php echo $WEB_ROOT; ?>/assets/css/main.css"/>
22-
<script src="https://cdn-readie.global-gaming.co/resources/scripts/jquery/jquery-3.5.1.min.js"></script>
22+
<script src="https://cdn.readiefur.com/resources/scripts/jquery/jquery-3.5.1.min.js"></script>
2323
<script>var WEB_ROOT = "<?php echo $WEB_ROOT; ?>";</script>
2424
<style id="themeColours"></style>
2525
<!--I'd like to move the alert box and account container here but I was having som annoying css ussues with it that I can't be arsed to fix right now.-->

Diff for: ‎src/assets/php/header.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<span class="bottomStripThin"></span>
88
<div class="titleContainer">
99
<a href="<?php echo $WEB_ROOT ?>/">
10-
<img class="small titleIcon" src="https://cdn-readie.global-gaming.co/images/team/members/readiecircle.png">
10+
<img class="small titleIcon" src="https://cdn.readiefur.com/images/team/members/readiecircle.png">
1111
<h3 class="title">BSDP Overlay</h3>
1212
</a>
1313
</div>
@@ -27,7 +27,7 @@
2727
</div>
2828
</div>
2929
</section>
30-
<iframe id="accountContainer" src="//api-readie.global-gaming.<?php echo $DOMAIN[count($DOMAIN) - 1]; ?>/account/"></iframe>
30+
<iframe id="accountContainer" src="//api.readiefur.<?php echo $DOMAIN[count($DOMAIN) - 1]; ?>/account/"></iframe>
3131
<div id="alertBoxContainer">
3232
<div class="background"></div>
3333
<div id="alertBox">

Diff for: ‎src/assets/php/overlay.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private function SaveOverlay(array $_data)
112112
else { return $updatedOverlay; }
113113
}
114114

115-
//http://readie.global-gaming.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"createOverlay","data":{}}
115+
//http://readiefur.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"createOverlay","data":{}}
116116
private function CreateOverlay()
117117
{
118118
global $dbServername;
@@ -157,7 +157,7 @@ private function CreateOverlay()
157157
else { return new ReturnData($id); }
158158
}
159159

160-
//http://readie.global-gaming.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlayByID","data":{"id":"123456789"}}
160+
//http://readiefur.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlayByID","data":{"id":"123456789"}}
161161
private function GetOverlayByID(array $_data)
162162
{
163163
global $dbServername;
@@ -195,9 +195,9 @@ private function GetOverlayByID(array $_data)
195195
else { return new ReturnData($result->data[0]); }
196196
}
197197

198-
//http://readie.global-gaming.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlaysBySearch","data":{"filter":"none","search":"","page":1}}
199-
//http://readie.global-gaming.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlaysBySearch","data":{"filter":"name","search":"overlay","page":1}}
200-
//http://readie.global-gaming.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlaysBySearch","data":{"filter":"username","search":"kof.readie","page":1}}
198+
//http://readiefur.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlaysBySearch","data":{"filter":"none","search":"","page":1}}
199+
//http://readiefur.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlaysBySearch","data":{"filter":"name","search":"overlay","page":1}}
200+
//http://readiefur.localhost/bsdp-overlay/assets/php/overlay.php?q={"method":"getOverlaysBySearch","data":{"filter":"username","search":"kof.readie","page":1}}
201201
//Tweak for 'my overlays' (private only)
202202
private function GetOverlaysBySearch(array $_data)
203203
{

Diff for: ‎src/browser/browser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Browser
7373
private WindowMessageEvent(ev: MessageEvent<any>)
7474
{
7575
var host = window.location.host.split('.');
76-
if (ev.origin.split('/')[2] == `api-readie.global-gaming.${host[host.length - 1]}`)
76+
if (ev.origin.split('/')[2] == `api.readiefur.${host[host.length - 1]}`)
7777
{
7878
if (Main.TypeOfReturnData(ev.data))
7979
{

Diff for: ‎src/browser/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</tbody>
3535
<tbody>
3636
<!--<tr>
37-
<td><img src="https://cdn-readie.global-gaming.co/images/team/members/readiecircle.png"></td>
37+
<td><img src="https://cdn.readiefur.com/images/team/members/readiecircle.png"></td>
3838
<td>Overlay Name</td>
3939
<td>Overlay Description</td>
4040
<td>kOF.Readie</td>

Diff for: ‎src/edit/index.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<head>
1313
<?php echo execAndRead("{$SITE_ROOT}/assets/php/head.php"); ?>
1414
<link rel="stylesheet" href="<?php echo $WEB_ROOT; ?>/edit/editor.css">
15-
<script src="https://cdn-readie.global-gaming.co/resources/scripts/dom-to-image.min.js"></script>
15+
<script src="https://cdn.readiefur.com/resources/scripts/dom-to-image.min.js"></script>
1616
<script src="<?php echo $WEB_ROOT; ?>/edit/editor.js" type="module" defer></script>
1717
</head>
1818
<header id="header"><?php echo execAndRead("{$SITE_ROOT}/assets/php/header.php"); ?></header>
1919
<body>
2020
<span id="splashScreen">
2121
<div class="center">
2222
<h2 id="ssHeader">BSDP Overlay</h2>
23-
<img class="medium" src="https://cdn-readie.global-gaming.co/images/team/members/readiecircle.png">
23+
<img class="medium" src="https://cdn.readiefur.com/images/team/members/readiecircle.png">
2424
<h3 id="ssSubText">Loading...</h3>
2525
<div class="ssProgressContainer">
2626
<div id="ssProgress"></div>

Diff for: ‎src/home/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<?php echo execAndRead("{$SITE_ROOT}/assets/php/head.php"); ?>
1414
<link rel="stylesheet" href="./index.css">
1515
<link rel="stylesheet" href="../assets/css/markdown.css">
16-
<script src="https://cdn-readie.global-gaming.co/resources/scripts/marked/marked-2.0.3.min.js"></script>
16+
<script src="https://cdn.readiefur.com/resources/scripts/marked/marked-2.0.3.min.js"></script>
1717
<script src="./index.js" type="module" defer></script>
1818
</head>
1919
<header id="header"><?php echo execAndRead("{$SITE_ROOT}/assets/php/header.php"); ?></header>

Diff for: ‎src/nginx.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#The location block I am using for local testing.
22
location /bsdp-overlay {
3-
root "S:/Webserver/www/global-gaming.localhost/readie/html";
3+
root "S:/Webserver/www/readiefur.localhost/html";
44

55
location /bsdp-overlay/preview {
66
try_files $uri $uri/ /bsdp-overlay/preview/index.php?$uri;

Diff for: ‎src/preview/preview.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class Preview
151151
private WindowMessageEvent(ev: MessageEvent<any>)
152152
{
153153
var host = window.location.host.split('.');
154-
if (ev.origin.split('/')[2] == `api-readie.global-gaming.${host[host.length - 1]}`)
154+
if (ev.origin.split('/')[2] == `api.readiefur.${host[host.length - 1]}`)
155155
{
156156
if (Main.TypeOfReturnData(ev.data))
157157
{

Diff for: ‎src/view/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<span>By</span>
2626
<span id="ssUsername">Creator</span>
2727
</h3>
28-
<img id="ssThumbnail" src="https://cdn-readie.global-gaming.co/images/team/members/readiecircle.png">
28+
<img id="ssThumbnail" src="https://cdn.readiefur.com/images/team/members/readiecircle.png">
2929
<h3 id="ssSubText">Loading...</h3>
3030
<div class="ssProgressContainer">
3131
<div id="ssProgress"></div>

0 commit comments

Comments
 (0)