diff --git a/brain/utility/Maintenance.php b/brain/utility/Maintenance.php index c3e4f40..764a274 100644 --- a/brain/utility/Maintenance.php +++ b/brain/utility/Maintenance.php @@ -2,6 +2,7 @@ namespace brain\utility; +use brain\data\Settings; use Carbon\Carbon; class Maintenance diff --git a/brain/views/dash/settings.twig b/brain/views/dash/settings.twig index 698e105..990ba16 100644 --- a/brain/views/dash/settings.twig +++ b/brain/views/dash/settings.twig @@ -10,7 +10,6 @@ {% block mainContent %}
-

Info

@@ -23,114 +22,103 @@
-
-
-
-
-
-

Options

-
+ +
+
+ {% if lastBackup != '' %} + LAST BACK UP
+ {{ lastBackup }}
+ {% else %} + span No back ups. Frowny face. + {% endif %} +
- -
- {% if apiStatus is defined and apiStatus == "true" %} - - - {% else %} - - - {% endif %} - {% if dynamicRenderStatus is defined and dynamicRenderStatus == "true" %} - - - {% else %} - - - {% endif %} -
-
-
- {% for theme in themes %} - {% if theme.name == currentTheme %} - - {% else %} - - {% endif %} - - {% endfor %} -
-
-
- {% if mailOption == "option-none" or mailOption == "" %} - NONE - {% else %} - NONE - {% endif %} - {% if mailOption == "option-mg" or mailOption == "" %} - MAILGUN - {% else %} - MAILGUN - {% endif %} - {% if mailOption == "option-smtp" or mailOption == "" %} - SMTP - {% else %} - SMTP - {% endif %} - - {% apply spaceless %} - {{ include("dash/partials/mailforms.twig") }} - {% endapply %} - -

-
-
-

Data

-
-
- -
- {{ member['key'] }} -
-
- {{ ftoken }} -
-
-
- {% if lastBackup != '' %} - LAST BACK UP
- {{ lastBackup }}
+ + {% else %} + + + {% endif %} + {% if dynamicRenderStatus is defined and dynamicRenderStatus == "true" %} + + + {% else %} + + + {% endif %} +
+
+
+ {% for theme in themes %} + {% if theme.name == currentTheme %} + {% else %} - span No back ups. Frowny face. + {% endif %} -
-
-
- {% endblock %} + + {% endfor %} + +
+
+ {% if mailOption == "option-none" or mailOption == "" %} + NONE + {% else %} + NONE + {% endif %} + {% if mailOption == "option-mg" or mailOption == "" %} + MAILGUN + {% else %} + MAILGUN + {% endif %} + {% if mailOption == "option-smtp" or mailOption == "" %} + SMTP + {% else %} + SMTP + {% endif %} + + {% apply spaceless %} + {{ include("dash/partials/mailforms.twig") }} + {% endapply %} + +

+
+
+ +
+ {{ member['key'] }} +
+
+ {{ ftoken }} +
+ + + {% endblock %} diff --git a/public/assets/css/dash/settings.css b/public/assets/css/dash/settings.css index 631f791..b24b31a 100644 --- a/public/assets/css/dash/settings.css +++ b/public/assets/css/dash/settings.css @@ -16,13 +16,11 @@ article[role="settings"] label { font-weight: 400; } -section[role="member-settings"], -section[role="site-settings"], -section[role="data-settings"], -section[role="backup-settings"] { +section[role="member-settings"] { display: grid; - grid-template-columns: 1fr 1fr 1fr; - gap: 10px; + grid-template-columns: 1fr 1fr 1fr 1fr; + grid-auto-columns: auto; + gap: 15px; width: 100%; max-width: 900px; margin: 10px auto; @@ -32,8 +30,47 @@ section[role="member-settings"] { width: 100%; } -section[role="member-settings"] > div[role="member-avatar"] { - height: 300px; +section[role="member-settings"] > div:nth-child(1) { + grid-column: 1/2; + grid-row: 1/3; +} + +section[role="member-settings"] > div:nth-child(2) { + grid-column: 2/4; + grid-row: 1/3; +} + +section[role="member-settings"] > div:nth-child(3) { + grid-row: 1/3; +} + +section[role="member-settings"] > div:nth-child(4) { + color: var(--white); +} + +section[role="member-settings"] > div:nth-child(4) a { + font-weight: bold; + text-decoration: underline; + color: var(--tertiary); +} + +section[role="member-settings"] > div:nth-child(5) { + grid-column: 2/4; +} + +section[role="member-settings"] > div:nth-child(6) { + grid-column: 1/3; +} + +section[role="member-settings"] > div:nth-child(7) { + grid-column: 3/5; + min-height: 325px; +} + +section[role="member-settings"] > div:nth-child(8) { + grid-column: 1/4; + color: var(--white); + word-wrap: break-word; } section[role="member-settings"] > div[role="member-avatar"] div, @@ -55,15 +92,7 @@ section[role="member-settings"] div input[type="text"] { section[role="member-settings"] div textarea { width: 99%; - height: 86%; -} - -section[role="member-settings"] > div:nth-child(1) { - grid-column: 1/2; -} - -section[role="member-settings"] > div:nth-child(2) { - grid-column: 2/4; + height: 63%; } article[role="settings"] button { @@ -80,20 +109,22 @@ article[role="settings"] button > span { position: relative; } -section[role="site-settings"] +section[role="member-settings"] > div[role="features"] button[data-enabled="true"] { color: var(--white); } -section[role="site-settings"] +section[role="member-settings"] > div[role="features"] button[data-enabled="false"] { color: var(--primary); background: var(--secondary); } -section[role="site-settings"] > div[role="theme"] button[data-enabled="true"] { +section[role="member-settings"] + > div[role="theme"] + button[data-enabled="true"] { color: var(--white); background: var(--highlight); display: block; @@ -101,7 +132,9 @@ section[role="site-settings"] > div[role="theme"] button[data-enabled="true"] { padding: 3px; } -section[role="site-settings"] > div[role="theme"] button[data-enabled="false"] { +section[role="member-settings"] + > div[role="theme"] + button[data-enabled="false"] { color: var(--primary); background: var(--secondary); display: block; @@ -109,7 +142,7 @@ section[role="site-settings"] > div[role="theme"] button[data-enabled="false"] { padding: 3px; } -section[role="site-settings"] > div[role="mail"] a { +section[role="member-settings"] > div[role="mail"] a { margin-right: 3px; color: var(--secondary); display: inline-block; @@ -118,18 +151,18 @@ section[role="site-settings"] > div[role="mail"] a { border-top: var(--primary) 1px solid; } -section[role="site-settings"] > div[role="mail"] a[data-enabled="true"] { +section[role="member-settings"] > div[role="mail"] a[data-enabled="true"] { color: var(--tertiary); font-weight: bold; border-top: var(--highlight) 1px solid; } -section[role="site-settings"] > div[role="mail"] div[data-enabled="false"] { +section[role="member-settings"] > div[role="mail"] div[data-enabled="false"] { visibility: hidden; display: none; } -section[role="site-settings"] > div[role="mail"] input { +section[role="member-settings"] > div[role="mail"] input { width: 96%; height: 30px; padding: 5px; @@ -140,17 +173,6 @@ section[role="data-settings"] { color: var(--white); } -section[role="data-settings"] div:nth-child(1) { - grid-column: 1/3; - word-wrap: break-word; -} - -section[role="data-settings"] a { - font-weight: bold; - text-decoration: underline; - color: var(--tertiary); -} - @media only screen and (max-width: 900px) { main > article[role="settings"] { width: 97%; @@ -161,68 +183,81 @@ section[role="data-settings"] a { } } -@media only screen and (max-width: 480px) { - article[role="settings"] button { - width: 98%; - } - - article[role="settings"] button > span { - font-size: 0.6em; - } - - section[role="member-settings"], - section[role="site-settings"], - section[role="data-settings"], - section[role="backup-settings"] { +@media only screen and (max-width: 650px) { + section[role="member-settings"] { grid-template-columns: 1fr 1fr; } + section[role="member-settings"] div textarea { + height: 80px; + } + + section[role="member-settings"] > div:nth-child(1) { + grid-column: 1/2; + grid-row: 1/3; + height: 200px; + } + section[role="member-settings"] > div:nth-child(2) { grid-column: 2/3; + grid-row: 1/3; } - section[role="member-settings"] > div:nth-child(5) { + section[role="member-settings"] > div:nth-child(3) { grid-column: 1/3; + grid-row: 3/5; } - main > article[role="settings"] > section[role="member-settings"] { - width: auto; - } - - section[role="member-settings"] > div[role="member-avatar"] { - height: 200px; - } - - section[role="site-settings"] > div:nth-child(3) { - grid-column: 1/3; - } - - section[role="data-settings"] > div:nth-child(2) { - grid-column: 1/3; - } -} - -@media only screen and (max-width: 330px) { - section[role="member-settings"], - section[role="site-settings"], - section[role="data-settings"], - section[role="backup-settings"] { - grid-template-columns: 1fr; - grid-auto-rows: 1fr 1fr auto auto; - } - - section[role="member-settings"] > div:nth-child(2), - section[role="member-settings"] > div:nth-child(3), - section[role="member-settings"] > div:nth-child(4), - section[role="member-settings"] > div:nth-child(5) { + section[role="member-settings"] > div:nth-child(4) { grid-column: 1/2; } - section[role="site-settings"] > div:nth-child(1) { - grid-column: 1/3; + section[role="member-settings"] > div:nth-child(5) { + grid-column: 2/3; } - article[role="settings"] button > span { - font-size: 0.8em; + section[role="member-settings"] > div:nth-child(6) { + grid-column: 1/2; + } + + section[role="member-settings"] > div:nth-child(7) { + grid-column: 2/3; + min-height: 325px; + } + + section[role="member-settings"] > div:nth-child(8) { + grid-column: 1/3; + } +} + +@media only screen and (max-width: 530px) { + section[role="member-settings"] { + grid-template-columns: 1fr; + } + + section[role="member-settings"] div textarea { + height: 80px; + } + + section[role="member-settings"] > div:nth-child(1) { + grid-row: 1/3; + height: 200px; + } + + section[role="member-settings"] > div:nth-child(2) { + grid-row: 3/5; + } + + section[role="member-settings"] > div:nth-child(3) { + grid-column: 1; + grid-row: 5/7; + } + + section[role="member-settings"] > div:nth-child(4), + section[role="member-settings"] > div:nth-child(5), + section[role="member-settings"] > div:nth-child(6), + section[role="member-settings"] > div:nth-child(7), + section[role="member-settings"] > div:nth-child(8) { + grid-column: 1/3; } } diff --git a/public/assets/scripts/Start.js b/public/assets/scripts/Start.js index 86c8ec6..e5e4d2c 100644 --- a/public/assets/scripts/Start.js +++ b/public/assets/scripts/Start.js @@ -445,7 +445,7 @@ const $7e781a188206b2b3$export$d46ee33f41c7e43d = "apiUseNotAuthorized"; data = { task: "create_backup" }; - this._request(url, event, method, type, data).then((result)=>{ + this._request(url, null, event, method, type, data).then((result)=>{ resolve(result); }).catch((err)=>{ reject(err); @@ -4186,6 +4186,7 @@ class $accfb6154319a04b$export$2e2bcd8739ae039 { $accfb6154319a04b$var$iconGood.style.display = "none"; $accfb6154319a04b$var$iconNotGood.style.display = "none"; var color = ""; + $accfb6154319a04b$var$responseText.innerHTML = text; if (status !== null) { if (status) { color = "#32cd32"; @@ -4200,7 +4201,6 @@ class $accfb6154319a04b$export$2e2bcd8739ae039 { color = "#200317"; $accfb6154319a04b$var$iconWorking.style.display = "block"; } - $accfb6154319a04b$var$responseText.innerHTML = text; new (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ targets: document.querySelector('[role="top-nav"]'), rotateX: "180deg", @@ -4226,30 +4226,32 @@ class $accfb6154319a04b$export$2e2bcd8739ae039 { duration: 400, complete: ()=>{ setTimeout(()=>{ - (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ - targets: $accfb6154319a04b$var$notifyText, - backgroundColor: color, - opacity: 0, - easing: "easeInOutQuad", - duration: 400 - }); - (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ - targets: $accfb6154319a04b$var$notifyIcons, - width: 0, - opacity: 0, - easing: "easeOutQuint", - duration: 350 - }); - new (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ - targets: document.querySelector('[role="top-nav"]'), - rotateX: "0deg", - easing: "easeOutQuint" - }); - new (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ - targets: document.querySelector('[role="notify"]'), - rotateX: "180deg", - easing: "easeOutQuint" - }); + if (status !== null) { + (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ + targets: $accfb6154319a04b$var$notifyText, + backgroundColor: color, + opacity: 0, + easing: "easeInOutQuad", + duration: 400 + }); + (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ + targets: $accfb6154319a04b$var$notifyIcons, + width: 0, + opacity: 0, + easing: "easeOutQuint", + duration: 350 + }); + new (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ + targets: document.querySelector('[role="top-nav"]'), + rotateX: "0deg", + easing: "easeOutQuint" + }); + new (0, $8b9e2899b2e82f52$export$2e2bcd8739ae039)({ + targets: document.querySelector('[role="notify"]'), + rotateX: "180deg", + easing: "easeOutQuint" + }); + } }, 2500); } }); diff --git a/src/com/controllers/MaintenanceManager.js b/src/com/controllers/MaintenanceManager.js index 7020dfc..81959d5 100644 --- a/src/com/controllers/MaintenanceManager.js +++ b/src/com/controllers/MaintenanceManager.js @@ -135,8 +135,7 @@ class MaintenanceManager { method = REQUEST_TYPE_POST; type = CONTENT_TYPE_JSON; data = { task: 'create_backup' }; - - this._request(url, event, method, type, data) + this._request(url, null, event, method, type, data) .then(result => { resolve(result); }) diff --git a/src/com/ui/Notifications.js b/src/com/ui/Notifications.js index 04629f6..4e30fb6 100644 --- a/src/com/ui/Notifications.js +++ b/src/com/ui/Notifications.js @@ -24,6 +24,7 @@ export default class Notfications { iconNotGood.style.display = 'none'; var color = ''; + responseText.innerHTML = text; if (status !== null) { if (status) { color = '#32cd32'; @@ -38,7 +39,6 @@ export default class Notfications { color = '#200317'; iconWorking.style.display = 'block'; } - responseText.innerHTML = text; new anime({ targets: document.querySelector('[role="top-nav"]'), @@ -67,33 +67,35 @@ export default class Notfications { duration: 400, complete: () => { setTimeout(() => { - anime({ - targets: notifyText, - backgroundColor: color, - opacity: 0, - easing: 'easeInOutQuad', - duration: 400 - }); + if (status !== null) { + anime({ + targets: notifyText, + backgroundColor: color, + opacity: 0, + easing: 'easeInOutQuad', + duration: 400 + }); - anime({ - targets: notifyIcons, - width: 0, - opacity: 0, - easing: 'easeOutQuint', - duration: 350 - }); + anime({ + targets: notifyIcons, + width: 0, + opacity: 0, + easing: 'easeOutQuint', + duration: 350 + }); - new anime({ - targets: document.querySelector('[role="top-nav"]'), - rotateX: '0deg', - easing: 'easeOutQuint' - }); + new anime({ + targets: document.querySelector('[role="top-nav"]'), + rotateX: '0deg', + easing: 'easeOutQuint' + }); - new anime({ - targets: document.querySelector('[role="notify"]'), - rotateX: '180deg', - easing: 'easeOutQuint' - }); + new anime({ + targets: document.querySelector('[role="notify"]'), + rotateX: '180deg', + easing: 'easeOutQuint' + }); + } }, 2500); } });