From 2f0483da13dcd83262cd77c3e19024f40d091d67 Mon Sep 17 00:00:00 2001
From: Marcel Baumgartner <marcel.kbkm@gmail.com>
Date: Tue, 4 Apr 2023 16:41:14 +0200
Subject: [PATCH 1/5] Update View.razor

---
 Moonlight/Shared/Views/Admin/Users/View.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Moonlight/Shared/Views/Admin/Users/View.razor b/Moonlight/Shared/Views/Admin/Users/View.razor
index b4851f22..0d4d9e66 100644
--- a/Moonlight/Shared/Views/Admin/Users/View.razor
+++ b/Moonlight/Shared/Views/Admin/Users/View.razor
@@ -186,7 +186,7 @@ else
                             <TL>Discord</TL>
                         </label>
                         <div class="col-lg-8">
-                            <span class="fw-bold fs-6 text-gray-800">@* TODO: Implement discord fetching here *@</span>
+                            <span class="fw-bold fs-6 text-gray-800">@(User.DiscordId)</span>
                         </div>
                     </div>
                     <div class="separator my-4"></div>

From d4468c138d65650c996fab3ce63b73a284cd7c19 Mon Sep 17 00:00:00 2001
From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:58:05 +0200
Subject: [PATCH 2/5] security settings design changed

---
 Moonlight/Shared/Views/Profile/Security.razor | 359 +++++++++---------
 1 file changed, 190 insertions(+), 169 deletions(-)

diff --git a/Moonlight/Shared/Views/Profile/Security.razor b/Moonlight/Shared/Views/Profile/Security.razor
index db0bf9f8..7cd7bff4 100644
--- a/Moonlight/Shared/Views/Profile/Security.razor
+++ b/Moonlight/Shared/Views/Profile/Security.razor
@@ -22,204 +22,225 @@
 <ProfileNavigation Index="1"/>
 
 <div class="card mb-5 mb-xl-10">
-    <div class="card-header border-0 cursor-pointer" role="button" data-bs-toggle="collapse" data-bs-target="#kt_account_profile_details" aria-expanded="true" aria-controls="kt_account_profile_details">
-        <div class="card-title m-0">
-            <h3 class="fw-bold m-0">
-                <TL>Security</TL>
-            </h3>
-        </div>
-    </div>
-
     <LazyLoader Load="Load">
-        <div class="card mb-5 mb-xl-10">
-            <div class="card-body border-top p-9">
-                @if (TotpEnabled)
-                {
-                    <div class="alert alert-success d-flex rounded p-6">
-                        <span class="svg-icon svg-icon-2tx svg-icon-primary me-4">
-                            <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                <path opacity="0.3" d="M20.5543 4.37824L12.1798 2.02473C12.0626 1.99176 11.9376 1.99176 11.8203 2.02473L3.44572 4.37824C3.18118 4.45258 3 4.6807 3 4.93945V13.569C3 14.6914 3.48509 15.8404 4.4417 16.984C5.17231 17.8575 6.18314 18.7345 7.446 19.5909C9.56752 21.0295 11.6566 21.912 11.7445 21.9488C11.8258 21.9829 11.9129 22 12.0001 22C12.0872 22 12.1744 21.983 12.2557 21.9488C12.3435 21.912 14.4326 21.0295 16.5541 19.5909C17.8169 18.7345 18.8277 17.8575 19.5584 16.984C20.515 15.8404 21 14.6914 21 13.569V4.93945C21 4.6807 20.8189 4.45258 20.5543 4.37824Z" fill="currentColor"></path>
-                                <path d="M10.5606 11.3042L9.57283 10.3018C9.28174 10.0065 8.80522 10.0065 8.51412 10.3018C8.22897 10.5912 8.22897 11.0559 8.51412 11.3452L10.4182 13.2773C10.8099 13.6747 11.451 13.6747 11.8427 13.2773L15.4859 9.58051C15.771 9.29117 15.771 8.82648 15.4859 8.53714C15.1948 8.24176 14.7183 8.24176 14.4272 8.53714L11.7002 11.3042C11.3869 11.6221 10.874 11.6221 10.5606 11.3042Z" fill="currentColor"></path>
-                            </svg>
-                        </span>
-                        <div class="d-flex flex-stack flex-grow-1 flex-wrap flex-md-nowrap">
-                            <div class="mb-3 mb-md-0 fw-semibold">
-                                <h4 class="text-gray-900 fw-bold">
-                                    <TL>Your account is secured with 2fa</TL>
-                                </h4>
-                                <div class="fs-6 text-gray-700 pe-7">
-                                    <TL>anyone write a fancy text here?</TL>
-                                </div>
-                            </div>
-
-                            <button @onclick="Disable" class="btn btn-danger px-6 align-self-center text-nowrap">
+        @if (TotpEnabled)
+        {
+            <div class="alert alert-primary d-flex rounded ms-6 me-6 mt-6 mb-8">
+                <table class="w-100">
+                    <tr>
+                        <td rowspan="2">
+                            <span class="svg-icon svg-icon-2tx svg-icon-primary">
+                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <path opacity="0.3" d="M20.5543 4.37824L12.1798 2.02473C12.0626 1.99176 11.9376 1.99176 11.8203 2.02473L3.44572 4.37824C3.18118 4.45258 3 4.6807 3 4.93945V13.569C3 14.6914 3.48509 15.8404 4.4417 16.984C5.17231 17.8575 6.18314 18.7345 7.446 19.5909C9.56752 21.0295 11.6566 21.912 11.7445 21.9488C11.8258 21.9829 11.9129 22 12.0001 22C12.0872 22 12.1744 21.983 12.2557 21.9488C12.3435 21.912 14.4326 21.0295 16.5541 19.5909C17.8169 18.7345 18.8277 17.8575 19.5584 16.984C20.515 15.8404 21 14.6914 21 13.569V4.93945C21 4.6807 20.8189 4.45258 20.5543 4.37824Z" fill="currentColor"></path>
+                                    <path d="M10.5606 11.3042L9.57283 10.3018C9.28174 10.0065 8.80522 10.0065 8.51412 10.3018C8.22897 10.5912 8.22897 11.0559 8.51412 11.3452L10.4182 13.2773C10.8099 13.6747 11.451 13.6747 11.8427 13.2773L15.4859 9.58051C15.771 9.29117 15.771 8.82648 15.4859 8.53714C15.1948 8.24176 14.7183 8.24176 14.4272 8.53714L11.7002 11.3042C11.3869 11.6221 10.874 11.6221 10.5606 11.3042Z" fill="currentColor"></path>
+                                </svg>
+                            </span>
+                        </td>
+                        <td class="w-100">
+                            <h4 class="text-gray-900 fw-bold ms-4">
+                                <TL>Your account is secured with 2fa</TL>
+                            </h4>
+                        </td>
+                        <td rowspan="2">
+                            <a @onclick="Disable" class="btn btn-primary px-6 align-self-center text-nowrap" data-bs-toggle="modal" data-bs-target="#twofactorauth">
                                 <TL>Disable</TL>
-                            </button>
-                        </div>
-                    </div>
-                }
-                else
-                {
-                    <div class="alert alert-primary d-flex rounded p-6">
-                        <span class="svg-icon svg-icon-2tx svg-icon-primary me-4">
-                            <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                <path opacity="0.3" d="M20.5543 4.37824L12.1798 2.02473C12.0626 1.99176 11.9376 1.99176 11.8203 2.02473L3.44572 4.37824C3.18118 4.45258 3 4.6807 3 4.93945V13.569C3 14.6914 3.48509 15.8404 4.4417 16.984C5.17231 17.8575 6.18314 18.7345 7.446 19.5909C9.56752 21.0295 11.6566 21.912 11.7445 21.9488C11.8258 21.9829 11.9129 22 12.0001 22C12.0872 22 12.1744 21.983 12.2557 21.9488C12.3435 21.912 14.4326 21.0295 16.5541 19.5909C17.8169 18.7345 18.8277 17.8575 19.5584 16.984C20.515 15.8404 21 14.6914 21 13.569V4.93945C21 4.6807 20.8189 4.45258 20.5543 4.37824Z" fill="currentColor"></path>
-                                <path d="M10.5606 11.3042L9.57283 10.3018C9.28174 10.0065 8.80522 10.0065 8.51412 10.3018C8.22897 10.5912 8.22897 11.0559 8.51412 11.3452L10.4182 13.2773C10.8099 13.6747 11.451 13.6747 11.8427 13.2773L15.4859 9.58051C15.771 9.29117 15.771 8.82648 15.4859 8.53714C15.1948 8.24176 14.7183 8.24176 14.4272 8.53714L11.7002 11.3042C11.3869 11.6221 10.874 11.6221 10.5606 11.3042Z" fill="currentColor"></path>
-                            </svg>
-                        </span>
-                        <div class="d-flex flex-stack flex-grow-1 flex-wrap flex-md-nowrap">
-                            <div class="mb-3 mb-md-0 fw-semibold">
-                                <h4 class="text-gray-900 fw-bold">
-                                    <TL>Secure your account</TL>
-                                </h4>
-                                <div class="fs-6 text-gray-700 pe-7">
-                                    <TL>2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.</TL>
-                                </div>
+                            </a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div class="fs-6 text-gray-700 pe-7 ms-4">
+                                <TL>anyone write a fancy text here?</TL>
                             </div>
-
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        }
+        else
+        {
+            <div class="alert alert-primary d-flex rounded ms-6 me-6 mt-6 mb-8">
+                <table class="w-100">
+                    <tr>
+                        <td rowspan="2">
+                            <span class="svg-icon svg-icon-2tx svg-icon-primary">
+                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <path opacity="0.3" d="M20.5543 4.37824L12.1798 2.02473C12.0626 1.99176 11.9376 1.99176 11.8203 2.02473L3.44572 4.37824C3.18118 4.45258 3 4.6807 3 4.93945V13.569C3 14.6914 3.48509 15.8404 4.4417 16.984C5.17231 17.8575 6.18314 18.7345 7.446 19.5909C9.56752 21.0295 11.6566 21.912 11.7445 21.9488C11.8258 21.9829 11.9129 22 12.0001 22C12.0872 22 12.1744 21.983 12.2557 21.9488C12.3435 21.912 14.4326 21.0295 16.5541 19.5909C17.8169 18.7345 18.8277 17.8575 19.5584 16.984C20.515 15.8404 21 14.6914 21 13.569V4.93945C21 4.6807 20.8189 4.45258 20.5543 4.37824Z" fill="currentColor"></path>
+                                    <path d="M10.5606 11.3042L9.57283 10.3018C9.28174 10.0065 8.80522 10.0065 8.51412 10.3018C8.22897 10.5912 8.22897 11.0559 8.51412 11.3452L10.4182 13.2773C10.8099 13.6747 11.451 13.6747 11.8427 13.2773L15.4859 9.58051C15.771 9.29117 15.771 8.82648 15.4859 8.53714C15.1948 8.24176 14.7183 8.24176 14.4272 8.53714L11.7002 11.3042C11.3869 11.6221 10.874 11.6221 10.5606 11.3042Z" fill="currentColor"></path>
+                                </svg>
+                            </span>
+                        </td>
+                        <td class="w-100">
+                            <h4 class="text-gray-900 fw-bold ms-4">
+                                <TL>Secure your account</TL>
+                            </h4>
+                        </td>
+                        <td rowspan="2">
                             <a @onclick="Enable" class="btn btn-primary px-6 align-self-center text-nowrap" data-bs-toggle="modal" data-bs-target="#twofactorauth">
                                 <TL>Enable</TL>
                             </a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <div class="fs-6 text-gray-700 pe-7 ms-4">
+                                <TL>2fa adds another layer of security to your account. You have to enter a 6 digit code in order to login.</TL>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        }
+
+        <div class="modal fade" id="twofactorauth" tabindex="-1" style="display: none;" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered mw-650px">
+                <div class="modal-content">
+                    <div class="modal-header flex-stack py-6">
+                        <h2 class="ms-3">
+                            <TL>Activate 2fa</TL>
+                        </h2>
+                        <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">
+                            <span class="svg-icon svg-icon-1">
+                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1" transform="rotate(-45 6 17.3137)" fill="currentColor"></rect>
+                                    <rect x="7.41422" y="6" width="16" height="2" rx="1" transform="rotate(45 7.41422 6)" fill="currentColor"></rect>
+                                </svg>
+                            </span>
                         </div>
                     </div>
-                }
+                    <div class="modal-body scroll-y ps-10 pe-10 pb-10">
+                        <div>
+                            <h3 class="text-dark fw-bold mb-3 mt-2">
+                                <TL>2fa apps</TL>
+                            </h3>
+                            <div class="text-gray-500 fw-semibold fs-6 mb-10">
+                                <TL>Use an app like </TL>
+                                <a href="https://support.google.com/accounts/answer/1066447?hl=en" target="_blank">Google Authenticator</a>,
+                                <a href="https://www.microsoft.com/en-us/account/authenticator" target="_blank">Microsoft Authenticator</a>,
+                                <a href="https://authy.com/download/" target="_blank">Authy</a>, <TL>or</TL>
+                                <a href="https://support.1password.com/one-time-passwords/" target="_blank">1Password</a> <TL>and scan the following QR Code</TL>
+                                @if (EnablingTotp)
+                                {
+                                    <div class="pt-5 text-center">
+                                        @{
+                                            QRCodeGenerator qrGenerator = new QRCodeGenerator();
 
-                <div class="modal fade" id="twofactorauth" tabindex="-1" style="display: none;" aria-hidden="true">
-                    <div class="modal-dialog modal-dialog-centered mw-650px">
-                        <div class="modal-content">
-                            <div class="modal-header flex-stack">
-                                <h2>
-                                    <TL>Activate 2fa</TL>
-                                </h2>
-                                <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">
-                                    <span class="svg-icon svg-icon-1">
-                                        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                            <rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1" transform="rotate(-45 6 17.3137)" fill="currentColor"></rect>
-                                            <rect x="7.41422" y="6" width="16" height="2" rx="1" transform="rotate(45 7.41422 6)" fill="currentColor"></rect>
-                                        </svg>
-                                    </span>
-                                </div>
-                            </div>
-                            <div class="modal-body scroll-y pt-10 pb-15 px-lg-17">
-                                <div>
-                                    <h3 class="text-dark fw-bold mb-7">
-                                        <TL>2fa apps</TL>
-                                    </h3>
-                                    <div class="text-gray-500 fw-semibold fs-6 mb-10">
-                                        <TL>Use an app like </TL>
-                                        <a href="https://support.google.com/accounts/answer/1066447?hl=en" target="_blank">Google Authenticator</a>,
-                                        <a href="https://www.microsoft.com/en-us/account/authenticator" target="_blank">Microsoft Authenticator</a>,
-                                        <a href="https://authy.com/download/" target="_blank">Authy</a>, <TL>or</TL>
-                                        <a href="https://support.1password.com/one-time-passwords/" target="_blank">1Password</a> <TL>and scan the following QR Code</TL>
-                                        @if (EnablingTotp)
-                                        {
-                                            <div class="pt-5 text-center">
-                                                @{
-                                                    QRCodeGenerator qrGenerator = new QRCodeGenerator();
+                                            var qrCodeData = qrGenerator.CreateQrCode
+                                                (
+                                                    $"otpauth://totp/{Uri.EscapeDataString(User.Email)}?secret={TotpSecret}&issuer={Uri.EscapeDataString(Issuer)}",
+                                                    QRCodeGenerator.ECCLevel.Q
+                                                );
 
-                                                    var qrCodeData = qrGenerator.CreateQrCode
-                                                        (
-                                                            $"otpauth://totp/{Uri.EscapeDataString(User.Email)}?secret={TotpSecret}&issuer={Uri.EscapeDataString(Issuer)}",
-                                                            QRCodeGenerator.ECCLevel.Q
-                                                        );
-
-                                                    PngByteQRCode qrCode = new PngByteQRCode(qrCodeData);
-                                                    byte[] qrCodeAsPngByteArr = qrCode.GetGraphic(20);
-                                                    var base64 = Convert.ToBase64String(qrCodeAsPngByteArr);
-                                                }
-                                                <img src="data:image/png;base64,@(base64)" alt="" class="mw-150px">
-                                            </div>
+                                            PngByteQRCode qrCode = new PngByteQRCode(qrCodeData);
+                                            byte[] qrCodeAsPngByteArr = qrCode.GetGraphic(20);
+                                            var base64 = Convert.ToBase64String(qrCodeAsPngByteArr);
                                         }
+                                        <img src="data:image/png;base64,@(base64)" alt="" class="mw-200px mt-2">
                                     </div>
-                                    <div class="notice d-flex bg-light-warning rounded border-warning border border-dashed mb-10 p-6">
-                                        <span class="svg-icon svg-icon-2tx svg-icon-warning me-4">
-                                            <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                                <rect opacity="0.3" x="2" y="2" width="20" height="20" rx="10" fill="currentColor"></rect>
-                                                <rect x="11" y="14" width="7" height="2" rx="1" transform="rotate(-90 11 14)" fill="currentColor"></rect>
-                                                <rect x="11" y="17" width="2" height="2" rx="1" transform="rotate(-90 11 17)" fill="currentColor"></rect>
-                                            </svg>
-                                        </span>
-                                        <div class="d-flex flex-stack flex-grow-1">
-                                            <div class="fw-semibold">
-                                                <div class="fs-6 text-gray-700">
-                                                    <TL>If you have trouble using the QR Code, select manual input in the app and enter your email and the following code:</TL>
-                                                    <div class="fw-bold text-dark pt-2">@(TotpSecret)</div>
-                                                </div>
-                                            </div>
+                                }
+                            </div>
+                            <div class="notice d-flex bg-light-warning rounded border-warning border border-dashed mb-8 p-6">
+                                <span class="svg-icon svg-icon-2tx svg-icon-warning me-4">
+                                    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                        <rect opacity="0.3" x="2" y="2" width="20" height="20" rx="10" fill="currentColor"></rect>
+                                        <rect x="11" y="14" width="7" height="2" rx="1" transform="rotate(-90 11 14)" fill="currentColor"></rect>
+                                        <rect x="11" y="17" width="2" height="2" rx="1" transform="rotate(-90 11 17)" fill="currentColor"></rect>
+                                    </svg>
+                                </span>
+                                <div class="d-flex flex-stack flex-grow-1">
+                                    <div class="fw-semibold">
+                                        <div class="fs-6 text-gray-700">
+                                            <TL>If you have trouble using the QR Code, select manual input in the app and enter your email and the following code:</TL>
+                                            <div class="fw-bold text-dark pt-2">@(TotpSecret)</div>
                                         </div>
                                     </div>
-
-                                    <a class="btn btn-primary px-6 align-self-center text-nowrap float-end" data-bs-toggle="modal" data-bs-target="#test">
-                                        <TL>Next</TL>
-                                    </a>
                                 </div>
                             </div>
-                        </div>
-                    </div>
-                </div>
 
-                <div class="modal fade" id="test" tabindex="-1" style="display: none;" aria-hidden="true">
-                    <div class="modal-dialog modal-dialog-centered mw-650px">
-                        <div class="modal-content">
-                            <div class="modal-header flex-stack">
-                                <h2>
-                                    <TL>Finish activation</TL>
-                                </h2>
-                                <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">
-                                    <span class="svg-icon svg-icon-1">
-                                        <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                            <rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1" transform="rotate(-45 6 17.3137)" fill="currentColor"></rect>
-                                            <rect x="7.41422" y="6" width="16" height="2" rx="1" transform="rotate(45 7.41422 6)" fill="currentColor"></rect>
-                                        </svg>
-                                    </span>
-                                </div>
-                            </div>
-                            <div class="modal-body scroll-y pt-10 pb-15 px-lg-17">
-                                <div class="text-gray-500 fw-semibold fs-6 mb-10">
-                                    <div class="alert alert-primary d-flex align-items-center p-5 mb-10">
-                                        <i class="bx bx-info-circle fs-2hx text-primary me-4">
-                                            <span class="path1"></span><span class="path2"></span>
-                                        </i>
-                                        <div class="d-flex flex-column">
-                                            <h4 class="mb-1 text-primary">
-                                                <TL>2fa Code requiered</TL>
-                                            </h4>
-                                            <span>In order to finish the activation of 2fa, you need to enter the code your 2fa app shows you.</span>
-                                        </div>
-                                    </div>
-                                    <input type="text" class="form-control form-control-lg form-control-solid" placeholder="@SmartTranslateService.Translate("2fa Code")" @bind="currentTotp"/>
-
-                                    <br/>
-
-                                    <WButton CssClasses="btn btn-primary px-6 align-self-center text-nowrap float-end" WorkingText="@SmartTranslateService.Translate("Saving")" Text="@SmartTranslateService.Translate("Finish")" OnClick="CheckAndSaveTotp">
-                                    </WButton>
-                                </div>
-                            </div>
+                            <a class="btn btn-primary px-6 align-self-center text-nowrap float-end" data-bs-toggle="modal" data-bs-target="#test">
+                                <TL>Next</TL>
+                            </a>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
 
-        <div class="card mb-5 mb-xl-10">
-            <div class="card-body border-top p-9">
-                <div class="row mb-6">
-                    <label class="col-lg-4 col-form-label fw-semibold fs-6">
-                        <TL>New password</TL>
-                    </label>
-                    <div class="col-lg-8">
-                        <div class="row">
-                            <div class="col-lg-6 fv-row fv-plugins-icon-container">
-                                <input @bind="Password" type="password" class="form-control form-control-lg form-control-solid">
-                            </div>
-                            <div class="col-lg-6 fv-row fv-plugins-icon-container">
-                                <WButton OnClick="ChangePassword" CssClasses="btn-danger" Text="@SmartTranslateService.Translate("Change")" WorkingText="@SmartTranslateService.Translate("Changing")"></WButton>
+        <div class="modal fade" id="test" tabindex="-1" style="display: none;" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered mw-650px">
+                <div class="modal-content">
+                    <div class="modal-header flex-stack py-6">
+                        <h2 class="ms-3">
+                            <TL>Finish activation</TL>
+                        </h2>
+                        <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">
+                            <span class="svg-icon svg-icon-1">
+                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1" transform="rotate(-45 6 17.3137)" fill="currentColor"></rect>
+                                    <rect x="7.41422" y="6" width="16" height="2" rx="1" transform="rotate(45 7.41422 6)" fill="currentColor"></rect>
+                                </svg>
+                            </span>
+                        </div>
+                    </div>
+                    <div class="modal-body scroll-y ps-10 pe-10 pb-10">
+                        <div class="text-gray-500 fw-semibold fs-6 mb-10">
+                            <div class="alert alert-primary d-flex align-items-center p-5 mb-6">
+                                <i class="bx bx-info-circle fs-2hx text-primary me-4">
+                                    <span class="path1"></span><span class="path2"></span>
+                                </i>
+                                <div class="d-flex flex-column">
+                                    <h4 class="mb-1 text-primary">
+                                        <TL>2fa Code requiered</TL>
+                                    </h4>
+                                    <span>In order to finish the activation of 2fa, you need to enter the code your 2fa app shows you.</span>
+                                </div>
                             </div>
+                            <input type="text" class="form-control form-control-lg form-control-solid mb-0" placeholder="@SmartTranslateService.Translate("2fa Code")" @bind="currentTotp"/>
+
+                            <br/>
+
+                            <WButton CssClasses="btn btn-primary mb-2 align-self-center text-nowrap float-end" WorkingText="@SmartTranslateService.Translate("Saving")" Text="@SmartTranslateService.Translate("Finish")" OnClick="CheckAndSaveTotp">
+                            </WButton>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
+
+
+        <div class="separator mt-2"></div>
+
+        <div class="alert alert-danger d-flex rounded ms-6 me-6 mt-6 mb-8 bg-body">
+            <div class="w-100">
+                <table>
+                    <tr>
+                        <td>
+                            <span class="svg-icon svg-icon-2tx svg-icon-body">
+                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <path opacity="0.3" d="M20.5543 4.37824L12.1798 2.02473C12.0626 1.99176 11.9376 1.99176 11.8203 2.02473L3.44572 4.37824C3.18118 4.45258 3 4.6807 3 4.93945V13.569C3 14.6914 3.48509 15.8404 4.4417 16.984C5.17231 17.8575 6.18314 18.7345 7.446 19.5909C9.56752 21.0295 11.6566 21.912 11.7445 21.9488C11.8258 21.9829 11.9129 22 12.0001 22C12.0872 22 12.1744 21.983 12.2557 21.9488C12.3435 21.912 14.4326 21.0295 16.5541 19.5909C17.8169 18.7345 18.8277 17.8575 19.5584 16.984C20.515 15.8404 21 14.6914 21 13.569V4.93945C21 4.6807 20.8189 4.45258 20.5543 4.37824Z" fill="currentColor"></path>
+                                    <path d="M10.5606 11.3042L9.57283 10.3018C9.28174 10.0065 8.80522 10.0065 8.51412 10.3018C8.22897 10.5912 8.22897 11.0559 8.51412 11.3452L10.4182 13.2773C10.8099 13.6747 11.451 13.6747 11.8427 13.2773L15.4859 9.58051C15.771 9.29117 15.771 8.82648 15.4859 8.53714C15.1948 8.24176 14.7183 8.24176 14.4272 8.53714L11.7002 11.3042C11.3869 11.6221 10.874 11.6221 10.5606 11.3042Z" fill="currentColor"></path>
+                                </svg>
+                            </span>
+                        </td>
+                        <td class="w-25">
+                            <span class="text-gray-700 fw-semibold fs-6 ms-4 me-2">
+                                <TL>New password</TL>
+                            </span>
+                        </td>
+                        <td class="w-75">
+                            <input @bind="Password" type="password" class="form-control">
+                        </td>
+                        <td class="">
+                            <WButton OnClick="ChangePassword"
+                                     CssClasses="btn-danger ms-4"
+                                     Text="@SmartTranslateService.Translate("Change")"
+                                     WorkingText="@SmartTranslateService.Translate("Changing")">
+                            </WButton>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
     </LazyLoader>
 </div>
 

From 19ddabdb0001b3f1a5c8b648d26fb871008dc899 Mon Sep 17 00:00:00 2001
From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:59:43 +0200
Subject: [PATCH 3/5] removed card header at /profile

---
 Moonlight/Shared/Views/Profile/Index.razor | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Moonlight/Shared/Views/Profile/Index.razor b/Moonlight/Shared/Views/Profile/Index.razor
index b9394503..cb1451ce 100644
--- a/Moonlight/Shared/Views/Profile/Index.razor
+++ b/Moonlight/Shared/Views/Profile/Index.razor
@@ -13,14 +13,7 @@
 <LazyLoader Load="Load">
     <SmartForm OnValidSubmit="Save" Model="User">
         <div class="card mb-5 mb-xl-10">
-            <div class="card-header">
-                <div class="card-title">
-                    <h3 class="fw-bold m-0 text-gray-800">
-                        <TL>Personal information</TL>
-                    </h3>
-                </div>
-            </div>
-            <div class="card-body border-top p-9">
+            <div class="card-body p-9">
                 <div class="row">
                     <div class="col-lg-6 fv-row fv-plugins-icon-container">
                         <div class="mb-3">

From 96cc8b8b970c7ebd81c55e1ed993a5b4fe7a9b50 Mon Sep 17 00:00:00 2001
From: Marcel Baumgartner <marcel.kbkm@gmail.com>
Date: Tue, 4 Apr 2023 18:46:42 +0200
Subject: [PATCH 4/5] Removed legacy aaPanel stuff

---
 Moonlight/App/Database/DataContext.cs         |   3 -
 Moonlight/App/Database/Entities/AaPanel.cs    |   9 -
 Moonlight/App/Database/Entities/Database.cs   |  10 -
 Moonlight/App/Database/Entities/Website.cs    |  13 -
 ...3809_RemovedLegacyAaPanelStuff.Designer.cs | 876 ++++++++++++++++++
 ...0230404163809_RemovedLegacyAaPanelStuff.cs | 133 +++
 .../Migrations/DataContextModelSnapshot.cs    | 129 ---
 .../App/Repositories/AaPanelRepository.cs     |  44 -
 .../App/Repositories/DatabaseRepository.cs    |  43 -
 .../App/Repositories/WebsiteRepository.cs     |  44 -
 Moonlight/App/Services/DatabaseService.cs     |  76 --
 Moonlight/App/Services/WebsiteService.cs      |  39 -
 Moonlight/Program.cs                          |   4 -
 Moonlight/Shared/Views/Admin/Index.razor      |   3 +-
 Moonlight/Shared/Views/Index.razor            |   9 +-
 15 files changed, 1012 insertions(+), 423 deletions(-)
 delete mode 100644 Moonlight/App/Database/Entities/AaPanel.cs
 delete mode 100644 Moonlight/App/Database/Entities/Database.cs
 delete mode 100644 Moonlight/App/Database/Entities/Website.cs
 create mode 100644 Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.Designer.cs
 create mode 100644 Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.cs
 delete mode 100644 Moonlight/App/Repositories/AaPanelRepository.cs
 delete mode 100644 Moonlight/App/Repositories/DatabaseRepository.cs
 delete mode 100644 Moonlight/App/Repositories/WebsiteRepository.cs
 delete mode 100644 Moonlight/App/Services/DatabaseService.cs
 delete mode 100644 Moonlight/App/Services/WebsiteService.cs

diff --git a/Moonlight/App/Database/DataContext.cs b/Moonlight/App/Database/DataContext.cs
index 3e2875f4..906ce00c 100644
--- a/Moonlight/App/Database/DataContext.cs
+++ b/Moonlight/App/Database/DataContext.cs
@@ -30,7 +30,6 @@ public class DataContext : DbContext
     public DbSet<AuditLogEntry> AuditLog { get; set; }
     public DbSet<ErrorLogEntry> ErrorLog { get; set; }
     public DbSet<SecurityLogEntry> SecurityLog { get; set; }
-    public DbSet<Entities.Database> Databases { get; set; }
     public DbSet<SupportMessage> SupportMessages { get; set; }
     
     public DbSet<SharedDomain> SharedDomains { get; set; }
@@ -38,8 +37,6 @@ public class DataContext : DbContext
     public DbSet<Revoke> Revokes { get; set; }
     public DbSet<NotificationClient> NotificationClients { get; set; }
     public DbSet<NotificationAction> NotificationActions { get; set; }
-    public DbSet<AaPanel> AaPanels { get; set; }
-    public DbSet<Website> Websites { get; set; }
     public DbSet<DdosAttack> DdosAttacks { get; set; }
     public DbSet<Subscription> Subscriptions { get; set; }
 
diff --git a/Moonlight/App/Database/Entities/AaPanel.cs b/Moonlight/App/Database/Entities/AaPanel.cs
deleted file mode 100644
index da79d53e..00000000
--- a/Moonlight/App/Database/Entities/AaPanel.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Moonlight.App.Database.Entities;
-
-public class AaPanel
-{
-    public int Id { get; set; }
-    public string Url { get; set; } = "";
-    public string Key { get; set; } = "";
-    public string BaseDomain { get; set; } = "";
-}
\ No newline at end of file
diff --git a/Moonlight/App/Database/Entities/Database.cs b/Moonlight/App/Database/Entities/Database.cs
deleted file mode 100644
index c14c1392..00000000
--- a/Moonlight/App/Database/Entities/Database.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Moonlight.App.Database.Entities;
-
-public class Database
-{
-    public int Id { get; set; }
-    public int InternalAaPanelId { get; set; }
-    public User Owner { get; set; }
-    public AaPanel AaPanel { get; set; }
-    public string Name { get; set; }
-}
\ No newline at end of file
diff --git a/Moonlight/App/Database/Entities/Website.cs b/Moonlight/App/Database/Entities/Website.cs
deleted file mode 100644
index d5c86d97..00000000
--- a/Moonlight/App/Database/Entities/Website.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Moonlight.App.Database.Entities;
-
-public class Website
-{
-    public int Id { get; set; }
-    public int InternalAaPanelId { get; set; }
-    public AaPanel AaPanel { get; set; }
-    public User Owner { get; set; }
-    public string DomainName { get; set; }
-    public string PhpVersion { get; set; }
-    public string FtpUsername { get; set; }
-    public string FtpPassword { get; set; }
-}
\ No newline at end of file
diff --git a/Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.Designer.cs b/Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.Designer.cs
new file mode 100644
index 00000000..5220ef2c
--- /dev/null
+++ b/Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.Designer.cs
@@ -0,0 +1,876 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Moonlight.App.Database;
+
+#nullable disable
+
+namespace Moonlight.App.Database.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20230404163809_RemovedLegacyAaPanelStuff")]
+    partial class RemovedLegacyAaPanelStuff
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.3")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<long>("Data")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NodeId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Ongoing")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NodeId");
+
+                    b.ToTable("DdosAttacks");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Default")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.ToTable("DockerImages");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("OwnerId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SharedDomainId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("SharedDomainId");
+
+                    b.ToTable("Domains");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("Allocations")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConfigFiles")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("InstallDockerImage")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("InstallEntrypoint")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("InstallScript")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Startup")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StartupDetection")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StopCommand")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TagsJson")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("Uuid")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Images");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ImageTag", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ImageTags");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("DefaultValue")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.ToTable("ImageVariables");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LoadingMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LoadingMessages");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.AuditLogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JsonData")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("System")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("AuditLog");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.ErrorLogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Class")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JsonData")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Stacktrace")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("System")
+                        .HasColumnType("tinyint(1)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ErrorLog");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.LogsEntries.SecurityLogEntry", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Ip")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("JsonData")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("System")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SecurityLog");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Fqdn")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("HttpPort")
+                        .HasColumnType("int");
+
+                    b.Property<int>("MoonlightDaemonPort")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("SftpPort")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Ssl")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Token")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TokenId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Nodes");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int?>("NodeId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NodeId");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("NodeAllocations");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Action")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NotificationClientId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NotificationClientId");
+
+                    b.ToTable("NotificationActions");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("NotificationClients");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Revoke", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Identifier")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Revokes");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<int>("Cpu")
+                        .HasColumnType("int");
+
+                    b.Property<long>("Disk")
+                        .HasColumnType("bigint");
+
+                    b.Property<int>("DockerImageIndex")
+                        .HasColumnType("int");
+
+                    b.Property<int>("ImageId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Installing")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsCleanupException")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("MainAllocationId")
+                        .HasColumnType("int");
+
+                    b.Property<long>("Memory")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("NodeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("OverrideStartup")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("OwnerId")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("Suspended")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("Uuid")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ImageId");
+
+                    b.HasIndex("MainAllocationId");
+
+                    b.HasIndex("NodeId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.ToTable("Servers");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<long>("Bytes")
+                        .HasColumnType("bigint");
+
+                    b.Property<bool>("Created")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<Guid>("Uuid")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("ServerBackups");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("ServerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ServerId");
+
+                    b.ToTable("ServerVariables");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.SharedDomain", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("CloudflareId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SharedDomains");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Subscription", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LimitsJson")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Subscriptions");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Answer")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsQuestion")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSupport")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Message")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("RecipientId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("SenderId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RecipientId");
+
+                    b.HasIndex("SenderId");
+
+                    b.ToTable("SupportMessages");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<string>("Address")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("Admin")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("City")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Country")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int?>("CurrentSubscriptionId")
+                        .HasColumnType("int");
+
+                    b.Property<long>("DiscordId")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("LastName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("State")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("SubscriptionDuration")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("SubscriptionSince")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("SupportPending")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime>("TokenValidTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("TotpEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("TotpSecret")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CurrentSubscriptionId");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Node", "Node")
+                        .WithMany()
+                        .HasForeignKey("NodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Node");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.DockerImage", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Image", null)
+                        .WithMany("DockerImages")
+                        .HasForeignKey("ImageId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Domain", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.SharedDomain", "SharedDomain")
+                        .WithMany()
+                        .HasForeignKey("SharedDomainId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Owner");
+
+                    b.Navigation("SharedDomain");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ImageVariable", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Image", null)
+                        .WithMany("Variables")
+                        .HasForeignKey("ImageId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.NodeAllocation", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Node", null)
+                        .WithMany("Allocations")
+                        .HasForeignKey("NodeId");
+
+                    b.HasOne("Moonlight.App.Database.Entities.Server", null)
+                        .WithMany("Allocations")
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationAction", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Notification.NotificationClient", "NotificationClient")
+                        .WithMany()
+                        .HasForeignKey("NotificationClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("NotificationClient");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Notification.NotificationClient", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Image", "Image")
+                        .WithMany()
+                        .HasForeignKey("ImageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.NodeAllocation", "MainAllocation")
+                        .WithMany()
+                        .HasForeignKey("MainAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.Node", "Node")
+                        .WithMany()
+                        .HasForeignKey("NodeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Image");
+
+                    b.Navigation("MainAllocation");
+
+                    b.Navigation("Node");
+
+                    b.Navigation("Owner");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerBackup", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Server", null)
+                        .WithMany("Backups")
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.ServerVariable", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Server", null)
+                        .WithMany("Variables")
+                        .HasForeignKey("ServerId");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.SupportMessage", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Recipient")
+                        .WithMany()
+                        .HasForeignKey("RecipientId");
+
+                    b.HasOne("Moonlight.App.Database.Entities.User", "Sender")
+                        .WithMany()
+                        .HasForeignKey("SenderId");
+
+                    b.Navigation("Recipient");
+
+                    b.Navigation("Sender");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.User", b =>
+                {
+                    b.HasOne("Moonlight.App.Database.Entities.Subscription", "CurrentSubscription")
+                        .WithMany()
+                        .HasForeignKey("CurrentSubscriptionId");
+
+                    b.Navigation("CurrentSubscription");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b =>
+                {
+                    b.Navigation("DockerImages");
+
+                    b.Navigation("Variables");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Node", b =>
+                {
+                    b.Navigation("Allocations");
+                });
+
+            modelBuilder.Entity("Moonlight.App.Database.Entities.Server", b =>
+                {
+                    b.Navigation("Allocations");
+
+                    b.Navigation("Backups");
+
+                    b.Navigation("Variables");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.cs b/Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.cs
new file mode 100644
index 00000000..aee8be1d
--- /dev/null
+++ b/Moonlight/App/Database/Migrations/20230404163809_RemovedLegacyAaPanelStuff.cs
@@ -0,0 +1,133 @@
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Moonlight.App.Database.Migrations
+{
+    /// <inheritdoc />
+    public partial class RemovedLegacyAaPanelStuff : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Databases");
+
+            migrationBuilder.DropTable(
+                name: "Websites");
+
+            migrationBuilder.DropTable(
+                name: "AaPanels");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "AaPanels",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    BaseDomain = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Key = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Url = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AaPanels", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "Databases",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    AaPanelId = table.Column<int>(type: "int", nullable: false),
+                    OwnerId = table.Column<int>(type: "int", nullable: false),
+                    InternalAaPanelId = table.Column<int>(type: "int", nullable: false),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Databases", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Databases_AaPanels_AaPanelId",
+                        column: x => x.AaPanelId,
+                        principalTable: "AaPanels",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Databases_Users_OwnerId",
+                        column: x => x.OwnerId,
+                        principalTable: "Users",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "Websites",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    AaPanelId = table.Column<int>(type: "int", nullable: false),
+                    OwnerId = table.Column<int>(type: "int", nullable: false),
+                    DomainName = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    FtpPassword = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    FtpUsername = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    InternalAaPanelId = table.Column<int>(type: "int", nullable: false),
+                    PhpVersion = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Websites", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Websites_AaPanels_AaPanelId",
+                        column: x => x.AaPanelId,
+                        principalTable: "AaPanels",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Websites_Users_OwnerId",
+                        column: x => x.OwnerId,
+                        principalTable: "Users",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Databases_AaPanelId",
+                table: "Databases",
+                column: "AaPanelId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Databases_OwnerId",
+                table: "Databases",
+                column: "OwnerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Websites_AaPanelId",
+                table: "Websites",
+                column: "AaPanelId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Websites_OwnerId",
+                table: "Websites",
+                column: "OwnerId");
+        }
+    }
+}
diff --git a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
index d670d747..65062e19 100644
--- a/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
+++ b/Moonlight/App/Database/Migrations/DataContextModelSnapshot.cs
@@ -19,57 +19,6 @@ namespace Moonlight.App.Database.Migrations
                 .HasAnnotation("ProductVersion", "7.0.3")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.AaPanel", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<string>("BaseDomain")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<string>("Key")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<string>("Url")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("AaPanels");
-                });
-
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<int>("AaPanelId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("InternalAaPanelId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<int>("OwnerId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AaPanelId");
-
-                    b.HasIndex("OwnerId");
-
-                    b.ToTable("Databases");
-                });
-
             modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
                 {
                     b.Property<int>("Id")
@@ -748,65 +697,6 @@ namespace Moonlight.App.Database.Migrations
                     b.ToTable("Users");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    b.Property<int>("AaPanelId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("DomainName")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<string>("FtpPassword")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<string>("FtpUsername")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.Property<int>("InternalAaPanelId")
-                        .HasColumnType("int");
-
-                    b.Property<int>("OwnerId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("PhpVersion")
-                        .IsRequired()
-                        .HasColumnType("longtext");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AaPanelId");
-
-                    b.HasIndex("OwnerId");
-
-                    b.ToTable("Websites");
-                });
-
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Database", b =>
-                {
-                    b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel")
-                        .WithMany()
-                        .HasForeignKey("AaPanelId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
-                        .WithMany()
-                        .HasForeignKey("OwnerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("AaPanel");
-
-                    b.Navigation("Owner");
-                });
-
             modelBuilder.Entity("Moonlight.App.Database.Entities.DdosAttack", b =>
                 {
                     b.HasOne("Moonlight.App.Database.Entities.Node", "Node")
@@ -957,25 +847,6 @@ namespace Moonlight.App.Database.Migrations
                     b.Navigation("CurrentSubscription");
                 });
 
-            modelBuilder.Entity("Moonlight.App.Database.Entities.Website", b =>
-                {
-                    b.HasOne("Moonlight.App.Database.Entities.AaPanel", "AaPanel")
-                        .WithMany()
-                        .HasForeignKey("AaPanelId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Moonlight.App.Database.Entities.User", "Owner")
-                        .WithMany()
-                        .HasForeignKey("OwnerId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("AaPanel");
-
-                    b.Navigation("Owner");
-                });
-
             modelBuilder.Entity("Moonlight.App.Database.Entities.Image", b =>
                 {
                     b.Navigation("DockerImages");
diff --git a/Moonlight/App/Repositories/AaPanelRepository.cs b/Moonlight/App/Repositories/AaPanelRepository.cs
deleted file mode 100644
index 92870f85..00000000
--- a/Moonlight/App/Repositories/AaPanelRepository.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database;
-using Moonlight.App.Database.Entities;
-
-namespace Moonlight.App.Repositories;
-
-public class AaPanelRepository : IDisposable
-{
-    private readonly DataContext DataContext;
-
-    public AaPanelRepository(DataContext dataContext)
-    {
-        DataContext = dataContext;
-    }
-
-    public DbSet<AaPanel> Get()
-    {
-        return DataContext.AaPanels;
-    }
-
-    public AaPanel Add(AaPanel aaPanel)
-    {
-        var x = DataContext.AaPanels.Add(aaPanel);
-        DataContext.SaveChanges();
-        return x.Entity;
-    }
-
-    public void Update(AaPanel aaPanel)
-    {
-        DataContext.AaPanels.Update(aaPanel);
-        DataContext.SaveChanges();
-    }
-
-    public void Delete(AaPanel aaPanel)
-    {
-        DataContext.AaPanels.Remove(aaPanel);
-        DataContext.SaveChanges();
-    }
-
-    public void Dispose()
-    {
-        DataContext.Dispose();
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/App/Repositories/DatabaseRepository.cs b/Moonlight/App/Repositories/DatabaseRepository.cs
deleted file mode 100644
index 020c72e8..00000000
--- a/Moonlight/App/Repositories/DatabaseRepository.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database;
-
-namespace Moonlight.App.Repositories;
-
-public class DatabaseRepository : IDisposable
-{
-    private readonly DataContext DataContext;
-
-    public DatabaseRepository(DataContext dataContext)
-    {
-        DataContext = dataContext;
-    }
-
-    public DbSet<Database.Entities.Database> Get()
-    {
-        return DataContext.Databases;
-    }
-
-    public Database.Entities.Database Add(Database.Entities.Database database)
-    {
-        var x = DataContext.Databases.Add(database);
-        DataContext.SaveChanges();
-        return x.Entity;
-    }
-
-    public void Update(Database.Entities.Database database)
-    {
-        DataContext.Databases.Update(database);
-        DataContext.SaveChanges();
-    }
-
-    public void Delete(Database.Entities.Database database)
-    {
-        DataContext.Databases.Remove(database);
-        DataContext.SaveChanges();
-    }
-
-    public void Dispose()
-    {
-        DataContext.Dispose();
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/App/Repositories/WebsiteRepository.cs b/Moonlight/App/Repositories/WebsiteRepository.cs
deleted file mode 100644
index aedf91f4..00000000
--- a/Moonlight/App/Repositories/WebsiteRepository.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database;
-using Moonlight.App.Database.Entities;
-
-namespace Moonlight.App.Repositories;
-
-public class WebsiteRepository : IDisposable
-{
-    private readonly DataContext DataContext;
-
-    public WebsiteRepository(DataContext dataContext)
-    {
-        DataContext = dataContext;
-    }
-
-    public DbSet<Website> Get()
-    {
-        return DataContext.Websites;
-    }
-
-    public Website Add(Website website)
-    {
-        var x = DataContext.Websites.Add(website);
-        DataContext.SaveChanges();
-        return x.Entity;
-    }
-
-    public void Update(Website website)
-    {
-        DataContext.Websites.Update(website);
-        DataContext.SaveChanges();
-    }
-
-    public void Delete(Website website)
-    {
-        DataContext.Websites.Remove(website);
-        DataContext.SaveChanges();
-    }
-
-    public void Dispose()
-    {
-        DataContext.Dispose();
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/App/Services/DatabaseService.cs b/Moonlight/App/Services/DatabaseService.cs
deleted file mode 100644
index 33e5988f..00000000
--- a/Moonlight/App/Services/DatabaseService.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using aaPanelSharp;
-using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Repositories;
-
-namespace Moonlight.App.Services;
-
-public class DatabaseService
-{
-    private readonly DatabaseRepository DatabaseRepository;
-    private readonly AaPanelRepository AaPanelRepository;
-
-    public DatabaseService(DatabaseRepository databaseRepository, AaPanelRepository aaPanelRepository)
-    {
-        DatabaseRepository = databaseRepository;
-        AaPanelRepository = aaPanelRepository;
-    }
-
-    public Task<Database.Entities.Database> Create(string name, string password, User u, AaPanel? a = null)
-    {
-        if (DatabaseRepository.Get().Any(x => x.Name == name))
-            throw new DisplayException("A database with this name has been already created");
-        
-        var aaPanel = a ?? AaPanelRepository.Get().First();
-
-        var access = new aaPanel(a!.Url, a.Key);
-
-        if (access.CreateDatabase(name, name, password))
-        {
-            var aaDb = access.Databases.First(x => x.Name == name);
-
-            return Task.FromResult(DatabaseRepository.Add(new()
-            {
-                Name = name,
-                AaPanel = aaPanel,
-                Owner = u,
-                InternalAaPanelId = aaDb.Id
-            }));
-        }
-        else
-            throw new DisplayException("An unknown error occured while creating the database");
-    }
-
-    public Task ChangePassword(Database.Entities.Database database, string newPassword)
-    {
-        var access = CreateApiAccess(database);
-
-        access.Databases.First(x => x.Id == database.InternalAaPanelId).ChangePassword(newPassword);
-        
-        return Task.CompletedTask;
-    }
-
-    public Task<string> GetPassword(Database.Entities.Database database)
-    {
-        var access = CreateApiAccess(database);
-
-        return Task.FromResult(
-            access.Databases
-                .First(x => x.Id == database.InternalAaPanelId).Password
-        );
-    }
-    
-    private aaPanel CreateApiAccess(Database.Entities.Database database)
-    {
-        if (database.AaPanel == null)
-        {
-            database = DatabaseRepository
-                .Get()
-                .Include(x => x.AaPanel)
-                .First(x => x.Id == database.Id);
-        }
-        
-        return new aaPanel(database.AaPanel.Url, database.AaPanel.Key);
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/App/Services/WebsiteService.cs b/Moonlight/App/Services/WebsiteService.cs
deleted file mode 100644
index 4cdda657..00000000
--- a/Moonlight/App/Services/WebsiteService.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using aaPanelSharp;
-using Microsoft.EntityFrameworkCore;
-using Moonlight.App.Database.Entities;
-using Moonlight.App.Exceptions;
-using Moonlight.App.Repositories;
-
-namespace Moonlight.App.Services;
-
-public class WebsiteService
-{
-    private readonly WebsiteRepository WebsiteRepository;
-
-    public WebsiteService(WebsiteRepository websiteRepository)
-    {
-        WebsiteRepository = websiteRepository;
-    }
-
-    public Website Create(AaPanel aaPanel, User user, string name)
-    {
-        if (WebsiteRepository.Get().Any(x => x.DomainName == name))
-            throw new DisplayException("A website with this domain has already been created");
-
-        var access = new aaPanel(aaPanel.Url, aaPanel.Key);
-        return null;
-    }
-
-    private aaPanel CreateApiAccess(Website website)
-    {
-        if (website.AaPanel == null)
-        {
-            website = WebsiteRepository
-                .Get()
-                .Include(x => x.AaPanel)
-                .First(x => x.Id == website.Id);
-        }
-        
-        return new aaPanel(website.AaPanel.Url, website.AaPanel.Key);
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/Program.cs b/Moonlight/Program.cs
index cb4fdcf3..5b4efebf 100644
--- a/Moonlight/Program.cs
+++ b/Moonlight/Program.cs
@@ -52,15 +52,12 @@ namespace Moonlight
             builder.Services.AddScoped<NodeRepository>();
             builder.Services.AddScoped<ServerRepository>();
             builder.Services.AddScoped<ServerBackupRepository>();
-            builder.Services.AddScoped<DatabaseRepository>();
             builder.Services.AddScoped<ImageRepository>();
             builder.Services.AddScoped<SupportMessageRepository>();
             builder.Services.AddScoped<DomainRepository>();
             builder.Services.AddScoped<SharedDomainRepository>();
             builder.Services.AddScoped<RevokeRepository>();
             builder.Services.AddScoped<NotificationRepository>();
-            builder.Services.AddScoped<AaPanelRepository>();
-            builder.Services.AddScoped<WebsiteRepository>();
             builder.Services.AddScoped<DdosAttackRepository>();
             builder.Services.AddScoped<SubscriptionRepository>();
 
@@ -108,7 +105,6 @@ namespace Moonlight
             builder.Services.AddScoped<LogService>();
             builder.Services.AddScoped<MailService>();
             builder.Services.AddSingleton<TrashMailDetectorService>();
-            builder.Services.AddScoped<WebsiteService>();
 
             // Support
             builder.Services.AddSingleton<SupportServerService>();
diff --git a/Moonlight/Shared/Views/Admin/Index.razor b/Moonlight/Shared/Views/Admin/Index.razor
index e4ccd49e..7fc0a182 100644
--- a/Moonlight/Shared/Views/Admin/Index.razor
+++ b/Moonlight/Shared/Views/Admin/Index.razor
@@ -3,7 +3,6 @@
 @using Moonlight.App.Repositories
 
 @inject ServerRepository ServerRepository
-@inject DatabaseRepository DatabaseRepository
 @inject UserRepository UserRepository
 
 <OnlyAdmin>
@@ -126,7 +125,7 @@
 
     private Task Load(LazyLoader lazyLoader)
     {
-        DatabaseCount = DatabaseRepository.Get().Count();
+        DatabaseCount = 0;
         ServerCount = ServerRepository.Get().Count();
         UserCount = UserRepository.Get().Count();
 
diff --git a/Moonlight/Shared/Views/Index.razor b/Moonlight/Shared/Views/Index.razor
index 44de7963..585cac6b 100644
--- a/Moonlight/Shared/Views/Index.razor
+++ b/Moonlight/Shared/Views/Index.razor
@@ -1,11 +1,9 @@
 @page "/"
-@using Moonlight.App.Repositories
+
 @using Moonlight.App.Repositories.Servers
 @using Microsoft.EntityFrameworkCore
 @using Moonlight.App.Database.Entities
-@using Moonlight.App.Services.Sessions
 
-@inject DatabaseRepository DatabaseRepository
 @inject ServerRepository ServerRepository
 
 <LazyLoader Load="Load">
@@ -246,10 +244,7 @@
 
     private async Task Load(LazyLoader lazyLoader)
     {
-        DatabaseCount = DatabaseRepository
-            .Get()
-            .Include(x => x.Owner)
-            .Count(x => x.Owner.Id == User.Id);
+        DatabaseCount = 0;
         
         ServerCount = ServerRepository
             .Get()

From f81ccdd5c334c2982df421bef69b0e2d8f810e30 Mon Sep 17 00:00:00 2001
From: Daniel Balk <67603460+Daniel-Balk@users.noreply.github.com>
Date: Tue, 4 Apr 2023 20:47:59 +0200
Subject: [PATCH 5/5] Create Changelog.razor

---
 Moonlight/Shared/Views/Changelog.razor | 53 ++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 Moonlight/Shared/Views/Changelog.razor

diff --git a/Moonlight/Shared/Views/Changelog.razor b/Moonlight/Shared/Views/Changelog.razor
new file mode 100644
index 00000000..ad68c1e2
--- /dev/null
+++ b/Moonlight/Shared/Views/Changelog.razor
@@ -0,0 +1,53 @@
+@page "/changelog"
+
+@{
+    List<string[]> changelog = new List<string[]>()
+    {
+        new[] {"title", "body1", "body2"},
+        new[] {"title2", "body3", "body4", "body5"},
+    };
+    int i = 0;
+}
+
+<div class="card card-docs flex-row-fluid mb-2">
+    <div class="card-body fs-6 py-15 px-10 py-lg-15 px-lg-15 text-gray-700">
+        <div class="accordion accordion-flush accordion-icon-toggle" id="kt_accordion">
+            @foreach (var prt in changelog)
+            {
+                i++;
+                <div class="accordion-item mb-5">
+                    <div class="accordion-header py-3 d-flex" data-bs-toggle="collapse" data-bs-target="#i@(i)" aria-expanded="@(i == 0)">
+                        <span class="accordion-icon">
+                            <span class="svg-icon svg-icon-3">
+                                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="currentColor"></rect>
+                                    <path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="currentColor"></path>
+                                </svg>
+                            </span>
+                        </span>
+                        <h3 class="fs-2 text-gray-800 fw-bold mb-0 ms-4">@prt[0]</h3>
+                    </div>
+
+                    <div id="i@(i)" class="fs-6 mt-1 mb-1 py-0 ps-10 @(i == 0 ? "show" : "collapse")" data-bs-parent="#kt_accordion" style="">
+                        <div class="accordion-body ps-0 pt-0">
+                            <div class="mb-5">
+                                @{
+                                    var o = prt[1..];
+                                }
+                                <h3 class="fs-6 fw-bold mb-1">Changes</h3>
+                                <ul class="my-0 py-0">
+                                    @foreach (var v in o)
+                                    {
+                                        <li class="py-2">
+                                            @v
+                                        </li>
+                                    }
+                                </ul>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            }
+        </div>
+    </div>
+</div>
\ No newline at end of file