diff --git a/.gitignore b/.gitignore index d26bc1f404..1ccab57261 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,9 @@ /html/upload/temp_image/* /html/upload/temp_plugin/* /node_modules/* +/.yarn/* +/.pnp.cjs +/.pnp.loader.mjs /phpunit.xml /playwright-report/* /reports/* @@ -26,8 +29,12 @@ /tests/tmp/* /vagrant/* /videos/* +/scripts/* +/screenshots/* composer.phar *.cache *.log *.tpl.php +eccube_db +/data/eccube.db !.gitkeep diff --git a/data/Smarty/templates/default/frontparts/bloc/login.tpl b/data/Smarty/templates/default/frontparts/bloc/login.tpl index a9589e0578..a77592b333 100644 --- a/data/Smarty/templates/default/frontparts/bloc/login.tpl +++ b/data/Smarty/templates/default/frontparts/bloc/login.tpl @@ -20,6 +20,50 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + + + +
ようこそ
様
diff --git a/data/Smarty/templates/default/frontparts/bloc/login_header.tpl b/data/Smarty/templates/default/frontparts/bloc/login_header.tpl
index 650195ef4d..f0bc320b73 100644
--- a/data/Smarty/templates/default/frontparts/bloc/login_header.tpl
+++ b/data/Smarty/templates/default/frontparts/bloc/login_header.tpl
@@ -25,7 +25,7 @@
}
});
- $('#header_login_form').submit(function() {
+ $('#header_login_form').submit(function(e) {
if (!$login_email.val()
|| $login_email.val() == 'メールアドレス') {
if ($('#header_login_area input[name=login_pass]').val()) {
@@ -33,7 +33,37 @@
}
return false;
}
- return true;
+
+ // AJAX対応
+ e.preventDefault();
+ $.ajax({
+ type: "POST",
+ url: "frontparts/login_check.php",
+ data: $('#header_login_form').serialize(),
+ cache: false,
+ dataType: "json",
+ error: function(xhr, textStatus, errorThrown) {
+ if (xhr.status === 401) {
+ try {
+ var result = JSON.parse(xhr.responseText);
+ if (result.error) {
+ alert(result.error);
+ }
+ } catch (e) {
+ alert('通信エラーが発生しました。');
+ }
+ } else {
+ alert('通信エラーが発生しました。');
+ }
+ },
+ success: function(result) {
+ if (result.success) {
+ location.href = result.success;
+ }
+ }
+ });
+
+ return false;
});
});
//]]>
@@ -46,6 +76,7 @@
ようこそ 様 diff --git a/data/Smarty/templates/default/mypage/login.tpl b/data/Smarty/templates/default/mypage/login.tpl index c68babc7b5..cae10b3fc0 100644 --- a/data/Smarty/templates/default/mypage/login.tpl +++ b/data/Smarty/templates/default/mypage/login.tpl @@ -22,10 +22,49 @@ */ *}--> + +