Compare commits

..

1 Commits

Author SHA1 Message Date
victorAnumudu 59ee61445b shows active resources link when env variable is set to true/1 2023-03-06 14:07:28 +01:00
5 changed files with 31 additions and 29 deletions
+2 -1
View File
@@ -18,4 +18,5 @@ REACT_APP_RESOURCES="Resources"
REACT_APP_HISTORY="History" REACT_APP_HISTORY="History"
REACT_APP_TRACKING_SHOW=1 REACT_APP_TRACKING_SHOW=1
# REACT_APP_HISTORY_SHOW=1
REACT_APP_RESOURCES_SHOW=1
+2 -1
View File
@@ -18,4 +18,5 @@ REACT_APP_RESOURCES="Resources"
REACT_APP_HISTORY="History" REACT_APP_HISTORY="History"
REACT_APP_TRACKING_SHOW=1 REACT_APP_TRACKING_SHOW=1
# REACT_APP_HISTORY_SHOW=1
REACT_APP_RESOURCES_SHOW=1
+2 -1
View File
@@ -18,4 +18,5 @@ REACT_APP_RESOURCES="Resources"
REACT_APP_HISTORY="History" REACT_APP_HISTORY="History"
REACT_APP_TRACKING_SHOW=0 REACT_APP_TRACKING_SHOW=0
# REACT_APP_HISTORY_SHOW=0
REACT_APP_RESOURCES_SHOW=0
+12 -16
View File
@@ -92,7 +92,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
className="nav-item flex items-center justify-start space-x-3.5" className="nav-item flex items-center justify-start space-x-3.5"
> >
<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 text-dark-gray dark:text-white"> <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 text-dark-gray dark:text-white">
<Icons name="reminder" /> <Icons name="active-bids" />
</span> </span>
<span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1"> <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
Reminders Reminders
@@ -102,28 +102,26 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
</span> </span>
</NavLink> </NavLink>
</li> </li>
{process.env.REACT_APP_TRACKING_SHOW ? <li className="item group">
(<li className="item group">
<NavLink <NavLink
to="/tracking" to="/tracking"
className="nav-item flex items-center justify-start space-x-3.5" className="nav-item flex items-center justify-start space-x-3.5"
> >
<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 text-dark-gray dark:text-white"> <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 text-dark-gray dark:text-white">
<Icons name="tracking" /> <Icons name="market" />
</span> </span>
<span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1"> <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
{process.env.REACT_APP_TRACKING} {process.env.REACT_APP_TRACKING}
</span> </span>
</NavLink> </NavLink>
</li>) </li>
: ''}
<li className="item group"> <li className="item group">
<NavLink <NavLink
to="/calendar" to="/calendar"
className="nav-item flex items-center justify-start space-x-3.5" className="nav-item flex items-center justify-start space-x-3.5"
> >
<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 text-dark-gray dark:text-white"> <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 text-dark-gray dark:text-white">
<Icons name="calendar" /> <Icons name="wallet-two" />
</span> </span>
<span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1"> <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
Calendar Calendar
@@ -136,28 +134,26 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
className="nav-item flex items-center justify-start space-x-3.5" className="nav-item flex items-center justify-start space-x-3.5"
> >
<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 text-dark-gray dark:text-white"> <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 text-dark-gray dark:text-white">
<Icons name="resources" /> <Icons name="star" />
</span> </span>
<span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1"> <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
{process.env.REACT_APP_RESOURCES} {process.env.REACT_APP_RESOURCES}
</span> </span>
</NavLink> </NavLink>
</li> </li>
{process.env.REACT_APP_HISTORY_SHOW ? <li className="item group">
(<li className="item group">
<NavLink <NavLink
to="/history" to="/history"
className="nav-item flex items-center justify-start space-x-3.5" className="nav-item flex items-center justify-start space-x-3.5"
> >
<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 text-dark-gray dark:text-white"> <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 text-dark-gray dark:text-white">
<Icons name="History" /> <Icons name="history" />
</span> </span>
<span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1"> <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
{process.env.REACT_APP_HISTORY} History
</span> </span>
</NavLink> </NavLink>
</li>) </li>
: ''}
</ul> </ul>
</div> </div>
</div> </div>
@@ -173,7 +169,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
className="nav-item flex items-center justify-start space-x-3.5" className="nav-item flex items-center justify-start space-x-3.5"
> >
<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 text-dark-gray dark:text-white"> <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 text-dark-gray dark:text-white">
<Icons name="profile" /> <Icons name="people-two" />
</span> </span>
<span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1"> <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
My Profile My Profile
@@ -186,7 +182,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
className="nav-item flex items-center justify-start space-x-3.5" className="nav-item flex items-center justify-start space-x-3.5"
> >
<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 text-dark-gray dark:text-white"> <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 text-dark-gray dark:text-white">
<Icons name="settings" /> <Icons name="setting" />
</span> </span>
<span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1"> <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
Settings Settings
+13 -10
View File
@@ -151,8 +151,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
</span> </span>
</NavLink> </NavLink>
</li> </li>
{process.env.REACT_APP_TRACKING_SHOW ? <li className="item group">
(<li className="item group">
<NavLink <NavLink
to="/tracking" to="/tracking"
className={`nav-item flex items-center ${ className={`nav-item flex items-center ${
@@ -171,8 +170,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
{process.env.REACT_APP_TRACKING} {process.env.REACT_APP_TRACKING}
</span> </span>
</NavLink> </NavLink>
</li>) </li>
: ''}
<li className="item group"> <li className="item group">
<NavLink <NavLink
to="/calendar" to="/calendar"
@@ -193,11 +191,14 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
</span> </span>
</NavLink> </NavLink>
</li> </li>
{process.env.REACT_APP_RESOURCES_SHOW == 1 ?
<li className="item group"> <li className="item group">
<NavLink <NavLink
to="/resources" to="/resources"
className={`nav-item flex items-center ${ className={`nav-item flex items-center ${
((navData) => (navData.isActive ? "active" : ""), (
(navData) => (navData.isActive ? "active" : ""),
sidebar ? "justify-start space-x-3.5" : "justify-center") sidebar ? "justify-start space-x-3.5" : "justify-center")
}`} }`}
> >
@@ -213,8 +214,11 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
</span> </span>
</NavLink> </NavLink>
</li> </li>
{process.env.REACT_APP_HISTORY_SHOW ? :
(<li className="item group"> null
}
<li className="item group">
<NavLink <NavLink
to="/history" to="/history"
className={`nav-item flex items-center ${ className={`nav-item flex items-center ${
@@ -230,11 +234,10 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
sidebar ? "active flex-1" : "w-0" sidebar ? "active flex-1" : "w-0"
}`} }`}
> >
{process.env.REACT_APP_HISTORY} History
</span> </span>
</NavLink> </NavLink>
</li>) </li>
: ''}
</ul> </ul>
</div> </div>
</div> </div>