From 7d2ed9cd6bac971acda55f57c390772cc068f51e Mon Sep 17 00:00:00 2001 From: Christina Hastenrath Date: Tue, 3 Dec 2024 15:15:52 +0100 Subject: [PATCH 1/3] [markeng-3711][c] remove utm from navbar --- build/navbarDev.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/navbarDev.json b/build/navbarDev.json index 293ddba81..8a3acfb3f 100644 --- a/build/navbarDev.json +++ b/build/navbarDev.json @@ -171,7 +171,7 @@ }, { "title": "Public API Network", - "url": "https://www.postman.com/explore?utm_source=postman-website&utm_medium=referral" + "url": "https://www.postman.com/explore/" } ] } \ No newline at end of file From 156155d7e26f224d5d9141d1de671edf4e1ef6c7 Mon Sep 17 00:00:00 2001 From: Roni Lockwood Date: Tue, 10 Dec 2024 14:02:15 -0700 Subject: [PATCH 2/3] [MARKENG-3715][c] update topnav with resources and items --- build/navbarDev.json | 80 ++++++++------------------ src/components/Header/Header.jsx | 10 ++-- src/components/Header/HeaderStyles.jsx | 2 +- 3 files changed, 30 insertions(+), 62 deletions(-) diff --git a/build/navbarDev.json b/build/navbarDev.json index 8a3acfb3f..3665a8cef 100644 --- a/build/navbarDev.json +++ b/build/navbarDev.json @@ -69,101 +69,69 @@ }, { - "title": "Resources and Support", + "title": "Resources", "dropdown": "true", "columns": [ { "title": "Learning", "subItemsCol": [ { - "title": "Learning Center Docs", - "url": "https://learning.postman.com/docs/getting-started/introduction/" + "title": "Postman Docs", + "url": "https://learning.postman.com/docs/introduction/overview/" }, { - "title": "Postman Academy", + "title": "Academy", "url": "https://academy.postman.com/" }, { - "title": "White Papers", - "url": "https://www.postman.com/whitepaper/" - }, - { - "title": "Breaking Changes Show", - "url": "https://www.postman.com/events/breaking-changes/" + "title": "Blog", + "url": "https://blog.postman.com/" }, { "title": "Templates", - "url": "https://www.postman.com/templates" - }, - { - "title": "Tutorials", - "url": "http://quickstarts.postman.com/" - }, - { - "title": "Webinars", - "url": "https://www.postman.com/events/intergalactic/" - }, - { - "title": "State of the API Report", - "url": "https://www.postman.com/state-of-api/" - }, - { - "title": "Guide to API-First", - "url": "https://www.postman.com/api-first/" + "url": "/templates/" } ] }, { - "title": "Community and Events", + "title": "Resources", "subItemsCol": [ { - "title": "POST/CON", - "url": "https://www.postman.com/postcon/" - }, - { - "title": "Blog", - "url": "https://blog.postman.com/" + "title": "Support Center", + "url": "/support/" }, { "title": "Community", - "url": "https://www.postman.com/community/" - }, - { - "title": "Student Program", - "url": "https://www.postman.com/student-program/" + "url": "https://community.postman.com/" }, { - "title": "Events", - "url": "https://www.postman.com/events/" + "title": "Release Notes", + "url": "/release-notes/" }, { - "title": "Postman Swag", - "url": "https://store.postman.com/" + "title": "Postman Status", + "url": "https://status.postman.com/" } ] }, { - "title": "Support", + "title": "Company", "subItemsCol": [ { - "title": "Support Center", - "url": "https://www.postman.com/support/" + "title": "Contact", + "url": "/company/contact-us/" }, { - "title": "Reseller Support", - "url": "https://www.postman.com/support/resellers-support/" - }, - { - "title": "Postman Status", - "url": "https://status.postman.com/" + "title": "POST/CON", + "url": "/postcon/" }, { - "title": "Release Notes", - "url": "https://www.postman.com/release-notes/" + "title": "Events", + "url": "/events/" }, { - "title": "Contact Us", - "url": "https://www.postman.com/company/contact-us/" + "title": "Swag", + "url": "https://store.postman.com/" } ] } diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index e0008e219..feb8ad65b 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -10,7 +10,7 @@ import { CTAButton } from './HeaderStyles.jsx' ; -import navbarData from '../../../bff-data/navbar.json'; +// import navbarData from '../../../bff-data/navbar.json'; import navtopicsdropdownData from '../../../bff-data/navtopicsdropdown.json'; // For local TOPNAVBAR TESTING import navbarDataLocal from '../../../build/navbarDev.json'; @@ -100,8 +100,8 @@ const Header = (props) => { const [beta, setBeta] = useState(''); const [cookie, setCookie] = useState(''); const [hidden, setHidden] = useState(true); - const [data, setData] = useState(navbarData); - const [dataDropdown, setDataDropdown] = useState(navbarData); + const [data, setData] = useState(navbarDataLocal); + const [dataDropdown, setDataDropdown] = useState(navbarDataLocal); const [visibleHelloBar] = useState(); useEffect(() => { @@ -114,8 +114,8 @@ const Header = (props) => { const navbarKeys = ['items', 'media', 'type']; const navtopicsdropdownKeys = ['items', 'type'] - if (navbarKeys.every(key => Object.keys(navbarData).includes(key))) { - setData(navbarData) + if (navbarKeys.every(key => Object.keys(navbarDataLocal).includes(key))) { + setData(navbarDataLocal) } else { setData(navbarDataLocal) } diff --git a/src/components/Header/HeaderStyles.jsx b/src/components/Header/HeaderStyles.jsx index 815c66514..eee9d3d8a 100644 --- a/src/components/Header/HeaderStyles.jsx +++ b/src/components/Header/HeaderStyles.jsx @@ -649,7 +649,7 @@ export const DropdownStyles = styled.div` .dropdown-col-menu { width: 100%; @media screen and (min-width: 992px) { - width: 64rem; + width: 50rem; } } .row__short { From c8cda9e3ec56d3195b5bc7285164067ba5bedb89 Mon Sep 17 00:00:00 2001 From: Roni Lockwood Date: Thu, 12 Dec 2024 10:31:45 -0700 Subject: [PATCH 3/3] revert back to bff file --- src/components/Header/Header.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index feb8ad65b..e0008e219 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -10,7 +10,7 @@ import { CTAButton } from './HeaderStyles.jsx' ; -// import navbarData from '../../../bff-data/navbar.json'; +import navbarData from '../../../bff-data/navbar.json'; import navtopicsdropdownData from '../../../bff-data/navtopicsdropdown.json'; // For local TOPNAVBAR TESTING import navbarDataLocal from '../../../build/navbarDev.json'; @@ -100,8 +100,8 @@ const Header = (props) => { const [beta, setBeta] = useState(''); const [cookie, setCookie] = useState(''); const [hidden, setHidden] = useState(true); - const [data, setData] = useState(navbarDataLocal); - const [dataDropdown, setDataDropdown] = useState(navbarDataLocal); + const [data, setData] = useState(navbarData); + const [dataDropdown, setDataDropdown] = useState(navbarData); const [visibleHelloBar] = useState(); useEffect(() => { @@ -114,8 +114,8 @@ const Header = (props) => { const navbarKeys = ['items', 'media', 'type']; const navtopicsdropdownKeys = ['items', 'type'] - if (navbarKeys.every(key => Object.keys(navbarDataLocal).includes(key))) { - setData(navbarDataLocal) + if (navbarKeys.every(key => Object.keys(navbarData).includes(key))) { + setData(navbarData) } else { setData(navbarDataLocal) }