Merge branch 'hiding_resources_menu_item' of MyFit/users-myfit into master

This commit is contained in:
2023-03-13 20:49:38 +00:00
committed by Gogs
5 changed files with 35 additions and 19 deletions
+3 -1
View File
@@ -17,4 +17,6 @@ REACT_APP_TRACKING="Tracking"
REACT_APP_RESOURCES="Resources"
REACT_APP_HISTORY="History"
REACT_APP_TRACKING_SHOW=1
REACT_APP_TRACKING_SHOW=1
REACT_APP_RESOURCES_SHOW=1
+2
View File
@@ -18,3 +18,5 @@ REACT_APP_RESOURCES="Resources"
REACT_APP_HISTORY="History"
REACT_APP_TRACKING_SHOW=1
REACT_APP_RESOURCES_SHOW=1
+2
View File
@@ -18,3 +18,5 @@ REACT_APP_RESOURCES="Resources"
REACT_APP_HISTORY="History"
REACT_APP_TRACKING_SHOW=0
REACT_APP_RESOURCES_SHOW=0
@@ -128,6 +128,8 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
</span>
</NavLink>
</li>
{process.env.REACT_APP_RESOURCES_SHOW == true ?
<li className="item group">
<NavLink
to="/resources"
@@ -141,6 +143,9 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
</span>
</NavLink>
</li>
:
<></>
}
<li className="item group">
<NavLink
to="/history"
+23 -18
View File
@@ -191,26 +191,31 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
</span>
</NavLink>
</li>
<li className="item group">
<NavLink
to="/resources"
className={`nav-item flex items-center ${
((navData) => (navData.isActive ? "active" : ""),
sidebar ? "justify-start space-x-3.5" : "justify-center")
}`}
>
<span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out bg-light-purple dark:bg-dark-light-purple rounded-full">
<Icons name="resources" />
</span>
<span
className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
sidebar ? "active flex-1" : "w-0"
{process.env.REACT_APP_RESOURCES_SHOW == true ?
<li className="item group">
<NavLink
to="/resources"
className={`nav-item flex items-center ${
((navData) => (navData.isActive ? "active" : ""),
sidebar ? "justify-start space-x-3.5" : "justify-center")
}`}
>
{process.env.REACT_APP_RESOURCES}
</span>
</NavLink>
</li>
<span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out bg-light-purple dark:bg-dark-light-purple rounded-full">
<Icons name="resources" />
</span>
<span
className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
sidebar ? "active flex-1" : "w-0"
}`}
>
{process.env.REACT_APP_RESOURCES}
</span>
</NavLink>
</li>
:
<></>
}
<li className="item group">
<NavLink