Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #603

Merged
merged 6 commits into from
Aug 25, 2024
Merged

Dev #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9dc2ae
Fix toast message background
treoden Aug 24, 2024
e43a80f
Use svg for admin logo
treoden Aug 24, 2024
79b8b29
Add more area to the store setting page
treoden Aug 24, 2024
30075e6
Allow changing the validity period of sid #593
treoden Aug 24, 2024
8bcec2a
Add widget configuration validation schema #581
treoden Aug 25, 2024
33629b2
Remove unused button when creating a widget #581
treoden Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/evershop/bin/lib/addDefaultMiddlewareFuncs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
1 change: 1 addition & 0 deletions packages/evershop/src/components/common/Notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
width: 320px;
box-sizing: border-box;
color: #fff;
background-color: transparent;
}
.Toastify__toast-container--top-left {
top: 1em;
Expand Down
71 changes: 52 additions & 19 deletions packages/evershop/src/modules/auth/pages/admin/adminLogin/LoginForm.jsx
View file
Open in desktop

Large diffs are not rendered by default.

Empty file removed packages/evershop/src/modules/auth/services/adminSessionMiddleware.js
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions packages/evershop/src/modules/base/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ module.exports = async () => {
cookieName: {
type: 'string'
},
maxAge: {
type: 'number'
},
reSave: {
type: 'boolean'
},
Expand Down
36 changes: 36 additions & 0 deletions packages/evershop/src/modules/cms/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/modules/cms/pages/admin/all/Notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 0 additions & 6 deletions packages/evershop/src/modules/cms/pages/admin/widgetGrid/NewWidgetButton.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ export default function NewWidgetButton({ widgetTypes }) {
title: 'Cancel',
onAction: closeAlert,
variant: 'primary'
},
secondaryAction: {
title: 'Disable',
onAction: async () => {},
variant: 'critical',
isLoading: false
}
});
}}
Expand Down
2 changes: 1 addition & 1 deletion packages/evershop/src/modules/cms/pages/frontStore/all/Notification.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
129 changes: 96 additions & 33 deletions packages/evershop/src/modules/setting/pages/admin/storeSetting/StoreSetting.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]) {
Expand Down Expand Up @@ -182,6 +183,46 @@ Currency.defaultProps = {
fieldName: 'storeCurrency'
};

function StorePhoneNumber({ storePhoneNumber }) {
return <div>
<Field
name="storePhoneNumber"
label="Store Phone Number"
placeholder="Store Phone Number"
value={storePhoneNumber}
type="text"
/>
</div>
}

StorePhoneNumber.propTypes = {
storePhoneNumber: PropTypes.string
};

StorePhoneNumber.defaultProps = {
storePhoneNumber: ''
};

function StoreEmail({ storeEmail }) {
return <div>
<Field
name="storeEmail"
label="Store Email"
placeholder="Store Email"
value={storeEmail}
type="text"
/>
</div>
}

StoreEmail.propTypes = {
storeEmail: PropTypes.string
};

StoreEmail.defaultProps = {
storeEmail: ''
};

export default function StoreSetting({
saveSettingApi,
setting: {
Expand Down Expand Up @@ -226,42 +267,64 @@ export default function StoreSetting({
>
<Card>
<Card.Session title="Store Information">
<Field
name="storeName"
label="Store Name"
placeholder="Store Name"
value={storeName}
type="text"
/>
<Field
name="storeDescription"
label="Store Description"
placeholder="Store Description"
value={storeDescription}
type="textarea"
<Area
id="storeInfoSetting"
coreComponents={[
{
component: {
default: Field
},
props: {
name: 'storeName',
label: 'Store Name',
placeholder: 'Store Name',
value: storeName,
type: 'text'
},
sortOrder: 10
},
{
component: {
default: Field
},
props: {
name: 'storeDescription',
label: 'Store Description',
placeholder: 'Store Description',
value: storeDescription,
type: 'textarea'
},
sortOrder: 20
}
]}
noOuter
/>
</Card.Session>
<Card.Session title="Contact Information">
<div className="grid grid-cols-2 gap-8 mt-8">
<div>
<Field
name="storePhoneNumber"
label="Store Phone Number"
value={storePhoneNumber}
placeholder="Store Phone Number"
type="text"
/>
</div>
<div>
<Field
name="storeEmail"
label="Store Email"
value={storeEmail}
placeholder="Store Email"
type="text"
/>
</div>
</div>
<Area
id="storeContactSetting"
coreComponents={[
{
component: {
default: StorePhoneNumber
},
props: {
storePhoneNumber
},
sortOrder: 10
},
{
component: {
default: StoreEmail
},
props: {
storeEmail
},
sortOrder: 20
}
]}
className="grid grid-cols-2 gap-8 mt-8"
/>
</Card.Session>
<Card.Session title="Address">
<Country
Expand Down
Loading