yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-04 22:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10882 from strapi/main-nav-notifications

Browse Source 
Main nav notifications
This commit is contained in:
cyril lopez 2021-09-06 07:46:54 +02:00 committed by GitHub
commit a68aeb0d16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/admin/admin/src/components/LeftMenu/index.js
View File

@ -53,7 +53,12 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
{generalSectionLinks.length > 0 ? (
<NavSection label="General">
{generalSectionLinks.map(link => (
<NavLink to={link.to} key={link.to} icon={<FontAwesomeIcon icon={link.icon} />}>
<NavLink
badgeContent={link.notificationsCount > 0 && link.notificationsCount}
to={link.to}
key={link.to}
icon={<FontAwesomeIcon icon={link.icon} />}
>
<FormattedMessage {...link.intlLabel} />
</NavLink>
))}

4
packages/core/admin/package.json
View File

@ -40,8 +40,8 @@
"@fortawesome/react-fontawesome": "^0.1.14",
"@strapi/babel-plugin-switch-ee-ce": "1.0.0",
"@strapi/helper-plugin": "3.6.7",
"@strapi/icons": "0.0.1-alpha.19",
"@strapi/parts": "0.0.1-alpha.19",
"@strapi/icons": "0.0.1-alpha.21",
"@strapi/parts": "0.0.1-alpha.21",
"@strapi/utils": "3.6.7",
"axios": "^0.21.1",
"babel-loader": "8.2.2",

14
yarn.lock
View File

@ -4920,6 +4920,11 @@
resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.19.tgz#88153c77ff02deccfedffb1dc2e7f0f4cc2f830a"
integrity sha512-nFpT3Gsp6nQ4+FNd9DkbqhMZrX9KJbWXLQ6XFHhtYdNVA3n5vr2/0MFaqWrvYwxpnxMs3gn1xZOjG4+VzLBwbA==
"@strapi/icons@0.0.1-alpha.21":
version "0.0.1-alpha.21"
resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.21.tgz#d509974c6a2ca5ce977a000d7859822221a9a14b"
integrity sha512-9gfvsq4uPJd6VIA5Cs9BFz7aPqeMLEq9PJp+gDF6gbS56qSzHhG/Vo1BjJcukuI2oSLpj4zMJHI/yw0NnnZs7w==
"@strapi/parts@0.0.1-alpha.19":
version "0.0.1-alpha.19"
resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.19.tgz#e4c64c1f63256ab21f4ad643f684738a283c0efc"
@ -4929,6 +4934,15 @@
compute-scroll-into-view "^1.0.17"
prop-types "^15.7.2"
"@strapi/parts@0.0.1-alpha.21":
version "0.0.1-alpha.21"
resolved "https://registry.yarnpkg.com/@strapi/parts/-/parts-0.0.1-alpha.21.tgz#f62edd0c503b438fd2b98419e97405cada5b0e60"
integrity sha512-Z6pArphkzk4+HkL1Tq3SsayGk9SEjANFd9SVGUStiohV6nWK/ri0562cJs0QIgBFwzGWjtuhIrOgTYe00xKSwg==
dependencies:
"@internationalized/number" "^3.0.2"
compute-scroll-into-view "^1.0.17"
prop-types "^15.7.2"
"@stylelint/postcss-css-in-js@^0.37.2":
version "0.37.2"
resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"