diff --git a/Controller/Popup/Forgot.php b/Controller/Popup/Forgot.php index afc162d..10958dc 100755 --- a/Controller/Popup/Forgot.php +++ b/Controller/Popup/Forgot.php @@ -38,6 +38,7 @@ use Magento\Framework\Exception\SecurityViolationException; use Magento\Framework\Validator\ValidateException; use Magento\Framework\Validator\ValidatorChain; +use Magento\Framework\Validator\EmailAddress; use Mageplaza\SocialLogin\Helper\Data; /** @@ -142,7 +143,7 @@ public function execute() $email = (string) $this->getRequest()->getPost('email'); if ($email) { - if (!ValidatorChain::is($email, 'EmailAddress')) { + if (!ValidatorChain::is($email, EmailAddress::class)) { $this->session->setForgottenEmail($email); $result['message'][] = __('Please correct the email address.'); } diff --git a/Helper/Data.php b/Helper/Data.php index 606a9f5..52acd59 100755 --- a/Helper/Data.php +++ b/Helper/Data.php @@ -158,4 +158,26 @@ public function isCheckMode($storeId = null) { return $this->getConfigGeneral('check_mode', $storeId) && $this->getPopupLogin(); } + + /** + * @param string $code + * @param null $storeId + * + * @return array|mixed + */ + public function getConfigGoogleRecaptcha($code = '', $storeId = null) + { + return $this->getConfigValue('googlerecaptcha' . $code, $storeId); + } + + /** + * @param null $storeId + * + * @return bool + */ + public function isEnabledGGRecaptcha($storeId = null) + { + return $this->getConfigGoogleRecaptcha('/general/enabled', $storeId) + && $this->getConfigGoogleRecaptcha('/frontend/enabled', $storeId); + } } diff --git a/composer.json b/composer.json index 90e7654..5c79adc 100755 --- a/composer.json +++ b/composer.json @@ -2,14 +2,14 @@ "name": "mageplaza/magento-2-social-login", "description": "Magento 2 Social Login extension is designed for quick login to your Magento 2 store without procesing complex register steps", "require": { - "mageplaza/module-core": "^1.5.3", + "mageplaza/module-core": "^1.5.6", "hybridauth/hybridauth": "^3.8.2" }, "require-dev": { "roave/security-advisories": "dev-master" }, "type": "magento2-module", - "version": "4.1.10", + "version": "4.1.11", "license": "proprietary", "authors": [ { diff --git a/view/frontend/layout/hyva_default.xml b/view/frontend/layout/hyva_default.xml new file mode 100755 index 0000000..3ccd850 --- /dev/null +++ b/view/frontend/layout/hyva_default.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + user_login + + + 230 + + + 50 + + + + + + + + + user_create + + + 230 + + + 50 + + + + + + + + + user_forgotpassword + + + 230 + + + 50 + + + + + + + + + + Mageplaza_SocialLogin::hyva/header/link/sign-in.phtml + + + + + Mageplaza_SocialLogin::hyva/header/link/register.phtml + + + + + + + + + + Mageplaza_SocialLogin/js/view/social-buttons + before + + + + + + + + + + + + Mageplaza_SocialLogin::hyva/form/social.phtml + + + + + + Mageplaza_SocialLogin:hyva/form/social.phtml + + + + diff --git a/view/frontend/templates/hyva/form/social.phtml b/view/frontend/templates/hyva/form/social.phtml new file mode 100644 index 0000000..0488dd1 --- /dev/null +++ b/view/frontend/templates/hyva/form/social.phtml @@ -0,0 +1,90 @@ +getAvailableSocials(); +$childBlock = $block->getChildBlock('request.info'); + +if ($block->canShow() && sizeof($availableSocials)): + ?> +
+
+ $social): ?> + + +
+
+ +isRequireMoreInfo()): ?> +
+ getChildHtml('request.info') ?> +
+ + + \ No newline at end of file diff --git a/view/frontend/templates/hyva/header/link/register.phtml b/view/frontend/templates/hyva/header/link/register.phtml new file mode 100644 index 0000000..906daa5 --- /dev/null +++ b/view/frontend/templates/hyva/header/link/register.phtml @@ -0,0 +1,78 @@ +require(CustomerRegistration::class); + +$label = $block->getLabel() ? $block->getLabel() : __('Create an Account'); +$helperData = $this->helper(\Mageplaza\SocialLogin\Helper\Data::class); +$popupEffect = $helperData->getPopupEffect(); +$popupLogin = $helperData->getPopupLogin(); +?> + +isAllowed()): ?> + +
+ + escapeHtml($label) ?> + +
+ +
+ + escapeHtml($label) ?> + +
+ + + + \ No newline at end of file diff --git a/view/frontend/templates/hyva/header/link/sign-in.phtml b/view/frontend/templates/hyva/header/link/sign-in.phtml new file mode 100644 index 0000000..e5ef6ac --- /dev/null +++ b/view/frontend/templates/hyva/header/link/sign-in.phtml @@ -0,0 +1,75 @@ +getLabel() ? $block->getLabel() : __('Sign In'); +$modalViewModel = $viewModels->require(\Hyva\Theme\ViewModel\Modal::class); +$helperData = $this->helper(\Mageplaza\SocialLogin\Helper\Data::class); +$popupEffect = $helperData->getPopupEffect(); +$popupLogin = $helperData->getPopupLogin(); +?> + +
+ + escapeHtml($label) ?> + +
+ +
+ + escapeHtml($label) ?> + + +
+ + + \ No newline at end of file diff --git a/view/frontend/templates/hyva/header/modal.phtml b/view/frontend/templates/hyva/header/modal.phtml new file mode 100644 index 0000000..73ffef3 --- /dev/null +++ b/view/frontend/templates/hyva/header/modal.phtml @@ -0,0 +1,283 @@ +helper(\Mageplaza\SocialLogin\Helper\Data::class); +$popupEffect = $helperData->getPopupEffect(); +$modal = $viewModels->require(\Hyva\Theme\ViewModel\Modal::class) + ->createModal() + ->addDialogClass("p-3 w-full wrap-modal-login transform origin-left opacity-0 scale-0" . " " . $popupEffect . "-appear") + ->removeDialogClass('shadow-xl', 'inline-block', 'bg-white', 'rounded-lg', 'p-10', 'max-h-screen', 'overflow-auto', + 'border border-10', 'border-blue-500') + ->withDialogRefName('my-dialog') + ->withContent(' + + '); + + +?> + + +
+ +
+ + + + \ No newline at end of file diff --git a/view/frontend/templates/hyva/popup/form/authentication.phtml b/view/frontend/templates/hyva/popup/form/authentication.phtml new file mode 100755 index 0000000..b2e21c2 --- /dev/null +++ b/view/frontend/templates/hyva/popup/form/authentication.phtml @@ -0,0 +1,274 @@ + + +
+
+ +
+
+
+ +
+
+ +
+
+ + +
+ diff --git a/view/frontend/templates/hyva/popup/form/create.phtml b/view/frontend/templates/hyva/popup/form/create.phtml new file mode 100755 index 0000000..b5f0651 --- /dev/null +++ b/view/frontend/templates/hyva/popup/form/create.phtml @@ -0,0 +1,287 @@ + + + diff --git a/view/frontend/templates/hyva/popup/form/email.phtml b/view/frontend/templates/hyva/popup/form/email.phtml new file mode 100644 index 0000000..4fb095d --- /dev/null +++ b/view/frontend/templates/hyva/popup/form/email.phtml @@ -0,0 +1,126 @@ + +isCheckMode() || $block->isRequireMoreInfo()): ?> + + + + diff --git a/view/frontend/templates/hyva/popup/form/forgot.phtml b/view/frontend/templates/hyva/popup/form/forgot.phtml new file mode 100755 index 0000000..9842a36 --- /dev/null +++ b/view/frontend/templates/hyva/popup/form/forgot.phtml @@ -0,0 +1,157 @@ + + diff --git a/view/frontend/templates/hyva/popup/form/social_buttons.phtml b/view/frontend/templates/hyva/popup/form/social_buttons.phtml new file mode 100755 index 0000000..630cdb7 --- /dev/null +++ b/view/frontend/templates/hyva/popup/form/social_buttons.phtml @@ -0,0 +1,87 @@ + +getAvailableSocials(); +?> +canShow(Position::PAGE_POPUP) && sizeof($availableSocials)): ?> +
+
+
+ +
+
+ $social): ?> + + +
+
+
+ + + + + +getSocialButtonsConfig(); ?> +canShow(Position::PAGE_AUTHEN) && sizeof($availableSocials)): ?> + + diff --git a/view/frontend/web/css/style.css b/view/frontend/web/css/style.css index c4a7a59..91f2c3c 100644 --- a/view/frontend/web/css/style.css +++ b/view/frontend/web/css/style.css @@ -1747,4 +1747,4 @@ } #social-login-popup > div.mp-social-popup.col-mp.mp-7 div.social-login-title { width: 200%; -} \ No newline at end of file +} diff --git a/view/frontend/web/css/style_hyva.css b/view/frontend/web/css/style_hyva.css new file mode 100644 index 0000000..0bd778e --- /dev/null +++ b/view/frontend/web/css/style_hyva.css @@ -0,0 +1,170 @@ +@import url('https://fonts.googleapis.com/css?family=Roboto'); +@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&display=swap'); + +html { + /*font-size: 62.5%;*/ + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + +} + +#popup_test { + color: #333333; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-style: normal; + font-weight: 400; + line-height: 1.42857143; + font-size: 0.8rem; +} + + +#popup_test .block-content > .actions-toolbar { + display: block; +} + +#popup_test .actions-toolbar { + border-top-width: 0; + --tw-border-opacity: 0; + border-color: unset; + padding-top: 0; + justify-content: flex-start; + flex-direction: row; +} + +#popup_test .fieldset > .field > .label, .fieldset > .fields > .field > .label { + font-weight: 600; +} + +#popup_test .fieldset > .field > .label, .fieldset > .fields > .field > .label { + margin: 0 0 8px; + display: inline-block; +} + +#popup_test .action.primary, .action-primary { + + border: 1px solid #1979c3; + color: #ffffff; + cursor: pointer; + display: inline-block; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-weight: 600; + padding: 0px 15px; + font-size: 0.8rem; + box-sizing: border-box; + vertical-align: middle; +} + +#popup_test .fieldset > .field.required > .label:after, .fieldset > .fields > .field.required > .label:after, .fieldset > .field._required > .label:after, .fieldset > .fields > .field._required > .label:after { + content: '*'; + color: #e02b27; + font-size: 0.6rem; + margin: 0 0 0 5px; +} +#popup_test .remind, .action.create, .back { + color: #006bb4 !important; + text-decoration: none !important; +} + +#popup_test .remind:hover, .back:hover, .action.create:hover { + color: #006bb4 !important; + text-decoration: underline !important; +} + +#popup_test .remind:active, .back:active, .action.create:active { + color: #ff5501 !important; + text-decoration: underline !important; +} +#popup_test .messages { + color: #e02b27; + font-size: 0.8rem; +} +#popup_test .control { + margin-bottom: 10px; +} + + +#popup_test h2 { + font-weight: 300; + line-height: 1.1; + font-size: 1.6rem; + +} +#popup_test .messages li { + margin-bottom: 20px; + margin-top: 7px; + +} +#popup_test .primary button:focus { + --tw-ring-shadow: 0 0 #000 ; +} +#popup_test input[type="text"], input[type="password"], input[type="url"], input[type="tel"], input[type="search"], input[type="number"], input[type*="date"], input[type="email"] { + background: #ffffff; + background-clip: padding-box; + border: 1px solid #c2c2c2; + border-radius: 1px; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-size: 14px; + height: 32px; + min-height: 32px; + line-height: 1.42857143; + padding: 0 9px; + vertical-align: baseline; + width: 100%; + box-sizing: border-box; +} +#popup_test fieldset .field.field-reserved, form .field.field-reserved { + margin-bottom: 0; +} +#popup_test button { + background-image: none; + background: #eeeeee; + border: 1px solid #cccccc; + color: #333333; + cursor: pointer; + display: inline-block; + font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-weight: 600; + margin: 0; + padding: 0px 15px; + font-size: 0.8rem; + line-height: 1.6rem; + box-sizing: border-box; + vertical-align: middle; +} +#popup_test .captcha-img { + margin: 0 10px 10px 0; +} + +#popup_test .mfp-close { + + width: 44px; + height: 44px; + line-height: 44px; + position: absolute; + right: 0; + top: 0; + text-decoration: none; + text-align: center; + opacity: 0.65; + font-style: normal; + font-size: 28px; +} +#popup_test button.mfp-close, button.mfp-arrow { + overflow: visible; + cursor: pointer; + background: transparent; + border: 0; + display: block; + outline: none; + z-index: 1046; + box-shadow: none; +} +#social-login-popup .mfp-close { + color: #ffffff; + padding-top: 15px; +} +#social-login-popup .mfp-close:hover, .mfp-close:focus { + opacity: 1; +} +.actions-toolbar.social-btn { + border-top: 0px !important; +} \ No newline at end of file