diff --git a/frontend/api/class.ApiLogin.php b/frontend/api/class.ApiLogin.php index e0cc38347..11f10400a 100644 --- a/frontend/api/class.ApiLogin.php +++ b/frontend/api/class.ApiLogin.php @@ -544,7 +544,7 @@ class ApiLogin if($this->method == 'AJAX'){ $piskotek['unam'] = [ - 'ime' => 'unme', + 'ime' => 'unam', 'vrednost' => base64_encode($r['name'].' '.$r['surname']), 'opcije' => [ 'expires' => time() + $LifeTime, @@ -1870,6 +1870,8 @@ class ApiLogin // Ce emaila ni v bazi $user_id_1ka = User::findByEmail($email); + return json_encode($user_id_1ka); + if (empty($user_id_1ka)) { if($ajaxKlic){ diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.libraries.yml b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.libraries.yml index 2fdf487fd..7c49f8e52 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.libraries.yml +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.libraries.yml @@ -1,6 +1,6 @@ prijava_1ka.library: version: 1.x js: - js/prijava_1ka_script.js: {} + js/login.js: {} dependencies: - - core/jquery \ No newline at end of file + - core/jquery diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module index 6575cd00e..a06273067 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module @@ -6,10 +6,15 @@ */ function prijava_1ka_theme() { - $google2fa =false; + if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') { + include_once(__DIR__ . '/../../../../../../lang/1.php'); + }else{ + include_once(__DIR__ . '/../../../../../../lang/2.php'); + } + + $google2fa =false; - include_once (__DIR__. '/../../../../../../lang/1.php'); return [ 'prijava_block' => [ @@ -18,7 +23,7 @@ function prijava_1ka_theme() 'prijavljen' => (isset($_COOKIE['unam']) ? true : false), 'title_login' => ($google2fa ? $lang['google_2fa'] : $lang['cms_login_title']), 'title_register_new_email' => ($google2fa ? $lang['google_2fa'] : $lang['cms_register_new_user_email']), - 'jezik' => 'Pridobi jezik forme', + 'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(), 'google2fa_error' => '', 'email' => '', 'password' => '', @@ -32,7 +37,7 @@ function prijava_1ka_theme() 'prijavljen' => (isset($_COOKIE['unam']) ? true : false), 'title_login' => ($google2fa ? $lang['google_2fa'] : $lang['cms_login_title']), 'title_register_new_email' => ($google2fa ? $lang['google_2fa'] : $lang['cms_register_new_user_email']), - 'jezik' => 'Pridobi jezik forme', + 'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(), 'google2fa_error' => '', 'email' => '', 'password' => '', @@ -49,7 +54,7 @@ function prijava_1ka_theme() 'prijava_obnovitev_gesla_aktivacija_blok' => [ 'variables' => [ 'lang' => $lang, - 'jezik' => 'Pridobi jezik forme', + 'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(), 'prijavljen' => (isset($_COOKIE['unam']) ? true : false), ] ], diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-obnovitev-gesla-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-obnovitev-gesla-block.html.twig index 0e1313f45..4f83e1d59 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-obnovitev-gesla-block.html.twig +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-obnovitev-gesla-block.html.twig @@ -25,14 +25,16 @@
- +
-
-
+ +
{{ lang['srv_potrdi'] }}
+ +
+
diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-podatki-o-uporabniku-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-podatki-o-uporabniku-block.html.twig index 252e55457..47e5a4de8 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-podatki-o-uporabniku-block.html.twig +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-podatki-o-uporabniku-block.html.twig @@ -10,17 +10,17 @@ s {{ lang['cms_search'] }} - + '; - + {# // Izpišemo podaztke o registriranem uporabniku ali možnost za prijavo#} - + {% if prijavljen %} |
{{ ime }} - +
@@ -34,15 +34,14 @@ s
- {% else %} - + {#// $html_user .= ' | ' . $lang['cms_register_link'] . '#} {#// | ' . $lang['cms_login_link'] . '';#} - + {% endif %} - + - + - -{% endif %} \ No newline at end of file + +{% endif %} diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml index 93409cea2..1405dc202 100644 --- a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml +++ b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.libraries.yml @@ -1,8 +1,6 @@ -registracija-1ka: +registracija_1ka.library: version: 1.x - js: - js/registracija_1ka_script.js: {} - + #js/registracija_1ka_script.js: {} dependencies: - - core/jquery \ No newline at end of file + - core/jquery diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module index 934e7b0b6..0ab48e2b3 100644 --- a/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module +++ b/frontend/drupal9/web/modules/custom/registracija_1ka/registracija_1ka.module @@ -2,10 +2,18 @@ /** * Omogči, da se uporabi Twig templaet + * @return array[][][] + */ +/** + * Implements hook_theme(). */ function registracija_1ka_theme() { - include_once (__DIR__. '/../../../../../../lang/1.php'); + if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') { + include(__DIR__ . '/../../../../../../lang/1.php'); + }else{ + include(__DIR__ . '/../../../../../../lang/2.php'); + } // $lang['cms_register_user_text'] = str_replace('GOOGLE_URL', variable_get('1ka_google_prijava'), $lang['cms_register_user_text']); @@ -22,26 +30,30 @@ function registracija_1ka_theme() // require(drupal_get_path('module', 'registracija_1ka') . '/../../../../../../settings_optional.php'); // } - // Pridobimo jezik iz izbranega jezika Drupala - $jezik = 'sl'; - $recaptcha_sitekey = ''; // pridobi podatke settings_optional // Pridobi vse $_GET parametre in jih shrani v polje - $parametri = []; //drupal_get_query_parameters(); - $register_url = '/frontend/api/api.php?action=register'; - $obvestila = []; //$this->preveriNapake($parametri); + // $parametri = []; //drupal_get_query_parameters(); + // $register_url = '/frontend/api/api.php?action=register'; + // $obvestila = []; //$this->preveriNapake($parametri); return [ 'registracija_block' => [ 'variables' => [ 'lang' => $lang ?? [], - 'jezik' => $jezik ?? 'sl', + 'jezik' => \Drupal::languageManager()->getCurrentLanguage()->getId(), //'obvestila' => $obvestila, 'recaptcha_sitekey' => $recaptcha_sitekey ?? '', - 'login__link' => str_replace('#URL#', '#', $lang['cms_register_login_link']) + 'login__link' => (isset($lang['cms_register_login_link']) ? str_replace('#URL#', '#', $lang['cms_register_login_link']) : '') ] - ], - + ] ]; } + +// Development +function registracija_1ka_preprocess_block(&$vars) +{ + if($vars['plugin_id'] == 'registracija_block'){ + $var['#cache'] ['max-age'] = 0; + } +} diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php index ea57ab0ee..14706d8e0 100644 --- a/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php +++ b/frontend/drupal9/web/modules/custom/registracija_1ka/src/Plugin/Block/RegistracijaBlock.php @@ -4,103 +4,29 @@ namespace Drupal\registracija_1ka\Plugin\Block; use Drupal\Core\Block\BlockBase; - /** * Priskrbi obrazec za prijavo * * @Block( - * id = "registracija_intro_block", - * admin_label = @Translation("Registracija: novega uporabnika 1KA (1KA, AAI)"), + * id = "registracija_block", + * admin_label = @Translation("Registracija: Obrazec za registracijo novega uporabnika"), * category = @Translation("1KA"), * ) */ class RegistracijaBlock extends BlockBase { - /** - * {@inheritdoc} - */ - public function build() { - - return [ - '#theme' => 'registracija_block', - ]; - } - - /* - private function preveriNapake($parametri) - { - - $lang = nalozi_ustrezen_jezik(); - - $napaka = []; - - - // Napaka pri emailu in opozorilo - $error_email = FALSE; - if (!empty($parametri['missing_email']) && $parametri['missing_email'] == 1) { - - $error_email = TRUE; - $napaka[] = $lang['cms_error_missing_email']; - - }elseif (!empty($parametri['invalid_email']) && $parametri['invalid_email'] == 1){ - - $error_email = TRUE; - $napaka[] = $lang['cms_error_email']; - - } elseif (!empty($parametri['existing_email']) && $parametri['existing_email'] == 1){ - - $error_email = TRUE; - $napaka[] = str_replace('RESTORE_PASSWORD', - '/frontend/api/api.php?action=reset_password&email=' . $parametri['email'], - $lang['cms_error_email_took']); - - } - - // Napaka pri imenu - $error_ime = FALSE; - if (!empty($parametri['missing_ime']) && $parametri['missing_ime'] == 1) { - - $error_ime = TRUE; - $napaka[] = $lang['cms_error_user_field_empty']; - - } elseif (!empty($parametri['existing_ime']) && $parametri['existing_ime'] == 1) { - - $error_ime = TRUE; - $napaka[] = $lang['cms_error_user_took']; - - } - - // Recaptcha error - $error_recaptcha = FALSE; - if (!empty($parametri['invalid_recaptcha']) && $parametri['invalid_recaptcha'] == 1) { - - $error_recaptcha = TRUE; - $napaka[] = $lang['cms_error_recaptcha']; - - } - - // Napaka pri napačno vpisanih geslih - $error_geslo = FALSE; - if (!empty($parametri['pass_mismatch']) && $parametri['pass_mismatch'] == 1) { - - $error_geslo = TRUE; - $napaka[] = $lang['cms_error_password_incorrect']; - } - // Geslo ni dovolj kompleksno - if (!$error_geslo && !empty($parametri['pass_complex']) && $parametri['pass_complex'] == 1) { - - $error_geslo = TRUE; - $napaka[] = $lang['password_err_complex']; - } - + /* + * {@inheritdoc} + */ + public function build() { return [ - 'napaka' => $napaka, - 'error_geslo' => $error_geslo, - 'error_ime' => $error_ime, - 'error_email' => $error_email, - 'error_recaptcha' => $error_recaptcha + '#theme' => 'registracija_block', ]; - } - */ + } + + public function getCacheMaxAge() { + return 0; + } } + diff --git a/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig b/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig index 30b5dafea..764b7748e 100644 --- a/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig +++ b/frontend/drupal9/web/modules/custom/registracija_1ka/templates/registracija-block.html.twig @@ -1,28 +1,28 @@ diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php index 760e97f14..8aba45318 100644 --- a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php +++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/CenikController.php @@ -78,6 +78,7 @@ class CenikController extends ControllerBase protected function getVariables() { $variables = [ 'module' => $this->getModuleName(), + 'email_uporabnika' => (!empty($_COOKIE['uid']) ? base64_decode($_COOKIE['uid']) : ''), ]; return $variables; } diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php index bce2fbaca..f06f09e06 100644 --- a/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php +++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/src/Controller/NarociloController.php @@ -97,6 +97,7 @@ class NarociloController extends ControllerBase } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { $ip = $_SERVER['HTTP_X_FORWARDED_FOR']; + } else { $ip = $_SERVER['REMOTE_ADDR']; @@ -105,7 +106,6 @@ class NarociloController extends ControllerBase $request_method = 'POST'; $post_data = ['ip' => $ip]; $raw_post_data = http_build_query($post_data); - } // Pripravimo stvari za izdelavo tokena diff --git a/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml b/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml index 48528aba8..b8c613f42 100644 --- a/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml +++ b/frontend/drupal9/web/modules/custom/trgovina_1ka/trgovina_1ka.routing.yml @@ -18,12 +18,12 @@ trgovina_1ka.izvedi_nakup: trgovina_1ka.nakupovanje_api: path: '/nakupovanje-api/{parameter}' defaults: - _form: '\Drupal\trgovina_1ka\Controller\NarociloController::apiKlici' + _controller: '\Drupal\trgovina_1ka\Controller\NarociloController::apiKlici' _title: 'Nakupovanje API' url_parameter: '' methods: 'POST' requirements: - _permission: 'access content' + _permission: 'TRUE' ## END cenik zasebni ## diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js index 2a817ad26..2f1567be4 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/js/login.js +++ b/frontend/drupal9/web/themes/custom/pro1ka/js/login.js @@ -62,7 +62,7 @@ jQuery('.obvestilo').empty().hide(); jQuery('#input-obnovitev-email').removeClass('error'); - var emailObnovitev = jQuery('#input-obnovitev-email').val(); + var emailObnovitev = jQuery('#obnovitev-gesla-email').val(); if (emailObnovitev.length == 0 || emailObnovitev.length > 1 && (emailObnovitev.search('@') == -1 || emailObnovitev.indexOf('.') == -1)) { jQuery('#input-obnovitev-email').addClass('error'); @@ -71,10 +71,10 @@ } // V kolikor je vse ok poljemo POST request, da preverimo v bazi - jQuery.post('/frontend/api/api.php?action=reset_password', { + jQuery.post('/api/drupal/reset_password', { email: emailObnovitev, ajax: true, - jezik: jQuery('[name="jezik"]').val() + jezik: pridobiJezik() }).done(function (val) { val = JSON.parse(val); @@ -101,6 +101,69 @@ }); + // AKtivacija izgubljenega gesla + if (window.location.hash == '#aktivacija-gesla') { + jQuery('#modal-lost-password-activate').show(); + } + + jQuery('#submit-lost-password-activation').on('click', function () { + jQuery('.w-form-fail').hide(); + jQuery('.error').removeClass('error'); + + var email = jQuery('#aktivacija-email').val(); + var geslo = jQuery('#aktivacija-geslo').val(); + var koda = ''; + var jezik = jQuery('#modal-lost-password [name="jezik"]').val(); + + var results = new RegExp('[\?&]code=([^&#]*)').exec(window.location.href); + if (results[1].length > 10) + koda = results[1]; + + if (email.length == 0 || geslo.length == 0 || koda.length == 0) { + jQuery('#error-aktivacija-gesla').show(); + + if (email.length == 0) { + jQuery('#aktivacija-email').addClass('error'); + } + + if (geslo.length == 0) { + jQuery('#aktivacija-geslo').addClass('error'); + } + + return false; + } + + + // V kolikor je vse ok poljemo POST request, da preverimo v bazi + jQuery.post('/frontend/api/api.php?action=reset_password_activate', { + email: email, + pass: geslo, + code: koda, + ajax: true, + lang: jezik + }).done(function (val) { + val = JSON.parse(val); + + jQuery('#error-aktivacija-gesla').removeClass('w-form-fail').removeClass('w-form-done').html('').hide(); + + if (val.type == 'success') { + jQuery('#error-aktivacija-gesla').addClass('w-form-done').html('
' + val.text + '
').show(); + + // Če je bil email uspešno poslal potem okno zapremo po 5 sekundah + setTimeout(function () { + window.location.href = val.action; + }, 5000); + + } else { + + // Napaka, če email ne obstaja v bazi + jQuery('#error-aktivacija-gesla').addClass('w-form-fail').html('
' + val.text + '
').show(); + + } + }); + }); + + }); } @@ -109,6 +172,10 @@ })(jQuery, Drupal, this, this.document); +function pridobiJezik(){ + +} + function vrniBesediloNapake(besedilo){ let sporocilo; @@ -236,7 +303,7 @@ function preveriZaTipkarskoNapakoVemailu(uporabnikovaDomena, domena) { return false; } -function lang() { +function pridobiJezik() { return jQuery('html')[0].lang; } @@ -245,7 +312,7 @@ function odpriAaiLoginObvestilo(){ jQuery('.nakup-prijava').hide(); jQuery('.modal-intro-login-text').css('display', 'flex'); - if(jQuery('html')[0].lang == 'sl') { + if(pridobiJezik() == 'sl') { jQuery('#modal-open-1ka').removeClass('modal-goto-registration').addClass('modal-open-login-obrazec'); jQuery('#modal-info-login').css('display', 'flex'); diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/1ka_funkcionalnost.js b/frontend/drupal9/web/themes/custom/pro1ka/js/old/1ka_funkcionalnost.js similarity index 100% rename from frontend/drupal9/web/themes/custom/pro1ka/js/1ka_funkcionalnost.js rename to frontend/drupal9/web/themes/custom/pro1ka/js/old/1ka_funkcionalnost.js diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/enka-21.js b/frontend/drupal9/web/themes/custom/pro1ka/js/old/enka-21.js similarity index 100% rename from frontend/drupal9/web/themes/custom/pro1ka/js/enka-21.js rename to frontend/drupal9/web/themes/custom/pro1ka/js/old/enka-21.js diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/enka-default.js b/frontend/drupal9/web/themes/custom/pro1ka/js/old/enka-default.js similarity index 100% rename from frontend/drupal9/web/themes/custom/pro1ka/js/enka-default.js rename to frontend/drupal9/web/themes/custom/pro1ka/js/old/enka-default.js diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/pro1ka.js b/frontend/drupal9/web/themes/custom/pro1ka/js/old/pro1ka.js similarity index 100% rename from frontend/drupal9/web/themes/custom/pro1ka/js/pro1ka.js rename to frontend/drupal9/web/themes/custom/pro1ka/js/old/pro1ka.js diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js index 1375a3651..1b3793317 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js +++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js @@ -26,42 +26,42 @@ jQuery(document).ready(function () { // Drupal nova prijava - jQuery('.submit-prijava').on('click', function(){ - // ODstranimo vse napake - jQuery('.error-field').removeClass('error-field') - - - jQuery(':input[required]:visible').each(function () { - if (jQuery(this).val() == '') { - jQuery(this).addClass('error-field'); - } - }); - - if( jQuery('.error-field').length > 0){ - return false - } - - - jQuery('#prijava-1ka error-message').append('').hide(); - - var sendVariables = jQuery('#forma-prijava :input').serialize() - var url = jQuery('#forma-prijava').attr('action') - - jQuery.post(url, sendVariables, function (data) { - var response = JSON.parse(data) - - if(response.type == 'success'){ - - return window.location = response.data.url - - } else if(response.type == 'error') { - - jQuery('#prijava-1ka error-message').append(response.message).show(); - } - }); - - - }); + // jQuery('.submit-prijava').on('click', function(){ + // // ODstranimo vse napake + // jQuery('.error-field').removeClass('error-field'); + // + // + // jQuery(':input[required]:visible').each(function () { + // if (jQuery(this).val() == '') { + // jQuery(this).addClass('error-field'); + // } + // }); + // + // if( jQuery('.error-field').length > 0){ + // return false; + // } + // + // + // jQuery('#prijava-1ka error-message').append('').hide(); + // + // var sendVariables = jQuery('#forma-prijava :input').serialize() + // var url = jQuery('#forma-prijava').attr('action') + // + // jQuery.post(url, sendVariables, function (data) { + // var response = JSON.parse(data) + // + // if(response.type == 'success'){ + // + // return window.location = response.data.url + // + // } else if(response.type == 'error') { + // + // jQuery('#prijava-1ka error-message').append(response.message).show(); + // } + // }); + // + // + // }); @@ -265,7 +265,7 @@ // Prijava modal jQuery('.modal-open-login-obrazec').on('click', function () { - jQuery('.rexister-modal').hide(); + jQuery('.rexister-modal').css('display', 'none'); jQuery('#modal-login').css('display', 'flex'); }); @@ -479,112 +479,114 @@ // Izgubljeno geslo - jQuery('#open-modal-lost-password').on('click', function () { - jQuery('#modal-login').hide(); - jQuery('#modal-lost-password').css('display', 'flex'); - }); - jQuery('#submit-lost-password').on('click', function () { - jQuery('.w-form-fail').hide(); + // jQuery('#open-modal-lost-password').on('click', function () { + // jQuery('#modal-login').hide(); + // jQuery('#modal-lost-password').css('display', 'flex'); + // }); + // jQuery('#submit-lost-password').on('click', function () { + // jQuery('.w-form-fail').hide(); + // + // var emailObnovitev = jQuery('#obnovitev-gesla').val(); + // var jezik = jQuery('#modal-lost-password [name="jezik"]').val(); + // + // if (emailObnovitev.length == 0 || emailObnovitev.length > 1 && (emailObnovitev.search('@') == -1 || emailObnovitev.indexOf('.') == -1)) { + // jQuery('#error-lost-password').show(); + // + // return false; + // } + // + // // V kolikor je vse ok poljemo POST request, da preverimo v bazi + // jQuery.post('/frontend/api/api.php?action=reset_password', { + // email: emailObnovitev, + // ajax: true, + // jezik: jezik + // }).done(function (val) { + // val = JSON.parse(val); + // + // jQuery('#modal-lost-password .w-form-done').html('').hide(); + // jQuery('#modal-lost-password .w-form-fail').hide(); + // + // if (val.type == 'success') { + // jQuery('#modal-lost-password .w-form-done').html('
' + val.text + '
').show(); + // + // // Če je bil email uspešno poslal potem okno zapremo po 5 sekundah + // setTimeout(function () { + // jQuery("#modal-lost-password").hide(); + // jQuery('#modal-lost-password .w-form-done').hide(); + // jQuery("#obnovitev-gesla").val(''); + // }, 2000); + // + // } else { + // + // // Napaka, če email ne obstaja v bazi + // jQuery('#modal-lost-password .w-form-fail').html('
' + val.text + '
').show(); + // + // } + // }); + // }); - var emailObnovitev = jQuery('#obnovitev-gesla').val(); - var jezik = jQuery('#modal-lost-password [name="jezik"]').val(); + // // AKtivacija izgubljenega gesla + // if (window.location.hash == '#aktivacija-gesla') { + // jQuery('#modal-lost-password-activate').show(); + // } - if (emailObnovitev.length == 0 || emailObnovitev.length > 1 && (emailObnovitev.search('@') == -1 || emailObnovitev.indexOf('.') == -1)) { - jQuery('#error-lost-password').show(); - - return false; - } - - // V kolikor je vse ok poljemo POST request, da preverimo v bazi - jQuery.post('/frontend/api/api.php?action=reset_password', { - email: emailObnovitev, - ajax: true, - jezik: jezik - }).done(function (val) { - val = JSON.parse(val); - - jQuery('#modal-lost-password .w-form-done').html('').hide(); - jQuery('#modal-lost-password .w-form-fail').hide(); - - if (val.type == 'success') { - jQuery('#modal-lost-password .w-form-done').html('
' + val.text + '
').show(); - - // Če je bil email uspešno poslal potem okno zapremo po 5 sekundah - setTimeout(function () { - jQuery("#modal-lost-password").hide(); - jQuery('#modal-lost-password .w-form-done').hide(); - jQuery("#obnovitev-gesla").val(''); - }, 2000); - - } else { - - // Napaka, če email ne obstaja v bazi - jQuery('#modal-lost-password .w-form-fail').html('
' + val.text + '
').show(); - - } - }); - }); - - // AKtivacija izgubljenega gesla - if (window.location.hash == '#aktivacija-gesla') { - jQuery('#modal-lost-password-activate').show(); - } - jQuery('#submit-lost-password-activation').on('click', function () { - jQuery('.w-form-fail').hide(); - jQuery('.error').removeClass('error'); - - var email = jQuery('#aktivacija-email').val(); - var geslo = jQuery('#aktivacija-geslo').val(); - var koda = ''; - var jezik = jQuery('#modal-lost-password [name="jezik"]').val(); - - var results = new RegExp('[\?&]code=([^&#]*)').exec(window.location.href); - if (results[1].length > 10) - koda = results[1]; - - if (email.length == 0 || geslo.length == 0 || koda.length == 0) { - jQuery('#error-aktivacija-gesla').show(); - - if (email.length == 0) { - jQuery('#aktivacija-email').addClass('error'); - } - - if (geslo.length == 0) { - jQuery('#aktivacija-geslo').addClass('error'); - } - - return false; - } - - - // V kolikor je vse ok poljemo POST request, da preverimo v bazi - jQuery.post('/frontend/api/api.php?action=reset_password_activate', { - email: email, - pass: geslo, - code: koda, - ajax: true, - lang: jezik - }).done(function (val) { - val = JSON.parse(val); - - jQuery('#error-aktivacija-gesla').removeClass('w-form-fail').removeClass('w-form-done').html('').hide(); - - if (val.type == 'success') { - jQuery('#error-aktivacija-gesla').addClass('w-form-done').html('
' + val.text + '
').show(); - - // Če je bil email uspešno poslal potem okno zapremo po 5 sekundah - setTimeout(function () { - window.location.href = val.action; - }, 5000); - - } else { - - // Napaka, če email ne obstaja v bazi - jQuery('#error-aktivacija-gesla').addClass('w-form-fail').html('
' + val.text + '
').show(); - - } - }); - }); + // V datoteki login.js + // jQuery('#submit-lost-password-activation').on('click', function () { + // jQuery('.w-form-fail').hide(); + // jQuery('.error').removeClass('error'); + // + // var email = jQuery('#aktivacija-email').val(); + // var geslo = jQuery('#aktivacija-geslo').val(); + // var koda = ''; + // var jezik = jQuery('#modal-lost-password [name="jezik"]').val(); + // + // var results = new RegExp('[\?&]code=([^&#]*)').exec(window.location.href); + // if (results[1].length > 10) + // koda = results[1]; + // + // if (email.length == 0 || geslo.length == 0 || koda.length == 0) { + // jQuery('#error-aktivacija-gesla').show(); + // + // if (email.length == 0) { + // jQuery('#aktivacija-email').addClass('error'); + // } + // + // if (geslo.length == 0) { + // jQuery('#aktivacija-geslo').addClass('error'); + // } + // + // return false; + // } + // + // + // // V kolikor je vse ok poljemo POST request, da preverimo v bazi + // jQuery.post('/frontend/api/api.php?action=reset_password_activate', { + // email: email, + // pass: geslo, + // code: koda, + // ajax: true, + // lang: jezik + // }).done(function (val) { + // val = JSON.parse(val); + // + // jQuery('#error-aktivacija-gesla').removeClass('w-form-fail').removeClass('w-form-done').html('').hide(); + // + // if (val.type == 'success') { + // jQuery('#error-aktivacija-gesla').addClass('w-form-done').html('
' + val.text + '
').show(); + // + // // Če je bil email uspešno poslal potem okno zapremo po 5 sekundah + // setTimeout(function () { + // window.location.href = val.action; + // }, 5000); + // + // } else { + // + // // Napaka, če email ne obstaja v bazi + // jQuery('#error-aktivacija-gesla').addClass('w-form-fail').html('
' + val.text + '
').show(); + // + // } + // }); + // }); //Prijava z ostalimi računi jQuery('#agreelabel, #cutom-login-agree, .checkbox-agree').on('click', function () { diff --git a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.libraries.yml b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.libraries.yml index fcaa12066..1f81e8d20 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.libraries.yml +++ b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.libraries.yml @@ -9,6 +9,7 @@ global-styling: # js/enka-default.js: {} # js/enka-21.js: {} js/script.js: {} + js/login.js: {} js/modernizr-custom.js: {} dependencies: diff --git a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme index 1b5a5dbad..d3b0025c4 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme +++ b/frontend/drupal9/web/themes/custom/pro1ka/pro1ka.theme @@ -18,8 +18,8 @@ function pro1ka_preprocess_page(&$variables) { } $variables['lang'] = $lang; - $variables['uporabnik'] = (!empty($_COOKIE['unam']) ? base64_decode($_COOKIE['unam']) : ''); + $variables['emailUporabnik'] = 'da'.(!empty($_COOKIE['uid']) ? base64_decode($_COOKIE['uid']) : ''); } /** diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss index 3868e641e..ea5beed98 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_popup.scss @@ -124,18 +124,18 @@ font-weight: 600; letter-spacing: 1px; cursor: pointer; - + transition: 0.2s; - + &:hover { background: $modra-hover; } - + &.gumb-aai{ text-transform: uppercase; background: #e35205; letter-spacing: 0.5px; - + &.login{ margin-top: 6px; width: 50%; @@ -145,12 +145,12 @@ span{ justify-content: center; } - + &:hover{ background: #fa6c21; } } - + img { height: 1.6rem; width: 52px; @@ -241,6 +241,12 @@ .prijava.forma { padding-right: 1rem; width: 100%; + + .error-message { + background: #ff000024; + padding: 0.25rem 0.75rem; + color: red; + } } .intro-modal{ diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig index b42405857..a79722b8d 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig @@ -89,7 +89,7 @@ END HEADER #} {% if email_uporabnika %} Preizkusi brezplačno {% else %} - Preizkusi brezplačno + Preizkusi brezplačno {% endif %} diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig index 7811052ed..3331ad822 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/parts/footer.html.twig @@ -10,7 +10,7 @@
Preizkusite
- +
Vsi paketi