From 87468c8fc868624341e0862a869839d0e18240fc Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 14:43:56 +0530 Subject: [PATCH 01/27] add recovery banner --- .gitlab-ci.yml | 2 +- img/warning.svg | 5 ++ l10n/de.js | 4 +- l10n/de.json | 4 +- l10n/en.js | 4 +- l10n/en.json | 4 +- l10n/es.js | 4 +- l10n/es.json | 4 +- l10n/fr.js | 4 +- l10n/fr.json | 4 +- l10n/it.js | 4 +- l10n/it.json | 4 +- lib/AppInfo/Application.php | 3 + .../BeforeTemplateRenderedListener.php | 56 ++++++++++++++ scss/ecloud-accounts-email-recovery.scss | 74 +++++++++++++++++++ src/emailrecovery.js | 69 +++++++++++++++++ webpack.config.js | 9 ++- 17 files changed, 246 insertions(+), 12 deletions(-) create mode 100644 img/warning.svg create mode 100644 lib/Listeners/BeforeTemplateRenderedListener.php create mode 100644 scss/ecloud-accounts-email-recovery.scss create mode 100644 src/emailrecovery.js diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4cb162..2a6bee7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - TO_PACKAGE: 'appinfo css l10n lib templates js' + TO_PACKAGE: 'appinfo css l10n lib templates img js' include: - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' diff --git a/img/warning.svg b/img/warning.svg new file mode 100644 index 0000000..704197c --- /dev/null +++ b/img/warning.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/l10n/de.js b/l10n/de.js index c23bf04..d3ef459 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -24,6 +24,8 @@ OC.L10N.register( "You verified recovery email successfully.": "Sie haben die Wiederherstellungs-E-Mail erfolgreich verifiziert.", "Could not verify recovery email because the token is expired": "Wiederherstellungs-E-Mail konnte nicht verifiziert werden, da das Token abgelaufen ist", "Could not verify recovery email because the token is invalid": "Wiederherstellungs-E-Mail konnte nicht verifiziert werden, da das Token ungültig ist", - "Unverified recovery email:": "Nicht verifizierte Wiederherstellungs-E-Mail:" + "Unverified recovery email:": "Nicht verifizierte Wiederherstellungs-E-Mail:", + "Please set your recovery email address to use your email account without restrictions.": "Bitte geben Sie Ihre Wiederherstellungs-E-Mail-Adresse an, damit Sie Ihr E-Mail ohne Beschränkungen nutzen können.", + "SET RECOVERY EMAIL NOW": "MEINE WIEDERHERSTELLUNGS-E-MAIL-ADRESSE ANGEBEN" }, "nplurals=2; plural=n != 1;"); diff --git a/l10n/de.json b/l10n/de.json index b05534e..72dcd1c 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -22,6 +22,8 @@ "You verified recovery email successfully.": "Sie haben die Wiederherstellungs-E-Mail erfolgreich verifiziert.", "Could not verify recovery email because the token is expired": "Wiederherstellungs-E-Mail konnte nicht verifiziert werden, da das Token abgelaufen ist", "Could not verify recovery email because the token is invalid": "Wiederherstellungs-E-Mail konnte nicht verifiziert werden, da das Token ungültig ist", - "Unverified recovery email:": "Nicht verifizierte Wiederherstellungs-E-Mail:" + "Unverified recovery email:": "Nicht verifizierte Wiederherstellungs-E-Mail:", + "Please set your recovery email address to use your email account without restrictions.": "Bitte geben Sie Ihre Wiederherstellungs-E-Mail-Adresse an, damit Sie Ihr E-Mail ohne Beschränkungen nutzen können.", + "SET RECOVERY EMAIL NOW": "MEINE WIEDERHERSTELLUNGS-E-MAIL-ADRESSE ANGEBEN" },"pluralForm" :"nplurals=2; plural=n != 1;" } \ No newline at end of file diff --git a/l10n/en.js b/l10n/en.js index c743864..55e2c67 100644 --- a/l10n/en.js +++ b/l10n/en.js @@ -22,6 +22,8 @@ OC.L10N.register( "You verified recovery email successfully.": "You verified recovery email successfully.", "Could not verify recovery email because the token is expired": "Could not verify recovery email because the token is expired", "Could not verify recovery email because the token is invalid": "Could not verify recovery email because the token is invalid", - "Unverified recovery email:": "Unverified recovery email:" + "Unverified recovery email:": "Unverified recovery email:", + "Please set your recovery email address to use your email account without restrictions.": "Please set your recovery email address to use your email account without restrictions.", + "SET RECOVERY EMAIL NOW": "SET RECOVERY EMAIL NOW" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/en.json b/l10n/en.json index 1193fd8..5fad55a 100644 --- a/l10n/en.json +++ b/l10n/en.json @@ -21,7 +21,9 @@ "You verified recovery email successfully.": "You verified recovery email successfully.", "Could not verify recovery email because the token is expired": "Could not verify recovery email because the token is expired", "Could not verify recovery email because the token is invalid": "Could not verify recovery email because the token is invalid", - "Unverified recovery email:": "Unverified recovery email:" + "Unverified recovery email:": "Unverified recovery email:", + "Please set your recovery email address to use your email account without restrictions.": "Please set your recovery email address to use your email account without restrictions.", + "SET RECOVERY EMAIL NOW": "SET RECOVERY EMAIL NOW" }, "pluralForm": "nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/es.js b/l10n/es.js index 9169737..f860c86 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -24,6 +24,8 @@ OC.L10N.register( "You verified recovery email successfully.": "Ha verificado correctamente el correo electrónico de recuperación.", "Could not verify recovery email because the token is expired": "No se ha podido verificar el correo electrónico de recuperación porque el token ha caducado.", "Could not verify recovery email because the token is invalid": "No se ha podido verificar el correo electrónico de recuperación porque el token no es válido", - "Unverified recovery email:": "Correo electrónico de recuperación no verificado:" + "Unverified recovery email:": "Correo electrónico de recuperación no verificado:", + "Please set your recovery email address to use your email account without restrictions.": "Configura tu dirección de correo electrónico de recuperación para utilizar tu cuenta de correo electrónico sin restricciones.", + "SET RECOVERY EMAIL NOW": "CONFIGURAR CORREO ELECTRÓNICO DE RECUPERACIÓN" }, "nplurals=2; plural=n != 1;"); diff --git a/l10n/es.json b/l10n/es.json index 8d3aafb..2b64cbb 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -22,6 +22,8 @@ "You verified recovery email successfully.": "Ha verificado correctamente el correo electrónico de recuperación.", "Could not verify recovery email because the token is expired": "No se ha podido verificar el correo electrónico de recuperación porque el token ha caducado.", "Could not verify recovery email because the token is invalid": "No se ha podido verificar el correo electrónico de recuperación porque el token no es válido", - "Unverified recovery email:": "Correo electrónico de recuperación no verificado:" + "Unverified recovery email:": "Correo electrónico de recuperación no verificado:", + "Please set your recovery email address to use your email account without restrictions.": "Configura tu dirección de correo electrónico de recuperación para utilizar tu cuenta de correo electrónico sin restricciones.", + "SET RECOVERY EMAIL NOW": "CONFIGURAR CORREO ELECTRÓNICO DE RECUPERACIÓN" },"pluralForm" :"nplurals=2; plural=n != 1;" } \ No newline at end of file diff --git a/l10n/fr.js b/l10n/fr.js index d86d48d..5fecfc1 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -24,6 +24,8 @@ OC.L10N.register( "You verified recovery email successfully.": "Vous avez vérifié l'email de récupération avec succès.", "Could not verify recovery email because the token is expired": "Impossible de vérifier l'e-mail de récupération car le jeton a expiré.", "Could not verify recovery email because the token is invalid": "Impossible de vérifier l'e-mail de récupération car le jeton n'est pas valide.", - "Unverified recovery email:": "Courriel de récupération non vérifié :" + "Unverified recovery email:": "Courriel de récupération non vérifié :", + "Please set your recovery email address to use your email account without restrictions.": "Merci de définir une adresse e-mail de récupération pour bénéficier d'un usage de votre compte sans restrictions.", + "SET RECOVERY EMAIL NOW": "DEFINIR L'ADRESSE DE RECUPERATION MAINTENANT" }, "nplurals=2; plural=n > 1;"); diff --git a/l10n/fr.json b/l10n/fr.json index 40f2a22..dc818ef 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -22,6 +22,8 @@ "You verified recovery email successfully.": "Vous avez vérifié l'email de récupération avec succès.", "Could not verify recovery email because the token is expired": "Impossible de vérifier l'e-mail de récupération car le jeton a expiré.", "Could not verify recovery email because the token is invalid": "Impossible de vérifier l'e-mail de récupération car le jeton n'est pas valide.", - "Unverified recovery email:": "Courriel de récupération non vérifié :" + "Unverified recovery email:": "Courriel de récupération non vérifié :", + "Please set your recovery email address to use your email account without restrictions.": "Merci de définir une adresse e-mail de récupération pour bénéficier d'un usage de votre compte sans restrictions.", + "SET RECOVERY EMAIL NOW": "DEFINIR L'ADRESSE DE RECUPERATION MAINTENANT" },"pluralForm" :"nplurals=2; plural=n > 1;" } \ No newline at end of file diff --git a/l10n/it.js b/l10n/it.js index 48d32cd..1d1fe98 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -24,6 +24,8 @@ OC.L10N.register( "You verified recovery email successfully.": "L'e-mail di recupero è stata verificata con successo.", "Could not verify recovery email because the token is expired": "Impossibile verificare l'email di recupero perché il token è scaduto", "Could not verify recovery email because the token is invalid": "Impossibile verificare l'email di recupero perché il token non è valido", - "Unverified recovery email:": "Email di recupero non verificata:" + "Unverified recovery email:": "Email di recupero non verificata:", + "Please set your recovery email address to use your email account without restrictions.": "Per poter usare l'account email senza restrizioni devi impostare l'indirizzo email di recovery.", + "SET RECOVERY EMAIL NOW": "IMPOSTA ADESSO LA EMAIL DI RECOVERY" }, "nplurals=2; plural=n != 1;"); diff --git a/l10n/it.json b/l10n/it.json index fb26f93..1344472 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -22,6 +22,8 @@ "You verified recovery email successfully.": "L'e-mail di recupero è stata verificata con successo.", "Could not verify recovery email because the token is expired": "Impossibile verificare l'email di recupero perché il token è scaduto", "Could not verify recovery email because the token is invalid": "Impossibile verificare l'email di recupero perché il token non è valido", - "Unverified recovery email:": "Email di recupero non verificata:" + "Unverified recovery email:": "Email di recupero non verificata:", + "Please set your recovery email address to use your email account without restrictions.": "Per poter usare l'account email senza restrizioni devi impostare l'indirizzo email di recovery.", + "SET RECOVERY EMAIL NOW": "IMPOSTA ADESSO LA EMAIL DI RECOVERY" },"pluralForm" :"nplurals=2; plural=n != 1;" } \ No newline at end of file diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 5296b1c..ca33cdf 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -30,8 +30,10 @@ use OCP\AppFramework\App; use OCP\AppFramework\Bootstrap\IBootstrap; use OCP\AppFramework\Bootstrap\IRegistrationContext; use OCA\EmailRecovery\Listeners\UserConfigChangedListener; +use OCA\EmailRecovery\Listeners\BeforeTemplateRenderedListener; use OCP\User\Events\UserConfigChangedEvent; use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; class Application extends App implements IBootstrap { public const APP_ID = 'email-recovery'; @@ -41,6 +43,7 @@ class Application extends App implements IBootstrap { } public function register(IRegistrationContext $context): void { + $context->registerEventListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class); $context->registerEventListener(UserConfigChangedEvent::class, UserConfigChangedListener::class); } public function boot(IBootContext $context): void { diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php new file mode 100644 index 0000000..ad87daf --- /dev/null +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -0,0 +1,56 @@ +appName = $appName; + $this->userSession = $userSession; + $this->request = $request; + $this->session = $session; + $this->config = $config; + $this->util = $util; + } + + public function handle(Event $event): void { + if (!($event instanceof BeforeTemplateRenderedEvent)) { + return; + } + if ($this->userSession->isLoggedIn()) { + $user = $this->userSession->getUser(); + if ($user instanceof IUser) { + $userID = $user->getUID(); + $recoveryEmail = $this->config->getUserValue($userID, $this->appName, 'recovery-email', ''); + if($recoveryEmail === '') { + $this->util->addStyle($this->appName, $this->appName . '-email-recovery'); + $this->util->addScript($this->appName, $this->appName . '-email-recovery'); + } + } + } + + } + +} diff --git a/scss/ecloud-accounts-email-recovery.scss b/scss/ecloud-accounts-email-recovery.scss new file mode 100644 index 0000000..162bce0 --- /dev/null +++ b/scss/ecloud-accounts-email-recovery.scss @@ -0,0 +1,74 @@ +.recovery-email { + display: inline-flex; + position: absolute; + top: 0px; + width: 100%; + z-index: 1000; + min-height: 50px; + box-sizing: border-box; + justify-content: center; + align-items: center; + background: #333333; + color: #ffffff; + font-size: 16px; + font-weight: 400; + line-height: 24px; + #image-text-container{ + display:inline-flex; + img { + padding-right:10px; + align-self: start; + } + } + + a { + color: #ffffff; + padding-left: 24px; + text-decoration: underline; + font-size: 16px; + font-weight: 600; + } + +} + +#body-user #header, +#body-settings #header, +#body-public #header { + top: 50px !important; +} + +#content { + margin-top: 100px !important; + height: calc(100% - env(safe-area-inset-bottom) - 100px - var(--body-container-margin)) !important; + + @media only screen and (max-width: 480px) { + margin-top: 150px !important; + height: calc(100% - env(safe-area-inset-bottom) - 150px - var(--body-container-margin)) !important; + } + + @media only screen and (min-width: 481px) and (max-width: 768px) { + margin-top: 125px !important; + height: calc(100% - env(safe-area-inset-bottom) - 125px - var(--body-container-margin)) !important; + } +} +@media only screen and (max-width: 1024px) { + #body-user #header, + #body-settings #header, + #body-public #header { + top: 90px !important; + } +} +@media only screen and (max-width: 768px) { + .recovery-email { + display: block; + padding: 16px 7%; + a{ + padding: 8px 0 0 30px; + } + } + #body-user #header, + #body-settings #header, + #body-public #header { + top: 120px !important; + } +} diff --git a/src/emailrecovery.js b/src/emailrecovery.js new file mode 100644 index 0000000..4d34cf2 --- /dev/null +++ b/src/emailrecovery.js @@ -0,0 +1,69 @@ +import { generateUrl } from '@nextcloud/router' +const APPLICATION_NAME = 'ecloud-accounts' +document.addEventListener('DOMContentLoaded', function() { + const newDiv = createNewDiv('recovery-email') + const contentDiv = document.createElement('div') + contentDiv.id = 'image-text-container' + const img = createImageElement(APPLICATION_NAME) + const textNode = createTextNode(APPLICATION_NAME) + const link = createLinkElement(APPLICATION_NAME) + + contentDiv.appendChild(img) + contentDiv.appendChild(textNode) + newDiv.appendChild(contentDiv) + newDiv.appendChild(link) + insertIntoDOM(newDiv) +}) + +/** + * + * @param className + */ +function createNewDiv(className) { + const div = document.createElement('div') + div.className = className + return div +} + +/** + * + * @param appName + */ +function createImageElement(appName) { + const img = document.createElement('img') + img.src = generateUrl('/custom_apps/' + appName + '/img/warning.svg') + return img +} + +/** + * + * @param appName + */ +function createTextNode(appName) { + const p = document.createElement('p') + const text = document.createTextNode(t(appName, 'Please set your recovery email address to use your email account without restrictions.')) + p.appendChild(text) + return p +} + +/** + * + * @param appName + */ +function createLinkElement(appName) { + const link = document.createElement('a') + link.textContent = t(appName, 'SET RECOVERY EMAIL NOW') + link.href = OC.getRootPath() + '/settings/user/security#recovery-email-div' + link.style.display = 'block' + return link +} + +/** + * + * @param element + */ +function insertIntoDOM(element) { + const targetElement = document.getElementById('header') + const parentElement = targetElement.parentNode + parentElement.insertBefore(element, targetElement) +} diff --git a/webpack.config.js b/webpack.config.js index e5daa92..0a32744 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,3 +1,10 @@ const webpackConfig = require('@nextcloud/webpack-vue-config') - +const path = require('path') module.exports = webpackConfig +module.exports = { + ...webpackConfig, + entry: { + 'email-recovery': path.join(__dirname, 'src/emailrecovery.js') + }, +} + -- GitLab From 1a5d638a13794d3426a65b827a405f20efc901c5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 14:55:11 +0530 Subject: [PATCH 02/27] add recovery banner --- lib/Listeners/BeforeTemplateRenderedListener.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index ad87daf..bae41d3 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -26,7 +26,7 @@ class BeforeTemplateRenderedListener implements IEventListener { private const SNAPPYMAIL_URL = '/apps/snappymail/'; private const SNAPPYMAIL_AUTOLOGIN_PWD = '1'; - public function __construct($appName, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config,Util $util) { + public function __construct($appName, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config, Util $util) { $this->appName = $appName; $this->userSession = $userSession; $this->request = $request; @@ -44,13 +44,11 @@ class BeforeTemplateRenderedListener implements IEventListener { if ($user instanceof IUser) { $userID = $user->getUID(); $recoveryEmail = $this->config->getUserValue($userID, $this->appName, 'recovery-email', ''); - if($recoveryEmail === '') { + if ($recoveryEmail === '') { $this->util->addStyle($this->appName, $this->appName . '-email-recovery'); $this->util->addScript($this->appName, $this->appName . '-email-recovery'); } } } - } - } -- GitLab From d1d9089c2768f029d5c95efac046be09b84f0e4f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 15:02:54 +0530 Subject: [PATCH 03/27] add recovery banner --- lib/Listeners/BeforeTemplateRenderedListener.php | 4 ++-- ...cloud-accounts-email-recovery.scss => email-recovery.scss} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename scss/{ecloud-accounts-email-recovery.scss => email-recovery.scss} (100%) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index bae41d3..eb46ccf 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -45,8 +45,8 @@ class BeforeTemplateRenderedListener implements IEventListener { $userID = $user->getUID(); $recoveryEmail = $this->config->getUserValue($userID, $this->appName, 'recovery-email', ''); if ($recoveryEmail === '') { - $this->util->addStyle($this->appName, $this->appName . '-email-recovery'); - $this->util->addScript($this->appName, $this->appName . '-email-recovery'); + $this->util->addStyle($this->appName, 'email-recovery'); + $this->util->addScript($this->appName, 'email-recovery'); } } } diff --git a/scss/ecloud-accounts-email-recovery.scss b/scss/email-recovery.scss similarity index 100% rename from scss/ecloud-accounts-email-recovery.scss rename to scss/email-recovery.scss -- GitLab From 4797dd092f014609095b9f2be0d0bacbdd99d46f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 15:13:19 +0530 Subject: [PATCH 04/27] add recovery banner --- lib/Listeners/BeforeTemplateRenderedListener.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index eb46ccf..8a1d115 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -45,8 +45,8 @@ class BeforeTemplateRenderedListener implements IEventListener { $userID = $user->getUID(); $recoveryEmail = $this->config->getUserValue($userID, $this->appName, 'recovery-email', ''); if ($recoveryEmail === '') { - $this->util->addStyle($this->appName, 'email-recovery'); - $this->util->addScript($this->appName, 'email-recovery'); + $this->util->addStyle($this->appName,'email-recovery'); + $this->util->addScript($this->appName, $this->appName . '-email-recovery'); } } } -- GitLab From b6e684201ca72e7fbe6501150360ba705291f41c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 15:14:23 +0530 Subject: [PATCH 05/27] add recovery banner --- lib/Listeners/BeforeTemplateRenderedListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index 8a1d115..d482f7c 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -45,7 +45,7 @@ class BeforeTemplateRenderedListener implements IEventListener { $userID = $user->getUID(); $recoveryEmail = $this->config->getUserValue($userID, $this->appName, 'recovery-email', ''); if ($recoveryEmail === '') { - $this->util->addStyle($this->appName,'email-recovery'); + $this->util->addStyle($this->appName, 'email-recovery'); $this->util->addScript($this->appName, $this->appName . '-email-recovery'); } } -- GitLab From 23815e8aa48b332c7a1a0461d4380fb8597ce34b Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 15:18:12 +0530 Subject: [PATCH 06/27] add recovery banner --- src/emailrecovery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emailrecovery.js b/src/emailrecovery.js index 4d34cf2..f54c12b 100644 --- a/src/emailrecovery.js +++ b/src/emailrecovery.js @@ -1,5 +1,5 @@ import { generateUrl } from '@nextcloud/router' -const APPLICATION_NAME = 'ecloud-accounts' +const APPLICATION_NAME = 'email-recovery' document.addEventListener('DOMContentLoaded', function() { const newDiv = createNewDiv('recovery-email') const contentDiv = document.createElement('div') -- GitLab From a35b7c74bfd69c6e1d7feca01dc2766e1296c677 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 18:01:23 +0530 Subject: [PATCH 07/27] review fixes --- .../BeforeTemplateRenderedListener.php | 23 ++++++++----------- scss/email-recovery.scss | 4 ++-- src/emailrecovery.js | 3 ++- webpack.config.js | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index d482f7c..10e49a5 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -10,9 +10,9 @@ use OCP\EventDispatcher\IEventListener; use OCP\IConfig; use OCP\IRequest; use OCP\ISession; -use OCP\IUser; use OCP\IUserSession; use OCP\Util; +use OCA\EmailRecovery\Service\RecoveryEmailService; class BeforeTemplateRenderedListener implements IEventListener { private $userSession; @@ -21,18 +21,19 @@ class BeforeTemplateRenderedListener implements IEventListener { private $session; private $config; private Util $util; + private $recoveryEmailService; + private $userId; - private const SNAPPYMAIL_APP_ID = 'snappymail'; - private const SNAPPYMAIL_URL = '/apps/snappymail/'; - private const SNAPPYMAIL_AUTOLOGIN_PWD = '1'; - public function __construct($appName, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config, Util $util) { + public function __construct($appName, $userId, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config, Util $util, RecoveryEmailService $recoveryEmailService) { $this->appName = $appName; + $this->userId = $userId; $this->userSession = $userSession; $this->request = $request; $this->session = $session; $this->config = $config; $this->util = $util; + $this->recoveryEmailService = $recoveryEmailService; } public function handle(Event $event): void { @@ -40,14 +41,10 @@ class BeforeTemplateRenderedListener implements IEventListener { return; } if ($this->userSession->isLoggedIn()) { - $user = $this->userSession->getUser(); - if ($user instanceof IUser) { - $userID = $user->getUID(); - $recoveryEmail = $this->config->getUserValue($userID, $this->appName, 'recovery-email', ''); - if ($recoveryEmail === '') { - $this->util->addStyle($this->appName, 'email-recovery'); - $this->util->addScript($this->appName, $this->appName . '-email-recovery'); - } + $recoveryEmail = $this->recoveryEmailService->getRecoveryEmail($this->userId); + if ($recoveryEmail === '') { + $this->util->addStyle($this->appName, 'email-recovery'); + $this->util->addScript($this->appName, $this->appName . '-email-recovery'); } } } diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 162bce0..94a8279 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -1,4 +1,4 @@ -.recovery-email { +.recovery-email-banner { display: inline-flex; position: absolute; top: 0px; @@ -59,7 +59,7 @@ } } @media only screen and (max-width: 768px) { - .recovery-email { + .recovery-email-banner { display: block; padding: 16px 7%; a{ diff --git a/src/emailrecovery.js b/src/emailrecovery.js index f54c12b..4447132 100644 --- a/src/emailrecovery.js +++ b/src/emailrecovery.js @@ -1,7 +1,7 @@ import { generateUrl } from '@nextcloud/router' const APPLICATION_NAME = 'email-recovery' document.addEventListener('DOMContentLoaded', function() { - const newDiv = createNewDiv('recovery-email') + const newDiv = createNewDiv('recovery-email-banner') const contentDiv = document.createElement('div') contentDiv.id = 'image-text-container' const img = createImageElement(APPLICATION_NAME) @@ -22,6 +22,7 @@ document.addEventListener('DOMContentLoaded', function() { function createNewDiv(className) { const div = document.createElement('div') div.className = className + div.id = className return div } diff --git a/webpack.config.js b/webpack.config.js index 0a32744..633aa4e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,7 +4,7 @@ module.exports = webpackConfig module.exports = { ...webpackConfig, entry: { - 'email-recovery': path.join(__dirname, 'src/emailrecovery.js') + 'email-recovery': path.join(__dirname, 'src/email-recovery.js') }, } -- GitLab From e47814d0f0921b112cd38d17422c6a329d62ebcf Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 19 Dec 2023 18:05:03 +0530 Subject: [PATCH 08/27] review fixes --- src/{emailrecovery.js => email-recovery.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{emailrecovery.js => email-recovery.js} (100%) diff --git a/src/emailrecovery.js b/src/email-recovery.js similarity index 100% rename from src/emailrecovery.js rename to src/email-recovery.js -- GitLab From ffd6f6aa70cc08b2b3199b14f2e6477c38efe833 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 20 Dec 2023 10:57:32 +0530 Subject: [PATCH 09/27] remove unsed --- lib/Listeners/BeforeTemplateRenderedListener.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index 10e49a5..4f17c31 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -7,31 +7,22 @@ namespace OCA\EmailRecovery\Listeners; use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; -use OCP\IConfig; -use OCP\IRequest; -use OCP\ISession; use OCP\IUserSession; use OCP\Util; use OCA\EmailRecovery\Service\RecoveryEmailService; class BeforeTemplateRenderedListener implements IEventListener { private $userSession; - private $request; private $appName; - private $session; - private $config; private Util $util; private $recoveryEmailService; private $userId; - public function __construct($appName, $userId, IUserSession $userSession, IRequest $request, ISession $session, IConfig $config, Util $util, RecoveryEmailService $recoveryEmailService) { + public function __construct($appName, $userId, IUserSession $userSession, Util $util, RecoveryEmailService $recoveryEmailService) { $this->appName = $appName; $this->userId = $userId; $this->userSession = $userSession; - $this->request = $request; - $this->session = $session; - $this->config = $config; $this->util = $util; $this->recoveryEmailService = $recoveryEmailService; } -- GitLab From 4f4f4737ad391b9f8ae435a1f54eb968f6a841ab Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 20 Dec 2023 11:12:18 +0530 Subject: [PATCH 10/27] main js build --- webpack.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 633aa4e..02d9f15 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,7 +4,8 @@ module.exports = webpackConfig module.exports = { ...webpackConfig, entry: { - 'email-recovery': path.join(__dirname, 'src/email-recovery.js') + 'email-recovery': path.join(__dirname, 'src/email-recovery.js'), + 'main': path.join(__dirname, 'src/main.js') }, } -- GitLab From 24b7440ae646f7b3b41ea481ab472583e0bd3799 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Wed, 20 Dec 2023 15:46:47 +0530 Subject: [PATCH 11/27] snappy fix --- scss/email-recovery.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 94a8279..b84fbb7 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -19,6 +19,9 @@ padding-right:10px; align-self: start; } + p{ + margin: 0 auto; + } } a { -- GitLab From d1826cbf366bdbf8776f1951971bb5731af89dc8 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 21 Dec 2023 14:41:29 +0000 Subject: [PATCH 12/27] suggestion applied. --- lib/Listeners/BeforeTemplateRenderedListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index 4f17c31..5dee093 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -31,7 +31,7 @@ class BeforeTemplateRenderedListener implements IEventListener { if (!($event instanceof BeforeTemplateRenderedEvent)) { return; } - if ($this->userSession->isLoggedIn()) { + if ($this->userSession->isLoggedIn() && !empty($this->userId)) { $recoveryEmail = $this->recoveryEmailService->getRecoveryEmail($this->userId); if ($recoveryEmail === '') { $this->util->addStyle($this->appName, 'email-recovery'); -- GitLab From 7d8ca8641c1748ac6cd8e8faf943a3f01537fda8 Mon Sep 17 00:00:00 2001 From: Akhil Date: Thu, 21 Dec 2023 14:42:18 +0000 Subject: [PATCH 13/27] applied suggestion --- src/email-recovery.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/email-recovery.js b/src/email-recovery.js index 4447132..f862693 100644 --- a/src/email-recovery.js +++ b/src/email-recovery.js @@ -3,7 +3,7 @@ const APPLICATION_NAME = 'email-recovery' document.addEventListener('DOMContentLoaded', function() { const newDiv = createNewDiv('recovery-email-banner') const contentDiv = document.createElement('div') - contentDiv.id = 'image-text-container' + contentDiv.id = 'recovery-email-banner-container' const img = createImageElement(APPLICATION_NAME) const textNode = createTextNode(APPLICATION_NAME) const link = createLinkElement(APPLICATION_NAME) -- GitLab From 8b9ec4765055ea4c3980003bf53ef329bd64ea63 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 20:20:50 +0530 Subject: [PATCH 14/27] notification drawer fix --- scss/email-recovery.scss | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index b84fbb7..37a0ab7 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -39,6 +39,9 @@ #body-public #header { top: 50px !important; } +#header .header-right .header-menu__wrapper{ + top:100px; +} #content { margin-top: 100px !important; @@ -59,6 +62,9 @@ #body-settings #header, #body-public #header { top: 90px !important; + } + #header .header-right .header-menu__wrapper{ + top:140px; } } @media only screen and (max-width: 768px) { @@ -73,5 +79,8 @@ #body-settings #header, #body-public #header { top: 120px !important; - } + } + #header .header-right .header-menu__wrapper{ + top:170px; + } } -- GitLab From d2f8d3241091339336c2207c609bce608c33ee25 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 20:27:45 +0530 Subject: [PATCH 15/27] notification drawer fix --- scss/email-recovery.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 37a0ab7..85f2832 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -13,7 +13,7 @@ font-size: 16px; font-weight: 400; line-height: 24px; - #image-text-container{ + #recovery-email-banner-container{ display:inline-flex; img { padding-right:10px; -- GitLab From d5c3480d4b8f4e443aaecdcb01ae70ae610ce77c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 21:43:14 +0530 Subject: [PATCH 16/27] notification drawer fix --- scss/email-recovery.scss | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 85f2832..dd9675b 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -13,6 +13,7 @@ font-size: 16px; font-weight: 400; line-height: 24px; + padding: 16px 7%; #recovery-email-banner-container{ display:inline-flex; img { @@ -40,22 +41,26 @@ top: 50px !important; } #header .header-right .header-menu__wrapper{ - top:100px; + top:106px; } #content { margin-top: 100px !important; - height: calc(100% - env(safe-area-inset-bottom) - 100px - var(--body-container-margin)) !important; - - @media only screen and (max-width: 480px) { - margin-top: 150px !important; - height: calc(100% - env(safe-area-inset-bottom) - 150px - var(--body-container-margin)) !important; + height: calc(100% - env(safe-area-inset-bottom) - 106px - var(--body-container-margin)) !important; + @media only screen and (min-width: 769px) and (max-width: 1024) { + margin-top: 130px !important; + height: calc(100% - env(safe-area-inset-bottom) - 130px - var(--body-container-margin)) !important; } - @media only screen and (min-width: 481px) and (max-width: 768px) { - margin-top: 125px !important; - height: calc(100% - env(safe-area-inset-bottom) - 125px - var(--body-container-margin)) !important; + margin-top: 162px !important; + height: calc(100% - env(safe-area-inset-bottom) - 162px - var(--body-container-margin)) !important; } + @media only screen and (max-width: 480px) { + margin-top: 186px !important; + height: calc(100% - env(safe-area-inset-bottom) - 186px - var(--body-container-margin)) !important; + } + + } @media only screen and (max-width: 1024px) { #body-user #header, @@ -70,7 +75,6 @@ @media only screen and (max-width: 768px) { .recovery-email-banner { display: block; - padding: 16px 7%; a{ padding: 8px 0 0 30px; } -- GitLab From 9ceea5005a22ccc3bdb811da01112c24f0efa43c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 21:51:54 +0530 Subject: [PATCH 17/27] notification drawer fix --- scss/email-recovery.scss | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index dd9675b..88c770e 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -44,20 +44,22 @@ top:106px; } -#content { - margin-top: 100px !important; - height: calc(100% - env(safe-area-inset-bottom) - 106px - var(--body-container-margin)) !important; +#body-user #content, +#body-settings #content, +#body-public #content { + margin-top: 100px; + height: calc(100% - env(safe-area-inset-bottom) - 106px - var(--body-container-margin)); @media only screen and (min-width: 769px) and (max-width: 1024) { - margin-top: 130px !important; - height: calc(100% - env(safe-area-inset-bottom) - 130px - var(--body-container-margin)) !important; + margin-top: 130px; + height: calc(100% - env(safe-area-inset-bottom) - 130px - var(--body-container-margin)); } @media only screen and (min-width: 481px) and (max-width: 768px) { - margin-top: 162px !important; - height: calc(100% - env(safe-area-inset-bottom) - 162px - var(--body-container-margin)) !important; + margin-top: 162px; + height: calc(100% - env(safe-area-inset-bottom) - 162px - var(--body-container-margin)); } @media only screen and (max-width: 480px) { - margin-top: 186px !important; - height: calc(100% - env(safe-area-inset-bottom) - 186px - var(--body-container-margin)) !important; + margin-top: 186px; + height: calc(100% - env(safe-area-inset-bottom) - 186px - var(--body-container-margin)); } @@ -66,10 +68,10 @@ #body-user #header, #body-settings #header, #body-public #header { - top: 90px !important; + top: 80px !important; } #header .header-right .header-menu__wrapper{ - top:140px; + top:130px; } } @media only screen and (max-width: 768px) { @@ -82,9 +84,19 @@ #body-user #header, #body-settings #header, #body-public #header { - top: 120px !important; + top: 112px !important; } #header .header-right .header-menu__wrapper{ - top:170px; + top:162px; + } +} +@media only screen and (max-width: 480px) { + #body-user #header, + #body-settings #header, + #body-public #header { + top: 136px !important; + } + #header .header-right .header-menu__wrapper{ + top:186px; } } -- GitLab From 00e935c9eacb76a070d282b82b47dd502930eee5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 22:09:22 +0530 Subject: [PATCH 18/27] notification drawer fix --- scss/email-recovery.scss | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 88c770e..ac0231b 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -35,9 +35,9 @@ } -#body-user #header, -#body-settings #header, -#body-public #header { +body#body-user #header, +body#body-settings #header, +body#body-public #header { top: 50px !important; } #header .header-right .header-menu__wrapper{ @@ -65,9 +65,9 @@ } @media only screen and (max-width: 1024px) { - #body-user #header, - #body-settings #header, - #body-public #header { + body#body-user #header, + body#body-settings #header, + body#body-public #header { top: 80px !important; } #header .header-right .header-menu__wrapper{ @@ -81,20 +81,20 @@ padding: 8px 0 0 30px; } } - #body-user #header, - #body-settings #header, - #body-public #header { - top: 112px !important; + body#body-user #header, + body#body-settings #header, + body#body-public #header { + top: 112px; } #header .header-right .header-menu__wrapper{ top:162px; } } @media only screen and (max-width: 480px) { - #body-user #header, - #body-settings #header, - #body-public #header { - top: 136px !important; + body#body-user #header, + body#body-settings #header, + body#body-public #header { + top: 136px; } #header .header-right .header-menu__wrapper{ top:186px; -- GitLab From 3da5e1e6f9ec5579e2125834d806983a5c2baad7 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 22:10:52 +0530 Subject: [PATCH 19/27] notification drawer fix --- scss/email-recovery.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index ac0231b..254ef1f 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -66,7 +66,7 @@ body#body-public #header { } @media only screen and (max-width: 1024px) { body#body-user #header, - body#body-settings #header, + body#body-settings #header, body#body-public #header { top: 80px !important; } @@ -82,8 +82,8 @@ body#body-public #header { } } body#body-user #header, - body#body-settings #header, - body#body-public #header { + body#body-settings #header, + body#body-public #header { top: 112px; } #header .header-right .header-menu__wrapper{ -- GitLab From 07302e162109e7f8eed131a53be1e2f937be620f Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 22:11:44 +0530 Subject: [PATCH 20/27] header fix --- scss/email-recovery.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 254ef1f..3224748 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -38,7 +38,7 @@ body#body-user #header, body#body-settings #header, body#body-public #header { - top: 50px !important; + top: 50px; } #header .header-right .header-menu__wrapper{ top:106px; @@ -68,7 +68,7 @@ body#body-public #header { body#body-user #header, body#body-settings #header, body#body-public #header { - top: 80px !important; + top: 80px; } #header .header-right .header-menu__wrapper{ top:130px; -- GitLab From a219377585fbdaed6bc58b14f4da0b4cdf89ea48 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 22:19:52 +0530 Subject: [PATCH 21/27] header fix --- scss/email-recovery.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 3224748..c9e76d0 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -38,7 +38,7 @@ body#body-user #header, body#body-settings #header, body#body-public #header { - top: 50px; + top: 56px; } #header .header-right .header-menu__wrapper{ top:106px; -- GitLab From cbcf8da494b1ad5a29430bafe574c7e6f41996e4 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 22:30:11 +0530 Subject: [PATCH 22/27] header fix --- scss/email-recovery.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index c9e76d0..78ebcd0 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -57,7 +57,7 @@ body#body-public #header { margin-top: 162px; height: calc(100% - env(safe-area-inset-bottom) - 162px - var(--body-container-margin)); } - @media only screen and (max-width: 480px) { + @media only screen and (max-width: 399px) { margin-top: 186px; height: calc(100% - env(safe-area-inset-bottom) - 186px - var(--body-container-margin)); } @@ -90,7 +90,7 @@ body#body-public #header { top:162px; } } -@media only screen and (max-width: 480px) { +@media only screen and (max-width: 399) { body#body-user #header, body#body-settings #header, body#body-public #header { -- GitLab From 51930e5f507957f1371b87794a0c0c3b1b640c9a Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 21 Dec 2023 22:34:51 +0530 Subject: [PATCH 23/27] header fix --- scss/email-recovery.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 78ebcd0..c9aa532 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -90,7 +90,7 @@ body#body-public #header { top:162px; } } -@media only screen and (max-width: 399) { +@media only screen and (max-width: 399px) { body#body-user #header, body#body-settings #header, body#body-public #header { -- GitLab From c238cc7729ffd2c22d1ac4fb3fe0d4f0ba3e6c27 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 22 Dec 2023 18:36:43 +0530 Subject: [PATCH 24/27] add content id for vue views --- scss/email-recovery.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index c9aa532..40d1e19 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -46,7 +46,9 @@ body#body-public #header { #body-user #content, #body-settings #content, -#body-public #content { +#body-public #content, +#body-public #content, +#body-user #app-content-vue { margin-top: 100px; height: calc(100% - env(safe-area-inset-bottom) - 106px - var(--body-container-margin)); @media only screen and (min-width: 769px) and (max-width: 1024) { -- GitLab From d46956faef6012535990b72700e57ce449ee994d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 22 Dec 2023 18:43:41 +0530 Subject: [PATCH 25/27] add content id for vue views --- scss/email-recovery.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 40d1e19..0c62ed2 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -48,7 +48,7 @@ body#body-public #header { #body-settings #content, #body-public #content, #body-public #content, -#body-user #app-content-vue { +#body-user #content-vue { margin-top: 100px; height: calc(100% - env(safe-area-inset-bottom) - 106px - var(--body-container-margin)); @media only screen and (min-width: 769px) and (max-width: 1024) { -- GitLab From dbfe63ef5d141c7a613c6f6cee2f4991b927ca3d Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 22 Dec 2023 18:48:26 +0530 Subject: [PATCH 26/27] add content id for vue views --- scss/email-recovery.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index 0c62ed2..a6e6dbd 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -49,7 +49,7 @@ body#body-public #header { #body-public #content, #body-public #content, #body-user #content-vue { - margin-top: 100px; + margin-top: 100px !important; height: calc(100% - env(safe-area-inset-bottom) - 106px - var(--body-container-margin)); @media only screen and (min-width: 769px) and (max-width: 1024) { margin-top: 130px; -- GitLab From a4fe0f15478d65a3a8d0bd49171b37adcca6fc47 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 22 Dec 2023 19:09:17 +0530 Subject: [PATCH 27/27] add content id for vue views --- scss/email-recovery.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/email-recovery.scss b/scss/email-recovery.scss index a6e6dbd..4fbf9ae 100644 --- a/scss/email-recovery.scss +++ b/scss/email-recovery.scss @@ -52,15 +52,15 @@ body#body-public #header { margin-top: 100px !important; height: calc(100% - env(safe-area-inset-bottom) - 106px - var(--body-container-margin)); @media only screen and (min-width: 769px) and (max-width: 1024) { - margin-top: 130px; + margin-top: 130px !important; height: calc(100% - env(safe-area-inset-bottom) - 130px - var(--body-container-margin)); } @media only screen and (min-width: 481px) and (max-width: 768px) { - margin-top: 162px; + margin-top: 162px !important; height: calc(100% - env(safe-area-inset-bottom) - 162px - var(--body-container-margin)); } @media only screen and (max-width: 399px) { - margin-top: 186px; + margin-top: 186px !important; height: calc(100% - env(safe-area-inset-bottom) - 186px - var(--body-container-margin)); } -- GitLab