diff --git a/packages/evershop/bin/lib/addDefaultMiddlewareFuncs.js b/packages/evershop/bin/lib/addDefaultMiddlewareFuncs.js
index 4e0a8cc03..56b50b45b 100644
--- a/packages/evershop/bin/lib/addDefaultMiddlewareFuncs.js
+++ b/packages/evershop/bin/lib/addDefaultMiddlewareFuncs.js
@@ -78,10 +78,10 @@ exports.addDefaultMiddlewareFuncs = function addDefaultMiddlewareFuncs(
}),
secret: cookieSecret,
cookie: {
- maxAge: 24 * 60 * 60 * 1000
+ maxAge: getConfig('system.session.maxAge', 24 * 60 * 60 * 1000)
},
resave: getConfig('system.session.resave', false),
- saveUninitialized: true
+ saveUninitialized: getConfig('system.session.saveUninitialized', true)
};
if (isProductionMode()) {
diff --git a/packages/evershop/src/components/common/Notification.scss b/packages/evershop/src/components/common/Notification.scss
index 8e2f9dd4a..4977163aa 100644
--- a/packages/evershop/src/components/common/Notification.scss
+++ b/packages/evershop/src/components/common/Notification.scss
@@ -6,6 +6,7 @@
width: 320px;
box-sizing: border-box;
color: #fff;
+ background-color: transparent;
}
.Toastify__toast-container--top-left {
top: 1em;
diff --git a/packages/evershop/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx b/packages/evershop/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx
index 91f6b4465..537bbcf2b 100644
--- a/packages/evershop/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx
+++ b/packages/evershop/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx
@@ -3,6 +3,7 @@ import React from 'react';
import { Field } from '@components/common/form/Field';
import { Form } from '@components/common/form/Form';
import './LoginForm.scss';
+import Area from '@components/common/Area';
export default function LoginForm({ authUrl, dashboardUrl }) {
const [error, setError] = React.useState(null);
@@ -18,12 +19,26 @@ export default function LoginForm({ authUrl, dashboardUrl }) {
return (
-
+
{error &&
{error}
}
diff --git a/packages/evershop/src/modules/auth/services/adminSessionMiddleware.js b/packages/evershop/src/modules/auth/services/adminSessionMiddleware.js
deleted file mode 100644
index e69de29bb..000000000
diff --git a/packages/evershop/src/modules/base/bootstrap.js b/packages/evershop/src/modules/base/bootstrap.js
index 279d1edf6..b225919e9 100644
--- a/packages/evershop/src/modules/base/bootstrap.js
+++ b/packages/evershop/src/modules/base/bootstrap.js
@@ -66,6 +66,9 @@ module.exports = async () => {
cookieName: {
type: 'string'
},
+ maxAge: {
+ type: 'number'
+ },
reSave: {
type: 'boolean'
},
diff --git a/packages/evershop/src/modules/cms/bootstrap.js b/packages/evershop/src/modules/cms/bootstrap.js
index 5436011f5..b525ded5e 100644
--- a/packages/evershop/src/modules/cms/bootstrap.js
+++ b/packages/evershop/src/modules/cms/bootstrap.js
@@ -125,6 +125,42 @@ module.exports = () => {
enum: ['local']
}
}
+ },
+ widgets: {
+ type: 'object',
+ patternProperties: {
+ '^[a-zA-Z_]+$': {
+ type: 'object',
+ properties: {
+ setting_component: {
+ type: 'string'
+ },
+ component: {
+ type: 'string'
+ },
+ name: {
+ type: 'string'
+ },
+ description: {
+ type: 'string'
+ },
+ default_settings: {
+ type: 'object'
+ },
+ enabled: {
+ type: 'boolean'
+ }
+ },
+ required: [
+ 'setting_component',
+ 'component',
+ 'name',
+ 'description',
+ 'enabled'
+ ],
+ additionalProperties: false
+ }
+ }
}
}
});
diff --git a/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss b/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss
index 53b422db5..10a84cb48 100644
--- a/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss
+++ b/packages/evershop/src/modules/cms/pages/admin/all/Notification.scss
@@ -3,7 +3,7 @@
-webkit-transform: translate3d(0, 0, 9999px);
position: fixed;
width: 380px;
- background-color: #fff;
+ background-color: transparent;
}
.Toastify__toast-container--top-left {
top: 1em;
diff --git a/packages/evershop/src/modules/cms/pages/admin/widgetGrid/NewWidgetButton.jsx b/packages/evershop/src/modules/cms/pages/admin/widgetGrid/NewWidgetButton.jsx
index 41f90e1a8..230dcee20 100644
--- a/packages/evershop/src/modules/cms/pages/admin/widgetGrid/NewWidgetButton.jsx
+++ b/packages/evershop/src/modules/cms/pages/admin/widgetGrid/NewWidgetButton.jsx
@@ -17,12 +17,6 @@ export default function NewWidgetButton({ widgetTypes }) {
title: 'Cancel',
onAction: closeAlert,
variant: 'primary'
- },
- secondaryAction: {
- title: 'Disable',
- onAction: async () => {},
- variant: 'critical',
- isLoading: false
}
});
}}
diff --git a/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss b/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss
index 4c23225f7..71653c452 100644
--- a/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss
+++ b/packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss
@@ -4,7 +4,7 @@
transform: translate3d(0, 0, 9999px);
position: fixed;
width: 380px;
- background-color: #fff;
+ background-color: transparent;
}
.Toastify__toast-container--top-left {
top: 1em;
diff --git a/packages/evershop/src/modules/setting/pages/admin/storeSetting/StoreSetting.jsx b/packages/evershop/src/modules/setting/pages/admin/storeSetting/StoreSetting.jsx
index 1e0b410eb..c55ffd0cc 100644
--- a/packages/evershop/src/modules/setting/pages/admin/storeSetting/StoreSetting.jsx
+++ b/packages/evershop/src/modules/setting/pages/admin/storeSetting/StoreSetting.jsx
@@ -6,6 +6,7 @@ import { Field } from '@components/common/form/Field';
import { Form } from '@components/common/form/Form';
import { Card } from '@components/admin/cms/Card';
import SettingMenu from '@components/admin/setting/SettingMenu';
+import Area from '@components/common/Area';
const ProvincesQuery = `
query Province($countries: [String]) {
@@ -182,6 +183,46 @@ Currency.defaultProps = {
fieldName: 'storeCurrency'
};
+function StorePhoneNumber({ storePhoneNumber }) {
+ return
+
+
+}
+
+StorePhoneNumber.propTypes = {
+ storePhoneNumber: PropTypes.string
+};
+
+StorePhoneNumber.defaultProps = {
+ storePhoneNumber: ''
+};
+
+function StoreEmail({ storeEmail }) {
+ return
+
+
+}
+
+StoreEmail.propTypes = {
+ storeEmail: PropTypes.string
+};
+
+StoreEmail.defaultProps = {
+ storeEmail: ''
+};
+
export default function StoreSetting({
saveSettingApi,
setting: {
@@ -226,42 +267,64 @@ export default function StoreSetting({
>
-
-
-
+