MyFit/users-myfit
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit into capability-to-hide-history

Browse Source
This commit was merged in pull request #78.
This commit is contained in:
Ebube
2023-10-04 12:34:48 +01:00
parent 29a101a062 c4b41a6557
commit 1841e7b3d5
10 changed files with 283 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/Partials/Sidebar.jsx
+30 -24
View File
@@ -151,7 +151,8 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
</span>
</NavLink>
</li>
<li className="item group">
{(process.env.REACT_APP_TRACKING_SHOW == true) ?
(<li className="item group">
<NavLink
to="/tracking"
className={`nav-item flex items-center ${
@@ -170,7 +171,8 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
{process.env.REACT_APP_TRACKING}
</span>
</NavLink>
</li>
</li>)
: ''}
<li className="item group">
<NavLink
to="/calendar"
@@ -191,28 +193,33 @@ 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>
{(process.env.REACT_APP_HISTORY_SHOW == true) ?
(<li className="item group">
<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
to="/history"
className={`nav-item flex items-center ${
@@ -231,8 +238,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
{process.env.REACT_APP_HISTORY}
</span>
</NavLink>
</li>)
: ''}
</li>
</ul>
</div>
</div>