diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index dfdaa728..e26c7a0b 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,2 @@ github: ['nayskutzu'] ko_fi: nayskutzu -custom: ['https://paypal.me/mythicalsystems'] \ No newline at end of file diff --git a/.github/README.md b/.github/README.md index 997b6731..36f66865 100644 --- a/.github/README.md +++ b/.github/README.md @@ -12,7 +12,7 @@ You can find a step-by-step installation documentation over here:  https://docs.mythicalsystems.xyz ## Support -For support, discord server: [discord.gg/freehost](https://discord.gg/3FWyugpznc) +For support, discord server: [discord.gg/mythicalsystems](https://discord.mythicalsystems.xyz) ## Optimizations @@ -61,15 +61,15 @@ Well, we created a table to compare the most commonly used pterodactyl clients, Yes, if you choose to install MythicalDash you agree with: -- [Github Security Policy](https://github.com/MythicalLTD/MythicalDash/blob/develop/.github/SECURITY.md) -- [Github MIT License](https://github.com/MythicalLTD/MythicalDash/blob/develop/LICENSE) +- [Github Security Policy](https://github.com/MythicalLTD/MythicalDash/blob/legacy/.github/SECURITY.md) +- [Github MIT License](https://github.com/MythicalLTD/MythicalDash/blob/legacy/LICENSE) - [MythicalGuard TOS](https://github.com/MythicalLTD/mythicalguard?tab=readme-ov-file#usage-restrictions-and-guidelines) ## Demo You can find a live deployment copy of MythicalDash here: -- https://devclient.mythicalsystems.xyz +- https://mythicaldash.mythicalsystems.xyz ## Roadmap @@ -84,26 +84,21 @@ Contributions are always welcome! This project is used by the following companies: - MythicalSystems -- Free2Host - ## Screenshots -- ![App Screenshot1](https://i.imgur.com/fLIYnqK.png) -- ![App Screenshot2](https://i.imgur.com/k3hBOut.png) -- ![App Screenshot3](https://i.imgur.com/QDr6jk5.png) -- ![App Screenshot4](https://i.imgur.com/1o5WNHo.png) -- ![App Screenshot5](https://i.imgur.com/YcEb4YE.png) -- ![App Screenshot6](https://i.imgur.com/KuJMgZk.png) -- ![App Screenshot7](https://i.imgur.com/Nf0aFAt.png) -- ![App Screenshot8](https://i.imgur.com/GwVkHbT.png) -- ![App Screenshot9](https://i.imgur.com/mVBrtV5.png) -- ![App Screenshot10](https://i.imgur.com/70rXiHt.png) -- ![App Screenshot11](https://i.imgur.com/WrroKW3.png) +- ![App Screenshot1](/.github/imgs/1.png) +- ![App Screenshot2](/.github/imgs/2.png) +- ![App Screenshot3](/.github/imgs/3.png) +- ![App Screenshot4](/.github/imgs/4.png) +- ![App Screenshot5](/.github/imgs/5.png) +- ![App Screenshot6](/.github/imgs/6.png) +- ![App Screenshot7](/.github/imgs/7.jpg) +- ![App Screenshot8](/.github/imgs/8.gif) ## API Reference -We did not write specific API documentation, but you can use [Insomnia](https://insomnia.rest/download) to see more info on what requests you can execute with our API. Here you can download the JSON for the Insomnia client: https://raw.githubusercontent.com/MythicalLTD/MythicalDash/develop/Insomnia.json +We did not write specific API documentation, but you can use [Insomnia](https://insomnia.rest/download) to see more info on what requests you can execute with our API. Here you can download the JSON for the Insomnia client: https://raw.githubusercontent.com/MythicalLTD/MythicalDash/legacy/Insomnia_2024-02-29.yaml ## Tech Stack @@ -123,7 +118,7 @@ Here is a list of the core components that MythicalDash uses to run! Page dialogs are a simple method to navigate into the dash by using page ids! ## Why shall i use them? -Well you do not have to use them if you do not want to use them, but there are just for developers or ppl that get annoyed in trying to find something in the UI! +Well you do not have to use them if you do not want to use them, but there are just for legacyers or ppl that get annoyed in trying to find something in the UI! ## Are there some reservations? Yes here there are: @@ -167,5 +162,5 @@ Where here is a list: ## Serial Code: ```bash -1 740 704 993 +1 036 044 163 ``` diff --git a/.github/imgs/1.png b/.github/imgs/1.png new file mode 100644 index 00000000..755dd79c Binary files /dev/null and b/.github/imgs/1.png differ diff --git a/.github/imgs/2.png b/.github/imgs/2.png new file mode 100644 index 00000000..f6aaca7b Binary files /dev/null and b/.github/imgs/2.png differ diff --git a/.github/imgs/3.png b/.github/imgs/3.png new file mode 100644 index 00000000..552d4a73 Binary files /dev/null and b/.github/imgs/3.png differ diff --git a/.github/imgs/4.png b/.github/imgs/4.png new file mode 100644 index 00000000..5b874308 Binary files /dev/null and b/.github/imgs/4.png differ diff --git a/.github/imgs/5.png b/.github/imgs/5.png new file mode 100644 index 00000000..df97ee6d Binary files /dev/null and b/.github/imgs/5.png differ diff --git a/.github/imgs/6.png b/.github/imgs/6.png new file mode 100644 index 00000000..e20c6de9 Binary files /dev/null and b/.github/imgs/6.png differ diff --git a/.github/imgs/7.jpg b/.github/imgs/7.jpg new file mode 100644 index 00000000..18dcd82f Binary files /dev/null and b/.github/imgs/7.jpg differ diff --git a/.github/imgs/8.gif b/.github/imgs/8.gif new file mode 100644 index 00000000..13d05e8b Binary files /dev/null and b/.github/imgs/8.gif differ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78d47668..90141cdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Build and PHP APP on: push: - branches: [ "develop" ] + branches: [ "legacy" ] workflow_dispatch: env: diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 2bb1ed9c..a8fb5aab 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -4,7 +4,7 @@ name: Deploy static content to Pages on: # Runs on pushes targeting the default branch push: - branches: ["develop"] + branches: ["legacy"] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/app/Main.php b/app/Main.php index ae3db554..03b3cee8 100644 --- a/app/Main.php +++ b/app/Main.php @@ -43,13 +43,13 @@ public static function getAppUrl() public static function getLatestReleaseInfo() { $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, "https://api.github.com/repos/mythicalltd/mythicaldash/releases/latest"); - curl_setopt($ch, CURLOPT_HTTPHEADER, ['User-Agent: MythicalDash']); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - $response = curl_exec($ch); - curl_close($ch); + curl_setopt($ch, CURLOPT_URL, "https://api.github.com/repos/mythicalltd/mythicaldash/releases/latest"); + curl_setopt($ch, CURLOPT_HTTPHEADER, ['User-Agent: MythicalDash']); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + $response = curl_exec($ch); + curl_close($ch); - return json_decode($response, true); + return json_decode($response, true); } public static function getLang() @@ -62,7 +62,7 @@ public static function getLang() $langFilePath = __DIR__ . '/../lang/' . $langConfig . '.php'; if (file_exists($langFilePath)) { - return include($langFilePath); + return include ($langFilePath); } else { self::handleLanguageError("Failed to start the dash. Please use a valid language file."); } diff --git a/cli/scripts/SettingsHandler.cs b/cli/scripts/SettingsHandler.cs index ff42d6c4..ee1568c5 100644 --- a/cli/scripts/SettingsHandler.cs +++ b/cli/scripts/SettingsHandler.cs @@ -39,7 +39,6 @@ public void Setup() { logo = "https://avatars.githubusercontent.com/u/117385445"; } - Console.Write("Pterodactyl URL ["); Console.ForegroundColor = ConsoleColor.Yellow; Console.Write($"https://panel.yourhost.net"); @@ -52,6 +51,13 @@ public void Setup() panelurl = "https://panel.yourhost.net"; } + if (panelurl.EndsWith("/")) + { + panelurl = panelurl.TrimEnd('/'); + Console.WriteLine("Removed trailing slash from Pterodactyl URL."); + Console.WriteLine("Next time be more careful with the URL."); + } + Console.Write("Pterodactyl API ["); Console.ForegroundColor = ConsoleColor.Yellow; Console.Write($"ptla_000000000000000000000000000000000000000000"); diff --git a/pages/assets/imgs/imgs/1.png b/pages/assets/imgs/imgs/1.png new file mode 100644 index 00000000..755dd79c Binary files /dev/null and b/pages/assets/imgs/imgs/1.png differ diff --git a/pages/assets/imgs/imgs/2.png b/pages/assets/imgs/imgs/2.png new file mode 100644 index 00000000..f6aaca7b Binary files /dev/null and b/pages/assets/imgs/imgs/2.png differ diff --git a/pages/assets/imgs/imgs/3.png b/pages/assets/imgs/imgs/3.png new file mode 100644 index 00000000..552d4a73 Binary files /dev/null and b/pages/assets/imgs/imgs/3.png differ diff --git a/pages/assets/imgs/imgs/4.png b/pages/assets/imgs/imgs/4.png new file mode 100644 index 00000000..5b874308 Binary files /dev/null and b/pages/assets/imgs/imgs/4.png differ diff --git a/pages/assets/imgs/imgs/5.png b/pages/assets/imgs/imgs/5.png new file mode 100644 index 00000000..df97ee6d Binary files /dev/null and b/pages/assets/imgs/imgs/5.png differ diff --git a/pages/assets/imgs/imgs/6.png b/pages/assets/imgs/imgs/6.png new file mode 100644 index 00000000..e20c6de9 Binary files /dev/null and b/pages/assets/imgs/imgs/6.png differ diff --git a/pages/assets/imgs/imgs/7.jpg b/pages/assets/imgs/imgs/7.jpg new file mode 100644 index 00000000..18dcd82f Binary files /dev/null and b/pages/assets/imgs/imgs/7.jpg differ diff --git a/pages/assets/imgs/imgs/8.gif b/pages/assets/imgs/imgs/8.gif new file mode 100644 index 00000000..13d05e8b Binary files /dev/null and b/pages/assets/imgs/imgs/8.gif differ diff --git a/pages/index.html b/pages/index.html index 2f00696a..3e7cb60f 100644 --- a/pages/index.html +++ b/pages/index.html @@ -73,7 +73,7 @@

- +
@@ -177,7 +177,7 @@

- +
@@ -194,7 +194,7 @@

Great design

- +
@@ -232,7 +232,7 @@

- +

NaysKutzu
MythicalNodes
@@ -255,7 +255,7 @@
NaysKutzu
- +
Roido
Free2Host
@@ -276,7 +276,7 @@
Roido
- +
kebab
Unknown
@@ -297,7 +297,7 @@
kebab
- +
usslmuk
Unknown
@@ -319,7 +319,7 @@
usslmuk
- +
DollPong
Unknown
@@ -359,7 +359,7 @@
Lasse
- +
Lordwolfy
Unknown
diff --git a/public/FIRST_INSTALL b/public/FIRST_INSTALL deleted file mode 100644 index e69de29b..00000000 diff --git a/public/FIRST_USER b/public/FIRST_USER deleted file mode 100644 index e69de29b..00000000 diff --git a/view/admin/health.php b/view/admin/health.php index 902c8eb3..a2aed674 100644 --- a/view/admin/health.php +++ b/view/admin/health.php @@ -52,42 +52,9 @@

Admin / Health

- - - - - - - + query($userCountQuery); @@ -34,7 +34,7 @@ - + <?= SettingsManager::getSetting("name") ?> - Admin @@ -46,48 +46,17 @@
-->
- +
- +

Admin / Statistics

- - - - - - - - + +
@@ -156,7 +125,7 @@
- +
@@ -164,7 +133,7 @@
- + + query("INSERT INTO mythicaldash_login_logs (ipaddr, userkey) VALUES ('" . mysqli_real_escape_string($conn, $session->getIP()) . "', '" . mysqli_real_escape_string($conn, $skey) . "')"); $default = "https://www.gravatar.com/avatar/00000000000000000000000000000000"; $grav_url = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($email))) . "?d=" . urlencode($default); - if (file_exists("FIRST_USER")) { - $role = "Administrator"; - } else { - $role = "User"; - } $conn->query("INSERT INTO `mythicaldash_users` (`panel_id`, `email`, @@ -184,7 +197,7 @@ } } } catch (Exception $e) { - header("location: /auth/register?e=" . $lang['login_error_unknown']."
".$e->getMessage().""); + header("location: /auth/register?e=" . $lang['login_error_unknown'] . "
" . $e->getMessage() . ""); ErrorHandler::Error("Register ", $e); die(); } @@ -197,7 +210,7 @@ - + <?= SettingsManager::getSetting("name") ?> - <?= $lang['register'] ?> @@ -208,7 +221,7 @@
-
+
@@ -250,9 +263,11 @@
@@ -260,14 +275,16 @@ class="text-primary" data-bs-toggle="modal" data-bs-target="#pp">
-
">
+
">
  input('register-form'); ?> - +

- +

- +

- + diff --git a/view/auth/reset-password.php b/view/auth/reset-password.php index bdb68c3d..cc79f812 100644 --- a/view/auth/reset-password.php +++ b/view/auth/reset-password.php @@ -82,7 +82,7 @@ include(__DIR__ . '/../components/snow.php'); } ?> -
+
diff --git a/view/components/navbar.php b/view/components/navbar.php index 77dae1c4..eec7c1c1 100644 --- a/view/components/navbar.php +++ b/view/components/navbar.php @@ -22,6 +22,7 @@
+ getUserInfo('id')); ?>
  • @@ -64,8 +65,8 @@ class="ti ti-alert-triangle">
- +
@@ -76,6 +77,75 @@ class="ti ti-x"> +
  • + +
    +
    +
    +
    Useful Tools
    +
    +
    +
    +
    +
    + + + + Motd + Minecraft +
    +
    + + + + Votifier tester + Minecraft +
    +
    +
    +
    + + + + RGB Generator + Minecraft +
    +
    + + + + MC Emojis + Minecraft +
    +
    +
    +
    + + + + Server Icon + Minecraft +
    +
    + + + + Flags + Minecraft +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
  • diff --git a/view/leaderboard.php b/view/leaderboard.php index e70dab8f..31734491 100644 --- a/view/leaderboard.php +++ b/view/leaderboard.php @@ -67,7 +67,7 @@ $users[] = $row; } usort($users, function ($a, $b) { - return $b['coins'] - $a['coins']; + return intval($b['coins']) - intval($a['coins']); }); $top5Users = array_slice($users, 0, 5); ?> diff --git a/view/user/deleteacc.php b/view/user/deleteacc.php index e284775d..d8ade586 100644 --- a/view/user/deleteacc.php +++ b/view/user/deleteacc.php @@ -16,7 +16,7 @@ deleteTickets($conn, mysqli_real_escape_string($conn,$_COOKIE['token'])); deleteTicketsMsgs($conn, mysqli_real_escape_string($conn,$_COOKIE['token'])); deletePasswordsReset($conn, mysqli_real_escape_string($conn,$_COOKIE['token'])); - deleteUserFromPterodactyl(SettingsManager::getSetting("PterodactylURL"), $user_info['panel_id'], SettingsManager::getSetting("PterodactylAPIKey")); + deleteUserFromPterodactyl(SettingsManager::getSetting("PterodactylURL"), $session->getUserInfo('panel_id'), SettingsManager::getSetting("PterodactylAPIKey")); deleteUserFromDb($conn, mysqli_real_escape_string($conn,$_COOKIE['token'])); header('location: /auth/logout'); die();