Skip to content

Commit

Permalink
Merge pull request #39 from ScilifelabDataCentre/bugfix
Browse files Browse the repository at this point in the history
Minor fixes, one of which prevented project image build
  • Loading branch information
SevLG authored Apr 22, 2024
2 parents 4bd029e + 26547d6 commit 47e867a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
6 changes: 3 additions & 3 deletions pmp-frontend-app/src/components/FooterComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ export default function FooterComponent(): ReactElement {
<footer className='footer pt-10 px-10 bg-primary text-primary-content'>
<nav>
{Object.keys(linksCol1).map( key => (
<Link className={linksCol1[key].classes} to={linksCol1[key].link}>{linksCol1[key].text}</Link>
<Link className={linksCol1[key].classes} to={linksCol1[key].link} key={key}>{linksCol1[key].text}</Link>
))}
</nav>
<nav>
{Object.keys(linksCol2).map( key => (
<Link className={linksCol2[key].classes} to={linksCol2[key].link}>{linksCol2[key].text}</Link>
<Link className={linksCol2[key].classes} to={linksCol2[key].link} key={key}>{linksCol2[key].text}</Link>
))}
</nav>
<nav>
<header className="footer-title">Social</header>
<div className="grid grid-flow-col gap-4">
{Object.keys(svgs).map( key => (
<a href={svgs[key].href}><svg xmlns={svgs[key].xmlns} width={svgs[key].width} height={svgs[key].height} viewBox={svgs[key].viewBox} className={svgs[key].classes}><path d={svgs[key].svg}></path></svg></a>
<a href={svgs[key].href} key={key}><svg xmlns={svgs[key].xmlns} width={svgs[key].width} height={svgs[key].height} viewBox={svgs[key].viewBox} className={svgs[key].classes}><path d={svgs[key].svg}></path></svg></a>
))}
</div>
</nav>
Expand Down
7 changes: 5 additions & 2 deletions pmp-frontend-app/src/components/HeaderComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { Link, NavLink } from 'react-router-dom';
import { ILink } from '../interfaces/types';
import { BUTTON_TYPE_ONE, LINK_CLASSES } from '../constants';
import {
//BODY_CLASSES,
LINK_CLASSES,
} from '../constants';
import sciLifeLogo from '../assets/SciLifeLab logo/Precisionmedicineportal_logo_white.png';
import { useLocation } from 'react-router-dom';
import { AboutPageContent, ContactPageContent, DataSourcesPageContent, EventsAndTrainingsPageContent, HomePageContent, PrivacyPageContent } from '../content/content';
Expand Down Expand Up @@ -65,7 +68,7 @@ export default function HeaderComponent() {
<div className="navbar-center lg:flex">
<ul className="menu menu-horizontal text-lg mt-0.5">
{Object.keys(links).map( key => (
<li>{<NavLink className={links[key].classes} to={links[key].link}>{links[key].text}</NavLink>}</li>
<li key={key}>{<NavLink className={links[key].classes} to={links[key].link}>{links[key].text}</NavLink>}</li>
))}
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion pmp-frontend-app/src/pages/AboutProductPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default function AboutProductPage(): ReactElement {
<div className="divider">Product</div>
<p>{PMDDescription}</p>
<div className="divider pt-16">Team & Contributions</div>
<div className="grid grid-cols-3 gap-2">
<div className="grid grid-cols-3 place-items-center gap-2">
{Object.keys(cardContent).map( key => (
<CardComponent cardConfig={cardConfig['teamCard']} cardContent={cardContent[key]} />
))}
Expand Down

0 comments on commit 47e867a

Please sign in to comment.